[gnome-themes-standard/wip/jimmac/updated-gtk2: 54/106] Needlelized progressbars.
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard/wip/jimmac/updated-gtk2: 54/106] Needlelized progressbars.
- Date: Thu, 3 Mar 2016 22:21:50 +0000 (UTC)
commit 6f9ea469a534dee7ccf9a0bd706f416ca4032f6a
Author: Juraj Fiala <doctorjellyface riseup net>
Date: Wed Feb 10 18:46:41 2016 +0100
Needlelized progressbars.
themes/Adwaita/gtk-2.0/assets.svg | 217 ++++++++------------
.../gtk-2.0/assets/progressbar-horz-trough.png | Bin 343 -> 228 bytes
themes/Adwaita/gtk-2.0/assets/progressbar-horz.png | Bin 275 -> 223 bytes
.../gtk-2.0/assets/progressbar-vert-trough.png | Bin 351 -> 229 bytes
themes/Adwaita/gtk-2.0/assets/progressbar-vert.png | Bin 284 -> 223 bytes
themes/Adwaita/gtk-2.0/main.rc | 16 +-
6 files changed, 94 insertions(+), 139 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/assets.svg b/themes/Adwaita/gtk-2.0/assets.svg
index bf1d413..f53fe3e 100644
--- a/themes/Adwaita/gtk-2.0/assets.svg
+++ b/themes/Adwaita/gtk-2.0/assets.svg
@@ -1605,9 +1605,9 @@
borderopacity="1"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="7.9999996"
- inkscape:cx="278.0584"
- inkscape:cy="373.60216"
+ inkscape:zoom="15.999999"
+ inkscape:cx="141.80136"
+ inkscape:cy="435.80783"
inkscape:current-layer="layer1"
inkscape:document-units="px"
showgrid="false"
@@ -5442,163 +5442,53 @@
</g>
</g>
<g
- id="progressbar-horz-trough"
- inkscape:label="#g5060"
- transform="translate(-2,22)">
- <rect
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="use5038"
- width="7"
- height="6"
- x="138.5"
- y="9.5"
- rx="3"
- ry="3" />
- <rect
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
- id="rect5041"
- width="10"
- height="10"
- x="137"
- y="7"
- rx="0"
- ry="0" />
- <g
- id="g5043"
- transform="translate(107,7)">
- <rect
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cececc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
- id="rect5045"
- width="7"
- height="6"
- x="31.5"
- y="1.5"
- rx="3"
- ry="3" />
- <rect
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="use5047"
- width="7"
- height="6"
- x="31.5"
- y="1.5"
- rx="3"
- ry="3" />
- </g>
- </g>
- <g
id="progressbar-horz"
- inkscape:label="#g5033">
- <rect
- ry="0"
- rx="0"
- y="68"
- x="136"
- height="8"
- width="8"
- id="rect5097"
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
/>
+ inkscape:label="#g5493"
+ transform="translate(0,-28)">
<g
transform="translate(105,68)"
id="g5099">
<rect
- ry="3"
- rx="3"
y="0.5"
x="31.5"
- height="6"
- width="7"
+ height="3"
+ width="4"
id="rect5101"
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
/>
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+ ry="1.5" />
<rect
- ry="3"
- rx="3"
y="0.5"
x="31.5"
- height="6"
- width="7"
+ height="3"
+ width="4"
id="rect5103"
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#184472;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#184472;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+ ry="1.5" />
</g>
</g>
<g
id="progressbar-vert"
- inkscape:label="#g5023">
- <rect
- transform="matrix(0,-1,1,0,0,0)"
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
- id="rect5135"
- width="9"
- height="7"
- x="-77"
- y="149"
- rx="0"
- ry="0" />
+ inkscape:label="#g5502"
+ transform="translate(0,-32)">
<g
id="g5137"
transform="matrix(0,-1,1,0,148,107)">
<rect
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
id="rect5139"
- width="7"
- height="6"
+ width="4"
+ height="3"
x="31.5"
y="1.5"
- rx="3"
- ry="3" />
+ ry="1.5" />
<rect
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#184472;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
id="rect5141"
- width="7"
- height="6"
- x="31.5"
- y="1.5"
- rx="3"
- ry="3" />
- </g>
- </g>
- <g
- id="progressbar-vert-trough"
- inkscape:label="#g5002">
- <rect
- ry="3"
- rx="3"
- y="31.5"
- x="150.5"
- height="7"
- width="6"
- id="rect5145"
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
- <rect
- ry="0"
- rx="0"
- y="29"
- x="149"
- height="11"
- width="9"
- id="rect5147"
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
/>
- <g
- transform="translate(119,29)"
- id="g5149">
- <rect
- ry="3"
- rx="3"
- y="1.5"
+ width="4"
+ height="3"
x="31.5"
- height="7"
- width="6"
- id="rect5151"
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cececc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
/>
- <rect
- ry="3"
- rx="3"
y="1.5"
- x="31.5"
- height="7"
- width="6"
- id="rect5153"
-
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ ry="1.5" />
</g>
</g>
<g
@@ -5939,5 +5829,70 @@
rx="0" />
</g>
</g>
+ <g
+ id="progressbar-horz-trough"
+ inkscape:label="#g5474">
+ <g
+ id="g5043"
+ transform="translate(105,29)">
+ <rect
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cececc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+ id="rect5045"
+ width="4"
+ height="3"
+ x="31.5"
+ y="1.5"
+ ry="1.5" />
+ <rect
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="use5047"
+ width="4"
+ height="3"
+ x="31.5"
+ y="1.5"
+ ry="1.5" />
+ </g>
+ <rect
+ ry="1.3486539"
+ y="29"
+ x="135"
+ height="6"
+ width="7"
+ id="rect5461"
+
style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </g>
+ <g
+ id="progressbar-vert-trough"
+ inkscape:label="#g5483">
+ <g
+ transform="translate(119,29)"
+ id="g5149">
+ <rect
+ ry="1.5"
+ y="1.5"
+ x="31.5"
+ height="4"
+ width="3"
+ id="rect5151"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cececc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ ry="1.5"
+ y="1.5"
+ x="31.5"
+ height="4"
+ width="3"
+ id="rect5153"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ </g>
+ <rect
+ transform="matrix(0,1,-1,0,0,0)"
+
style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect5472"
+ width="7"
+ height="6"
+ x="29"
+ y="-155"
+ ry="1.3486539" />
+ </g>
</g>
</svg>
diff --git a/themes/Adwaita/gtk-2.0/assets/progressbar-horz-trough.png
b/themes/Adwaita/gtk-2.0/assets/progressbar-horz-trough.png
index 7c1146f..0ea54b0 100644
Binary files a/themes/Adwaita/gtk-2.0/assets/progressbar-horz-trough.png and
b/themes/Adwaita/gtk-2.0/assets/progressbar-horz-trough.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/progressbar-horz.png
b/themes/Adwaita/gtk-2.0/assets/progressbar-horz.png
index bc2be0d..7eebf87 100644
Binary files a/themes/Adwaita/gtk-2.0/assets/progressbar-horz.png and
b/themes/Adwaita/gtk-2.0/assets/progressbar-horz.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/progressbar-vert-trough.png
b/themes/Adwaita/gtk-2.0/assets/progressbar-vert-trough.png
index 107da4d..f323bf5 100644
Binary files a/themes/Adwaita/gtk-2.0/assets/progressbar-vert-trough.png and
b/themes/Adwaita/gtk-2.0/assets/progressbar-vert-trough.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/progressbar-vert.png
b/themes/Adwaita/gtk-2.0/assets/progressbar-vert.png
index 494a8fd..721416f 100644
Binary files a/themes/Adwaita/gtk-2.0/assets/progressbar-vert.png and
b/themes/Adwaita/gtk-2.0/assets/progressbar-vert.png differ
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index b445583..91b5052 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -61,14 +61,14 @@ style "default" {
# FIXME: progress bars should be 2px smaller, but doing so now makes
# them fuzzy, it probably requires a change in the assets.
- GtkProgressBar::min-horizontal-bar-height = 9
- GtkProgressBar::min-vertical-bar-width = 8
+ GtkProgressBar::min-horizontal-bar-height = 6
+ GtkProgressBar::min-vertical-bar-width = 6
# Making this bigger than the min[height,width]-2*[y,x]spacing makes the
# whole progressbar thicker, so by setting it to the exact above value
# we get the maximum spacing between the text and the edges without
# doing so.
- GtkProgressBar::xspacing = 6
- GtkProgressBar::yspacing = 7
+ GtkProgressBar::xspacing = 4
+ GtkProgressBar::yspacing = 4
GtkStatusbar::shadow_type = GTK_SHADOW_NONE
GtkSpinButton::shadow_type = GTK_SHADOW_NONE
@@ -1960,7 +1960,7 @@ style "progressbar" {
function = BOX
detail = "trough"
file = "assets/progressbar-horz-trough.png"
- border = {4, 4, 4, 5}
+ border = {3, 3, 2, 2}
stretch = TRUE
orientation = HORIZONTAL
}
@@ -1970,7 +1970,7 @@ style "progressbar" {
detail = "bar"
file = "assets/progressbar-horz.png"
stretch = TRUE
- border = {3, 3, 3, 4}
+ border = {2, 2, 1, 1}
orientation = HORIZONTAL
}
@@ -1978,7 +1978,7 @@ style "progressbar" {
function = BOX
detail = "trough"
file = "assets/progressbar-vert-trough.png"
- border = {4, 4, 4, 5}
+ border = {2, 2, 3, 3}
stretch = TRUE
orientation = VERTICAL
}
@@ -1988,7 +1988,7 @@ style "progressbar" {
detail = "bar"
file = "assets/progressbar-vert.png"
stretch = TRUE
- border = {3, 3, 3, 4}
+ border = {1, 1, 2, 2}
orientation = VERTICAL
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
