X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=620b000f3f6a5d3d551eb4fe40497241033f487a;hp=b9de6fafc6255306d486fc7138793ab491fc8870;hb=96d786458551cb101e9ccd046e98cd03e331345e;hpb=7ad7a8af395e0e63ca4c81e6eb5af34ad12fe2fe

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index b9de6fa..620b000 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,5 +1,4 @@
-
-import os
+import os, os.path
 import sys
 import time
 
@@ -13,11 +12,24 @@ 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.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()
+        pixmap = QPixmap(locate_image_file('graphic-sfa.png'))
+        logolabel=QLabel("",self)
+        logolabel.setPixmap(pixmap)
         self.main = QLabel("", self)
         self.main.setAlignment(Qt.AlignRight)
 
@@ -28,6 +40,7 @@ class Nav(QWidget):
         self.help.setAlignment(Qt.AlignRight)
 
         hlayout = QHBoxLayout()
+        hlayout.addWidget(logolabel)
         hlayout.addWidget(self.title)
         hlayout.addStretch()
         hlayout.addWidget(QLabel("Go to: ", self))
@@ -109,7 +122,7 @@ class MainWindow(QWidget):
         layout.addWidget(self.screens)
         layout.addLayout(hlayout)
         self.setLayout(layout)
-        self.resize(800, 600)
+        self.resize(800, 500)
 
         for link in (self.nav.main, self.nav.config, self.nav.help):
             self.connect(link, SIGNAL('linkActivated(QString)'),
@@ -125,7 +138,7 @@ class MainWindow(QWidget):
 
     def showLogWindow(self, link):
         self.logWindow.show()
-        self.logWindow.resize(800, 400)
+        self.logWindow.resize(800, 200)
         self.logWindow.raise_()
         self.logWindow.activateWindow()