[d-feet] Fix icon handling

From: Thomas Bechtold <toabctl src gnome org>
To: commits-list gnome org
Cc:
Subject: [d-feet] Fix icon handling
Date: Tue, 23 Oct 2012 07:48:22 +0000 (UTC)
commit ce3fded38efd9090970f519730daf6809526dfa9
Author: Thomas Bechtold <thomasbechtold jpberlin de>
Date:   Tue Oct 23 09:17:25 2012 +0200

    Fix icon handling
    
    * move icons to match icon theme spec dirs
    * rename named d-feet icon
    * add local icon path for d-feet development

 d-feet                                             |    3 +++
 .../16x16/apps/d-feet.png}                         |  Bin 1002 -> 1002 bytes
 .../16x16/apps}/dfeet-icon-default-service.png     |  Bin 652 -> 652 bytes
 .../16x16/apps}/dfeet-method-category.png          |  Bin 505 -> 505 bytes
 .../{16x16 => hicolor/16x16/apps}/dfeet-method.png |  Bin 459 -> 459 bytes
 .../{16x16 => hicolor/16x16/apps}/dfeet-object.png |  Bin 702 -> 702 bytes
 .../16x16/apps}/dfeet-property-category.png        |  Bin 427 -> 427 bytes
 .../16x16/apps}/dfeet-property.png                 |  Bin 330 -> 330 bytes
 .../16x16/apps}/dfeet-signal-category.png          |  Bin 474 -> 474 bytes
 .../{16x16 => hicolor/16x16/apps}/dfeet-signal.png |  Bin 400 -> 400 bytes
 .../24x24/apps/d-feet.png}                         |  Bin 1522 -> 1522 bytes
 .../256x256/apps/d-feet.png}                       |  Bin 39476 -> 39476 bytes
 .../32x32/apps/d-feet.png}                         |  Bin 2443 -> 2443 bytes
 .../48x48/apps/d-feet.png}                         |  Bin 4393 -> 4393 bytes
 .../scalable/apps/d-feet.svg}                      |    0
 .../{ => hicolor}/src/object-catagories-boxed.svg  |    0
 .../src/object-catagories-centered.svg             |    0
 icons/{ => hicolor}/src/object.svg                 |    0
 setup.py                                           |   11 ++++++-----
 ui/buswatch.ui                                     |    2 +-
 ui/dfeet.desktop                                   |    2 +-
 ui/mainwindow.ui                                   |    4 ++--
 22 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/d-feet b/d-feet
index a130d65..0756bd9 100755
--- a/d-feet
+++ b/d-feet
@@ -14,6 +14,7 @@
 
 import os, sys
 import optparse
+from gi.repository import Gtk
 
 parser = optparse.OptionParser(usage="%prog [options] [project-file]")
 
@@ -29,6 +30,8 @@ if options.use_local_dirs:
                  "DFEET_LOCALE_PATH" : "locale/",
                  "DFEET_HELP_PATH" : "/usr/share/gnome/dfeet/"
                 }
