X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=2e9664a5418535b9cc43bdd8fe9a257912f6a553;hp=b9de6fafc6255306d486fc7138793ab491fc8870;hb=0c8751587f38c9b3976233bdebce34dbd548085f;hpb=7ad7a8af395e0e63ca4c81e6eb5af34ad12fe2fe diff --git a/sface/mainwindow.py b/sface/mainwindow.py index b9de6fa..2e9664a 100644 --- a/sface/mainwindow.py +++ b/sface/mainwindow.py @@ -1,10 +1,10 @@ - import os 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 @@ -18,6 +18,11 @@ class Nav(QWidget): 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) self.main = QLabel("", self) self.main.setAlignment(Qt.AlignRight) @@ -28,6 +33,7 @@ class Nav(QWidget): self.help.setAlignment(Qt.AlignRight) hlayout = QHBoxLayout() + hlayout.addWidget(self.logoview) hlayout.addWidget(self.title) hlayout.addStretch() hlayout.addWidget(QLabel("Go to: ", self)) @@ -109,7 +115,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 +131,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()