X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=39e68a07efcdc1026e6c91d4aa542431d9ab8fc1;hp=46eb79ed73ef5be168225f3b105c75908435ed12;hb=be96cc0a7b9a9fc857698998c01dc4f227d3ca93;hpb=b09988e1840c80455eef1e745a4205b49c03d6d0

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 46eb79e..39e68a0 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,11 +1,13 @@
 
 import os
+import sys
 import time
 
 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 +59,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)
@@ -72,17 +76,33 @@ class MainWindow(QWidget):
         self.nav.setLink(self.config_screen.getLinkText())
 
         self.status = Status(self)
+        self.log = QLabel("<a href='showlog'>Show Log</a>", 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 redirectOutputToLog(self):
+        self.logWindow.redirectOutput()
 
+    def showLogWindow(self, link):
+        self.logWindow.show()
+        self.logWindow.resize(500, 500)
+        self.logWindow.raise_()
+        self.logWindow.activateWindow()
 
     def animatePixmap(self, y):
         self.pix.move(0, y)
@@ -98,7 +118,7 @@ class MainWindow(QWidget):
         self.screens.setCurrentWidget(self.pix)
         self.pix.setPixmap(pixmap)
 
-        timeLine = QTimeLine(800, self)
+        timeLine = QTimeLine(500, self)
         timeLine.setFrameRange(0, self.screens.height());
         self.connect(timeLine, SIGNAL('frameChanged(int)'), self.animatePixmap)
         self.connect(timeLine, SIGNAL('finished()'), self.toNextScreen)