X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=689707fec3aad41d3ca6e15b87fa91dddc157fa5;hp=0bcd7664e1afef4ab080a492df0e7ed0363ff3f2;hb=6de9ffc916cb64e68d10892e05b712d73bc0f824;hpb=ec662155314ca0f10483a22f99f6673f1549e27b

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 0bcd766..689707f 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -8,29 +8,35 @@ 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
+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.link1 = QLabel("", self)
+        self.link1.setAlignment(Qt.AlignRight)
+
+        self.link2 = QLabel("", self)
+        self.link2.setAlignment(Qt.AlignRight)
         
         hlayout = QHBoxLayout()
         hlayout.addWidget(self.title)
         hlayout.addStretch()
-        hlayout.addWidget(self.link)
+        hlayout.addWidget(QLabel("Go to: ", self))
+        hlayout.addWidget(self.link1)
+        hlayout.addWidget(self.link2)
         self.setLayout(hlayout)
 
     def setTitle(self, title):
         self.title.setText(title)
 
-    def setLink(self, link):
-        self.link.setText(link)
+    def setLinks(self, link1, link2):
+        self.link1.setText(link1)
+        self.link2.setText(link2)
 
 
 class Status(QLabel):
@@ -61,31 +67,30 @@ class MainWindow(QWidget):
         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)
+        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.rspec_screen.getLinkText(), self.config_screen.getLinkText())
 
         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)
@@ -94,12 +99,12 @@ class MainWindow(QWidget):
         self.setLayout(layout)
         self.resize(800, 600)
 
-        self.connect(self.nav.link, SIGNAL('linkActivated(QString)'),
+        self.connect(self.nav.link1, SIGNAL('linkActivated(QString)'),
+                     self.animateToScreen)
+        self.connect(self.nav.link2, 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()
@@ -110,13 +115,6 @@ class MainWindow(QWidget):
         self.logWindow.raise_()
         self.logWindow.activateWindow()
 
-    def showXmlWindow(self, link):
-        self.xmlWindow.init_view()
-        self.xmlWindow.show()
-        self.xmlWindow.resize(500, 500)
-        self.xmlWindow.raise_()
-        self.xmlWindow.activateWindow()
-
     def animatePixmap(self, y):
         self.pix.move(0, y)
 
@@ -125,6 +123,8 @@ 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
         
         pixmap = QPixmap(self.screens.size())
         self.screens.currentWidget().render(pixmap)
@@ -143,16 +143,24 @@ 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.setLinks(self.main_screen.getLinkText(), self.rspec_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.setLinks(self.rspec_screen.getLinkText(), self.config_screen.getLinkText())
         self.nav.setTitle(self.main_screen.getTitleText())
 
+    def toRSpecScreen(self):
+        self.screens.setCurrentWidget(self.rspec_screen)
+        self.nav.setLinks(self.main_screen.getLinkText(), self.config_screen.getLinkText())
+        self.nav.setTitle(self.rspec_screen.getTitleText())
+
     def setStatus(self, msg, timeout):
         self.status.set(msg, timeout)
+