diff options
Diffstat (limited to 'themes/default-xhdpi')
147 files changed, 2530 insertions, 3908 deletions
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" |
