git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add logo in mainwindow
[sface.git]
/
sface
/
mainwindow.py
diff --git
a/sface/mainwindow.py
b/sface/mainwindow.py
index
b9de6fa
..
2e9664a
100644
(file)
--- 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 *
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
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)
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)
self.main = QLabel("", self)
self.main.setAlignment(Qt.AlignRight)
@@
-28,6
+33,7
@@
class Nav(QWidget):
self.help.setAlignment(Qt.AlignRight)
hlayout = QHBoxLayout()
self.help.setAlignment(Qt.AlignRight)
hlayout = QHBoxLayout()
+ hlayout.addWidget(self.logoview)
hlayout.addWidget(self.title)
hlayout.addStretch()
hlayout.addWidget(QLabel("Go to: ", self))
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)
layout.addWidget(self.screens)
layout.addLayout(hlayout)
self.setLayout(layout)
- self.resize(800,
6
00)
+ self.resize(800,
5
00)
for link in (self.nav.main, self.nav.config, self.nav.help):
self.connect(link, SIGNAL('linkActivated(QString)'),
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()
def showLogWindow(self, link):
self.logWindow.show()
- self.logWindow.resize(800,
4
00)
+ self.logWindow.resize(800,
2
00)
self.logWindow.raise_()
self.logWindow.activateWindow()
self.logWindow.raise_()
self.logWindow.activateWindow()