X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fmainwindow.py;h=140a6ffe6e0a1469d6e3ef308e05578cd860f74d;hb=56eeddf9de82bfb79a5cced82e448809eefe9352;hp=ab552ce41e2626fd41b091c6d75ad0526d1c99e7;hpb=af547c974bce8d8a7952cfc8089ef30e5d8e4bdf;p=sface.git
diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index ab552ce..140a6ff 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -8,29 +8,40 @@ 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.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):
@@ -61,31 +72,32 @@ 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.main_screen.getLinkText(),
+ self.rspec_screen.getLinkText(),
+ 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)
@@ -94,12 +106,12 @@ 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)
- self.connect(self.xml, SIGNAL('linkActivated(QString)'),
- self.showXmlWindow)
def redirectOutputToLog(self):
self.logWindow.redirectOutput()
@@ -110,12 +122,6 @@ class MainWindow(QWidget):
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)
@@ -124,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)
@@ -142,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)
+