From f9b3fb96571db1b9f67000a907e540888097cf11 Mon Sep 17 00:00:00 2001 From: Thierry Lorthiois Date: Wed, 3 Nov 2010 14:57:08 +0000 Subject: [PATCH] tint2conf : follow freedesktop icon theme specification --- src/tint2conf/CMakeLists.txt | 2 +- src/tint2conf/main.c | 4 +- src/tint2conf/{tint2conf.svg => taskbar.svg} | 99 +++++++++++++++++-- src/tint2conf/theme_view.c | 6 +- src/tint2conf/tint2conf.desktop | 2 +- src/tint2conf/tint2conf.png | Bin 490 -> 0 bytes 6 files changed, 101 insertions(+), 12 deletions(-) rename src/tint2conf/{tint2conf.svg => taskbar.svg} (77%) delete mode 100644 src/tint2conf/tint2conf.png diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt index 48fcd1f..c44ad1e 100644 --- a/src/tint2conf/CMakeLists.txt +++ b/src/tint2conf/CMakeLists.txt @@ -41,5 +41,5 @@ set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" ) install( TARGETS tint2conf DESTINATION bin ) install( PROGRAMS tintwizard.py DESTINATION bin ) -install( FILES tint2conf.png tint2conf.svg DESTINATION share/pixmaps ) +install( FILES taskbar.svg DESTINATION share/icons/hicolor/scalable/apps ) install( FILES tint2conf.desktop DESTINATION share/applications ) diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index 66ac917..2d65a19 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -132,6 +132,8 @@ int main (int argc, char ** argv) g_thread_init( NULL ); read_config(); initTheme(); + g_set_application_name (_("tint2conf")); + gtk_window_set_default_icon_name("taskbar"); // define main layout : container, menubar, toolbar g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -185,7 +187,7 @@ static void menuAbout() "comments", _("Theming tool for tint2 panel"), "version", VERSION_STRING, "copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"), - "logo-icon-name", NULL, "authors", authors, + "logo-icon-name", "taskbar", "authors", authors, /* Translators: translate "translator-credits" as your name to have it appear in the credits in the "About" dialog */ diff --git a/src/tint2conf/tint2conf.svg b/src/tint2conf/taskbar.svg similarity index 77% rename from src/tint2conf/tint2conf.svg rename to src/tint2conf/taskbar.svg index 96749e7..406a950 100644 --- a/src/tint2conf/tint2conf.svg +++ b/src/tint2conf/taskbar.svg @@ -15,7 +15,7 @@ height="48" id="svg1325" inkscape:version="0.47 r22583" - sodipodi:docname="tint2conf.svg" + sodipodi:docname="taskbar.svg" inkscape:export-filename="/home/omega_dist/4_devel_open_source/9_tint/tint2/src/tint2conf/tint2conf.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -40,14 +40,14 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1024" - inkscape:window-height="715" + inkscape:window-width="1440" + inkscape:window-height="837" id="namedview48" showgrid="false" inkscape:zoom="4.9166667" - inkscape:cx="-14.440678" + inkscape:cx="-69.254237" inkscape:cy="21.9661" - inkscape:window-x="0" + inkscape:window-x="-2" inkscape:window-y="1" inkscape:window-maximized="1" inkscape:current-layer="svg1325" /> @@ -327,6 +327,84 @@ y1="-12.489107" x2="63.397362" y2="5.4675598" /> + + + + + + + + + + + + + + + + + + diff --git a/src/tint2conf/theme_view.c b/src/tint2conf/theme_view.c index 5fd9187..4e169c1 100644 --- a/src/tint2conf/theme_view.c +++ b/src/tint2conf/theme_view.c @@ -125,12 +125,12 @@ gboolean update_snapshot() pixWidth = gdk_pixbuf_get_width(pixbuf); pixHeight = gdk_pixbuf_get_height(pixbuf); - if (g_width_list < pixWidth) { + if (g_width_list != pixWidth) { g_width_list = pixWidth; changeSize = TRUE; } - if (g_height_list < (pixHeight+6)) { - g_height_list = pixHeight+6; + if (g_height_list != (pixHeight+30)) { + g_height_list = pixHeight+30; changeSize = TRUE; } if (changeSize) diff --git a/src/tint2conf/tint2conf.desktop b/src/tint2conf/tint2conf.desktop index 0301b7d..16c49a5 100644 --- a/src/tint2conf/tint2conf.desktop +++ b/src/tint2conf/tint2conf.desktop @@ -143,7 +143,7 @@ Comment[ur]=پینل کی ترتیبات Comment[ur_PK]=پینل کی ترتیبات Comment[zh_CN]=自定义面板设置 Exec=tint2conf -Icon=tint2conf +Icon=taskbar Terminal=false Categories=Settings;DesktopSettings; diff --git a/src/tint2conf/tint2conf.png b/src/tint2conf/tint2conf.png deleted file mode 100644 index 26e1f00f63d75371527b859b0564a3a025562812..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 490 zcmVK~!jg?U}J^!cY{3za&DD($yz$?qD(h?$^;jUpBwu{s%`V g5SmUPH0}ky0m?#wD&Mr%O8@`>07*qoM6N<$g0>gTUH||9 -- 2.43.0