Zhiyi Zhang : light.msstyles: Add Progress parts.

Alexandre Julliard julliard at winehq.org
Mon Jun 28 16:49:35 CDT 2021


Module: wine
Branch: master
Commit: 3dab0775c7ed3ef65034ca1904eb2ac7f6a204ae
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3dab0775c7ed3ef65034ca1904eb2ac7f6a204ae

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Mon Jun 28 10:29:58 2021 +0800

light.msstyles: Add Progress parts.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/light.msstyles/Makefile.in                    |   4 ++
 .../blue_progress_chunk_horizontal.bmp             | Bin 0 -> 2358 bytes
 .../blue_progress_chunk_horizontal.svg             |  13 ++++++
 .../blue_progress_chunk_vertical.bmp               | Bin 0 -> 2490 bytes
 .../blue_progress_chunk_vertical.svg               |  13 ++++++
 .../blue_progress_track_horizontal.bmp             | Bin 0 -> 2698 bytes
 .../blue_progress_track_horizontal.svg             |  13 ++++++
 .../blue_progress_track_vertical.bmp               | Bin 0 -> 886 bytes
 .../blue_progress_track_vertical.svg               |  13 ++++++
 dlls/light.msstyles/light.rc                       |  48 +++++++++++++++++++++
 10 files changed, 104 insertions(+)

diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in
index f5bbb77df04..c3c5643236a 100644
--- a/dlls/light.msstyles/Makefile.in
+++ b/dlls/light.msstyles/Makefile.in
@@ -15,6 +15,10 @@ SVG_SRCS = \
 	blue_groupbox.svg \
 	blue_header.svg \
 	blue_header_item.svg \
+	blue_progress_chunk_horizontal.svg \
+	blue_progress_chunk_vertical.svg \
+	blue_progress_track_horizontal.svg \
+	blue_progress_track_vertical.svg \
 	blue_radiobutton_13px.svg \
 	blue_radiobutton_16px.svg \
 	blue_radiobutton_25px.svg \
diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp
new file mode 100644
index 00000000000..60debfe4049
Binary files /dev/null and b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp differ
diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg
new file mode 100644
index 00000000000..629b667f585
--- /dev/null
+++ b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bitmap:49-24" width="49" height="15" version="1.1" viewBox="0 0 12.965 3.9688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <rect width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/>
+</svg>
diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp
new file mode 100644
index 00000000000..f9816b09dcf
Binary files /dev/null and b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp differ
diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.svg b/dlls/light.msstyles/blue_progress_chunk_vertical.svg
new file mode 100644
index 00000000000..4f43374dce5
--- /dev/null
+++ b/dlls/light.msstyles/blue_progress_chunk_vertical.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bitmap:15-24" width="15" height="49" version="1.1" viewBox="0 0 3.9687 12.965" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <rect transform="rotate(90)" y="-3.9688" width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/>
+</svg>
diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.bmp b/dlls/light.msstyles/blue_progress_track_horizontal.bmp
new file mode 100644
index 00000000000..43d5eaa441a
Binary files /dev/null and b/dlls/light.msstyles/blue_progress_track_horizontal.bmp differ
diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.svg b/dlls/light.msstyles/blue_progress_track_horizontal.svg
new file mode 100644
index 00000000000..af25bbbcd51
--- /dev/null
+++ b/dlls/light.msstyles/blue_progress_track_horizontal.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bitmap:53-24" width="53" height="16" version="1.1" viewBox="0 0 14.023 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <rect x=".13229" y=".13229" width="13.758" height="3.9688" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/>
+</svg>
diff --git a/dlls/light.msstyles/blue_progress_track_vertical.bmp b/dlls/light.msstyles/blue_progress_track_vertical.bmp
new file mode 100644
index 00000000000..5dddee9c32e
Binary files /dev/null and b/dlls/light.msstyles/blue_progress_track_vertical.bmp differ
diff --git a/dlls/light.msstyles/blue_progress_track_vertical.svg b/dlls/light.msstyles/blue_progress_track_vertical.svg
new file mode 100644
index 00000000000..2f0f638bd8a
--- /dev/null
+++ b/dlls/light.msstyles/blue_progress_track_vertical.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bitmap:14-24" width="14" height="17" version="1.1" viewBox="0 0 3.7042 4.4979" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <rect x=".13229" y=".13229" width="3.4396" height="4.2333" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/>
+</svg>
diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc
index 19e3192201f..199ddcbfa77 100644
--- a/dlls/light.msstyles/light.rc
+++ b/dlls/light.msstyles/light.rc
@@ -365,6 +365,41 @@ BLUE_INI TEXTFILE
 "FillColor = 255 255 255\r\n"
 "BorderColor = 174 174 174\r\n"
 
+"\r\n; Progress\r\n"
+"[Progress]\r\n"
+"ProgressChunkSize = 1\r\n"
+"ProgressSpaceSize = 0\r\n"
+"BgType = BorderFill\r\n"
+"FillType = Solid\r\n"
+"FillColor = 255 255 255\r\n"
+"BorderSize = 1\r\n"
+"BorderColor = 174 174 174\r\n"
+
+"[Progress.Bar]\r\n"
+"BgType = ImageFile\r\n"
+"ImageFile = blue_progress_track_horizontal.bmp\r\n"
+"MinSize = 10, 10\r\n"
+"SizingMargins = 1, 1, 1, 1\r\n"
+"SizingType = Stretch\r\n"
+
+"[Progress.BarVert]\r\n"
+"BgType = ImageFile\r\n"
+"ImageFile = blue_progress_track_vertical.bmp\r\n"
+"SizingMargins = 1, 1, 1, 1\r\n"
+"SizingType = Stretch\r\n"
+
+"[Progress.Chunk]\r\n"
+"BgType = ImageFile\r\n"
+"ImageFile = blue_progress_chunk_horizontal.bmp\r\n"
+"SizingMargins = 1, 1, 1, 1\r\n"
+"SizingType = Stretch\r\n"
+
+"[Progress.ChunkVert]\r\n"
+"BgType = ImageFile\r\n"
+"ImageFile = blue_progress_chunk_vertical.bmp\r\n"
+"SizingMargins = 1, 1, 1, 1\r\n"
+"SizingType = Stretch\r\n"
+
 "\r\n; Rebar\r\n"
 "[Rebar]\r\n"
 "BgType = ImageFile\r\n"
@@ -722,6 +757,19 @@ BLUE_HEADER_BMP BITMAP "blue_header.bmp"
 /* @makedep: blue_header_item.bmp */
 BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp"
 
+/* Progress */
+/* @makedep: blue_progress_chunk_horizontal.bmp */
+BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp"
+
+/* @makedep: blue_progress_chunk_vertical.bmp */
+BLUE_PROGRESS_CHUNK_VERTICAL_BMP BITMAP "blue_progress_chunk_vertical.bmp"
+
+/* @makedep: blue_progress_track_horizontal.bmp */
+BLUE_PROGRESS_TRACK_HORIZONTAL_BMP BITMAP "blue_progress_track_horizontal.bmp"
+
+/* @makedep: blue_progress_track_vertical.bmp */
+BLUE_PROGRESS_TRACK_VERTICAL_BMP BITMAP "blue_progress_track_vertical.bmp"
+
 /* Rebar */
 /* @makedep: blue_rebar_background.bmp */
 BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp"




More information about the wine-cvs mailing list