diff options
-rw-r--r-- | common/gtk-2.0/assets-dark.svg | 54 | ||||
-rw-r--r-- | common/gtk-2.0/assets-dark/trough-horizontal-active.png | bin | 0 -> 243 bytes | |||
-rw-r--r-- | common/gtk-2.0/assets-dark/trough-vertical-active.png | bin | 0 -> 264 bytes | |||
-rw-r--r-- | common/gtk-2.0/assets.svg | 58 | ||||
-rw-r--r-- | common/gtk-2.0/assets.txt | 2 | ||||
-rw-r--r-- | common/gtk-2.0/assets/trough-horizontal-active.png | bin | 0 -> 243 bytes | |||
-rw-r--r-- | common/gtk-2.0/assets/trough-vertical-active.png | bin | 0 -> 264 bytes | |||
-rw-r--r-- | common/gtk-2.0/main.rc | 27 |
8 files changed, 131 insertions, 10 deletions
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index 03f4f96..ec74a71 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -566,11 +566,11 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.313708" - inkscape:cx="247.42082" - inkscape:cy="280.79196" + inkscape:cx="258.94404" + inkscape:cy="123.52013" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" showborder="false" inkscape:window-width="1366" inkscape:window-height="720" @@ -5220,5 +5220,53 @@ id="focus-line" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.14492753" inkscape:label="#rect6176-4-2" /> + <g + style="display:inline" + id="trough-horizontal-active" + transform="translate(36,-283.63782)" + inkscape:label="#g5902"> + <rect + ry="0" + rx="0" + y="276" + x="208" + height="15" + width="24" + id="rect5900-0" + style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + rx="2.5" + ry="2.5" + y="281" + x="208" + height="5" + width="24" + id="rect5799-8-5" + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + <g + style="display:inline" + transform="matrix(0,1,-1,0,539,-200.63782)" + id="trough-vertical-active" + inkscape:label="#g5902-6"> + <rect + ry="0" + rx="0" + y="276" + x="208" + height="15" + width="24" + id="rect5900-2-4" + style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + rx="2.5" + ry="2.5" + y="281" + x="208" + height="5" + width="24" + id="rect5799-8-9-4" + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gtk-2.0/assets-dark/trough-horizontal-active.png b/common/gtk-2.0/assets-dark/trough-horizontal-active.png Binary files differnew file mode 100644 index 0000000..eb9a0b0 --- /dev/null +++ b/common/gtk-2.0/assets-dark/trough-horizontal-active.png diff --git a/common/gtk-2.0/assets-dark/trough-vertical-active.png b/common/gtk-2.0/assets-dark/trough-vertical-active.png Binary files differnew file mode 100644 index 0000000..3c5938f --- /dev/null +++ b/common/gtk-2.0/assets-dark/trough-vertical-active.png diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index 1b44f6e..940d4c4 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,12 +565,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="403.8686" - inkscape:cy="386.55985" + inkscape:zoom="11.313708" + inkscape:cx="263.61274" + inkscape:cy="122.03206" inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="false" + inkscape:current-layer="layer3" + showgrid="true" showborder="false" inkscape:window-width="1366" inkscape:window-height="720" @@ -5187,5 +5187,53 @@ id="focus-line" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.67346936" inkscape:label="#rect6176-4-2" /> + <g + style="display:inline" + id="trough-horizontal-active" + transform="translate(37,-283.63782)" + inkscape:label="#g5902"> + <rect + ry="0" + rx="0" + y="276" + x="208" + height="15" + width="24" + id="rect5900-0" + style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + rx="2.5" + ry="2.5" + y="281" + x="208" + height="5" + width="24" + id="rect5799-8-5" + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + <g + style="display:inline" + transform="matrix(0,1,-1,0,540,-200.63782)" + id="trough-vertical-active" + inkscape:label="#g5902-6"> + <rect + ry="0" + rx="0" + y="276" + x="208" + height="15" + width="24" + id="rect5900-2-4" + style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + rx="2.5" + ry="2.5" + y="281" + x="208" + height="5" + width="24" + id="rect5799-8-9-4" + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index f1b7a1c..6acfe2c 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -95,6 +95,8 @@ slider-insensitive slider-prelight trough-horizontal trough-vertical +trough-horizontal-active +trough-vertical-active slider-horiz slider-horiz-active slider-horiz-insens diff --git a/common/gtk-2.0/assets/trough-horizontal-active.png b/common/gtk-2.0/assets/trough-horizontal-active.png Binary files differnew file mode 100644 index 0000000..eb9a0b0 --- /dev/null +++ b/common/gtk-2.0/assets/trough-horizontal-active.png diff --git a/common/gtk-2.0/assets/trough-vertical-active.png b/common/gtk-2.0/assets/trough-vertical-active.png Binary files differnew file mode 100644 index 0000000..3c5938f --- /dev/null +++ b/common/gtk-2.0/assets/trough-vertical-active.png diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc index 665be9b..c850de1 100644 --- a/common/gtk-2.0/main.rc +++ b/common/gtk-2.0/main.rc @@ -42,6 +42,11 @@ style "default" { GtkHScale::slider_length = 15 GtkHScale::slider_width = 15 + GtkScale::trough-side-details = 1 + + GtkProgressBar::min-horizontal-bar-height = 8 + GtkProgressBar::min-vertical-bar-width = 8 + GtkStatusbar::shadow_type = GTK_SHADOW_NONE GtkSpinButton::shadow_type = GTK_SHADOW_NONE GtkMenuBar::shadow-type = GTK_SHADOW_NONE @@ -1871,7 +1876,7 @@ style "range" { image { function = BOX - detail = "trough" + detail = "trough-upper" file = "assets/trough-horizontal.png" border = { 4, 4, 0, 0 } stretch = TRUE @@ -1880,13 +1885,31 @@ style "range" { image { function = BOX - detail = "trough" + detail = "trough-lower" + file = "assets/trough-horizontal-active.png" + border = { 4, 4, 0, 0 } + stretch = TRUE + orientation = HORIZONTAL + } + + image { + function = BOX + detail = "trough-upper" file = "assets/trough-vertical.png" border = { 0, 0, 4, 4 } stretch = TRUE orientation = VERTICAL } + image { + function = BOX + detail = "trough-lower" + file = "assets/trough-vertical-active.png" + border = { 0, 0, 4, 4 } + stretch = TRUE + orientation = VERTICAL + } + # Horizontal image { |