package the logo image and retrieve it from the code

diff --git a/setup.py b/setup.py
index a0b8d07..07b6faf 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ package_dirs = ['sface', 'sface/screens']
 
 setup(name='sface',
       packages = package_dirs, 
-      data_files = [ ('images',['macos/graphic-sfa.png'] ) , ] ,
+      data_files = [ ('sface/images',['macos/graphic-sfa.png'] ) , ] ,
       ext_modules = [],
       py_modules = [],
       scripts = bins)

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index d23c7b3..b85ce0d 100644 (file)
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,4 +1,4 @@
-import os
+import os, os.path
 import sys
 import time
 
@@ -12,13 +12,22 @@ from sface.screens.configscreen import ConfigScreen
 from sface.screens.mainscreen import MainScreen
 from sface.screens.helpscreen import HelpScreen
 
+# depending on the platform..
+def locate_image_file (filename):
+    for dir in [ '/usr/share' ] :
+        for suffix in ['png','jpg']:
+            attempt=os.path.join(dir,'images',"%s.%s"%(filename,suffix))
+            if os.path.is_file(attempt) : return attempt
+    return os.path.join('/could/not/locate/image/file',filename)
+        
+
 class Nav(QWidget):
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)
         
         self.title = QLabel("", self)
         scene=QGraphicsScene()
-        pixmap = QPixmap('/Users/parmentelat/git/sface/macos/graphic-sfa64.png')
+        pixmap = QPixmap(locate_image_file('graphic-sfa.png'))
         logolabel=QLabel("",self)
         logolabel.setPixmap(pixmap)
         self.main = QLabel("", self)