also search in optional package

ratt-ru · Feb 4, 2014 · a5b55d2 · a5b55d2
1 parent 95877d7
commit a5b55d2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Kittens/pixmaps.py b/Kittens/pixmaps.py
@@ -3014,8 +3014,11 @@ def icon (self):
 
 __icons_loaded = False;
 
-def load_icons (appname):
-  """load all icons found in path, subdirs 'icons/appname'""";
+def load_icons (appname, package=""):
+  """
+  load all icons found in path, subdirs '<package>/icons/<appname>'.
+  Package is optional.
+  """;
   # loop over system path
   global __icons_loaded;
   if __icons_loaded:
@@ -3024,7 +3027,7 @@ def load_icons (appname):
   for path in icon_paths:
     path = path or '.';
     # for each entry, try <entry>/icons/<appname>'
-    trydir = os.path.join(path,'icons',appname);
+    trydir = os.path.join(path,package,'icons',appname);
     _dprint(3,'trying icon path',trydir);
     try: files = os.listdir(trydir);
     except: continue;