Merge branch 'master' of ssh://git.onelab.eu/git/sface

[sface.git] / sface / mainwindow.py

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index b85ce0d..19f05a9 100644 (file)
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -13,11 +13,12 @@ from sface.screens.mainscreen import MainScreen
 from sface.screens.helpscreen import HelpScreen
 
 # depending on the platform..
+# could probably use Qt's resource system but looks overkill for just one file...
 def locate_image_file (filename):
-    for dir in [ '/usr/share' ] :
+    for dir in [ '/usr/share', '/Applications/sface.app/Contents/Resources/sface' ] :
         for suffix in ['png','jpg']:
             attempt=os.path.join(dir,'images',"%s.%s"%(filename,suffix))
-            if os.path.is_file(attempt) : return attempt
+            if os.path.isfile(attempt) : return attempt
     return os.path.join('/could/not/locate/image/file',filename)
         
 
@@ -27,7 +28,7 @@ class Nav(QWidget):
         
         self.title = QLabel("", self)
         scene=QGraphicsScene()
-        pixmap = QPixmap(locate_image_file('graphic-sfa.png'))
+        pixmap = QPixmap(locate_image_file('graphic-sfa'))
         logolabel=QLabel("",self)
         logolabel.setPixmap(pixmap)
         self.main = QLabel("", self)