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

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 5ba17f1..b04e638 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,5 +1,6 @@
 
 import os
+import sys
 import time
 
 from PyQt4.QtCore import *
@@ -9,26 +10,38 @@ from sface.config import config
 from sface.logwindow import LogWindow
 from sface.screens.configscreen import ConfigScreen
 from sface.screens.mainscreen import MainScreen
+from sface.screens.rspecscreen import RSpecScreen
 
 class Nav(QWidget):
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)
         
         self.title = QLabel("", self)
-        self.link = QLabel("", self)
-        self.link.setAlignment(Qt.AlignRight)
+        self.main = QLabel("", self)
+        self.main.setAlignment(Qt.AlignRight)
+
+        self.rspec = QLabel("", self)
+        self.rspec.setAlignment(Qt.AlignRight)
+
+        self.config = QLabel("", self)
+        self.config.setAlignment(Qt.AlignRight)
         
         hlayout = QHBoxLayout()
         hlayout.addWidget(self.title)
         hlayout.addStretch()
-        hlayout.addWidget(self.link)
+        hlayout.addWidget(QLabel("Go to: ", self))
+        hlayout.addWidget(self.main)
+        hlayout.addWidget(self.rspec)
+        hlayout.addWidget(self.config)
         self.setLayout(hlayout)
 
     def setTitle(self, title):
         self.title.setText(title)
 
-    def setLink(self, link):
-        self.link.setText(link)
+    def setLinks(self, main, rspec, config):
+        self.main.setText(main)
+        self.rspec.setText(rspec)
+        self.config.setText(config)
 
 
 class Status(QLabel):
@@ -58,19 +71,25 @@ 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)
+        self.rspec_screen = RSpecScreen(self)
 
         self.screens = QStackedWidget(self)
         self.screens.addWidget(self.main_screen)
         self.screens.addWidget(self.config_screen)
+        self.screens.addWidget(self.rspec_screen)
         self.screens.addWidget(self.pix)
         self.next_screen = None
 
         self.nav = Nav(self)
         self.nav.setTitle(self.main_screen.getTitleText())
-        self.nav.setLink(self.config_screen.getLinkText())
+        self.nav.setLinks(self.main_screen.getLinkText(),
+                          self.rspec_screen.getLinkText(),
+                          self.config_screen.getLinkText())
 
         self.status = Status(self)
         self.log = QLabel("<a href='showlog'>Show Log</a>", self)
@@ -87,16 +106,21 @@ class MainWindow(QWidget):
         self.setLayout(layout)
         self.resize(800, 600)
 
-        self.connect(self.nav.link, SIGNAL('linkActivated(QString)'),
-                     self.animateToScreen)
+        for link in (self.nav.main, self.nav.rspec, self.nav.config):
+            self.connect(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):
-        log = LogWindow(self)
-        log.show()
-        log.raise_()
-        log.activateWindow()
+        self.logWindow.show()
+        self.logWindow.resize(800, 400)
+        self.logWindow.raise_()
+        self.logWindow.activateWindow()
 
     def animatePixmap(self, y):
         self.pix.move(0, y)
@@ -106,9 +130,17 @@ class MainWindow(QWidget):
             self.next_screen = self.config_screen
         elif link == self.main_screen.name:
             self.next_screen = self.main_screen
-        
+        elif link == self.rspec_screen.name:
+            self.next_screen = self.rspec_screen
+
+        curr_screen = self.screens.currentWidget()
+
+        if self.next_screen == curr_screen:
+            self.setStatus("Already showing %s" % curr_screen.getTitleText(), timeout=1000)
+            return
+
         pixmap = QPixmap(self.screens.size())
-        self.screens.currentWidget().render(pixmap)
+        curr_screen.render(pixmap)
         self.screens.setCurrentWidget(self.pix)
         self.pix.setPixmap(pixmap)
 
@@ -124,16 +156,21 @@ class MainWindow(QWidget):
             self.toConfigScreen()
         elif self.next_screen == self.main_screen:
             self.toMainScreen()
+        elif self.next_screen == self.rspec_screen:
+            self.toRSpecScreen()
 
     def toConfigScreen(self):
         self.screens.setCurrentWidget(self.config_screen)
-        self.nav.setLink(self.main_screen.getLinkText())
         self.nav.setTitle(self.config_screen.getTitleText())
 
     def toMainScreen(self):
         self.screens.setCurrentWidget(self.main_screen)
-        self.nav.setLink(self.config_screen.getLinkText())
         self.nav.setTitle(self.main_screen.getTitleText())
 
+    def toRSpecScreen(self):
+        self.screens.setCurrentWidget(self.rspec_screen)
+        self.nav.setTitle(self.rspec_screen.getTitleText())
+
     def setStatus(self, msg, timeout):
         self.status.set(msg, timeout)
+