diff options
| author | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2008-06-16 21:46:35 +0000 |
|---|---|---|
| committer | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2008-06-16 21:46:35 +0000 |
| commit | fa57024e62b6faaf770aab5dbfd990eef934c2e4 (patch) | |
| tree | 64ceb09d1335a87b5bc1ebf07efb5e94fb13d856 /themes | |
| parent | c2de028d5303643ca4ed907559923eb2a79f4efa (diff) | |
| download | xfwm4-fa57024e62b6faaf770aab5dbfd990eef934c2e4.tar.gz | |
Update themes
(Old svn revision: 27078)
Diffstat (limited to 'themes')
350 files changed, 8478 insertions, 7867 deletions
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png Binary files differindex 7d87c3405..35653b0c9 100644 --- a/themes/default/bottom-active.png +++ b/themes/default/bottom-active.png diff --git a/themes/default/bottom-active.svg b/themes/default/bottom-active.svg index e09bddc61..b8afc3b1a 100644 --- a/themes/default/bottom-active.svg +++ b/themes/default/bottom-active.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="bottom-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -47,47 +47,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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.5,4.5 L 24,4.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1"> + id="border"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" 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 af481a2c1..05b089ae5 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 Binary files differindex 1f7544003..35653b0c9 100644 --- a/themes/default/bottom-inactive.png +++ b/themes/default/bottom-inactive.png diff --git a/themes/default/bottom-inactive.svg b/themes/default/bottom-inactive.svg index 3e6f15a2b..62116c65b 100644 --- a/themes/default/bottom-inactive.svg +++ b/themes/default/bottom-inactive.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="bottom-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -47,47 +47,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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.5,4.5 L 24,4.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1"> + id="border"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" 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 f70bcabb5..ad03c07ae 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 Binary files differindex 01db91536..984af9922 100644 --- a/themes/default/bottom-left-active.png +++ b/themes/default/bottom-left-active.png diff --git a/themes/default/bottom-left-active.svg b/themes/default/bottom-left-active.svg index 27df14f3a..1aac429d4 100644 --- a/themes/default/bottom-left-active.svg +++ b/themes/default/bottom-left-active.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="bottom-left-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -46,47 +46,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 1.5,0 L 1.5,12.5 C 1.5,12.5 1.5,14.5 3.5,14.5 C 5.5,14.5 16,14.5 16,14.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <path - style="fill:#000000;fill-opacity:0.50" + style="fill:black;fill-opacity:0.20" 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 8eb1e7d77..42f3c164e 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 Binary files differindex 0e7b83917..984af9922 100644 --- a/themes/default/bottom-left-inactive.png +++ b/themes/default/bottom-left-inactive.png diff --git a/themes/default/bottom-left-inactive.svg b/themes/default/bottom-left-inactive.svg index ece73c268..f878fcd5b 100644 --- a/themes/default/bottom-left-inactive.svg +++ b/themes/default/bottom-left-inactive.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="bottom-left-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -46,47 +46,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 1.5,0 L 1.5,12.5 C 1.5,12.5 1.5,14.5 3.5,14.5 C 5.5,14.5 16,14.5 16,14.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <path - style="fill:#000000;fill-opacity:0.50" + style="fill:black;fill-opacity:0.20" 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 52498ef0b..a1ddb0c4b 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 Binary files differindex c36e7d92a..5ceb367d3 100644 --- a/themes/default/bottom-right-active.png +++ b/themes/default/bottom-right-active.png diff --git a/themes/default/bottom-right-active.svg b/themes/default/bottom-right-active.svg index f1899b650..2513155ff 100644 --- a/themes/default/bottom-right-active.svg +++ b/themes/default/bottom-right-active.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="bottom-right-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -46,47 +46,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 14.5,0 L 14.5,12.5 C 14.5,12.5 14.5,14.5 12.5,14.5 C 10.5,14.5 0,14.5 0,14.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <path - style="fill:#000000;fill-opacity:0.50" + style="fill:black;fill-opacity:0.20" 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 e9c153527..159230751 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 Binary files differindex e48007c8a..5ceb367d3 100644 --- a/themes/default/bottom-right-inactive.png +++ b/themes/default/bottom-right-inactive.png diff --git a/themes/default/bottom-right-inactive.svg b/themes/default/bottom-right-inactive.svg index f71f86075..51e349956 100644 --- a/themes/default/bottom-right-inactive.svg +++ b/themes/default/bottom-right-inactive.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="bottom-right-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -46,47 +46,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 14.5,0 L 14.5,12.5 C 14.5,12.5 14.5,14.5 12.5,14.5 C 10.5,14.5 0,14.5 0,14.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <path - style="fill:#000000;fill-opacity:0.50" + style="fill:black;fill-opacity:0.20" 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 43420e08f..42a8e492f 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 Binary files differindex 114bd43c8..d1c0bcc02 100644 --- a/themes/default/close-active.png +++ b/themes/default/close-active.png diff --git a/themes/default/close-active.svg b/themes/default/close-active.svg index 6548e1af3..0a701c9da 100644 --- a/themes/default/close-active.svg +++ b/themes/default/close-active.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="close-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,50 +181,76 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + 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: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" /> + 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"> + <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="g20" inkscape:label="Button"> <g - id="g2328" - transform="translate(3,7)"> + id="g2327" + transform="translate(6,4)"> <g transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g2217"> <path - style="fill:none;fill-opacity:0.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" + 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" d="M 2,2 L 10,10" id="path1340" /> <path - 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" + 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" 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:#ffffff;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:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path id="path2225" d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm index d5c777374..dd2d806e6 100644 --- a/themes/default/close-active.xpm +++ b/themes/default/close-active.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * close_active_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex a09b32c13..afaad13ad 100644 --- a/themes/default/close-inactive.png +++ b/themes/default/close-inactive.png diff --git a/themes/default/close-inactive.svg b/themes/default/close-inactive.svg index 895f50476..43b5bbd67 100644 --- a/themes/default/close-inactive.svg +++ b/themes/default/close-inactive.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="close-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,37 +181,63 @@ 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + id="rect6061" + width="24" + height="4" x="0" - y="12" /> + y="1" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" + x="0" + y="1" /> + <path + style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30" + 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: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" /> + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10" + 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"> + <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="g20" inkscape:label="Button"> <g - id="g2328" - transform="translate(3,7)"> + id="g2327" + transform="translate(6,4)"> <path id="path2221" d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> + 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" /> <path id="path2225" d="M 2.5,9.5 L 9.5,2.5" - 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" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm index bde5d4415..8c8163229 100644 --- a/themes/default/close-inactive.xpm +++ b/themes/default/close-inactive.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * close_inactive_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex 33bbd5c59..8e7247c59 100644 --- a/themes/default/close-prelight.png +++ b/themes/default/close-prelight.png diff --git a/themes/default/close-prelight.svg b/themes/default/close-prelight.svg index 87fbe2660..97e9cfaf2 100644 --- a/themes/default/close-prelight.svg +++ b/themes/default/close-prelight.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="close-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + inkscape:label="pressed"> <g - 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" /> + id="g1789" + transform="translate(0,1)"> + <rect + style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,50 +208,76 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" x="0" - y="12" /> + 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: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" /> + 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="g20" + 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" inkscape:label="Button"> <g - id="g2328" - transform="translate(3,7)"> + id="g2327" + transform="translate(6,4)"> <g transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g2217"> <path - style="fill:none;fill-opacity:0.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" + 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" d="M 2,2 L 10,10" id="path1340" /> <path - 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" + 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" 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:#ffffff;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:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path id="path2225" d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm index d5c777374..e175ab506 100644 --- a/themes/default/close-prelight.xpm +++ b/themes/default/close-prelight.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * close_active_xpm[] = { -"18 24 2 1", +static char * close_pressed_xpm[] = { +"24 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 Binary files differindex 5d812bf10..71d8b7895 100644 --- a/themes/default/close-pressed.png +++ b/themes/default/close-pressed.png diff --git a/themes/default/close-pressed.svg b/themes/default/close-pressed.svg index 08fd4b638..7d15dbe55 100644 --- a/themes/default/close-pressed.svg +++ b/themes/default/close-pressed.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="close-pressed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + id="layer1" + inkscape:label="pressed"> <g - 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" /> + 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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,50 +208,76 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" height="12" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" id="g3722" inkscape:label="Button"> <g - id="g2328" - transform="translate(3,8)"> + id="g2327" + transform="translate(6,5)"> <g transform="matrix(0.875,0,0,0.875,0.75,0.75)" - style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="g2217"> <path - style="fill:none;fill-opacity:0.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" + 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" d="M 2,2 L 10,10" id="path1340" /> <path - 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" + 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" 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:#ffffff;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:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path id="path2225" d="M 2.5,9.5 L 9.5,2.5" - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;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:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm index d5c777374..e175ab506 100644 --- a/themes/default/close-pressed.xpm +++ b/themes/default/close-pressed.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * close_active_xpm[] = { -"18 24 2 1", +static char * close_pressed_xpm[] = { +"24 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 Binary files differindex b31dc5ada..bcd67a936 100644 --- a/themes/default/hide-active.png +++ b/themes/default/hide-active.png diff --git a/themes/default/hide-active.svg b/themes/default/hide-active.svg index 6740a30a3..984609f0a 100644 --- a/themes/default/hide-active.svg +++ b/themes/default/hide-active.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="hide-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + 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: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" /> + 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"> + <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" @@ -195,16 +221,16 @@ <g style="display:inline" id="g1616" - transform="translate(3,7)"> + transform="translate(6,4)"> <rect - 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" + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2376" width="8" height="4" x="2" y="7" /> <rect - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2378" width="6" height="2" @@ -212,4 +238,13 @@ 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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm index ffa5e9d76..29dc80661 100644 --- a/themes/default/hide-active.xpm +++ b/themes/default/hide-active.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * hide_active_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex 5c63b5bce..c5e9e0952 100644 --- a/themes/default/hide-inactive.png +++ b/themes/default/hide-inactive.png diff --git a/themes/default/hide-inactive.svg b/themes/default/hide-inactive.svg index 151f265f2..4a523f47a 100644 --- a/themes/default/hide-inactive.svg +++ b/themes/default/hide-inactive.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="hide-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + id="rect6061" + width="24" + height="4" x="0" - y="12" /> + y="1" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" + x="0" + y="1" /> + <path + style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30" + 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: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" /> + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10" + 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"> + <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" @@ -195,9 +221,9 @@ <g style="display:inline" id="g1616" - transform="translate(3,7)"> + transform="translate(6,4)"> <rect - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" + 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" id="rect2378" width="6" height="2" @@ -205,4 +231,13 @@ 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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm index fcc8b1312..9bb2fb803 100644 --- a/themes/default/hide-inactive.xpm +++ b/themes/default/hide-inactive.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex c15d85c3a..75605a829 100644 --- a/themes/default/hide-prelight.png +++ b/themes/default/hide-prelight.png diff --git a/themes/default/hide-prelight.svg b/themes/default/hide-prelight.svg index db5c1201c..ccfa23027 100644 --- a/themes/default/hide-prelight.svg +++ b/themes/default/hide-prelight.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="hide-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + inkscape:label="pressed"> <g - 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" /> + id="g1789" + transform="translate(0,1)"> + <rect + style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,39 +208,56 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" - id="g20" + id="g3722" inkscape:label="Button"> <g style="display:inline" id="g1616" - transform="translate(3,7)"> + transform="translate(6,4)"> <rect - 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" + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2376" width="8" height="4" x="2" y="7" /> <rect - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2378" width="6" height="2" @@ -226,4 +265,13 @@ 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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm index ffa5e9d76..66f8bc800 100644 --- a/themes/default/hide-prelight.xpm +++ b/themes/default/hide-prelight.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * hide_active_xpm[] = { -"18 24 2 1", +static char * hide_pressed_xpm[] = { +"24 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 Binary files differindex 50584f2bf..dd5977c72 100644 --- a/themes/default/hide-pressed.png +++ b/themes/default/hide-pressed.png diff --git a/themes/default/hide-pressed.svg b/themes/default/hide-pressed.svg index 05a33b392..ddb8c7586 100644 --- a/themes/default/hide-pressed.svg +++ b/themes/default/hide-pressed.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="hide-pressed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + 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="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + id="layer1" + inkscape:label="pressed"> <g - 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" /> + 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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,21 +208,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" height="12" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" @@ -209,16 +248,16 @@ <g style="display:inline" id="g1616" - transform="translate(3,8)"> + transform="translate(6,5)"> <rect - 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" + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2376" width="8" height="4" x="2" y="7" /> <rect - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2378" width="6" height="2" @@ -226,4 +265,13 @@ 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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm index ffa5e9d76..66f8bc800 100644 --- a/themes/default/hide-pressed.xpm +++ b/themes/default/hide-pressed.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * hide_active_xpm[] = { -"18 24 2 1", +static char * hide_pressed_xpm[] = { +"24 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 Binary files differindex aeeddcc65..83d671748 100644 --- a/themes/default/left-active.png +++ b/themes/default/left-active.png diff --git a/themes/default/left-active.svg b/themes/default/left-active.svg index 386b8b54a..b23450092 100644 --- a/themes/default/left-active.svg +++ b/themes/default/left-active.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="left-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -45,47 +45,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 1.5,0 L 1.5,24" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1"> + id="border"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" 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 2428adb5a..121053a40 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 Binary files differindex 5d4c12d58..83d671748 100644 --- a/themes/default/left-inactive.png +++ b/themes/default/left-inactive.png diff --git a/themes/default/left-inactive.svg b/themes/default/left-inactive.svg index d9be4ad5d..f9e6a2c2d 100644 --- a/themes/default/left-inactive.svg +++ b/themes/default/left-inactive.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="left-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -45,47 +45,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 1.5,0 L 1.5,24" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1"> + id="border"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" 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 2e0dd60d3..079ae5926 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 Binary files differindex c7d25f56a..d49e1a8ba 100644 --- a/themes/default/maximize-active.png +++ b/themes/default/maximize-active.png diff --git a/themes/default/maximize-active.svg b/themes/default/maximize-active.svg index 56458849e..273499e03 100644 --- a/themes/default/maximize-active.svg +++ b/themes/default/maximize-active.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="maximize-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + 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: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" /> + 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"> + <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" @@ -195,15 +221,24 @@ <g style="display:inline" id="g1614" - transform="translate(3,7)"> + transform="translate(6,4)"> <path - id="rect2246" + id="rect2276" 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:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path - id="rect2285" + id="rect2275" d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm index 5ec094da2..17aa4a574 100644 --- a/themes/default/maximize-active.xpm +++ b/themes/default/maximize-active.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * maximize_active_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex ea20a5b48..238bc9e7b 100644 --- a/themes/default/maximize-inactive.png +++ b/themes/default/maximize-inactive.png diff --git a/themes/default/maximize-inactive.svg b/themes/default/maximize-inactive.svg index 633681691..49d35f0b1 100644 --- a/themes/default/maximize-inactive.svg +++ b/themes/default/maximize-inactive.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="maximize-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + id="rect6061" + width="24" + height="4" x="0" - y="12" /> + y="1" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" + x="0" + y="1" /> + <path + style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30" + 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: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" /> + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10" + 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"> + <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" @@ -194,12 +220,21 @@ inkscape:label="Button"> <g style="display:inline" - id="g1624" - transform="translate(3,7)"> + id="g1627" + transform="translate(6,4)"> <path - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" + 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" 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="rect2285" /> + id="rect2275" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm index 0fbdd0d57..fe56c5bec 100644 --- a/themes/default/maximize-inactive.xpm +++ b/themes/default/maximize-inactive.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex 96e78e6ee..190db0f50 100644 --- a/themes/default/maximize-prelight.png +++ b/themes/default/maximize-prelight.png diff --git a/themes/default/maximize-prelight.svg b/themes/default/maximize-prelight.svg index a43d761ed..d6f44f758 100644 --- a/themes/default/maximize-prelight.svg +++ b/themes/default/maximize-prelight.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="maximize-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + inkscape:label="pressed"> <g - 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" /> + id="g1789" + transform="translate(0,1)"> + <rect + style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,38 +208,64 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" - id="g20" + id="g3722" inkscape:label="Button"> <g style="display:inline" id="g1614" - transform="translate(3,7)"> + transform="translate(6,4)"> <path - id="rect2246" + id="rect2276" 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:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path - id="rect2285" + id="rect2275" d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm index 5ec094da2..626a82c81 100644 --- a/themes/default/maximize-prelight.xpm +++ b/themes/default/maximize-prelight.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * maximize_active_xpm[] = { -"18 24 2 1", +static char * maximize_pressed_xpm[] = { +"24 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 Binary files differindex d42c97ba5..375ac5f03 100644 --- a/themes/default/maximize-pressed.png +++ b/themes/default/maximize-pressed.png diff --git a/themes/default/maximize-pressed.svg b/themes/default/maximize-pressed.svg index 8e11e2d43..06a113dae 100644 --- a/themes/default/maximize-pressed.svg +++ b/themes/default/maximize-pressed.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="maximize-pressed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + 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="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + id="layer1" + inkscape:label="pressed"> <g - 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" /> + 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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,21 +208,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" height="12" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" @@ -209,15 +248,24 @@ <g style="display:inline" id="g1614" - transform="translate(3,8)"> + transform="translate(6,5)"> <path - id="rect2246" + id="rect2276" 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:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path - id="rect2285" + id="rect2275" d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm index 5ec094da2..626a82c81 100644 --- a/themes/default/maximize-pressed.xpm +++ b/themes/default/maximize-pressed.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * maximize_active_xpm[] = { -"18 24 2 1", +static char * maximize_pressed_xpm[] = { +"24 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 Binary files differindex 8d3771ec8..48b285e88 100644 --- a/themes/default/maximize-toggled-active.png +++ b/themes/default/maximize-toggled-active.png diff --git a/themes/default/maximize-toggled-active.svg b/themes/default/maximize-toggled-active.svg index 15270a280..cb9cca131 100644 --- a/themes/default/maximize-toggled-active.svg +++ b/themes/default/maximize-toggled-active.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + 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: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" /> + 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"> + <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" @@ -194,20 +220,29 @@ inkscape:label="Button"> <g style="display:inline" - id="g1624" - transform="translate(3,7)"> + id="g1627" + transform="translate(6,4)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path id="rect2331" d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path id="rect2371" d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm index de884b3b8..7924268b0 100644 --- a/themes/default/maximize-toggled-active.xpm +++ b/themes/default/maximize-toggled-active.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * maximize_toggled_active_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex 43e96528e..e48b71cd4 100644 --- a/themes/default/maximize-toggled-inactive.png +++ b/themes/default/maximize-toggled-inactive.png diff --git a/themes/default/maximize-toggled-inactive.svg b/themes/default/maximize-toggled-inactive.svg index 2e8657dc2..ab6c899bb 100644 --- a/themes/default/maximize-toggled-inactive.svg +++ b/themes/default/maximize-toggled-inactive.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + id="rect6061" + width="24" + height="4" x="0" - y="12" /> + y="1" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" + x="0" + y="1" /> + <path + style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30" + 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: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" /> + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10" + 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"> + <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" @@ -195,15 +221,24 @@ <g style="display:inline" id="g1639" - transform="translate(3,7)"> + transform="translate(6,4)"> <path id="rect2331" d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + 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" /> <path id="rect2371" d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm index 5dc29b3ba..25b8c53ac 100644 --- a/themes/default/maximize-toggled-inactive.xpm +++ b/themes/default/maximize-toggled-inactive.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * maximize_toggled_inactive_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex b5739b1fb..6a1811ec5 100644 --- a/themes/default/maximize-toggled-prelight.png +++ b/themes/default/maximize-toggled-prelight.png diff --git a/themes/default/maximize-toggled-prelight.svg b/themes/default/maximize-toggled-prelight.svg index 26ca0e668..4babb31b1 100644 --- a/themes/default/maximize-toggled-prelight.svg +++ b/themes/default/maximize-toggled-prelight.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + inkscape:label="pressed"> <g - 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" /> + id="g1789" + transform="translate(0,1)"> + <rect + style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,42 +208,68 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" - id="g20" + id="g3722" inkscape:label="Button"> <g style="display:inline" - id="g1624" - transform="translate(3,7)"> + id="g1627" + transform="translate(6,4)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path id="rect2331" d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path id="rect2371" d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm index de884b3b8..0a8015764 100644 --- a/themes/default/maximize-toggled-prelight.xpm +++ b/themes/default/maximize-toggled-prelight.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * maximize_toggled_active_xpm[] = { -"18 24 2 1", +static char * maximize_toggled_pressed_xpm[] = { +"24 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 Binary files differindex f2290201a..3cd1e5b56 100644 --- a/themes/default/maximize-toggled-pressed.png +++ b/themes/default/maximize-toggled-pressed.png diff --git a/themes/default/maximize-toggled-pressed.svg b/themes/default/maximize-toggled-pressed.svg index 333b19a20..6f5ad4c56 100644 --- a/themes/default/maximize-toggled-pressed.svg +++ b/themes/default/maximize-toggled-pressed.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + 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="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + id="layer1" + inkscape:label="pressed"> <g - 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" /> + 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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,21 +208,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" height="12" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" @@ -208,20 +247,29 @@ inkscape:label="Button"> <g style="display:inline" - id="g1624" - transform="translate(3,8)"> + id="g1627" + transform="translate(6,5)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path id="rect2331" d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path id="rect2371" d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm index de884b3b8..0a8015764 100644 --- a/themes/default/maximize-toggled-pressed.xpm +++ b/themes/default/maximize-toggled-pressed.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * maximize_toggled_active_xpm[] = { -"18 24 2 1", +static char * maximize_toggled_pressed_xpm[] = { +"24 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 Binary files differindex 6a272c7dd..56f4c64c7 100644 --- a/themes/default/menu-active.png +++ b/themes/default/menu-active.png diff --git a/themes/default/menu-active.svg b/themes/default/menu-active.svg index 31e1029de..663d5cfee 100644 --- a/themes/default/menu-active.svg +++ b/themes/default/menu-active.svg @@ -9,68 +9,68 @@ 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="18" - height="24" + width="24" + height="18" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="menu-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,46 +147,58 @@ </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,-4)" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> <g inkscape:groupmode="layer" id="layer3" + transform="translate(0,-4)" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + x="0" + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-4)" + 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,-4)" + inkscape:label="Shadow"> <path - 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" /> + 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,23.5 L 23.5,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm index 0b60759d1..3a9d0f45a 100644 --- a/themes/default/menu-active.xpm +++ b/themes/default/menu-active.xpm @@ -1,29 +1,23 @@ /* XPM */ static char * menu_active_xpm[] = { -"16 24 2 1", +"24 17 2 1", " c None", ". c #C0C0FF s active_color_1", -" ", -" ", -" ", -" ", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -" ", -" "}; +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................"}; diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png Binary files differindex 69f340e3d..0def67458 100644 --- a/themes/default/menu-inactive.png +++ b/themes/default/menu-inactive.png diff --git a/themes/default/menu-inactive.svg b/themes/default/menu-inactive.svg index b1123da07..2139c7a1c 100644 --- a/themes/default/menu-inactive.svg +++ b/themes/default/menu-inactive.svg @@ -9,68 +9,68 @@ 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="18" - height="24" + width="24" + height="18" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="menu-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,46 +147,58 @@ </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,-4)" style="display:inline"> <rect - style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> <g inkscape:groupmode="layer" id="layer3" + transform="translate(0,-4)" 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + id="rect6061" + width="24" + height="4" x="0" - y="12" /> + y="1" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" + x="0" + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-4)" + 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,-4)" + inkscape:label="Shadow"> <path - 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" /> + 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,23.5 L 23.5,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm index c004dee54..8f07169eb 100644 --- a/themes/default/menu-inactive.xpm +++ b/themes/default/menu-inactive.xpm @@ -1,29 +1,23 @@ /* XPM */ static char * menu_inactive_xpm[] = { -"16 24 2 1", +"24 17 2 1", " c None", ". c #C0C0FF s inactive_color_1", -" ", -" ", -" ", -" ", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -" ", -" "}; +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................"}; diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png Binary files differindex 6a272c7dd..56f4c64c7 100644 --- a/themes/default/menu-prelight.png +++ b/themes/default/menu-prelight.png diff --git a/themes/default/menu-prelight.svg b/themes/default/menu-prelight.svg index 8093fb88f..7fdd3f03a 100644 --- a/themes/default/menu-prelight.svg +++ b/themes/default/menu-prelight.svg @@ -9,27 +9,27 @@ 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="18" - height="24" + width="24" + height="18" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="menu-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,46 +147,58 @@ </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,-4)" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> <g inkscape:groupmode="layer" id="layer3" + transform="translate(0,-4)" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + x="0" + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-4)" + 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,-4)" + inkscape:label="Shadow"> <path - 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" /> + 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,23.5 L 23.5,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/menu-prelight.xpm b/themes/default/menu-prelight.xpm index 0b60759d1..bfe19e1c8 100644 --- a/themes/default/menu-prelight.xpm +++ b/themes/default/menu-prelight.xpm @@ -1,29 +1,22 @@ /* XPM */ static char * menu_active_xpm[] = { -"16 24 2 1", +"24 17 2 1", " c None", ". c #C0C0FF s active_color_1", -" ", -" ", -" ", -" ", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -" ", -" "}; +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................"}; diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png Binary files differindex 6a272c7dd..56f4c64c7 100644 --- a/themes/default/menu-pressed.png +++ b/themes/default/menu-pressed.png diff --git a/themes/default/menu-pressed.svg b/themes/default/menu-pressed.svg index d35d438c5..ae4e78751 100644 --- a/themes/default/menu-pressed.svg +++ b/themes/default/menu-pressed.svg @@ -9,27 +9,27 @@ 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="18" - height="24" + width="24" + height="18" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="menu-pressed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,46 +147,58 @@ </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,-4)" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> <g inkscape:groupmode="layer" id="layer3" + transform="translate(0,-4)" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + x="0" + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-4)" + 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,-4)" + inkscape:label="Shadow"> <path - 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" /> + 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,23.5 L 23.5,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm index 0b60759d1..bfe19e1c8 100644 --- a/themes/default/menu-pressed.xpm +++ b/themes/default/menu-pressed.xpm @@ -1,29 +1,22 @@ /* XPM */ static char * menu_active_xpm[] = { -"16 24 2 1", +"24 17 2 1", " c None", ". c #C0C0FF s active_color_1", -" ", -" ", -" ", -" ", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -"................", -" ", -" "}; +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................"}; diff --git a/themes/default/right-active.png b/themes/default/right-active.png Binary files differindex f5cd2331b..57bf1c4d9 100644 --- a/themes/default/right-active.png +++ b/themes/default/right-active.png diff --git a/themes/default/right-active.svg b/themes/default/right-active.svg index dccddb039..1be099c00 100644 --- a/themes/default/right-active.svg +++ b/themes/default/right-active.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="right-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -45,47 +45,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 4.5,0 L 4.5,24" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1"> + id="border"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" 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 caad32306..634908f0c 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 Binary files differindex 724f80f7a..57bf1c4d9 100644 --- a/themes/default/right-inactive.png +++ b/themes/default/right-inactive.png diff --git a/themes/default/right-inactive.svg b/themes/default/right-inactive.svg index 39f39e326..ad5c690f2 100644 --- a/themes/default/right-inactive.svg +++ b/themes/default/right-inactive.svg @@ -14,14 +14,14 @@ sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="right-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs - id="defs4" /> + id="defs7" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -45,47 +45,21 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Border</dc:title> + <dc:title>Top Corner</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 4.5,0 L 4.5,24" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1"> + id="border"> <path - style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50" + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" 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 45b2a4f2b..a9894c017 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 Binary files differindex 4f12900df..7332d59e2 100644 --- a/themes/default/shade-active.png +++ b/themes/default/shade-active.png diff --git a/themes/default/shade-active.svg b/themes/default/shade-active.svg index 3314617a0..25db7fa13 100644 --- a/themes/default/shade-active.svg +++ b/themes/default/shade-active.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="shade-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + 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: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" /> + 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"> + <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" @@ -195,15 +221,24 @@ <g style="display:inline" id="g1616" - transform="translate(3,7)"> + transform="translate(6,4)"> <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:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2405" /> + 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" /> <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:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2420" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm index f7ab9745f..2175710f6 100644 --- a/themes/default/shade-active.xpm +++ b/themes/default/shade-active.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * shade_active_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex ea938137b..f0ad2dc1b 100644 --- a/themes/default/shade-inactive.png +++ b/themes/default/shade-inactive.png diff --git a/themes/default/shade-inactive.svg b/themes/default/shade-inactive.svg index 01820878c..e43dc3510 100644 --- a/themes/default/shade-inactive.svg +++ b/themes/default/shade-inactive.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="shade-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + id="rect6061" + width="24" + height="4" x="0" - y="12" /> + y="1" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" + x="0" + y="1" /> + <path + style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30" + 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: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" /> + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10" + 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"> + <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" @@ -195,11 +221,20 @@ <g style="display:inline" id="g1616" - transform="translate(3,7)"> + transform="translate(6,4)"> <path - 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" + 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" 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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm index 5008b2c59..a68c547b2 100644 --- a/themes/default/shade-inactive.xpm +++ b/themes/default/shade-inactive.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * shade_inactive_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex 00a55f953..6f847f1cf 100644 --- a/themes/default/shade-prelight.png +++ b/themes/default/shade-prelight.png diff --git a/themes/default/shade-prelight.svg b/themes/default/shade-prelight.svg index 9650e29a0..75c240bfd 100644 --- a/themes/default/shade-prelight.svg +++ b/themes/default/shade-prelight.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="shade-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + inkscape:label="pressed"> <g - 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" /> + id="g1789" + transform="translate(0,1)"> + <rect + style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,38 +208,64 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" - id="g20" + id="g3722" inkscape:label="Button"> <g style="display:inline" id="g1616" - transform="translate(3,7)"> + transform="translate(6,4)"> <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:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2405" /> + 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" /> <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:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2420" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm index f7ab9745f..5ebabc644 100644 --- a/themes/default/shade-prelight.xpm +++ b/themes/default/shade-prelight.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * shade_active_xpm[] = { -"18 24 2 1", +static char * shade_pressed_xpm[] = { +"24 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 Binary files differindex 5f6c4a556..14c0ffce8 100644 --- a/themes/default/shade-pressed.png +++ b/themes/default/shade-pressed.png diff --git a/themes/default/shade-pressed.svg b/themes/default/shade-pressed.svg index 5d1adc8d1..2f2cace50 100644 --- a/themes/default/shade-pressed.svg +++ b/themes/default/shade-pressed.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="shade-pressed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + 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="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + id="layer1" + inkscape:label="pressed"> <g - 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" /> + 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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,21 +208,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" height="12" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" @@ -209,15 +248,24 @@ <g style="display:inline" id="g1616" - transform="translate(3,8)"> + transform="translate(6,5)"> <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:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2405" /> + 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" /> <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:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2420" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm index f7ab9745f..5ebabc644 100644 --- a/themes/default/shade-pressed.xpm +++ b/themes/default/shade-pressed.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * shade_active_xpm[] = { -"18 24 2 1", +static char * shade_pressed_xpm[] = { +"24 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 Binary files differindex 49884691a..7301157a6 100644 --- a/themes/default/shade-toggled-active.png +++ b/themes/default/shade-toggled-active.png diff --git a/themes/default/shade-toggled-active.svg b/themes/default/shade-toggled-active.svg index 1ed3624db..162ed907c 100644 --- a/themes/default/shade-toggled-active.svg +++ b/themes/default/shade-toggled-active.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + 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: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" /> + 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"> + <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" @@ -194,16 +220,25 @@ inkscape:label="Button"> <g style="display:inline" - id="g1624" - transform="translate(3,7)"> + id="g1628" + transform="translate(6,4)"> <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:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2405" /> + 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" /> <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:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2420" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm index e5f40e2c8..79edeee63 100644 --- a/themes/default/shade-toggled-active.xpm +++ b/themes/default/shade-toggled-active.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * shade_toggled_active_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex edcce25b0..a6b33894c 100644 --- a/themes/default/shade-toggled-inactive.png +++ b/themes/default/shade-toggled-inactive.png diff --git a/themes/default/shade-toggled-inactive.svg b/themes/default/shade-toggled-inactive.svg index 7362b6524..4b097527e 100644 --- a/themes/default/shade-toggled-inactive.svg +++ b/themes/default/shade-toggled-inactive.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + id="rect6061" + width="24" + height="4" x="0" - y="12" /> + y="1" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" + x="0" + y="1" /> + <path + style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30" + 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: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" /> + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10" + 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"> + <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" @@ -194,12 +220,21 @@ inkscape:label="Button"> <g style="display:inline" - id="g1624" - transform="translate(3,7)"> + id="g1628" + transform="translate(6,4)"> <path - 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" + 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" 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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm index 056cfab4e..e4ee95ccf 100644 --- a/themes/default/shade-toggled-inactive.xpm +++ b/themes/default/shade-toggled-inactive.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * shade_toggled_inactive_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex ec4f82bee..97431bf6a 100644 --- a/themes/default/shade-toggled-prelight.png +++ b/themes/default/shade-toggled-prelight.png diff --git a/themes/default/shade-toggled-prelight.svg b/themes/default/shade-toggled-prelight.svg index af348b097..2e1a3d27e 100644 --- a/themes/default/shade-toggled-prelight.svg +++ b/themes/default/shade-toggled-prelight.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + inkscape:label="pressed"> <g - 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" /> + id="g1789" + transform="translate(0,1)"> + <rect + style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,38 +208,64 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" - id="g20" + id="g3722" inkscape:label="Button"> <g style="display:inline" - id="g1624" - transform="translate(3,7)"> + id="g1628" + transform="translate(6,4)"> <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:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2405" /> + 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" /> <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:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2420" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm index e5f40e2c8..1ec41a55c 100644 --- a/themes/default/shade-toggled-prelight.xpm +++ b/themes/default/shade-toggled-prelight.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * shade_toggled_active_xpm[] = { -"18 24 2 1", +static char * shade_toggled_pressed_xpm[] = { +"24 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 Binary files differindex 008b3e536..e7c190dad 100644 --- a/themes/default/shade-toggled-pressed.png +++ b/themes/default/shade-toggled-pressed.png diff --git a/themes/default/shade-toggled-pressed.svg b/themes/default/shade-toggled-pressed.svg index a81b9e51a..a7276d0be 100644 --- a/themes/default/shade-toggled-pressed.svg +++ b/themes/default/shade-toggled-pressed.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + 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="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + id="layer1" + inkscape:label="pressed"> <g - 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" /> + 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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,21 +208,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" height="12" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" @@ -208,16 +247,25 @@ inkscape:label="Button"> <g style="display:inline" - id="g1624" - transform="translate(3,8)"> + id="g1628" + transform="translate(6,5)"> <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:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2405" /> + 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" /> <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:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline" - id="path2420" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm index e5f40e2c8..1ec41a55c 100644 --- a/themes/default/shade-toggled-pressed.xpm +++ b/themes/default/shade-toggled-pressed.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * shade_toggled_active_xpm[] = { -"18 24 2 1", +static char * shade_toggled_pressed_xpm[] = { +"24 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 Binary files differindex 838f0cd72..3f2279e7c 100644 --- a/themes/default/stick-active.png +++ b/themes/default/stick-active.png diff --git a/themes/default/stick-active.svg b/themes/default/stick-active.svg index 3e75ff203..c49c14d8e 100644 --- a/themes/default/stick-active.svg +++ b/themes/default/stick-active.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="stick-active.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + 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: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" /> + 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"> + <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" @@ -195,15 +221,24 @@ <g style="display:inline" id="g1613" - transform="translate(3,7)"> + transform="translate(6,4)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - id="path2247" + id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm index fa7ebe7e0..04d853c78 100644 --- a/themes/default/stick-active.xpm +++ b/themes/default/stick-active.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * stick_active_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex bbca76df3..0082f22ce 100644 --- a/themes/default/stick-inactive.png +++ b/themes/default/stick-inactive.png diff --git a/themes/default/stick-inactive.svg b/themes/default/stick-inactive.svg index 7229f3b55..3631d7e59 100644 --- a/themes/default/stick-inactive.svg +++ b/themes/default/stick-inactive.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="stick-inactive.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + id="rect6061" + width="24" + height="4" x="0" - y="12" /> + y="1" /> + <rect + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" + x="0" + y="1" /> + <path + style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30" + 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: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" /> + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10" + 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"> + <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" @@ -195,11 +221,20 @@ <g style="display:inline" id="g1613" - transform="translate(3,7)"> + transform="translate(6,4)"> <path - id="path2247" + id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + 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" /> </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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm index a6ccaaae0..062568111 100644 --- a/themes/default/stick-inactive.xpm +++ b/themes/default/stick-inactive.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * stick_inactive_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex 8bc0f739a..83c8cca50 100644 --- a/themes/default/stick-prelight.png +++ b/themes/default/stick-prelight.png diff --git a/themes/default/stick-prelight.svg b/themes/default/stick-prelight.svg index 7132c0e93..272289a5a 100644 --- a/themes/default/stick-prelight.svg +++ b/themes/default/stick-prelight.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="stick-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + inkscape:label="pressed"> <g - 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" /> + id="g1789" + transform="translate(0,1)"> + <rect + style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,38 +208,64 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" - id="g20" + id="g3722" inkscape:label="Button"> <g style="display:inline" id="g1613" - transform="translate(3,7)"> + transform="translate(6,4)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - id="path2247" + id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm index fa7ebe7e0..be8454705 100644 --- a/themes/default/stick-prelight.xpm +++ b/themes/default/stick-prelight.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * stick_active_xpm[] = { -"18 24 2 1", +static char * stick_pressed_xpm[] = { +"24 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 Binary files differindex 32febb89f..65cb44653 100644 --- a/themes/default/stick-pressed.png +++ b/themes/default/stick-pressed.png diff --git a/themes/default/stick-pressed.svg b/themes/default/stick-pressed.svg index a7a6435d8..db1230865 100644 --- a/themes/default/stick-pressed.svg +++ b/themes/default/stick-pressed.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" version="1.0" - sodipodi:docbase="/themes/default" sodipodi:docname="stick-pressed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + 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="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + id="layer1" + inkscape:label="pressed"> <g - 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" /> + 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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,21 +208,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" height="12" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" @@ -209,15 +248,24 @@ <g style="display:inline" id="g1613" - transform="translate(3,8)"> + transform="translate(6,5)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - id="path2247" + id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm index fa7ebe7e0..be8454705 100644 --- a/themes/default/stick-pressed.xpm +++ b/themes/default/stick-pressed.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * stick_active_xpm[] = { -"18 24 2 1", +static char * stick_pressed_xpm[] = { +"24 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 Binary files differindex b5af56d16..ae2d6cf92 100644 --- a/themes/default/stick-toggled-active.png +++ b/themes/default/stick-toggled-active.png diff --git a/themes/default/stick-toggled-active.svg b/themes/default/stick-toggled-active.svg index 2822dcdd6..3b2942610 100644 --- a/themes/default/stick-toggled-active.svg +++ b/themes/default/stick-toggled-active.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" + x1="0" + y1="1" + x2="0" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,21 +181,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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="12" /> + 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" + 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: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" /> + 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"> + <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" @@ -195,20 +221,33 @@ <g style="display:inline" id="g1625" - transform="translate(3,7)"> + transform="translate(6,4)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - id="path2247" + id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - 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:ry="1" + sodipodi:rx="1" + sodipodi:cy="6" + sodipodi:cx="6" + id="path2292" + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm index 45c175259..3132512cf 100644 --- a/themes/default/stick-toggled-active.xpm +++ b/themes/default/stick-toggled-active.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * stick_toggled_active_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex 133312947..5e854bd0c 100644 --- a/themes/default/stick-toggled-inactive.png +++ b/themes/default/stick-toggled-inactive.png diff --git a/themes/default/stick-toggled-inactive.svg b/themes/default/stick-toggled-inactive.svg index 0a99a2044..9822bc48c 100644 --- a/themes/default/stick-toggled-inactive.svg +++ b/themes/default/stick-toggled-inactive.svg @@ -9,68 +9,68 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + 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" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="25" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5873" + id="linearGradient4147" + x1="0" + y1="1" + x2="0" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +165,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -172,31 +181,38 @@ 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(#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" + style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" + width="24" + height="15" x="0" - y="12" /> + y="1" /> + <path + style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30" + 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: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" /> + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10" + 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="g22" + 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="path24" /> + 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" @@ -205,16 +221,29 @@ <g style="display:inline" id="g1625" - transform="translate(3,7)"> + transform="translate(6,4)"> <path - id="path2247" + id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + 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" /> <path d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="6" + sodipodi:cx="6" id="path2202" - style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" + 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" 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,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm index ca1bd8536..b424c7fe6 100644 --- a/themes/default/stick-toggled-inactive.xpm +++ b/themes/default/stick-toggled-inactive.xpm @@ -1,29 +1,29 @@ /* XPM */ static char * stick_toggled_inactive_xpm[] = { -"18 24 2 1", +"24 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 Binary files differindex 2b8570b11..0eb5ef452 100644 --- a/themes/default/stick-toggled-prelight.png +++ b/themes/default/stick-toggled-prelight.png diff --git a/themes/default/stick-toggled-prelight.svg b/themes/default/stick-toggled-prelight.svg index 3ea8972f0..9ee88f67e 100644 --- a/themes/default/stick-toggled-prelight.svg +++ b/themes/default/stick-toggled-prelight.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient5873" + id="linearGradient4147" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + y2="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + inkscape:label="pressed"> <g - 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" /> + id="g1789" + transform="translate(0,1)"> + <rect + style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,43 +208,73 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" - id="g20" + id="g3722" inkscape:label="Button"> <g style="display:inline" id="g1625" - transform="translate(3,7)"> + transform="translate(6,4)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - id="path2247" + id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - 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:ry="1" + sodipodi:rx="1" + sodipodi:cy="0" + sodipodi:cx="6" + id="path2292" + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm index 45c175259..67c11cb6c 100644 --- a/themes/default/stick-toggled-prelight.xpm +++ b/themes/default/stick-toggled-prelight.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * stick_toggled_active_xpm[] = { -"18 24 2 1", +static char * stick_toggled_pressed_xpm[] = { +"24 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 Binary files differindex 0b2004c35..da658b543 100644 --- a/themes/default/stick-toggled-pressed.png +++ b/themes/default/stick-toggled-pressed.png diff --git a/themes/default/stick-toggled-pressed.svg b/themes/default/stick-toggled-pressed.svg index 38fc879b9..f8c398df4 100644 --- a/themes/default/stick-toggled-pressed.svg +++ b/themes/default/stick-toggled-pressed.svg @@ -9,27 +9,27 @@ 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="18" + width="24" height="24" id="svg2" sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> @@ -40,37 +40,37 @@ <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:#ffffff;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -81,19 +81,49 @@ 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="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" + 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="22" gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,27 +176,19 @@ </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="layer4" - inkscape:label="frame"> + id="layer1" + inkscape:label="pressed"> <g - 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" /> + 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" /> </g> </g> <g @@ -175,10 +197,10 @@ inkscape:label="Grad" style="display:inline"> <rect - 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" + style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" id="rect6057" - width="18" - height="12" + width="24" + height="23" x="0" y="1" /> </g> @@ -186,21 +208,38 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;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(#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" + 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" height="12" x="0" - y="12" /> + y="1" /> <path - 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" /> + 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" /> </g> <g inkscape:groupmode="layer" @@ -209,20 +248,33 @@ <g style="display:inline" id="g1625" - transform="translate(3,8)"> + transform="translate(6,5)"> <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:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - id="path2247" + id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - id="path2282" d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z" - 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:ry="1" + sodipodi:rx="1" + sodipodi:cy="0" + sodipodi:cx="6" + id="path2292" + style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc" /> </g> </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> + <path + style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0" + d="M 0,23.5 L 24,23.5" + id="path6989" /> + </g> </svg> diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm index 45c175259..67c11cb6c 100644 --- a/themes/default/stick-toggled-pressed.xpm +++ b/themes/default/stick-toggled-pressed.xpm @@ -1,29 +1,29 @@ /* XPM */ -static char * stick_toggled_active_xpm[] = { -"18 24 2 1", +static char * stick_toggled_pressed_xpm[] = { +"24 24 2 1", " c None", ". c #C0C0FF s active_color_1", -" ", -" ", -" ", -" ", -" ................ ", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -"..................", -" ................ ", -" ", -" "}; +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................", +"........................"}; diff --git a/themes/default/themerc b/themes/default/themerc index 80d40c4e1..1888a1960 100644 --- a/themes/default/themerc +++ b/themes/default/themerc @@ -1,5 +1,5 @@ active_text_color=#ffffff -button_offset=-2 +button_offset=0 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 Binary files differindex 491d07178..7d45042be 100644 --- a/themes/default/title-1-active.png +++ b/themes/default/title-1-active.png diff --git a/themes/default/title-1-active.svg b/themes/default/title-1-active.svg index bdce85331..1e88b7267 100644 --- a/themes/default/title-1-active.svg +++ b/themes/default/title-1-active.svg @@ -15,62 +15,61 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,35 +82,36 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="10" - inkscape:cx="0" - inkscape:cy="0" + inkscape:zoom="40" + inkscape:cx="-3.2737067" + inkscape:cy="-1.198171" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer2" showgrid="true" inkscape:grid-bbox="true" inkscape:grid-points="true" gridtolerance="0.5px" guidetolerance="1px" - inkscape:window-width="640" - inkscape:window-height="400" - inkscape:window-x="0" - inkscape:window-y="0" + inkscape:window-width="1351" + inkscape:window-height="754" + inkscape:window-x="423" + inkscape:window-y="101" inkscape:guide-bbox="true" inkscape:guide-points="false" showguides="true"> @@ -146,25 +146,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +163,34 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + 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 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png Binary files differindex 92b462364..43f7bb0a5 100644 --- a/themes/default/title-1-inactive.png +++ b/themes/default/title-1-inactive.png diff --git a/themes/default/title-1-inactive.svg b/themes/default/title-1-inactive.svg index 9522b77df..c4b2b0055 100644 --- a/themes/default/title-1-inactive.svg +++ b/themes/default/title-1-inactive.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ 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" + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png Binary files differindex 491d07178..7d45042be 100644 --- a/themes/default/title-2-active.png +++ b/themes/default/title-2-active.png diff --git a/themes/default/title-2-active.svg b/themes/default/title-2-active.svg index 0efd836a9..822bba3ca 100644 --- a/themes/default/title-2-active.svg +++ b/themes/default/title-2-active.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + 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 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png Binary files differindex 92b462364..43f7bb0a5 100644 --- a/themes/default/title-2-inactive.png +++ b/themes/default/title-2-inactive.png diff --git a/themes/default/title-2-inactive.svg b/themes/default/title-2-inactive.svg index 3232670e3..487a57696 100644 --- a/themes/default/title-2-inactive.svg +++ b/themes/default/title-2-inactive.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ 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" + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png Binary files differindex 491d07178..7d45042be 100644 --- a/themes/default/title-3-active.png +++ b/themes/default/title-3-active.png diff --git a/themes/default/title-3-active.svg b/themes/default/title-3-active.svg index 532fb4239..efd2e9b02 100644 --- a/themes/default/title-3-active.svg +++ b/themes/default/title-3-active.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + 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 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png Binary files differindex 92b462364..43f7bb0a5 100644 --- a/themes/default/title-3-inactive.png +++ b/themes/default/title-3-inactive.png diff --git a/themes/default/title-3-inactive.svg b/themes/default/title-3-inactive.svg index a2655310b..230c7414a 100644 --- a/themes/default/title-3-inactive.svg +++ b/themes/default/title-3-inactive.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ 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" + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png Binary files differindex 491d07178..7d45042be 100644 --- a/themes/default/title-4-active.png +++ b/themes/default/title-4-active.png diff --git a/themes/default/title-4-active.svg b/themes/default/title-4-active.svg index bfe3dde22..2fc35f909 100644 --- a/themes/default/title-4-active.svg +++ b/themes/default/title-4-active.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + 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 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png Binary files differindex 92b462364..43f7bb0a5 100644 --- a/themes/default/title-4-inactive.png +++ b/themes/default/title-4-inactive.png diff --git a/themes/default/title-4-inactive.svg b/themes/default/title-4-inactive.svg index d8017e4b0..968254e74 100644 --- a/themes/default/title-4-inactive.svg +++ b/themes/default/title-4-inactive.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ 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" + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png Binary files differindex 491d07178..7d45042be 100644 --- a/themes/default/title-5-active.png +++ b/themes/default/title-5-active.png diff --git a/themes/default/title-5-active.svg b/themes/default/title-5-active.svg index 95b8527f1..ee4ca2b98 100644 --- a/themes/default/title-5-active.svg +++ b/themes/default/title-5-active.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#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" + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ id="layer3" inkscape:label="hilight"> <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + 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 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png Binary files differindex 92b462364..43f7bb0a5 100644 --- a/themes/default/title-5-inactive.png +++ b/themes/default/title-5-inactive.png diff --git a/themes/default/title-5-inactive.svg b/themes/default/title-5-inactive.svg index e1e77aa27..9ad7c07c1 100644 --- a/themes/default/title-5-inactive.svg +++ b/themes/default/title-5-inactive.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -146,25 +147,15 @@ </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(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:url(#linearGradient6945);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1" id="rect6057" width="8" - height="12" + height="23" x="0" y="1" /> </g> @@ -173,19 +164,34 @@ 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" + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1" + id="rect1884" width="8" - height="12" + height="15" x="0" - y="12" /> + y="1" /> + </g> + <g + inkscape:label="Border" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> <path - style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#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" /> + 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,23.5 L 8,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png Binary files differindex 5d0f4a568..87b45a77c 100644 --- a/themes/default/top-left-active.png +++ b/themes/default/top-left-active.png diff --git a/themes/default/top-left-active.svg b/themes/default/top-left-active.svg index 5e122b6ad..a86c9ae6d 100644 --- a/themes/default/top-left-active.svg +++ b/themes/default/top-left-active.svg @@ -10,67 +10,67 @@ 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.46" sodipodi:version="0.32" id="svg2" height="24" width="8" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -111,7 +112,7 @@ inkscape:window-width="640" inkscape:window-height="733" inkscape:window-x="187" - inkscape:window-y="724" + inkscape:window-y="728" inkscape:guide-bbox="true" inkscape:guide-points="false" showguides="true"> @@ -147,23 +148,13 @@ </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" id="layer2" inkscape:groupmode="layer"> <path id="path6057" - 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 " /> + 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,19 C 1,19 1,24 6,24 L 8,24 L 8,24 L 8,1 z " /> </g> <g inkscape:label="hilight" @@ -172,14 +163,29 @@ <path id="path6061" 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.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" /> <path - 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" /> + 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,24 1,24 1,24 L 0,24 L 0,0 L 8,0 z " + style="fill:black;fill-opacity:0.20" /> + </g> + <g + inkscape:label="Shadow" + id="layer5" + inkscape:groupmode="layer"> <path - 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" /> + 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,23.5 L 7.5,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png Binary files differindex 687a58e77..ea785d14f 100644 --- a/themes/default/top-left-inactive.png +++ b/themes/default/top-left-inactive.png diff --git a/themes/default/top-left-inactive.svg b/themes/default/top-left-inactive.svg index a8d43eb87..f0f242654 100644 --- a/themes/default/top-left-inactive.svg +++ b/themes/default/top-left-inactive.svg @@ -10,67 +10,67 @@ 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.46" sodipodi:version="0.32" id="svg2" height="24" width="8" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -111,7 +112,7 @@ inkscape:window-width="640" inkscape:window-height="733" inkscape:window-x="187" - inkscape:window-y="724" + inkscape:window-y="728" inkscape:guide-bbox="true" inkscape:guide-points="false" showguides="true"> @@ -147,23 +148,13 @@ </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" id="layer2" inkscape:groupmode="layer"> <path id="path6057" - style="fill:url(#linearGradient3148);fill-opacity:0.25;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 " /> + style="fill:url(#linearGradient6945);fill-opacity:0.25;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,19 C 1,19 1,24 6,24 L 8,24 L 8,24 L 8,1 z " /> </g> <g inkscape:label="hilight" @@ -172,14 +163,29 @@ <path id="path6061" 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.25;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" /> <path - 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" /> + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;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,24 1,24 1,24 L 0,24 L 0,0 L 8,0 z " + style="fill:black;fill-opacity:0.20" /> + </g> + <g + inkscape:label="Shadow" + id="layer5" + inkscape:groupmode="layer"> <path - 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" /> + 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,23.5 L 7.5,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png Binary files differindex 0d2d7689e..219ab6892 100644 --- a/themes/default/top-right-active.png +++ b/themes/default/top-right-active.png diff --git a/themes/default/top-right-active.svg b/themes/default/top-right-active.svg index af4091854..f82a26dc6 100644 --- a/themes/default/top-right-active.svg +++ b/themes/default/top-right-active.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -111,7 +112,7 @@ inkscape:window-width="640" inkscape:window-height="733" inkscape:window-x="187" - inkscape:window-y="724" + inkscape:window-y="728" inkscape:guide-bbox="true" inkscape:guide-points="false" showguides="true"> @@ -146,40 +147,45 @@ </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(#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 " + 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,19 C 7,19 7,24 2,24 L 0,24 L 0,24 L 0,1 z " id="path6057" /> </g> <g - inkscape:label="hilight" + inkscape:groupmode="layer" id="layer3" - inkscape:groupmode="layer"> + inkscape:label="hilight"> <path - style="fill:url(#linearGradient6962);fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" + 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="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" /> + 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,24 7,24 7,24 L 8,24 L 8,0 L 0,0 z " + style="fill:black;fill-opacity:0.20" /> + </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> <path - 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" /> + 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,23.5 L 5.5,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm index 1b3acf7b7..6e6bd0240 100644 --- a/themes/default/top-right-active.xpm +++ b/themes/default/top-right-active.xpm @@ -26,6 +26,4 @@ static char * top_right_active_xpm[] = { "........", "........", "........", -"........", -"........", "........"}; diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png Binary files differindex 838fe4fd1..883a4f013 100644 --- a/themes/default/top-right-inactive.png +++ b/themes/default/top-right-inactive.png diff --git a/themes/default/top-right-inactive.svg b/themes/default/top-right-inactive.svg index 35802a4ad..7277d9c42 100644 --- a/themes/default/top-right-inactive.svg +++ b/themes/default/top-right-inactive.svg @@ -15,62 +15,62 @@ sodipodi:version="0.32" 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"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> <defs id="defs4"> <linearGradient - id="linearGradient3143"> + id="linearGradient1886"> <stop - style="stop-color:#ffffff;stop-opacity:0.0;" + style="stop-color:white;stop-opacity:1;" offset="0" - id="stop3145" /> + id="stop1888" /> <stop - style="stop-color:#000000;stop-opacity:0.10;" + style="stop-color:white;stop-opacity:0.25;" offset="1" - id="stop3147" /> + id="stop1890" /> </linearGradient> <linearGradient id="linearGradient5873"> <stop id="stop5875" offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:white;stop-opacity:1;" /> <stop id="stop5877" offset="0.5" - style="stop-color:#ffffff;stop-opacity:0.95;" /> + style="stop-color:white;stop-opacity:0.90;" /> <stop id="stop5879" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:white;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient5847"> <stop id="stop5849" offset="0" - style="stop-color:#ffffff;stop-opacity:0.90;" /> + style="stop-color:white;stop-opacity:0;" /> <stop - id="stop5850" - offset="0.70" - style="stop-color:#ffffff;stop-opacity:0.10;" /> + id="stop2779" + offset="0.80" + style="stop-color:white;stop-opacity:0;" /> <stop id="stop5851" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0.10;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5847" - id="linearGradient3148" + id="linearGradient6945" + gradientUnits="userSpaceOnUse" x1="0" - y1="1" + y1="0.5" x2="0" - y2="18" - gradientUnits="userSpaceOnUse" - spreadMethod="none" /> + y2="23.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -83,17 +83,18 @@ gradientTransform="matrix(1,0,0,0.2,0,1)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3143" - id="linearGradient3149" + xlink:href="#linearGradient1886" + id="linearGradient1892" x1="0" - y1="13" + y1="1" x2="0" - y2="24" - gradientUnits="userSpaceOnUse" /> + y2="14" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.75,0,0,1,0.75,0)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="white" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" @@ -111,7 +112,7 @@ inkscape:window-width="640" inkscape:window-height="733" inkscape:window-x="187" - inkscape:window-y="724" + inkscape:window-y="728" inkscape:guide-bbox="true" inkscape:guide-points="false" showguides="true"> @@ -146,40 +147,45 @@ </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(#linearGradient3148);fill-opacity:0.25;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 " + style="fill:url(#linearGradient6945);fill-opacity:0.25;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,19 C 7,19 7,24 2,24 L 0,24 L 0,24 L 0,1 z " id="path6057" /> </g> <g - inkscape:label="hilight" + inkscape:groupmode="layer" id="layer3" - inkscape:groupmode="layer"> + 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" + 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 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="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" /> + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;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,24 7,24 7,24 L 8,24 L 8,0 L 0,0 z " + style="fill:black;fill-opacity:0.20" /> + </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="Shadow"> <path - 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" /> + 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,23.5 L 5.5,23.5" + id="path6989" /> </g> </svg> diff --git a/themes/kokodi/README b/themes/kokodi/README index 44f6269b6..5d53c4586 100644 --- a/themes/kokodi/README +++ b/themes/kokodi/README @@ -1,3 +1,7 @@ -Kokodi - SVG based theme for xfwm4. -(c) 2006, 2007, 2008 - Olivier Fourdan <fourdan@xfce.org> +Kokodi^2 +-------- + +SVG based theme for xfwm4. +Created Sept. 2006 by Olivier Fourdan <fourdan@xfce.org> +Modified Oct. 2006 by Olivier Fourdan <fourdan@xfce.org> Theme released under GNU GPL license. diff --git a/themes/kokodi/bottom-active.png b/themes/kokodi/bottom-active.png Binary files differindex a60098939..6317a4b48 100644 --- a/themes/kokodi/bottom-active.png +++ b/themes/kokodi/bottom-active.png diff --git a/themes/kokodi/bottom-active.svg b/themes/kokodi/bottom-active.svg index 83290f874..24b4923ad 100644 --- a/themes/kokodi/bottom-active.svg +++ b/themes/kokodi/bottom-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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="6" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -45,30 +47,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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.5,4.5 L 24,4.5" - id="path6061" /> - </g> - <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/kokodi/bottom-active.xpm b/themes/kokodi/bottom-active.xpm index 05b089ae5..3651e2814 100644 --- a/themes/kokodi/bottom-active.xpm +++ b/themes/kokodi/bottom-active.xpm @@ -7,6 +7,6 @@ static char * bottom_active_xpm[] = { "########################", "########################", "########################", -"@@@@@@@@@@@@@@@@@@@@@@@@", +"########################", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/themes/kokodi/bottom-inactive.png b/themes/kokodi/bottom-inactive.png Binary files differindex 17399639a..6317a4b48 100644 --- a/themes/kokodi/bottom-inactive.png +++ b/themes/kokodi/bottom-inactive.png diff --git a/themes/kokodi/bottom-inactive.svg b/themes/kokodi/bottom-inactive.svg index 58b987aa8..5f09478cf 100644 --- a/themes/kokodi/bottom-inactive.svg +++ b/themes/kokodi/bottom-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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="6" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -45,30 +47,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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.5,4.5 L 24,4.5" - id="path6061" /> - </g> - <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/kokodi/bottom-inactive.xpm b/themes/kokodi/bottom-inactive.xpm index ad03c07ae..7482f8618 100644 --- a/themes/kokodi/bottom-inactive.xpm +++ b/themes/kokodi/bottom-inactive.xpm @@ -7,6 +7,6 @@ static char * bottom_inactive_xpm[] = { "########################", "########################", "########################", -"@@@@@@@@@@@@@@@@@@@@@@@@", +"########################", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@"}; diff --git a/themes/kokodi/bottom-left-active.png b/themes/kokodi/bottom-left-active.png Binary files differindex bd0bc5132..509a8cbc2 100644 --- a/themes/kokodi/bottom-left-active.png +++ b/themes/kokodi/bottom-left-active.png diff --git a/themes/kokodi/bottom-left-active.svg b/themes/kokodi/bottom-left-active.svg index 3cbd2b738..96e0fcb8a 100644 --- a/themes/kokodi/bottom-left-active.svg +++ b/themes/kokodi/bottom-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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="16" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -44,30 +46,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 1.5,0 L 1.5,12.5 C 1.5,12.5 1.5,14.5 3.5,14.5 C 5.5,14.5 16,14.5 16,14.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" 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/kokodi/bottom-left-active.xpm b/themes/kokodi/bottom-left-active.xpm index 42f3c164e..65a91e8d7 100644 --- a/themes/kokodi/bottom-left-active.xpm +++ b/themes/kokodi/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/kokodi/bottom-left-inactive.png b/themes/kokodi/bottom-left-inactive.png Binary files differindex 77da55e02..e761450e8 100644 --- a/themes/kokodi/bottom-left-inactive.png +++ b/themes/kokodi/bottom-left-inactive.png diff --git a/themes/kokodi/bottom-left-inactive.svg b/themes/kokodi/bottom-left-inactive.svg index 3b4a93db9..777eb76d2 100644 --- a/themes/kokodi/bottom-left-inactive.svg +++ b/themes/kokodi/bottom-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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="16" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -44,30 +46,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 1.5,0 L 1.5,12.5 C 1.5,12.5 1.5,14.5 3.5,14.5 C 5.5,14.5 16,14.5 16,14.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" 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/kokodi/bottom-left-inactive.xpm b/themes/kokodi/bottom-left-inactive.xpm index a1ddb0c4b..254099e2f 100644 --- a/themes/kokodi/bottom-left-inactive.xpm +++ b/themes/kokodi/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/kokodi/bottom-right-active.png b/themes/kokodi/bottom-right-active.png Binary files differindex d947c5cad..867b01702 100644 --- a/themes/kokodi/bottom-right-active.png +++ b/themes/kokodi/bottom-right-active.png diff --git a/themes/kokodi/bottom-right-active.svg b/themes/kokodi/bottom-right-active.svg index fb9d10448..433c631ba 100644 --- a/themes/kokodi/bottom-right-active.svg +++ b/themes/kokodi/bottom-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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="16" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -44,30 +46,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 14.5,0 L 14.5,12.5 C 14.5,12.5 14.5,14.5 12.5,14.5 C 10.5,14.5 0,14.5 0,14.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" 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/kokodi/bottom-right-active.xpm b/themes/kokodi/bottom-right-active.xpm index 159230751..e3da1dc1e 100644 --- a/themes/kokodi/bottom-right-active.xpm +++ b/themes/kokodi/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/kokodi/bottom-right-inactive.png b/themes/kokodi/bottom-right-inactive.png Binary files differindex 259d9eee3..867b01702 100644 --- a/themes/kokodi/bottom-right-inactive.png +++ b/themes/kokodi/bottom-right-inactive.png diff --git a/themes/kokodi/bottom-right-inactive.svg b/themes/kokodi/bottom-right-inactive.svg index 5bcd0a7c5..46205a72b 100644 --- a/themes/kokodi/bottom-right-inactive.svg +++ b/themes/kokodi/bottom-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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="16" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -44,30 +46,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 14.5,0 L 14.5,12.5 C 14.5,12.5 14.5,14.5 12.5,14.5 C 10.5,14.5 0,14.5 0,14.5" - id="path6061" /> - </g> - <g inkscape:label="Layer 1" 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/kokodi/bottom-right-inactive.xpm b/themes/kokodi/bottom-right-inactive.xpm index 42a8e492f..ff0364734 100644 --- a/themes/kokodi/bottom-right-inactive.xpm +++ b/themes/kokodi/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/kokodi/close-active.png b/themes/kokodi/close-active.png Binary files differindex 2abcbd808..40dc9f7cd 100644 --- a/themes/kokodi/close-active.png +++ b/themes/kokodi/close-active.png diff --git a/themes/kokodi/close-active.svg b/themes/kokodi/close-active.svg index 1110e7190..ef31edc70 100644 --- a/themes/kokodi/close-active.svg +++ b/themes/kokodi/close-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -91,24 +95,6 @@ y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -157,40 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -198,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -208,7 +180,7 @@ inkscape:label="Button"> <g id="g2327" - transform="translate(6,4)"> + transform="translate(3,9)"> <g transform="matrix(0.875,0,0,0.875,0.75,0.75)" style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" @@ -237,8 +209,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/close-active.xpm b/themes/kokodi/close-active.xpm index d255e0ba4..3c1a7ae56 100644 --- a/themes/kokodi/close-active.xpm +++ b/themes/kokodi/close-active.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * close_active_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/close-inactive.png b/themes/kokodi/close-inactive.png Binary files differindex 3a8126070..26fbbe0c9 100644 --- a/themes/kokodi/close-inactive.png +++ b/themes/kokodi/close-inactive.png diff --git a/themes/kokodi/close-inactive.svg b/themes/kokodi/close-inactive.svg index e3b344ced..67bf2ce63 100644 --- a/themes/kokodi/close-inactive.svg +++ b/themes/kokodi/close-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,36 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -176,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -186,15 +180,15 @@ inkscape:label="Button"> <g id="g2327" - transform="translate(6,4)"> + transform="translate(3,9)"> <path id="path2221" d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5" - style="opacity:0.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 @@ -202,8 +196,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/close-inactive.xpm b/themes/kokodi/close-inactive.xpm index c57f58d5e..1cf0710b3 100644 --- a/themes/kokodi/close-inactive.xpm +++ b/themes/kokodi/close-inactive.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * close_inactive_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/close-prelight.png b/themes/kokodi/close-prelight.png Binary files differindex 896a99908..4c13d6f1f 100644 --- a/themes/kokodi/close-prelight.png +++ b/themes/kokodi/close-prelight.png diff --git a/themes/kokodi/close-prelight.svg b/themes/kokodi/close-prelight.svg index 0dfc78acb..c86437d74 100644 --- a/themes/kokodi/close-prelight.svg +++ b/themes/kokodi/close-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="close-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="close-pressed.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -235,7 +204,7 @@ inkscape:label="Button"> <g id="g2327" - transform="translate(6,4)"> + transform="translate(3,9)"> <g transform="matrix(0.875,0,0,0.875,0.75,0.75)" style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" @@ -264,8 +233,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/close-prelight.xpm b/themes/kokodi/close-prelight.xpm index 8b6d28347..3c1a7ae56 100644 --- a/themes/kokodi/close-prelight.xpm +++ b/themes/kokodi/close-prelight.xpm @@ -1,33 +1,34 @@ /* XPM */ -static char * close_pressed_xpm[] = { -"24 28 2 1", +static char * close_active_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/close-pressed.png b/themes/kokodi/close-pressed.png Binary files differindex e6268b84b..c7a29f0b0 100644 --- a/themes/kokodi/close-pressed.png +++ b/themes/kokodi/close-pressed.png diff --git a/themes/kokodi/close-pressed.svg b/themes/kokodi/close-pressed.svg index 63bcb9731..a45776db4 100644 --- a/themes/kokodi/close-pressed.svg +++ b/themes/kokodi/close-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <path + style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" + 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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="12" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -235,7 +204,7 @@ inkscape:label="Button"> <g id="g2327" - transform="translate(6,5)"> + transform="translate(3,10)"> <g transform="matrix(0.875,0,0,0.875,0.75,0.75)" style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" @@ -264,8 +233,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/close-pressed.xpm b/themes/kokodi/close-pressed.xpm index 8b6d28347..6c53e6c05 100644 --- a/themes/kokodi/close-pressed.xpm +++ b/themes/kokodi/close-pressed.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * close_pressed_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/hide-active.png b/themes/kokodi/hide-active.png Binary files differindex 38a50522e..bb7f04939 100644 --- a/themes/kokodi/hide-active.png +++ b/themes/kokodi/hide-active.png diff --git a/themes/kokodi/hide-active.svg b/themes/kokodi/hide-active.svg index a826607af..bc784f800 100644 --- a/themes/kokodi/hide-active.svg +++ b/themes/kokodi/hide-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -91,24 +95,6 @@ y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -157,40 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -198,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -209,7 +181,7 @@ <g style="display:inline" id="g1616" - transform="translate(6,4)"> + transform="translate(3,9)"> <rect style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2376" @@ -231,8 +203,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/hide-active.xpm b/themes/kokodi/hide-active.xpm index 95b703ee7..e0b53aa5d 100644 --- a/themes/kokodi/hide-active.xpm +++ b/themes/kokodi/hide-active.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * hide_active_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/hide-inactive.png b/themes/kokodi/hide-inactive.png Binary files differindex 9e72149ec..d2c102153 100644 --- a/themes/kokodi/hide-inactive.png +++ b/themes/kokodi/hide-inactive.png diff --git a/themes/kokodi/hide-inactive.svg b/themes/kokodi/hide-inactive.svg index 0afdf930e..1fd07979f 100644 --- a/themes/kokodi/hide-inactive.svg +++ b/themes/kokodi/hide-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,36 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -176,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -187,9 +181,9 @@ <g style="display:inline" id="g1616" - transform="translate(6,4)"> + transform="translate(3,9)"> <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" @@ -202,8 +196,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/hide-inactive.xpm b/themes/kokodi/hide-inactive.xpm index 5a3bdce91..31a48440e 100644 --- a/themes/kokodi/hide-inactive.xpm +++ b/themes/kokodi/hide-inactive.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/hide-prelight.png b/themes/kokodi/hide-prelight.png Binary files differindex 5ed190ff6..75f37b8f4 100644 --- a/themes/kokodi/hide-prelight.png +++ b/themes/kokodi/hide-prelight.png diff --git a/themes/kokodi/hide-prelight.svg b/themes/kokodi/hide-prelight.svg index 118d5e4d5..7ecab96c3 100644 --- a/themes/kokodi/hide-prelight.svg +++ b/themes/kokodi/hide-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="hide-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="hide-pressed.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,7 +205,7 @@ <g style="display:inline" id="g1616" - transform="translate(6,4)"> + transform="translate(3,9)"> <rect style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2376" @@ -258,8 +227,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/hide-prelight.xpm b/themes/kokodi/hide-prelight.xpm index 06d93779f..e0b53aa5d 100644 --- a/themes/kokodi/hide-prelight.xpm +++ b/themes/kokodi/hide-prelight.xpm @@ -1,33 +1,34 @@ /* XPM */ -static char * hide_pressed_xpm[] = { -"24 28 2 1", +static char * hide_active_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/hide-pressed.png b/themes/kokodi/hide-pressed.png Binary files differindex 64e16ef14..d348bf076 100644 --- a/themes/kokodi/hide-pressed.png +++ b/themes/kokodi/hide-pressed.png diff --git a/themes/kokodi/hide-pressed.svg b/themes/kokodi/hide-pressed.svg index f705b5cdd..1daea2175 100644 --- a/themes/kokodi/hide-pressed.svg +++ b/themes/kokodi/hide-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <path + style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" + 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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="12" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,7 +205,7 @@ <g style="display:inline" id="g1616" - transform="translate(6,5)"> + transform="translate(3,10)"> <rect style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" id="rect2376" @@ -258,8 +227,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/hide-pressed.xpm b/themes/kokodi/hide-pressed.xpm index 06d93779f..c7f8dda9c 100644 --- a/themes/kokodi/hide-pressed.xpm +++ b/themes/kokodi/hide-pressed.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * hide_pressed_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/left-active.png b/themes/kokodi/left-active.png Binary files differindex 120dc4931..4aaa880bc 100644 --- a/themes/kokodi/left-active.png +++ b/themes/kokodi/left-active.png diff --git a/themes/kokodi/left-active.svg b/themes/kokodi/left-active.svg index 7ac7babf3..5fb146fb8 100644 --- a/themes/kokodi/left-active.svg +++ b/themes/kokodi/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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="24" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -43,30 +45,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 1.5,0 L 1.5,24" - id="path6061" /> - </g> - <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/kokodi/left-active.xpm b/themes/kokodi/left-active.xpm index 121053a40..542944593 100644 --- a/themes/kokodi/left-active.xpm +++ b/themes/kokodi/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/kokodi/left-inactive.png b/themes/kokodi/left-inactive.png Binary files differindex ce0122d3f..4aaa880bc 100644 --- a/themes/kokodi/left-inactive.png +++ b/themes/kokodi/left-inactive.png diff --git a/themes/kokodi/left-inactive.svg b/themes/kokodi/left-inactive.svg index b6c06ddb9..9746a7bb2 100644 --- a/themes/kokodi/left-inactive.svg +++ b/themes/kokodi/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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="24" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -43,30 +45,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 1.5,0 L 1.5,24" - id="path6061" /> - </g> - <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/kokodi/left-inactive.xpm b/themes/kokodi/left-inactive.xpm index 079ae5926..447deca8e 100644 --- a/themes/kokodi/left-inactive.xpm +++ b/themes/kokodi/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/kokodi/maximize-active.png b/themes/kokodi/maximize-active.png Binary files differindex 746bfd7bd..ffbe22eb6 100644 --- a/themes/kokodi/maximize-active.png +++ b/themes/kokodi/maximize-active.png diff --git a/themes/kokodi/maximize-active.svg b/themes/kokodi/maximize-active.svg index f01344405..d9f41aada 100644 --- a/themes/kokodi/maximize-active.svg +++ b/themes/kokodi/maximize-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -91,24 +95,6 @@ y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -157,40 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -198,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -209,9 +181,9 @@ <g style="display:inline" id="g1614" - transform="translate(6,4)"> + transform="translate(3,9)"> <path - id="rect2276" + id="rect2266" d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path @@ -225,8 +197,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/maximize-active.xpm b/themes/kokodi/maximize-active.xpm index 62a15801d..cad593dfd 100644 --- a/themes/kokodi/maximize-active.xpm +++ b/themes/kokodi/maximize-active.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * maximize_active_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/maximize-inactive.png b/themes/kokodi/maximize-inactive.png Binary files differindex ed434aa2d..8f290b40d 100644 --- a/themes/kokodi/maximize-inactive.png +++ b/themes/kokodi/maximize-inactive.png diff --git a/themes/kokodi/maximize-inactive.svg b/themes/kokodi/maximize-inactive.svg index 647a07501..31ec41be5 100644 --- a/themes/kokodi/maximize-inactive.svg +++ b/themes/kokodi/maximize-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,36 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -176,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -186,10 +180,10 @@ inkscape:label="Button"> <g style="display:inline" - id="g1627" - transform="translate(6,4)"> + id="g1626" + transform="translate(3,9)"> <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" /> </g> @@ -199,8 +193,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/maximize-inactive.xpm b/themes/kokodi/maximize-inactive.xpm index fef091db9..cca5139d2 100644 --- a/themes/kokodi/maximize-inactive.xpm +++ b/themes/kokodi/maximize-inactive.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/maximize-prelight.png b/themes/kokodi/maximize-prelight.png Binary files differindex d47229684..73b5a9fa3 100644 --- a/themes/kokodi/maximize-prelight.png +++ b/themes/kokodi/maximize-prelight.png diff --git a/themes/kokodi/maximize-prelight.svg b/themes/kokodi/maximize-prelight.svg index 1ac9e6bf4..15ada6cb8 100644 --- a/themes/kokodi/maximize-prelight.svg +++ b/themes/kokodi/maximize-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="maximize-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="maximize-pressed.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,9 +205,9 @@ <g style="display:inline" id="g1614" - transform="translate(6,4)"> + transform="translate(3,9)"> <path - id="rect2276" + id="rect2266" d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path @@ -252,8 +221,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/maximize-prelight.xpm b/themes/kokodi/maximize-prelight.xpm index c91fbf147..cad593dfd 100644 --- a/themes/kokodi/maximize-prelight.xpm +++ b/themes/kokodi/maximize-prelight.xpm @@ -1,33 +1,34 @@ /* XPM */ -static char * maximize_pressed_xpm[] = { -"24 28 2 1", +static char * maximize_active_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/maximize-pressed.png b/themes/kokodi/maximize-pressed.png Binary files differindex 5ce66f75c..1f37f13aa 100644 --- a/themes/kokodi/maximize-pressed.png +++ b/themes/kokodi/maximize-pressed.png diff --git a/themes/kokodi/maximize-pressed.svg b/themes/kokodi/maximize-pressed.svg index 93612dcd2..7e9fba6f8 100644 --- a/themes/kokodi/maximize-pressed.svg +++ b/themes/kokodi/maximize-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <path + style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" + 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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="12" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,9 +205,9 @@ <g style="display:inline" id="g1614" - transform="translate(6,5)"> + transform="translate(3,10)"> <path - id="rect2276" + id="rect2266" d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z " style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> <path @@ -252,8 +221,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/maximize-pressed.xpm b/themes/kokodi/maximize-pressed.xpm index c91fbf147..eea4bc835 100644 --- a/themes/kokodi/maximize-pressed.xpm +++ b/themes/kokodi/maximize-pressed.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * maximize_pressed_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/maximize-toggled-active.png b/themes/kokodi/maximize-toggled-active.png Binary files differindex 1e3b53196..694e8fbd1 100644 --- a/themes/kokodi/maximize-toggled-active.png +++ b/themes/kokodi/maximize-toggled-active.png diff --git a/themes/kokodi/maximize-toggled-active.svg b/themes/kokodi/maximize-toggled-active.svg index b3e4eb4a4..ad73437a0 100644 --- a/themes/kokodi/maximize-toggled-active.svg +++ b/themes/kokodi/maximize-toggled-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -91,24 +95,6 @@ y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -157,40 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -198,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -208,8 +180,8 @@ inkscape:label="Button"> <g style="display:inline" - id="g1627" - transform="translate(6,4)"> + id="g1626" + transform="translate(3,9)"> <path id="rect2318" d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " @@ -229,8 +201,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/maximize-toggled-active.xpm b/themes/kokodi/maximize-toggled-active.xpm index de33ff823..b4c5c594c 100644 --- a/themes/kokodi/maximize-toggled-active.xpm +++ b/themes/kokodi/maximize-toggled-active.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * maximize_toggled_active_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/maximize-toggled-inactive.png b/themes/kokodi/maximize-toggled-inactive.png Binary files differindex e4d5780ab..1598540ca 100644 --- a/themes/kokodi/maximize-toggled-inactive.png +++ b/themes/kokodi/maximize-toggled-inactive.png diff --git a/themes/kokodi/maximize-toggled-inactive.svg b/themes/kokodi/maximize-toggled-inactive.svg index 71abed660..84f0adc21 100644 --- a/themes/kokodi/maximize-toggled-inactive.svg +++ b/themes/kokodi/maximize-toggled-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,36 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -176,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -187,15 +181,15 @@ <g style="display:inline" id="g1639" - transform="translate(6,4)"> + transform="translate(3,9)"> <path id="rect2331" d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z " - style="opacity:0.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 @@ -203,8 +197,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/maximize-toggled-inactive.xpm b/themes/kokodi/maximize-toggled-inactive.xpm index 4d894c19c..18c9c3ddc 100644 --- a/themes/kokodi/maximize-toggled-inactive.xpm +++ b/themes/kokodi/maximize-toggled-inactive.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * maximize_toggled_inactive_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/maximize-toggled-prelight.png b/themes/kokodi/maximize-toggled-prelight.png Binary files differindex 37d1ed112..0121ee1d1 100644 --- a/themes/kokodi/maximize-toggled-prelight.png +++ b/themes/kokodi/maximize-toggled-prelight.png diff --git a/themes/kokodi/maximize-toggled-prelight.svg b/themes/kokodi/maximize-toggled-prelight.svg index ad802f6e1..239ac1e22 100644 --- a/themes/kokodi/maximize-toggled-prelight.svg +++ b/themes/kokodi/maximize-toggled-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="maximize-toggled-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="maximize-toggled-pressed.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -235,8 +204,8 @@ inkscape:label="Button"> <g style="display:inline" - id="g1627" - transform="translate(6,4)"> + id="g1626" + transform="translate(3,9)"> <path id="rect2318" d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " @@ -256,8 +225,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/maximize-toggled-prelight.xpm b/themes/kokodi/maximize-toggled-prelight.xpm index b07da63e6..b4c5c594c 100644 --- a/themes/kokodi/maximize-toggled-prelight.xpm +++ b/themes/kokodi/maximize-toggled-prelight.xpm @@ -1,33 +1,34 @@ /* XPM */ -static char * maximize_toggled_pressed_xpm[] = { -"24 28 2 1", +static char * maximize_toggled_active_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/maximize-toggled-pressed.png b/themes/kokodi/maximize-toggled-pressed.png Binary files differindex 61fcd93d5..47cb996b8 100644 --- a/themes/kokodi/maximize-toggled-pressed.png +++ b/themes/kokodi/maximize-toggled-pressed.png diff --git a/themes/kokodi/maximize-toggled-pressed.svg b/themes/kokodi/maximize-toggled-pressed.svg index 56e2a8852..0cbfd7faa 100644 --- a/themes/kokodi/maximize-toggled-pressed.svg +++ b/themes/kokodi/maximize-toggled-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <path + style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" + 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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="12" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -235,8 +204,8 @@ inkscape:label="Button"> <g style="display:inline" - id="g1627" - transform="translate(6,5)"> + id="g1626" + transform="translate(3,10)"> <path id="rect2318" d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z " @@ -256,8 +225,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/maximize-toggled-pressed.xpm b/themes/kokodi/maximize-toggled-pressed.xpm index b07da63e6..760dc0c4b 100644 --- a/themes/kokodi/maximize-toggled-pressed.xpm +++ b/themes/kokodi/maximize-toggled-pressed.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * maximize_toggled_pressed_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/menu-active.png b/themes/kokodi/menu-active.png Binary files differindex 82a7af7f0..f72152522 100644 --- a/themes/kokodi/menu-active.png +++ b/themes/kokodi/menu-active.png diff --git a/themes/kokodi/menu-active.svg b/themes/kokodi/menu-active.svg index c49694346..7b9da2df7 100644 --- a/themes/kokodi/menu-active.svg +++ b/themes/kokodi/menu-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -138,33 +142,25 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" - transform="translate(0,-6)" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" x="0" y="1" /> </g> @@ -172,21 +168,19 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g inkscape:groupmode="layer" id="layer5" - transform="translate(0,-6)" 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.5,27.5 L 23.5,27.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/menu-active.xpm b/themes/kokodi/menu-active.xpm index 3a9d0f45a..785a85906 100644 --- a/themes/kokodi/menu-active.xpm +++ b/themes/kokodi/menu-active.xpm @@ -1,23 +1,34 @@ /* XPM */ static char * menu_active_xpm[] = { -"24 17 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/menu-inactive.png b/themes/kokodi/menu-inactive.png Binary files differindex b811735e0..f72152522 100644 --- a/themes/kokodi/menu-inactive.png +++ b/themes/kokodi/menu-inactive.png diff --git a/themes/kokodi/menu-inactive.svg b/themes/kokodi/menu-inactive.svg index 2d95c1d8a..c6812927b 100644 --- a/themes/kokodi/menu-inactive.svg +++ b/themes/kokodi/menu-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -138,33 +142,25 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" - transform="translate(0,-6)" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" x="0" y="1" /> </g> @@ -172,21 +168,19 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g inkscape:groupmode="layer" id="layer5" - transform="translate(0,-6)" 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.5,27.5 L 23.5,27.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/menu-inactive.xpm b/themes/kokodi/menu-inactive.xpm index 8f07169eb..b00d5d9dc 100644 --- a/themes/kokodi/menu-inactive.xpm +++ b/themes/kokodi/menu-inactive.xpm @@ -1,23 +1,34 @@ /* XPM */ static char * menu_inactive_xpm[] = { -"24 17 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/menu-prelight.png b/themes/kokodi/menu-prelight.png Binary files differindex 82a7af7f0..f72152522 100644 --- a/themes/kokodi/menu-prelight.png +++ b/themes/kokodi/menu-prelight.png diff --git a/themes/kokodi/menu-prelight.svg b/themes/kokodi/menu-prelight.svg index 7d74450c9..7b9da2df7 100644 --- a/themes/kokodi/menu-prelight.svg +++ b/themes/kokodi/menu-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="menu-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="menu-active.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -138,33 +142,25 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" - transform="translate(0,-6)" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" x="0" y="1" /> </g> @@ -172,21 +168,19 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g inkscape:groupmode="layer" id="layer5" - transform="translate(0,-6)" 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.5,27.5 L 23.5,27.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/menu-prelight.xpm b/themes/kokodi/menu-prelight.xpm index 3a9d0f45a..785a85906 100644 --- a/themes/kokodi/menu-prelight.xpm +++ b/themes/kokodi/menu-prelight.xpm @@ -1,23 +1,34 @@ /* XPM */ static char * menu_active_xpm[] = { -"24 17 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/menu-pressed.png b/themes/kokodi/menu-pressed.png Binary files differindex 82a7af7f0..f72152522 100644 --- a/themes/kokodi/menu-pressed.png +++ b/themes/kokodi/menu-pressed.png diff --git a/themes/kokodi/menu-pressed.svg b/themes/kokodi/menu-pressed.svg index e424f4385..7b9da2df7 100644 --- a/themes/kokodi/menu-pressed.svg +++ b/themes/kokodi/menu-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="menu-pressed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="menu-active.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -138,33 +142,25 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" - transform="translate(0,-6)" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" x="0" y="1" /> </g> @@ -172,21 +168,19 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g inkscape:groupmode="layer" id="layer5" - transform="translate(0,-6)" 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.5,27.5 L 23.5,27.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/menu-pressed.xpm b/themes/kokodi/menu-pressed.xpm index bfe19e1c8..44c3d4a4c 100644 --- a/themes/kokodi/menu-pressed.xpm +++ b/themes/kokodi/menu-pressed.xpm @@ -1,22 +1,34 @@ /* XPM */ -static char * menu_active_xpm[] = { -"24 17 2 1", +static char * menu_pressed_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/right-active.png b/themes/kokodi/right-active.png Binary files differindex 834414f37..69af09e64 100644 --- a/themes/kokodi/right-active.png +++ b/themes/kokodi/right-active.png diff --git a/themes/kokodi/right-active.svg b/themes/kokodi/right-active.svg index acba9d152..e1605f9c3 100644 --- a/themes/kokodi/right-active.svg +++ b/themes/kokodi/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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="24" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -43,30 +45,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 4.5,0 L 4.5,24" - id="path6061" /> - </g> - <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/kokodi/right-active.xpm b/themes/kokodi/right-active.xpm index 634908f0c..8e980fc49 100644 --- a/themes/kokodi/right-active.xpm +++ b/themes/kokodi/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/kokodi/right-inactive.png b/themes/kokodi/right-inactive.png Binary files differindex 4e53373dd..69af09e64 100644 --- a/themes/kokodi/right-inactive.png +++ b/themes/kokodi/right-inactive.png diff --git a/themes/kokodi/right-inactive.svg b/themes/kokodi/right-inactive.svg index 2a2b74af3..23d4acf99 100644 --- a/themes/kokodi/right-inactive.svg +++ b/themes/kokodi/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://creativecommons.org/ns#" + xmlns:cc="http://web.resource.org/cc/" 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" @@ -12,11 +12,13 @@ height="24" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 id="base" pagecolor="white" @@ -43,30 +45,38 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Top Corner</dc:title> + <dc:title>Border</dc:title> <dc:creator> <cc:Agent> <dc:title>Olivier Fourdan</dc:title> </cc:Agent> </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> </rdf:RDF> </metadata> <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="hilight"> - <path - 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 4.5,0 L 4.5,24" - id="path6061" /> - </g> - <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/kokodi/right-inactive.xpm b/themes/kokodi/right-inactive.xpm index a9894c017..57f2e1a65 100644 --- a/themes/kokodi/right-inactive.xpm +++ b/themes/kokodi/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/kokodi/shade-active.png b/themes/kokodi/shade-active.png Binary files differindex 3f2743416..43f7779e3 100644 --- a/themes/kokodi/shade-active.png +++ b/themes/kokodi/shade-active.png diff --git a/themes/kokodi/shade-active.svg b/themes/kokodi/shade-active.svg index 67423f028..bba27174c 100644 --- a/themes/kokodi/shade-active.svg +++ b/themes/kokodi/shade-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -91,24 +95,6 @@ y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -157,40 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -198,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -209,15 +181,15 @@ <g style="display:inline" id="g1616" - transform="translate(6,4)"> + transform="translate(3,9)"> <path d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" style="opacity:0.33;fill:none;fill-opacity:0.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" /> + id="path2605" /> <path d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" style="fill:none;fill-opacity:0.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" /> + id="path2620" /> </g> </g> <g @@ -225,8 +197,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/shade-active.xpm b/themes/kokodi/shade-active.xpm index e63dd62fd..e931f598a 100644 --- a/themes/kokodi/shade-active.xpm +++ b/themes/kokodi/shade-active.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * shade_active_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/shade-inactive.png b/themes/kokodi/shade-inactive.png Binary files differindex f9282cf39..fb88fa6e5 100644 --- a/themes/kokodi/shade-inactive.png +++ b/themes/kokodi/shade-inactive.png diff --git a/themes/kokodi/shade-inactive.svg b/themes/kokodi/shade-inactive.svg index 4f38510cb..825623156 100644 --- a/themes/kokodi/shade-inactive.svg +++ b/themes/kokodi/shade-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,36 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -176,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -187,10 +181,10 @@ <g style="display:inline" id="g1616" - transform="translate(6,4)"> + transform="translate(3,9)"> <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="path2620" + 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> @@ -199,8 +193,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/shade-inactive.xpm b/themes/kokodi/shade-inactive.xpm index 84afd3297..5a2f3224c 100644 --- a/themes/kokodi/shade-inactive.xpm +++ b/themes/kokodi/shade-inactive.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * shade_inactive_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/shade-prelight.png b/themes/kokodi/shade-prelight.png Binary files differindex 1699d28f0..024de56ef 100644 --- a/themes/kokodi/shade-prelight.png +++ b/themes/kokodi/shade-prelight.png diff --git a/themes/kokodi/shade-prelight.svg b/themes/kokodi/shade-prelight.svg index 83be89760..c79bc4482 100644 --- a/themes/kokodi/shade-prelight.svg +++ b/themes/kokodi/shade-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="shade-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="shade-pressed.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,15 +205,15 @@ <g style="display:inline" id="g1616" - transform="translate(6,4)"> + transform="translate(3,9)"> <path d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" style="opacity:0.33;fill:none;fill-opacity:0.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" /> + id="path2605" /> <path d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" style="fill:none;fill-opacity:0.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" /> + id="path2620" /> </g> </g> <g @@ -252,8 +221,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/shade-prelight.xpm b/themes/kokodi/shade-prelight.xpm index c6e14ec43..e931f598a 100644 --- a/themes/kokodi/shade-prelight.xpm +++ b/themes/kokodi/shade-prelight.xpm @@ -1,33 +1,34 @@ /* XPM */ -static char * shade_pressed_xpm[] = { -"24 28 2 1", +static char * shade_active_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/shade-pressed.png b/themes/kokodi/shade-pressed.png Binary files differindex 218343437..f5b0b6021 100644 --- a/themes/kokodi/shade-pressed.png +++ b/themes/kokodi/shade-pressed.png diff --git a/themes/kokodi/shade-pressed.svg b/themes/kokodi/shade-pressed.svg index 0dddaa3f3..30ba4ef0f 100644 --- a/themes/kokodi/shade-pressed.svg +++ b/themes/kokodi/shade-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <path + style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" + 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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="12" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,15 +205,15 @@ <g style="display:inline" id="g1616" - transform="translate(6,5)"> + transform="translate(3,10)"> <path d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6" style="opacity:0.33;fill:none;fill-opacity:0.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" /> + id="path2605" /> <path d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" style="fill:none;fill-opacity:0.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" /> + id="path2620" /> </g> </g> <g @@ -252,8 +221,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/shade-pressed.xpm b/themes/kokodi/shade-pressed.xpm index c6e14ec43..e3155abd2 100644 --- a/themes/kokodi/shade-pressed.xpm +++ b/themes/kokodi/shade-pressed.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * shade_pressed_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/shade-toggled-active.png b/themes/kokodi/shade-toggled-active.png Binary files differindex dc275c9f0..b399a421d 100644 --- a/themes/kokodi/shade-toggled-active.png +++ b/themes/kokodi/shade-toggled-active.png diff --git a/themes/kokodi/shade-toggled-active.svg b/themes/kokodi/shade-toggled-active.svg index 0be456383..574aa2b4e 100644 --- a/themes/kokodi/shade-toggled-active.svg +++ b/themes/kokodi/shade-toggled-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -91,24 +95,6 @@ y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -157,40 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -198,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -209,15 +181,15 @@ <g style="display:inline" id="g1628" - transform="translate(6,4)"> + transform="translate(3,9)"> <path d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" style="opacity:0.33;fill:none;fill-opacity:0.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" /> + id="path2605" /> <path d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" style="fill:none;fill-opacity:0.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" /> + id="path2620" /> </g> </g> <g @@ -225,8 +197,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/shade-toggled-active.xpm b/themes/kokodi/shade-toggled-active.xpm index ccdc70913..0793c86ab 100644 --- a/themes/kokodi/shade-toggled-active.xpm +++ b/themes/kokodi/shade-toggled-active.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * shade_toggled_active_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/shade-toggled-inactive.png b/themes/kokodi/shade-toggled-inactive.png Binary files differindex 7157a3fe1..cd5de1bc7 100644 --- a/themes/kokodi/shade-toggled-inactive.png +++ b/themes/kokodi/shade-toggled-inactive.png diff --git a/themes/kokodi/shade-toggled-inactive.svg b/themes/kokodi/shade-toggled-inactive.svg index 9afb5bbf8..ecd928a3b 100644 --- a/themes/kokodi/shade-toggled-inactive.svg +++ b/themes/kokodi/shade-toggled-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,36 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -176,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -187,10 +181,10 @@ <g style="display:inline" id="g1628" - transform="translate(6,4)"> + transform="translate(3,9)"> <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="path2620" + 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> @@ -199,8 +193,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/shade-toggled-inactive.xpm b/themes/kokodi/shade-toggled-inactive.xpm index 7f94137fb..7d7a1fe86 100644 --- a/themes/kokodi/shade-toggled-inactive.xpm +++ b/themes/kokodi/shade-toggled-inactive.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * shade_toggled_inactive_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/shade-toggled-prelight.png b/themes/kokodi/shade-toggled-prelight.png Binary files differindex 7d8a1c8c4..37cc524c7 100644 --- a/themes/kokodi/shade-toggled-prelight.png +++ b/themes/kokodi/shade-toggled-prelight.png diff --git a/themes/kokodi/shade-toggled-prelight.svg b/themes/kokodi/shade-toggled-prelight.svg index 5ff58030e..8e18ad99b 100644 --- a/themes/kokodi/shade-toggled-prelight.svg +++ b/themes/kokodi/shade-toggled-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="shade-toggled-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="shade-toggled-pressed.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,15 +205,15 @@ <g style="display:inline" id="g1628" - transform="translate(6,4)"> + transform="translate(3,9)"> <path d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" style="opacity:0.33;fill:none;fill-opacity:0.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" /> + id="path2605" /> <path d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" style="fill:none;fill-opacity:0.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" /> + id="path2620" /> </g> </g> <g @@ -252,8 +221,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/shade-toggled-prelight.xpm b/themes/kokodi/shade-toggled-prelight.xpm index 0f68410d9..0793c86ab 100644 --- a/themes/kokodi/shade-toggled-prelight.xpm +++ b/themes/kokodi/shade-toggled-prelight.xpm @@ -1,33 +1,34 @@ /* XPM */ -static char * shade_toggled_pressed_xpm[] = { -"24 28 2 1", +static char * shade_toggled_active_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/shade-toggled-pressed.png b/themes/kokodi/shade-toggled-pressed.png Binary files differindex d959bfc8b..e99735639 100644 --- a/themes/kokodi/shade-toggled-pressed.png +++ b/themes/kokodi/shade-toggled-pressed.png diff --git a/themes/kokodi/shade-toggled-pressed.svg b/themes/kokodi/shade-toggled-pressed.svg index 9cb934fdb..9afdf0fe0 100644 --- a/themes/kokodi/shade-toggled-pressed.svg +++ b/themes/kokodi/shade-toggled-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <path + style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" + 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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="12" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,15 +205,15 @@ <g style="display:inline" id="g1628" - transform="translate(6,5)"> + transform="translate(3,10)"> <path d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6" style="opacity:0.33;fill:none;fill-opacity:0.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" /> + id="path2605" /> <path d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" style="fill:none;fill-opacity:0.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" /> + id="path2620" /> </g> </g> <g @@ -252,8 +221,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/shade-toggled-pressed.xpm b/themes/kokodi/shade-toggled-pressed.xpm index 0f68410d9..e360feb5b 100644 --- a/themes/kokodi/shade-toggled-pressed.xpm +++ b/themes/kokodi/shade-toggled-pressed.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * shade_toggled_pressed_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/stick-active.png b/themes/kokodi/stick-active.png Binary files differindex 5d96d9bb7..c13ae0bc9 100644 --- a/themes/kokodi/stick-active.png +++ b/themes/kokodi/stick-active.png diff --git a/themes/kokodi/stick-active.svg b/themes/kokodi/stick-active.svg index 2a19ec620..02ad9d32a 100644 --- a/themes/kokodi/stick-active.svg +++ b/themes/kokodi/stick-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -91,24 +95,6 @@ y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -157,40 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -198,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -209,7 +181,7 @@ <g style="display:inline" id="g1613" - transform="translate(6,4)"> + transform="translate(3,9)"> <path id="path1412" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " @@ -225,8 +197,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/stick-active.xpm b/themes/kokodi/stick-active.xpm index 635c422f9..5209082a8 100644 --- a/themes/kokodi/stick-active.xpm +++ b/themes/kokodi/stick-active.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * stick_active_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/stick-inactive.png b/themes/kokodi/stick-inactive.png Binary files differindex 81a7fac8f..9d00247cc 100644 --- a/themes/kokodi/stick-inactive.png +++ b/themes/kokodi/stick-inactive.png diff --git a/themes/kokodi/stick-inactive.svg b/themes/kokodi/stick-inactive.svg index df2ec0e95..8549ffd6b 100644 --- a/themes/kokodi/stick-inactive.svg +++ b/themes/kokodi/stick-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,36 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -176,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -187,11 +181,11 @@ <g style="display:inline" id="g1613" - transform="translate(6,4)"> + transform="translate(3,9)"> <path id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.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 @@ -199,8 +193,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/stick-inactive.xpm b/themes/kokodi/stick-inactive.xpm index 581c17a43..82bc95e96 100644 --- a/themes/kokodi/stick-inactive.xpm +++ b/themes/kokodi/stick-inactive.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * stick_inactive_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/stick-prelight.png b/themes/kokodi/stick-prelight.png Binary files differindex e4912ac2a..4d0015e87 100644 --- a/themes/kokodi/stick-prelight.png +++ b/themes/kokodi/stick-prelight.png diff --git a/themes/kokodi/stick-prelight.svg b/themes/kokodi/stick-prelight.svg index 4ab60fe17..385268116 100644 --- a/themes/kokodi/stick-prelight.svg +++ b/themes/kokodi/stick-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="stick-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="stick-pressed.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,7 +205,7 @@ <g style="display:inline" id="g1613" - transform="translate(6,4)"> + transform="translate(3,9)"> <path id="path1412" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " @@ -252,8 +221,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/stick-prelight.xpm b/themes/kokodi/stick-prelight.xpm index 549ee1a39..5209082a8 100644 --- a/themes/kokodi/stick-prelight.xpm +++ b/themes/kokodi/stick-prelight.xpm @@ -1,33 +1,34 @@ /* XPM */ -static char * stick_pressed_xpm[] = { -"24 28 2 1", +static char * stick_active_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/stick-pressed.png b/themes/kokodi/stick-pressed.png Binary files differindex a9e425021..a51648830 100644 --- a/themes/kokodi/stick-pressed.png +++ b/themes/kokodi/stick-pressed.png diff --git a/themes/kokodi/stick-pressed.svg b/themes/kokodi/stick-pressed.svg index 846fba97b..4bfff0ee2 100644 --- a/themes/kokodi/stick-pressed.svg +++ b/themes/kokodi/stick-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <path + style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" + 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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="12" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,7 +205,7 @@ <g style="display:inline" id="g1613" - transform="translate(6,5)"> + transform="translate(3,10)"> <path id="path1412" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " @@ -252,8 +221,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/stick-pressed.xpm b/themes/kokodi/stick-pressed.xpm index 549ee1a39..a399043fd 100644 --- a/themes/kokodi/stick-pressed.xpm +++ b/themes/kokodi/stick-pressed.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * stick_pressed_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/stick-toggled-active.png b/themes/kokodi/stick-toggled-active.png Binary files differindex 54ade85f5..e1e0f6058 100644 --- a/themes/kokodi/stick-toggled-active.png +++ b/themes/kokodi/stick-toggled-active.png diff --git a/themes/kokodi/stick-toggled-active.svg b/themes/kokodi/stick-toggled-active.svg index 99bf19e1e..05a1e66c8 100644 --- a/themes/kokodi/stick-toggled-active.svg +++ b/themes/kokodi/stick-toggled-active.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -91,24 +95,6 @@ y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -157,40 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -198,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -209,7 +181,7 @@ <g style="display:inline" id="g1625" - transform="translate(6,4)"> + transform="translate(3,9)"> <path id="path1412" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " @@ -234,8 +206,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/stick-toggled-active.xpm b/themes/kokodi/stick-toggled-active.xpm index 58f02465e..8af322457 100644 --- a/themes/kokodi/stick-toggled-active.xpm +++ b/themes/kokodi/stick-toggled-active.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * stick_toggled_active_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/stick-toggled-inactive.png b/themes/kokodi/stick-toggled-inactive.png Binary files differindex 6e4af6f97..f7f1efaef 100644 --- a/themes/kokodi/stick-toggled-inactive.png +++ b/themes/kokodi/stick-toggled-inactive.png diff --git a/themes/kokodi/stick-toggled-inactive.svg b/themes/kokodi/stick-toggled-inactive.svg index b42cc0fc8..182cdba97 100644 --- a/themes/kokodi/stick-toggled-inactive.svg +++ b/themes/kokodi/stick-toggled-inactive.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,36 +143,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> + <path + 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" + 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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -176,8 +170,8 @@ id="layer1" 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -187,11 +181,11 @@ <g style="display:inline" id="g1625" - transform="translate(6,4)"> + transform="translate(3,9)"> <path id="path2287" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " - style="opacity:0.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" @@ -199,7 +193,7 @@ 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> @@ -208,8 +202,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/stick-toggled-inactive.xpm b/themes/kokodi/stick-toggled-inactive.xpm index 65e6479bc..b9a1af361 100644 --- a/themes/kokodi/stick-toggled-inactive.xpm +++ b/themes/kokodi/stick-toggled-inactive.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * stick_toggled_inactive_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/stick-toggled-prelight.png b/themes/kokodi/stick-toggled-prelight.png Binary files differindex edf6e961f..4a04fbf3c 100644 --- a/themes/kokodi/stick-toggled-prelight.png +++ b/themes/kokodi/stick-toggled-prelight.png diff --git a/themes/kokodi/stick-toggled-prelight.svg b/themes/kokodi/stick-toggled-prelight.svg index c60d7237f..86281f5f3 100644 --- a/themes/kokodi/stick-toggled-prelight.svg +++ b/themes/kokodi/stick-toggled-prelight.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" - sodipodi:docname="stick-toggled-prelight.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"> + sodipodi:docbase="default" + sodipodi:docname="stick-toggled-pressed.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4"> <linearGradient @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="15" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,7 +205,7 @@ <g style="display:inline" id="g1625" - transform="translate(6,4)"> + transform="translate(3,9)"> <path id="path1412" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " @@ -261,8 +230,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/stick-toggled-prelight.xpm b/themes/kokodi/stick-toggled-prelight.xpm index 69f313f00..8af322457 100644 --- a/themes/kokodi/stick-toggled-prelight.xpm +++ b/themes/kokodi/stick-toggled-prelight.xpm @@ -1,33 +1,34 @@ /* XPM */ -static char * stick_toggled_pressed_xpm[] = { -"24 28 2 1", +static char * stick_toggled_active_xpm[] = { +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/stick-toggled-pressed.png b/themes/kokodi/stick-toggled-pressed.png Binary files differindex ddd50c6b2..84d941bdc 100644 --- a/themes/kokodi/stick-toggled-pressed.png +++ b/themes/kokodi/stick-toggled-pressed.png diff --git a/themes/kokodi/stick-toggled-pressed.svg b/themes/kokodi/stick-toggled-pressed.svg index 25fcd1d3b..43560a149 100644 --- a/themes/kokodi/stick-toggled-pressed.svg +++ b/themes/kokodi/stick-toggled-pressed.svg @@ -9,15 +9,15 @@ 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="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -36,11 +36,11 @@ <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,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -85,11 +89,11 @@ inkscape:collect="always" xlink:href="#linearGradient5873" id="radialGradient3087" - cx="12" - cy="0" - fx="12" - fy="3" - r="22" + cx="9" + cy="9" + fx="9" + fy="9" + r="9" gradientTransform="matrix(1,0,0,1,0,0.5)" gradientUnits="userSpaceOnUse" /> <linearGradient @@ -99,27 +103,9 @@ x1="0" y1="1" x2="0" - y2="12" + y2="14" 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" - gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -169,14 +155,11 @@ inkscape:label="pressed"> <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" /> + transform="translate(0,6)"> + <path + style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5" + 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 @@ -184,40 +167,26 @@ 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" - id="rect6057" - width="24" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" id="layer3" inkscape:label="hilight"> - <rect + <path 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" /> + 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="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" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" - width="24" - height="12" + width="18" + height="14" 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" @@ -225,8 +194,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 17.5,0.5" id="path6059" /> </g> <g @@ -236,7 +205,7 @@ <g style="display:inline" id="g1625" - transform="translate(6,5)"> + transform="translate(3,10)"> <path id="path1412" d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z " @@ -261,8 +230,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 17.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/stick-toggled-pressed.xpm b/themes/kokodi/stick-toggled-pressed.xpm index 69f313f00..8297ebfbb 100644 --- a/themes/kokodi/stick-toggled-pressed.xpm +++ b/themes/kokodi/stick-toggled-pressed.xpm @@ -1,33 +1,34 @@ /* XPM */ static char * stick_toggled_pressed_xpm[] = { -"24 28 2 1", +"18 29 2 1", " c None", ". c #C0C0FF s active_color_1", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................", -"........................"}; +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +"..................", +".................."}; diff --git a/themes/kokodi/themerc b/themes/kokodi/themerc index 1888a1960..9f3070109 100644 --- a/themes/kokodi/themerc +++ b/themes/kokodi/themerc @@ -3,10 +3,10 @@ button_offset=0 button_spacing=0 full_width_title=false maximized_offset=0 -shadow_delta_height=4 -shadow_delta_width=1 -shadow_delta_x=1 -shadow_delta_y=1 +shadow_delta_height=-2 +shadow_delta_width=-2 +shadow_delta_x=-2 +shadow_delta_y=-2 show_app_icon=true title_horizontal_offset=1 title_shadow_active=frame diff --git a/themes/kokodi/title-1-active.png b/themes/kokodi/title-1-active.png Binary files differindex 6b3f69e4c..4aab87fc3 100644 --- a/themes/kokodi/title-1-active.png +++ b/themes/kokodi/title-1-active.png diff --git a/themes/kokodi/title-1-active.svg b/themes/kokodi/title-1-active.svg index 77b668dc7..69461d81d 100644 --- a/themes/kokodi/title-1-active.svg +++ b/themes/kokodi/title-1-active.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,8 @@ x1="0" y1="0.5" x2="0" - y2="27.5" /> + y2="28.5" + gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient5873" @@ -98,21 +103,21 @@ 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" /> @@ -138,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -168,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -177,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-1-active.xpm b/themes/kokodi/title-1-active.xpm index 9f656fef3..3c1149c1d 100644 --- a/themes/kokodi/title-1-active.xpm +++ b/themes/kokodi/title-1-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_active_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s active_color_1", "....", @@ -30,4 +30,5 @@ static char * title_active_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-1-inactive.png b/themes/kokodi/title-1-inactive.png Binary files differindex 2352a6eda..4aab87fc3 100644 --- a/themes/kokodi/title-1-inactive.png +++ b/themes/kokodi/title-1-inactive.png diff --git a/themes/kokodi/title-1-inactive.svg b/themes/kokodi/title-1-inactive.svg index a993c95e9..dbfbbf533 100644 --- a/themes/kokodi/title-1-inactive.svg +++ b/themes/kokodi/title-1-inactive.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-1-inactive.xpm b/themes/kokodi/title-1-inactive.xpm index b97494023..6c865cc53 100644 --- a/themes/kokodi/title-1-inactive.xpm +++ b/themes/kokodi/title-1-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_inactive_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", "....", @@ -30,4 +30,5 @@ static char * title_inactive_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-2-active.png b/themes/kokodi/title-2-active.png Binary files differindex 6b3f69e4c..4aab87fc3 100644 --- a/themes/kokodi/title-2-active.png +++ b/themes/kokodi/title-2-active.png diff --git a/themes/kokodi/title-2-active.svg b/themes/kokodi/title-2-active.svg index b3d29c9d1..26fe6d1cd 100644 --- a/themes/kokodi/title-2-active.svg +++ b/themes/kokodi/title-2-active.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-2-active.xpm b/themes/kokodi/title-2-active.xpm index 9f656fef3..3c1149c1d 100644 --- a/themes/kokodi/title-2-active.xpm +++ b/themes/kokodi/title-2-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_active_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s active_color_1", "....", @@ -30,4 +30,5 @@ static char * title_active_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-2-inactive.png b/themes/kokodi/title-2-inactive.png Binary files differindex 2352a6eda..4aab87fc3 100644 --- a/themes/kokodi/title-2-inactive.png +++ b/themes/kokodi/title-2-inactive.png diff --git a/themes/kokodi/title-2-inactive.svg b/themes/kokodi/title-2-inactive.svg index bd17c1c9c..82424fab8 100644 --- a/themes/kokodi/title-2-inactive.svg +++ b/themes/kokodi/title-2-inactive.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-2-inactive.xpm b/themes/kokodi/title-2-inactive.xpm index b97494023..6c865cc53 100644 --- a/themes/kokodi/title-2-inactive.xpm +++ b/themes/kokodi/title-2-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_inactive_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", "....", @@ -30,4 +30,5 @@ static char * title_inactive_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-3-active.png b/themes/kokodi/title-3-active.png Binary files differindex 6b3f69e4c..4aab87fc3 100644 --- a/themes/kokodi/title-3-active.png +++ b/themes/kokodi/title-3-active.png diff --git a/themes/kokodi/title-3-active.svg b/themes/kokodi/title-3-active.svg index 7ddcb92f9..86ef24f0f 100644 --- a/themes/kokodi/title-3-active.svg +++ b/themes/kokodi/title-3-active.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-3-active.xpm b/themes/kokodi/title-3-active.xpm index 9f656fef3..3c1149c1d 100644 --- a/themes/kokodi/title-3-active.xpm +++ b/themes/kokodi/title-3-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_active_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s active_color_1", "....", @@ -30,4 +30,5 @@ static char * title_active_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-3-inactive.png b/themes/kokodi/title-3-inactive.png Binary files differindex 2352a6eda..4aab87fc3 100644 --- a/themes/kokodi/title-3-inactive.png +++ b/themes/kokodi/title-3-inactive.png diff --git a/themes/kokodi/title-3-inactive.svg b/themes/kokodi/title-3-inactive.svg index 669254339..4fcf55cf5 100644 --- a/themes/kokodi/title-3-inactive.svg +++ b/themes/kokodi/title-3-inactive.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-3-inactive.xpm b/themes/kokodi/title-3-inactive.xpm index b97494023..6c865cc53 100644 --- a/themes/kokodi/title-3-inactive.xpm +++ b/themes/kokodi/title-3-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_inactive_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", "....", @@ -30,4 +30,5 @@ static char * title_inactive_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-4-active.png b/themes/kokodi/title-4-active.png Binary files differindex 6b3f69e4c..4aab87fc3 100644 --- a/themes/kokodi/title-4-active.png +++ b/themes/kokodi/title-4-active.png diff --git a/themes/kokodi/title-4-active.svg b/themes/kokodi/title-4-active.svg index 25dc30ecd..0d243cf3f 100644 --- a/themes/kokodi/title-4-active.svg +++ b/themes/kokodi/title-4-active.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-4-active.xpm b/themes/kokodi/title-4-active.xpm index 9f656fef3..3c1149c1d 100644 --- a/themes/kokodi/title-4-active.xpm +++ b/themes/kokodi/title-4-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_active_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s active_color_1", "....", @@ -30,4 +30,5 @@ static char * title_active_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-4-inactive.png b/themes/kokodi/title-4-inactive.png Binary files differindex 2352a6eda..4aab87fc3 100644 --- a/themes/kokodi/title-4-inactive.png +++ b/themes/kokodi/title-4-inactive.png diff --git a/themes/kokodi/title-4-inactive.svg b/themes/kokodi/title-4-inactive.svg index 16e5f36b1..4fb492fb8 100644 --- a/themes/kokodi/title-4-inactive.svg +++ b/themes/kokodi/title-4-inactive.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-4-inactive.xpm b/themes/kokodi/title-4-inactive.xpm index b97494023..6c865cc53 100644 --- a/themes/kokodi/title-4-inactive.xpm +++ b/themes/kokodi/title-4-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_inactive_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", "....", @@ -30,4 +30,5 @@ static char * title_inactive_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-5-active.png b/themes/kokodi/title-5-active.png Binary files differindex 6b3f69e4c..4aab87fc3 100644 --- a/themes/kokodi/title-5-active.png +++ b/themes/kokodi/title-5-active.png diff --git a/themes/kokodi/title-5-active.svg b/themes/kokodi/title-5-active.svg index ac017749b..bd7858925 100644 --- a/themes/kokodi/title-5-active.svg +++ b/themes/kokodi/title-5-active.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-5-active.xpm b/themes/kokodi/title-5-active.xpm index 9f656fef3..3c1149c1d 100644 --- a/themes/kokodi/title-5-active.xpm +++ b/themes/kokodi/title-5-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_active_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s active_color_1", "....", @@ -30,4 +30,5 @@ static char * title_active_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/title-5-inactive.png b/themes/kokodi/title-5-inactive.png Binary files differindex 2352a6eda..4aab87fc3 100644 --- a/themes/kokodi/title-5-inactive.png +++ b/themes/kokodi/title-5-inactive.png diff --git a/themes/kokodi/title-5-inactive.svg b/themes/kokodi/title-5-inactive.svg index 072dc364d..881547b59 100644 --- a/themes/kokodi/title-5-inactive.svg +++ b/themes/kokodi/title-5-inactive.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -139,27 +143,24 @@ 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" - id="rect6057" - width="8" - height="26" - x="0" - y="1" /> + <path + style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z " + id="path6057" /> </g> <g inkscape:groupmode="layer" 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z " id="path6061" /> <rect - style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1" + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1884" width="8" - height="15" + height="14" x="0" y="1" /> </g> @@ -169,8 +170,8 @@ id="layer1" style="display:inline"> <path - style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20" - d="M 0,0.5 L 8,0.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50" + d="M 0.5,0.5 L 7.5,0.5" id="path6059" /> </g> <g @@ -178,8 +179,8 @@ 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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/title-5-inactive.xpm b/themes/kokodi/title-5-inactive.xpm index b97494023..6c865cc53 100644 --- a/themes/kokodi/title-5-inactive.xpm +++ b/themes/kokodi/title-5-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * title_inactive_xpm[] = { -"4 28 2 1", +"4 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", "....", @@ -30,4 +30,5 @@ static char * title_inactive_xpm[] = { "....", "....", "....", +"....", "...."}; diff --git a/themes/kokodi/top-left-active.png b/themes/kokodi/top-left-active.png Binary files differindex e3c289a0c..6f0f24b3f 100644 --- a/themes/kokodi/top-left-active.png +++ b/themes/kokodi/top-left-active.png diff --git a/themes/kokodi/top-left-active.svg b/themes/kokodi/top-left-active.svg index 129e47263..6fe458cea 100644 --- a/themes/kokodi/top-left-active.svg +++ b/themes/kokodi/top-left-active.svg @@ -10,14 +10,14 @@ 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="default" version="1.0" - inkscape:version="0.45.1" + inkscape:version="0.44.1" sodipodi:version="0.32" id="svg2" - height="28" + height="29" 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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -141,8 +145,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(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" + d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " /> </g> <g inkscape:label="hilight" @@ -151,10 +155,10 @@ <path id="path6061" 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" /> + 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" /> <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 " + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,10 C 1,10 1,15 6,15 L 8,15 L 8,15 L 8,1 z " id="path1884" /> </g> <g @@ -164,16 +168,16 @@ 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" /> + d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,29 1,29 1,29 L 0,29 L 0,0 L 8,0 z " + style="fill:black;fill-opacity:0.50" /> </g> <g inkscape:label="Shadow" id="layer5" inkscape:groupmode="layer"> <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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 2.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/top-left-active.xpm b/themes/kokodi/top-left-active.xpm index 8a8f571df..9b1fcce2c 100644 --- a/themes/kokodi/top-left-active.xpm +++ b/themes/kokodi/top-left-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * top_left_active_xpm[] = { -"8 28 2 1", +"8 29 2 1", " c None", ". c #C0C0FF s active_color_1", " ......", @@ -30,4 +30,5 @@ static char * top_left_active_xpm[] = { "........", "........", "........", +"........", "........"}; diff --git a/themes/kokodi/top-left-inactive.png b/themes/kokodi/top-left-inactive.png Binary files differindex 44afa3287..6f0f24b3f 100644 --- a/themes/kokodi/top-left-inactive.png +++ b/themes/kokodi/top-left-inactive.png diff --git a/themes/kokodi/top-left-inactive.svg b/themes/kokodi/top-left-inactive.svg index f64c8870c..6510838cc 100644 --- a/themes/kokodi/top-left-inactive.svg +++ b/themes/kokodi/top-left-inactive.svg @@ -10,14 +10,14 @@ 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="default" version="1.0" - inkscape:version="0.45.1" + inkscape:version="0.44.1" sodipodi:version="0.32" id="svg2" - height="28" + height="29" 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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -141,8 +145,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(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" + d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " /> </g> <g inkscape:label="hilight" @@ -151,10 +155,10 @@ <path id="path6061" 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" /> + 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" /> <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 " + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,10 C 1,10 1,15 6,15 L 8,15 L 8,15 L 8,1 z " id="path1884" /> </g> <g @@ -164,16 +168,16 @@ 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" /> + d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,29 1,29 1,29 L 0,29 L 0,0 L 8,0 z " + style="fill:black;fill-opacity:0.50" /> </g> <g inkscape:label="Shadow" id="layer5" inkscape:groupmode="layer"> <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" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 2.5,28.5 L 7.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/top-left-inactive.xpm b/themes/kokodi/top-left-inactive.xpm index b9eff7f25..5f4e40abf 100644 --- a/themes/kokodi/top-left-inactive.xpm +++ b/themes/kokodi/top-left-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * top_left_inactive_xpm[] = { -"8 28 2 1", +"8 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", " ......", @@ -30,4 +30,5 @@ static char * top_left_inactive_xpm[] = { "........", "........", "........", +"........", "........"}; diff --git a/themes/kokodi/top-right-active.png b/themes/kokodi/top-right-active.png Binary files differindex 251934806..12d1a090a 100644 --- a/themes/kokodi/top-right-active.png +++ b/themes/kokodi/top-right-active.png diff --git a/themes/kokodi/top-right-active.svg b/themes/kokodi/top-right-active.svg index ae6dcd020..7043f078a 100644 --- a/themes/kokodi/top-right-active.svg +++ b/themes/kokodi/top-right-active.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -140,8 +144,8 @@ 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(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z " id="path6057" /> </g> <g @@ -149,12 +153,12 @@ 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z " 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 " + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,15 2,15 L 0,15 L 0,15 L 0,1 z " id="path1884" /> </g> <g @@ -164,16 +168,16 @@ 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" /> + d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,29 7,29 7,29 L 8,29 L 8,0 L 0,0 z " + style="fill:black;fill-opacity:0.50" /> </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.5,27.5 L 5.5,27.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 5.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/top-right-active.xpm b/themes/kokodi/top-right-active.xpm index d33ccf4b7..56545c3df 100644 --- a/themes/kokodi/top-right-active.xpm +++ b/themes/kokodi/top-right-active.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * top_right_active_xpm[] = { -"8 28 2 1", +"8 29 2 1", " c None", ". c #C0C0FF s active_color_1", "...... ", @@ -30,4 +30,5 @@ static char * top_right_active_xpm[] = { "........", "........", "........", +"........", "........"}; diff --git a/themes/kokodi/top-right-inactive.png b/themes/kokodi/top-right-inactive.png Binary files differindex d20390526..12d1a090a 100644 --- a/themes/kokodi/top-right-inactive.png +++ b/themes/kokodi/top-right-inactive.png diff --git a/themes/kokodi/top-right-inactive.svg b/themes/kokodi/top-right-inactive.svg index 57da706dd..8a65173b1 100644 --- a/themes/kokodi/top-right-inactive.svg +++ b/themes/kokodi/top-right-inactive.svg @@ -10,14 +10,14 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="8" - height="28" + height="29" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" + inkscape:version="0.44.1" version="1.0" + sodipodi:docbase="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 @@ -51,11 +51,15 @@ <stop id="stop5849" offset="0" - style="stop-color:white;stop-opacity:0;" /> + style="stop-color:black;stop-opacity:0;" /> + <stop + id="stop2776" + offset="0.4" + style="stop-color:black;stop-opacity:0;" /> <stop id="stop2779" - offset="0.75" - style="stop-color:white;stop-opacity:0;" /> + offset="0.6" + style="stop-color:black;stop-opacity:0.05;" /> <stop id="stop5851" offset="1" @@ -69,7 +73,7 @@ x1="0" y1="0.5" x2="0" - y2="27.5" + y2="28.5" gradientTransform="matrix(1,0,0,1,0,0)" /> <linearGradient inkscape:collect="always" @@ -140,8 +144,8 @@ 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(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z " id="path6057" /> </g> <g @@ -149,12 +153,12 @@ 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.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z " 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 " + style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,15 2,15 L 0,15 L 0,15 L 0,1 z " id="path1884" /> </g> <g @@ -164,16 +168,16 @@ 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" /> + d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,29 7,29 7,29 L 8,29 L 8,0 L 0,0 z " + style="fill:black;fill-opacity:0.50" /> </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.5,27.5 L 5.5,27.5" + style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05" + d="M 0.5,28.5 L 5.5,28.5" id="path6989" /> </g> </svg> diff --git a/themes/kokodi/top-right-inactive.xpm b/themes/kokodi/top-right-inactive.xpm index 15ea11883..8be602e38 100644 --- a/themes/kokodi/top-right-inactive.xpm +++ b/themes/kokodi/top-right-inactive.xpm @@ -1,6 +1,6 @@ /* XPM */ static char * top_right_inactive_xpm[] = { -"8 28 2 1", +"8 29 2 1", " c None", ". c #C0C0FF s inactive_color_1", "...... ", @@ -30,4 +30,5 @@ static char * top_right_inactive_xpm[] = { "........", "........", "........", +"........", "........"}; |
