icons path from installed package or script dir

diff --git a/dboxswitch/settings.py b/dboxswitch/settings.py
index 3b7fdb1..b604488 100644 (file)
--- a/dboxswitch/settings.py
+++ b/dboxswitch/settings.py
@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
 import os, sys
 """
 
 import os, sys

+from apperror import AppError

 
 class Settings():
     def __init__(self):
 
 class Settings():
     def __init__(self):


@@ -42,10 +43,19 @@ class Settings():
 
         self.appname = "dboxswitch"
         self.appversion = "0.1"
 
         self.appname = "dboxswitch"
         self.appversion = "0.1"

-        self.icon     = os.path.join(__location__,"icon.png")
-        self.cpicon   = os.path.join(__location__,"current-profile.png")
-        self.delpicon = os.path.join(__location__,"delete.png")
-        self.addpicon = os.path.join(__location__,"add.png")
+        if os.path.isdir(os.path.join(__location__,"/icons")):
+            path = os.path.join(__location__,"/icons")
+        else:
+            path = ""
+            try:
+                import pkg_resources
+                path = pkg_resources.resource_filename(__name__, 'icons/')
+            except:
+                print "unable to load resource icons"
+        self.icon     = os.path.join(path,"icon.png")
+        self.cpicon   = os.path.join(path,"current-profile.png")
+        self.delpicon = os.path.join(path,"delete.png")
+        self.addpicon = os.path.join(path,"add.png")

 
 global conf
 appconf = Settings()
 
 global conf
 appconf = Settings()