X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=c5e0183358b5900424a82b9f20a120d8d85e8631;hp=2e9664a5418535b9cc43bdd8fe9a257912f6a553;hb=ceec62613fb82f1a96fe18a6ed9d69dec50cd3c8;hpb=0c8751587f38c9b3976233bdebce34dbd548085f

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 2e9664a..c5e0183 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,10 +1,9 @@
-import os
+import os, os.path
 import sys
 import time
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-from PyQt4.QtOpenGL import *
 
 from sface.config import config
 from sface.logwindow import LogWindow
@@ -13,16 +12,25 @@ from sface.screens.configscreen import ConfigScreen
 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', '/Applications/sface.app/Contents/Resources/sface' ] :
+        for suffix in ['png','jpg']:
+            attempt=os.path.join(dir,'images',"%s.%s"%(filename,suffix))
+            if os.path.isfile(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()
-        scene.addPixmap(QPixmap('/Users/parmentelat/git/sface/macos/graphic-sfa64.png'))
-        self.logoview=QGraphicsView()
-        self.logoview.setViewport(QGLWidget())
-        self.logoview.setScene(scene)
+        pixmap = QPixmap(locate_image_file('graphic-sfa64'))
+        logolabel=QLabel("",self)
+        logolabel.setPixmap(pixmap)
         self.main = QLabel("", self)
         self.main.setAlignment(Qt.AlignRight)
 
@@ -33,10 +41,12 @@ class Nav(QWidget):
         self.help.setAlignment(Qt.AlignRight)
 
         hlayout = QHBoxLayout()
-        hlayout.addWidget(self.logoview)
+        hlayout.addWidget(logolabel)
         hlayout.addWidget(self.title)
         hlayout.addStretch()
-        hlayout.addWidget(QLabel("Go to: ", self))
+        gotolabel=QLabel("Go to: ", self)
+        gotolabel.setAlignment(Qt.AlignRight)
+        hlayout.addWidget(gotolabel)
         hlayout.addWidget(self.main)
         hlayout.addWidget(self.config)
         hlayout.addWidget(self.help)