diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index dad484edbf2ba1dd87c6596ebd8a0892b050a4bd..675ff2cedea9c7fb579a20c010af89a27b86d5e7 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Kokodi/xfwm4
+themedir = $(datadir)/themes/Default/xfwm4
PNG_FILES = \
bottom-active.png \
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index 547c71fc557be5b298cea42f115fc9f43a42b5c2..dd7d55914b0d1ce46772b14da5d5d85260036ed0 100644
Binary files a/themes/default/bottom-active.png and b/themes/default/bottom-active.png differ
diff --git a/themes/default/bottom-active.svg b/themes/default/bottom-active.svg
index 513b263469f49e5ae243fe3035b978ff931b9633..1061bfc781438084b8da782444f8d543748cf79b 100644
--- a/themes/default/bottom-active.svg
+++ b/themes/default/bottom-active.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="bottom-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -86,9 +85,9 @@
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="border">
+ id="layer1">
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
d="M 0,5.5 L 24,5.5"
id="path1340" />
</g>
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index 05b089ae5b777a1acaa2dacf6deddd0fb2afdac3..af481a2c151148e6f18f324bb0e352fca80bcc3e 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -6,7 +6,7 @@ static char * bottom_active_xpm[] = {
"@ c #C0C0FF s active_color_1",
"########################",
"########################",
-"########################",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
index 547c71fc557be5b298cea42f115fc9f43a42b5c2..c7111c587988dda766382a29ccd53f02b3591ae8 100644
Binary files a/themes/default/bottom-inactive.png and b/themes/default/bottom-inactive.png differ
diff --git a/themes/default/bottom-inactive.svg b/themes/default/bottom-inactive.svg
index 31c4e63a4a65a78ef77ce22dda9c045c69e86257..ec45610db47fe8eedf1d9ea7062409867d5a0f60 100644
--- a/themes/default/bottom-inactive.svg
+++ b/themes/default/bottom-inactive.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="bottom-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -86,9 +85,9 @@
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="border">
+ id="layer1">
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
d="M 0,5.5 L 24,5.5"
id="path1340" />
</g>
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index ad03c07ae91b6089bca281109ebd3095ee426369..f70bcabb559121386641932eaf4bbd1a889f41cf 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -6,7 +6,7 @@ static char * bottom_inactive_xpm[] = {
"@ c #C0C0FF s inactive_color_1",
"########################",
"########################",
-"########################",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
index 84611f71906c43826b992b77801da2dff21dc79c..b1140bb7132e9a43357e46e46cae54723382c0d4 100644
Binary files a/themes/default/bottom-left-active.png and b/themes/default/bottom-left-active.png differ
diff --git a/themes/default/bottom-left-active.svg b/themes/default/bottom-left-active.svg
index c0f8ae2ab7c89430580134e41be92df57f7ed9ce..d3d9f288133257ccfea3969dee2a12b48090651e 100644
--- a/themes/default/bottom-left-active.svg
+++ b/themes/default/bottom-left-active.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="bottom-left-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -87,7 +86,7 @@
inkscape:groupmode="layer"
id="layer1">
<path
- style="fill:black;fill-opacity:0.20"
+ style="fill:black;fill-opacity:0.50"
d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
id="rect1870" />
</g>
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index 42f3c164e820c9e1dba930d51966fd13818f85a4..8eb1e7d77887076c2a0e254d93f3467561292d4d 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -4,19 +4,19 @@ static char * bottom_left_active_xpm[] = {
" c None",
"# c #C0C0C0 s active_color_2",
"@ c #C0C0FF s active_color_1",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@#############",
-"@@@#############",
-"@@@#############",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@############",
+"@@@@############",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
" @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.png b/themes/default/bottom-left-inactive.png
index 84611f71906c43826b992b77801da2dff21dc79c..e96896ecb1bbb2fa0c56c106ac82863a8715f03e 100644
Binary files a/themes/default/bottom-left-inactive.png and b/themes/default/bottom-left-inactive.png differ
diff --git a/themes/default/bottom-left-inactive.svg b/themes/default/bottom-left-inactive.svg
index eaf49ad05dead6b2543a90b3ed035cc69cbe2169..8f40226c94a4bc4ca0f11e3c00e51b80e398ac21 100644
--- a/themes/default/bottom-left-inactive.svg
+++ b/themes/default/bottom-left-inactive.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="bottom-left-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -87,7 +86,7 @@
inkscape:groupmode="layer"
id="layer1">
<path
- style="fill:black;fill-opacity:0.20"
+ style="fill:black;fill-opacity:0.50"
d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
id="rect1870" />
</g>
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index a1ddb0c4b67e3f19b288582ce316b980240ea2ee..52498ef0b5263f7b6abe031347ca07715358fd92 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -4,19 +4,19 @@ static char * bottom_left_inactive_xpm[] = {
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_1",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@### ",
-"@@@#############",
-"@@@#############",
-"@@@#############",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@## ",
+"@@@@############",
+"@@@@############",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
" @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
index 5a9b57e37afe45ec44458f5ff8dbf04ab1d78786..8175e4c8d262ce7225ce300cf8f3b2c6c7d030df 100644
Binary files a/themes/default/bottom-right-active.png and b/themes/default/bottom-right-active.png differ
diff --git a/themes/default/bottom-right-active.svg b/themes/default/bottom-right-active.svg
index 462f517049c4fe646afed564000c627e031cd20c..f883962cc790cdda452f9d2e0b04eefb496dfe11 100644
--- a/themes/default/bottom-right-active.svg
+++ b/themes/default/bottom-right-active.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="bottom-right-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -87,7 +86,7 @@
inkscape:groupmode="layer"
id="layer1">
<path
- style="fill:black;fill-opacity:0.20"
+ style="fill:black;fill-opacity:0.50"
d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
id="rect1870" />
</g>
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 159230751100aaceb938ff8ca643020cb9ebf66c..e9c1535277e628eccbe02ed0f67392acb25949f4 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -4,19 +4,19 @@ static char * bottom_right_active_xpm[] = {
" c None",
"# c #C0C0C0 s active_color_2",
"@ c #C0C0FF s active_color_1",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-"#############@@@",
-"#############@@@",
-"#############@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+"############@@@@",
+"############@@@@",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.png b/themes/default/bottom-right-inactive.png
index 5a9b57e37afe45ec44458f5ff8dbf04ab1d78786..318e397b4a3bdc2ff0a223cf93f604a6d02dcf02 100644
Binary files a/themes/default/bottom-right-inactive.png and b/themes/default/bottom-right-inactive.png differ
diff --git a/themes/default/bottom-right-inactive.svg b/themes/default/bottom-right-inactive.svg
index 5e81277fe518bab0d8f2a13a70fbf9030cdcb17f..a1f90359c569abb90280aa6f37453cffcdc4e323 100644
--- a/themes/default/bottom-right-inactive.svg
+++ b/themes/default/bottom-right-inactive.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="bottom-right-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -87,7 +86,7 @@
inkscape:groupmode="layer"
id="layer1">
<path
- style="fill:black;fill-opacity:0.20"
+ style="fill:black;fill-opacity:0.50"
d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
id="rect1870" />
</g>
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 42a8e492f3edfb182365b0152b3ddf33c17aec54..43420e08ffbd2b8244ac2ad2fd44ecf2457b55bb 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -4,19 +4,19 @@ static char * bottom_right_inactive_xpm[] = {
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_1",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-" ###@@@",
-"#############@@@",
-"#############@@@",
-"#############@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+" ##@@@@",
+"############@@@@",
+"############@@@@",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index 72fa30ab90a104748f2996d19ce140bbdbdd9e4f..2d8ffc20ba39c956a87ce4feb9fd83fd0579e7c9 100644
Binary files a/themes/default/close-active.png and b/themes/default/close-active.png differ
diff --git a/themes/default/close-active.svg b/themes/default/close-active.svg
index 1110e7190902449eb20053a655a049db221de75f..8e048f1c09bfbddfb6e27453889bca4dd2e3e705 100644
--- a/themes/default/close-active.svg
+++ b/themes/default/close-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="close-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -134,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -152,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -169,76 +172,50 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
id="g20"
inkscape:label="Button">
<g
- id="g2327"
- transform="translate(6,4)">
+ id="g2328"
+ transform="translate(3,7)">
<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"
+ style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g2217">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;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.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;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.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index d255e0ba445509488557196f5d0bdc3e8c26c521..d5c777374b0e264d4e92895f07c3260a69ed8c7e 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * close_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index d92c911e05bfde631e058d72295dca5fea453925..2733145f0daf1aa262dea477fe36cc943222f242 100644
Binary files a/themes/default/close-inactive.png and b/themes/default/close-inactive.png differ
diff --git a/themes/default/close-inactive.svg b/themes/default/close-inactive.svg
index e3b344ced9747ae594b03a0b03b5887b2089a9d9..f53816dc66d7dc92d4cf41bcf6774e666f66d617 100644
--- a/themes/default/close-inactive.svg
+++ b/themes/default/close-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="close-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,59 +172,37 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
id="g20"
inkscape:label="Button">
<g
- id="g2327"
- transform="translate(6,4)">
+ id="g2328"
+ transform="translate(3,7)">
<path
id="path2221"
d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
- style="opacity:0.25;fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+ style="opacity:0.50;fill:none;fill-opacity:0.50;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.25;fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+ style="opacity:0.50;fill:none;fill-opacity:0.50;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index c57f58d5ec9652e0f7c06614732f4af8b5d65f3f..bde5d4415c053ff1d154fa91e3798aa3ddc20b7c 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/close-prelight.png b/themes/default/close-prelight.png
index 68aa09ca997b0fc5812c43f8664eacaa82e51403..4af0277efbcfdae14a753798f3ee2b370f155dd7 100644
Binary files a/themes/default/close-prelight.png and b/themes/default/close-prelight.png differ
diff --git a/themes/default/close-prelight.svg b/themes/default/close-prelight.svg
index 0dfc78acb30830fe013e18e7b69d23bda1bd6086..7f5d8fe7fa12efea5a8e9a23e68aa1f38169cfe3 100644
--- a/themes/default/close-prelight.svg
+++ b/themes/default/close-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="close-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#ffd0d0;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#ffd0d0;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
id="layer1"
- inkscape:label="pressed">
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,76 +186,50 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
+ y="12" />
<path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
- inkscape:label="Border"
inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="g3722"
+ id="g20"
inkscape:label="Button">
<g
- id="g2327"
- transform="translate(6,4)">
+ id="g2328"
+ transform="translate(3,7)">
<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"
+ style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g2217">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;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.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;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.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm
index 8b6d28347191fbf9251da1aff09bed2970da42fe..d5c777374b0e264d4e92895f07c3260a69ed8c7e 100644
--- a/themes/default/close-prelight.xpm
+++ b/themes/default/close-prelight.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * close_pressed_xpm[] = {
-"24 28 2 1",
+static char * close_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index 50d60f919c5365f628f69a8e56cfa99972492431..bfade6ae01191564a63cb320b1846473c0dc11ec 100644
Binary files a/themes/default/close-pressed.png and b/themes/default/close-pressed.png differ
diff --git a/themes/default/close-pressed.svg b/themes/default/close-pressed.svg
index 63bcb97310d7150975c89b774a98648d23e4bbe0..ce811d7ae4145015cafeec1d66c744cc5082e028 100644
--- a/themes/default/close-pressed.svg
+++ b/themes/default/close-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="close-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#ffd0d0;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#ffd0d0;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -163,20 +145,28 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="g24"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,76 +186,50 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect1884"
- width="24"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
id="g3722"
inkscape:label="Button">
<g
- id="g2327"
- transform="translate(6,5)">
+ id="g2328"
+ transform="translate(3,8)">
<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"
+ style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g2217">
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;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.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;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.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 8b6d28347191fbf9251da1aff09bed2970da42fe..d5c777374b0e264d4e92895f07c3260a69ed8c7e 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * close_pressed_xpm[] = {
-"24 28 2 1",
+static char * close_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index d35dde136f20b0a75fd43ecb7542f1cc121f8ae6..ad560ff3f82d1b0ed69e5d319091633bd1500dcc 100644
Binary files a/themes/default/hide-active.png and b/themes/default/hide-active.png differ
diff --git a/themes/default/hide-active.svg b/themes/default/hide-active.svg
index a826607affb64de3f65b7451b1a4bd670409f5a8..cb478acc1f44f0028bec7ce1b9a93019ae2a2e28 100644
--- a/themes/default/hide-active.svg
+++ b/themes/default/hide-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="hide-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -134,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -152,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -169,38 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -209,16 +195,16 @@
<g
style="display:inline"
id="g1616"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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"
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;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"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
id="rect2378"
width="6"
height="2"
@@ -226,13 +212,4 @@
y="8" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 95b703ee7702d6d1754c4a3a973c82d51b235fae..ffa5e9d7605be553e630d532ef58d128dd409b59 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * hide_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index e14dc49688d2ea38d28a7f55f6abeb698d764088..a25077a3570c03e3d786a3a15ba3783ac8d89666 100644
Binary files a/themes/default/hide-inactive.png and b/themes/default/hide-inactive.png differ
diff --git a/themes/default/hide-inactive.svg b/themes/default/hide-inactive.svg
index 0afdf930ea02c3ab900a544fbb10842a995d5f26..7af026228fe523d70244f00f8a5f09ffbe612056 100644
--- a/themes/default/hide-inactive.svg
+++ b/themes/default/hide-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="hide-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,34 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -187,9 +195,9 @@
<g
style="display:inline"
id="g1616"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<rect
- style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ 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"
@@ -197,13 +205,4 @@
y="8" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 5a3bdce915f4cc2f1fc393ee24029c6f12933186..fcc8b1312f04663d72f6d79a008104ba40de3a2d 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/hide-prelight.png b/themes/default/hide-prelight.png
index f9efe95ed084931061e2cddddd76638383e0f010..9383c4ffe59122c5482f63975073bdc813c8779c 100644
Binary files a/themes/default/hide-prelight.png and b/themes/default/hide-prelight.png differ
diff --git a/themes/default/hide-prelight.svg b/themes/default/hide-prelight.svg
index 118d5e4d5dde7b43c6d4e958fa1e26a58737842d..9181b210ed290ac5a89a08db0b2e70537e81f99c 100644
--- a/themes/default/hide-prelight.svg
+++ b/themes/default/hide-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="hide-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
id="layer1"
- inkscape:label="pressed">
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,56 +186,39 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
+ id="g20"
inkscape:label="Button">
<g
style="display:inline"
id="g1616"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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"
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;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"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
id="rect2378"
width="6"
height="2"
@@ -253,13 +226,4 @@
y="8" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm
index 06d93779f5ad5292645889e259090d95d487be43..ffa5e9d7605be553e630d532ef58d128dd409b59 100644
--- a/themes/default/hide-prelight.xpm
+++ b/themes/default/hide-prelight.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * hide_pressed_xpm[] = {
-"24 28 2 1",
+static char * hide_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index fd8dd1d940e1d9b97aaa87b8e16f8b5348c6cc68..126614436a652b31812d7c530264a024a1820cb2 100644
Binary files a/themes/default/hide-pressed.png and b/themes/default/hide-pressed.png differ
diff --git a/themes/default/hide-pressed.svg b/themes/default/hide-pressed.svg
index f705b5cdde26062efc9f5eceac60085f048334a5..c1433e2a2f9bf0788beb740a5f41125f09785891 100644
--- a/themes/default/hide-pressed.svg
+++ b/themes/default/hide-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="hide-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
+ id="g24"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,38 +186,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect1884"
- width="24"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -236,16 +209,16 @@
<g
style="display:inline"
id="g1616"
- transform="translate(6,5)">
+ transform="translate(3,8)">
<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"
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;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"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
id="rect2378"
width="6"
height="2"
@@ -253,13 +226,4 @@
y="8" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 06d93779f5ad5292645889e259090d95d487be43..ffa5e9d7605be553e630d532ef58d128dd409b59 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * hide_pressed_xpm[] = {
-"24 28 2 1",
+static char * hide_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
index ce79b04af4ccc18482ac7237be318dd23137b986..e0602838f2509ab2409c07757d9926818e9682fe 100644
Binary files a/themes/default/left-active.png and b/themes/default/left-active.png differ
diff --git a/themes/default/left-active.svg b/themes/default/left-active.svg
index 09cf390c46a195ac560e9e46cb9e63a504d86ec5..751057e940e6cee5e6587f295ad89b5b88d8b198 100644
--- a/themes/default/left-active.svg
+++ b/themes/default/left-active.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="left-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -84,9 +83,9 @@
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="border">
+ id="layer1">
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
d="M 0.5,0 L 0.5,24"
id="path1340" />
</g>
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 121053a40bf6db4e670aca6fff493dcb293841ad..2428adb5ab6693f591c5f33e7b6f189654ca2f9f 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -4,27 +4,27 @@ static char * left_active_xpm[] = {
" c None",
"# c #C0C0C0 s active_color_2",
"@ c #C0C0FF s active_color_1",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###"};
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##"};
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
index ce79b04af4ccc18482ac7237be318dd23137b986..3d7c9f75c42fb4ebd89d61fda6dabe5ee4db03b3 100644
Binary files a/themes/default/left-inactive.png and b/themes/default/left-inactive.png differ
diff --git a/themes/default/left-inactive.svg b/themes/default/left-inactive.svg
index 988a1a8e33d5d89747cacec8c818644d04c84ef9..23ff01747b744e90c59d441cdbd333066432d985 100644
--- a/themes/default/left-inactive.svg
+++ b/themes/default/left-inactive.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="left-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -84,9 +83,9 @@
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="border">
+ id="layer1">
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
d="M 0.5,0 L 0.5,24"
id="path1340" />
</g>
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index 079ae5926011e9d707a842bdf26d4c053ccca745..2e0dd60d37bc481722e40673226156897c8166cb 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -4,27 +4,27 @@ static char * left_inactive_xpm[] = {
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_1",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###"};
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##"};
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index f6d463a125043e351bc7479a800c182acb106136..8f25e0f389322ddfcb1fad5760cba33aa850b4f8 100644
Binary files a/themes/default/maximize-active.png and b/themes/default/maximize-active.png differ
diff --git a/themes/default/maximize-active.svg b/themes/default/maximize-active.svg
index f01344405929e288079db4b27b910cbf07201639..c2d2deaefc35ea9ee51cac8e87288929fcd010a3 100644
--- a/themes/default/maximize-active.svg
+++ b/themes/default/maximize-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="maximize-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -134,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -152,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -169,38 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -209,24 +195,15 @@
<g
style="display:inline"
id="g1614"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<path
- id="rect2276"
+ id="rect2246"
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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
<path
- id="rect2275"
+ id="rect2285"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 62a15801d52a622f75b52a37a8897f21cd26bdd3..5ec094da2926f7929e41e74ee337db8fe5f19cd9 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index 880e55a0fa8dee0f7a6b054985538690e5ce8dbd..47efd9521612a4c26dbe801074269f83af1b77b5 100644
Binary files a/themes/default/maximize-inactive.png and b/themes/default/maximize-inactive.png differ
diff --git a/themes/default/maximize-inactive.svg b/themes/default/maximize-inactive.svg
index 647a075013025911ca031225d4c2ac3c2c3988a4..2daab1781a3054c4237e3c9ba2794c4105516221 100644
--- a/themes/default/maximize-inactive.svg
+++ b/themes/default/maximize-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="maximize-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,34 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -186,21 +194,12 @@
inkscape:label="Button">
<g
style="display:inline"
- id="g1627"
- transform="translate(6,4)">
+ id="g1624"
+ transform="translate(3,7)">
<path
- style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ 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" />
+ id="rect2285" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index fef091db9de5dd79e4eb8748ec47838b2477324d..0fbdd0d57391c600818eec3f4eb50872f2b782f7 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/maximize-prelight.png b/themes/default/maximize-prelight.png
index 1efb0ac449334af3c2a083da8ee5b7a9f5b35e2a..7605ce915061d7adf97a655e52382929f080d065 100644
Binary files a/themes/default/maximize-prelight.png and b/themes/default/maximize-prelight.png differ
diff --git a/themes/default/maximize-prelight.svg b/themes/default/maximize-prelight.svg
index 1ac9e6bf4f01f84f9ff448096b7389a47b92acb3..6a10ef48ac5327ece70761fbb5bb1be5ecb600d1 100644
--- a/themes/default/maximize-prelight.svg
+++ b/themes/default/maximize-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="maximize-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
id="layer1"
- inkscape:label="pressed">
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,64 +186,38 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
+ id="g20"
inkscape:label="Button">
<g
style="display:inline"
id="g1614"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<path
- id="rect2276"
+ id="rect2246"
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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
<path
- id="rect2275"
+ id="rect2285"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm
index c91fbf14721fdc5c2a4a0c466315258f573b1715..5ec094da2926f7929e41e74ee337db8fe5f19cd9 100644
--- a/themes/default/maximize-prelight.xpm
+++ b/themes/default/maximize-prelight.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * maximize_pressed_xpm[] = {
-"24 28 2 1",
+static char * maximize_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index ed9b4d2c6ae91a1560e303c40cb073c35b2537f4..9468931554874f210e45d788bd2296a3c160d46b 100644
Binary files a/themes/default/maximize-pressed.png and b/themes/default/maximize-pressed.png differ
diff --git a/themes/default/maximize-pressed.svg b/themes/default/maximize-pressed.svg
index 93612dcd22d5c80b81bab3be9f9bc694c4d8c785..2127b8fa2d5aef55d7e0d05e7f4779ccecc3eee2 100644
--- a/themes/default/maximize-pressed.svg
+++ b/themes/default/maximize-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="maximize-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
+ id="g24"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,38 +186,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect1884"
- width="24"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -236,24 +209,15 @@
<g
style="display:inline"
id="g1614"
- transform="translate(6,5)">
+ transform="translate(3,8)">
<path
- id="rect2276"
+ id="rect2246"
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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
<path
- id="rect2275"
+ id="rect2285"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index c91fbf14721fdc5c2a4a0c466315258f573b1715..5ec094da2926f7929e41e74ee337db8fe5f19cd9 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * maximize_pressed_xpm[] = {
-"24 28 2 1",
+static char * maximize_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index 50b4c494f43a178b97a99c1dea14bf91249a4cf7..eb21698ec86b90c77c7a7eb8f7d2550d052e887d 100644
Binary files a/themes/default/maximize-toggled-active.png and b/themes/default/maximize-toggled-active.png differ
diff --git a/themes/default/maximize-toggled-active.svg b/themes/default/maximize-toggled-active.svg
index b3e4eb4a4a4d1d8c3dff2f73fca0f026726d992f..9aa6ac66970a0c9a18d6094b864eb6789e37abcb 100644
--- a/themes/default/maximize-toggled-active.svg
+++ b/themes/default/maximize-toggled-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="maximize-toggled-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -134,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -152,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -169,38 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -208,29 +194,20 @@
inkscape:label="Button">
<g
style="display:inline"
- id="g1627"
- transform="translate(6,4)">
+ id="g1624"
+ transform="translate(3,7)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index de33ff823bcb3f19a3d04247c569d89f61c78b33..de884b3b8f137cb2bc23ad9509d9e15095734e6c 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * maximize_toggled_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index 97ee9a4746219fb64b3a38d320f81ee9f0d6f05a..15383a502d7f2b5f220f7d2b49f7a6649a1f9c6b 100644
Binary files a/themes/default/maximize-toggled-inactive.png and b/themes/default/maximize-toggled-inactive.png differ
diff --git a/themes/default/maximize-toggled-inactive.svg b/themes/default/maximize-toggled-inactive.svg
index 71abed660e0b5af03787e4368df1b6ab1bdfec82..b62705188755112e34d5572d0b06a35c2d16f38a 100644
--- a/themes/default/maximize-toggled-inactive.svg
+++ b/themes/default/maximize-toggled-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="maximize-toggled-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,34 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -187,24 +195,15 @@
<g
style="display:inline"
id="g1639"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ 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.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ 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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 4d894c19c2c518581ff71a310ddba4bb63095604..5dc29b3bab8dfb55c16162e390100f56ef19dbd9 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * maximize_toggled_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/maximize-toggled-prelight.png b/themes/default/maximize-toggled-prelight.png
index d312dfd15ac584d551df11a8b691439342204491..a84c713bd32d3d9b946f85f7b1b6622660f5c677 100644
Binary files a/themes/default/maximize-toggled-prelight.png and b/themes/default/maximize-toggled-prelight.png differ
diff --git a/themes/default/maximize-toggled-prelight.svg b/themes/default/maximize-toggled-prelight.svg
index ad802f6e1e4375e8b12ba3e8efba8e443e26673f..be63ff08663d1ee1fe1a4e423b9294920aa51e16 100644
--- a/themes/default/maximize-toggled-prelight.svg
+++ b/themes/default/maximize-toggled-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="maximize-toggled-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
id="layer1"
- inkscape:label="pressed">
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,68 +186,42 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
+ id="g20"
inkscape:label="Button">
<g
style="display:inline"
- id="g1627"
- transform="translate(6,4)">
+ id="g1624"
+ transform="translate(3,7)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm
index b07da63e6403e3a517fd4578e259ed539c5297f3..de884b3b8f137cb2bc23ad9509d9e15095734e6c 100644
--- a/themes/default/maximize-toggled-prelight.xpm
+++ b/themes/default/maximize-toggled-prelight.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * maximize_toggled_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index 0e95cb7b3df8e0e031016d2a6459215d706116c7..1175472b545d79648c41959db2a3539c6eef7310 100644
Binary files a/themes/default/maximize-toggled-pressed.png and b/themes/default/maximize-toggled-pressed.png differ
diff --git a/themes/default/maximize-toggled-pressed.svg b/themes/default/maximize-toggled-pressed.svg
index 56e2a88524baf94dc213e48cc70a2bb6e1d1db6b..18a297049cabe526303b1393412398569447fa9c 100644
--- a/themes/default/maximize-toggled-pressed.svg
+++ b/themes/default/maximize-toggled-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="maximize-toggled-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
+ id="g24"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,38 +186,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect1884"
- width="24"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -235,29 +208,20 @@
inkscape:label="Button">
<g
style="display:inline"
- id="g1627"
- transform="translate(6,5)">
+ id="g1624"
+ transform="translate(3,8)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index b07da63e6403e3a517fd4578e259ed539c5297f3..de884b3b8f137cb2bc23ad9509d9e15095734e6c 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * maximize_toggled_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
index 4bcb15fab1c8658c1c8be4812e71f0b475534664..2f1314e3f2ff85f4f2de1b96f54d4c7dfbb0b039 100644
Binary files a/themes/default/menu-active.png and b/themes/default/menu-active.png differ
diff --git a/themes/default/menu-active.svg b/themes/default/menu-active.svg
index c496943465b80b7f19b17ac7addf2a0b8e33f4c4..4d0c56fd09c75601b5ae59687b9abc659b61b7cb 100644
--- a/themes/default/menu-active.svg
+++ b/themes/default/menu-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="18"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="menu-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,59 +145,47 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
- transform="translate(0,-6)"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
- transform="translate(0,-6)"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-6)"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- transform="translate(0,-6)"
- inkscape:label="Shadow">
+ y="12" />
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
- d="M 0.5,27.5 L 23.5,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 3a9d0f45a78a5ccd59aa0159d005a08ee98e230e..0b60759d1e2e4ed24fd88054da2d2d39bdc2667a 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,23 +1,29 @@
/* XPM */
static char * menu_active_xpm[] = {
-"24 17 2 1",
+"16 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+" ",
+" "};
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
index 6f280f9b44254a10584d8ff76550a488fde9b054..cdf07269c9f37cce1b89a3f5380c9e0eb99c83b7 100644
Binary files a/themes/default/menu-inactive.png and b/themes/default/menu-inactive.png differ
diff --git a/themes/default/menu-inactive.svg b/themes/default/menu-inactive.svg
index 2d95c1d8a4e24a002ed645a9d1bd25f1815a9acf..f18835ea61e2f749c06b966301b6aa41e1c821f3 100644
--- a/themes/default/menu-inactive.svg
+++ b/themes/default/menu-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="18"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="menu-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,59 +145,47 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
- transform="translate(0,-6)"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
- transform="translate(0,-6)"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-6)"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- transform="translate(0,-6)"
- inkscape:label="Shadow">
+ y="12" />
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
- d="M 0.5,27.5 L 23.5,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 8f07169eb93830fd66b5f0fb5ff10ee936e59210..c004dee548fac76681431a8868b81fa7db64722e 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,23 +1,29 @@
/* XPM */
static char * menu_inactive_xpm[] = {
-"24 17 2 1",
+"16 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+" ",
+" "};
diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png
index fcc67bfee56ecc32853fd4240dd54ca54d501030..2f1314e3f2ff85f4f2de1b96f54d4c7dfbb0b039 100644
Binary files a/themes/default/menu-prelight.png and b/themes/default/menu-prelight.png differ
diff --git a/themes/default/menu-prelight.svg b/themes/default/menu-prelight.svg
index 7d74450c9ee781aef0a4a67a81aec46516435223..a861545ba07479cf275105988494a3befe5f1dc0 100644
--- a/themes/default/menu-prelight.svg
+++ b/themes/default/menu-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="18"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="menu-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,59 +145,47 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
- transform="translate(0,-6)"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
- transform="translate(0,-6)"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-6)"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- transform="translate(0,-6)"
- inkscape:label="Shadow">
+ y="12" />
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
- d="M 0.5,27.5 L 23.5,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/menu-prelight.xpm b/themes/default/menu-prelight.xpm
index 3a9d0f45a78a5ccd59aa0159d005a08ee98e230e..0b60759d1e2e4ed24fd88054da2d2d39bdc2667a 100644
--- a/themes/default/menu-prelight.xpm
+++ b/themes/default/menu-prelight.xpm
@@ -1,23 +1,29 @@
/* XPM */
static char * menu_active_xpm[] = {
-"24 17 2 1",
+"16 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+" ",
+" "};
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index fcc67bfee56ecc32853fd4240dd54ca54d501030..2f1314e3f2ff85f4f2de1b96f54d4c7dfbb0b039 100644
Binary files a/themes/default/menu-pressed.png and b/themes/default/menu-pressed.png differ
diff --git a/themes/default/menu-pressed.svg b/themes/default/menu-pressed.svg
index e424f43856d344ddbca9f8b130cf27151488d61a..a065f661072c1f69fe788ab31ee69233cdec3604 100644
--- a/themes/default/menu-pressed.svg
+++ b/themes/default/menu-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="18"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="menu-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,59 +145,47 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
- transform="translate(0,-6)"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
- transform="translate(0,-6)"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-6)"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- transform="translate(0,-6)"
- inkscape:label="Shadow">
+ y="12" />
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
- d="M 0.5,27.5 L 23.5,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index bfe19e1c81f084f1a8ef471d5f4bfe0cea20f431..0b60759d1e2e4ed24fd88054da2d2d39bdc2667a 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,22 +1,29 @@
/* XPM */
static char * menu_active_xpm[] = {
-"24 17 2 1",
+"16 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+" ",
+" "};
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
index 1f58cf04aaadd9d7e788b41463990e0a181256a3..ee7347969660e25cab7460c8d44db10089a312a3 100644
Binary files a/themes/default/right-active.png and b/themes/default/right-active.png differ
diff --git a/themes/default/right-active.svg b/themes/default/right-active.svg
index 6bbdd41500d9e638637a3a0c78857633630f047f..c2c46e8d6d9f4ed3b2b176e2fa67e085e4b557c8 100644
--- a/themes/default/right-active.svg
+++ b/themes/default/right-active.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="right-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -84,9 +83,9 @@
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="border">
+ id="layer1">
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
d="M 5.5,0 L 5.5,24"
id="path1340" />
</g>
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 634908f0ce9eb588e14052530ecb0e671a7992f4..caad32306e7886940e703873a8479691dc9a93d9 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -4,27 +4,27 @@ static char * right_active_xpm[] = {
" c None",
"# c #C0C0C0 s active_color_2",
"@ c #C0C0FF s active_color_1",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@"};
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@"};
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
index 1f58cf04aaadd9d7e788b41463990e0a181256a3..2feb99a30cb841e6add3b3b1674acf571628b18f 100644
Binary files a/themes/default/right-inactive.png and b/themes/default/right-inactive.png differ
diff --git a/themes/default/right-inactive.svg b/themes/default/right-inactive.svg
index 99c3e130b00f81b30da40cc0735ed31f0cba6353..2b8fbd754f8fedef71a58ce6dc26e0e02b75e479 100644
--- a/themes/default/right-inactive.svg
+++ b/themes/default/right-inactive.svg
@@ -16,8 +16,7 @@
version="1.0"
sodipodi:docbase="/themes/default"
sodipodi:docname="right-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
@@ -84,9 +83,9 @@
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="border">
+ id="layer1">
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
d="M 5.5,0 L 5.5,24"
id="path1340" />
</g>
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index a9894c0172b19744c0da5c558df17bf2bfadaf8a..45b2a4f2b4075b13b8c527be7d04b4a90389e93e 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -4,27 +4,27 @@ static char * right_inactive_xpm[] = {
" c None",
"# c #C0C0C0 s inactive_color_2",
"@ c #C0C0FF s inactive_color_1",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@"};
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@"};
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index 427a1a106e798599ae79f4bb9b044f520a22950e..2c192fc925fe7e2cf4ae64d1723d7c2ec9541b9d 100644
Binary files a/themes/default/shade-active.png and b/themes/default/shade-active.png differ
diff --git a/themes/default/shade-active.svg b/themes/default/shade-active.svg
index 67423f02839056487e96d1625bb2b638c9d429e5..d0f335a5de099940dadaa1b92f66eecfb907fe09 100644
--- a/themes/default/shade-active.svg
+++ b/themes/default/shade-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="shade-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -134,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -152,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -169,38 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -209,24 +195,15 @@
<g
style="display:inline"
id="g1616"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2705" />
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2405" />
<path
d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2720" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index e63dd62fdd28e471a61e780f9996462bf3bd200c..f7ab9745f6ec48196bd370bc7bb1dcf48b931dbd 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * shade_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index 291760d96ca0aef16652c55181e930f62dc69e7e..36fbe6a3563eaa801990b60b1acc5d0ad9b1d544 100644
Binary files a/themes/default/shade-inactive.png and b/themes/default/shade-inactive.png differ
diff --git a/themes/default/shade-inactive.svg b/themes/default/shade-inactive.svg
index 4f38510cb5ad374ad3be0a794800a69eba938f94..8c8668ff851452d86aec2bd195578f336b7f772c 100644
--- a/themes/default/shade-inactive.svg
+++ b/themes/default/shade-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="shade-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,34 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -187,20 +195,11 @@
<g
style="display:inline"
id="g1616"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<path
- id="path2720"
- style="opacity:0.25;fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420"
+ style="opacity:0.50;fill:none;fill-opacity:0.50;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 84afd3297e914b674bedca3e2c45e5977ade4fe6..5008b2c5969c63443d64f1706f7c4a1e3054cdc1 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/shade-prelight.png b/themes/default/shade-prelight.png
index 0f9bc6e4eb47b3df6c47c3821e851522c8c6881e..426568b519c7e60954e6d48c6987de76732eff94 100644
Binary files a/themes/default/shade-prelight.png and b/themes/default/shade-prelight.png differ
diff --git a/themes/default/shade-prelight.svg b/themes/default/shade-prelight.svg
index 83be89760a62e09b752b94155dd931f4f73cb436..3f8f27b36586e1a0b0a04245a228d7b9c0d34bd5 100644
--- a/themes/default/shade-prelight.svg
+++ b/themes/default/shade-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="shade-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
id="layer1"
- inkscape:label="pressed">
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,64 +186,38 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
+ id="g20"
inkscape:label="Button">
<g
style="display:inline"
id="g1616"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2705" />
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2405" />
<path
d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2720" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm
index c6e14ec43d7d0d9f51db63234b23313c230b9901..f7ab9745f6ec48196bd370bc7bb1dcf48b931dbd 100644
--- a/themes/default/shade-prelight.xpm
+++ b/themes/default/shade-prelight.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * shade_pressed_xpm[] = {
-"24 28 2 1",
+static char * shade_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index d2ab55e5f501d1eb11976d6f9d2a3651ddf12d6a..2cf088945c3e2d7079932f41cafa78abc858aede 100644
Binary files a/themes/default/shade-pressed.png and b/themes/default/shade-pressed.png differ
diff --git a/themes/default/shade-pressed.svg b/themes/default/shade-pressed.svg
index 0dddaa3f327ec6805e81a40386da74c45ee75252..58df3586c0a77505b9db06fa302fa8bd82c6cfd7 100644
--- a/themes/default/shade-pressed.svg
+++ b/themes/default/shade-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="shade-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
+ id="g24"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,38 +186,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect1884"
- width="24"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -236,24 +209,15 @@
<g
style="display:inline"
id="g1616"
- transform="translate(6,5)">
+ transform="translate(3,8)">
<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.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2705" />
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2405" />
<path
d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2720" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index c6e14ec43d7d0d9f51db63234b23313c230b9901..f7ab9745f6ec48196bd370bc7bb1dcf48b931dbd 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * shade_pressed_xpm[] = {
-"24 28 2 1",
+static char * shade_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index 27c7be825e578a1fddc8bdf043abab457c9bc2c0..8383c2d2ec859efe0849d4655a6127197634c6e4 100644
Binary files a/themes/default/shade-toggled-active.png and b/themes/default/shade-toggled-active.png differ
diff --git a/themes/default/shade-toggled-active.svg b/themes/default/shade-toggled-active.svg
index 0be45638374b0e91979f48e717fb6044b0cc7d40..bf63f45292714520efaa1bcb660301ba360159d7 100644
--- a/themes/default/shade-toggled-active.svg
+++ b/themes/default/shade-toggled-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="shade-toggled-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -134,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -152,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -169,38 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -208,25 +194,16 @@
inkscape:label="Button">
<g
style="display:inline"
- id="g1628"
- transform="translate(6,4)">
+ id="g1624"
+ transform="translate(3,7)">
<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.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2705" />
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2405" />
<path
d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2720" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index ccdc70913b10607301d3309fe344034254c9d76e..e5f40e2c848e8dd7f58d4328c91981712b85ead4 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * shade_toggled_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index a6005868fc35b5e7e9ae5361ef7322ac7094856e..e3dd6013c581b53decab3c04c8f704be28fcea87 100644
Binary files a/themes/default/shade-toggled-inactive.png and b/themes/default/shade-toggled-inactive.png differ
diff --git a/themes/default/shade-toggled-inactive.svg b/themes/default/shade-toggled-inactive.svg
index 9afb5bbf8b899401c0406d2ff61aaeba41aa0ed0..6e3d4c4d6aab73ee8250777feb98e65c151fceef 100644
--- a/themes/default/shade-toggled-inactive.svg
+++ b/themes/default/shade-toggled-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="shade-toggled-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,34 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -186,21 +194,12 @@
inkscape:label="Button">
<g
style="display:inline"
- id="g1628"
- transform="translate(6,4)">
+ id="g1624"
+ transform="translate(3,7)">
<path
- id="path2720"
- style="opacity:0.25;fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420"
+ style="opacity:0.50;fill:none;fill-opacity:0.50;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 7f94137fbe10374f7ceb6d087fb19bf66409ac7a..056cfab4e69cba3e54bb2d6fc46e44c8f73bda48 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * shade_toggled_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/shade-toggled-prelight.png b/themes/default/shade-toggled-prelight.png
index cc526c06e5f6a840dbb4b89ca7688b5e5b568544..2ea5d4b7e31a3d5deaf104138be130038413e661 100644
Binary files a/themes/default/shade-toggled-prelight.png and b/themes/default/shade-toggled-prelight.png differ
diff --git a/themes/default/shade-toggled-prelight.svg b/themes/default/shade-toggled-prelight.svg
index 5ff58030e2f1f501a633a00356fe8aea3bb724a8..d5874577e84ee9634b36d53202228f7d7840b249 100644
--- a/themes/default/shade-toggled-prelight.svg
+++ b/themes/default/shade-toggled-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="shade-toggled-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
id="layer1"
- inkscape:label="pressed">
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,64 +186,38 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
+ id="g20"
inkscape:label="Button">
<g
style="display:inline"
- id="g1628"
- transform="translate(6,4)">
+ id="g1624"
+ transform="translate(3,7)">
<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.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2705" />
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2405" />
<path
d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2720" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm
index 0f68410d92b2b4895b38366887c2cc2b50f64e13..e5f40e2c848e8dd7f58d4328c91981712b85ead4 100644
--- a/themes/default/shade-toggled-prelight.xpm
+++ b/themes/default/shade-toggled-prelight.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * shade_toggled_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index ca97d699f05ad40c38d4c8aa1bc26595196554b6..ed876c4acaf512433f830c0804983115abb23611 100644
Binary files a/themes/default/shade-toggled-pressed.png and b/themes/default/shade-toggled-pressed.png differ
diff --git a/themes/default/shade-toggled-pressed.svg b/themes/default/shade-toggled-pressed.svg
index 9cb934fdb89f1c20d5543e17331ef46a046203f9..3540e4b0400a1b7ea8de1bd21fee92bc1e3c262c 100644
--- a/themes/default/shade-toggled-pressed.svg
+++ b/themes/default/shade-toggled-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="shade-toggled-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
+ id="g24"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,38 +186,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect1884"
- width="24"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -235,25 +208,16 @@
inkscape:label="Button">
<g
style="display:inline"
- id="g1628"
- transform="translate(6,5)">
+ id="g1624"
+ transform="translate(3,8)">
<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.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2705" />
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2405" />
<path
d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
- id="path2720" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420" />
</g>
</g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 0f68410d92b2b4895b38366887c2cc2b50f64e13..e5f40e2c848e8dd7f58d4328c91981712b85ead4 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * shade_toggled_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index db37d62a33b86400afe206425c4b2b2ce4b399fa..d0637eb31e2e8f4f033d2fbb804d8b7a50c5bd17 100644
Binary files a/themes/default/stick-active.png and b/themes/default/stick-active.png differ
diff --git a/themes/default/stick-active.svg b/themes/default/stick-active.svg
index 2a19ec6206dd0580c770fa4bd03e83bb00e6bf05..64e4f793abbde16bfaa1b1af06926eb67efedfab 100644
--- a/themes/default/stick-active.svg
+++ b/themes/default/stick-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="stick-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -134,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -152,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -169,38 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -209,24 +195,15 @@
<g
style="display:inline"
id="g1613"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- id="path2287"
+ id="path2247"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 635c422f96a9077484579806fcb9437a0a2b3ad5..fa7ebe7e0ddd075bc14b37954b4c6ac13ef45e54 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * stick_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index 3976829b759527800c4f36e291a1600701e811d9..f57b506df9df6007fd02cd85c1b7c82413bd8396 100644
Binary files a/themes/default/stick-inactive.png and b/themes/default/stick-inactive.png differ
diff --git a/themes/default/stick-inactive.svg b/themes/default/stick-inactive.svg
index df2ec0e958be2c5c30dca6221586f17cb24735e3..1ff32908af32f7b87f75276113b823bdaf7daa55 100644
--- a/themes/default/stick-inactive.svg
+++ b/themes/default/stick-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="stick-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,34 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -187,20 +195,11 @@
<g
style="display:inline"
id="g1613"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<path
- id="path2287"
+ id="path2247"
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.25;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" />
+ 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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 581c17a4313270798a187bb126fb5e9989770979..a6ccaaae0b1c358b984a84c5042c7ebbb51e06ed 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/stick-prelight.png b/themes/default/stick-prelight.png
index 16cd89b42e8c9aec26fa90930ba78b943dc8867d..eae77909310193be8f43ac5a81cfab51242219a3 100644
Binary files a/themes/default/stick-prelight.png and b/themes/default/stick-prelight.png differ
diff --git a/themes/default/stick-prelight.svg b/themes/default/stick-prelight.svg
index 4ab60fe17b7068c667d2a6b61b99ef1092827864..1210a09fa221479a12f8334e4fb03fbb6d4f37f7 100644
--- a/themes/default/stick-prelight.svg
+++ b/themes/default/stick-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="stick-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
id="layer1"
- inkscape:label="pressed">
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,64 +186,38 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
+ id="g20"
inkscape:label="Button">
<g
style="display:inline"
id="g1613"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- id="path2287"
+ id="path2247"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm
index 549ee1a39832ee875e9bf207327472350b01f1ba..fa7ebe7e0ddd075bc14b37954b4c6ac13ef45e54 100644
--- a/themes/default/stick-prelight.xpm
+++ b/themes/default/stick-prelight.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * stick_pressed_xpm[] = {
-"24 28 2 1",
+static char * stick_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index 0b8b95240ac02ffebb7bcbef0065bebbe495b7c2..44092f164cfd03e2ef5d3141cd217ce60fa5690c 100644
Binary files a/themes/default/stick-pressed.png and b/themes/default/stick-pressed.png differ
diff --git a/themes/default/stick-pressed.svg b/themes/default/stick-pressed.svg
index 846fba97b7a198ea817724e83dc38e21f24d78de..56b3411144e52005de9b13a6319c0b0b3ed6f947 100644
--- a/themes/default/stick-pressed.svg
+++ b/themes/default/stick-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="stick-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
+ id="g24"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,38 +186,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect1884"
- width="24"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -236,24 +209,15 @@
<g
style="display:inline"
id="g1613"
- transform="translate(6,5)">
+ transform="translate(3,8)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- id="path2287"
+ id="path2247"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 549ee1a39832ee875e9bf207327472350b01f1ba..fa7ebe7e0ddd075bc14b37954b4c6ac13ef45e54 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * stick_pressed_xpm[] = {
-"24 28 2 1",
+static char * stick_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index 24b852ad1b677cf7eb13878d944952b44d9628f2..7da15835decf863a9de8adf6f3c82ec775818fc8 100644
Binary files a/themes/default/stick-toggled-active.png and b/themes/default/stick-toggled-active.png differ
diff --git a/themes/default/stick-toggled-active.svg b/themes/default/stick-toggled-active.svg
index 99bf19e1e0d6eecb5fc462c4bb67b1d362141803..c7fe43bf19d8aa010ae60183971abea72ab1f349 100644
--- a/themes/default/stick-toggled-active.svg
+++ b/themes/default/stick-toggled-active.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="stick-toggled-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -134,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -152,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -169,38 +172,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
- <path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -209,33 +195,20 @@
<g
style="display:inline"
id="g1625"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- id="path2287"
+ id="path2247"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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"
+ id="path2282"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 58f02465e0deb6b133a999734e94723257f99031..45c175259b8692f4f6993d56ad3bb60c5b61a166 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * stick_toggled_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index b98ba02ce04f725be4a4e9012419bb1d2cd4019f..0fca6ad0edb2161c60e684e024545ab1de681753 100644
Binary files a/themes/default/stick-toggled-inactive.png and b/themes/default/stick-toggled-inactive.png differ
diff --git a/themes/default/stick-toggled-inactive.svg b/themes/default/stick-toggled-inactive.svg
index b42cc0fc867ed79004b199a2815f4f03f0caed43..49c7a623aa93dc6cc12f78ed44a09d5bcd0e6342 100644
--- a/themes/default/stick-toggled-inactive.svg
+++ b/themes/default/stick-toggled-inactive.svg
@@ -2,34 +2,34 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="stick-toggled-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,34 +172,31 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
- width="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:label="Border"
inkscape:groupmode="layer"
- id="layer1"
+ id="g22"
style="display:inline">
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path24" />
</g>
<g
inkscape:groupmode="layer"
@@ -187,29 +205,16 @@
<g
style="display:inline"
id="g1625"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<path
- id="path2287"
+ id="path2247"
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.25;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" />
+ 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.25;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"
+ 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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 65e6479bc22a98108b1a95cec5c97c64fa833436..ca1bd853692c99d278f34cb237d9f1e7f1a23dc1 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,33 +1,29 @@
/* XPM */
static char * stick_toggled_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/stick-toggled-prelight.png b/themes/default/stick-toggled-prelight.png
index eead4705db7598f43c0ada5e08570b3fa76a7b94..c22f6f05a20dddf031286f57bf3e872aa889871f 100644
Binary files a/themes/default/stick-toggled-prelight.png and b/themes/default/stick-toggled-prelight.png differ
diff --git a/themes/default/stick-toggled-prelight.svg b/themes/default/stick-toggled-prelight.svg
index c60d7237f07585024f3d4d1971f503817a544514..fff7675c6943abd89eaf786fa9bb2794c000fe39 100644
--- a/themes/default/stick-toggled-prelight.svg
+++ b/themes/default/stick-toggled-prelight.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="stick-toggled-prelight.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
- x1="0"
- y1="1"
- x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
id="layer1"
- inkscape:label="pressed">
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,73 +186,43 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.25;fill:url(#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="24"
- height="15"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
+ height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
- id="g3722"
+ id="g20"
inkscape:label="Button">
<g
style="display:inline"
id="g1625"
- transform="translate(6,4)">
+ transform="translate(3,7)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- id="path2287"
+ id="path2247"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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"
+ id="path2282"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm
index 69f313f00cac7afc59f3f8b41d137652a564db28..45c175259b8692f4f6993d56ad3bb60c5b61a166 100644
--- a/themes/default/stick-toggled-prelight.xpm
+++ b/themes/default/stick-toggled-prelight.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * stick_toggled_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index 0136350868eb827e8fdb8b92e8d315f183a26c0d..b430a3b922d869d919b10c683a7bfdf4aadfed05 100644
Binary files a/themes/default/stick-toggled-pressed.png and b/themes/default/stick-toggled-pressed.png differ
diff --git a/themes/default/stick-toggled-pressed.svg b/themes/default/stick-toggled-pressed.svg
index 25fcd1d3ba36eee742d37e01990060e713dea255..cea22028950fd81d24ef06218d0bc53cde7646ec 100644
--- a/themes/default/stick-toggled-pressed.svg
+++ b/themes/default/stick-toggled-pressed.svg
@@ -2,45 +2,45 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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="24"
- height="28"
+ width="18"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="stick-toggled-pressed.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
<stop
id="stop5875"
offset="0"
- style="stop-color:#d0ffff;stop-opacity:1;" />
+ style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5877"
offset="0.5"
- style="stop-color:#d0ffff;stop-opacity:0.90;" />
+ style="stop-color:white;stop-opacity:0.90;" />
<stop
id="stop5879"
offset="1"
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
y2="8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.2,0,1)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="radialGradient3087"
- cx="12"
- cy="0"
- fx="12"
- fy="3"
- r="22"
- gradientTransform="matrix(1,0,0,1,0,0.5)"
- gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="12"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient2791"
- x1="0"
- y1="1"
- x2="0"
- y2="25"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5873"
- id="linearGradient4147"
- x1="0"
- y1="1"
- x2="0"
- y2="19"
+ y2="24"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -145,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -164,19 +146,27 @@
</rdf:RDF>
</metadata>
<g
+ inkscape:label="Border"
inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="pressed">
+ id="g24"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 17.5,0.5"
+ id="path6059" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="frame">
<g
- id="g1789"
- transform="translate(0,1)">
- <rect
- style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3079"
- width="24"
- height="25"
- x="0"
- y="0" />
+ style="display:inline"
+ id="g1969"
+ transform="translate(0,4)">
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+ d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+ id="path4123" />
</g>
</g>
<g
@@ -185,10 +175,10 @@
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
- width="24"
- height="26"
+ width="18"
+ height="12"
x="0"
y="1" />
</g>
@@ -196,38 +186,21 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+ id="path6061" />
<rect
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
- id="rect6061"
- width="24"
- height="4"
- x="0"
- y="1" />
- <rect
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect1884"
- width="24"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
+ width="18"
height="12"
x="0"
- y="1" />
+ y="12" />
<path
- style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
- d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
- id="path2187" />
- <path
- style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
- d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
- id="path2188" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="g31"
- style="display:inline">
- <path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 24,0.5"
- id="path6059" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 18,1.5"
+ id="path6061" />
</g>
<g
inkscape:groupmode="layer"
@@ -236,33 +209,20 @@
<g
style="display:inline"
id="g1625"
- transform="translate(6,5)">
+ transform="translate(3,8)">
<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" />
+ style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- id="path2287"
+ id="path2247"
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" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
+ id="path2282"
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"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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;stroke:black;stroke-width:1px;stroke-opacity:0"
- d="M 0,27.5 L 24,27.5"
- id="path6989" />
- </g>
</svg>
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 69f313f00cac7afc59f3f8b41d137652a564db28..45c175259b8692f4f6993d56ad3bb60c5b61a166 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,33 +1,29 @@
/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * stick_toggled_active_xpm[] = {
+"18 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+" ",
+" ",
+" ",
+" ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+" ",
+" "};
diff --git a/themes/default/themerc b/themes/default/themerc
index 1888a1960f3ed17f0a04177a4c585d94d3f841ae..80d40c4e17a73a319bc0a278ed5c72174739894d 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,5 +1,5 @@
active_text_color=#ffffff
-button_offset=0
+button_offset=-2
button_spacing=0
full_width_title=false
maximized_offset=0
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index a4fcfafe80c8c211c16cc7dd61eab0878f9dd40e..02251c6181afb4ada7019869c3c5a38a12bd5fab 100644
Binary files a/themes/default/title-1-active.png and b/themes/default/title-1-active.png differ
diff --git a/themes/default/title-1-active.svg b/themes/default/title-1-active.svg
index 77b668dc77c8525c8eac128cb60526f812d3228c..13aabc91db159513a7e22cb05e29314a27c28e2a 100644
--- a/themes/default/title-1-active.svg
+++ b/themes/default/title-1-active.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-1-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,25 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -82,40 +83,51 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="40"
- inkscape:cx="-3.2737067"
- inkscape:cy="-1.198171"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
inkscape:document-units="px"
- inkscape:current-layer="layer2"
+ inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
- inkscape:window-width="1351"
- inkscape:window-height="754"
- inkscape:window-x="423"
- inkscape:window-y="101"
+ 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" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -133,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -151,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;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-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 9f656fef3393fc3fd9785387567c67a810ad6894..518b43936564169c56b3e28ce913488ce67e36a4 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_active_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index cb3f997076877ddcd90a295b3a6c6555a18faac0..b4f4729d5cadea7c7562c5ee1f1a21cef4601424 100644
Binary files a/themes/default/title-1-inactive.png and b/themes/default/title-1-inactive.png differ
diff --git a/themes/default/title-1-inactive.svg b/themes/default/title-1-inactive.svg
index a993c95e964587fb2ad5d11f6470256939789faa..0f0d71322436a8e5f56c9b30f2b64a8f007428d6 100644
--- a/themes/default/title-1-inactive.svg
+++ b/themes/default/title-1-inactive.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-1-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;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:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index b97494023e7120b585703809f7182007486ee251..a334c0d6bcf92c09135e6294ad58c51ac505023b 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_inactive_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index a4fcfafe80c8c211c16cc7dd61eab0878f9dd40e..02251c6181afb4ada7019869c3c5a38a12bd5fab 100644
Binary files a/themes/default/title-2-active.png and b/themes/default/title-2-active.png differ
diff --git a/themes/default/title-2-active.svg b/themes/default/title-2-active.svg
index b3d29c9d1cf6a71b6327c76c84d1c9a6c372c932..14a206c7ff983f3788a62f8f93ecff7867eb09c3 100644
--- a/themes/default/title-2-active.svg
+++ b/themes/default/title-2-active.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-2-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;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-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 9f656fef3393fc3fd9785387567c67a810ad6894..518b43936564169c56b3e28ce913488ce67e36a4 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_active_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index cb3f997076877ddcd90a295b3a6c6555a18faac0..5a32c78870caae465103d009fe308426f8ca3c13 100644
Binary files a/themes/default/title-2-inactive.png and b/themes/default/title-2-inactive.png differ
diff --git a/themes/default/title-2-inactive.svg b/themes/default/title-2-inactive.svg
index bd17c1c9c0a29a923d8705fa84974ba1d1397a1f..fa34f3fb423664493ad7ade641ed51b9211f98b0 100644
--- a/themes/default/title-2-inactive.svg
+++ b/themes/default/title-2-inactive.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-2-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;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:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index b97494023e7120b585703809f7182007486ee251..a334c0d6bcf92c09135e6294ad58c51ac505023b 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_inactive_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index a4fcfafe80c8c211c16cc7dd61eab0878f9dd40e..ecee8cdd3092de15026a3e6018f32f3ea762a640 100644
Binary files a/themes/default/title-3-active.png and b/themes/default/title-3-active.png differ
diff --git a/themes/default/title-3-active.svg b/themes/default/title-3-active.svg
index 7ddcb92f9fdc178893a18b0243091bd9eb5b4b09..382e1abaccadbfcc2bb3bb3dcb8d37ee3911247f 100644
--- a/themes/default/title-3-active.svg
+++ b/themes/default/title-3-active.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-3-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;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-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 9f656fef3393fc3fd9785387567c67a810ad6894..518b43936564169c56b3e28ce913488ce67e36a4 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_active_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index cb3f997076877ddcd90a295b3a6c6555a18faac0..5a32c78870caae465103d009fe308426f8ca3c13 100644
Binary files a/themes/default/title-3-inactive.png and b/themes/default/title-3-inactive.png differ
diff --git a/themes/default/title-3-inactive.svg b/themes/default/title-3-inactive.svg
index 66925433928592faa57479a74520fb2ad7f52134..60713a2fdfe66ba9b2ee40165df3249e414cb14c 100644
--- a/themes/default/title-3-inactive.svg
+++ b/themes/default/title-3-inactive.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-3-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;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:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index b97494023e7120b585703809f7182007486ee251..a334c0d6bcf92c09135e6294ad58c51ac505023b 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_inactive_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index a4fcfafe80c8c211c16cc7dd61eab0878f9dd40e..ecee8cdd3092de15026a3e6018f32f3ea762a640 100644
Binary files a/themes/default/title-4-active.png and b/themes/default/title-4-active.png differ
diff --git a/themes/default/title-4-active.svg b/themes/default/title-4-active.svg
index 25dc30ecd65709d5e6b7963112c922159cf85222..c04f1fac2b7ca762318e264303beaee0737ff1d1 100644
--- a/themes/default/title-4-active.svg
+++ b/themes/default/title-4-active.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-4-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;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-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 9f656fef3393fc3fd9785387567c67a810ad6894..518b43936564169c56b3e28ce913488ce67e36a4 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_active_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index cb3f997076877ddcd90a295b3a6c6555a18faac0..5a32c78870caae465103d009fe308426f8ca3c13 100644
Binary files a/themes/default/title-4-inactive.png and b/themes/default/title-4-inactive.png differ
diff --git a/themes/default/title-4-inactive.svg b/themes/default/title-4-inactive.svg
index 16e5f36b1573bb6df728cda4c798511fbc965e7a..3badd8637ef6e14e3032248ff684393d49845472 100644
--- a/themes/default/title-4-inactive.svg
+++ b/themes/default/title-4-inactive.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-4-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;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:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index b97494023e7120b585703809f7182007486ee251..a334c0d6bcf92c09135e6294ad58c51ac505023b 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_inactive_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index a4fcfafe80c8c211c16cc7dd61eab0878f9dd40e..ecee8cdd3092de15026a3e6018f32f3ea762a640 100644
Binary files a/themes/default/title-5-active.png and b/themes/default/title-5-active.png differ
diff --git a/themes/default/title-5-active.svg b/themes/default/title-5-active.svg
index ac017749bc573630d1dba212ae0679202f787785..193653a10979a87c625174121663951de92dfd6b 100644
--- a/themes/default/title-5-active.svg
+++ b/themes/default/title-5-active.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-5-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;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-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 9f656fef3393fc3fd9785387567c67a810ad6894..518b43936564169c56b3e28ce913488ce67e36a4 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_active_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index cb3f997076877ddcd90a295b3a6c6555a18faac0..5a32c78870caae465103d009fe308426f8ca3c13 100644
Binary files a/themes/default/title-5-inactive.png and b/themes/default/title-5-inactive.png differ
diff --git a/themes/default/title-5-inactive.svg b/themes/default/title-5-inactive.svg
index 072dc364d8832b264aec83339d0d46c2c9c99c5f..b8ec89efbc6b44aab4867c5aea75cff2d0bf4936 100644
--- a/themes/default/title-5-inactive.svg
+++ b/themes/default/title-5-inactive.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="title-5-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
@@ -116,7 +114,20 @@
inkscape:window-y="0"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,16 +145,26 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<rect
- style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6057"
width="8"
- height="26"
+ height="12"
x="0"
y="1" />
</g>
@@ -152,34 +173,19 @@
id="layer3"
inkscape:label="hilight">
<path
- style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+ style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;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:0;stroke:none;stroke-width:0;stroke-opacity:1"
- id="rect1884"
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3141"
width="8"
- height="15"
+ height="12"
x="0"
- y="1" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
+ y="12" />
<path
- style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
- d="M 0,0.5 L 8,0.5"
- id="path6059" />
- </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-linejoin:miter;stroke-opacity:0"
- d="M 0,27.5 L 8,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 8,1.5"
+ id="path6061" />
</g>
</svg>
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index b97494023e7120b585703809f7182007486ee251..a334c0d6bcf92c09135e6294ad58c51ac505023b 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_inactive_xpm[] = {
-"4 28 2 1",
+"4 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
"....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
"....",
"....",
"....",
-"....",
-"....",
-"....",
-"....",
"...."};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 73fdecac7f0b2959b8e824cad7268f5c81072014..2b5bf87115deeaaed542a5235d0a0031d8c2718d 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-left-active.svg b/themes/default/top-left-active.svg
index 129e472638ca4537663572ff4513d3855dd82fb3..3612180a9078287671001dd9690eab6cf96173c3 100644
--- a/themes/default/top-left-active.svg
+++ b/themes/default/top-left-active.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="top-left-active.svg"
+ sodipodi:docbase="/themes/default"
version="1.0"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
sodipodi:version="0.32"
id="svg2"
- height="28"
+ height="24"
width="8"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,16 +106,28 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
inkscape:window-height="733"
inkscape:window-x="187"
- inkscape:window-y="728"
+ inkscape:window-y="724"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,6 +145,16 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ style="display:inline"
+ id="layer1"
+ inkscape:groupmode="layer"
+ inkscape:label="Border">
+ <path
+ id="rect1319"
+ d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,24 1,24 1,24 L 0,24 L 0,0 L 8,0 z "
+ style="fill:#000000;fill-opacity:0.50" />
+ </g>
<g
style="display:inline"
inkscape:label="Grad"
@@ -141,8 +162,8 @@
inkscape:groupmode="layer">
<path
id="path6057"
- style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
- d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,22 C 1,22 1,27 6,27 L 8,27 L 8,27 L 8,1 z " />
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 8,1 L 4,1 C 3,1 1,1 1,3 C 1,7.5 1,10 1,13 L 8,13 L 8,13 L 8,1 z " />
</g>
<g
inkscape:label="hilight"
@@ -153,27 +174,12 @@
d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
<path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
- d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,11 C 1,11 1,16 6,16 L 8,16 L 8,16 L 8,1 z "
- id="path1884" />
- </g>
- <g
- style="display:inline"
- id="layer1"
- inkscape:groupmode="layer"
- inkscape:label="Border">
- <path
- id="rect1319"
- d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,28 1,28 1,28 L 0,28 L 0,0 L 8,0 z "
- style="fill:black;fill-opacity:0.20" />
- </g>
- <g
- inkscape:label="Shadow"
- id="layer5"
- inkscape:groupmode="layer">
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 2,12 L 8,12 L 8,24 L 4,24 L 2,12 z"
+ id="path2396" />
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
- d="M 2.5,27.5 L 7.5,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,24 1.5,24 L 1.5,24 L 1.5,25"
+ id="path2170" />
</g>
</svg>
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 8a8f571df4e353e114147709252e627a4fb16362..355367ddb68bf1200331bbeb9a956609ea6ed813 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"8 28 2 1",
+"8 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
" ......",
@@ -26,8 +26,4 @@ static char * top_left_active_xpm[] = {
"........",
"........",
"........",
-"........",
-"........",
-"........",
-"........",
"........"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 2429bbe391eaeb3961d27241a1ad71c17cd5723a..9aae49070792a82a0eb81ac164b7eceaa059c4b3 100644
Binary files a/themes/default/top-left-inactive.png and b/themes/default/top-left-inactive.png differ
diff --git a/themes/default/top-left-inactive.svg b/themes/default/top-left-inactive.svg
index f64c8870ca2188031d53d9663bf769babe0fbf3e..c13413e44a63f9fd9e21fab3404abc7d2ff1e82c 100644
--- a/themes/default/top-left-inactive.svg
+++ b/themes/default/top-left-inactive.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="top-left-inactive.svg"
+ sodipodi:docbase="/themes/default"
version="1.0"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
sodipodi:version="0.32"
id="svg2"
- height="28"
+ height="24"
width="8"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,16 +106,28 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
inkscape:window-height="733"
inkscape:window-x="187"
- inkscape:window-y="728"
+ inkscape:window-y="724"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,6 +145,16 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ style="display:inline"
+ id="layer1"
+ inkscape:groupmode="layer"
+ inkscape:label="Border">
+ <path
+ id="rect1319"
+ d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,24 1,24 1,24 L 0,24 L 0,0 L 8,0 z "
+ style="fill:#000000;fill-opacity:0.50" />
+ </g>
<g
style="display:inline"
inkscape:label="Grad"
@@ -141,8 +162,8 @@
inkscape:groupmode="layer">
<path
id="path6057"
- style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
- d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,22 C 1,22 1,27 6,27 L 8,27 L 8,27 L 8,1 z " />
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 8,1 L 4,1 C 3,1 1,1 1,3 C 1,7.5 1,10 1,13 L 8,13 L 8,13 L 8,1 z " />
</g>
<g
inkscape:label="hilight"
@@ -153,27 +174,12 @@
d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
<path
- style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
- d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,11 C 1,11 1,16 6,16 L 8,16 L 8,16 L 8,1 z "
- id="path1884" />
- </g>
- <g
- style="display:inline"
- id="layer1"
- inkscape:groupmode="layer"
- inkscape:label="Border">
- <path
- id="rect1319"
- d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,28 1,28 1,28 L 0,28 L 0,0 L 8,0 z "
- style="fill:black;fill-opacity:0.20" />
- </g>
- <g
- inkscape:label="Shadow"
- id="layer5"
- inkscape:groupmode="layer">
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 2,12 L 8,12 L 8,24 L 4,24 L 2,12 z"
+ id="path2396" />
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
- d="M 2.5,27.5 L 7.5,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,24 1.5,24 L 1.5,24 L 1.5,25"
+ id="path2170" />
</g>
</svg>
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index b9eff7f25c58f82d7d45ae13d7de5841bff1a55e..c02156857b22f767b4105d91f9ab741933735044 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"8 28 2 1",
+"8 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
" ......",
@@ -26,8 +26,4 @@ static char * top_left_inactive_xpm[] = {
"........",
"........",
"........",
-"........",
-"........",
-"........",
-"........",
"........"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index b5bb6098642ba2a51437d79cd096bc22b6265f81..04750bc7e28a538cd9a8de0d941acb0c6a19ac04 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/default/top-right-active.svg b/themes/default/top-right-active.svg
index ae6dcd020d92e4fafacf2c004b35a5415866a4a3..1945bfa1e39de4e74a3a139438c4f0d4b9a4eec4 100644
--- a/themes/default/top-right-active.svg
+++ b/themes/default/top-right-active.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="top-right-active.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,16 +106,28 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
inkscape:window-height="733"
inkscape:window-x="187"
- inkscape:window-y="728"
+ inkscape:window-y="724"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,46 +145,41 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ id="rect1319"
+ d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,24 7,24 7,24 L 8,24 L 8,0 L 0,0 z "
+ style="fill:#000000;fill-opacity:0.50" />
+ </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-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,22 C 7,22 7,27 2,27 L 0,27 L 0,27 L 0,1 z "
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;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 5,1 C 5,1 7,1 7,3 C 7,7.5 7,10 7,13 L 0,13 L 0,13 L 0,1 z "
id="path6057" />
</g>
<g
- inkscape:groupmode="layer"
+ inkscape:label="hilight"
id="layer3"
- inkscape:label="hilight">
+ inkscape:groupmode="layer">
<path
style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;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-opacity:1"
- d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,11 C 7,11 7,16 2,16 L 0,16 L 0,16 L 0,1 z "
- id="path1884" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
- <path
- id="rect1319"
- d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,28 7,28 7,28 L 8,28 L 8,0 L 0,0 z "
- style="fill:black;fill-opacity:0.20" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
+ style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 6,12 L 0,12 L 0,24 L 4,24 L 6,12 z"
+ id="path2396" />
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
- d="M 0.5,27.5 L 5.5,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+ d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,24 6.5,24 L 6.5,24 L 6.5,25"
+ id="path2170" />
</g>
</svg>
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index d33ccf4b750a781fe851ba77e3febb558b42c442..1b3acf7b727424e8ef40842d204db11380f1f45b 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"8 28 2 1",
+"8 24 2 1",
" c None",
". c #C0C0FF s active_color_1",
"...... ",
@@ -28,6 +28,4 @@ static char * top_right_active_xpm[] = {
"........",
"........",
"........",
-"........",
-"........",
"........"};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index ab230e47d62125f7677d1ba1e8e4190b87bdfdef..dd0861e7c5f96a24b4d4d144a2ff72d0c9511384 100644
Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ
diff --git a/themes/default/top-right-inactive.svg b/themes/default/top-right-inactive.svg
index 57da706dd8d2fe55df37cb707457136ae818184b..69ef803c5adb709b3b78e8da358dac19840dea79 100644
--- a/themes/default/top-right-inactive.svg
+++ b/themes/default/top-right-inactive.svg
@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ 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"
@@ -10,26 +10,26 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="8"
- height="28"
+ height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.46"
version="1.0"
+ sodipodi:docbase="/themes/default"
sodipodi:docname="top-right-inactive.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
- id="linearGradient1886">
+ id="linearGradient3143">
<stop
- style="stop-color:white;stop-opacity:1;"
+ style="stop-color:#ffffff;stop-opacity:0.0;"
offset="0"
- id="stop1888" />
+ id="stop3145" />
<stop
- style="stop-color:white;stop-opacity:0.25;"
+ style="stop-color:#000000;stop-opacity:0.10;"
offset="1"
- id="stop1890" />
+ id="stop3147" />
</linearGradient>
<linearGradient
id="linearGradient5873">
@@ -51,26 +51,26 @@
<stop
id="stop5849"
offset="0"
- style="stop-color:white;stop-opacity:0;" />
+ style="stop-color:#ffffff;stop-opacity:0.90;" />
<stop
- id="stop2779"
- offset="0.75"
- style="stop-color:white;stop-opacity:0;" />
+ id="stop5850"
+ offset="0.70"
+ style="stop-color:#ffffff;stop-opacity:0.10;" />
<stop
id="stop5851"
offset="1"
- style="stop-color:white;stop-opacity:0.20;" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5847"
- id="linearGradient6945"
- gradientUnits="userSpaceOnUse"
+ id="linearGradient3148"
x1="0"
- y1="0.5"
+ y1="1"
x2="0"
- y2="27.5"
- gradientTransform="matrix(1,0,0,1,0,0)" />
+ y2="18"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="none" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
gradientTransform="matrix(1,0,0,0.2,0,1)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient1886"
- id="linearGradient1892"
+ xlink:href="#linearGradient3143"
+ id="linearGradient3149"
x1="0"
- y1="1"
+ y1="13"
x2="0"
- y2="14"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ y2="24"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
- pagecolor="white"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
@@ -107,16 +106,28 @@
showgrid="true"
inkscape:grid-bbox="true"
inkscape:grid-points="true"
- gridoriginx="0px"
gridtolerance="0.5px"
guidetolerance="1px"
inkscape:window-width="640"
inkscape:window-height="733"
inkscape:window-x="187"
- inkscape:window-y="728"
+ inkscape:window-y="724"
inkscape:guide-bbox="true"
inkscape:guide-points="false"
- showguides="true" />
+ showguides="true">
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="0px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -134,46 +145,41 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ id="rect1319"
+ d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,24 7,24 7,24 L 8,24 L 8,0 L 0,0 z "
+ style="fill:#000000;fill-opacity:0.50" />
+ </g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Grad"
style="display:inline">
<path
- style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
- d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,22 C 7,22 7,27 2,27 L 0,27 L 0,27 L 0,1 z "
+ style="fill:url(#linearGradient3148);fill-opacity:0.50;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 5,1 C 5,1 7,1 7,3 C 7,7.5 7,10 7,13 L 0,13 L 0,13 L 0,1 z "
id="path6057" />
</g>
<g
- inkscape:groupmode="layer"
+ inkscape:label="hilight"
id="layer3"
- inkscape:label="hilight">
+ inkscape:groupmode="layer">
<path
style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;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:0;stroke:none;stroke-width:0;stroke-opacity:1"
- d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,11 C 7,11 7,16 2,16 L 0,16 L 0,16 L 0,1 z "
- id="path1884" />
- </g>
- <g
- inkscape:label="Border"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline">
- <path
- id="rect1319"
- d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,28 7,28 7,28 L 8,28 L 8,0 L 0,0 z "
- style="fill:black;fill-opacity:0.20" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Shadow">
+ style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 6,12 L 0,12 L 0,24 L 4,24 L 6,12 z"
+ id="path2396" />
<path
- style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
- d="M 0.5,27.5 L 5.5,27.5"
- id="path6989" />
+ style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+ d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,24 6.5,24 L 6.5,24 L 6.5,25"
+ id="path2170" />
</g>
</svg>
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 15ea1188313f4126cf07ed5fd1c9b5e2c96561dd..0d10025597bdd9ed32cc391621126dd7cc28c06c 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"8 28 2 1",
+"8 24 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
"...... ",
@@ -26,8 +26,4 @@ static char * top_right_inactive_xpm[] = {
"........",
"........",
"........",
-"........",
-"........",
-"........",
-"........",
"........"};