+    theme = Gtk.IconTheme.get_default()
+    theme.prepend_search_path(os.path.abspath("./icons/"))
 else:
     ENV_PATHS = {"DFEET_DATA_PATH" : "/usr/share/dfeet/",
                  "DFEET_IMAGE_PATH" : "/usr/share/dfeet/pixmaps/",
diff --git a/icons/16x16/d-feet-icon.png b/icons/hicolor/16x16/apps/d-feet.png
similarity index 100%
rename from icons/16x16/d-feet-icon.png
rename to icons/hicolor/16x16/apps/d-feet.png
diff --git a/icons/16x16/dfeet-icon-default-service.png b/icons/hicolor/16x16/apps/dfeet-icon-default-service.png
similarity index 100%
rename from icons/16x16/dfeet-icon-default-service.png
rename to icons/hicolor/16x16/apps/dfeet-icon-default-service.png
diff --git a/icons/16x16/dfeet-method-category.png b/icons/hicolor/16x16/apps/dfeet-method-category.png
similarity index 100%
rename from icons/16x16/dfeet-method-category.png
rename to icons/hicolor/16x16/apps/dfeet-method-category.png
diff --git a/icons/16x16/dfeet-method.png b/icons/hicolor/16x16/apps/dfeet-method.png
similarity index 100%
rename from icons/16x16/dfeet-method.png
rename to icons/hicolor/16x16/apps/dfeet-method.png
diff --git a/icons/16x16/dfeet-object.png b/icons/hicolor/16x16/apps/dfeet-object.png
similarity index 100%
rename from icons/16x16/dfeet-object.png
rename to icons/hicolor/16x16/apps/dfeet-object.png
diff --git a/icons/16x16/dfeet-property-category.png b/icons/hicolor/16x16/apps/dfeet-property-category.png
similarity index 100%
rename from icons/16x16/dfeet-property-category.png
rename to icons/hicolor/16x16/apps/dfeet-property-category.png
diff --git a/icons/16x16/dfeet-property.png b/icons/hicolor/16x16/apps/dfeet-property.png
similarity index 100%
rename from icons/16x16/dfeet-property.png
rename to icons/hicolor/16x16/apps/dfeet-property.png
diff --git a/icons/16x16/dfeet-signal-category.png b/icons/hicolor/16x16/apps/dfeet-signal-category.png
similarity index 100%
rename from icons/16x16/dfeet-signal-category.png
rename to icons/hicolor/16x16/apps/dfeet-signal-category.png
diff --git a/icons/16x16/dfeet-signal.png b/icons/hicolor/16x16/apps/dfeet-signal.png
similarity index 100%
rename from icons/16x16/dfeet-signal.png
rename to icons/hicolor/16x16/apps/dfeet-signal.png
diff --git a/icons/24x24/d-feet-icon.png b/icons/hicolor/24x24/apps/d-feet.png
similarity index 100%
rename from icons/24x24/d-feet-icon.png
rename to icons/hicolor/24x24/apps/d-feet.png
diff --git a/icons/256x256/d-feet-icon.png b/icons/hicolor/256x256/apps/d-feet.png
similarity index 100%
rename from icons/256x256/d-feet-icon.png
rename to icons/hicolor/256x256/apps/d-feet.png
diff --git a/icons/32x32/d-feet-icon.png b/icons/hicolor/32x32/apps/d-feet.png
similarity index 100%
rename from icons/32x32/d-feet-icon.png
rename to icons/hicolor/32x32/apps/d-feet.png
diff --git a/icons/48x48/d-feet-icon.png b/icons/hicolor/48x48/apps/d-feet.png
similarity index 100%
rename from icons/48x48/d-feet-icon.png
rename to icons/hicolor/48x48/apps/d-feet.png
diff --git a/icons/scalable/d-feet-icon.svg b/icons/hicolor/scalable/apps/d-feet.svg
similarity index 100%
rename from icons/scalable/d-feet-icon.svg
rename to icons/hicolor/scalable/apps/d-feet.svg
diff --git a/icons/src/object-catagories-boxed.svg b/icons/hicolor/src/object-catagories-boxed.svg
similarity index 100%
rename from icons/src/object-catagories-boxed.svg
rename to icons/hicolor/src/object-catagories-boxed.svg
diff --git a/icons/src/object-catagories-centered.svg b/icons/hicolor/src/object-catagories-centered.svg
similarity index 100%
rename from icons/src/object-catagories-centered.svg
rename to icons/hicolor/src/object-catagories-centered.svg
diff --git a/icons/src/object.svg b/icons/hicolor/src/object.svg
similarity index 100%
rename from icons/src/object.svg
rename to icons/hicolor/src/object.svg
diff --git a/setup.py b/setup.py
index ed4837e..e13a619 100755
--- a/setup.py
+++ b/setup.py
@@ -60,11 +60,12 @@ dist = setup(name='d-feet',
     packages=['dfeet', 'dfeet/_ui'],
     data_files=[
         ('share/dfeet', glob.glob("ui/*.ui")),
-        ('share/icons/hicolor/16x16/apps', glob.glob("icons/16x16/*.png")),
-        ('share/icons/hicolor/24x24/apps', glob.glob("icons/24x24/*.png")),
-        ('share/icons/hicolor/32x32/apps', glob.glob("icons/32x32/*.png")),
-        ('share/icons/hicolor/48x48/apps', glob.glob("icons/48x48/*.png")),
-        ('share/icons/hicolor/256x256/apps', glob.glob("icons/256x256/*.png")),
+        ('share/icons/hicolor/16x16/apps', glob.glob("icons/hicolor/16x16/apps/*.png")),
+        ('share/icons/hicolor/24x24/apps', glob.glob("icons/hicolor/24x24/apps/*.png")),
+        ('share/icons/hicolor/32x32/apps', glob.glob("icons/hicolor/32x32/apps/*.png")),
+        ('share/icons/hicolor/48x48/apps', glob.glob("icons/hicolor/48x48/apps/*.png")),
+        ('share/icons/hicolor/256x256/apps', glob.glob("icons/hicolor/256x256/apps/*.png")),
+        ('share/icons/hicolor/scalable/apps', glob.glob("icons/hicolor/scalable/apps/*.svg")),
         ('share/applications', ['ui/dfeet.desktop']),
         ]+I18NFILES+HELPDOCS+HELPIMAGES+OMFFILES
 )
diff --git a/ui/buswatch.ui b/ui/buswatch.ui
index dddb94a..fffdbf3 100644
--- a/ui/buswatch.ui
+++ b/ui/buswatch.ui
@@ -213,7 +213,7 @@
       <object class="GtkImage" id="image1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="icon_name">d-feet-icon</property>
+        <property name="icon_name">d-feet</property>
       </object>
       <packing>
         <property name="resize">True</property>
diff --git a/ui/dfeet.desktop b/ui/dfeet.desktop
index c2a9aa4..d7d5910 100644
--- a/ui/dfeet.desktop
+++ b/ui/dfeet.desktop
@@ -4,7 +4,7 @@ Name=D-Feet
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
 Exec=d-feet
-Icon=d-feet-icon
+Icon=d-feet
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Development;Debugger;
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index d710c28..18619f2 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -56,7 +56,7 @@
     <property name="type_hint">normal</property>
     <property name="program_name">d-feet</property>
     <property name="website">https://live.gnome.org/DFeet/</property>
-    <property name="logo_icon_name">d-feet-icon</property>
+    <property name="logo_icon_name">d-feet</property>
     <property name="license_type">gpl-2-0</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="aboutdialog-vbox1">
@@ -88,7 +88,7 @@
     <property name="title" translatable="yes" context="yes">D-Feet D-Bus debugger</property>
     <property name="default_width">640</property>
     <property name="default_height">480</property>
-    <property name="icon_name">d-feet-icon</property>
+    <property name="icon_name">d-feet</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]