X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fmainwindow.py;h=0ae038d47337b5b47641082a16d070ebb3b15a15;hb=9000be28306fe69b1f24ce18d5a0bc3daefe08f6;hp=89ca0d65f99879fa7b8afd38d4e3036ff26ef8d4;hpb=4f4423394725e8ac2849122fdaf6c000787f3e5c;p=sface.git diff --git a/sface/mainwindow.py b/sface/mainwindow.py index 89ca0d6..0ae038d 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 @@ -57,6 +58,8 @@ class MainWindow(QWidget): def __init__(self, parent=None): QWidget.__init__(self, parent) + self.logWindow = LogWindow(self) + self.pix = QLabel(self) self.config_screen = ConfigScreen(self) self.main_screen = MainScreen(self) @@ -88,7 +91,13 @@ class MainWindow(QWidget): self.connect(self.nav.link, SIGNAL('linkActivated(QString)'), self.animateToScreen) + self.connect(self.log, SIGNAL('linkActivated(QString)'), + self.showLogWindow) + def showLogWindow(self, link): + self.logWindow.show() + self.logWindow.raise_() + self.logWindow.activateWindow() def animatePixmap(self, y): self.pix.move(0, y)