diff options
| author | Olivier Fourdan <fourdan@xfce.org> | 2019-05-02 09:38:21 +0200 |
|---|---|---|
| committer | Olivier Fourdan <fourdan@xfce.org> | 2019-05-02 16:01:48 +0200 |
| commit | deed0d10dbe284304d44271f4240431c4dd2ec47 (patch) | |
| tree | 53e33a32f631bc41484fd5492e26fa98d632f39d /themes | |
| parent | e8e920cb170645449dc2367a29175f2bbbd4e61e (diff) | |
| download | xfwm4-deed0d10dbe284304d44271f4240431c4dd2ec47.tar.gz | |
themes: Add new default theme
Add new default theme for xfce 4.14 which integrates nicely with gtk
client side decorations.
Comes in standard, hdpi and xhdpi variants.
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
Diffstat (limited to 'themes')
459 files changed, 5572 insertions, 9947 deletions
diff --git a/themes/default-hdpi/bottom-left-active.png b/themes/default-hdpi/bottom-left-active.png Binary files differindex 660406b43..31d0a1fcd 100644 --- a/themes/default-hdpi/bottom-left-active.png +++ b/themes/default-hdpi/bottom-left-active.png diff --git a/themes/default-hdpi/bottom-left-inactive.png b/themes/default-hdpi/bottom-left-inactive.png Binary files differindex 660406b43..31d0a1fcd 100644 --- a/themes/default-hdpi/bottom-left-inactive.png +++ b/themes/default-hdpi/bottom-left-inactive.png diff --git a/themes/default-hdpi/bottom-right-active.png b/themes/default-hdpi/bottom-right-active.png Binary files differindex 63e1f738f..3ccba9237 100644 --- a/themes/default-hdpi/bottom-right-active.png +++ b/themes/default-hdpi/bottom-right-active.png diff --git a/themes/default-hdpi/bottom-right-inactive.png b/themes/default-hdpi/bottom-right-inactive.png Binary files differindex 63e1f738f..3ccba9237 100644 --- a/themes/default-hdpi/bottom-right-inactive.png +++ b/themes/default-hdpi/bottom-right-inactive.png diff --git a/themes/default-hdpi/close-active.png b/themes/default-hdpi/close-active.png Binary files differindex 3abc2e4db..d423f23db 100644 --- a/themes/default-hdpi/close-active.png +++ b/themes/default-hdpi/close-active.png diff --git a/themes/default-hdpi/close-active.svg b/themes/default-hdpi/close-active.svg index d184331be..e813ff482 100644 --- a/themes/default-hdpi/close-active.svg +++ b/themes/default-hdpi/close-active.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,40 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,9)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/close-active.xpm b/themes/default-hdpi/close-active.xpm index 92d262bb6..a7021f3b1 100644 --- a/themes/default-hdpi/close-active.xpm +++ b/themes/default-hdpi/close-active.xpm @@ -1,17 +1,11 @@ /* XPM */ static char * close_active_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", ".................................", ".................................", ".................................", @@ -30,6 +24,15 @@ static char * close_active_xpm[] = { ".................................", ".................................", ".................................", +"............##@...@##............", +"............###@.@###............", +"............@###@###@............", +".............@#####@.............", +"..............@###@..............", +".............@#####@.............", +"............@###@###@............", +"............###@.@###............", +"............##@...@##............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/close-inactive b/themes/default-hdpi/close-inactive new file mode 100644 index 000000000..857ae9efc --- /dev/null +++ b/themes/default-hdpi/close-inactive @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="33" + height="43" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.48.5 r10040" + version="1.0" + sodipodi:docname="button.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <metadata + id="metadata38" /> + <defs + id="defs36" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview34" /> + <g + transform="scale(1.5)" + id="g3"> + <defs + id="defs4"> + <linearGradient + id="linearGradient1886"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop1888" /> + <stop + style="stop-color:white;stop-opacity:0.15;" + offset="1" + id="stop1890" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1886" + id="linearGradient1892" + x1="0" + y1="1" + x2="0" + y2="18" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1,0,0)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="white" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="10" + inkscape:cx="0" + inkscape:cy="0" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:grid-points="true" + gridtolerance="0.5px" + guidetolerance="1px" + inkscape:window-width="640" + inkscape:window-height="400" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:guide-bbox="true" + inkscape:guide-points="false" + showguides="true"> + <inkscape:grid + id="GridFromPre046Settings" + type="xygrid" + originx="0px" + originy="0px" + spacingx="1px" + spacingy="1px" + color="#3f3fff" + empcolor="#3f3fff" + opacity="0.15" + empopacity="0.38" + empspacing="5" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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>Title</dc:title> + <dc:creator> + <cc:Agent> + <dc:title>Olivier Fourdan</dc:title> + </cc:Agent> + </dc:creator> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Grad" + style="display:inline"> + <path + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + id="path6057" /> + </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="hilight"> + <path + style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + id="path6061" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="22" + height="18" + x="0" + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> + <path + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 21.5,0.5" + id="path6059" /> + </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 21.5,26.5" + id="path6989" /> + </g> + </g> +</svg> diff --git a/themes/default-hdpi/close-inactive.png b/themes/default-hdpi/close-inactive.png Binary files differindex 58dfc86a0..d423f23db 100644 --- a/themes/default-hdpi/close-inactive.png +++ b/themes/default-hdpi/close-inactive.png diff --git a/themes/default-hdpi/close-inactive.svg b/themes/default-hdpi/close-inactive.svg index 4298135a4..ee8c0be5e 100644 --- a/themes/default-hdpi/close-inactive.svg +++ b/themes/default-hdpi/close-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="close-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata38" /> <defs - id="defs27" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,28 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(3,9)"> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/close-inactive.xpm b/themes/default-hdpi/close-inactive.xpm index 912db27fe..0197ae25d 100644 --- a/themes/default-hdpi/close-inactive.xpm +++ b/themes/default-hdpi/close-inactive.xpm @@ -1,8 +1,11 @@ /* XPM */ static char * close_inactive_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", ". c #C0C0FF s inactive_color_2", +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", ".................................", ".................................", ".................................", @@ -21,15 +24,15 @@ static char * close_inactive_xpm[] = { ".................................", ".................................", ".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"............##$...$##............", +"............###$.$###............", +"............$###$###$............", +".............$#####$.............", +"..............$###$..............", +".............$#####$.............", +"............$###$###$............", +"............###$.$###............", +"............##$...$##............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/close-prelight.png b/themes/default-hdpi/close-prelight.png Binary files differindex c7fd79c82..d423f23db 100644 --- a/themes/default-hdpi/close-prelight.png +++ b/themes/default-hdpi/close-prelight.png diff --git a/themes/default-hdpi/close-prelight.svg b/themes/default-hdpi/close-prelight.svg index b6150f592..1cff20888 100644 --- a/themes/default-hdpi/close-prelight.svg +++ b/themes/default-hdpi/close-prelight.svg @@ -19,9 +19,9 @@ sodipodi:docname="close-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata41" /> + id="metadata38" /> <defs - id="defs39" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview37" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,40 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,9)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/close-prelight.xpm b/themes/default-hdpi/close-prelight.xpm index 92d262bb6..ca30bab0e 100644 --- a/themes/default-hdpi/close-prelight.xpm +++ b/themes/default-hdpi/close-prelight.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * close_active_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++##@+++@##+++++++++++@", +"@+++++++++++###@+@###+++++++++++@", +"@+++++++++++@###@###@+++++++++++@", +"@++++++++++++@#####@++++++++++++@", +"@+++++++++++++@###@+++++++++++++@", +"@++++++++++++@#####@++++++++++++@", +"@+++++++++++@###@###@+++++++++++@", +"@+++++++++++###@+@###+++++++++++@", +"@+++++++++++##@+++@##+++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/close-pressed.png b/themes/default-hdpi/close-pressed.png Binary files differindex da872d478..d423f23db 100644 --- a/themes/default-hdpi/close-pressed.png +++ b/themes/default-hdpi/close-pressed.png diff --git a/themes/default-hdpi/close-pressed.svg b/themes/default-hdpi/close-pressed.svg index ca8dbf8b5..cd6fd2b8e 100644 --- a/themes/default-hdpi/close-pressed.svg +++ b/themes/default-hdpi/close-pressed.svg @@ -19,9 +19,9 @@ sodipodi:docname="close-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata41" /> + id="metadata38" /> <defs - id="defs39" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview37" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,58 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,10)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/close-pressed.xpm b/themes/default-hdpi/close-pressed.xpm index f5cd2bba1..9b0b0bf19 100644 --- a/themes/default-hdpi/close-pressed.xpm +++ b/themes/default-hdpi/close-pressed.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * close_pressed_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.............................@.", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...........##@...@##...........@", +"@...........###@.@###...........@", +"@...........@###@###@...........@", +"@............@#####@............@", +"@.............@###@.............@", +"@............@#####@............@", +"@...........@###@###@...........@", +"@...........###@.@###...........@", +"@...........##@...@##...........@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +".@.............................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/hide-active.png b/themes/default-hdpi/hide-active.png Binary files differindex 9a1c7c34f..d423f23db 100644 --- a/themes/default-hdpi/hide-active.png +++ b/themes/default-hdpi/hide-active.png diff --git a/themes/default-hdpi/hide-active.svg b/themes/default-hdpi/hide-active.svg index c1f1fec9e..749f14997 100644 --- a/themes/default-hdpi/hide-active.svg +++ b/themes/default-hdpi/hide-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="hide-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata35" /> + id="metadata38" /> <defs - id="defs33" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview31" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,34 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/hide-active.xpm b/themes/default-hdpi/hide-active.xpm index 650bb4d7d..5311a1e06 100644 --- a/themes/default-hdpi/hide-active.xpm +++ b/themes/default-hdpi/hide-active.xpm @@ -1,10 +1,11 @@ /* XPM */ static char * hide_active_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", ".................................", ".................................", ".................................", @@ -30,6 +31,8 @@ static char * hide_active_xpm[] = { ".................................", ".................................", ".................................", +"............#########............", +"............#########............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/hide-inactive.png b/themes/default-hdpi/hide-inactive.png Binary files differindex a30205e04..d423f23db 100644 --- a/themes/default-hdpi/hide-inactive.png +++ b/themes/default-hdpi/hide-inactive.png diff --git a/themes/default-hdpi/hide-inactive.svg b/themes/default-hdpi/hide-inactive.svg index 11d50988e..b9467b54b 100644 --- a/themes/default-hdpi/hide-inactive.svg +++ b/themes/default-hdpi/hide-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="hide-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata28" /> + id="metadata38" /> <defs - id="defs26" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview24" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,28 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(3,9)"> - <rect - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/hide-inactive.xpm b/themes/default-hdpi/hide-inactive.xpm index f5145eca4..b8d7af477 100644 --- a/themes/default-hdpi/hide-inactive.xpm +++ b/themes/default-hdpi/hide-inactive.xpm @@ -1,8 +1,11 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", ". c #C0C0FF s inactive_color_2", +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", ".................................", ".................................", ".................................", @@ -28,8 +31,8 @@ static char * hide_inactive_xpm[] = { ".................................", ".................................", ".................................", -".................................", -".................................", +"............#########............", +"............#########............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/hide-prelight.png b/themes/default-hdpi/hide-prelight.png Binary files differindex f6118b8ed..d423f23db 100644 --- a/themes/default-hdpi/hide-prelight.png +++ b/themes/default-hdpi/hide-prelight.png diff --git a/themes/default-hdpi/hide-prelight.svg b/themes/default-hdpi/hide-prelight.svg index 07b3caed3..026b5c462 100644 --- a/themes/default-hdpi/hide-prelight.svg +++ b/themes/default-hdpi/hide-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,34 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/hide-prelight.xpm b/themes/default-hdpi/hide-prelight.xpm index 650bb4d7d..93acdf497 100644 --- a/themes/default-hdpi/hide-prelight.xpm +++ b/themes/default-hdpi/hide-prelight.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * hide_active_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++#########+++++++++++@", +"@+++++++++++#########+++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/hide-pressed.png b/themes/default-hdpi/hide-pressed.png Binary files differindex 41cc10aeb..d423f23db 100644 --- a/themes/default-hdpi/hide-pressed.png +++ b/themes/default-hdpi/hide-pressed.png diff --git a/themes/default-hdpi/hide-pressed.svg b/themes/default-hdpi/hide-pressed.svg index aec8417f7..d61f1d9a1 100644 --- a/themes/default-hdpi/hide-pressed.svg +++ b/themes/default-hdpi/hide-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,52 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,10)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/hide-pressed.xpm b/themes/default-hdpi/hide-pressed.xpm index 7784eeee6..fa14f1df1 100644 --- a/themes/default-hdpi/hide-pressed.xpm +++ b/themes/default-hdpi/hide-pressed.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * hide_pressed_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.............................@.", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...........#########...........@", +"@...........#########...........@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +".@.............................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/maximize-active.png b/themes/default-hdpi/maximize-active.png Binary files differindex c98294aac..d423f23db 100644 --- a/themes/default-hdpi/maximize-active.png +++ b/themes/default-hdpi/maximize-active.png diff --git a/themes/default-hdpi/maximize-active.svg b/themes/default-hdpi/maximize-active.svg index 1b0ef100c..5d67bb47a 100644 --- a/themes/default-hdpi/maximize-active.svg +++ b/themes/default-hdpi/maximize-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata35" /> + id="metadata38" /> <defs - id="defs33" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview31" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,9)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/maximize-active.xpm b/themes/default-hdpi/maximize-active.xpm index a6ee3a3c7..99a134e04 100644 --- a/themes/default-hdpi/maximize-active.xpm +++ b/themes/default-hdpi/maximize-active.xpm @@ -1,17 +1,11 @@ /* XPM */ static char * maximize_active_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", ".................................", ".................................", ".................................", @@ -30,6 +24,15 @@ static char * maximize_active_xpm[] = { ".................................", ".................................", ".................................", +"............#########............", +"............#########............", +"............##.....##............", +"............##.....##............", +"............##.....##............", +"............##.....##............", +"............##.....##............", +"............#########............", +"............#########............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/maximize-inactive.png b/themes/default-hdpi/maximize-inactive.png Binary files differindex 8b8012c70..d423f23db 100644 --- a/themes/default-hdpi/maximize-inactive.png +++ b/themes/default-hdpi/maximize-inactive.png diff --git a/themes/default-hdpi/maximize-inactive.svg b/themes/default-hdpi/maximize-inactive.svg index 4e6bab4c0..1b3a03a0c 100644 --- a/themes/default-hdpi/maximize-inactive.svg +++ b/themes/default-hdpi/maximize-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata28" /> + id="metadata38" /> <defs - id="defs26" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview24" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -121,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(3,9)"> - <path - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - id="rect2275" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/maximize-inactive.xpm b/themes/default-hdpi/maximize-inactive.xpm index 020d06954..adc2c7fbf 100644 --- a/themes/default-hdpi/maximize-inactive.xpm +++ b/themes/default-hdpi/maximize-inactive.xpm @@ -1,8 +1,11 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", ". c #C0C0FF s inactive_color_2", +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", ".................................", ".................................", ".................................", @@ -21,15 +24,15 @@ static char * maximize_inactive_xpm[] = { ".................................", ".................................", ".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"............#########............", +"............#########............", +"............##.....##............", +"............##.....##............", +"............##.....##............", +"............##.....##............", +"............##.....##............", +"............#########............", +"............#########............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/maximize-prelight.png b/themes/default-hdpi/maximize-prelight.png Binary files differindex e899ebd2e..d423f23db 100644 --- a/themes/default-hdpi/maximize-prelight.png +++ b/themes/default-hdpi/maximize-prelight.png diff --git a/themes/default-hdpi/maximize-prelight.svg b/themes/default-hdpi/maximize-prelight.svg index 4e93c3722..7148fac90 100644 --- a/themes/default-hdpi/maximize-prelight.svg +++ b/themes/default-hdpi/maximize-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,9)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/maximize-prelight.xpm b/themes/default-hdpi/maximize-prelight.xpm index a6ee3a3c7..736855bc0 100644 --- a/themes/default-hdpi/maximize-prelight.xpm +++ b/themes/default-hdpi/maximize-prelight.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * maximize_active_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++#########+++++++++++@", +"@+++++++++++#########+++++++++++@", +"@+++++++++++##+++++##+++++++++++@", +"@+++++++++++##+++++##+++++++++++@", +"@+++++++++++##+++++##+++++++++++@", +"@+++++++++++##+++++##+++++++++++@", +"@+++++++++++##+++++##+++++++++++@", +"@+++++++++++#########+++++++++++@", +"@+++++++++++#########+++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/maximize-pressed.png b/themes/default-hdpi/maximize-pressed.png Binary files differindex 433247e61..d423f23db 100644 --- a/themes/default-hdpi/maximize-pressed.png +++ b/themes/default-hdpi/maximize-pressed.png diff --git a/themes/default-hdpi/maximize-pressed.svg b/themes/default-hdpi/maximize-pressed.svg index ec18da45a..48170539b 100644 --- a/themes/default-hdpi/maximize-pressed.svg +++ b/themes/default-hdpi/maximize-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,46 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,10)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/maximize-pressed.xpm b/themes/default-hdpi/maximize-pressed.xpm index 7a60f671e..dac211d53 100644 --- a/themes/default-hdpi/maximize-pressed.xpm +++ b/themes/default-hdpi/maximize-pressed.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * maximize_pressed_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.............................@.", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...........#########...........@", +"@...........#########...........@", +"@...........##.....##...........@", +"@...........##.....##...........@", +"@...........##.....##...........@", +"@...........##.....##...........@", +"@...........##.....##...........@", +"@...........#########...........@", +"@...........#########...........@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +".@.............................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/maximize-toggled-active.png b/themes/default-hdpi/maximize-toggled-active.png Binary files differindex d6fd1f3be..d423f23db 100644 --- a/themes/default-hdpi/maximize-toggled-active.png +++ b/themes/default-hdpi/maximize-toggled-active.png diff --git a/themes/default-hdpi/maximize-toggled-active.svg b/themes/default-hdpi/maximize-toggled-active.svg index 5f9e0f293..6b82eafae 100644 --- a/themes/default-hdpi/maximize-toggled-active.svg +++ b/themes/default-hdpi/maximize-toggled-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata38" /> <defs - id="defs34" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,32 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,9)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/maximize-toggled-active.xpm b/themes/default-hdpi/maximize-toggled-active.xpm index b63731a06..e81bdab67 100644 --- a/themes/default-hdpi/maximize-toggled-active.xpm +++ b/themes/default-hdpi/maximize-toggled-active.xpm @@ -1,15 +1,11 @@ /* XPM */ -static char * maximize_toggled_active_xpm[] = { -"33 43 2 1", +static char * maximize_active_xpm[] = { +"33 43 5 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", ".................................", ".................................", ".................................", @@ -29,6 +25,13 @@ static char * maximize_toggled_active_xpm[] = { ".................................", ".................................", ".................................", +".............#######.............", +".............#######.............", +".............##...##.............", +".............##...##.............", +".............##...##.............", +".............#######.............", +".............#######.............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/maximize-toggled-inactive.png b/themes/default-hdpi/maximize-toggled-inactive.png Binary files differindex 9ac44e250..d423f23db 100644 --- a/themes/default-hdpi/maximize-toggled-inactive.png +++ b/themes/default-hdpi/maximize-toggled-inactive.png diff --git a/themes/default-hdpi/maximize-toggled-inactive.svg b/themes/default-hdpi/maximize-toggled-inactive.svg index de7db88dd..4c78aabb0 100644 --- a/themes/default-hdpi/maximize-toggled-inactive.svg +++ b/themes/default-hdpi/maximize-toggled-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata38" /> <defs - id="defs27" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1639" - transform="translate(3,9)"> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/maximize-toggled-inactive.xpm b/themes/default-hdpi/maximize-toggled-inactive.xpm index 676cfd6c0..35b821916 100644 --- a/themes/default-hdpi/maximize-toggled-inactive.xpm +++ b/themes/default-hdpi/maximize-toggled-inactive.xpm @@ -1,8 +1,11 @@ /* XPM */ -static char * maximize_toggled_inactive_xpm[] = { -"33 43 2 1", +static char * maximize_inactive_xpm[] = { +"33 43 5 1", " c None", ". c #C0C0FF s inactive_color_2", +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", ".................................", ".................................", ".................................", @@ -22,13 +25,13 @@ static char * maximize_toggled_inactive_xpm[] = { ".................................", ".................................", ".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +".............#######.............", +".............#######.............", +".............##...##.............", +".............##...##.............", +".............##...##.............", +".............#######.............", +".............#######.............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/maximize-toggled-prelight.png b/themes/default-hdpi/maximize-toggled-prelight.png Binary files differindex 177753764..d423f23db 100644 --- a/themes/default-hdpi/maximize-toggled-prelight.png +++ b/themes/default-hdpi/maximize-toggled-prelight.png diff --git a/themes/default-hdpi/maximize-toggled-prelight.svg b/themes/default-hdpi/maximize-toggled-prelight.svg index b25fc0559..00b8217e5 100644 --- a/themes/default-hdpi/maximize-toggled-prelight.svg +++ b/themes/default-hdpi/maximize-toggled-prelight.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata39" /> + id="metadata38" /> <defs - id="defs37" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview35" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,32 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,9)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/maximize-toggled-prelight.xpm b/themes/default-hdpi/maximize-toggled-prelight.xpm index b63731a06..e4ad78299 100644 --- a/themes/default-hdpi/maximize-toggled-prelight.xpm +++ b/themes/default-hdpi/maximize-toggled-prelight.xpm @@ -1,47 +1,51 @@ /* XPM */ -static char * maximize_toggled_active_xpm[] = { -"33 43 2 1", +static char * maximize_active_xpm[] = { +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@++++++++++++#######++++++++++++@", +"@++++++++++++#######++++++++++++@", +"@++++++++++++##+++##++++++++++++@", +"@++++++++++++##+++##++++++++++++@", +"@++++++++++++##+++##++++++++++++@", +"@++++++++++++#######++++++++++++@", +"@++++++++++++#######++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/maximize-toggled-pressed.png b/themes/default-hdpi/maximize-toggled-pressed.png Binary files differindex 34729c55a..d423f23db 100644 --- a/themes/default-hdpi/maximize-toggled-pressed.png +++ b/themes/default-hdpi/maximize-toggled-pressed.png diff --git a/themes/default-hdpi/maximize-toggled-pressed.svg b/themes/default-hdpi/maximize-toggled-pressed.svg index 6ea8bd4a9..118847d07 100644 --- a/themes/default-hdpi/maximize-toggled-pressed.svg +++ b/themes/default-hdpi/maximize-toggled-pressed.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata39" /> + id="metadata38" /> <defs - id="defs37" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview35" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,50 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,10)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/maximize-toggled-pressed.xpm b/themes/default-hdpi/maximize-toggled-pressed.xpm index 75b09906f..f68a44d17 100644 --- a/themes/default-hdpi/maximize-toggled-pressed.xpm +++ b/themes/default-hdpi/maximize-toggled-pressed.xpm @@ -1,47 +1,51 @@ /* XPM */ -static char * maximize_toggled_pressed_xpm[] = { -"33 43 2 1", +static char * maximize_pressed_xpm[] = { +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.............................@.", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@............#######............@", +"@............#######............@", +"@............##...##............@", +"@............##...##............@", +"@............##...##............@", +"@............#######............@", +"@............#######............@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +".@.............................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/menu-active.png b/themes/default-hdpi/menu-active.png Binary files differindex c697caee4..d423f23db 100644 --- a/themes/default-hdpi/menu-active.png +++ b/themes/default-hdpi/menu-active.png diff --git a/themes/default-hdpi/menu-active.svg b/themes/default-hdpi/menu-active.svg index 2a3ec7ba1..addc466b6 100644 --- a/themes/default-hdpi/menu-active.svg +++ b/themes/default-hdpi/menu-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default-hdpi/menu-active.xpm b/themes/default-hdpi/menu-active.xpm index 281a00a80..97bd286de 100644 --- a/themes/default-hdpi/menu-active.xpm +++ b/themes/default-hdpi/menu-active.xpm @@ -2,7 +2,7 @@ static char * menu_active_xpm[] = { "33 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/menu-inactive.png b/themes/default-hdpi/menu-inactive.png Binary files differindex c697caee4..d423f23db 100644 --- a/themes/default-hdpi/menu-inactive.png +++ b/themes/default-hdpi/menu-inactive.png diff --git a/themes/default-hdpi/menu-inactive.svg b/themes/default-hdpi/menu-inactive.svg index 12138c474..c941ff936 100644 --- a/themes/default-hdpi/menu-inactive.svg +++ b/themes/default-hdpi/menu-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default-hdpi/menu-prelight.png b/themes/default-hdpi/menu-prelight.png Binary files differindex c697caee4..d423f23db 100644 --- a/themes/default-hdpi/menu-prelight.png +++ b/themes/default-hdpi/menu-prelight.png diff --git a/themes/default-hdpi/menu-prelight.svg b/themes/default-hdpi/menu-prelight.svg index 5c35767b8..59cf9cf2d 100644 --- a/themes/default-hdpi/menu-prelight.svg +++ b/themes/default-hdpi/menu-prelight.svg @@ -19,9 +19,9 @@ sodipodi:docname="menu-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata25" /> + id="metadata38" /> <defs - id="defs23" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview21" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -157,7 +157,7 @@ inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/menu-prelight.xpm b/themes/default-hdpi/menu-prelight.xpm index 281a00a80..97bd286de 100644 --- a/themes/default-hdpi/menu-prelight.xpm +++ b/themes/default-hdpi/menu-prelight.xpm @@ -2,7 +2,7 @@ static char * menu_active_xpm[] = { "33 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/menu-pressed.png b/themes/default-hdpi/menu-pressed.png Binary files differindex c697caee4..d423f23db 100644 --- a/themes/default-hdpi/menu-pressed.png +++ b/themes/default-hdpi/menu-pressed.png diff --git a/themes/default-hdpi/menu-pressed.svg b/themes/default-hdpi/menu-pressed.svg index fc71e49ef..d2546cdd7 100644 --- a/themes/default-hdpi/menu-pressed.svg +++ b/themes/default-hdpi/menu-pressed.svg @@ -19,9 +19,9 @@ sodipodi:docname="menu-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata25" /> + id="metadata38" /> <defs - id="defs23" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview21" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -157,7 +157,7 @@ inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/menu-pressed.xpm b/themes/default-hdpi/menu-pressed.xpm index 888a3c131..12cffea77 100644 --- a/themes/default-hdpi/menu-pressed.xpm +++ b/themes/default-hdpi/menu-pressed.xpm @@ -2,7 +2,7 @@ static char * menu_pressed_xpm[] = { "33 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/shade-active.png b/themes/default-hdpi/shade-active.png Binary files differindex fd3681ba1..d423f23db 100644 --- a/themes/default-hdpi/shade-active.png +++ b/themes/default-hdpi/shade-active.png diff --git a/themes/default-hdpi/shade-active.svg b/themes/default-hdpi/shade-active.svg index 998937a6d..f0a89dcc1 100644 --- a/themes/default-hdpi/shade-active.svg +++ b/themes/default-hdpi/shade-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="shade-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata35" /> + id="metadata38" /> <defs - id="defs33" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview31" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/shade-active.xpm b/themes/default-hdpi/shade-active.xpm index 355490ab4..32c33bdb9 100644 --- a/themes/default-hdpi/shade-active.xpm +++ b/themes/default-hdpi/shade-active.xpm @@ -1,15 +1,11 @@ /* XPM */ static char * shade_active_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", ".................................", ".................................", ".................................", @@ -29,6 +25,13 @@ static char * shade_active_xpm[] = { ".................................", ".................................", ".................................", +"................@................", +"...............@#@...............", +"..............@###@..............", +".............@#####@.............", +"............@###@###@............", +"............###@.@###............", +"............##@...@##............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/shade-inactive.png b/themes/default-hdpi/shade-inactive.png Binary files differindex c2f8ffb1c..d423f23db 100644 --- a/themes/default-hdpi/shade-inactive.png +++ b/themes/default-hdpi/shade-inactive.png diff --git a/themes/default-hdpi/shade-inactive.svg b/themes/default-hdpi/shade-inactive.svg index 02e604b2a..78e755915 100644 --- a/themes/default-hdpi/shade-inactive.svg +++ b/themes/default-hdpi/shade-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="shade-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata28" /> + id="metadata38" /> <defs - id="defs26" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview24" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(3,9)"> - <path - id="path2620" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/shade-inactive.xpm b/themes/default-hdpi/shade-inactive.xpm index 37ff26a46..6f2db6630 100644 --- a/themes/default-hdpi/shade-inactive.xpm +++ b/themes/default-hdpi/shade-inactive.xpm @@ -1,8 +1,11 @@ /* XPM */ static char * shade_inactive_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", ". c #C0C0FF s inactive_color_2", +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", ".................................", ".................................", ".................................", @@ -22,13 +25,13 @@ static char * shade_inactive_xpm[] = { ".................................", ".................................", ".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"................$................", +"...............$#$...............", +"..............$###$..............", +".............$#####$.............", +"............$###$###$............", +"............###$.$###............", +"............##$...$##............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/shade-prelight.png b/themes/default-hdpi/shade-prelight.png Binary files differindex 9d54d262e..d423f23db 100644 --- a/themes/default-hdpi/shade-prelight.png +++ b/themes/default-hdpi/shade-prelight.png diff --git a/themes/default-hdpi/shade-prelight.svg b/themes/default-hdpi/shade-prelight.svg index f1aba7077..df709d340 100644 --- a/themes/default-hdpi/shade-prelight.svg +++ b/themes/default-hdpi/shade-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/shade-prelight.xpm b/themes/default-hdpi/shade-prelight.xpm index 355490ab4..3671c0c0d 100644 --- a/themes/default-hdpi/shade-prelight.xpm +++ b/themes/default-hdpi/shade-prelight.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * shade_active_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++@+++++++++++++++@", +"@++++++++++++++@#@++++++++++++++@", +"@+++++++++++++@###@+++++++++++++@", +"@++++++++++++@#####@++++++++++++@", +"@+++++++++++@###@###@+++++++++++@", +"@+++++++++++###@+@###+++++++++++@", +"@+++++++++++##@+++@##+++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/shade-pressed.png b/themes/default-hdpi/shade-pressed.png Binary files differindex 81aca08ab..d423f23db 100644 --- a/themes/default-hdpi/shade-pressed.png +++ b/themes/default-hdpi/shade-pressed.png diff --git a/themes/default-hdpi/shade-pressed.svg b/themes/default-hdpi/shade-pressed.svg index 9bec32a1a..d6b67ed92 100644 --- a/themes/default-hdpi/shade-pressed.svg +++ b/themes/default-hdpi/shade-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,46 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,10)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/shade-pressed.xpm b/themes/default-hdpi/shade-pressed.xpm index 0f6676316..253230ca2 100644 --- a/themes/default-hdpi/shade-pressed.xpm +++ b/themes/default-hdpi/shade-pressed.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * shade_pressed_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.............................@.", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............@...............@", +"@..............@#@..............@", +"@.............@###@.............@", +"@............@#####@............@", +"@...........@###@###@...........@", +"@...........###@.@###...........@", +"@...........##@...@##...........@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +".@.............................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/shade-toggled-active.png b/themes/default-hdpi/shade-toggled-active.png Binary files differindex d5afc7e34..d423f23db 100644 --- a/themes/default-hdpi/shade-toggled-active.png +++ b/themes/default-hdpi/shade-toggled-active.png diff --git a/themes/default-hdpi/shade-toggled-active.svg b/themes/default-hdpi/shade-toggled-active.svg index b507d6bc4..ef2b4103f 100644 --- a/themes/default-hdpi/shade-toggled-active.svg +++ b/themes/default-hdpi/shade-toggled-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="shade-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata35" /> + id="metadata38" /> <defs - id="defs33" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview31" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,9)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/shade-toggled-active.xpm b/themes/default-hdpi/shade-toggled-active.xpm index 751b983a7..08f923702 100644 --- a/themes/default-hdpi/shade-toggled-active.xpm +++ b/themes/default-hdpi/shade-toggled-active.xpm @@ -1,15 +1,11 @@ /* XPM */ -static char * shade_toggled_active_xpm[] = { -"33 43 2 1", +static char * shade_active_xpm[] = { +"33 43 5 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", ".................................", ".................................", ".................................", @@ -30,6 +26,13 @@ static char * shade_toggled_active_xpm[] = { ".................................", ".................................", ".................................", +"............##@...@##............", +"............###@.@###............", +"............@###@###@............", +".............@#####@.............", +"..............@###@..............", +"...............@#@...............", +"................@................", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/shade-toggled-inactive.png b/themes/default-hdpi/shade-toggled-inactive.png Binary files differindex a621a0664..d423f23db 100644 --- a/themes/default-hdpi/shade-toggled-inactive.png +++ b/themes/default-hdpi/shade-toggled-inactive.png diff --git a/themes/default-hdpi/shade-toggled-inactive.svg b/themes/default-hdpi/shade-toggled-inactive.svg index 1b8e63124..ec01cf397 100644 --- a/themes/default-hdpi/shade-toggled-inactive.svg +++ b/themes/default-hdpi/shade-toggled-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="shade-toggled-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata28" /> + id="metadata38" /> <defs - id="defs26" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview24" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(3,9)"> - <path - id="path2620" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/shade-toggled-inactive.xpm b/themes/default-hdpi/shade-toggled-inactive.xpm index eec52d9b2..cd40d2d98 100644 --- a/themes/default-hdpi/shade-toggled-inactive.xpm +++ b/themes/default-hdpi/shade-toggled-inactive.xpm @@ -1,8 +1,11 @@ /* XPM */ -static char * shade_toggled_inactive_xpm[] = { -"33 43 2 1", +static char * shade_inactive_xpm[] = { +"33 43 5 1", " c None", ". c #C0C0FF s inactive_color_2", +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", ".................................", ".................................", ".................................", @@ -23,13 +26,13 @@ static char * shade_toggled_inactive_xpm[] = { ".................................", ".................................", ".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"............##$...$##............", +"............###$.$###............", +"............$###$###$............", +".............$#####$.............", +"..............$###$..............", +"...............$#$...............", +"................$................", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/shade-toggled-prelight.png b/themes/default-hdpi/shade-toggled-prelight.png Binary files differindex c6f6becd8..d423f23db 100644 --- a/themes/default-hdpi/shade-toggled-prelight.png +++ b/themes/default-hdpi/shade-toggled-prelight.png diff --git a/themes/default-hdpi/shade-toggled-prelight.svg b/themes/default-hdpi/shade-toggled-prelight.svg index a1ab0166d..1394d25f2 100644 --- a/themes/default-hdpi/shade-toggled-prelight.svg +++ b/themes/default-hdpi/shade-toggled-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,9)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/shade-toggled-prelight.xpm b/themes/default-hdpi/shade-toggled-prelight.xpm index 751b983a7..950b12b13 100644 --- a/themes/default-hdpi/shade-toggled-prelight.xpm +++ b/themes/default-hdpi/shade-toggled-prelight.xpm @@ -1,47 +1,51 @@ /* XPM */ -static char * shade_toggled_active_xpm[] = { -"33 43 2 1", +static char * shade_active_xpm[] = { +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++##@+++@##+++++++++++@", +"@+++++++++++###@+@###+++++++++++@", +"@+++++++++++@###@###@+++++++++++@", +"@++++++++++++@#####@++++++++++++@", +"@+++++++++++++@###@+++++++++++++@", +"@++++++++++++++@#@++++++++++++++@", +"@+++++++++++++++@+++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/shade-toggled-pressed.png b/themes/default-hdpi/shade-toggled-pressed.png Binary files differindex f24215699..d423f23db 100644 --- a/themes/default-hdpi/shade-toggled-pressed.png +++ b/themes/default-hdpi/shade-toggled-pressed.png diff --git a/themes/default-hdpi/shade-toggled-pressed.svg b/themes/default-hdpi/shade-toggled-pressed.svg index 43666bec2..cf1524eb5 100644 --- a/themes/default-hdpi/shade-toggled-pressed.svg +++ b/themes/default-hdpi/shade-toggled-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,46 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,10)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/shade-toggled-pressed.xpm b/themes/default-hdpi/shade-toggled-pressed.xpm index 4543247e6..f3f163023 100644 --- a/themes/default-hdpi/shade-toggled-pressed.xpm +++ b/themes/default-hdpi/shade-toggled-pressed.xpm @@ -1,47 +1,51 @@ /* XPM */ -static char * shade_toggled_pressed_xpm[] = { -"33 43 2 1", +static char * shade_pressed_xpm[] = { +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.............................@.", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...........##@...@##...........@", +"@...........###@.@###...........@", +"@...........@###@###@...........@", +"@............@#####@............@", +"@.............@###@.............@", +"@..............@#@..............@", +"@...............@...............@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +".@.............................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/stick-active.png b/themes/default-hdpi/stick-active.png Binary files differindex 3b3dc66eb..d423f23db 100644 --- a/themes/default-hdpi/stick-active.png +++ b/themes/default-hdpi/stick-active.png diff --git a/themes/default-hdpi/stick-active.svg b/themes/default-hdpi/stick-active.svg index bc1c6e914..cc17bc5a8 100644 --- a/themes/default-hdpi/stick-active.svg +++ b/themes/default-hdpi/stick-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata35" /> + id="metadata38" /> <defs - id="defs33" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview31" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/stick-active.xpm b/themes/default-hdpi/stick-active.xpm index 7608eb96c..821c22483 100644 --- a/themes/default-hdpi/stick-active.xpm +++ b/themes/default-hdpi/stick-active.xpm @@ -1,17 +1,11 @@ /* XPM */ static char * stick_active_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", ".................................", ".................................", ".................................", @@ -30,6 +24,15 @@ static char * stick_active_xpm[] = { ".................................", ".................................", ".................................", +"...............@#@...............", +"...............###...............", +"...............###...............", +"............@#######@............", +"............#########............", +"............@#######@............", +"...............###...............", +"...............###...............", +"...............@#@...............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/stick-inactive.png b/themes/default-hdpi/stick-inactive.png Binary files differindex 9b62596f3..d423f23db 100644 --- a/themes/default-hdpi/stick-inactive.png +++ b/themes/default-hdpi/stick-inactive.png diff --git a/themes/default-hdpi/stick-inactive.svg b/themes/default-hdpi/stick-inactive.svg index 7780f51e4..acdb926fc 100644 --- a/themes/default-hdpi/stick-inactive.svg +++ b/themes/default-hdpi/stick-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata28" /> + id="metadata38" /> <defs - id="defs26" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview24" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(3,9)"> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/stick-inactive.xpm b/themes/default-hdpi/stick-inactive.xpm index 55506e681..805c5e604 100644 --- a/themes/default-hdpi/stick-inactive.xpm +++ b/themes/default-hdpi/stick-inactive.xpm @@ -1,8 +1,11 @@ /* XPM */ static char * stick_inactive_xpm[] = { -"33 43 2 1", +"33 43 5 1", " c None", ". c #C0C0FF s inactive_color_2", +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", ".................................", ".................................", ".................................", @@ -21,15 +24,15 @@ static char * stick_inactive_xpm[] = { ".................................", ".................................", ".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"...............$#$...............", +"...............###...............", +"...............###...............", +"............$#######$............", +"............#########............", +"............$#######$............", +"...............###...............", +"...............###...............", +"...............$#$...............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/stick-prelight.png b/themes/default-hdpi/stick-prelight.png Binary files differindex d7670a270..d423f23db 100644 --- a/themes/default-hdpi/stick-prelight.png +++ b/themes/default-hdpi/stick-prelight.png diff --git a/themes/default-hdpi/stick-prelight.svg b/themes/default-hdpi/stick-prelight.svg index 8227b054e..dcaec4783 100644 --- a/themes/default-hdpi/stick-prelight.svg +++ b/themes/default-hdpi/stick-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/stick-prelight.xpm b/themes/default-hdpi/stick-prelight.xpm index 7608eb96c..2ea82c750 100644 --- a/themes/default-hdpi/stick-prelight.xpm +++ b/themes/default-hdpi/stick-prelight.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * stick_active_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@++++++++++++++@#@++++++++++++++@", +"@++++++++++++++###++++++++++++++@", +"@++++++++++++++###++++++++++++++@", +"@+++++++++++@#######@+++++++++++@", +"@+++++++++++#########+++++++++++@", +"@+++++++++++@#######@+++++++++++@", +"@++++++++++++++###++++++++++++++@", +"@++++++++++++++###++++++++++++++@", +"@++++++++++++++@#@++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/stick-pressed.png b/themes/default-hdpi/stick-pressed.png Binary files differindex 144adcf90..d423f23db 100644 --- a/themes/default-hdpi/stick-pressed.png +++ b/themes/default-hdpi/stick-pressed.png diff --git a/themes/default-hdpi/stick-pressed.svg b/themes/default-hdpi/stick-pressed.svg index 51a8ce2a2..c0e3896c8 100644 --- a/themes/default-hdpi/stick-pressed.svg +++ b/themes/default-hdpi/stick-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,46 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,10)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/stick-pressed.xpm b/themes/default-hdpi/stick-pressed.xpm index 78f5cc711..31b81f454 100644 --- a/themes/default-hdpi/stick-pressed.xpm +++ b/themes/default-hdpi/stick-pressed.xpm @@ -1,47 +1,51 @@ /* XPM */ static char * stick_pressed_xpm[] = { -"33 43 2 1", +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.............................@.", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@..............@#@..............@", +"@..............###..............@", +"@..............###..............@", +"@...........@#######@...........@", +"@...........#########...........@", +"@...........@#######@...........@", +"@..............###..............@", +"@..............###..............@", +"@..............@#@..............@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +".@.............................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/stick-toggled-active.png b/themes/default-hdpi/stick-toggled-active.png Binary files differindex de8757a04..d423f23db 100644 --- a/themes/default-hdpi/stick-toggled-active.png +++ b/themes/default-hdpi/stick-toggled-active.png diff --git a/themes/default-hdpi/stick-toggled-active.svg b/themes/default-hdpi/stick-toggled-active.svg index 0a6e7facd..d8e9d6877 100644 --- a/themes/default-hdpi/stick-toggled-active.svg +++ b/themes/default-hdpi/stick-toggled-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata38" /> <defs - id="defs34" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,37 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="6" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/stick-toggled-active.xpm b/themes/default-hdpi/stick-toggled-active.xpm index a8582a02f..247ebd022 100644 --- a/themes/default-hdpi/stick-toggled-active.xpm +++ b/themes/default-hdpi/stick-toggled-active.xpm @@ -1,17 +1,11 @@ /* XPM */ -static char * stick_toggled_active_xpm[] = { -"33 43 2 1", +static char * stick_active_xpm[] = { +"33 43 5 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", ".................................", ".................................", ".................................", @@ -30,6 +24,15 @@ static char * stick_toggled_active_xpm[] = { ".................................", ".................................", ".................................", +"...............###...............", +"...............###...............", +"...............@#@...............", +"............##$.$.@##............", +"............###@.@###............", +"............##@.@.@##............", +"...............@#@...............", +"...............###...............", +"...............###...............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/stick-toggled-inactive.png b/themes/default-hdpi/stick-toggled-inactive.png Binary files differindex 96e32d7c5..d423f23db 100644 --- a/themes/default-hdpi/stick-toggled-inactive.png +++ b/themes/default-hdpi/stick-toggled-inactive.png diff --git a/themes/default-hdpi/stick-toggled-inactive.svg b/themes/default-hdpi/stick-toggled-inactive.svg index d0d9aee3f..b1c95519d 100644 --- a/themes/default-hdpi/stick-toggled-inactive.svg +++ b/themes/default-hdpi/stick-toggled-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata38" /> <defs - id="defs27" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,34 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(3,9)"> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="6" - sodipodi:cx="6" - id="path2202" - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/stick-toggled-inactive.xpm b/themes/default-hdpi/stick-toggled-inactive.xpm index 4f83d7325..f132c0cad 100644 --- a/themes/default-hdpi/stick-toggled-inactive.xpm +++ b/themes/default-hdpi/stick-toggled-inactive.xpm @@ -1,8 +1,11 @@ /* XPM */ -static char * stick_toggled_inactive_xpm[] = { -"33 43 2 1", +static char * stick_inactive_xpm[] = { +"33 43 5 1", " c None", ". c #C0C0FF s inactive_color_2", +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", ".................................", ".................................", ".................................", @@ -21,15 +24,15 @@ static char * stick_toggled_inactive_xpm[] = { ".................................", ".................................", ".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"...............###...............", +"...............###...............", +"...............$#$...............", +"............##$.$.$##............", +"............###$.$###............", +"............##$.$.$##............", +"...............$#$...............", +"...............###...............", +"...............###...............", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/stick-toggled-prelight.png b/themes/default-hdpi/stick-toggled-prelight.png Binary files differindex ba36054cc..d423f23db 100644 --- a/themes/default-hdpi/stick-toggled-prelight.png +++ b/themes/default-hdpi/stick-toggled-prelight.png diff --git a/themes/default-hdpi/stick-toggled-prelight.svg b/themes/default-hdpi/stick-toggled-prelight.svg index f812deec6..857e0b169 100644 --- a/themes/default-hdpi/stick-toggled-prelight.svg +++ b/themes/default-hdpi/stick-toggled-prelight.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata39" /> + id="metadata38" /> <defs - id="defs37" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview35" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,37 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="0" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/stick-toggled-prelight.xpm b/themes/default-hdpi/stick-toggled-prelight.xpm index a8582a02f..bcf40c826 100644 --- a/themes/default-hdpi/stick-toggled-prelight.xpm +++ b/themes/default-hdpi/stick-toggled-prelight.xpm @@ -1,47 +1,51 @@ /* XPM */ -static char * stick_toggled_active_xpm[] = { -"33 43 2 1", +static char * stick_active_xpm[] = { +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..$$$$$$$$$$$$$$$$$$$$$$$$$$$$$..", +".$+++++++++++++++++++++++++++++$.", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$++++++++++++++###++++++++++++++$", +"$++++++++++++++###++++++++++++++$", +"$++++++++++++++@#@++++++++++++++$", +"$+++++++++++##@+@+@##+++++++++++$", +"$+++++++++++###@+@###+++++++++++$", +"$+++++++++++##@+@+@##+++++++++++$", +"$++++++++++++++@#@++++++++++++++$", +"$++++++++++++++###++++++++++++++$", +"$++++++++++++++###++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +"$+++++++++++++++++++++++++++++++$", +".$+++++++++++++++++++++++++++++$.", +"..$$$$$$$$$$$$$$$$$$$$$$$$$$$$$..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/stick-toggled-pressed.png b/themes/default-hdpi/stick-toggled-pressed.png Binary files differindex ad4801a2b..d423f23db 100644 --- a/themes/default-hdpi/stick-toggled-pressed.png +++ b/themes/default-hdpi/stick-toggled-pressed.png diff --git a/themes/default-hdpi/stick-toggled-pressed.svg b/themes/default-hdpi/stick-toggled-pressed.svg index d6c5d7ff3..f67b1ac85 100644 --- a/themes/default-hdpi/stick-toggled-pressed.svg +++ b/themes/default-hdpi/stick-toggled-pressed.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata39" /> + id="metadata38" /> <defs - id="defs37" /> + id="defs36" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview35" /> + id="namedview34" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,55 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,10)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="0" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/stick-toggled-pressed.xpm b/themes/default-hdpi/stick-toggled-pressed.xpm index 3c8e57e55..e13de8cc6 100644 --- a/themes/default-hdpi/stick-toggled-pressed.xpm +++ b/themes/default-hdpi/stick-toggled-pressed.xpm @@ -1,47 +1,51 @@ /* XPM */ -static char * stick_toggled_pressed_xpm[] = { -"33 43 2 1", +static char * stick_pressed_xpm[] = { +"33 43 6 1", " c None", -". c #C0C0FF s active_color_2", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", -".................................", +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".................................", +".................................", +".................................", +".................................", +".................................", +".................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.............................@.", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@..............###..............@", +"@..............###..............@", +"@..............@#@..............@", +"@...........##@.@.@##...........@", +"@...........###@.@###...........@", +"@...........##@.@.@##...........@", +"@..............@#@..............@", +"@..............###..............@", +"@..............###..............@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +"@...............................@", +".@.............................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", ".................................", ".................................", ".................................", diff --git a/themes/default-hdpi/title-1-active.png b/themes/default-hdpi/title-1-active.png Binary files differindex bbf63598a..8209447e8 100644 --- a/themes/default-hdpi/title-1-active.png +++ b/themes/default-hdpi/title-1-active.png diff --git a/themes/default-hdpi/title-1-active.svg b/themes/default-hdpi/title-1-active.svg index f8a50d277..43e66262a 100644 --- a/themes/default-hdpi/title-1-active.svg +++ b/themes/default-hdpi/title-1-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-hdpi/title-1-active.xpm b/themes/default-hdpi/title-1-active.xpm index bb54dcb99..9f0e8a056 100644 --- a/themes/default-hdpi/title-1-active.xpm +++ b/themes/default-hdpi/title-1-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "6 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-hdpi/title-1-inactive.png b/themes/default-hdpi/title-1-inactive.png Binary files differindex bbf63598a..8209447e8 100644 --- a/themes/default-hdpi/title-1-inactive.png +++ b/themes/default-hdpi/title-1-inactive.png diff --git a/themes/default-hdpi/title-1-inactive.svg b/themes/default-hdpi/title-1-inactive.svg index ac7f4dc05..57695a557 100644 --- a/themes/default-hdpi/title-1-inactive.svg +++ b/themes/default-hdpi/title-1-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-hdpi/title-2-active.png b/themes/default-hdpi/title-2-active.png Binary files differindex bbf63598a..8209447e8 100644 --- a/themes/default-hdpi/title-2-active.png +++ b/themes/default-hdpi/title-2-active.png diff --git a/themes/default-hdpi/title-2-active.svg b/themes/default-hdpi/title-2-active.svg index ca0f40a35..1d29b6f69 100644 --- a/themes/default-hdpi/title-2-active.svg +++ b/themes/default-hdpi/title-2-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-hdpi/title-2-active.xpm b/themes/default-hdpi/title-2-active.xpm index bb54dcb99..9f0e8a056 100644 --- a/themes/default-hdpi/title-2-active.xpm +++ b/themes/default-hdpi/title-2-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "6 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-hdpi/title-2-inactive.png b/themes/default-hdpi/title-2-inactive.png Binary files differindex bbf63598a..8209447e8 100644 --- a/themes/default-hdpi/title-2-inactive.png +++ b/themes/default-hdpi/title-2-inactive.png diff --git a/themes/default-hdpi/title-2-inactive.svg b/themes/default-hdpi/title-2-inactive.svg index 854b13bd4..7a6ed38d7 100644 --- a/themes/default-hdpi/title-2-inactive.svg +++ b/themes/default-hdpi/title-2-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-hdpi/title-3-active.png b/themes/default-hdpi/title-3-active.png Binary files differindex bbf63598a..8209447e8 100644 --- a/themes/default-hdpi/title-3-active.png +++ b/themes/default-hdpi/title-3-active.png diff --git a/themes/default-hdpi/title-3-active.svg b/themes/default-hdpi/title-3-active.svg index be5c68708..aa0ffcdcf 100644 --- a/themes/default-hdpi/title-3-active.svg +++ b/themes/default-hdpi/title-3-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-hdpi/title-3-active.xpm b/themes/default-hdpi/title-3-active.xpm index bb54dcb99..9f0e8a056 100644 --- a/themes/default-hdpi/title-3-active.xpm +++ b/themes/default-hdpi/title-3-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "6 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-hdpi/title-3-inactive.png b/themes/default-hdpi/title-3-inactive.png Binary files differindex bbf63598a..8209447e8 100644 --- a/themes/default-hdpi/title-3-inactive.png +++ b/themes/default-hdpi/title-3-inactive.png diff --git a/themes/default-hdpi/title-3-inactive.svg b/themes/default-hdpi/title-3-inactive.svg index 02d9cfbb0..c013aa014 100644 --- a/themes/default-hdpi/title-3-inactive.svg +++ b/themes/default-hdpi/title-3-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-hdpi/title-4-active.png b/themes/default-hdpi/title-4-active.png Binary files differindex b966ef8b4..8209447e8 100644 --- a/themes/default-hdpi/title-4-active.png +++ b/themes/default-hdpi/title-4-active.png diff --git a/themes/default-hdpi/title-4-active.svg b/themes/default-hdpi/title-4-active.svg index f8a7a9cf2..30a6c6d64 100644 --- a/themes/default-hdpi/title-4-active.svg +++ b/themes/default-hdpi/title-4-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="title-4-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata31" /> + id="metadata25" /> <defs - id="defs29" /> + id="defs23" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview27" /> + id="namedview21" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,8 +156,8 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/title-4-active.xpm b/themes/default-hdpi/title-4-active.xpm index bb54dcb99..9f0e8a056 100644 --- a/themes/default-hdpi/title-4-active.xpm +++ b/themes/default-hdpi/title-4-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "6 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-hdpi/title-4-inactive.png b/themes/default-hdpi/title-4-inactive.png Binary files differindex bbf63598a..8209447e8 100644 --- a/themes/default-hdpi/title-4-inactive.png +++ b/themes/default-hdpi/title-4-inactive.png diff --git a/themes/default-hdpi/title-4-inactive.svg b/themes/default-hdpi/title-4-inactive.svg index c39ce206d..14594aba2 100644 --- a/themes/default-hdpi/title-4-inactive.svg +++ b/themes/default-hdpi/title-4-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-hdpi/title-5-active.png b/themes/default-hdpi/title-5-active.png Binary files differindex 7cf3ccf6d..8209447e8 100644 --- a/themes/default-hdpi/title-5-active.png +++ b/themes/default-hdpi/title-5-active.png diff --git a/themes/default-hdpi/title-5-active.svg b/themes/default-hdpi/title-5-active.svg index 41079093e..468ca25b5 100644 --- a/themes/default-hdpi/title-5-active.svg +++ b/themes/default-hdpi/title-5-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="title-5-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata31" /> + id="metadata25" /> <defs - id="defs29" /> + id="defs23" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview27" /> + id="namedview21" /> <g transform="scale(1.5)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,8 +156,8 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 7.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default-hdpi/title-5-active.xpm b/themes/default-hdpi/title-5-active.xpm index bb54dcb99..9f0e8a056 100644 --- a/themes/default-hdpi/title-5-active.xpm +++ b/themes/default-hdpi/title-5-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "6 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-hdpi/title-5-inactive.png b/themes/default-hdpi/title-5-inactive.png Binary files differindex bbf63598a..8209447e8 100644 --- a/themes/default-hdpi/title-5-inactive.png +++ b/themes/default-hdpi/title-5-inactive.png diff --git a/themes/default-hdpi/title-5-inactive.svg b/themes/default-hdpi/title-5-inactive.svg index 4bd9d10c6..c477259c0 100644 --- a/themes/default-hdpi/title-5-inactive.svg +++ b/themes/default-hdpi/title-5-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-hdpi/top-left-active.png b/themes/default-hdpi/top-left-active.png Binary files differindex 91b040487..e7f829ca5 100644 --- a/themes/default-hdpi/top-left-active.png +++ b/themes/default-hdpi/top-left-active.png diff --git a/themes/default-hdpi/top-left-active.svg b/themes/default-hdpi/top-left-active.svg index f094b7dfc..8388786ef 100644 --- a/themes/default-hdpi/top-left-active.svg +++ b/themes/default-hdpi/top-left-active.svg @@ -123,7 +123,7 @@ <path id="path6057" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" - d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " /> + d="M 8,1 L 6,1 C 6,1 1.5,1.5 1,6 L 1,26 L 8,26 L 8,26 L 8,1 z " /> </g> <g inkscape:label="hilight" @@ -132,11 +132,14 @@ <path id="path6061" d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z " - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z " - id="path1884" /> + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g style="display:inline" diff --git a/themes/default-hdpi/top-left-active.xpm b/themes/default-hdpi/top-left-active.xpm index b5d91c987..c6b382f21 100644 --- a/themes/default-hdpi/top-left-active.xpm +++ b/themes/default-hdpi/top-left-active.xpm @@ -2,7 +2,7 @@ static char * top_left_active_xpm[] = { "12 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", " .....", " .......", " .........", diff --git a/themes/default-hdpi/top-left-inactive.png b/themes/default-hdpi/top-left-inactive.png Binary files differindex 91b040487..e7f829ca5 100644 --- a/themes/default-hdpi/top-left-inactive.png +++ b/themes/default-hdpi/top-left-inactive.png diff --git a/themes/default-hdpi/top-left-inactive.svg b/themes/default-hdpi/top-left-inactive.svg index c0b026f97..02cdc1c2e 100644 --- a/themes/default-hdpi/top-left-inactive.svg +++ b/themes/default-hdpi/top-left-inactive.svg @@ -123,7 +123,7 @@ <path id="path6057" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" - d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " /> + d="M 8,1 L 6,1 C 6,1 1.5,1.5 1,6 L 1,26 L 8,26 L 8,26 L 8,1 z " /> </g> <g inkscape:label="hilight" @@ -132,11 +132,14 @@ <path id="path6061" d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z " - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z " - id="path1884" /> + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g style="display:inline" diff --git a/themes/default-hdpi/top-right-active.png b/themes/default-hdpi/top-right-active.png Binary files differindex d875983cd..245762ab3 100644 --- a/themes/default-hdpi/top-right-active.png +++ b/themes/default-hdpi/top-right-active.png diff --git a/themes/default-hdpi/top-right-active.svg b/themes/default-hdpi/top-right-active.svg index 48c9d9bbf..c24e6c92c 100644 --- a/themes/default-hdpi/top-right-active.svg +++ b/themes/default-hdpi/top-right-active.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,7 +156,7 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 6.5,26.5" id="path6989" /> </g> diff --git a/themes/default-hdpi/top-right-active.xpm b/themes/default-hdpi/top-right-active.xpm index 238605512..c1011651e 100644 --- a/themes/default-hdpi/top-right-active.xpm +++ b/themes/default-hdpi/top-right-active.xpm @@ -2,7 +2,7 @@ static char * top_right_active_xpm[] = { "12 43 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "..... ", "....... ", "......... ", diff --git a/themes/default-hdpi/top-right-inactive.png b/themes/default-hdpi/top-right-inactive.png Binary files differindex c9cd58546..245762ab3 100644 --- a/themes/default-hdpi/top-right-inactive.png +++ b/themes/default-hdpi/top-right-inactive.png diff --git a/themes/default-hdpi/top-right-inactive.svg b/themes/default-hdpi/top-right-inactive.svg index 7b10500f1..4dfae554e 100644 --- a/themes/default-hdpi/top-right-inactive.svg +++ b/themes/default-hdpi/top-right-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="top-right-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata25" /> + id="metadata31" /> <defs - id="defs23" /> + id="defs29" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview21" /> + id="namedview27" /> <g transform="scale(1.5)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z " + d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,13 +130,16 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z " id="path6061" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z " - id="path1884" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g inkscape:label="Border" @@ -154,7 +157,7 @@ inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 5.5,28.5" + d="M 0.5,26.5 L 6.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/bottom-left-active.png b/themes/default-xhdpi/bottom-left-active.png Binary files differindex a56611895..6d799418a 100644 --- a/themes/default-xhdpi/bottom-left-active.png +++ b/themes/default-xhdpi/bottom-left-active.png diff --git a/themes/default-xhdpi/bottom-left-inactive.png b/themes/default-xhdpi/bottom-left-inactive.png Binary files differindex a56611895..6d799418a 100644 --- a/themes/default-xhdpi/bottom-left-inactive.png +++ b/themes/default-xhdpi/bottom-left-inactive.png diff --git a/themes/default-xhdpi/bottom-right-active.png b/themes/default-xhdpi/bottom-right-active.png Binary files differindex 1aeef2bc0..80ec7f8cc 100644 --- a/themes/default-xhdpi/bottom-right-active.png +++ b/themes/default-xhdpi/bottom-right-active.png diff --git a/themes/default-xhdpi/bottom-right-inactive.png b/themes/default-xhdpi/bottom-right-inactive.png Binary files differindex 1aeef2bc0..80ec7f8cc 100644 --- a/themes/default-xhdpi/bottom-right-inactive.png +++ b/themes/default-xhdpi/bottom-right-inactive.png diff --git a/themes/default-xhdpi/close-active.png b/themes/default-xhdpi/close-active.png Binary files differindex a6953a287..4a02448a5 100644 --- a/themes/default-xhdpi/close-active.png +++ b/themes/default-xhdpi/close-active.png diff --git a/themes/default-xhdpi/close-active.svg b/themes/default-xhdpi/close-active.svg index 308b4df8f..8548700a3 100644 --- a/themes/default-xhdpi/close-active.svg +++ b/themes/default-xhdpi/close-active.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,40 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,9)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/close-active.xpm b/themes/default-xhdpi/close-active.xpm index 642809495..14898cda5 100644 --- a/themes/default-xhdpi/close-active.xpm +++ b/themes/default-xhdpi/close-active.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * close_active_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...............##@.......@##...............", +"...............###@.....@###...............", +"...............@###@...@###@...............", +"................@###@.@###@................", +".................@###@###@.................", +"..................@#####@..................", +"...................@###@...................", +"..................@#####@..................", +".................@###@###@.................", +"................@###@.@###@................", +"...............@###@...@###@...............", +"...............###@.....@###...............", +"...............##@.......@##...............", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/close-inactive b/themes/default-xhdpi/close-inactive new file mode 100644 index 000000000..8548700a3 --- /dev/null +++ b/themes/default-xhdpi/close-inactive @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="44" + height="58" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.48.5 r10040" + version="1.0" + sodipodi:docname="close-active.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <metadata + id="metadata39" /> + <defs + id="defs37" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview35" /> + <g + transform="scale(2)" + id="g3"> + <defs + id="defs4"> + <linearGradient + id="linearGradient1886"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop1888" /> + <stop + style="stop-color:white;stop-opacity:0.15;" + offset="1" + id="stop1890" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1886" + id="linearGradient1892" + x1="0" + y1="1" + x2="0" + y2="18" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1,0,0)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="white" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="10" + inkscape:cx="0" + inkscape:cy="0" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:grid-points="true" + gridtolerance="0.5px" + guidetolerance="1px" + inkscape:window-width="640" + inkscape:window-height="400" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:guide-bbox="true" + inkscape:guide-points="false" + showguides="true"> + <inkscape:grid + id="GridFromPre046Settings" + type="xygrid" + originx="0px" + originy="0px" + spacingx="1px" + spacingy="1px" + color="#3f3fff" + empcolor="#3f3fff" + opacity="0.15" + empopacity="0.38" + empspacing="5" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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>Title</dc:title> + <dc:creator> + <cc:Agent> + <dc:title>Olivier Fourdan</dc:title> + </cc:Agent> + </dc:creator> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Grad" + style="display:inline"> + <path + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + id="path6057" /> + </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="hilight"> + <path + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + id="path6061" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="22" + height="18" + x="0" + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> + <path + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 21.5,0.5" + id="path6059" /> + </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 21.5,26.5" + id="path6989" /> + </g> + </g> +</svg> diff --git a/themes/default-xhdpi/close-inactive.png b/themes/default-xhdpi/close-inactive.png Binary files differindex 2af1e1c8d..4a02448a5 100644 --- a/themes/default-xhdpi/close-inactive.png +++ b/themes/default-xhdpi/close-inactive.png diff --git a/themes/default-xhdpi/close-inactive.svg b/themes/default-xhdpi/close-inactive.svg index 2b6beff5e..3b37bfad3 100644 --- a/themes/default-xhdpi/close-inactive.svg +++ b/themes/default-xhdpi/close-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="close-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata30" /> + id="metadata39" /> <defs - id="defs28" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview26" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,28 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(3,9)"> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/close-inactive.xpm b/themes/default-xhdpi/close-inactive.xpm index 56192f826..ae9b24d15 100644 --- a/themes/default-xhdpi/close-inactive.xpm +++ b/themes/default-xhdpi/close-inactive.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * close_inactive_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...............##$.......$##...............", +"...............###$.....$###...............", +"...............$###$...$###$...............", +"................$###$.$###$................", +".................$###$###$.................", +"..................$#####$..................", +"...................$###$...................", +"..................$#####$..................", +".................$###$###$.................", +"................$###$.$###$................", +"...............$###$...$###$...............", +"...............###$.....$###...............", +"...............##$.......$##...............", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/close-prelight.png b/themes/default-xhdpi/close-prelight.png Binary files differindex 3845776e9..4a02448a5 100644 --- a/themes/default-xhdpi/close-prelight.png +++ b/themes/default-xhdpi/close-prelight.png diff --git a/themes/default-xhdpi/close-prelight.svg b/themes/default-xhdpi/close-prelight.svg index 84067496c..64a788dee 100644 --- a/themes/default-xhdpi/close-prelight.svg +++ b/themes/default-xhdpi/close-prelight.svg @@ -19,9 +19,9 @@ sodipodi:docname="close-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata42" /> + id="metadata39" /> <defs - id="defs40" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview38" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,40 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,9)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/close-prelight.xpm b/themes/default-xhdpi/close-prelight.xpm index 642809495..852386528 100644 --- a/themes/default-xhdpi/close-prelight.xpm +++ b/themes/default-xhdpi/close-prelight.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * close_active_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@++++++++++++++##@+++++++@##++++++++++++++@", +"@++++++++++++++###@+++++@###++++++++++++++@", +"@++++++++++++++@###@+++@###@++++++++++++++@", +"@+++++++++++++++@###@+@###@+++++++++++++++@", +"@++++++++++++++++@###@###@++++++++++++++++@", +"@+++++++++++++++++@#####@+++++++++++++++++@", +"@++++++++++++++++++@###@++++++++++++++++++@", +"@+++++++++++++++++@#####@+++++++++++++++++@", +"@++++++++++++++++@###@###@++++++++++++++++@", +"@+++++++++++++++@###@+@###@+++++++++++++++@", +"@++++++++++++++@###@+++@###@++++++++++++++@", +"@++++++++++++++###@+++++@###++++++++++++++@", +"@++++++++++++++##@+++++++@##++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/close-pressed.png b/themes/default-xhdpi/close-pressed.png Binary files differindex ec600546a..4a02448a5 100644 --- a/themes/default-xhdpi/close-pressed.png +++ b/themes/default-xhdpi/close-pressed.png diff --git a/themes/default-xhdpi/close-pressed.svg b/themes/default-xhdpi/close-pressed.svg index 3f41b5367..245e84c26 100644 --- a/themes/default-xhdpi/close-pressed.svg +++ b/themes/default-xhdpi/close-pressed.svg @@ -19,9 +19,9 @@ sodipodi:docname="close-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata42" /> + id="metadata39" /> <defs - id="defs40" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview38" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,58 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,10)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/close-pressed.xpm b/themes/default-xhdpi/close-pressed.xpm index 442257b23..e8801ac10 100644 --- a/themes/default-xhdpi/close-pressed.xpm +++ b/themes/default-xhdpi/close-pressed.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * close_pressed_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.......................................@.", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@..............##@.......@##..............@", +"@..............###@.....@###..............@", +"@..............@###@...@###@..............@", +"@...............@###@.@###@...............@", +"@................@###@###@................@", +"@.................@#####@.................@", +"@..................@###@..................@", +"@.................@#####@.................@", +"@................@###@###@................@", +"@...............@###@.@###@...............@", +"@..............@###@...@###@..............@", +"@..............###@.....@###..............@", +"@..............##@.......@##..............@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +".@.......................................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/hide-active.png b/themes/default-xhdpi/hide-active.png Binary files differindex 76ec20f7f..4a02448a5 100644 --- a/themes/default-xhdpi/hide-active.png +++ b/themes/default-xhdpi/hide-active.png diff --git a/themes/default-xhdpi/hide-active.svg b/themes/default-xhdpi/hide-active.svg index feaefdaef..2b7984cb9 100644 --- a/themes/default-xhdpi/hide-active.svg +++ b/themes/default-xhdpi/hide-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="hide-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,34 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/hide-active.xpm b/themes/default-xhdpi/hide-active.xpm index 90ce5a4a7..2a3b1cf2c 100644 --- a/themes/default-xhdpi/hide-active.xpm +++ b/themes/default-xhdpi/hide-active.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * hide_active_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...............#############...............", +"...............#############...............", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/hide-inactive.png b/themes/default-xhdpi/hide-inactive.png Binary files differindex e2d2d3f60..4a02448a5 100644 --- a/themes/default-xhdpi/hide-inactive.png +++ b/themes/default-xhdpi/hide-inactive.png diff --git a/themes/default-xhdpi/hide-inactive.svg b/themes/default-xhdpi/hide-inactive.svg index f184cab43..5d1af7441 100644 --- a/themes/default-xhdpi/hide-inactive.svg +++ b/themes/default-xhdpi/hide-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="hide-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata39" /> <defs - id="defs27" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,28 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(3,9)"> - <rect - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/hide-inactive.xpm b/themes/default-xhdpi/hide-inactive.xpm index 426b66d4d..b8bf9e24f 100644 --- a/themes/default-xhdpi/hide-inactive.xpm +++ b/themes/default-xhdpi/hide-inactive.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...............#############...............", +"...............#############...............", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/hide-prelight.png b/themes/default-xhdpi/hide-prelight.png Binary files differindex 792f83f91..4a02448a5 100644 --- a/themes/default-xhdpi/hide-prelight.png +++ b/themes/default-xhdpi/hide-prelight.png diff --git a/themes/default-xhdpi/hide-prelight.svg b/themes/default-xhdpi/hide-prelight.svg index 5790ab2e7..aa39e202c 100644 --- a/themes/default-xhdpi/hide-prelight.svg +++ b/themes/default-xhdpi/hide-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,34 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/hide-prelight.xpm b/themes/default-xhdpi/hide-prelight.xpm index 90ce5a4a7..01b0fc4a7 100644 --- a/themes/default-xhdpi/hide-prelight.xpm +++ b/themes/default-xhdpi/hide-prelight.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * hide_active_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@++++++++++++++#############++++++++++++++@", +"@++++++++++++++#############++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/hide-pressed.png b/themes/default-xhdpi/hide-pressed.png Binary files differindex e7436477b..4a02448a5 100644 --- a/themes/default-xhdpi/hide-pressed.png +++ b/themes/default-xhdpi/hide-pressed.png diff --git a/themes/default-xhdpi/hide-pressed.svg b/themes/default-xhdpi/hide-pressed.svg index 58e93918d..436018329 100644 --- a/themes/default-xhdpi/hide-pressed.svg +++ b/themes/default-xhdpi/hide-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,52 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,10)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/hide-pressed.xpm b/themes/default-xhdpi/hide-pressed.xpm index 0f9bd7800..62fe05760 100644 --- a/themes/default-xhdpi/hide-pressed.xpm +++ b/themes/default-xhdpi/hide-pressed.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * hide_pressed_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.......................................@.", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@..............############...............@", +"@..............############...............@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +".@.......................................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/maximize-active.png b/themes/default-xhdpi/maximize-active.png Binary files differindex 34a6bc7aa..4a02448a5 100644 --- a/themes/default-xhdpi/maximize-active.png +++ b/themes/default-xhdpi/maximize-active.png diff --git a/themes/default-xhdpi/maximize-active.svg b/themes/default-xhdpi/maximize-active.svg index c9fbc3d74..2b6e1c0d1 100644 --- a/themes/default-xhdpi/maximize-active.svg +++ b/themes/default-xhdpi/maximize-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,9)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/maximize-active.xpm b/themes/default-xhdpi/maximize-active.xpm index 79de42362..7f54789bc 100644 --- a/themes/default-xhdpi/maximize-active.xpm +++ b/themes/default-xhdpi/maximize-active.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * maximize_active_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...............#############...............", +"...............#############...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............#############...............", +"...............#############...............", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/maximize-inactive.png b/themes/default-xhdpi/maximize-inactive.png Binary files differindex a86c8afbb..4a02448a5 100644 --- a/themes/default-xhdpi/maximize-inactive.png +++ b/themes/default-xhdpi/maximize-inactive.png diff --git a/themes/default-xhdpi/maximize-inactive.svg b/themes/default-xhdpi/maximize-inactive.svg index 8e69f48b7..227627028 100644 --- a/themes/default-xhdpi/maximize-inactive.svg +++ b/themes/default-xhdpi/maximize-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata39" /> <defs - id="defs27" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -121,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(3,9)"> - <path - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - id="rect2275" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/maximize-inactive.xpm b/themes/default-xhdpi/maximize-inactive.xpm index 2981e129b..e667055d8 100644 --- a/themes/default-xhdpi/maximize-inactive.xpm +++ b/themes/default-xhdpi/maximize-inactive.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...............#############...............", +"...............#############...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............##.........##...............", +"...............#############...............", +"...............#############...............", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/maximize-prelight.png b/themes/default-xhdpi/maximize-prelight.png Binary files differindex b9b6a6d00..4a02448a5 100644 --- a/themes/default-xhdpi/maximize-prelight.png +++ b/themes/default-xhdpi/maximize-prelight.png diff --git a/themes/default-xhdpi/maximize-prelight.svg b/themes/default-xhdpi/maximize-prelight.svg index d973db040..10cc99f67 100644 --- a/themes/default-xhdpi/maximize-prelight.svg +++ b/themes/default-xhdpi/maximize-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,9)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/maximize-prelight.xpm b/themes/default-xhdpi/maximize-prelight.xpm index 79de42362..5cbe2de23 100644 --- a/themes/default-xhdpi/maximize-prelight.xpm +++ b/themes/default-xhdpi/maximize-prelight.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * maximize_active_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@++++++++++++++#############++++++++++++++@", +"@++++++++++++++#############++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++##+++++++++##++++++++++++++@", +"@++++++++++++++#############++++++++++++++@", +"@++++++++++++++#############++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/maximize-pressed.png b/themes/default-xhdpi/maximize-pressed.png Binary files differindex 206c9a6c8..4a02448a5 100644 --- a/themes/default-xhdpi/maximize-pressed.png +++ b/themes/default-xhdpi/maximize-pressed.png diff --git a/themes/default-xhdpi/maximize-pressed.svg b/themes/default-xhdpi/maximize-pressed.svg index 0cfc4dc4f..64d287255 100644 --- a/themes/default-xhdpi/maximize-pressed.svg +++ b/themes/default-xhdpi/maximize-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,46 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,10)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/maximize-pressed.xpm b/themes/default-xhdpi/maximize-pressed.xpm index 464c1e305..3facb3046 100644 --- a/themes/default-xhdpi/maximize-pressed.xpm +++ b/themes/default-xhdpi/maximize-pressed.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * maximize_pressed_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.......................................@.", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@..............#############..............@", +"@..............#############..............@", +"@..............##.........##..............@", +"@..............##.........##..............@", +"@..............##.........##..............@", +"@..............##.........##..............@", +"@..............##.........##..............@", +"@..............##.........##..............@", +"@..............##.........##..............@", +"@..............##.........##..............@", +"@..............##.........##..............@", +"@..............#############..............@", +"@..............#############..............@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +".@.......................................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/maximize-toggled-active.png b/themes/default-xhdpi/maximize-toggled-active.png Binary files differindex 30fddf7b6..4a02448a5 100644 --- a/themes/default-xhdpi/maximize-toggled-active.png +++ b/themes/default-xhdpi/maximize-toggled-active.png diff --git a/themes/default-xhdpi/maximize-toggled-active.svg b/themes/default-xhdpi/maximize-toggled-active.svg index 2c4a4d61b..88820b615 100644 --- a/themes/default-xhdpi/maximize-toggled-active.svg +++ b/themes/default-xhdpi/maximize-toggled-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata37" /> + id="metadata39" /> <defs - id="defs35" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview33" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,32 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,9)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/maximize-toggled-active.xpm b/themes/default-xhdpi/maximize-toggled-active.xpm index 59541ae68..69dcf38ae 100644 --- a/themes/default-xhdpi/maximize-toggled-active.xpm +++ b/themes/default-xhdpi/maximize-toggled-active.xpm @@ -1,62 +1,67 @@ /* XPM */ -static char * maximize_toggled_active_xpm[] = { -"44 58 2 1", +static char * maximize_active_xpm[] = { +"43 58 5 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..................#######..................", +"..................#######..................", +"..................##...##..................", +"..................##...##..................", +"..................##...##..................", +"..................#######..................", +"..................#######..................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/maximize-toggled-inactive.png b/themes/default-xhdpi/maximize-toggled-inactive.png Binary files differindex 7910ff132..4a02448a5 100644 --- a/themes/default-xhdpi/maximize-toggled-inactive.png +++ b/themes/default-xhdpi/maximize-toggled-inactive.png diff --git a/themes/default-xhdpi/maximize-toggled-inactive.svg b/themes/default-xhdpi/maximize-toggled-inactive.svg index d54e6adf8..06475047a 100644 --- a/themes/default-xhdpi/maximize-toggled-inactive.svg +++ b/themes/default-xhdpi/maximize-toggled-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata30" /> + id="metadata39" /> <defs - id="defs28" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview26" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1639" - transform="translate(3,9)"> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/maximize-toggled-inactive.xpm b/themes/default-xhdpi/maximize-toggled-inactive.xpm index 4cfc203a3..238c6e7a0 100644 --- a/themes/default-xhdpi/maximize-toggled-inactive.xpm +++ b/themes/default-xhdpi/maximize-toggled-inactive.xpm @@ -1,62 +1,67 @@ /* XPM */ -static char * maximize_toggled_inactive_xpm[] = { -"44 58 2 1", +static char * maximize_inactive_xpm[] = { +"43 58 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..................#######..................", +"..................#######..................", +"..................##...##..................", +"..................##...##..................", +"..................##...##..................", +"..................#######..................", +"..................#######..................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/maximize-toggled-prelight.png b/themes/default-xhdpi/maximize-toggled-prelight.png Binary files differindex edaab2540..4a02448a5 100644 --- a/themes/default-xhdpi/maximize-toggled-prelight.png +++ b/themes/default-xhdpi/maximize-toggled-prelight.png diff --git a/themes/default-xhdpi/maximize-toggled-prelight.svg b/themes/default-xhdpi/maximize-toggled-prelight.svg index d38f8b824..00e845b0a 100644 --- a/themes/default-xhdpi/maximize-toggled-prelight.svg +++ b/themes/default-xhdpi/maximize-toggled-prelight.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata40" /> + id="metadata39" /> <defs - id="defs38" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview36" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,32 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,9)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/maximize-toggled-prelight.xpm b/themes/default-xhdpi/maximize-toggled-prelight.xpm index 59541ae68..6ffb5e867 100644 --- a/themes/default-xhdpi/maximize-toggled-prelight.xpm +++ b/themes/default-xhdpi/maximize-toggled-prelight.xpm @@ -1,62 +1,68 @@ /* XPM */ -static char * maximize_toggled_active_xpm[] = { -"44 58 2 1", +static char * maximize_active_xpm[] = { +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++#######+++++++++++++++++@", +"@+++++++++++++++++#######+++++++++++++++++@", +"@+++++++++++++++++##+++##+++++++++++++++++@", +"@+++++++++++++++++##+++##+++++++++++++++++@", +"@+++++++++++++++++##+++##+++++++++++++++++@", +"@+++++++++++++++++#######+++++++++++++++++@", +"@+++++++++++++++++#######+++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/maximize-toggled-pressed.png b/themes/default-xhdpi/maximize-toggled-pressed.png Binary files differindex d6b96a21b..4a02448a5 100644 --- a/themes/default-xhdpi/maximize-toggled-pressed.png +++ b/themes/default-xhdpi/maximize-toggled-pressed.png diff --git a/themes/default-xhdpi/maximize-toggled-pressed.svg b/themes/default-xhdpi/maximize-toggled-pressed.svg index f32f6d53b..d96e80266 100644 --- a/themes/default-xhdpi/maximize-toggled-pressed.svg +++ b/themes/default-xhdpi/maximize-toggled-pressed.svg @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata40" /> + id="metadata39" /> <defs - id="defs38" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview36" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,50 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,10)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/maximize-toggled-pressed.xpm b/themes/default-xhdpi/maximize-toggled-pressed.xpm index ee2e343f8..c342b6b65 100644 --- a/themes/default-xhdpi/maximize-toggled-pressed.xpm +++ b/themes/default-xhdpi/maximize-toggled-pressed.xpm @@ -1,62 +1,68 @@ /* XPM */ -static char * maximize_toggled_pressed_xpm[] = { -"44 58 2 1", +static char * maximize_pressed_xpm[] = { +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.......................................@.", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.................#######.................@", +"@.................#######.................@", +"@.................##...##.................@", +"@.................##...##.................@", +"@.................##...##.................@", +"@.................#######.................@", +"@.................#######.................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +".@.......................................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/menu-active.png b/themes/default-xhdpi/menu-active.png Binary files differindex 90ccbba2e..4a02448a5 100644 --- a/themes/default-xhdpi/menu-active.png +++ b/themes/default-xhdpi/menu-active.png diff --git a/themes/default-xhdpi/menu-active.svg b/themes/default-xhdpi/menu-active.svg index 01d8fd7e8..bb1e5a3b2 100644 --- a/themes/default-xhdpi/menu-active.svg +++ b/themes/default-xhdpi/menu-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default-xhdpi/menu-active.xpm b/themes/default-xhdpi/menu-active.xpm index 5d923c80c..c43f2c830 100644 --- a/themes/default-xhdpi/menu-active.xpm +++ b/themes/default-xhdpi/menu-active.xpm @@ -2,7 +2,7 @@ static char * menu_active_xpm[] = { "44 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "............................................", "............................................", "............................................", diff --git a/themes/default-xhdpi/menu-inactive.png b/themes/default-xhdpi/menu-inactive.png Binary files differindex 90ccbba2e..4a02448a5 100644 --- a/themes/default-xhdpi/menu-inactive.png +++ b/themes/default-xhdpi/menu-inactive.png diff --git a/themes/default-xhdpi/menu-inactive.svg b/themes/default-xhdpi/menu-inactive.svg index abeb3a62a..63c110df4 100644 --- a/themes/default-xhdpi/menu-inactive.svg +++ b/themes/default-xhdpi/menu-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default-xhdpi/menu-prelight.png b/themes/default-xhdpi/menu-prelight.png Binary files differindex 90ccbba2e..4a02448a5 100644 --- a/themes/default-xhdpi/menu-prelight.png +++ b/themes/default-xhdpi/menu-prelight.png diff --git a/themes/default-xhdpi/menu-prelight.svg b/themes/default-xhdpi/menu-prelight.svg index 849cf13e2..d50b070b1 100644 --- a/themes/default-xhdpi/menu-prelight.svg +++ b/themes/default-xhdpi/menu-prelight.svg @@ -19,9 +19,9 @@ sodipodi:docname="menu-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata26" /> + id="metadata39" /> <defs - id="defs24" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview22" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -157,7 +157,7 @@ inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/menu-prelight.xpm b/themes/default-xhdpi/menu-prelight.xpm index 5d923c80c..c43f2c830 100644 --- a/themes/default-xhdpi/menu-prelight.xpm +++ b/themes/default-xhdpi/menu-prelight.xpm @@ -2,7 +2,7 @@ static char * menu_active_xpm[] = { "44 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "............................................", "............................................", "............................................", diff --git a/themes/default-xhdpi/menu-pressed.png b/themes/default-xhdpi/menu-pressed.png Binary files differindex 90ccbba2e..4a02448a5 100644 --- a/themes/default-xhdpi/menu-pressed.png +++ b/themes/default-xhdpi/menu-pressed.png diff --git a/themes/default-xhdpi/menu-pressed.svg b/themes/default-xhdpi/menu-pressed.svg index a6dc8e42f..e65535497 100644 --- a/themes/default-xhdpi/menu-pressed.svg +++ b/themes/default-xhdpi/menu-pressed.svg @@ -19,9 +19,9 @@ sodipodi:docname="menu-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata26" /> + id="metadata39" /> <defs - id="defs24" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview22" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -157,7 +157,7 @@ inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/menu-pressed.xpm b/themes/default-xhdpi/menu-pressed.xpm index 2642edf94..0efdfe202 100644 --- a/themes/default-xhdpi/menu-pressed.xpm +++ b/themes/default-xhdpi/menu-pressed.xpm @@ -2,7 +2,7 @@ static char * menu_pressed_xpm[] = { "44 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "............................................", "............................................", "............................................", diff --git a/themes/default-xhdpi/shade-active.png b/themes/default-xhdpi/shade-active.png Binary files differindex 6425b92b9..4a02448a5 100644 --- a/themes/default-xhdpi/shade-active.png +++ b/themes/default-xhdpi/shade-active.png diff --git a/themes/default-xhdpi/shade-active.svg b/themes/default-xhdpi/shade-active.svg index 287336d00..0337a8823 100644 --- a/themes/default-xhdpi/shade-active.svg +++ b/themes/default-xhdpi/shade-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="shade-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/shade-active.xpm b/themes/default-xhdpi/shade-active.xpm index edc8ff140..1c1d66c50 100644 --- a/themes/default-xhdpi/shade-active.xpm +++ b/themes/default-xhdpi/shade-active.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * shade_active_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +".....................@.....................", +"....................@#@....................", +"...................@###@...................", +"..................@#####@..................", +".................@###@###@.................", +"................@###@.@###@................", +"...............@###@...@###@...............", +"..............@###@.....@###@..............", +".............@###@.......@###@.............", +".............###@.........@###.............", +".............##@...........@##.............", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/shade-inactive.png b/themes/default-xhdpi/shade-inactive.png Binary files differindex 0b15c751d..4a02448a5 100644 --- a/themes/default-xhdpi/shade-inactive.png +++ b/themes/default-xhdpi/shade-inactive.png diff --git a/themes/default-xhdpi/shade-inactive.svg b/themes/default-xhdpi/shade-inactive.svg index 868593c98..b1d74d754 100644 --- a/themes/default-xhdpi/shade-inactive.svg +++ b/themes/default-xhdpi/shade-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="shade-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata39" /> <defs - id="defs27" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(3,9)"> - <path - id="path2620" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/shade-inactive.xpm b/themes/default-xhdpi/shade-inactive.xpm index 2fa950091..7375d0081 100644 --- a/themes/default-xhdpi/shade-inactive.xpm +++ b/themes/default-xhdpi/shade-inactive.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * shade_inactive_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +".....................$.....................", +"....................$#$....................", +"...................$###$...................", +"..................$#####$..................", +".................$###$###$.................", +"................$###$.$###$................", +"...............$###$...$###$...............", +"..............$###$.....$###$..............", +".............$###$.......$###$.............", +".............###$.........$###.............", +".............##$...........$##.............", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/shade-prelight.png b/themes/default-xhdpi/shade-prelight.png Binary files differindex 2b41e5ccd..4a02448a5 100644 --- a/themes/default-xhdpi/shade-prelight.png +++ b/themes/default-xhdpi/shade-prelight.png diff --git a/themes/default-xhdpi/shade-prelight.svg b/themes/default-xhdpi/shade-prelight.svg index ebd0107bf..f83ade5e7 100644 --- a/themes/default-xhdpi/shade-prelight.svg +++ b/themes/default-xhdpi/shade-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/shade-prelight.xpm b/themes/default-xhdpi/shade-prelight.xpm index edc8ff140..822b6be07 100644 --- a/themes/default-xhdpi/shade-prelight.xpm +++ b/themes/default-xhdpi/shade-prelight.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * shade_active_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@++++++++++++++++++++@++++++++++++++++++++@", +"@+++++++++++++++++++@#@+++++++++++++++++++@", +"@++++++++++++++++++@###@++++++++++++++++++@", +"@+++++++++++++++++@#####@+++++++++++++++++@", +"@++++++++++++++++@###@###@++++++++++++++++@", +"@+++++++++++++++@###@+@###@+++++++++++++++@", +"@++++++++++++++@###@+++@###@++++++++++++++@", +"@+++++++++++++@###@+++++@###@+++++++++++++@", +"@++++++++++++@###@+++++++@###@++++++++++++@", +"@++++++++++++###@+++++++++@###++++++++++++@", +"@++++++++++++##@+++++++++++@##++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/shade-pressed.png b/themes/default-xhdpi/shade-pressed.png Binary files differindex 27b20db2f..4a02448a5 100644 --- a/themes/default-xhdpi/shade-pressed.png +++ b/themes/default-xhdpi/shade-pressed.png diff --git a/themes/default-xhdpi/shade-pressed.svg b/themes/default-xhdpi/shade-pressed.svg index e158ec689..d37405470 100644 --- a/themes/default-xhdpi/shade-pressed.svg +++ b/themes/default-xhdpi/shade-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,46 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,10)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/shade-pressed.xpm b/themes/default-xhdpi/shade-pressed.xpm index ef6866a0c..a7ccb1a14 100644 --- a/themes/default-xhdpi/shade-pressed.xpm +++ b/themes/default-xhdpi/shade-pressed.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * shade_pressed_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.......................................@.", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@....................@....................@", +"@...................@#@...................@", +"@..................@###@..................@", +"@.................@#####@.................@", +"@................@###@###@................@", +"@...............@###@.@###@...............@", +"@..............@###@...@###@..............@", +"@.............@###@.....@###@.............@", +"@............@###@.......@###@............@", +"@............###@.........@###............@", +"@............##@...........@##............@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +".@.......................................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/shade-toggled-active.png b/themes/default-xhdpi/shade-toggled-active.png Binary files differindex e4f4988a2..4a02448a5 100644 --- a/themes/default-xhdpi/shade-toggled-active.png +++ b/themes/default-xhdpi/shade-toggled-active.png diff --git a/themes/default-xhdpi/shade-toggled-active.svg b/themes/default-xhdpi/shade-toggled-active.svg index 88c9b88b2..b5c0783f2 100644 --- a/themes/default-xhdpi/shade-toggled-active.svg +++ b/themes/default-xhdpi/shade-toggled-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="shade-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,9)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/shade-toggled-active.xpm b/themes/default-xhdpi/shade-toggled-active.xpm index c35e22dad..daf8dcbe1 100644 --- a/themes/default-xhdpi/shade-toggled-active.xpm +++ b/themes/default-xhdpi/shade-toggled-active.xpm @@ -1,62 +1,67 @@ /* XPM */ -static char * shade_toggled_active_xpm[] = { -"44 58 2 1", +static char * shade_active_xpm[] = { +"43 58 5 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +".............##@...........@##.............", +".............###@.........@###.............", +".............@###@.......@###@.............", +"..............@###@.....@###@..............", +"...............@###@...@###@...............", +"................@###@.@###@................", +".................@###@###@.................", +"..................@#####@..................", +"...................@###@...................", +"....................@#@....................", +".....................@.....................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/shade-toggled-inactive.png b/themes/default-xhdpi/shade-toggled-inactive.png Binary files differindex 81a17503b..4a02448a5 100644 --- a/themes/default-xhdpi/shade-toggled-inactive.png +++ b/themes/default-xhdpi/shade-toggled-inactive.png diff --git a/themes/default-xhdpi/shade-toggled-inactive.svg b/themes/default-xhdpi/shade-toggled-inactive.svg index 1bb2afec5..d2b7bef01 100644 --- a/themes/default-xhdpi/shade-toggled-inactive.svg +++ b/themes/default-xhdpi/shade-toggled-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="shade-toggled-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata39" /> <defs - id="defs27" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(3,9)"> - <path - id="path2620" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/shade-toggled-inactive.xpm b/themes/default-xhdpi/shade-toggled-inactive.xpm index cd4f2c83f..05c452640 100644 --- a/themes/default-xhdpi/shade-toggled-inactive.xpm +++ b/themes/default-xhdpi/shade-toggled-inactive.xpm @@ -1,62 +1,67 @@ /* XPM */ -static char * shade_toggled_inactive_xpm[] = { -"44 58 2 1", +static char * shade_inactive_xpm[] = { +"43 58 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +".............##$...........$##.............", +".............###$.........$###.............", +".............$###$.......$###$.............", +"..............$###$.....$###$..............", +"...............$###$...$###$...............", +"................$###$.$###$................", +".................$###$###$.................", +"..................$#####$..................", +"...................$###$...................", +"....................$#$....................", +".....................$.....................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/shade-toggled-prelight.png b/themes/default-xhdpi/shade-toggled-prelight.png Binary files differindex ad2de9a32..4a02448a5 100644 --- a/themes/default-xhdpi/shade-toggled-prelight.png +++ b/themes/default-xhdpi/shade-toggled-prelight.png diff --git a/themes/default-xhdpi/shade-toggled-prelight.svg b/themes/default-xhdpi/shade-toggled-prelight.svg index c5c46c01c..1baa71e34 100644 --- a/themes/default-xhdpi/shade-toggled-prelight.svg +++ b/themes/default-xhdpi/shade-toggled-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,9)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/shade-toggled-prelight.xpm b/themes/default-xhdpi/shade-toggled-prelight.xpm index c35e22dad..ad1084709 100644 --- a/themes/default-xhdpi/shade-toggled-prelight.xpm +++ b/themes/default-xhdpi/shade-toggled-prelight.xpm @@ -1,62 +1,68 @@ /* XPM */ -static char * shade_toggled_active_xpm[] = { -"44 58 2 1", +static char * shade_active_xpm[] = { +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@++++++++++++##@+++++++++++@##++++++++++++@", +"@++++++++++++###@+++++++++@###++++++++++++@", +"@++++++++++++@###@+++++++@###@++++++++++++@", +"@+++++++++++++@###@+++++@###@+++++++++++++@", +"@++++++++++++++@###@+++@###@++++++++++++++@", +"@+++++++++++++++@###@+@###@+++++++++++++++@", +"@++++++++++++++++@###@###@++++++++++++++++@", +"@+++++++++++++++++@#####@+++++++++++++++++@", +"@++++++++++++++++++@###@++++++++++++++++++@", +"@+++++++++++++++++++@#@+++++++++++++++++++@", +"@++++++++++++++++++++@++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/shade-toggled-pressed.png b/themes/default-xhdpi/shade-toggled-pressed.png Binary files differindex 2eeeaac75..4a02448a5 100644 --- a/themes/default-xhdpi/shade-toggled-pressed.png +++ b/themes/default-xhdpi/shade-toggled-pressed.png diff --git a/themes/default-xhdpi/shade-toggled-pressed.svg b/themes/default-xhdpi/shade-toggled-pressed.svg index 3786d7abc..9e2bcef20 100644 --- a/themes/default-xhdpi/shade-toggled-pressed.svg +++ b/themes/default-xhdpi/shade-toggled-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,46 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,10)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/shade-toggled-pressed.xpm b/themes/default-xhdpi/shade-toggled-pressed.xpm index b60fc23e6..2f9b98acc 100644 --- a/themes/default-xhdpi/shade-toggled-pressed.xpm +++ b/themes/default-xhdpi/shade-toggled-pressed.xpm @@ -1,62 +1,68 @@ /* XPM */ -static char * shade_toggled_pressed_xpm[] = { -"44 58 2 1", +static char * shade_pressed_xpm[] = { +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.......................................@.", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@............##@...........@##............@", +"@............###@.........@###............@", +"@............@###@.......@###@............@", +"@.............@###@.....@###@.............@", +"@..............@###@...@###@..............@", +"@...............@###@.@###@...............@", +"@................@###@###@................@", +"@.................@#####@.................@", +"@..................@###@..................@", +"@...................@#@...................@", +"@....................@....................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +".@.......................................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/stick-active.png b/themes/default-xhdpi/stick-active.png Binary files differindex 0a15dee6f..4a02448a5 100644 --- a/themes/default-xhdpi/stick-active.png +++ b/themes/default-xhdpi/stick-active.png diff --git a/themes/default-xhdpi/stick-active.svg b/themes/default-xhdpi/stick-active.svg index f718282ba..2d6578405 100644 --- a/themes/default-xhdpi/stick-active.svg +++ b/themes/default-xhdpi/stick-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/stick-active.xpm b/themes/default-xhdpi/stick-active.xpm index 681092c97..bcf729f3d 100644 --- a/themes/default-xhdpi/stick-active.xpm +++ b/themes/default-xhdpi/stick-active.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * stick_active_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"....................@#@....................", +"....................###....................", +"....................###....................", +"....................###....................", +"....................###....................", +"...............@###########@...............", +"...............#############...............", +"...............@###########@...............", +"....................###....................", +"....................###....................", +"....................###....................", +"....................###....................", +"....................@#@....................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/stick-inactive.png b/themes/default-xhdpi/stick-inactive.png Binary files differindex 0d1963ff1..4a02448a5 100644 --- a/themes/default-xhdpi/stick-inactive.png +++ b/themes/default-xhdpi/stick-inactive.png diff --git a/themes/default-xhdpi/stick-inactive.svg b/themes/default-xhdpi/stick-inactive.svg index 38e443dd8..b6473471d 100644 --- a/themes/default-xhdpi/stick-inactive.svg +++ b/themes/default-xhdpi/stick-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata39" /> <defs - id="defs27" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(3,9)"> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/stick-inactive.xpm b/themes/default-xhdpi/stick-inactive.xpm index f8242120a..03809d43d 100644 --- a/themes/default-xhdpi/stick-inactive.xpm +++ b/themes/default-xhdpi/stick-inactive.xpm @@ -1,62 +1,67 @@ /* XPM */ static char * stick_inactive_xpm[] = { -"44 58 2 1", +"43 58 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"....................$#$....................", +"....................###....................", +"....................###....................", +"....................###....................", +"....................###....................", +"...............$###########$...............", +"...............#############...............", +"...............$###########$...............", +"....................###....................", +"....................###....................", +"....................###....................", +"....................###....................", +"....................$#$....................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/stick-prelight.png b/themes/default-xhdpi/stick-prelight.png Binary files differindex 727f0d2e4..4a02448a5 100644 --- a/themes/default-xhdpi/stick-prelight.png +++ b/themes/default-xhdpi/stick-prelight.png diff --git a/themes/default-xhdpi/stick-prelight.svg b/themes/default-xhdpi/stick-prelight.svg index 24cbf3443..e6351ec12 100644 --- a/themes/default-xhdpi/stick-prelight.svg +++ b/themes/default-xhdpi/stick-prelight.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,28 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/stick-prelight.xpm b/themes/default-xhdpi/stick-prelight.xpm index 681092c97..869f0166a 100644 --- a/themes/default-xhdpi/stick-prelight.xpm +++ b/themes/default-xhdpi/stick-prelight.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * stick_active_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++@#@+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@++++++++++++++@###########@++++++++++++++@", +"@++++++++++++++#############++++++++++++++@", +"@++++++++++++++@###########@++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++@#@+++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/stick-pressed.png b/themes/default-xhdpi/stick-pressed.png Binary files differindex acf730c3a..4a02448a5 100644 --- a/themes/default-xhdpi/stick-pressed.png +++ b/themes/default-xhdpi/stick-pressed.png diff --git a/themes/default-xhdpi/stick-pressed.svg b/themes/default-xhdpi/stick-pressed.svg index d31f9d679..d3b201b43 100644 --- a/themes/default-xhdpi/stick-pressed.svg +++ b/themes/default-xhdpi/stick-pressed.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,46 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,10)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/stick-pressed.xpm b/themes/default-xhdpi/stick-pressed.xpm index 225392fee..6ddc21366 100644 --- a/themes/default-xhdpi/stick-pressed.xpm +++ b/themes/default-xhdpi/stick-pressed.xpm @@ -1,62 +1,68 @@ /* XPM */ static char * stick_pressed_xpm[] = { -"44 58 2 1", +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.......................................@.", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@...................@#@...................@", +"@...................###...................@", +"@...................###...................@", +"@...................###...................@", +"@...................###...................@", +"@..............@###########@..............@", +"@..............#############..............@", +"@..............@###########@..............@", +"@...................###...................@", +"@...................###...................@", +"@...................###...................@", +"@...................###...................@", +"@...................@#@...................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +".@.......................................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/stick-toggled-active.png b/themes/default-xhdpi/stick-toggled-active.png Binary files differindex 7ef6549ee..4a02448a5 100644 --- a/themes/default-xhdpi/stick-toggled-active.png +++ b/themes/default-xhdpi/stick-toggled-active.png diff --git a/themes/default-xhdpi/stick-toggled-active.svg b/themes/default-xhdpi/stick-toggled-active.svg index d94adcfa5..122054b6e 100644 --- a/themes/default-xhdpi/stick-toggled-active.svg +++ b/themes/default-xhdpi/stick-toggled-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata37" /> + id="metadata39" /> <defs - id="defs35" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview33" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,37 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="6" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/stick-toggled-active.xpm b/themes/default-xhdpi/stick-toggled-active.xpm index a394d488b..ff62b324c 100644 --- a/themes/default-xhdpi/stick-toggled-active.xpm +++ b/themes/default-xhdpi/stick-toggled-active.xpm @@ -1,62 +1,67 @@ /* XPM */ -static char * stick_toggled_active_xpm[] = { -"44 58 2 1", +static char * stick_active_xpm[] = { +"43 58 5 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"....................###....................", +"....................###....................", +"....................###....................", +"....................@#@....................", +".....................@.....................", +"...............###@.....@###...............", +"...............####@...@####...............", +"...............###@.....@###...............", +".....................@.....................", +"....................@#@....................", +"....................###....................", +"....................###....................", +"....................###....................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/stick-toggled-inactive.png b/themes/default-xhdpi/stick-toggled-inactive.png Binary files differindex 2e33478d8..4a02448a5 100644 --- a/themes/default-xhdpi/stick-toggled-inactive.png +++ b/themes/default-xhdpi/stick-toggled-inactive.png diff --git a/themes/default-xhdpi/stick-toggled-inactive.svg b/themes/default-xhdpi/stick-toggled-inactive.svg index ac6c3e5bc..8b66d6ec0 100644 --- a/themes/default-xhdpi/stick-toggled-inactive.svg +++ b/themes/default-xhdpi/stick-toggled-inactive.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata30" /> + id="metadata39" /> <defs - id="defs28" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview26" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,34 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(3,9)"> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="6" - sodipodi:cx="6" - id="path2202" - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/stick-toggled-inactive.xpm b/themes/default-xhdpi/stick-toggled-inactive.xpm index 810d9bf41..a941a5f6f 100644 --- a/themes/default-xhdpi/stick-toggled-inactive.xpm +++ b/themes/default-xhdpi/stick-toggled-inactive.xpm @@ -1,62 +1,67 @@ /* XPM */ -static char * stick_toggled_inactive_xpm[] = { -"44 58 2 1", +static char * stick_inactive_xpm[] = { +"43 58 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"....................###....................", +"....................###....................", +"....................###....................", +"....................$#$....................", +".....................$.....................", +"...............###$.....$###...............", +"...............####$...$####...............", +"...............###$.....$###...............", +".....................$.....................", +"....................$#$....................", +"....................###....................", +"....................###....................", +"....................###....................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/stick-toggled-prelight.png b/themes/default-xhdpi/stick-toggled-prelight.png Binary files differindex 171ff670d..4a02448a5 100644 --- a/themes/default-xhdpi/stick-toggled-prelight.png +++ b/themes/default-xhdpi/stick-toggled-prelight.png diff --git a/themes/default-xhdpi/stick-toggled-prelight.svg b/themes/default-xhdpi/stick-toggled-prelight.svg index 12b5a0b2c..e50ebf563 100644 --- a/themes/default-xhdpi/stick-toggled-prelight.svg +++ b/themes/default-xhdpi/stick-toggled-prelight.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata40" /> + id="metadata39" /> <defs - id="defs38" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview36" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,29 +117,11 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,37 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="0" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/stick-toggled-prelight.xpm b/themes/default-xhdpi/stick-toggled-prelight.xpm index a394d488b..6f82dacc6 100644 --- a/themes/default-xhdpi/stick-toggled-prelight.xpm +++ b/themes/default-xhdpi/stick-toggled-prelight.xpm @@ -1,62 +1,68 @@ /* XPM */ -static char * stick_toggled_active_xpm[] = { -"44 58 2 1", +static char * stick_active_xpm[] = { +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@+++++++++++++++++++++++++++++++++++++++@.", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++@#@+++++++++++++++++++@", +"@++++++++++++++++++++@++++++++++++++++++++@", +"@++++++++++++++###@+++++@###++++++++++++++@", +"@++++++++++++++####@+++@####++++++++++++++@", +"@++++++++++++++###@+++++@###++++++++++++++@", +"@++++++++++++++++++++@++++++++++++++++++++@", +"@+++++++++++++++++++@#@+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++###+++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +"@+++++++++++++++++++++++++++++++++++++++++@", +".@+++++++++++++++++++++++++++++++++++++++@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/stick-toggled-pressed.png b/themes/default-xhdpi/stick-toggled-pressed.png Binary files differindex a814b307d..4a02448a5 100644 --- a/themes/default-xhdpi/stick-toggled-pressed.png +++ b/themes/default-xhdpi/stick-toggled-pressed.png diff --git a/themes/default-xhdpi/stick-toggled-pressed.svg b/themes/default-xhdpi/stick-toggled-pressed.svg index 6bd3529bf..b39be7b69 100644 --- a/themes/default-xhdpi/stick-toggled-pressed.svg +++ b/themes/default-xhdpi/stick-toggled-pressed.svg @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata40" /> + id="metadata39" /> <defs - id="defs38" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview36" /> + id="namedview35" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,55 +153,10 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,10)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="0" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 21.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/stick-toggled-pressed.xpm b/themes/default-xhdpi/stick-toggled-pressed.xpm index a972c5d34..dd1ae631f 100644 --- a/themes/default-xhdpi/stick-toggled-pressed.xpm +++ b/themes/default-xhdpi/stick-toggled-pressed.xpm @@ -1,62 +1,68 @@ /* XPM */ -static char * stick_toggled_pressed_xpm[] = { -"44 58 2 1", +static char * stick_pressed_xpm[] = { +"43 58 6 1", " c None", -". c #C0C0FF s active_color_2", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................", -"............................................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +".@.......................................@.", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@...................###...................@", +"@...................###...................@", +"@...................###...................@", +"@...................@#@...................@", +"@....................@....................@", +"@..............###@.....@###..............@", +"@..............####@...@####..............@", +"@..............###@.....@###..............@", +"@....................@....................@", +"@...................@#@...................@", +"@...................###...................@", +"@...................###...................@", +"@...................###...................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +"@.........................................@", +".@.......................................@.", +"..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@..", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"...........................................", +"..........................................."}; diff --git a/themes/default-xhdpi/title-1-active.png b/themes/default-xhdpi/title-1-active.png Binary files differindex 7fa2e8b91..a30423e8f 100644 --- a/themes/default-xhdpi/title-1-active.png +++ b/themes/default-xhdpi/title-1-active.png diff --git a/themes/default-xhdpi/title-1-active.svg b/themes/default-xhdpi/title-1-active.svg index 9f626efa7..168c63287 100644 --- a/themes/default-xhdpi/title-1-active.svg +++ b/themes/default-xhdpi/title-1-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-xhdpi/title-1-active.xpm b/themes/default-xhdpi/title-1-active.xpm index 9468f21f1..3b163b586 100644 --- a/themes/default-xhdpi/title-1-active.xpm +++ b/themes/default-xhdpi/title-1-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "8 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-xhdpi/title-1-inactive.png b/themes/default-xhdpi/title-1-inactive.png Binary files differindex 7fa2e8b91..a30423e8f 100644 --- a/themes/default-xhdpi/title-1-inactive.png +++ b/themes/default-xhdpi/title-1-inactive.png diff --git a/themes/default-xhdpi/title-1-inactive.svg b/themes/default-xhdpi/title-1-inactive.svg index 01d62bd3a..41348805c 100644 --- a/themes/default-xhdpi/title-1-inactive.svg +++ b/themes/default-xhdpi/title-1-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-xhdpi/title-2-active.png b/themes/default-xhdpi/title-2-active.png Binary files differindex 7fa2e8b91..a30423e8f 100644 --- a/themes/default-xhdpi/title-2-active.png +++ b/themes/default-xhdpi/title-2-active.png diff --git a/themes/default-xhdpi/title-2-active.svg b/themes/default-xhdpi/title-2-active.svg index f3bbf08f0..f16985e35 100644 --- a/themes/default-xhdpi/title-2-active.svg +++ b/themes/default-xhdpi/title-2-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-xhdpi/title-2-active.xpm b/themes/default-xhdpi/title-2-active.xpm index 9468f21f1..3b163b586 100644 --- a/themes/default-xhdpi/title-2-active.xpm +++ b/themes/default-xhdpi/title-2-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "8 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-xhdpi/title-2-inactive.png b/themes/default-xhdpi/title-2-inactive.png Binary files differindex 7fa2e8b91..a30423e8f 100644 --- a/themes/default-xhdpi/title-2-inactive.png +++ b/themes/default-xhdpi/title-2-inactive.png diff --git a/themes/default-xhdpi/title-2-inactive.svg b/themes/default-xhdpi/title-2-inactive.svg index 726a98511..12298d574 100644 --- a/themes/default-xhdpi/title-2-inactive.svg +++ b/themes/default-xhdpi/title-2-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-xhdpi/title-3-active.png b/themes/default-xhdpi/title-3-active.png Binary files differindex 7fa2e8b91..a30423e8f 100644 --- a/themes/default-xhdpi/title-3-active.png +++ b/themes/default-xhdpi/title-3-active.png diff --git a/themes/default-xhdpi/title-3-active.svg b/themes/default-xhdpi/title-3-active.svg index 7584f8313..8d25f79ff 100644 --- a/themes/default-xhdpi/title-3-active.svg +++ b/themes/default-xhdpi/title-3-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-xhdpi/title-3-active.xpm b/themes/default-xhdpi/title-3-active.xpm index 9468f21f1..3b163b586 100644 --- a/themes/default-xhdpi/title-3-active.xpm +++ b/themes/default-xhdpi/title-3-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "8 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-xhdpi/title-3-inactive.png b/themes/default-xhdpi/title-3-inactive.png Binary files differindex 7fa2e8b91..a30423e8f 100644 --- a/themes/default-xhdpi/title-3-inactive.png +++ b/themes/default-xhdpi/title-3-inactive.png diff --git a/themes/default-xhdpi/title-3-inactive.svg b/themes/default-xhdpi/title-3-inactive.svg index 0eea5e11d..c6309336b 100644 --- a/themes/default-xhdpi/title-3-inactive.svg +++ b/themes/default-xhdpi/title-3-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-xhdpi/title-4-active.png b/themes/default-xhdpi/title-4-active.png Binary files differindex 88109a71f..a30423e8f 100644 --- a/themes/default-xhdpi/title-4-active.png +++ b/themes/default-xhdpi/title-4-active.png diff --git a/themes/default-xhdpi/title-4-active.svg b/themes/default-xhdpi/title-4-active.svg index 6d7c2176f..80023c907 100644 --- a/themes/default-xhdpi/title-4-active.svg +++ b/themes/default-xhdpi/title-4-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="title-4-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata32" /> + id="metadata26" /> <defs - id="defs30" /> + id="defs24" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview28" /> + id="namedview22" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,8 +156,8 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/title-4-active.xpm b/themes/default-xhdpi/title-4-active.xpm index 9468f21f1..3b163b586 100644 --- a/themes/default-xhdpi/title-4-active.xpm +++ b/themes/default-xhdpi/title-4-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "8 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-xhdpi/title-4-inactive.png b/themes/default-xhdpi/title-4-inactive.png Binary files differindex 7fa2e8b91..a30423e8f 100644 --- a/themes/default-xhdpi/title-4-inactive.png +++ b/themes/default-xhdpi/title-4-inactive.png diff --git a/themes/default-xhdpi/title-4-inactive.svg b/themes/default-xhdpi/title-4-inactive.svg index 000733309..8a675fffd 100644 --- a/themes/default-xhdpi/title-4-inactive.svg +++ b/themes/default-xhdpi/title-4-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-xhdpi/title-5-active.png b/themes/default-xhdpi/title-5-active.png Binary files differindex 2bad2f87e..a30423e8f 100644 --- a/themes/default-xhdpi/title-5-active.png +++ b/themes/default-xhdpi/title-5-active.png diff --git a/themes/default-xhdpi/title-5-active.svg b/themes/default-xhdpi/title-5-active.svg index 1038a35e0..0f9a3b2e1 100644 --- a/themes/default-xhdpi/title-5-active.svg +++ b/themes/default-xhdpi/title-5-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="title-5-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata32" /> + id="metadata26" /> <defs - id="defs30" /> + id="defs24" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview28" /> + id="namedview22" /> <g transform="scale(2)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,8 +156,8 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 7.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default-xhdpi/title-5-active.xpm b/themes/default-xhdpi/title-5-active.xpm index 9468f21f1..3b163b586 100644 --- a/themes/default-xhdpi/title-5-active.xpm +++ b/themes/default-xhdpi/title-5-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "8 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........", "........", "........", diff --git a/themes/default-xhdpi/title-5-inactive.png b/themes/default-xhdpi/title-5-inactive.png Binary files differindex 7fa2e8b91..a30423e8f 100644 --- a/themes/default-xhdpi/title-5-inactive.png +++ b/themes/default-xhdpi/title-5-inactive.png diff --git a/themes/default-xhdpi/title-5-inactive.svg b/themes/default-xhdpi/title-5-inactive.svg index f2ec3d923..865952ed0 100644 --- a/themes/default-xhdpi/title-5-inactive.svg +++ b/themes/default-xhdpi/title-5-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default-xhdpi/top-left-active.png b/themes/default-xhdpi/top-left-active.png Binary files differindex 72e85f8da..033f36092 100644 --- a/themes/default-xhdpi/top-left-active.png +++ b/themes/default-xhdpi/top-left-active.png diff --git a/themes/default-xhdpi/top-left-active.svg b/themes/default-xhdpi/top-left-active.svg index c62c5a643..08ac26f7a 100644 --- a/themes/default-xhdpi/top-left-active.svg +++ b/themes/default-xhdpi/top-left-active.svg @@ -132,11 +132,14 @@ <path id="path6061" d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z " - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z " - id="path1884" /> + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g style="display:inline" diff --git a/themes/default-xhdpi/top-left-active.xpm b/themes/default-xhdpi/top-left-active.xpm index 21007d54f..17759130c 100644 --- a/themes/default-xhdpi/top-left-active.xpm +++ b/themes/default-xhdpi/top-left-active.xpm @@ -2,7 +2,7 @@ static char * top_left_active_xpm[] = { "16 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", " ........", " ..........", " ............", diff --git a/themes/default-xhdpi/top-left-inactive.png b/themes/default-xhdpi/top-left-inactive.png Binary files differindex 72e85f8da..033f36092 100644 --- a/themes/default-xhdpi/top-left-inactive.png +++ b/themes/default-xhdpi/top-left-inactive.png diff --git a/themes/default-xhdpi/top-left-inactive.svg b/themes/default-xhdpi/top-left-inactive.svg index 5e38b371d..e44dca739 100644 --- a/themes/default-xhdpi/top-left-inactive.svg +++ b/themes/default-xhdpi/top-left-inactive.svg @@ -132,11 +132,14 @@ <path id="path6061" d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z " - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z " - id="path1884" /> + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g style="display:inline" diff --git a/themes/default-xhdpi/top-right-active.png b/themes/default-xhdpi/top-right-active.png Binary files differindex 833a6c750..c665840cd 100644 --- a/themes/default-xhdpi/top-right-active.png +++ b/themes/default-xhdpi/top-right-active.png diff --git a/themes/default-xhdpi/top-right-active.svg b/themes/default-xhdpi/top-right-active.svg index 23b70d18f..87416d490 100644 --- a/themes/default-xhdpi/top-right-active.svg +++ b/themes/default-xhdpi/top-right-active.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,7 +156,7 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 6.5,26.5" id="path6989" /> </g> diff --git a/themes/default-xhdpi/top-right-active.xpm b/themes/default-xhdpi/top-right-active.xpm index ba9800f19..fbb39fb81 100644 --- a/themes/default-xhdpi/top-right-active.xpm +++ b/themes/default-xhdpi/top-right-active.xpm @@ -2,7 +2,7 @@ static char * top_right_active_xpm[] = { "16 58 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "........ ", ".......... ", "............ ", diff --git a/themes/default-xhdpi/top-right-inactive.png b/themes/default-xhdpi/top-right-inactive.png Binary files differindex 843f1c6e7..c665840cd 100644 --- a/themes/default-xhdpi/top-right-inactive.png +++ b/themes/default-xhdpi/top-right-inactive.png diff --git a/themes/default-xhdpi/top-right-inactive.svg b/themes/default-xhdpi/top-right-inactive.svg index 3860fd542..c53936050 100644 --- a/themes/default-xhdpi/top-right-inactive.svg +++ b/themes/default-xhdpi/top-right-inactive.svg @@ -130,13 +130,16 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z " id="path6061" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z " - id="path1884" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g inkscape:label="Border" diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png Binary files differindex f4f253b93..91c5a4bb6 100644 --- a/themes/default/bottom-active.png +++ b/themes/default/bottom-active.png diff --git a/themes/default/bottom-active.svg b/themes/default/bottom-active.svg index 752f28ac0..70de0e2d7 100644 --- a/themes/default/bottom-active.svg +++ b/themes/default/bottom-active.svg @@ -10,7 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" - height="4" + height="5" id="svg2" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" @@ -98,7 +98,7 @@ id="layer1"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" - d="M 0,3.5 L 24,3.5" + d="M 0,4.5 L 24,4.5" id="path1340" /> </g> </g> diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm index 9222f87dc..b5efc8316 100644 --- a/themes/default/bottom-active.xpm +++ b/themes/default/bottom-active.xpm @@ -1,10 +1,11 @@ /* XPM */ static char * bottom_active_xpm[] = { -"24 4 3 1", +"24 5 3 1", " c None", "# c #C0C0C0 s active_color_2", "@ c #C0C0FF s active_color_2", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png Binary files differindex f4f253b93..91c5a4bb6 100644 --- a/themes/default/bottom-inactive.png +++ b/themes/default/bottom-inactive.png diff --git a/themes/default/bottom-inactive.svg b/themes/default/bottom-inactive.svg index 1d8b0b350..637df2c1b 100644 --- a/themes/default/bottom-inactive.svg +++ b/themes/default/bottom-inactive.svg @@ -10,7 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" - height="4" + height="5" id="svg2" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" @@ -98,7 +98,7 @@ id="layer1"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" - d="M 0,3.5 L 24,3.5" + d="M 0,4.5 L 24,4.5" id="path1340" /> </g> </g> diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm index 67549b96d..3481504dd 100644 --- a/themes/default/bottom-inactive.xpm +++ b/themes/default/bottom-inactive.xpm @@ -1,10 +1,11 @@ /* XPM */ static char * bottom_inactive_xpm[] = { -"24 4 3 1", +"24 5 3 1", " c None", "# c #C0C0C0 s inactive_color_2", "@ c #C0C0FF s inactive_color_2", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm index 8a1410340..1c31a6a67 100644 --- a/themes/default/bottom-left-active.xpm +++ b/themes/default/bottom-left-active.xpm @@ -4,18 +4,18 @@ static char * bottom_left_active_xpm[] = { " c None", "# c #C0C0C0 s active_color_2", "@ c #C0C0FF s active_color_2", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm index c4449e5b9..6eb387c22 100644 --- a/themes/default/bottom-left-inactive.xpm +++ b/themes/default/bottom-left-inactive.xpm @@ -4,18 +4,18 @@ static char * bottom_left_inactive_xpm[] = { " c None", "# c #C0C0C0 s inactive_color_2", "@ c #C0C0FF s inactive_color_2", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", -"@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@ ", +"@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm index 9977d9af8..7c851268e 100644 --- a/themes/default/bottom-right-active.xpm +++ b/themes/default/bottom-right-active.xpm @@ -4,18 +4,18 @@ static char * bottom_right_active_xpm[] = { " c None", "# c #C0C0C0 s active_color_2", "@ c #C0C0FF s active_color_2", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +"@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm index 69fafd964..f3e1e47b5 100644 --- a/themes/default/bottom-right-inactive.xpm +++ b/themes/default/bottom-right-inactive.xpm @@ -4,18 +4,18 @@ static char * bottom_right_inactive_xpm[] = { " c None", "# c #C0C0C0 s inactive_color_2", "@ c #C0C0FF s inactive_color_2", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", -" @@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +" @@@@@", +"@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@", diff --git a/themes/default/close-active.png b/themes/default/close-active.png Binary files differindex 2262e624b..1e5779ab5 100644 --- a/themes/default/close-active.png +++ b/themes/default/close-active.png diff --git a/themes/default/close-active.svg b/themes/default/close-active.svg index 9ecc7a300..b798a0dee 100644 --- a/themes/default/close-active.svg +++ b/themes/default/close-active.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,41 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,9)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm index 939cfc23d..b2faf9304 100644 --- a/themes/default/close-active.xpm +++ b/themes/default/close-active.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * close_active_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"......##@...@##......", +"......###@.@###......", +"......@###@###@......", +".......@#####@.......", +"........@###@........", +".......@#####@.......", +"......@###@###@......", +"......###@.@###......", +"......##@...@##......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png Binary files differindex 740023b87..1e5779ab5 100644 --- a/themes/default/close-inactive.png +++ b/themes/default/close-inactive.png diff --git a/themes/default/close-inactive.svg b/themes/default/close-inactive.svg index f008a8fa5..9f24baf37 100644 --- a/themes/default/close-inactive.svg +++ b/themes/default/close-inactive.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,0.5 L 21,0.5 C 21,0.5 21,28 21,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -130,13 +130,13 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="22" + width="21" height="18" x="0" y="1" /> @@ -148,33 +148,16 @@ style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" - d="M 0.5,0.5 L 21.5,0.5" + d="M 0.5,0.5 L 20.5,0.5" id="path6059" /> </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(3,9)"> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,28.5 L 20.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm index c45a79458..bbe6d2197 100644 --- a/themes/default/close-inactive.xpm +++ b/themes/default/close-inactive.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * close_inactive_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"......##$...$##......", +"......###$.$###......", +"......$###$###$......", +".......$#####$.......", +"........$###$........", +".......$#####$.......", +"......$###$###$......", +"......###$.$###......", +"......##$...$##......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/close-prelight.png b/themes/default/close-prelight.png Binary files differindex 86801bd6a..1e5779ab5 100644 --- a/themes/default/close-prelight.png +++ b/themes/default/close-prelight.png diff --git a/themes/default/close-prelight.svg b/themes/default/close-prelight.svg index a9812f440..08086ffdc 100644 --- a/themes/default/close-prelight.svg +++ b/themes/default/close-prelight.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="close-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata42" /> + id="metadata39" /> <defs - id="defs40" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview38" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,30 +117,12 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,41 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,9)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm index 939cfc23d..6654bfb7f 100644 --- a/themes/default/close-prelight.xpm +++ b/themes/default/close-prelight.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * close_active_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++##@+++@##+++++@", +"@+++++###@+@###+++++@", +"@+++++@###@###@+++++@", +"@++++++@#####@++++++@", +"@+++++++@###@+++++++@", +"@++++++@#####@++++++@", +"@+++++@###@###@+++++@", +"@+++++###@+@###+++++@", +"@+++++##@+++@##+++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png Binary files differindex 5d76d6347..1e5779ab5 100644 --- a/themes/default/close-pressed.png +++ b/themes/default/close-pressed.png diff --git a/themes/default/close-pressed.svg b/themes/default/close-pressed.svg index d9f29938c..251ed1741 100644 --- a/themes/default/close-pressed.svg +++ b/themes/default/close-pressed.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="close-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata42" /> + id="metadata39" /> <defs - id="defs40" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview38" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,59 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - id="g2327" - transform="translate(5,10)"> - <g - transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g2217"> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,2 L 10,10" - id="path1340" /> - <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 2,10 L 10,2" - id="path2215" /> - </g> - <path - id="path2221" - d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2225" - d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm index fb28512cc..d6bf6169d 100644 --- a/themes/default/close-pressed.xpm +++ b/themes/default/close-pressed.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * close_pressed_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@.....##@...@##.....@", +"@.....###@.@###.....@", +"@.....@###@###@.....@", +"@......@#####@......@", +"@.......@###@.......@", +"@......@#####@......@", +"@.....@###@###@.....@", +"@.....###@.@###.....@", +"@.....##@...@##.....@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png Binary files differindex 880ae108e..1e5779ab5 100644 --- a/themes/default/hide-active.png +++ b/themes/default/hide-active.png diff --git a/themes/default/hide-active.svg b/themes/default/hide-active.svg index 35de20a92..9de7c29fd 100644 --- a/themes/default/hide-active.svg +++ b/themes/default/hide-active.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="hide-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,35 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm index b5a87f2b9..7402bd5ec 100644 --- a/themes/default/hide-active.xpm +++ b/themes/default/hide-active.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * hide_active_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"......#########......", +"......#########......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png Binary files differindex 15e21cf58..da38b0865 100644 --- a/themes/default/hide-inactive.png +++ b/themes/default/hide-inactive.png diff --git a/themes/default/hide-inactive.svg b/themes/default/hide-inactive.svg index b4f44a120..8a279efb7 100644 --- a/themes/default/hide-inactive.svg +++ b/themes/default/hide-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm index 381d958f6..11830658b 100644 --- a/themes/default/hide-inactive.xpm +++ b/themes/default/hide-inactive.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"......#########......", +"......#########......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/hide-prelight.png b/themes/default/hide-prelight.png Binary files differindex 97d8ce825..1e5779ab5 100644 --- a/themes/default/hide-prelight.png +++ b/themes/default/hide-prelight.png diff --git a/themes/default/hide-prelight.svg b/themes/default/hide-prelight.svg index 311ba13d5..4bdd925cf 100644 --- a/themes/default/hide-prelight.svg +++ b/themes/default/hide-prelight.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,30 +117,12 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,35 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm index b5a87f2b9..557f88ff9 100644 --- a/themes/default/hide-prelight.xpm +++ b/themes/default/hide-prelight.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * hide_active_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++#########+++++@", +"@+++++#########+++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png Binary files differindex 1cb379e58..1e5779ab5 100644 --- a/themes/default/hide-pressed.png +++ b/themes/default/hide-pressed.png diff --git a/themes/default/hide-pressed.svg b/themes/default/hide-pressed.svg index e29342af1..d78b3185b 100644 --- a/themes/default/hide-pressed.svg +++ b/themes/default/hide-pressed.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,53 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,10)"> - <rect - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2376" - width="8" - height="4" - x="2" - y="7" /> - <rect - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - id="rect2378" - width="6" - height="2" - x="3" - y="8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm index b28a096c3..ca7f08a26 100644 --- a/themes/default/hide-pressed.xpm +++ b/themes/default/hide-pressed.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * hide_pressed_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@.....#########.....@", +"@.....#########.....@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/left-active.png b/themes/default/left-active.png Binary files differindex e004e2401..4c77af203 100644 --- a/themes/default/left-active.png +++ b/themes/default/left-active.png diff --git a/themes/default/left-active.svg b/themes/default/left-active.svg index 93f459a64..ac058c317 100644 --- a/themes/default/left-active.svg +++ b/themes/default/left-active.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="4" + width="5" height="24" id="svg2" sodipodi:version="0.32" diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm index df054f1d7..00d1a2265 100644 --- a/themes/default/left-active.xpm +++ b/themes/default/left-active.xpm @@ -1,30 +1,30 @@ /* XPM */ static char * left_active_xpm[] = { -"4 24 3 1", +"5 24 3 1", " c None", "# c #C0C0C0 s inactive_color_2", "@ c #C0C0FF s inactive_color_2", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@"}; +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png Binary files differindex e004e2401..4c77af203 100644 --- a/themes/default/left-inactive.png +++ b/themes/default/left-inactive.png diff --git a/themes/default/left-inactive.svg b/themes/default/left-inactive.svg index 097debcd5..c578aae00 100644 --- a/themes/default/left-inactive.svg +++ b/themes/default/left-inactive.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="4" + width="5" height="24" id="svg2" sodipodi:version="0.32" diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm index 5c1b02abb..82222f205 100644 --- a/themes/default/left-inactive.xpm +++ b/themes/default/left-inactive.xpm @@ -1,30 +1,30 @@ /* XPM */ static char * left_inactive_xpm[] = { -"4 24 3 1", +"5 24 3 1", " c None", "# c #C0C0C0 s inactive_color_2", "@ c #C0C0FF s inactive_color_2", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@"}; +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png Binary files differindex 1f24ca8b1..1e5779ab5 100644 --- a/themes/default/maximize-active.png +++ b/themes/default/maximize-active.png diff --git a/themes/default/maximize-active.svg b/themes/default/maximize-active.svg index 8cd5ea837..451d39ad3 100644 --- a/themes/default/maximize-active.svg +++ b/themes/default/maximize-active.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="maximize-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,9)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm index 182099684..1850b8b79 100644 --- a/themes/default/maximize-active.xpm +++ b/themes/default/maximize-active.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * maximize_active_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"......#########......", +"......#########......", +"......##.....##......", +"......##.....##......", +"......##.....##......", +"......##.....##......", +"......##.....##......", +"......#########......", +"......#########......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png Binary files differindex e0a37a31b..0c3a6e851 100644 --- a/themes/default/maximize-inactive.png +++ b/themes/default/maximize-inactive.png diff --git a/themes/default/maximize-inactive.svg b/themes/default/maximize-inactive.svg index 8ce2b9732..2546404f0 100644 --- a/themes/default/maximize-inactive.svg +++ b/themes/default/maximize-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm index c131926d5..c719553cf 100644 --- a/themes/default/maximize-inactive.xpm +++ b/themes/default/maximize-inactive.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"......#########......", +"......#########......", +"......##.....##......", +"......##.....##......", +"......##.....##......", +"......##.....##......", +"......##.....##......", +"......#########......", +"......#########......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/maximize-prelight.png b/themes/default/maximize-prelight.png Binary files differindex 45ebc75aa..1e5779ab5 100644 --- a/themes/default/maximize-prelight.png +++ b/themes/default/maximize-prelight.png diff --git a/themes/default/maximize-prelight.svg b/themes/default/maximize-prelight.svg index 0c875fdbf..acadae886 100644 --- a/themes/default/maximize-prelight.svg +++ b/themes/default/maximize-prelight.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,30 +117,12 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,9)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm index 182099684..92440f1d0 100644 --- a/themes/default/maximize-prelight.xpm +++ b/themes/default/maximize-prelight.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * maximize_active_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++#########+++++@", +"@+++++#########+++++@", +"@+++++##+++++##+++++@", +"@+++++##+++++##+++++@", +"@+++++##+++++##+++++@", +"@+++++##+++++##+++++@", +"@+++++##+++++##+++++@", +"@+++++#########+++++@", +"@+++++#########+++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png Binary files differindex 9319553a9..1e5779ab5 100644 --- a/themes/default/maximize-pressed.png +++ b/themes/default/maximize-pressed.png diff --git a/themes/default/maximize-pressed.svg b/themes/default/maximize-pressed.svg index bd5073c19..317ca781d 100644 --- a/themes/default/maximize-pressed.svg +++ b/themes/default/maximize-pressed.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,47 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1614" - transform="translate(5,10)"> - <path - id="rect2266" - d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2275" - d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm index ebcd7131a..8482aff98 100644 --- a/themes/default/maximize-pressed.xpm +++ b/themes/default/maximize-pressed.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * maximize_pressed_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@.....#########.....@", +"@.....#########.....@", +"@.....##.....##.....@", +"@.....##.....##.....@", +"@.....##.....##.....@", +"@.....##.....##.....@", +"@.....##.....##.....@", +"@.....#########.....@", +"@.....#########.....@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png Binary files differindex 252ae6376..1e5779ab5 100644 --- a/themes/default/maximize-toggled-active.png +++ b/themes/default/maximize-toggled-active.png diff --git a/themes/default/maximize-toggled-active.svg b/themes/default/maximize-toggled-active.svg index 3e890fd81..9ff37100d 100644 --- a/themes/default/maximize-toggled-active.svg +++ b/themes/default/maximize-toggled-active.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata37" /> + id="metadata39" /> <defs - id="defs35" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview33" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,33 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,9)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm index b5c219c0d..1e665887c 100644 --- a/themes/default/maximize-toggled-active.xpm +++ b/themes/default/maximize-toggled-active.xpm @@ -1,34 +1,37 @@ /* XPM */ -static char * maximize_toggled_active_xpm[] = { -"22 29 2 1", +static char * maximize_active_xpm[] = { +"21 29 5 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".......#######.......", +".......#######.......", +".......##...##.......", +".......##...##.......", +".......##...##.......", +".......#######.......", +".......#######.......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png Binary files differindex 832af2cce..3e7caec7e 100644 --- a/themes/default/maximize-toggled-inactive.png +++ b/themes/default/maximize-toggled-inactive.png diff --git a/themes/default/maximize-toggled-inactive.svg b/themes/default/maximize-toggled-inactive.svg index 9c5185c99..b19cf4f47 100644 --- a/themes/default/maximize-toggled-inactive.svg +++ b/themes/default/maximize-toggled-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm index 58b29bd9e..1dce403ef 100644 --- a/themes/default/maximize-toggled-inactive.xpm +++ b/themes/default/maximize-toggled-inactive.xpm @@ -1,34 +1,37 @@ /* XPM */ -static char * maximize_toggled_inactive_xpm[] = { -"22 29 2 1", +static char * maximize_inactive_xpm[] = { +"21 29 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".......#######.......", +".......#######.......", +".......##...##.......", +".......##...##.......", +".......##...##.......", +".......#######.......", +".......#######.......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/maximize-toggled-prelight.png b/themes/default/maximize-toggled-prelight.png Binary files differindex 085223877..1e5779ab5 100644 --- a/themes/default/maximize-toggled-prelight.png +++ b/themes/default/maximize-toggled-prelight.png diff --git a/themes/default/maximize-toggled-prelight.svg b/themes/default/maximize-toggled-prelight.svg index 7584df095..3661579d0 100644 --- a/themes/default/maximize-toggled-prelight.svg +++ b/themes/default/maximize-toggled-prelight.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata40" /> + id="metadata39" /> <defs - id="defs38" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview36" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,30 +117,12 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,33 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,9)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm index b5c219c0d..98e9527f1 100644 --- a/themes/default/maximize-toggled-prelight.xpm +++ b/themes/default/maximize-toggled-prelight.xpm @@ -1,34 +1,38 @@ /* XPM */ -static char * maximize_toggled_active_xpm[] = { -"22 29 2 1", +static char * maximize_active_xpm[] = { +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@++++++#######++++++@", +"@++++++#######++++++@", +"@++++++##+++##++++++@", +"@++++++##+++##++++++@", +"@++++++##+++##++++++@", +"@++++++#######++++++@", +"@++++++#######++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png Binary files differindex f4afedcbd..1e5779ab5 100644 --- a/themes/default/maximize-toggled-pressed.png +++ b/themes/default/maximize-toggled-pressed.png diff --git a/themes/default/maximize-toggled-pressed.svg b/themes/default/maximize-toggled-pressed.svg index c48cbd438..727aac7a5 100644 --- a/themes/default/maximize-toggled-pressed.svg +++ b/themes/default/maximize-toggled-pressed.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="maximize-toggled-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata40" /> + id="metadata39" /> <defs - id="defs38" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview36" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,51 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1626" - transform="translate(5,10)"> - <path - id="rect2318" - d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> - <path - id="rect2331" - d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="rect2371" - d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm index 5c5e581b3..6cd60ccd1 100644 --- a/themes/default/maximize-toggled-pressed.xpm +++ b/themes/default/maximize-toggled-pressed.xpm @@ -1,34 +1,38 @@ /* XPM */ -static char * maximize_toggled_pressed_xpm[] = { -"22 29 2 1", +static char * maximize_pressed_xpm[] = { +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@......#######......@", +"@......#######......@", +"@......##...##......@", +"@......##...##......@", +"@......##...##......@", +"@......#######......@", +"@......#######......@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png Binary files differindex 87acd7a30..4d19340d0 100644 --- a/themes/default/menu-active.png +++ b/themes/default/menu-active.png diff --git a/themes/default/menu-active.svg b/themes/default/menu-active.svg index 7a26606e0..75db087c2 100644 --- a/themes/default/menu-active.svg +++ b/themes/default/menu-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm index e548be4c6..6e6c06740 100644 --- a/themes/default/menu-active.xpm +++ b/themes/default/menu-active.xpm @@ -2,7 +2,7 @@ static char * menu_active_xpm[] = { "22 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "......................", "......................", "......................", diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png Binary files differindex 87acd7a30..4d19340d0 100644 --- a/themes/default/menu-inactive.png +++ b/themes/default/menu-inactive.png diff --git a/themes/default/menu-inactive.svg b/themes/default/menu-inactive.svg index c5356aa86..3564f13b5 100644 --- a/themes/default/menu-inactive.svg +++ b/themes/default/menu-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png Binary files differindex 87acd7a30..4d19340d0 100644 --- a/themes/default/menu-prelight.png +++ b/themes/default/menu-prelight.png diff --git a/themes/default/menu-prelight.svg b/themes/default/menu-prelight.svg index c4ed469fc..bbc1587c5 100644 --- a/themes/default/menu-prelight.svg +++ b/themes/default/menu-prelight.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default/menu-prelight.xpm b/themes/default/menu-prelight.xpm index e548be4c6..6e6c06740 100644 --- a/themes/default/menu-prelight.xpm +++ b/themes/default/menu-prelight.xpm @@ -2,7 +2,7 @@ static char * menu_active_xpm[] = { "22 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "......................", "......................", "......................", diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png Binary files differindex 87acd7a30..4d19340d0 100644 --- a/themes/default/menu-pressed.png +++ b/themes/default/menu-pressed.png diff --git a/themes/default/menu-pressed.svg b/themes/default/menu-pressed.svg index 9a7d0ffcb..28e636f80 100644 --- a/themes/default/menu-pressed.svg +++ b/themes/default/menu-pressed.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm index 09910bfda..e4a807b65 100644 --- a/themes/default/menu-pressed.xpm +++ b/themes/default/menu-pressed.xpm @@ -2,7 +2,7 @@ static char * menu_pressed_xpm[] = { "22 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "......................", "......................", "......................", diff --git a/themes/default/right-active.png b/themes/default/right-active.png Binary files differindex 1ddbddbf3..096aadfa8 100644 --- a/themes/default/right-active.png +++ b/themes/default/right-active.png diff --git a/themes/default/right-active.svg b/themes/default/right-active.svg index 30123d263..191f4f4f3 100644 --- a/themes/default/right-active.svg +++ b/themes/default/right-active.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="4" + width="5" height="24" id="svg2" sodipodi:version="0.32" @@ -96,7 +96,7 @@ id="layer1"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" - d="M 3.5,0 L 3.5,24" + d="M 4.5,0 L 4.5,24" id="path1340" /> </g> </g> diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm index 1910d87ea..6899265ed 100644 --- a/themes/default/right-active.xpm +++ b/themes/default/right-active.xpm @@ -1,30 +1,30 @@ /* XPM */ static char * right_active_xpm[] = { -"4 24 3 1", +"5 24 3 1", " c None", "# c #C0C0C0 s inactive_color_2", "@ c #C0C0FF s inactive_color_2", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@"}; +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png Binary files differindex 1ddbddbf3..096aadfa8 100644 --- a/themes/default/right-inactive.png +++ b/themes/default/right-inactive.png diff --git a/themes/default/right-inactive.svg b/themes/default/right-inactive.svg index e33e8672c..919fc214d 100644 --- a/themes/default/right-inactive.svg +++ b/themes/default/right-inactive.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="4" + width="5" height="24" id="svg2" sodipodi:version="0.32" @@ -96,7 +96,7 @@ id="layer1"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" - d="M 3.5,0 L 3.5,24" + d="M 4.5,0 L 4.5,24" id="path1340" /> </g> </g> diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm index cb2e5c0d6..d149d63ff 100644 --- a/themes/default/right-inactive.xpm +++ b/themes/default/right-inactive.xpm @@ -1,30 +1,30 @@ /* XPM */ static char * right_inactive_xpm[] = { -"4 24 3 1", +"5 24 3 1", " c None", "# c #C0C0C0 s inactive_color_2", "@ c #C0C0FF s inactive_color_2", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@", -"@@@@"}; +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@", +"@@@@@"}; diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png Binary files differindex c559c1a5f..1e5779ab5 100644 --- a/themes/default/shade-active.png +++ b/themes/default/shade-active.png diff --git a/themes/default/shade-active.svg b/themes/default/shade-active.svg index 9ee1c444f..cd36bde43 100644 --- a/themes/default/shade-active.svg +++ b/themes/default/shade-active.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="shade-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm index 0831e7466..9c299aee7 100644 --- a/themes/default/shade-active.xpm +++ b/themes/default/shade-active.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * shade_active_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"..........@..........", +".........@#@.........", +"........@###@........", +".......@#####@.......", +"......@###@###@......", +"......###@.@###......", +"......##@...@##......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png Binary files differindex 6fde3f0e5..1e5779ab5 100644 --- a/themes/default/shade-inactive.png +++ b/themes/default/shade-inactive.png diff --git a/themes/default/shade-inactive.svg b/themes/default/shade-inactive.svg index 977c31b90..6bbe27dd8 100644 --- a/themes/default/shade-inactive.svg +++ b/themes/default/shade-inactive.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="shade-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata39" /> <defs - id="defs27" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(3,9)"> - <path - id="path2620" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm index 6a1ca818e..aebe46d7a 100644 --- a/themes/default/shade-inactive.xpm +++ b/themes/default/shade-inactive.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * shade_inactive_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"..........$..........", +".........$#$.........", +"........$###$........", +".......$#####$.......", +"......$###$###$......", +"......###$.$###......", +"......##$...$##......", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/shade-prelight.png b/themes/default/shade-prelight.png Binary files differindex 9c08f47e8..1e5779ab5 100644 --- a/themes/default/shade-prelight.png +++ b/themes/default/shade-prelight.png diff --git a/themes/default/shade-prelight.svg b/themes/default/shade-prelight.svg index fbf13a15a..15f214175 100644 --- a/themes/default/shade-prelight.svg +++ b/themes/default/shade-prelight.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,30 +117,12 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,9)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm index 0831e7466..6010763ec 100644 --- a/themes/default/shade-prelight.xpm +++ b/themes/default/shade-prelight.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * shade_active_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++@+++++++++@", +"@++++++++@#@++++++++@", +"@+++++++@###@+++++++@", +"@++++++@#####@++++++@", +"@+++++@###@###@+++++@", +"@+++++###@+@###+++++@", +"@+++++##@+++@##+++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png Binary files differindex 83bab4823..1e5779ab5 100644 --- a/themes/default/shade-pressed.png +++ b/themes/default/shade-pressed.png diff --git a/themes/default/shade-pressed.svg b/themes/default/shade-pressed.svg index fb52bced3..0244ae746 100644 --- a/themes/default/shade-pressed.svg +++ b/themes/default/shade-pressed.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,47 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1616" - transform="translate(5,10)"> - <path - d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm index 7f129b0ad..0586abc8f 100644 --- a/themes/default/shade-pressed.xpm +++ b/themes/default/shade-pressed.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * shade_pressed_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@.........@.........@", +"@........@#@........@", +"@.......@###@.......@", +"@......@#####@......@", +"@.....@###@###@.....@", +"@.....###@.@###.....@", +"@.....##@...@##.....@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png Binary files differindex 2dee8720b..1e5779ab5 100644 --- a/themes/default/shade-toggled-active.png +++ b/themes/default/shade-toggled-active.png diff --git a/themes/default/shade-toggled-active.svg b/themes/default/shade-toggled-active.svg index 66ca84f8c..c001dc017 100644 --- a/themes/default/shade-toggled-active.svg +++ b/themes/default/shade-toggled-active.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="shade-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,9)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm index e6305571a..7db6fb9f0 100644 --- a/themes/default/shade-toggled-active.xpm +++ b/themes/default/shade-toggled-active.xpm @@ -1,34 +1,37 @@ /* XPM */ -static char * shade_toggled_active_xpm[] = { -"22 29 2 1", +static char * shade_active_xpm[] = { +"21 29 5 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"......##@...@##......", +"......###@.@###......", +"......@###@###@......", +".......@#####@.......", +"........@###@........", +".........@#@.........", +"..........@..........", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png Binary files differindex 3fb88487f..1e5779ab5 100644 --- a/themes/default/shade-toggled-inactive.png +++ b/themes/default/shade-toggled-inactive.png diff --git a/themes/default/shade-toggled-inactive.svg b/themes/default/shade-toggled-inactive.svg index 2894cd54b..ecbffe29c 100644 --- a/themes/default/shade-toggled-inactive.svg +++ b/themes/default/shade-toggled-inactive.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="shade-toggled-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata39" /> <defs - id="defs27" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -153,25 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(3,9)"> - <path - id="path2620" - style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm index 69c040306..31b0a0e30 100644 --- a/themes/default/shade-toggled-inactive.xpm +++ b/themes/default/shade-toggled-inactive.xpm @@ -1,34 +1,37 @@ /* XPM */ -static char * shade_toggled_inactive_xpm[] = { -"22 29 2 1", +static char * shade_inactive_xpm[] = { +"21 29 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"......##$...$##......", +"......###$.$###......", +"......$###$###$......", +".......$#####$.......", +"........$###$........", +".........$#$.........", +"..........$..........", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/shade-toggled-prelight.png b/themes/default/shade-toggled-prelight.png Binary files differindex ce9870613..1e5779ab5 100644 --- a/themes/default/shade-toggled-prelight.png +++ b/themes/default/shade-toggled-prelight.png diff --git a/themes/default/shade-toggled-prelight.svg b/themes/default/shade-toggled-prelight.svg index 25264c856..160f870a6 100644 --- a/themes/default/shade-toggled-prelight.svg +++ b/themes/default/shade-toggled-prelight.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,30 +117,12 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,9)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm index e6305571a..3ebac98e7 100644 --- a/themes/default/shade-toggled-prelight.xpm +++ b/themes/default/shade-toggled-prelight.xpm @@ -1,34 +1,38 @@ /* XPM */ -static char * shade_toggled_active_xpm[] = { -"22 29 2 1", +static char * shade_active_xpm[] = { +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++##@+++@##+++++@", +"@+++++###@+@###+++++@", +"@+++++@###@###@+++++@", +"@++++++@#####@++++++@", +"@+++++++@###@+++++++@", +"@++++++++@#@++++++++@", +"@+++++++++@+++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png Binary files differindex f460846ac..1e5779ab5 100644 --- a/themes/default/shade-toggled-pressed.png +++ b/themes/default/shade-toggled-pressed.png diff --git a/themes/default/shade-toggled-pressed.svg b/themes/default/shade-toggled-pressed.svg index 8b42b1b93..377e26b20 100644 --- a/themes/default/shade-toggled-pressed.svg +++ b/themes/default/shade-toggled-pressed.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,47 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1628" - transform="translate(5,10)"> - <path - d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" - style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2605" /> - <path - d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2620" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm index e5df2c8a1..7dc88f997 100644 --- a/themes/default/shade-toggled-pressed.xpm +++ b/themes/default/shade-toggled-pressed.xpm @@ -1,34 +1,38 @@ /* XPM */ -static char * shade_toggled_pressed_xpm[] = { -"22 29 2 1", +static char * shade_pressed_xpm[] = { +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@.....##@...@##.....@", +"@.....###@.@###.....@", +"@.....@###@###@.....@", +"@......@#####@......@", +"@.......@###@.......@", +"@........@#@........@", +"@.........@.........@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png Binary files differindex b345c3ab5..1e5779ab5 100644 --- a/themes/default/stick-active.png +++ b/themes/default/stick-active.png diff --git a/themes/default/stick-active.svg b/themes/default/stick-active.svg index 572f07388..291bf9e69 100644 --- a/themes/default/stick-active.svg +++ b/themes/default/stick-active.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="stick-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata36" /> + id="metadata39" /> <defs - id="defs34" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview32" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm index da71c6eb1..c850bfa0e 100644 --- a/themes/default/stick-active.xpm +++ b/themes/default/stick-active.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * stick_active_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".........@#@.........", +".........###.........", +".........###.........", +"......@#######@......", +"......#########......", +"......@#######@......", +".........###.........", +".........###.........", +".........@#@.........", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png Binary files differindex 8cd69af8b..1e5779ab5 100644 --- a/themes/default/stick-inactive.png +++ b/themes/default/stick-inactive.png diff --git a/themes/default/stick-inactive.svg b/themes/default/stick-inactive.svg index 94f10902e..46425c27b 100644 --- a/themes/default/stick-inactive.svg +++ b/themes/default/stick-inactive.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="stick-inactive.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata29" /> + id="metadata30" /> <defs - id="defs27" /> + id="defs28" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview25" /> + id="namedview26" /> <g transform="scale(1)" id="g3"> @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,0.5 L 21,0.5 C 21,0.5 21,28 21,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -130,13 +130,13 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="22" + width="21" height="18" x="0" y="1" /> @@ -148,30 +148,16 @@ style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" - d="M 0.5,0.5 L 21.5,0.5" + d="M 0.5,0.5 L 20.5,0.5" id="path6059" /> </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(3,9)"> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,28.5 L 20.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm index 1d7fa5256..1ada88050 100644 --- a/themes/default/stick-inactive.xpm +++ b/themes/default/stick-inactive.xpm @@ -1,34 +1,37 @@ /* XPM */ static char * stick_inactive_xpm[] = { -"22 29 2 1", +"21 29 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".........$#$.........", +".........###.........", +".........###.........", +"......$#######$......", +"......#########......", +"......$#######$......", +".........###.........", +".........###.........", +".........$#$.........", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/stick-prelight.png b/themes/default/stick-prelight.png Binary files differindex f7adf7194..1e5779ab5 100644 --- a/themes/default/stick-prelight.png +++ b/themes/default/stick-prelight.png diff --git a/themes/default/stick-prelight.svg b/themes/default/stick-prelight.svg index 1eb8e94f8..e024aec0d 100644 --- a/themes/default/stick-prelight.svg +++ b/themes/default/stick-prelight.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,30 +117,12 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,29 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm index da71c6eb1..05fb399d9 100644 --- a/themes/default/stick-prelight.xpm +++ b/themes/default/stick-prelight.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * stick_active_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@++++++++@#@++++++++@", +"@++++++++###++++++++@", +"@++++++++###++++++++@", +"@+++++@#######@+++++@", +"@+++++#########+++++@", +"@+++++@#######@+++++@", +"@++++++++###++++++++@", +"@++++++++###++++++++@", +"@++++++++@#@++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png Binary files differindex e2e1f8140..1e5779ab5 100644 --- a/themes/default/stick-pressed.png +++ b/themes/default/stick-pressed.png diff --git a/themes/default/stick-pressed.svg b/themes/default/stick-pressed.svg index 2d3ff1d1c..27370ef98 100644 --- a/themes/default/stick-pressed.svg +++ b/themes/default/stick-pressed.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,47 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1613" - transform="translate(5,10)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm index bac54bf90..07dc009f5 100644 --- a/themes/default/stick-pressed.xpm +++ b/themes/default/stick-pressed.xpm @@ -1,34 +1,38 @@ /* XPM */ static char * stick_pressed_xpm[] = { -"22 29 2 1", +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@........@#@........@", +"@........###........@", +"@........###........@", +"@.....@#######@.....@", +"@.....#########.....@", +"@.....@#######@.....@", +"@........###........@", +"@........###........@", +"@........@#@........@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png Binary files differindex 5e4ac8ce5..1e5779ab5 100644 --- a/themes/default/stick-toggled-active.png +++ b/themes/default/stick-toggled-active.png diff --git a/themes/default/stick-toggled-active.svg b/themes/default/stick-toggled-active.svg index 29b5892ba..8f02aac87 100644 --- a/themes/default/stick-toggled-active.svg +++ b/themes/default/stick-toggled-active.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata37" /> + id="metadata39" /> <defs - id="defs35" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview33" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -182,38 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="6" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm index e228f4230..346483fd8 100644 --- a/themes/default/stick-toggled-active.xpm +++ b/themes/default/stick-toggled-active.xpm @@ -1,34 +1,37 @@ /* XPM */ -static char * stick_toggled_active_xpm[] = { -"22 29 2 1", +static char * stick_active_xpm[] = { +"21 29 5 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".........###.........", +".........###.........", +".........@#@.........", +"......##$.$.@##......", +"......###@.@###......", +"......##@.@.@##......", +".........@#@.........", +".........###.........", +".........###.........", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png Binary files differindex 7ea6c60e1..1e5779ab5 100644 --- a/themes/default/stick-toggled-inactive.png +++ b/themes/default/stick-toggled-inactive.png diff --git a/themes/default/stick-toggled-inactive.svg b/themes/default/stick-toggled-inactive.svg index c20db8706..5306f5179 100644 --- a/themes/default/stick-toggled-inactive.svg +++ b/themes/default/stick-toggled-inactive.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -122,7 +122,7 @@ style="display:inline"> <path style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z " + d="M 0,0.5 L 21,0.5 C 21,0.5 21,28 21,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -130,13 +130,13 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="22" + width="21" height="18" x="0" y="1" /> @@ -148,39 +148,16 @@ style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" - d="M 0.5,0.5 L 21.5,0.5" + d="M 0.5,0.5 L 20.5,0.5" id="path6059" /> </g> <g inkscape:groupmode="layer" - id="g20" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(3,9)"> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="6" - sodipodi:cx="6" - id="path2202" - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" - d="M 0.5,28.5 L 21.5,28.5" + d="M 0.5,28.5 L 20.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm index 06e3c3a6f..08461cb67 100644 --- a/themes/default/stick-toggled-inactive.xpm +++ b/themes/default/stick-toggled-inactive.xpm @@ -1,34 +1,37 @@ /* XPM */ -static char * stick_toggled_inactive_xpm[] = { -"22 29 2 1", +static char * stick_inactive_xpm[] = { +"21 29 5 1", " c None", ". c #C0C0FF s inactive_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"@ c #949594 s inactive_shadow_2", +"# c #000000 s inactive_text_color", +"$ c #B4BAB4 s inactive_mid_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".........###.........", +".........###.........", +".........$#$.........", +"......##$.$.$##......", +"......###$.$###......", +"......##$.$.$##......", +".........$#$.........", +".........###.........", +".........###.........", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +".....................", +"....................."}; diff --git a/themes/default/stick-toggled-prelight.png b/themes/default/stick-toggled-prelight.png Binary files differindex eea0afbab..1e5779ab5 100644 --- a/themes/default/stick-toggled-prelight.png +++ b/themes/default/stick-toggled-prelight.png diff --git a/themes/default/stick-toggled-prelight.svg b/themes/default/stick-toggled-prelight.svg index 6c45d0ef1..723d55725 100644 --- a/themes/default/stick-toggled-prelight.svg +++ b/themes/default/stick-toggled-prelight.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-prelight.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata40" /> + id="metadata39" /> <defs - id="defs38" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview36" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -146,30 +117,12 @@ </metadata> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="prelight"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer2" inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -177,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -191,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -200,38 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,9)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="0" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm index e228f4230..8549a4b2e 100644 --- a/themes/default/stick-toggled-prelight.xpm +++ b/themes/default/stick-toggled-prelight.xpm @@ -1,34 +1,38 @@ /* XPM */ -static char * stick_toggled_active_xpm[] = { -"22 29 2 1", +static char * stick_active_xpm[] = { +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@++++++++###++++++++@", +"@++++++++###++++++++@", +"@++++++++@#@++++++++@", +"@+++++##@+@+@##+++++@", +"@+++++###@+@###+++++@", +"@+++++##@+@+@##+++++@", +"@++++++++@#@++++++++@", +"@++++++++###++++++++@", +"@++++++++###++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +"@+++++++++++++++++++@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png Binary files differindex b688b05a7..1e5779ab5 100644 --- a/themes/default/stick-toggled-pressed.png +++ b/themes/default/stick-toggled-pressed.png diff --git a/themes/default/stick-toggled-pressed.svg b/themes/default/stick-toggled-pressed.svg index a83a6a796..e5a4a3cfe 100644 --- a/themes/default/stick-toggled-pressed.svg +++ b/themes/default/stick-toggled-pressed.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" + width="21" height="29" id="svg2" sodipodi:version="0.32" @@ -19,9 +19,9 @@ sodipodi:docname="stick-toggled-pressed.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata40" /> + id="metadata39" /> <defs - id="defs38" /> + id="defs37" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview36" /> + id="namedview35" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,26 21,26 L 0,26 L 0,1 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" - d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z " + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,1 L 21,1 C 21,1 21,4 21,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="22" height="18" @@ -173,7 +144,7 @@ <g inkscape:label="Border" inkscape:groupmode="layer" - id="g31" + id="layer1" style="display:inline"> <path style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" @@ -182,56 +153,11 @@ </g> <g inkscape:groupmode="layer" - id="layer1" - inkscape:label="pressed"> - <g - id="g1789" - transform="translate(0,0)"> - <rect - style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" - x="1" - y="4" - rx="2" - ry="2" - width="20" - height="21" - id="path4123" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="g3722" - inkscape:label="Button"> - <g - style="display:inline" - id="g1625" - transform="translate(5,10)"> - <path - id="path1412" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - id="path2287" - d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="0" - sodipodi:cx="6" - id="path2292" - style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </g> - <g - inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 21.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,26.5 L 20.5,26.5" id="path6989" /> </g> </g> diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm index a470d7eb1..afe22d126 100644 --- a/themes/default/stick-toggled-pressed.xpm +++ b/themes/default/stick-toggled-pressed.xpm @@ -1,34 +1,38 @@ /* XPM */ -static char * stick_toggled_pressed_xpm[] = { -"22 29 2 1", +static char * stick_pressed_xpm[] = { +"21 29 6 1", " c None", -". c #C0C0FF s active_color_2", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; +"$ c #C0C0FF s active_color_2", +"@ c #949594 s active_shadow_2", +"# c #000000 s active_text_color", +". c #B4BAB4 s active_mid_2", +"+ c #B4BAB4 s active_hilight_2", +".....................", +".....................", +".....................", +".....................", +".....................", +".@@@@@@@@@@@@@@@@@@@.", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +"@........###........@", +"@........###........@", +"@........@#@........@", +"@.....##@.@.@##.....@", +"@.....###@.@###.....@", +"@.....##@.@.@##.....@", +"@........@#@........@", +"@........###........@", +"@........###........@", +"@...................@", +"@...................@", +"@...................@", +"@...................@", +".@@@@@@@@@@@@@@@@@@@.", +".....................", +".....................", +"....................."}; diff --git a/themes/default/themerc b/themes/default/themerc index f7135822b..f6b57d38f 100644 --- a/themes/default/themerc +++ b/themes/default/themerc @@ -2,8 +2,8 @@ active_text_color=active_text_color_2 active_text_shadow_color=active_hilight_2 inactive_text_color=inactive_text_color_2 inactive_text_shadow_color=inactive_hilight_2 -button_offset=2 -button_spacing=0 +button_offset=0 +button_spacing=2 full_width_title=true maximized_offset=0 show_app_icon=true diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png Binary files differindex e1a4d6e7f..bbbe28d7e 100644 --- a/themes/default/title-1-active.png +++ b/themes/default/title-1-active.png diff --git a/themes/default/title-1-active.svg b/themes/default/title-1-active.svg index 40fa25949..490249b20 100644 --- a/themes/default/title-1-active.svg +++ b/themes/default/title-1-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm index de1ca89e4..c424c37f6 100644 --- a/themes/default/title-1-active.xpm +++ b/themes/default/title-1-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "4 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "....", "....", "....", diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png Binary files differindex e1a4d6e7f..bbbe28d7e 100644 --- a/themes/default/title-1-inactive.png +++ b/themes/default/title-1-inactive.png diff --git a/themes/default/title-1-inactive.svg b/themes/default/title-1-inactive.svg index 6fb724b8d..b8230c72d 100644 --- a/themes/default/title-1-inactive.svg +++ b/themes/default/title-1-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png Binary files differindex e1a4d6e7f..bbbe28d7e 100644 --- a/themes/default/title-2-active.png +++ b/themes/default/title-2-active.png diff --git a/themes/default/title-2-active.svg b/themes/default/title-2-active.svg index 48c3d658f..be1c1b9cf 100644 --- a/themes/default/title-2-active.svg +++ b/themes/default/title-2-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm index de1ca89e4..c424c37f6 100644 --- a/themes/default/title-2-active.xpm +++ b/themes/default/title-2-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "4 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "....", "....", "....", diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png Binary files differindex e1a4d6e7f..bbbe28d7e 100644 --- a/themes/default/title-2-inactive.png +++ b/themes/default/title-2-inactive.png diff --git a/themes/default/title-2-inactive.svg b/themes/default/title-2-inactive.svg index 8db3967f5..37421b289 100644 --- a/themes/default/title-2-inactive.svg +++ b/themes/default/title-2-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png Binary files differindex e1a4d6e7f..bbbe28d7e 100644 --- a/themes/default/title-3-active.png +++ b/themes/default/title-3-active.png diff --git a/themes/default/title-3-active.svg b/themes/default/title-3-active.svg index caad8ec12..b657cdb6d 100644 --- a/themes/default/title-3-active.svg +++ b/themes/default/title-3-active.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm index de1ca89e4..c424c37f6 100644 --- a/themes/default/title-3-active.xpm +++ b/themes/default/title-3-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "4 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "....", "....", "....", diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png Binary files differindex e1a4d6e7f..bbbe28d7e 100644 --- a/themes/default/title-3-inactive.png +++ b/themes/default/title-3-inactive.png diff --git a/themes/default/title-3-inactive.svg b/themes/default/title-3-inactive.svg index fad4dcb2a..8b9616549 100644 --- a/themes/default/title-3-inactive.svg +++ b/themes/default/title-3-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png Binary files differindex eb584f9e2..bbbe28d7e 100644 --- a/themes/default/title-4-active.png +++ b/themes/default/title-4-active.png diff --git a/themes/default/title-4-active.svg b/themes/default/title-4-active.svg index c6a633347..d3d1b1ef8 100644 --- a/themes/default/title-4-active.svg +++ b/themes/default/title-4-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="title-4-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata32" /> + id="metadata26" /> <defs - id="defs30" /> + id="defs24" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview28" /> + id="namedview22" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,8 +156,8 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm index de1ca89e4..c424c37f6 100644 --- a/themes/default/title-4-active.xpm +++ b/themes/default/title-4-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "4 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "....", "....", "....", diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png Binary files differindex e1a4d6e7f..bbbe28d7e 100644 --- a/themes/default/title-4-inactive.png +++ b/themes/default/title-4-inactive.png diff --git a/themes/default/title-4-inactive.svg b/themes/default/title-4-inactive.svg index 1b92807c9..e88201e42 100644 --- a/themes/default/title-4-inactive.svg +++ b/themes/default/title-4-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png Binary files differindex 9412aa312..bbbe28d7e 100644 --- a/themes/default/title-5-active.png +++ b/themes/default/title-5-active.png diff --git a/themes/default/title-5-active.svg b/themes/default/title-5-active.svg index 35259f2b9..9cb911e3f 100644 --- a/themes/default/title-5-active.svg +++ b/themes/default/title-5-active.svg @@ -19,9 +19,9 @@ sodipodi:docname="title-5-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata32" /> + id="metadata26" /> <defs - id="defs30" /> + id="defs24" /> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -33,7 +33,7 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview28" /> + id="namedview22" /> <g transform="scale(1)" id="g3"> @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,8 +121,8 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " id="path6057" /> </g> <g @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,8 +156,8 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" - d="M 0.5,26.5 L 7.5,26.5" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </g> diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm index de1ca89e4..c424c37f6 100644 --- a/themes/default/title-5-active.xpm +++ b/themes/default/title-5-active.xpm @@ -2,7 +2,7 @@ static char * title_active_xpm[] = { "4 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", "....", "....", "....", diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png Binary files differindex e1a4d6e7f..bbbe28d7e 100644 --- a/themes/default/title-5-inactive.png +++ b/themes/default/title-5-inactive.png diff --git a/themes/default/title-5-inactive.svg b/themes/default/title-5-inactive.svg index dd103dee6..4cd5161bb 100644 --- a/themes/default/title-5-inactive.svg +++ b/themes/default/title-5-inactive.svg @@ -130,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png Binary files differindex 833473a92..c49e09e30 100644 --- a/themes/default/top-left-active.png +++ b/themes/default/top-left-active.png diff --git a/themes/default/top-left-active.svg b/themes/default/top-left-active.svg index d387eeac3..c540fea02 100644 --- a/themes/default/top-left-active.svg +++ b/themes/default/top-left-active.svg @@ -132,11 +132,14 @@ <path id="path6061" d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z " - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z " - id="path1884" /> + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g style="display:inline" diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm index a0d9e090a..9e6d80deb 100644 --- a/themes/default/top-left-active.xpm +++ b/themes/default/top-left-active.xpm @@ -2,7 +2,7 @@ static char * top_left_active_xpm[] = { "8 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", " ....", " ......", " .......", diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png Binary files differindex 833473a92..c49e09e30 100644 --- a/themes/default/top-left-inactive.png +++ b/themes/default/top-left-inactive.png diff --git a/themes/default/top-left-inactive.svg b/themes/default/top-left-inactive.svg index 4e8dd85b2..301d2652f 100644 --- a/themes/default/top-left-inactive.svg +++ b/themes/default/top-left-inactive.svg @@ -132,11 +132,14 @@ <path id="path6061" d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z " - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z " - id="path1884" /> + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g style="display:inline" diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png Binary files differindex c50d012c5..aa8ea59c4 100644 --- a/themes/default/top-right-active.png +++ b/themes/default/top-right-active.png diff --git a/themes/default/top-right-active.svg b/themes/default/top-right-active.svg index 4b7f8516a..3255cc177 100644 --- a/themes/default/top-right-active.svg +++ b/themes/default/top-right-active.svg @@ -51,35 +51,6 @@ id="stop1890" /> </linearGradient> <linearGradient - id="linearGradient5847"> - <stop - id="stop5849" - offset="0" - style="stop-color:black;stop-opacity:0.30;" /> - <stop - id="stop2776" - offset="0.4" - style="stop-color:black;stop-opacity:0.20;" /> - <stop - id="stop2779" - offset="0.6" - style="stop-color:black;stop-opacity:0.25;" /> - <stop - id="stop5851" - offset="1" - style="stop-color:black;stop-opacity:0.10;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5847" - id="linearGradient6945" - gradientUnits="userSpaceOnUse" - x1="0" - y1="0.5" - x2="0" - y2="28.5" - gradientTransform="matrix(1,0,0,1,0,0)" /> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient1886" id="linearGradient1892" @@ -150,7 +121,7 @@ inkscape:label="Grad" style="display:inline"> <path - style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z " id="path6057" /> </g> @@ -159,11 +130,11 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" height="18" @@ -185,7 +156,7 @@ id="layer5" inkscape:label="Shadow"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0" d="M 0.5,26.5 L 6.5,26.5" id="path6989" /> </g> diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm index 1cb06087a..bf8491418 100644 --- a/themes/default/top-right-active.xpm +++ b/themes/default/top-right-active.xpm @@ -2,7 +2,7 @@ static char * top_right_active_xpm[] = { "8 29 2 1", " c None", -". c #C0C0FF s active_color_2", +". c #C0C0FF s active_mid_2", ".... ", "...... ", "....... ", diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png Binary files differindex b61250d3f..aa8ea59c4 100644 --- a/themes/default/top-right-inactive.png +++ b/themes/default/top-right-inactive.png diff --git a/themes/default/top-right-inactive.svg b/themes/default/top-right-inactive.svg index fd39f28b6..2d2477bff 100644 --- a/themes/default/top-right-inactive.svg +++ b/themes/default/top-right-inactive.svg @@ -130,13 +130,16 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" + style="fill:none;fill-opacity:0.05;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z " id="path6061" /> - <path - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z " - id="path1884" /> + <rect + style="opacity:0.05;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect1884" + width="8" + height="18" + x="0" + y="1" /> </g> <g inkscape:label="Border" |
