[Xfce4-commits] <xfwm4:master> Use themeable icons for the settings manager and the menu, rework the default icons for the settings manager and the window menu and add SVG version.
Olivier Fourdan
noreply at xfce.org
Mon Dec 12 20:52:03 CET 2011
Updating branch refs/heads/master
to 1ecd375dae2aed6832d35e36fc0d58e87d13f4a1 (commit)
from d30cd2fb8a2303ed93dd4d0e5d73bfb337541f59 (commit)
commit 1ecd375dae2aed6832d35e36fc0d58e87d13f4a1
Author: Olivier Fourdan <fourdan at xfce.org>
Date: Mon Dec 12 18:03:20 2011 +0100
Use themeable icons for the settings manager and the menu, rework the default icons for the settings manager and the window menu and add SVG version.
icons/22x22/Makefile.am | 22 ++++---
icons/22x22/xfce-wm-close.png | Bin 0 -> 374 bytes
icons/22x22/xfce-wm-maximize.png | Bin 0 -> 168 bytes
icons/22x22/xfce-wm-menu.png | Bin 0 -> 345 bytes
icons/22x22/xfce-wm-minimize.png | Bin 0 -> 135 bytes
icons/22x22/xfce-wm-shade.png | Bin 0 -> 302 bytes
icons/22x22/xfce-wm-stick.png | Bin 0 -> 352 bytes
icons/22x22/xfce-wm-unmaximize.png | Bin 0 -> 188 bytes
icons/22x22/xfce-wm-unshade.png | Bin 0 -> 266 bytes
icons/22x22/xfce-wm-unstick.png | Bin 0 -> 357 bytes
icons/22x22/xfwm4-settings-close.png | Bin 451 -> 0 bytes
icons/22x22/xfwm4-settings-maximize.png | Bin 345 -> 0 bytes
icons/22x22/xfwm4-settings-menu.png | Bin 295 -> 0 bytes
icons/22x22/xfwm4-settings-minimize.png | Bin 264 -> 0 bytes
icons/22x22/xfwm4-settings-shade.png | Bin 470 -> 0 bytes
icons/22x22/xfwm4-settings-stick.png | Bin 407 -> 0 bytes
icons/Makefile.am | 4 +
icons/scalable/Makefile.am | 18 ++++-
icons/scalable/xfce-wm-close.svg | 68 ++++++++++++++++++
.../scalable/xfce-wm-maximize.svg | 49 +++++--------
.../scalable/xfce-wm-menu.svg | 51 ++++++--------
.../scalable/xfce-wm-minimize.svg | 53 ++++++--------
.../scalable/xfce-wm-shade.svg | 47 +++++--------
icons/scalable/xfce-wm-stick.svg | 56 +++++++++++++++
icons/scalable/xfce-wm-unmaximize.svg | 60 ++++++++++++++++
.../scalable/xfce-wm-unshade.svg | 47 +++++--------
icons/scalable/xfce-wm-unstick.svg | 61 ++++++++++++++++
settings-dialogs/xfwm4-dialog.glade | 12 ++--
src/Makefile.am | 39 +----------
src/inline-stock-maximize.h | 62 ----------------
src/inline-stock-minimize.h | 57 ---------------
src/inline-stock-rolldown.h | 61 ----------------
src/inline-stock-rollup.h | 61 ----------------
src/inline-stock-unmaximize.h | 60 ----------------
src/menu.c | 47 ++++++------
src/stock_icons.c | 75 --------------------
src/stock_icons.h | 49 -------------
src/stock_maximize.png | Bin 176 -> 0 bytes
src/stock_minimize.png | Bin 158 -> 0 bytes
src/stock_rolldown.png | Bin 184 -> 0 bytes
src/stock_rollup.png | Bin 174 -> 0 bytes
src/stock_unmaximize.png | Bin 203 -> 0 bytes
42 files changed, 407 insertions(+), 652 deletions(-)
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index f17695d..c22cf82 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -1,10 +1,14 @@
-iconsdir = $(datadir)/icons/hicolor/22x22/actions
-icons_DATA = \
- xfwm4-settings-close.png \
- xfwm4-settings-maximize.png \
- xfwm4-settings-menu.png \
- xfwm4-settings-minimize.png \
- xfwm4-settings-shade.png \
- xfwm4-settings-stick.png
+actionsiconsdir = $(datadir)/icons/hicolor/22x22/actions
+actionsicons_DATA = \
+ xfce-wm-close.png \
+ xfce-wm-maximize.png \
+ xfce-wm-menu.png \
+ xfce-wm-minimize.png \
+ xfce-wm-shade.png \
+ xfce-wm-stick.png \
+ xfce-wm-unmaximize.png \
+ xfce-wm-unshade.png \
+ xfce-wm-unstick.png
+
-EXTRA_DIST = $(icons_DATA)
+EXTRA_DIST = $(actionsicons_DATA)
diff --git a/icons/22x22/xfce-wm-close.png b/icons/22x22/xfce-wm-close.png
new file mode 100644
index 0000000..59b7f42
Binary files /dev/null and b/icons/22x22/xfce-wm-close.png differ
diff --git a/icons/22x22/xfce-wm-maximize.png b/icons/22x22/xfce-wm-maximize.png
new file mode 100644
index 0000000..371d2fa
Binary files /dev/null and b/icons/22x22/xfce-wm-maximize.png differ
diff --git a/icons/22x22/xfce-wm-menu.png b/icons/22x22/xfce-wm-menu.png
new file mode 100644
index 0000000..b57ad6c
Binary files /dev/null and b/icons/22x22/xfce-wm-menu.png differ
diff --git a/icons/22x22/xfce-wm-minimize.png b/icons/22x22/xfce-wm-minimize.png
new file mode 100644
index 0000000..b8de527
Binary files /dev/null and b/icons/22x22/xfce-wm-minimize.png differ
diff --git a/icons/22x22/xfce-wm-shade.png b/icons/22x22/xfce-wm-shade.png
new file mode 100644
index 0000000..2238601
Binary files /dev/null and b/icons/22x22/xfce-wm-shade.png differ
diff --git a/icons/22x22/xfce-wm-stick.png b/icons/22x22/xfce-wm-stick.png
new file mode 100644
index 0000000..c7fcfac
Binary files /dev/null and b/icons/22x22/xfce-wm-stick.png differ
diff --git a/icons/22x22/xfce-wm-unmaximize.png b/icons/22x22/xfce-wm-unmaximize.png
new file mode 100644
index 0000000..47cb199
Binary files /dev/null and b/icons/22x22/xfce-wm-unmaximize.png differ
diff --git a/icons/22x22/xfce-wm-unshade.png b/icons/22x22/xfce-wm-unshade.png
new file mode 100644
index 0000000..44d299a
Binary files /dev/null and b/icons/22x22/xfce-wm-unshade.png differ
diff --git a/icons/22x22/xfce-wm-unstick.png b/icons/22x22/xfce-wm-unstick.png
new file mode 100644
index 0000000..6f66f33
Binary files /dev/null and b/icons/22x22/xfce-wm-unstick.png differ
diff --git a/icons/22x22/xfwm4-settings-close.png b/icons/22x22/xfwm4-settings-close.png
deleted file mode 100644
index b7d9123..0000000
Binary files a/icons/22x22/xfwm4-settings-close.png and /dev/null differ
diff --git a/icons/22x22/xfwm4-settings-maximize.png b/icons/22x22/xfwm4-settings-maximize.png
deleted file mode 100644
index ae20e47..0000000
Binary files a/icons/22x22/xfwm4-settings-maximize.png and /dev/null differ
diff --git a/icons/22x22/xfwm4-settings-menu.png b/icons/22x22/xfwm4-settings-menu.png
deleted file mode 100644
index 3823e52..0000000
Binary files a/icons/22x22/xfwm4-settings-menu.png and /dev/null differ
diff --git a/icons/22x22/xfwm4-settings-minimize.png b/icons/22x22/xfwm4-settings-minimize.png
deleted file mode 100644
index f51b3b6..0000000
Binary files a/icons/22x22/xfwm4-settings-minimize.png and /dev/null differ
diff --git a/icons/22x22/xfwm4-settings-shade.png b/icons/22x22/xfwm4-settings-shade.png
deleted file mode 100644
index 67d4255..0000000
Binary files a/icons/22x22/xfwm4-settings-shade.png and /dev/null differ
diff --git a/icons/22x22/xfwm4-settings-stick.png b/icons/22x22/xfwm4-settings-stick.png
deleted file mode 100644
index 58e81f7..0000000
Binary files a/icons/22x22/xfwm4-settings-stick.png and /dev/null differ
diff --git a/icons/Makefile.am b/icons/Makefile.am
index e6631a0..fc25b0f 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -2,3 +2,7 @@ SUBDIRS = \
22x22 \
48x48 \
scalable
+
+# install-data-local:
+# @echo "Updating Gtk icon cache."
+# gtk-update-icon-cache -f -t $(datadir)/icons/hicolor/
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 8b08d5b..54b3064 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,7 +1,19 @@
-iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA = \
+appiconsdir = $(datadir)/icons/hicolor/scalable/apps
+appicons_DATA = \
wmtweaks.svg \
xfce4-workspaces.svg \
xfwm4.svg
-EXTRA_DIST = $(icons_DATA)
+actionsiconsdir = $(datadir)/icons/hicolor/scalable/actions
+actionsicons_DATA = \
+ xfce-wm-close.svg \
+ xfce-wm-maximize.svg \
+ xfce-wm-menu.svg \
+ xfce-wm-minimize.svg \
+ xfce-wm-shade.svg \
+ xfce-wm-stick.svg \
+ xfce-wm-unmaximize.svg \
+ xfce-wm-unshade.svg \
+ xfce-wm-unstick.svg
+
+EXTRA_DIST = $(icons_DATA) $(actionsicons_DATA)
diff --git a/icons/scalable/xfce-wm-close.svg b/icons/scalable/xfce-wm-close.svg
new file mode 100644
index 0000000..be6d11b
--- /dev/null
+++ b/icons/scalable/xfce-wm-close.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.47 r22583"
+ version="1.0"
+ sodipodi:docname="xfce-wm-close.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ id="g2328"
+ transform="translate(2,3)">
+ <g
+ transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+ style="opacity:0.33;stroke:#ffffff;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:#ffffff;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:#ffffff;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:#000000;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:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/themes/default/bottom-left-inactive.svg b/icons/scalable/xfce-wm-maximize.svg
similarity index 56%
copy from themes/default/bottom-left-inactive.svg
copy to icons/scalable/xfce-wm-maximize.svg
index 58a8fe4..35c5f5d 100644
--- a/themes/default/bottom-left-inactive.svg
+++ b/icons/scalable/xfce-wm-maximize.svg
@@ -7,6 +7,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
@@ -15,30 +16,9 @@
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
version="1.0"
- sodipodi:docname="bottom-left-inactive.svg"
+ sodipodi:docname="xfce-wm-maximize.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs7" />
- <sodipodi:namedview
- id="base"
- pagecolor="white"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="10"
- inkscape:cx="0"
- inkscape:cy="0"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:window-width="640"
- inkscape:window-height="400"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:grid-points="true" />
- <metadata
+ <metadata
id="metadata7">
<rdf:RDF>
<cc:Work
@@ -46,7 +26,7 @@
<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>Title</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Olivier Fourdan</dc:title>
@@ -56,12 +36,21 @@
</rdf:RDF>
</metadata>
<g
- inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill:#a0a0a0;fill-opacity:0.25"
- d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
- id="rect1870" />
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1614"
+ transform="translate(2,3)">
+ <path
+ id="rect2246"
+ d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+ style="opacity:0.33;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+ <path
+ id="rect2285"
+ d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
</g>
</svg>
diff --git a/themes/default/left-active.svg b/icons/scalable/xfce-wm-menu.svg
similarity index 57%
copy from themes/default/left-active.svg
copy to icons/scalable/xfce-wm-menu.svg
index 55ac0de..866b630 100644
--- a/themes/default/left-active.svg
+++ b/icons/scalable/xfce-wm-menu.svg
@@ -9,34 +9,14 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1"
- height="24"
+ width="16"
+ height="16"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
version="1.0"
- sodipodi:docname="left-active.svg"
+ sodipodi:docname="xfce-wm-menu.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs7" />
- <sodipodi:namedview
- id="base"
- pagecolor="white"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="10"
- inkscape:cx="0"
- inkscape:cy="0"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:window-width="640"
- inkscape:window-height="400"
- inkscape:window-x="0"
- inkscape:window-y="0" />
<metadata
id="metadata7">
<rdf:RDF>
@@ -45,7 +25,7 @@
<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>Title</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Olivier Fourdan</dc:title>
@@ -55,12 +35,23 @@
</rdf:RDF>
</metadata>
<g
- inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="border">
- <path
- style="fill:none;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:0.25"
- d="M 0.5,0 L 0.5,24"
- id="path1340" />
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1614"
+ transform="translate(2,3)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3792"
+ d="M 1,1 11,1 6,9 z"
+ style="opacity:0.33;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+ <path
+ style="fill:#000000;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+ d="M 3,2 9,2 6,7 z"
+ id="path3011"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
</svg>
diff --git a/themes/default/bottom-left-active.svg b/icons/scalable/xfce-wm-minimize.svg
similarity index 56%
copy from themes/default/bottom-left-active.svg
copy to icons/scalable/xfce-wm-minimize.svg
index ab11400..aeec556 100644
--- a/themes/default/bottom-left-active.svg
+++ b/icons/scalable/xfce-wm-minimize.svg
@@ -7,6 +7,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
@@ -15,29 +16,8 @@
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
version="1.0"
- sodipodi:docname="bottom-left-active.svg"
+ sodipodi:docname="xfce-wm-minimize.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs7" />
- <sodipodi:namedview
- id="base"
- pagecolor="white"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="10"
- inkscape:cx="0"
- inkscape:cy="0"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:window-width="640"
- inkscape:window-height="400"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:grid-points="true" />
<metadata
id="metadata7">
<rdf:RDF>
@@ -46,7 +26,7 @@
<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>Title</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Olivier Fourdan</dc:title>
@@ -56,12 +36,27 @@
</rdf:RDF>
</metadata>
<g
- inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill:#a0a0a0;fill-opacity:0.25"
- d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
- id="rect1870" />
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1616"
+ transform="translate(2,3)">
+ <rect
+ style="opacity:0.33;fill:#ffffff;fill-opacity:1;stroke:#ffffff;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:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="rect2378"
+ width="6"
+ height="2"
+ x="3"
+ y="8" />
+ </g>
</g>
</svg>
diff --git a/themes/default/bottom-left-active.svg b/icons/scalable/xfce-wm-shade.svg
similarity index 56%
copy from themes/default/bottom-left-active.svg
copy to icons/scalable/xfce-wm-shade.svg
index ab11400..9ed5af1 100644
--- a/themes/default/bottom-left-active.svg
+++ b/icons/scalable/xfce-wm-shade.svg
@@ -7,6 +7,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
@@ -15,29 +16,8 @@
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
version="1.0"
- sodipodi:docname="bottom-left-active.svg"
+ sodipodi:docname="xfce-wm-shade.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs7" />
- <sodipodi:namedview
- id="base"
- pagecolor="white"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="10"
- inkscape:cx="0"
- inkscape:cy="0"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:window-width="640"
- inkscape:window-height="400"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:grid-points="true" />
<metadata
id="metadata7">
<rdf:RDF>
@@ -46,7 +26,7 @@
<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>Title</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Olivier Fourdan</dc:title>
@@ -56,12 +36,21 @@
</rdf:RDF>
</metadata>
<g
- inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill:#a0a0a0;fill-opacity:0.25"
- d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
- id="rect1870" />
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1616"
+ transform="translate(2,3)">
+ <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:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2405" />
+ <path
+ d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420" />
+ </g>
</g>
</svg>
diff --git a/icons/scalable/xfce-wm-stick.svg b/icons/scalable/xfce-wm-stick.svg
new file mode 100644
index 0000000..6520435
--- /dev/null
+++ b/icons/scalable/xfce-wm-stick.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.47 r22583"
+ version="1.0"
+ sodipodi:docname="xfce-wm-stick.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1613"
+ transform="translate(2,3)">
+ <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:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2247"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/icons/scalable/xfce-wm-unmaximize.svg b/icons/scalable/xfce-wm-unmaximize.svg
new file mode 100644
index 0000000..02e1c51
--- /dev/null
+++ b/icons/scalable/xfce-wm-unmaximize.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.47 r22583"
+ version="1.0"
+ sodipodi:docname="xfce-wm-unmaximize.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1624"
+ transform="translate(2,3)">
+ <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:#ffffff;fill-opacity:1;stroke:#ffffff;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:#000000;fill-opacity:1;stroke:#ffffff;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:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/themes/default/bottom-left-active.svg b/icons/scalable/xfce-wm-unshade.svg
similarity index 56%
copy from themes/default/bottom-left-active.svg
copy to icons/scalable/xfce-wm-unshade.svg
index ab11400..2dd70ce 100644
--- a/themes/default/bottom-left-active.svg
+++ b/icons/scalable/xfce-wm-unshade.svg
@@ -7,6 +7,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
@@ -15,29 +16,8 @@
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
version="1.0"
- sodipodi:docname="bottom-left-active.svg"
+ sodipodi:docname="xfce-wm-unshade.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs7" />
- <sodipodi:namedview
- id="base"
- pagecolor="white"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="10"
- inkscape:cx="0"
- inkscape:cy="0"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:window-width="640"
- inkscape:window-height="400"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:grid-points="true" />
<metadata
id="metadata7">
<rdf:RDF>
@@ -46,7 +26,7 @@
<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>Title</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Olivier Fourdan</dc:title>
@@ -56,12 +36,21 @@
</rdf:RDF>
</metadata>
<g
- inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill:#a0a0a0;fill-opacity:0.25"
- d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
- id="rect1870" />
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1624"
+ transform="translate(2,3)">
+ <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:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2405" />
+ <path
+ d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2420" />
+ </g>
</g>
</svg>
diff --git a/icons/scalable/xfce-wm-unstick.svg b/icons/scalable/xfce-wm-unstick.svg
new file mode 100644
index 0000000..2cbe936
--- /dev/null
+++ b/icons/scalable/xfce-wm-unstick.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.47 r22583"
+ version="1.0"
+ sodipodi:docname="xfce-wm-unstick.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1625"
+ transform="translate(2,3)">
+ <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:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2247"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;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:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ </g>
+ </g>
+</svg>
diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade
index 96f6aa8..65677f6 100644
--- a/settings-dialogs/xfwm4-dialog.glade
+++ b/settings-dialogs/xfwm4-dialog.glade
@@ -256,7 +256,7 @@
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="icon_name">xfwm4-settings-menu</property>
+ <property name="icon_name">xfce-wm-menu</property>
</object>
</child>
</object>
@@ -275,7 +275,7 @@
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="icon_name">xfwm4-settings-stick</property>
+ <property name="icon_name">xfce-wm-stick</property>
</object>
</child>
</object>
@@ -294,7 +294,7 @@
<child>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="icon_name">xfwm4-settings-shade</property>
+ <property name="icon_name">xfce-wm-shade</property>
</object>
</child>
</object>
@@ -313,7 +313,7 @@
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
- <property name="icon_name">xfwm4-settings-minimize</property>
+ <property name="icon_name">xfce-wm-minimize</property>
</object>
</child>
</object>
@@ -332,7 +332,7 @@
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
- <property name="icon_name">xfwm4-settings-maximize</property>
+ <property name="icon_name">xfce-wm-maximize</property>
</object>
</child>
</object>
@@ -351,7 +351,7 @@
<child>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
- <property name="icon_name">xfwm4-settings-close</property>
+ <property name="icon_name">xfce-wm-close</property>
</object>
</child>
</object>
diff --git a/src/Makefile.am b/src/Makefile.am
index c1e2789..9113d2a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,11 +22,6 @@ xfwm4_SOURCES = \
icons.c \
icons.h \
inline-default-icon.h \
- inline-stock-maximize.h \
- inline-stock-minimize.h \
- inline-stock-rolldown.h \
- inline-stock-rollup.h \
- inline-stock-unmaximize.h \
keyboard.c \
keyboard.h \
main.c \
@@ -60,8 +55,6 @@ xfwm4_SOURCES = \
stacking.h \
startup_notification.c \
startup_notification.h \
- stock_icons.c \
- stock_icons.h \
tabwin.c \
tabwin.h \
terminate.c \
@@ -112,20 +105,10 @@ xfwm4_LDADD = \
EXTRA_DIST = \
inline-default-icon.h default_icon.png default_icon.svg \
- inline-stock-maximize.h stock_maximize.png \
- inline-stock-unmaximize.h stock_unmaximize.png \
- inline-stock-minimize.h stock_minimize.png \
- inline-stock-rollup.h stock_rollup.png \
- inline-stock-rolldown.h stock_rolldown.png \
gen-color-table.pl
noinst_DATA = \
- inline-default-icon.h default_icon.png default_icon.svg \
- inline-stock-maximize.h stock_maximize.png \
- inline-stock-unmaximize.h stock_unmaximize.png \
- inline-stock-minimize.h stock_minimize.png \
- inline-stock-rollup.h stock_rollup.png \
- inline-stock-rolldown.h stock_rolldown.png
+ inline-default-icon.h default_icon.png default_icon.svg
build.h:
$(AM_V_GEN) echo "#define BUILD_ID \""`date +%H%M-%y%m%d`"\"" > build.h
@@ -134,23 +117,3 @@ inline-default-icon.h: $(srcdir)/default_icon.png
$(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \
default_icon_data $(srcdir)/default_icon.png > inline-default-icon.h
-inline-stock-maximize.h: $(srcdir)/stock_maximize.png
- $(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \
- stock_maximize_data $(srcdir)/stock_maximize.png > inline-stock-maximize.h
-
-inline-stock-unmaximize.h: $(srcdir)/stock_unmaximize.png
- $(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \
- stock_unmaximize_data $(srcdir)/stock_unmaximize.png > inline-stock-unmaximize.h
-
-inline-stock-minimize.h: $(srcdir)/stock_minimize.png
- $(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \
- stock_minimize_data $(srcdir)/stock_minimize.png > inline-stock-minimize.h
-
-inline-stock-rollup.h: $(srcdir)/stock_rollup.png
- $(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \
- stock_rollup_data $(srcdir)/stock_rollup.png > inline-stock-rollup.h
-
-inline-stock-rolldown.h: $(srcdir)/stock_rolldown.png
- $(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \
- stock_rolldown_data $(srcdir)/stock_rolldown.png > inline-stock-rolldown.h
-
diff --git a/src/inline-stock-maximize.h b/src/inline-stock-maximize.h
deleted file mode 100644
index f1d7bd0..0000000
--- a/src/inline-stock-maximize.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump */
-
-#ifdef __SUNPRO_C
-#pragma align 4 (stock_maximize_data)
-#endif
-#ifdef __GNUC__
-static const guint8 stock_maximize_data[] __attribute__ ((__aligned__ (4))) =
-#else
-static const guint8 stock_maximize_data[] =
-#endif
-{ ""
- /* Pixbuf magic (0x47646b50) */
- "GdkP"
- /* length: header (24) + pixel_data (1024) */
- "\0\0\4\30"
- /* pixdata_type (0x1010002) */
- "\1\1\0\2"
- /* rowstride (64) */
- "\0\0\0@"
- /* width (16) */
- "\0\0\0\20"
- /* height (16) */
- "\0\0\0\20"
- /* pixel_data: */
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\342\342\336\0\342\342\336\0"
- "\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\377\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\0\0\0\377"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\342\342\336"
- "\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\342\342\336\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\377\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
- "\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\342\342\336\0\342\342\336\0\0\0\0\377\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\342\342\336\0\342\342\336"
- "\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
- "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
-
-
diff --git a/src/inline-stock-minimize.h b/src/inline-stock-minimize.h
deleted file mode 100644
index 70994b6..0000000
--- a/src/inline-stock-minimize.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump */
-
-#ifdef __SUNPRO_C
-#pragma align 4 (stock_minimize_data)
-#endif
-#ifdef __GNUC__
-static const guint8 stock_minimize_data[] __attribute__ ((__aligned__ (4))) =
-#else
-static const guint8 stock_minimize_data[] =
-#endif
-{ ""
- /* Pixbuf magic (0x47646b50) */
- "GdkP"
- /* length: header (24) + pixel_data (1024) */
- "\0\0\4\30"
- /* pixdata_type (0x1010002) */
- "\1\1\0\2"
- /* rowstride (64) */
- "\0\0\0@"
- /* width (16) */
- "\0\0\0\20"
- /* height (16) */
- "\0\0\0\20"
- /* pixel_data: */
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0"
- "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
- "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0"
- "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
-
-
diff --git a/src/inline-stock-rolldown.h b/src/inline-stock-rolldown.h
deleted file mode 100644
index 8d1d9d1..0000000
--- a/src/inline-stock-rolldown.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump */
-
-#ifdef __SUNPRO_C
-#pragma align 4 (stock_rolldown_data)
-#endif
-#ifdef __GNUC__
-static const guint8 stock_rolldown_data[] __attribute__ ((__aligned__ (4))) =
-#else
-static const guint8 stock_rolldown_data[] =
-#endif
-{ ""
- /* Pixbuf magic (0x47646b50) */
- "GdkP"
- /* length: header (24) + pixel_data (1024) */
- "\0\0\4\30"
- /* pixdata_type (0x1010002) */
- "\1\1\0\2"
- /* rowstride (64) */
- "\0\0\0@"
- /* width (16) */
- "\0\0\0\20"
- /* height (16) */
- "\0\0\0\20"
- /* pixel_data: */
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\377\0"
- "\0\0\0\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\342\342\336\0\0\0\0\377"
- "\342\342\336\0\0\0\0\377\342\342\336\0\0\0\0\377\342\342\336\0\0\0\0"
- "\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\342\342"
- "\336\0\0\0\0\377\342\342\336\0\0\0\0\377\342\342\336\0\0\0\0\377\342"
- "\342\336\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\377\0\0\0\377\342\342\336\0\0\0\0\377\342\342\336\0"
- "\0\0\0\377\342\342\336\0\0\0\0\377\342\342\336\0\0\0\0\377\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\342\342\336\0\0\0\0"
- "\377\342\342\336\0\0\0\0\377\342\342\336\0\0\0\0\377\342\342\336\0\0"
- "\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\377\0\0\0\377\342\342\336\0\0\0\0\377\342\342\336\0\0\0\0\377\342"
- "\342\336\0\0\0\0\377\342\342\336\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\342\342\336\0\0\0\0\377\342\342\336"
- "\0\0\0\0\377\342\342\336\0\0\0\0\377\342\342\336\0\0\0\0\377\0\0\0\377"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0"};
-
-
diff --git a/src/inline-stock-rollup.h b/src/inline-stock-rollup.h
deleted file mode 100644
index cb2479b..0000000
--- a/src/inline-stock-rollup.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump */
-
-#ifdef __SUNPRO_C
-#pragma align 4 (stock_rollup_data)
-#endif
-#ifdef __GNUC__
-static const guint8 stock_rollup_data[] __attribute__ ((__aligned__ (4))) =
-#else
-static const guint8 stock_rollup_data[] =
-#endif
-{ ""
- /* Pixbuf magic (0x47646b50) */
- "GdkP"
- /* length: header (24) + pixel_data (1024) */
- "\0\0\4\30"
- /* pixdata_type (0x1010002) */
- "\1\1\0\2"
- /* rowstride (64) */
- "\0\0\0@"
- /* width (16) */
- "\0\0\0\20"
- /* height (16) */
- "\0\0\0\20"
- /* pixel_data: */
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\342\342\336\0\342\342\336\0\342"
- "\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342"
- "\342\336\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342"
- "\336\0\342\342\336\0\342\342\336\0\342\342\336\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0"
- "\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\342\342\336\0\342"
- "\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342"
- "\342\336\0\342\342\336\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342"
- "\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
-
-
diff --git a/src/inline-stock-unmaximize.h b/src/inline-stock-unmaximize.h
deleted file mode 100644
index c6f3e66..0000000
--- a/src/inline-stock-unmaximize.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump */
-
-#ifdef __SUNPRO_C
-#pragma align 4 (stock_unmaximize_data)
-#endif
-#ifdef __GNUC__
-static const guint8 stock_unmaximize_data[] __attribute__ ((__aligned__ (4))) =
-#else
-static const guint8 stock_unmaximize_data[] =
-#endif
-{ ""
- /* Pixbuf magic (0x47646b50) */
- "GdkP"
- /* length: header (24) + pixel_data (1024) */
- "\0\0\4\30"
- /* pixdata_type (0x1010002) */
- "\1\1\0\2"
- /* rowstride (64) */
- "\0\0\0@"
- /* width (16) */
- "\0\0\0\20"
- /* height (16) */
- "\0\0\0\20"
- /* pixel_data: */
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
- "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\377"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0"
- "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
- "\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0"
- "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
- "\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
- "\0\0\0\0\0\0\0\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\342\342\336\0\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\342\342\336\0\342\342"
- "\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\0\0\0"
- "\377\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
- "\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0"
- "\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336\0\342\342\336"
- "\0\342\342\336\0\342\342\336\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
- "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
-
-
diff --git a/src/menu.c b/src/menu.c
index 5be596d..d75367f 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -37,39 +37,38 @@
#include "event_filter.h"
#include "menu.h"
#include "misc.h"
-#include "stock_icons.h"
static GtkWidget *menu_open = NULL;
static MenuItem menuitems[] = {
- {MENU_OP_MAXIMIZE, WM_STOCK_MAXIMIZE, N_("Ma_ximize")},
- {MENU_OP_UNMAXIMIZE, WM_STOCK_UNMAXIMIZE, N_("Unma_ximize")},
- {MENU_OP_MINIMIZE, WM_STOCK_MINIMIZE, N_("Mi_nimize")},
- {MENU_OP_MINIMIZE_ALL, NULL, N_("Minimize _All Other Windows")},
- {MENU_OP_UNMINIMIZE, NULL, N_("S_how")},
- {MENU_OP_MOVE, NULL, N_("_Move")},
- {MENU_OP_RESIZE, NULL, N_("_Resize")},
+ {MENU_OP_MAXIMIZE, "xfce-wm-maximize", N_("Ma_ximize")},
+ {MENU_OP_UNMAXIMIZE, "xfce-wm-unmaximize", N_("Unma_ximize")},
+ {MENU_OP_MINIMIZE, "xfce-wm-minimize", N_("Mi_nimize")},
+ {MENU_OP_MINIMIZE_ALL, NULL, N_("Minimize _All Other Windows")},
+ {MENU_OP_UNMINIMIZE, NULL, N_("S_how")},
+ {MENU_OP_MOVE, NULL, N_("_Move")},
+ {MENU_OP_RESIZE, NULL, N_("_Resize")},
{0, NULL, NULL}, /* -------------------------------------------------------- */
- {MENU_OP_ABOVE, NULL, N_("Always on Top")},
- {MENU_OP_NORMAL, NULL, N_("Same as Other Windows")},
- {MENU_OP_BELOW, NULL, N_("Always Below Other Windows")},
- {MENU_OP_SHADE, WM_STOCK_ROLLUP, N_("Roll Window Up")},
- {MENU_OP_UNSHADE, WM_STOCK_ROLLDOWN, N_("Roll Window Down")},
- {MENU_OP_FULLSCREEN, "gtk-fullscreen", N_("_Fullscreen")},
- {MENU_OP_UNFULLSCREEN, "gtk-fullscreen", N_("Leave _Fullscreen")},
- {MENU_OP_CONTEXT_HELP, "gtk-help", N_("Context _Help")},
+ {MENU_OP_ABOVE, NULL, N_("Always on Top")},
+ {MENU_OP_NORMAL, NULL, N_("Same as Other Windows")},
+ {MENU_OP_BELOW, NULL, N_("Always Below Other Windows")},
+ {MENU_OP_SHADE, "xfce-wm-shade", N_("Roll Window Up")},
+ {MENU_OP_UNSHADE, "xfce-wm-unshade", N_("Roll Window Down")},
+ {MENU_OP_FULLSCREEN, "gtk-fullscreen", N_("_Fullscreen")},
+ {MENU_OP_UNFULLSCREEN, "gtk-fullscreen", N_("Leave _Fullscreen")},
+ {MENU_OP_CONTEXT_HELP, "gtk-help", N_("Context _Help")},
{0, NULL, NULL}, /* -------------------------------------------------------- */
- {MENU_OP_STICK, NULL, N_("Always on Visible Workspace")},
- {MENU_OP_UNSTICK, NULL, N_("Only on This Workspace")},
- {MENU_OP_WORKSPACES, NULL, N_("Move to Another Workspace")},
+ {MENU_OP_STICK, "xfce-wm-stick", N_("Always on Visible Workspace")},
+ {MENU_OP_UNSTICK, "xfce-wm-unstick", N_("Only on This Workspace")},
+ {MENU_OP_WORKSPACES, NULL, N_("Move to Another Workspace")},
{0, NULL, NULL}, /* -------------------------------------------------------- */
- {MENU_OP_DELETE, "gtk-close", N_("_Close")},
+ {MENU_OP_DELETE, "xfce-wm-close", N_("_Close")},
#if 0
{0, NULL, NULL}, /* -------------------------------------------------------- */
- {MENU_OP_DESTROY, "gtk-delete", N_("Destroy")},
+ {MENU_OP_DESTROY, "gtk-delete", N_("Destroy")},
{0, NULL, NULL}, /* -------------------------------------------------------- */
#endif
- {MENU_OP_QUIT, "gtk-quit", N_("_Quit")},
- {MENU_OP_RESTART, "gtk-refresh", N_("Restart")},
+ {MENU_OP_QUIT, "gtk-quit", N_("_Quit")},
+ {MENU_OP_RESTART, "gtk-refresh", N_("Restart")},
};
static eventFilterStatus
@@ -258,7 +257,7 @@ menu_default (GdkScreen *gscr, Window xid, MenuOp ops, MenuOp insensitive, MenuF
{
menuitem = gtk_image_menu_item_new_with_mnemonic (label);
image =
- gtk_image_new_from_stock (menuitems[i].image_name,
+ gtk_image_new_from_icon_name (menuitems[i].image_name,
GTK_ICON_SIZE_MENU);
gtk_widget_show (image);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
diff --git a/src/stock_icons.c b/src/stock_icons.c
deleted file mode 100644
index 6d9619b..0000000
--- a/src/stock_icons.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* $Id$
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-
- metacity - Copyright (C) 2002 Havoc Pennington
- stock icon code Copyright (C) 2002 Jorn Baayen <jorn at nl.linux.org>
- xfwm4 - (c) 2002-2011 Olivier Fourdan
-
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gtk/gtk.h>
-#include "stock_icons.h"
-
-/*
- * Taken from metacity
- * stock icon code Copyright (C) 2002 Jorn Baayen <jorn at nl.linux.org>
- */
-
-typedef struct
-{
- char *stock_id;
- const guint8 *icon_data;
-} StockIcon;
-
-
-void
-initWMStockIcons (void)
-{
- GtkIconFactory *factory;
- GtkIconSet *icon_set;
- GdkPixbuf *pixbuf;
- gint i;
-
- StockIcon items[] =
- {
- { WM_STOCK_MAXIMIZE, stock_maximize_data },
- { WM_STOCK_UNMAXIMIZE, stock_unmaximize_data },
- { WM_STOCK_MINIMIZE, stock_minimize_data },
- { WM_STOCK_ROLLUP, stock_rollup_data },
- { WM_STOCK_ROLLDOWN, stock_rolldown_data }
- };
-
- factory = gtk_icon_factory_new ();
- gtk_icon_factory_add_default (factory);
-
- for (i = 0; i < (gint) G_N_ELEMENTS (items); i++)
- {
- pixbuf = gdk_pixbuf_new_from_inline (-1, items[i].icon_data, FALSE, NULL);
-
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
- gtk_icon_set_unref (icon_set);
-
- g_object_unref (G_OBJECT (pixbuf));
- }
- g_object_unref (G_OBJECT (factory));
-}
diff --git a/src/stock_icons.h b/src/stock_icons.h
deleted file mode 100644
index e5a3ad1..0000000
--- a/src/stock_icons.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $Id$
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-
- metacity - Copyright (C) 2002 Havoc Pennington
- stock icon code Copyright (C) 2002 Jorn Baayen <jorn at nl.linux.org>
- xfwm4 - (c) 2002-2011 Olivier Fourdan
-
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gtk/gtk.h>
-
-/* icons */
-#include "inline-stock-maximize.h"
-#include "inline-stock-unmaximize.h"
-#include "inline-stock-rollup.h"
-#include "inline-stock-rolldown.h"
-#include "inline-stock-minimize.h"
-
-#ifndef INC_STOCK_ICONS_H
-#define INC_STOCK_ICONS_H
-
-#define WM_STOCK_MAXIMIZE "wm-maximize"
-#define WM_STOCK_UNMAXIMIZE "wm-unmaximize"
-#define WM_STOCK_MINIMIZE "wm-minimize"
-#define WM_STOCK_ROLLUP "wm-rollup"
-#define WM_STOCK_ROLLDOWN "wm-rolldown"
-
-void initWMStockIcons (void);
-
-#endif /* INC_STOCK_ICONS_H */
diff --git a/src/stock_maximize.png b/src/stock_maximize.png
deleted file mode 100644
index 1e64190..0000000
Binary files a/src/stock_maximize.png and /dev/null differ
diff --git a/src/stock_minimize.png b/src/stock_minimize.png
deleted file mode 100644
index a7c73a8..0000000
Binary files a/src/stock_minimize.png and /dev/null differ
diff --git a/src/stock_rolldown.png b/src/stock_rolldown.png
deleted file mode 100644
index 220cc38..0000000
Binary files a/src/stock_rolldown.png and /dev/null differ
diff --git a/src/stock_rollup.png b/src/stock_rollup.png
deleted file mode 100644
index 26f3ded..0000000
Binary files a/src/stock_rollup.png and /dev/null differ
diff --git a/src/stock_unmaximize.png b/src/stock_unmaximize.png
deleted file mode 100644
index fb1cc71..0000000
Binary files a/src/stock_unmaximize.png and /dev/null differ
More information about the Xfce4-commits
mailing list