X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=5ba17f11705e7328ed53fe9aad0faaf049e18d6e;hp=f3115a52059b177eaebe68f14e63b7df14776380;hb=154bcc2afda6ff1d2889f8d6b120becbedb3b707;hpb=e0f5698d85a9079446e04780751acf62e6ee7e61 diff --git a/sface/mainwindow.py b/sface/mainwindow.py index f3115a5..5ba17f1 100644 --- a/sface/mainwindow.py +++ b/sface/mainwindow.py @@ -6,6 +6,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * from sface.config import config +from sface.logwindow import LogWindow from sface.screens.configscreen import ConfigScreen from sface.screens.mainscreen import MainScreen @@ -72,17 +73,30 @@ class MainWindow(QWidget): self.nav.setLink(self.config_screen.getLinkText()) self.status = Status(self) + self.log = QLabel("Show Log", self) + + hlayout = QHBoxLayout() + hlayout.addWidget(self.status) + hlayout.addStretch() + hlayout.addWidget(self.log) layout = QVBoxLayout() layout.addWidget(self.nav) layout.addWidget(self.screens) - layout.addWidget(self.status) + layout.addLayout(hlayout) self.setLayout(layout) self.resize(800, 600) self.connect(self.nav.link, SIGNAL('linkActivated(QString)'), self.animateToScreen) - + self.connect(self.log, SIGNAL('linkActivated(QString)'), + self.showLogWindow) + + def showLogWindow(self, link): + log = LogWindow(self) + log.show() + log.raise_() + log.activateWindow() def animatePixmap(self, y): self.pix.move(0, y)