X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=ab552ce41e2626fd41b091c6d75ad0526d1c99e7;hp=5ba17f11705e7328ed53fe9aad0faaf049e18d6e;hb=af547c974bce8d8a7952cfc8089ef30e5d8e4bdf;hpb=4c1046ce18cb25a8a045ca588d975723af36ea1a

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 5ba17f1..ab552ce 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,5 +1,6 @@
 
 import os
+import sys
 import time
 
 from PyQt4.QtCore import *
@@ -7,6 +8,7 @@ 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
 
@@ -58,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)
@@ -74,11 +79,13 @@ class MainWindow(QWidget):
 
         self.status = Status(self)
         self.log = QLabel("<a href='showlog'>Show Log</a>", self)
+        self.xml = QLabel("<a href='showrspec'>Show RSpec</a>", self)
 
         hlayout = QHBoxLayout()
         hlayout.addWidget(self.status)
         hlayout.addStretch()
         hlayout.addWidget(self.log)
+        hlayout.addWidget(self.xml)
 
         layout = QVBoxLayout()
         layout.addWidget(self.nav)
@@ -91,12 +98,23 @@ class MainWindow(QWidget):
                      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):
-        log = LogWindow(self)
-        log.show()
-        log.raise_()
-        log.activateWindow()
+        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)