git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run in background
[sface.git]
/
sface
/
mainwindow.py
diff --git
a/sface/mainwindow.py
b/sface/mainwindow.py
index
39e68a0
..
689707f
100644
(file)
--- a/
sface/mainwindow.py
+++ b/
sface/mainwindow.py
@@
-10,26
+10,33
@@
from sface.config import config
from sface.logwindow import LogWindow
from sface.screens.configscreen import ConfigScreen
from sface.screens.mainscreen import MainScreen
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)
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):
@@
-64,16
+71,18
@@
class MainWindow(QWidget):
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.setLink
s(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)
@@
-90,7
+99,9
@@
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)
@@
-112,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)
@@
-130,16
+143,24
@@
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.setLink
s(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.setLink
s(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)
+