implement xmlwindow as a screen (rspecscreen)

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 0bcd766..5d17f80 100644 (file)
--- 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.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.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)
 
 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 = 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)
 
         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):
 
 
 class Status(QLabel):


@@ -61,31 +67,30 @@ class MainWindow(QWidget):
         QWidget.__init__(self, parent)
 
         self.logWindow = LogWindow(self)
         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.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 = 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.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.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 = QHBoxLayout()
         hlayout.addWidget(self.status)
         hlayout.addStretch()
         hlayout.addWidget(self.log)

-        hlayout.addWidget(self.xml)

 
         layout = QVBoxLayout()
         layout.addWidget(self.nav)
 
         layout = QVBoxLayout()
         layout.addWidget(self.nav)


@@ -94,12 +99,12 @@ class MainWindow(QWidget):
         self.setLayout(layout)
         self.resize(800, 600)
 
         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.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 redirectOutputToLog(self):
         self.logWindow.redirectOutput()


@@ -110,13 +115,6 @@ class MainWindow(QWidget):
         self.logWindow.raise_()
         self.logWindow.activateWindow()
 
         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)
 
     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
             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)
         
         pixmap = QPixmap(self.screens.size())
         self.screens.currentWidget().render(pixmap)


@@ -143,16 +143,23 @@ class MainWindow(QWidget):
             self.toConfigScreen()
         elif self.next_screen == self.main_screen:
             self.toMainScreen()
             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)
 
     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.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())
 
         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)
     def setStatus(self, msg, timeout):
         self.status.set(msg, timeout)

diff --git a/sface/xmlwindow.py b/sface/screens/rspecscreen.py
similarity index 94%
rename from sface/xmlwindow.py
rename to sface/screens/rspecscreen.py
index 2fb3183..4c8c041 100644 (file)
--- a/sface/xmlwindow.py
+++ b/sface/screens/rspecscreen.py
@@ -6,6 +6,7 @@ from PyQt4.QtGui import *
 from PyQt4.QtXml import *
 
 from sface.config import config
 from PyQt4.QtXml import *
 
 from sface.config import config

+from sface.screens.sfascreen import SfaScreen

 
 
 class DomModel(QAbstractItemModel):
 
 
 class DomModel(QAbstractItemModel):


@@ -154,12 +155,9 @@ class DomItem:
         return self.rowNumber
     
 
         return self.rowNumber
     
 

-
-class XmlWindow(QDialog):
+class RSpecWidget(QWidget):

     def __init__(self, parent=None):
     def __init__(self, parent=None):

-        QDialog.__init__(self, parent)
-        self.setWindowTitle("RSpec View")
-
+        QWidget.__init__(self, parent)

 
     def init_view(self):
         document = QDomDocument("RSpec")
 
     def init_view(self):
         document = QDomDocument("RSpec")


@@ -178,3 +176,11 @@ class XmlWindow(QDialog):
         self.setLayout(layout)
 
 
         self.setLayout(layout)
 
 

+class RSpecScreen(SfaScreen):
+    def __init__(self, parent):
+        SfaScreen.__init__(self, parent)
+        
+        widget = RSpecWidget(self)
+        self.init(widget, "RSpec Window", "RSPec View")
+
+

diff --git a/sface/screens/sfascreen.py b/sface/screens/sfascreen.py
index d8d62e7..489cbfe 100644 (file)
--- a/sface/screens/sfascreen.py
+++ b/sface/screens/sfascreen.py
@@ -23,7 +23,7 @@ class SfaScreen(QWidget):
         self.setLayout(layout)
 
     def getLinkText(self):
         self.setLayout(layout)
 
     def getLinkText(self):

-        return "<a href='%s'>Go to %s</a>" % (self.name, self.name)
+        return "<a href='%s'>%s</a>" % (self.name, self.name)

 
     def getTitleText(self):
         return "<b>%s</b>" % self.title
 
     def getTitleText(self):
         return "<b>%s</b>" % self.title