tint2conf : follow freedesktop icon theme specification

diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
index 48fcd1f86bf247d347c64a1fa2d9f54582efbd65..c44ad1e04d83c8d759c5a7272982ab1a08b83e2c 100644 (file)
--- 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 66ac917f37bd88bf26d0199f775ebe1d5d126149..2d65a193c36d3491f10837f89f99680bc54998d4 100644 (file)
--- 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 96749e79af0cef6b925396dba889bb8d6b4369b4..406a950194668806999b035ecbc5f06086e5dcd8 100644 (file)
--- 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" />
+    <inkscape:perspective
+       id="perspective2924"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       x1="30"
+       y1="17"
+       x2="30"
+       y2="47"
+       id="linearGradient2854-0"
+       xlink:href="#linearGradient2181-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-9.9999992)" />
+    <linearGradient
+       id="linearGradient2181-7">
+      <stop
+         id="stop2183-8"
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2185-6"
+         style="stop-color:#d3d3d3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <mask
+       id="mask4722-8">
+      <rect
+         width="52"
+         height="32"
+         x="1"
+         y="6"
+         id="rect4724-8"
+         style="fill:url(#linearGradient4726-4);fill-opacity:1;stroke:none" />
+    </mask>
+    <linearGradient
+       x1="50.23077"
+       y1="22"
+       x2="53"
+       y2="22"
+       id="linearGradient4726-4"
+       xlink:href="#linearGradient4708-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.3333333,0,0,1,-176.66667,0)" />
+    <linearGradient
+       id="linearGradient4708-3">
+      <stop
+         id="stop4710-1"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4712-4"
+         style="stop-color:black;stop-opacity:1"
+         offset="0.57954973" />
+      <stop
+         id="stop4714-9"
+         style="stop-color:black;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="47"
+       x2="30"
+       y1="17"
+       x1="30"
+       gradientTransform="translate(0,-9.9999992)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2940"
+       xlink:href="#linearGradient2181-7"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2894"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
   </defs>
   <rect
      width="46"
@@ -335,7 +413,7 @@
      y="7.5"
      mask="url(#mask4722)"
      id="rect1333"
-     style="fill:url(#linearGradient2854);fill-opacity:1;stroke:#323232;stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     style="fill:url(#linearGradient2854);fill-opacity:1;stroke:#2c2c2c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
      transform="translate(-0.20338983,3.4237288)" />
   <rect
      width="45"
@@ -346,4 +424,13 @@
      id="rect2210"
      style="opacity:0.7;fill:none;stroke:url(#linearGradient2851);stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
      transform="translate(-0.20338983,3.4237288)" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#333424;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0.69999999999999996"
+     id="rect6306"
+     width="29.45332"
+     height="9.5719652"
+     x="10.697065"
+     y="21.044527"
+     rx="1.4456253"
+     ry="1.6443363" />
 </svg>

diff --git a/src/tint2conf/theme_view.c b/src/tint2conf/theme_view.c
index 5fd9187963083e3e44111b677e12bf26ed085804..4e169c19cae8c0207d8b7b8403eee136e68bfa74 100644 (file)
--- 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 0301b7d204da9bf9fff77e69a1473c689ddfb5b8..16c49a541fac755c659fb78921b8846cac097db1 100644 (file)
--- 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 (file)
index 26e1f00..0000000
Binary files a/src/tint2conf/tint2conf.png and /dev/null differ