[Xfce4-commits] <xfce4-embed-plugin:master> Now using stock icons for everything (plugin and menus)
David Schneider
noreply at xfce.org
Sun Jan 1 23:16:01 CET 2012
Updating branch refs/heads/master
to 3fcd604f6b3229857b01df364e1eb0efffcac6f9 (commit)
from 17b7aa3a4e2ce8ffd6fd52f695c1d52bd42e3c31 (commit)
commit 3fcd604f6b3229857b01df364e1eb0efffcac6f9
Author: David Schneider <dnschneid at gmail.com>
Date: Sun Jan 1 17:11:31 2012 -0500
Now using stock icons for everything (plugin and menus)
Makefile.am | 1 -
configure.ac.in | 2 -
icons/Makefile.am | 19 ---
icons/scalable/Makefile.am | 10 --
icons/scalable/xfce4-embed-plugin.svg | 246 ---------------------------------
panel-plugin/embed.c | 6 +
panel-plugin/embed.desktop.in.in | 3 +-
7 files changed, 7 insertions(+), 280 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ff8c1f7..5b84bff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
SUBDIRS = \
- icons \
panel-plugin \
po
diff --git a/configure.ac.in b/configure.ac.in
index a8ecbff..91342ef 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -96,8 +96,6 @@ AC_SUBST([PLATFORM_LDFLAGS])
AC_OUTPUT([
Makefile
-icons/Makefile
-icons/scalable/Makefile
panel-plugin/Makefile
po/Makefile.in
])
diff --git a/icons/Makefile.am b/icons/Makefile.am
deleted file mode 100644
index 725f229..0000000
--- a/icons/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id$
-
-SUBDIRS = \
- scalable
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
- @-if test -z "$(DESTDIR)"; then \
- echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache); \
- else \
- echo "*** Icon cache not updated. Remember to run:"; \
- echo "***"; \
- echo "*** $(gtk_update_icon_cache)"; \
- echo "***"; \
- fi
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
deleted file mode 100644
index 5c911ee..0000000
--- a/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-# $Id$
-
-iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA = \
- xfce4-embed-plugin.svg
-
-EXTRA_DIST = \
- $(icons_DATA)
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/scalable/xfce4-embed-plugin.svg b/icons/scalable/xfce4-embed-plugin.svg
deleted file mode 100644
index 2b467a3..0000000
--- a/icons/scalable/xfce4-embed-plugin.svg
+++ /dev/null
@@ -1,246 +0,0 @@
-<?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="48px"
- height="48px"
- id="svg4062"
- version="1.1"
- inkscape:version="0.48.0 r9654"
- sodipodi:docname="help-contents.svg">
- <defs
- id="defs4064">
- <linearGradient
- inkscape:collect="always"
- id="linearGradient4661">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4663" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop4665" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3707-319-631-407-324"
- id="linearGradient4023"
- gradientUnits="userSpaceOnUse"
- x1="24.132597"
- y1="44.47514"
- x2="32"
- y2="26"
- gradientTransform="translate(0,-0.9999998)" />
- <linearGradient
- id="linearGradient3707-319-631-407-324">
- <stop
- offset="0"
- style="stop-color:#185f9a;stop-opacity:1;"
- id="stop3760" />
- <stop
- offset="1"
- style="stop-color:#599ec9;stop-opacity:1;"
- id="stop3762" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4011"
- id="linearGradient3906-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-47.733515,-0.3572397)"
- x1="71.204407"
- y1="6.2375584"
- x2="71.204407"
- y2="44.340794" />
- <linearGradient
- id="linearGradient4011">
- <stop
- offset="0"
- style="stop-color:#ffffff;stop-opacity:1;"
- id="stop4013" />
- <stop
- id="stop4015"
- style="stop-color:#ffffff;stop-opacity:0.23529412;"
- offset="0.507761" />
- <stop
- offset="0.83456558"
- style="stop-color:#ffffff;stop-opacity:0.15686275;"
- id="stop4017" />
- <stop
- offset="1"
- style="stop-color:#ffffff;stop-opacity:0.39215687;"
- id="stop4019" />
- </linearGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8"
- id="radialGradient3909-0"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,2.3767198,-2.5142859,-6.4690655e-8,45.245242,-9.4123727)"
- cx="3.9722471"
- cy="8.4497671"
- fx="3.9722471"
- fy="8.4497671"
- r="19.99999" />
- <linearGradient
- id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8">
- <stop
- offset="0"
- style="stop-color:#90dbec;stop-opacity:1;"
- id="stop3750-8-9" />
- <stop
- offset="0.26238"
- style="stop-color:#42baea;stop-opacity:1;"
- id="stop3752-3-2" />
- <stop
- offset="0.704952"
- style="stop-color:#3689e6;stop-opacity:1;"
- id="stop3754-7-2" />
- <stop
- offset="1"
- style="stop-color:#2b63a0;stop-opacity:1;"
- id="stop3756-9-3" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3707-319-631-407-324-3-8"
- id="linearGradient3911-1"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(2.39e-6,1.0000002)"
- x1="24"
- y1="44"
- x2="24"
- y2="3.8990016" />
- <linearGradient
- id="linearGradient3707-319-631-407-324-3-8">
- <stop
- offset="0"
- style="stop-color:#185f9a;stop-opacity:1;"
- id="stop3760-7-3" />
- <stop
- offset="1"
- style="stop-color:#599ec9;stop-opacity:1;"
- id="stop3762-8-4" />
- </linearGradient>
- <linearGradient
- id="linearGradient8838">
- <stop
- id="stop8840"
- style="stop-color:#000000;stop-opacity:1"
- offset="0" />
- <stop
- id="stop8842"
- style="stop-color:#000000;stop-opacity:0"
- offset="1" />
- </linearGradient>
- <radialGradient
- r="10.625"
- fy="4.625"
- fx="62.625"
- cy="4.625"
- cx="62.625"
- gradientTransform="matrix(2.1647059,0,0,0.7529402,-111.56471,36.517647)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient4060"
- xlink:href="#linearGradient8838"
- inkscape:collect="always" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4661"
- id="linearGradient4674"
- gradientUnits="userSpaceOnUse"
- x1="24.693371"
- y1="12.651934"
- x2="24.693371"
- y2="31.394552" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4661"
- id="linearGradient4680"
- gradientUnits="userSpaceOnUse"
- x1="24.693371"
- y1="34.39452"
- x2="24.693371"
- y2="39.173557" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.65625"
- inkscape:cx="-2.8975727"
- inkscape:cy="24"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:document-units="px"
- inkscape:window-width="1280"
- inkscape:window-height="753"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata4067">
- <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 />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- inkscape:connector-curvature="0"
- style="opacity:0.3;fill:url(#radialGradient4060);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible"
- id="path8836"
- d="m 46.999997,40 c 0,4.418278 -10.297452,8 -23,8 -12.702548,0 -23.0000002,-3.581722 -23.0000002,-8 0,-4.418278 10.2974522,-8 23.0000002,-8 12.702548,0 23,3.581722 23,8 l 0,0 z" />
- <path
- inkscape:connector-curvature="0"
- style="color:#000000;fill:url(#radialGradient3909-0);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3911-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="path2555"
- d="M 24.000002,5.501809 C 13.241573,5.501809 4.5018088,14.24157 4.5018088,25 c 0,10.75843 8.7397642,19.498195 19.4981932,19.498192 10.758425,0 19.498199,-8.739762 19.498189,-19.498192 0,-10.75843 -8.739764,-19.498191 -19.498189,-19.498191 z" />
- <path
- inkscape:connector-curvature="0"
- style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3906-0);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="path8655"
- d="M 42.500002,24.999344 C 42.500002,35.216942 34.21666,43.5 24.000235,43.5 13.782875,43.5 5.5000003,35.216848 5.5000003,24.999344 c 0,-10.217125 8.2828747,-18.4993437 18.5002347,-18.4993437 10.216425,0 18.499767,8.2822187 18.499767,18.4993437 l 0,0 z" />
- <path
- inkscape:connector-curvature="0"
- style="font-size:72px;font-style:normal;font-weight:bold;fill:url(#linearGradient4023);fill-opacity:1;stroke:none;font-family:Standard Symbols L"
- id="path3298-9"
- d="m 24.910438,30.163548 c -0.06608,-2.358762 0.462374,-4.648617 2.690869,-6.270608 2.35386,-1.834368 4.620815,-4.129412 4.381246,-6.83475 -0.05231,-2.609055 -3.092241,-4.653533 -6.367546,-4.947493 -3.684186,-0.510386 -8.142028,0.751736 -9.376574,3.628942 -0.626134,1.399375 -0.0455,3.910017 2.055795,3.910017 1.229052,0 1.793562,-0.793934 1.886302,-1.520198 0.07017,-0.549514 -0.155434,-1.040224 -0.288666,-1.494127 -0.15181,-0.517192 0.496254,-1.519566 1.202084,-1.927971 0.589802,-0.341274 1.206886,-0.455708 1.297847,-0.477569 2.118145,-0.509045 4.22963,0.615366 5.110579,1.983913 0.88095,1.368546 -0.08871,3.444365 -1.482855,5.463019 -1.394147,2.018654 -2.890315,4.311433 -2.884338,6.74674 0,0.927123 -0.08261,1.242088 -0.02391,1.617179 0.04689,0.299687 1.039226,0.263471 1.799169,0.122906 z m -0.966655,3.174767 c -2.025281,-0.109945 -3.427057,2.185998 -2.210368,3.648826 1.086561,1.615107 4.133026,1.216405 4.655189,-0.612542 0.542861,-1.422241 -0.763542,-3.060025 -2.44482,-
3.036285 l -1e-6,1e-6 z" />
- <path
- inkscape:connector-curvature="0"
- style="font-size:72px;font-style:normal;font-weight:bold;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Standard Symbols L"
- id="path3298"
- d="m 24.910438,31.163548 c -0.06608,-2.358762 0.462374,-4.648617 2.690869,-6.270608 2.35386,-1.834368 4.620815,-4.129412 4.381246,-6.83475 -0.05231,-2.609055 -3.092241,-4.653533 -6.367546,-4.947493 -3.684186,-0.510386 -8.142028,0.751736 -9.376574,3.628942 -0.626134,1.399375 -0.0455,3.910017 2.055795,3.910017 1.229052,0 1.793562,-0.793934 1.886302,-1.520198 0.07017,-0.549514 -0.155434,-1.040224 -0.288666,-1.494127 -0.15181,-0.517192 0.496254,-1.519566 1.202084,-1.927971 0.589802,-0.341274 1.206886,-0.455708 1.297847,-0.477569 2.118145,-0.509045 4.22963,0.615366 5.110579,1.983913 0.88095,1.368546 -0.08871,3.444365 -1.482855,5.463019 -1.394147,2.018654 -2.890315,4.311433 -2.884338,6.74674 0,0.927123 -0.08261,1.242088 -0.02391,1.617179 0.04689,0.299687 1.039226,0.263471 1.799169,0.122906 z m -0.966655,3.174767 c -2.025281,-0.109945 -3.427057,2.185998 -2.210368,3.648826 1.086561,1.615107 4.133026,1.216405 4.655189,-0.612542 0.542861,-1.422241 -0.763542,-3.060025 -2.44482,-
3.036285 l -1e-6,1e-6 z" />
- <path
- style="font-size:72px;font-style:normal;font-weight:bold;opacity:0.1;fill:none;stroke:url(#linearGradient4674);stroke-opacity:1;font-family:Standard Symbols L"
- d="m 28.084949,17.265953 c 0.722661,1.77837 -0.323726,3.640969 -1.258202,5.121879 -1.519961,2.265502 -3.357779,4.683667 -3.204209,7.561658 -0.159759,0.678163 0.124554,0.99522 0.814962,0.73801 m 7.010682,-11.701326 c 0.24956,-1.456424 -0.42773,-2.943381 -1.629158,-3.784911 -1.962257,-1.507859 -4.579929,-1.802656 -6.975274,-1.638763 -2.237263,0.241487 -4.703571,1.019245 -5.952518,3.027858 -0.647987,1.107638 -0.479037,2.938903 0.824248,3.483653"
- id="path4678"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccc" />
- <path
- style="font-size:72px;font-style:normal;font-weight:bold;opacity:0.10000000000000001;fill:none;stroke:url(#linearGradient4680);stroke-opacity:1;font-family:Standard Symbols L"
- d="m 23.90625,34.84375 c -1.359453,-0.146609 -2.729136,1.497041 -1.893858,2.737463 0.831041,1.324461 3.172901,1.189046 3.85165,-0.207148 0.540707,-1.263634 -0.667681,-2.600614 -1.957792,-2.530315 z"
- id="path4669" />
- </g>
-</svg>
diff --git a/panel-plugin/embed.c b/panel-plugin/embed.c
index 506f2c8..2ace30e 100644
--- a/panel-plugin/embed.c
+++ b/panel-plugin/embed.c
@@ -235,13 +235,19 @@ embed_new (XfcePanelPlugin *plugin)
/* pop out menu item, not shown by default */
embed->popout_menu = gtk_image_menu_item_new_with_mnemonic (_("Pop _Out"));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (embed->popout_menu),
+ gtk_image_new_from_stock (GTK_STOCK_FULLSCREEN, GTK_ICON_SIZE_MENU));
/* embed menu item, shown by default. */
embed->embed_menu = gtk_image_menu_item_new_with_mnemonic (_("_Embed"));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (embed->embed_menu),
+ gtk_image_new_from_stock (GTK_STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_MENU));
gtk_widget_show (embed->embed_menu);
/* focus menu item, not shown by default */
embed->focus_menu = gtk_image_menu_item_new_with_mnemonic (_("_Focus"));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (embed->focus_menu),
+ gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU));
return embed;
}
diff --git a/panel-plugin/embed.desktop.in.in b/panel-plugin/embed.desktop.in.in
index b656af4..ad48bd7 100644
--- a/panel-plugin/embed.desktop.in.in
+++ b/panel-plugin/embed.desktop.in.in
@@ -3,6 +3,5 @@ Type=X-XFCE-PanelPlugin
Encoding=UTF-8
_Name=Embed Plugin
_Comment=Embeds an arbitrary window into the panel
-Icon=xfce4-embed-plugin
+Icon=xfce4-panel
X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-embed-plugin
-#X-XFCE-Unique=true
More information about the Xfce4-commits
mailing list