[Xfce4-commits] <terminal:master> Use standard stock icons.
Nick Schermer
noreply at xfce.org
Mon Dec 17 18:42:01 CET 2012
Updating branch refs/heads/master
to eb2cc6adbcccbb607de409abf5c915200217bc54 (commit)
from 73d40638921a30e70b46fc4653bc643e0a65485c (commit)
commit eb2cc6adbcccbb607de409abf5c915200217bc54
Author: Nick Schermer <nick at xfce.org>
Date: Mon Dec 17 18:35:52 2012 +0100
Use standard stock icons.
Except for the bug report icon, all other icons are part of
most of the themes, so drop those and use the common
icon names.
Makefile.am | 1 -
Terminal-default-apps.xml.in.in | 2 +-
configure.ac.in | 5 -
icons/16x16/Makefile.am | 11 -
icons/16x16/stock_terminal-closetab.png | Bin 665 -> 0 bytes
icons/16x16/stock_terminal-closewindow.png | Bin 686 -> 0 bytes
icons/16x16/stock_terminal-newtab.png | Bin 611 -> 0 bytes
icons/16x16/stock_terminal-newwindow.png | Bin 694 -> 0 bytes
icons/16x16/stock_terminal-reportbug.png | Bin 775 -> 0 bytes
icons/24x24/Makefile.am | 13 --
icons/24x24/stock_terminal-closetab.png | Bin 935 -> 0 bytes
icons/24x24/stock_terminal-newtab.png | Bin 859 -> 0 bytes
icons/24x24/stock_terminal-newwindow.png | Bin 1036 -> 0 bytes
icons/24x24/stock_terminal-reportbug.png | Bin 1222 -> 0 bytes
icons/24x24/stock_terminal-showborders.png | Bin 745 -> 0 bytes
icons/24x24/stock_terminal-showmenu.png | Bin 402 -> 0 bytes
icons/48x48/Makefile.am | 12 --
icons/48x48/Terminal.png | Bin 1209 -> 0 bytes
icons/48x48/stock_terminal-compose.png | Bin 3278 -> 0 bytes
icons/Makefile.am | 27 ---
icons/scalable/Makefile.am | 8 -
icons/scalable/Terminal.svg | 298 ----------------------------
icons/terminal.xpm | 93 ---------
terminal/Makefile.am | 2 -
terminal/main.c | 7 +-
terminal/terminal-preferences-dialog.c | 1 -
terminal/terminal-shortcut-editor.c | 3 +-
terminal/terminal-stock.c | 121 -----------
terminal/terminal-stock.h | 38 ----
terminal/terminal-window.c | 15 +-
30 files changed, 10 insertions(+), 647 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9f6240a..cd6a7b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
SUBDIRS = \
doc \
- icons \
po \
terminal
diff --git a/Terminal-default-apps.xml.in.in b/Terminal-default-apps.xml.in.in
index 7fb4386..6306b8d 100644
--- a/Terminal-default-apps.xml.in.in
+++ b/Terminal-default-apps.xml.in.in
@@ -6,7 +6,7 @@
<_name>Xfce Terminal Emulator</_name>
<executable>@PACKAGE_EXEC@</executable>
<command>@PACKAGE_EXEC@</command>
- <icon-name>Terminal</icon-name>
+ <icon-name>utilities-terminal</icon-name>
<exec-flag>-x</exec-flag>
</terminal>
</terminals>
diff --git a/configure.ac.in b/configure.ac.in
index 6ad89a3..5e7ebc9 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -178,11 +178,6 @@ AC_OUTPUT([
Makefile
doc/Makefile
doc/po/Makefile
-icons/Makefile
-icons/16x16/Makefile
-icons/24x24/Makefile
-icons/48x48/Makefile
-icons/scalable/Makefile
po/Makefile.in
terminal/Makefile
terminal/terminal-config.h
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
deleted file mode 100644
index 5351c54..0000000
--- a/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-iconsdir = $(datadir)/icons/hicolor/16x16/stock/navigation
-icons_DATA = \
- stock_terminal-closetab.png \
- stock_terminal-newtab.png \
- stock_terminal-newwindow.png \
- stock_terminal-reportbug.png
-
-EXTRA_DIST = \
- $(icons_DATA)
-
-# vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/icons/16x16/stock_terminal-closetab.png b/icons/16x16/stock_terminal-closetab.png
deleted file mode 100644
index a7d2263..0000000
Binary files a/icons/16x16/stock_terminal-closetab.png and /dev/null differ
diff --git a/icons/16x16/stock_terminal-closewindow.png b/icons/16x16/stock_terminal-closewindow.png
deleted file mode 100644
index 4f887cf..0000000
Binary files a/icons/16x16/stock_terminal-closewindow.png and /dev/null differ
diff --git a/icons/16x16/stock_terminal-newtab.png b/icons/16x16/stock_terminal-newtab.png
deleted file mode 100644
index 935e49d..0000000
Binary files a/icons/16x16/stock_terminal-newtab.png and /dev/null differ
diff --git a/icons/16x16/stock_terminal-newwindow.png b/icons/16x16/stock_terminal-newwindow.png
deleted file mode 100644
index 8a83687..0000000
Binary files a/icons/16x16/stock_terminal-newwindow.png and /dev/null differ
diff --git a/icons/16x16/stock_terminal-reportbug.png b/icons/16x16/stock_terminal-reportbug.png
deleted file mode 100644
index b12d4cb..0000000
Binary files a/icons/16x16/stock_terminal-reportbug.png and /dev/null differ
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
deleted file mode 100644
index 80f2345..0000000
--- a/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-iconsdir = $(datadir)/icons/hicolor/24x24/stock/navigation
-icons_DATA = \
- stock_terminal-closetab.png \
- stock_terminal-newtab.png \
- stock_terminal-newwindow.png \
- stock_terminal-reportbug.png \
- stock_terminal-showborders.png \
- stock_terminal-showmenu.png
-
-EXTRA_DIST = \
- $(icons_DATA)
-
-# vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/icons/24x24/stock_terminal-closetab.png b/icons/24x24/stock_terminal-closetab.png
deleted file mode 100644
index 90464b0..0000000
Binary files a/icons/24x24/stock_terminal-closetab.png and /dev/null differ
diff --git a/icons/24x24/stock_terminal-newtab.png b/icons/24x24/stock_terminal-newtab.png
deleted file mode 100644
index 3cb807b..0000000
Binary files a/icons/24x24/stock_terminal-newtab.png and /dev/null differ
diff --git a/icons/24x24/stock_terminal-newwindow.png b/icons/24x24/stock_terminal-newwindow.png
deleted file mode 100644
index 3ba7d84..0000000
Binary files a/icons/24x24/stock_terminal-newwindow.png and /dev/null differ
diff --git a/icons/24x24/stock_terminal-reportbug.png b/icons/24x24/stock_terminal-reportbug.png
deleted file mode 100644
index 6f8bc50..0000000
Binary files a/icons/24x24/stock_terminal-reportbug.png and /dev/null differ
diff --git a/icons/24x24/stock_terminal-showborders.png b/icons/24x24/stock_terminal-showborders.png
deleted file mode 100644
index e626e66..0000000
Binary files a/icons/24x24/stock_terminal-showborders.png and /dev/null differ
diff --git a/icons/24x24/stock_terminal-showmenu.png b/icons/24x24/stock_terminal-showmenu.png
deleted file mode 100644
index 14653f8..0000000
Binary files a/icons/24x24/stock_terminal-showmenu.png and /dev/null differ
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
deleted file mode 100644
index 5896459..0000000
--- a/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-appsdir = $(datadir)/icons/hicolor/48x48/apps
-apps_DATA = \
- Terminal.png
-
-stockdir = $(datadir)/icons/hicolor/48x48/stock/navigation
-stock_DATA = stock_terminal-compose.png
-
-EXTRA_DIST = \
- $(apps_DATA) \
- $(stock_DATA)
-
-# vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/icons/48x48/Terminal.png b/icons/48x48/Terminal.png
deleted file mode 100644
index 5f67851..0000000
Binary files a/icons/48x48/Terminal.png and /dev/null differ
diff --git a/icons/48x48/stock_terminal-compose.png b/icons/48x48/stock_terminal-compose.png
deleted file mode 100644
index 60dbee4..0000000
Binary files a/icons/48x48/stock_terminal-compose.png and /dev/null differ
diff --git a/icons/Makefile.am b/icons/Makefile.am
deleted file mode 100644
index 890cf43..0000000
--- a/icons/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-SUBDIRS = \
- 16x16 \
- 24x24 \
- 48x48 \
- scalable
-
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = \
- terminal.xpm
-
-EXTRA_DIST = \
- $(pixmap_DATA)
-
-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:
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
deleted file mode 100644
index 1c8040e..0000000
--- a/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA = \
- Terminal.svg
-
-EXTRA_DIST = \
- $(icons_DATA)
-
-# vi:set ts=8 sw=8 noet ai nocindent:
diff --git a/icons/scalable/Terminal.svg b/icons/scalable/Terminal.svg
deleted file mode 100644
index 94cb47e..0000000
--- a/icons/scalable/Terminal.svg
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- id="svg1"
- sodipodi:version="0.32"
- inkscape:version="0.39"
- width="128.00000pt"
- height="128.00000pt"
- sodipodi:docbase="/home/francois/Documents/work/XFce4/themes"
- sodipodi:docname="xfce-terminal.svg"
- inkscape:export-filename="/home/francois/new_xfce-terminal.png"
- inkscape:export-xdpi="27.000000"
- inkscape:export-ydpi="27.000000"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient877">
- <stop
- style="stop-color:#ffffff;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop878" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.91372550;"
- offset="0.12375000"
- id="stop879" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.87058824;"
- offset="0.18562500"
- id="stop880" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.85098040;"
- offset="0.21656251"
- id="stop881" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.83137256;"
- offset="0.24750000"
- id="stop882" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.74901962;"
- offset="0.37125000"
- id="stop883" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.70588237;"
- offset="0.43312502"
- id="stop884" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.68627453;"
- offset="0.46406251"
- id="stop885" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.67450982;"
- offset="0.47953126"
- id="stop886" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.67058825;"
- offset="0.48500001"
- id="stop887" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.66666669;"
- offset="0.49500000"
- id="stop888" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.33333334;"
- offset="0.78928030"
- id="stop889" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.16470589;"
- offset="0.82118571"
- id="stop890" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.082352944;"
- offset="0.88642740"
- id="stop891" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.039215688;"
- offset="0.98000002"
- id="stop892" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.019607844;"
- offset="0.99000001"
- id="stop893" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0078431377;"
- offset="0.99000001"
- id="stop894" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0039215689;"
- offset="0.99000001"
- id="stop895" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0000000;"
- offset="0.99000001"
- id="stop896" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0000000;"
- offset="0.98000002"
- id="stop897" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0000000;"
- offset="0.99000001"
- id="stop900" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop901" />
- </linearGradient>
- <linearGradient
- id="linearGradient926">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.52195120;"
- offset="0.0000000"
- id="stop927" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.39512196;"
- offset="0.98000002"
- id="stop858" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.14146341;"
- offset="0.99000001"
- id="stop860" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop929" />
- </linearGradient>
- <linearGradient
- id="linearGradient903">
- <stop
- style="stop-color:#bdbbbb;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop904" />
- <stop
- style="stop-color:#dedddd;stop-opacity:1.0000000;"
- offset="0.50000000"
- id="stop907" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1.0000000;"
- offset="1.0000000"
- id="stop906" />
- </linearGradient>
- <linearGradient
- id="linearGradient897">
- <stop
- style="stop-color:#757373;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop898" />
- <stop
- style="stop-color:#e5e6e6;stop-opacity:1.0000000;"
- offset="0.49257576"
- id="stop902" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop899" />
- </linearGradient>
- <linearGradient
- xlink:href="#linearGradient926"
- id="linearGradient900"
- x1="0.42424244"
- y1="0.031250000"
- x2="0.012121212"
- y2="0.99218750" />
- <linearGradient
- xlink:href="#linearGradient926"
- id="linearGradient873"
- x1="0.46760562"
- y1="0.039062500"
- x2="0.46760562"
- y2="0.75781250" />
- <linearGradient
- xlink:href="#linearGradient897"
- id="linearGradient876"
- x1="0.54037267"
- y1="0.96093750"
- x2="0.38509318"
- y2="0.60156250" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.9531250"
- inkscape:cx="64.000000"
- inkscape:cy="64.000000"
- inkscape:window-width="920"
- inkscape:window-height="901"
- showgrid="true"
- gridspacingx="1.0000000mm"
- gridspacingy="1.0000000mm"
- snaptogrid="false"
- horizgrid="true"
- vertgrid="true"
- gridtolerance="5.0000000px"
- showguides="true"
- snaptoguides="true"
- inkscape:window-x="182"
- inkscape:window-y="40">
- <sodipodi:guide
- orientation="horizontal"
- position="104.98688"
- id="guide911" />
- <sodipodi:guide
- orientation="vertical"
- position="59.632546"
- id="guide912" />
- <sodipodi:guide
- orientation="vertical"
- position="104.98688"
- id="guide913" />
- <sodipodi:guide
- orientation="horizontal"
- position="48.377953"
- id="guide914" />
- </sodipodi:namedview>
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:9.9458075;stroke-linecap:round;stroke-linejoin:round;"
- d="M 28.968321,74.136978 C 36.004265,66.908607 39.522237,70.522794 43.040209,74.136978 C 46.558181,77.751166 50.076153,81.365350 57.112097,74.136978"
- id="path908"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:9.9458075;stroke-linecap:round;"
- d="M 102.17703,39.531034 L 102.17703,116.92736"
- id="path910"
- sodipodi:nodetypes="cc" />
- <path
- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:9.9458075;stroke-linecap:round;"
- d="M 124.73529,58.880115 C 124.85465,58.880115 124.73529,45.980727 102.17703,45.980727 C 86.063996,45.980727 79.499426,52.430420 79.618783,62.104962 C 79.618783,71.779502 89.286604,75.004349 102.17703,75.004349 C 118.29008,75.004349 128.07725,81.454042 127.95789,94.353432 C 127.95789,104.02796 119.99536,110.55922 102.17703,110.47767 C 86.063996,110.47767 76.396176,100.80311 76.515532,91.128583"
- id="path916"
- sodipodi:nodetypes="ccccccc" />
- <rect
- style="fill-rule:evenodd;stroke:none;stroke-width:3.7943192;fill:#000000;fill-opacity:0.38235295;"
- id="rect917"
- width="149.67355"
- height="120.01327"
- x="8.9616179"
- y="24.369932"
- ry="0.88898715" />
- <rect
- style="fill-rule:evenodd;stroke:#000000;stroke-width:3.9160004;"
- id="rect894"
- width="149.67355"
- height="120.01327"
- x="3.3792825"
- y="18.151813"
- ry="0.88898715" />
- <rect
- style="fill-rule:evenodd;stroke:none;stroke-width:0.96349487pt;fill:#ffffff;fill-opacity:1.0000000;"
- id="rect895"
- width="142.38805"
- height="112.51243"
- x="7.0142145"
- y="21.902227"
- ry="0.83342543" />
- <rect
- style="fill:#363636;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.2250000;stroke-linejoin:round;stroke-opacity:1.0000000;"
- id="rect896"
- width="137.30406"
- height="98.768517"
- x="9.4802208"
- y="32.911888"
- ry="0.0000000" />
- <metadata
- id="metadata74">
- <rdf:RDF
- id="RDF75">
- <cc:Work
- rdf:about=""
- id="Work76">
- <dc:format
- id="format77">image/svg+xml</dc:format>
- <dc:type
- id="type79"
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <path
- style="font-size:40.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Trek;text-anchor:start;writing-mode:lr;"
- d="M 54.243290,88.278409 L 41.693720,88.278409 C 36.290418,88.278455 31.671484,86.884057 27.836904,84.095219 C 22.607917,80.434981 19.993423,74.683101 19.993423,66.839562 C 19.993423,59.344753 22.607917,53.636447 27.836904,49.714628 C 31.845786,46.751623 36.464717,45.270078 41.693720,45.269989 L 54.243290,45.269989 L 54.243290,38.733755 L 59.603001,38.733755 L 59.603001,45.269989 L 89.669680,45.269989 L 89.669680,57.950283 L 59.603001,57.950283 L 59.603001,75.728840 L 72.152570,75.728840 C 77.294350,75.728895 81.913290,77.166867 86.009390,80.042754 C 91.238310,83.964544 93.852800,89.759997 93.852870,97.429137 C 93.852800,104.66260 91.238310,110.45805 86.009390,114.81552 C 82.000440,117.77863 77.381500,119.26017 72.152570,119.26016 L 59.603001,119.26016 L 59.603001,125.79639 L 54.243290,125.79639 L 54.243290,119.26016 L 23.130816,119.26016 L 23.130816,106.57986 L 54.243290,106.57986 L 54.243290,88.278409 M 59.603001,106.57986 L 64.831989,106.57986 C 67.707886,106.57989 7
0.017350,105.70839 71.760400,103.96537 C 73.590490,102.22241 74.505560,100.04366 74.505610,97.429137 C 74.505560,95.076132 73.546920,92.984537 71.629670,91.154352 C 69.799477,89.237101 67.446436,88.278455 64.570539,88.278409 L 59.603001,88.278409 L 59.603001,106.57986 M 54.243290,57.950283 L 48.752853,57.950283 C 46.312635,57.950358 44.046742,58.734707 41.955170,60.303328 C 39.950706,61.784945 38.948486,63.963687 38.948502,66.839562 C 38.948486,69.628419 40.037857,71.937886 42.216619,73.767970 C 43.785292,75.075275 46.051186,75.728895 49.014302,75.728840 L 54.243290,75.728840 L 54.243290,57.950283"
- id="text978" />
- <path
- style="fill:url(#linearGradient900);fill-opacity:0.32352939;fill-rule:evenodd;stroke:none;stroke-width:1.0000000pt;"
- d="M 12.282817,36.390407 L 12.282817,129.06891 C 63.406396,82.790874 88.968183,66.263006 143.74347,36.512840 L 12.282817,36.390407 z "
- id="path925"
- sodipodi:nodetypes="cccc" />
-</svg>
diff --git a/icons/terminal.xpm b/icons/terminal.xpm
deleted file mode 100644
index b5011ec..0000000
--- a/icons/terminal.xpm
+++ /dev/null
@@ -1,93 +0,0 @@
-/* XPM */
-static char * terminal_xpm[] = {
-"45 37 53 1",
-" c None",
-". c #000000",
-"+ c #5D5D5D",
-"@ c #707070",
-"# c #6E6E6E",
-"$ c #525252",
-"% c #E8E8E8",
-"& c #FFFFFF",
-"* c #D1D1D1",
-"= c #FBFBFB",
-"- c #8F8F8F",
-"; c #B5B5B5",
-"> c #B0B0B0",
-", c #818181",
-"' c #E7E7E7",
-") c #BFBFBF",
-"! c #A6A6A6",
-"~ c #363636",
-"{ c #F7F7F7",
-"] c #BCBCBC",
-"^ c #D6D6D6",
-"/ c #424242",
-"( c #383838",
-"_ c #CDCDCD",
-": c #EBEBEB",
-"< c #A7A7A7",
-"[ c #ACACAC",
-"} c #F3F3F3",
-"| c #9F9F9F",
-"1 c #959595",
-"2 c #E3E3E3",
-"3 c #7A7A7A",
-"4 c #8A8A8A",
-"5 c #D7D7D7",
-"6 c #DEDEDE",
-"7 c #C3C3C3",
-"8 c #4A4A4A",
-"9 c #7F7F7F",
-"0 c #777777",
-"a c #C7C7C7",
-"b c #CBCBCB",
-"c c #575757",
-"d c #3F3F3F",
-"e c #656565",
-"f c #686868",
-"g c #8C8C8C",
-"h c #A2A2A2",
-"i c #626262",
-"j c #9A9A9A",
-"k c #404040",
-"l c #5B5B5B",
-"m c #858585",
-"n c #4F4F4F",
-".............................................",
-".+@@@@@@@@@@@##@@@@@@@@@@@@@@@@@@@@@@@@@@@@$.",
-".%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*.",
-".%=-;;;;;;;;;;;;;;>;;;>;;;;;;;;;>;;;>>;>;,=*.",
-".'=)&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&!~{*.",
-".%=]&&==&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&^/(~=_.",
-".'=;============&=&&&&&&&&&&&&&&&&&&:@~~~~=*.",
-".%=>={=={=========&=&&=&&&&&&&&&&&&<~~~~~~=*.",
-".'{[}{{{{{{{{={={==========&&&&&&*$~~~~~~~=*.",
-".%=!}}}}{}}}{}{{{{{{{{=====&===:,~~~~~~~~~=*.",
-".%=|%::%::}:}:}}:}}}}{}{{{}}}{;/~~~~~~~~~~=*.",
-".'=12''''%%%%:%%::}:}}:%:::}'3~~~~~~~~~~~~{*.",
-".'{4^5556662222'22'2222'%%%78~~~~~~~~~~~~~=*.",
-".'=9____***^^^5555526622264(~~~~~~~~~~~~~~{*.",
-".'=0a7abbb___**^^5555566ac~~~~~~~~~~~~~~~~=*.",
-".%=0)777aaaabb_****^^^51d~~~~~~~~~~~~~~~~~=_.",
-".'=0]))7777aaabb___**be~~~~~~~~~~~~~~~~~~~{*.",
-".'=@]])]]))777aaabb_]8~~~~~~~~~~~~~~~~~~~~=*.",
-".'{#[>>;]]])))77aaa!d~~~~~~~~~~~~~~~~~~~~~{_.",
-".%=f<[[>;;]]]]))77g(~~~~~~~~~~~~~~~~~~~~~~=*.",
-".'{fh!<<<[>>>;]])@~~~~~~~~~~~~~~~~~~~~~~~~{*.",
-".%=i|hhh!!<[[>;[+~~~~~~~~~~~~~~~~~~~~~~~~~=_.",
-".%=i11jj|hh!!<h8~~~~~~~~~~~~~~~~~~~~~~~~~~=*.",
-".'=+--11jj||hgk~~~~~~~~~~~~~~~~~~~~~~~~~~~{*.",
-".'{lm4g--111,(~~~~~~~~~~~~~~~~~~~~~~~~~~~~=*.",
-".'=c9mmm4g-0(~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{*.",
-".'=c399,mm#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=*.",
-".%=/i#033e~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{_.",
-".'=k$ccic~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=*.",
-".'=d8nn/~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=*.",
-".'{d//k(~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=*.",
-".%=(k(~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=_.",
-".'=((~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=*.",
-".%=939333393393333393339333339333339333333=*.",
-".%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*.",
-".d$n$n$n$$nn$nn$nn$nn$nn$n$n$n$n$n$n$n$nn$n(.",
-"............................................."};
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index d4a8c2c..4041b86 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -32,7 +32,6 @@ Terminal_headers = \
terminal-private.h \
terminal-screen.h \
terminal-shortcut-editor.h \
- terminal-stock.h \
terminal-toolbars-model.h \
terminal-toolbars-view.h \
terminal-widget.h \
@@ -52,7 +51,6 @@ Terminal_SOURCES = \
terminal-preferences-dialog.c \
terminal-screen.c \
terminal-shortcut-editor.c \
- terminal-stock.c \
terminal-toolbars-model.c \
terminal-toolbars-view.c \
terminal-widget.c \
diff --git a/terminal/main.c b/terminal/main.c
index 9d9f17a..4e77699 100644
--- a/terminal/main.c
+++ b/terminal/main.c
@@ -30,7 +30,6 @@
#include <exo/exo.h>
#include <terminal/terminal-app.h>
-#include <terminal/terminal-stock.h>
#include <terminal/terminal-private.h>
#ifdef HAVE_DBUS
@@ -117,7 +116,6 @@ main (int argc, char **argv)
gint nargc;
gint n;
gchar *name;
- gboolean has_util_icon;
/* install required signal handlers */
signal (SIGPIPE, SIG_IGN);
@@ -233,11 +231,8 @@ main (int argc, char **argv)
modifiers = gtk_accelerator_get_default_mod_mask ();
gtk_accelerator_set_default_mod_mask (modifiers | GDK_MOD4_MASK);
- /* register our stock icons */
- has_util_icon = terminal_stock_init ();
-
/* set default window icon */
- gtk_window_set_default_icon_name (has_util_icon ? "utilities-terminal" : "Terminal");
+ gtk_window_set_default_icon_name ("utilities-terminal");
app = g_object_new (TERMINAL_TYPE_APP, NULL);
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 31a9c0c..bb1f85f 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -28,7 +28,6 @@
#include <terminal/terminal-enum-types.h>
#include <terminal/terminal-preferences-dialog.h>
#include <terminal/terminal-shortcut-editor.h>
-#include <terminal/terminal-stock.h>
#include <terminal/terminal-private.h>
diff --git a/terminal/terminal-shortcut-editor.c b/terminal/terminal-shortcut-editor.c
index de3021c..e644e3e 100644
--- a/terminal/terminal-shortcut-editor.c
+++ b/terminal/terminal-shortcut-editor.c
@@ -28,7 +28,6 @@
#include <terminal/terminal-preferences.h>
#include <terminal/terminal-shortcut-editor.h>
-#include <terminal/terminal-stock.h>
#include <terminal/terminal-private.h>
#if defined(GDK_WINDOWING_WIN32)
@@ -344,7 +343,7 @@ terminal_shortcut_editor_activate (TerminalShortcutEditor *editor,
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (TERMINAL_STOCK_COMPOSE, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("preferences-desktop-keyboard-shortcuts", GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
gtk_widget_show (image);
diff --git a/terminal/terminal-stock.c b/terminal/terminal-stock.c
deleted file mode 100644
index 0a455e6..0000000
--- a/terminal/terminal-stock.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * Copyright (c) 2004-2007 os-cillation e.K.
- *
- * Written by Benedikt Meurer <benny at xfce.org>.
- *
- * 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 of the License, 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., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <gtk/gtk.h>
-
-#include <terminal/terminal-stock.h>
-
-
-typedef struct
-{
- const gchar *name;
- const gchar *stock;
-} TerminalStockIcon;
-
-
-
-static const TerminalStockIcon terminal_stock_icons[] =
-{
- { TERMINAL_STOCK_CLOSETAB, "tab-close" },
- { TERMINAL_STOCK_NEWTAB, "tab-new" },
- { TERMINAL_STOCK_NEWWINDOW, "window-new" },
- { TERMINAL_STOCK_REPORTBUG, NULL },
- { TERMINAL_STOCK_SHOWBORDERS, NULL },
- { TERMINAL_STOCK_SHOWMENU, NULL },
- { TERMINAL_STOCK_COMPOSE, NULL }
-};
-
-
-
-/**
- * terminal_stock_init:
- *
- * This function sets up the terminal stock icons.
- **/
-gboolean
-terminal_stock_init (void)
-{
- GtkIconTheme *icon_theme;
- GtkIconFactory *icon_factory;
- GtkIconSource *icon_source;
- GtkIconSet *icon_set;
- gchar icon_name[50];
- guint n;
-
- /* allocate a new icon factory for the terminal icons */
- icon_factory = gtk_icon_factory_new ();
-
- /* we try to avoid allocating multiple icon sources */
- icon_source = gtk_icon_source_new ();
-
- /* get default icon theme */
- icon_theme = gtk_icon_theme_get_default ();
-
- /* register our stock icons */
- for (n = 0; n < G_N_ELEMENTS (terminal_stock_icons); ++n)
- {
- /* set the new icon name for the icon source */
- g_snprintf (icon_name, sizeof (icon_name), "stock_%s",
- terminal_stock_icons[n].name);
-
- /* allocate the icon set */
- icon_set = gtk_icon_set_new ();
- gtk_icon_source_set_icon_name (icon_source, icon_name);
- gtk_icon_set_add_source (icon_set, icon_source);
-
- /* add an alternative stock name if there is one */
- if (terminal_stock_icons[n].stock != NULL
- && gtk_icon_theme_has_icon (icon_theme,
- terminal_stock_icons[n].stock))
- {
- gtk_icon_source_set_icon_name (icon_source,
- terminal_stock_icons[n].stock);
- gtk_icon_set_add_source (icon_set, icon_source);
- }
-
- /* add to the factory */
- gtk_icon_factory_add (icon_factory,
- terminal_stock_icons[n].name, icon_set);
- gtk_icon_set_unref (icon_set);
- }
-
- /* register the icon factory as default */
- gtk_icon_factory_add_default (icon_factory);
-
- /* cleanup */
- g_object_unref (G_OBJECT (icon_factory));
- gtk_icon_source_free (icon_source);
-
- return gtk_icon_theme_has_icon (icon_theme, "utilities-terminal");
-}
-
-
-
diff --git a/terminal/terminal-stock.h b/terminal/terminal-stock.h
deleted file mode 100644
index ba3b1d2..0000000
--- a/terminal/terminal-stock.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2004-2007 os-cillation e.K.
- *
- * Written by Benedikt Meurer <benny at xfce.org>.
- *
- * 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 of the License, 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., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __TERMINAL_STOCK_H__
-#define __TERMINAL_STOCK_H__
-
-G_BEGIN_DECLS
-
-#define TERMINAL_STOCK_CLOSETAB "terminal-closetab"
-#define TERMINAL_STOCK_NEWTAB "terminal-newtab"
-#define TERMINAL_STOCK_NEWWINDOW "terminal-newwindow"
-#define TERMINAL_STOCK_REPORTBUG "terminal-reportbug"
-#define TERMINAL_STOCK_SHOWBORDERS "terminal-showborders"
-#define TERMINAL_STOCK_SHOWMENU "terminal-showmenu"
-#define TERMINAL_STOCK_COMPOSE "terminal-compose"
-
-gboolean terminal_stock_init (void);
-
-G_END_DECLS
-
-#endif /* !__TERMINAL_STOCK_H__ */
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index c5c9cdb..0017b10 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -49,7 +49,6 @@
#include <terminal/terminal-options.h>
#include <terminal/terminal-preferences-dialog.h>
#include <terminal/terminal-private.h>
-#include <terminal/terminal-stock.h>
#include <terminal/terminal-marshal.h>
#include <terminal/terminal-toolbars-view.h>
#include <terminal/terminal-window.h>
@@ -219,10 +218,10 @@ static GQuark gomenu_action_quark = 0;
static const GtkActionEntry action_entries[] =
{
{ "file-menu", NULL, N_ ("_File"), NULL, NULL, NULL, },
- { "new-tab", TERMINAL_STOCK_NEWTAB, N_ ("Open _Tab"), NULL, N_ ("Open a new terminal tab"), G_CALLBACK (terminal_window_action_new_tab), },
- { "new-window", TERMINAL_STOCK_NEWWINDOW, N_ ("Open T_erminal"), "<control><shift>N", N_ ("Open a new terminal window"), G_CALLBACK (terminal_window_action_new_window), },
+ { "new-tab", "tab-new", N_ ("Open _Tab"), NULL, N_ ("Open a new terminal tab"), G_CALLBACK (terminal_window_action_new_tab), },
+ { "new-window", "window-new", N_ ("Open T_erminal"), "<control><shift>N", N_ ("Open a new terminal window"), G_CALLBACK (terminal_window_action_new_window), },
{ "detach-tab", NULL, N_ ("_Detach Tab"), NULL, N_ ("Open a new window for the current terminal tab"), G_CALLBACK (terminal_window_action_detach_tab), },
- { "close-tab", TERMINAL_STOCK_CLOSETAB, N_ ("C_lose Tab"), NULL, N_ ("Close the current terminal tab"), G_CALLBACK (terminal_window_action_close_tab), },
+ { "close-tab", GTK_STOCK_CLOSE, N_ ("C_lose Tab"), NULL, N_ ("Close the current terminal tab"), G_CALLBACK (terminal_window_action_close_tab), },
{ "close-window", GTK_STOCK_QUIT, N_ ("_Close Window"), NULL, N_ ("Close the terminal window"), G_CALLBACK (terminal_window_action_close_window), },
{ "edit-menu", NULL, N_ ("_Edit"), NULL, NULL, NULL, },
{ "copy", GTK_STOCK_COPY, N_ ("_Copy"), NULL, N_ ("Copy to clipboard"), G_CALLBACK (terminal_window_action_copy), },
@@ -241,17 +240,17 @@ static const GtkActionEntry action_entries[] =
{ "next-tab", GTK_STOCK_GO_FORWARD, N_ ("_Next Tab"), NULL, N_ ("Switch to next tab"), G_CALLBACK (terminal_window_action_next_tab), },
{ "help-menu", NULL, N_ ("_Help"), NULL, NULL, NULL, },
{ "contents", GTK_STOCK_HELP, N_ ("_Contents"), NULL, N_ ("Display help contents"), G_CALLBACK (terminal_window_action_contents), },
- { "report-bug", TERMINAL_STOCK_REPORTBUG, N_ ("_Report a bug"), NULL, N_ ("Report a bug in Terminal"), G_CALLBACK (terminal_window_action_report_bug), },
+ { "report-bug", NULL, N_ ("_Report a bug"), NULL, N_ ("Report a bug in Terminal"), G_CALLBACK (terminal_window_action_report_bug), },
{ "about", GTK_STOCK_ABOUT, N_ ("_About"), NULL, N_ ("Display information about Terminal"), G_CALLBACK (terminal_window_action_about), },
{ "input-methods", NULL, N_ ("_Input Methods"), NULL, NULL, NULL, },
};
static const GtkToggleActionEntry toggle_action_entries[] =
{
- { "show-menubar", TERMINAL_STOCK_SHOWMENU, N_ ("Show _Menubar"), NULL, N_ ("Show/hide the menubar"), G_CALLBACK (terminal_window_action_show_menubar), FALSE, },
+ { "show-menubar", NULL, N_ ("Show _Menubar"), NULL, N_ ("Show/hide the menubar"), G_CALLBACK (terminal_window_action_show_menubar), FALSE, },
{ "show-toolbars", NULL, N_ ("Show _Toolbars"), NULL, N_ ("Show/hide the toolbars"), G_CALLBACK (terminal_window_action_show_toolbars), FALSE, },
- { "show-borders", TERMINAL_STOCK_SHOWBORDERS, N_ ("Show Window _Borders"), NULL, N_ ("Show/hide the window decorations"), G_CALLBACK (terminal_window_action_show_borders), TRUE, },
- { "fullscreen", GTK_STOCK_FULLSCREEN, N_ ("_Fullscreen"), NULL, N_ ("Toggle fullscreen mode"), G_CALLBACK (terminal_window_action_fullscreen), FALSE, },
+ { "show-borders", NULL, N_ ("Show Window _Borders"), NULL, N_ ("Show/hide the window decorations"), G_CALLBACK (terminal_window_action_show_borders), TRUE, },
+ { "fullscreen", NULL, N_ ("_Fullscreen"), NULL, N_ ("Toggle fullscreen mode"), G_CALLBACK (terminal_window_action_fullscreen), FALSE, },
};
More information about the Xfce4-commits
mailing list