X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=ab552ce41e2626fd41b091c6d75ad0526d1c99e7;hp=46eb79ed73ef5be168225f3b105c75908435ed12;hb=e3ff7b1a829714d72e135fd11f7746a01bc2492b;hpb=b09988e1840c80455eef1e745a4205b49c03d6d0
diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 46eb79e..ab552ce 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,11 +1,14 @@
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.xmlwindow import XmlWindow
from sface.screens.configscreen import ConfigScreen
from sface.screens.mainscreen import MainScreen
@@ -57,6 +60,9 @@ class MainWindow(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
+ self.logWindow = LogWindow(self)
+ self.xmlWindow = XmlWindow(self)
+
self.pix = QLabel(self)
self.config_screen = ConfigScreen(self)
self.main_screen = MainScreen(self)
@@ -72,17 +78,43 @@ class MainWindow(QWidget):
self.nav.setLink(self.config_screen.getLinkText())
self.status = Status(self)
+ self.log = QLabel("Show Log", self)
+ self.xml = QLabel("Show RSpec", self)
+
+ hlayout = QHBoxLayout()
+ hlayout.addWidget(self.status)
+ hlayout.addStretch()
+ hlayout.addWidget(self.log)
+ hlayout.addWidget(self.xml)
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)
+ self.connect(self.xml, SIGNAL('linkActivated(QString)'),
+ self.showXmlWindow)
+
+ 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 showXmlWindow(self, link):
+ self.xmlWindow.show()
+ self.xmlWindow.resize(500, 500)
+ self.xmlWindow.raise_()
+ self.xmlWindow.activateWindow()
def animatePixmap(self, y):
self.pix.move(0, y)
@@ -98,7 +130,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)