X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=sface%2Fmainwindow.py;h=0b52d95670689bad917ae6632d5eeb43005edb07;hb=cb3b38cb5ecb4169945568e338efed9ed53735c5;hp=689707fec3aad41d3ca6e15b87fa91dddc157fa5;hpb=d93310c8e667d3256c07272c0f3a719cdd1fa719;p=sface.git
diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 689707f..0b52d95 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -8,35 +8,35 @@ from PyQt4.QtGui import *
from sface.config import config
from sface.logwindow import LogWindow
+from sface.rspecwindow import RSpecWindow
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.link1 = QLabel("", self)
- self.link1.setAlignment(Qt.AlignRight)
+ self.main = QLabel("", self)
+ self.main.setAlignment(Qt.AlignRight)
- self.link2 = QLabel("", self)
- self.link2.setAlignment(Qt.AlignRight)
+ self.config = QLabel("", self)
+ self.config.setAlignment(Qt.AlignRight)
hlayout = QHBoxLayout()
hlayout.addWidget(self.title)
hlayout.addStretch()
hlayout.addWidget(QLabel("Go to: ", self))
- hlayout.addWidget(self.link1)
- hlayout.addWidget(self.link2)
+ hlayout.addWidget(self.main)
+ hlayout.addWidget(self.config)
self.setLayout(hlayout)
def setTitle(self, title):
self.title.setText(title)
- def setLinks(self, link1, link2):
- self.link1.setText(link1)
- self.link2.setText(link2)
+ def setLinks(self, main, config):
+ self.main.setText(main)
+ self.config.setText(config)
class Status(QLabel):
@@ -62,34 +62,37 @@ class Status(QLabel):
self.setText("")
QTimer.singleShot(1500, self.sliceUpdateDate)
+
class MainWindow(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
self.logWindow = LogWindow(self)
+ self.rspecWindow = RSpecWindow(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.setLinks(self.rspec_screen.getLinkText(), self.config_screen.getLinkText())
+ self.nav.setLinks(self.main_screen.getLinkText(),
+ self.config_screen.getLinkText())
self.status = Status(self)
self.log = QLabel("Show Log", self)
+ self.rspec = QLabel("Show RSpec", self)
hlayout = QHBoxLayout()
hlayout.addWidget(self.status)
hlayout.addStretch()
+ hlayout.addWidget(self.rspec)
hlayout.addWidget(self.log)
layout = QVBoxLayout()
@@ -99,22 +102,31 @@ class MainWindow(QWidget):
self.setLayout(layout)
self.resize(800, 600)
- self.connect(self.nav.link1, SIGNAL('linkActivated(QString)'),
- self.animateToScreen)
- self.connect(self.nav.link2, SIGNAL('linkActivated(QString)'),
- self.animateToScreen)
+ for link in (self.nav.main, self.nav.config):
+ self.connect(link, SIGNAL('linkActivated(QString)'),
+ self.animateToScreen)
+
self.connect(self.log, SIGNAL('linkActivated(QString)'),
self.showLogWindow)
+ self.connect(self.rspec, SIGNAL('linkActivated(QString)'),
+ self.showRSpecWindow)
def redirectOutputToLog(self):
self.logWindow.redirectOutput()
def showLogWindow(self, link):
self.logWindow.show()
- self.logWindow.resize(500, 500)
+ self.logWindow.resize(800, 400)
self.logWindow.raise_()
self.logWindow.activateWindow()
+ def showRSpecWindow(self, link):
+ self.rspecWindow.show()
+ self.rspecWindow.resize(500, 640)
+ self.rspecWindow.raise_()
+ self.rspecWindow.activateWindow()
+
+
def animatePixmap(self, y):
self.pix.move(0, y)
@@ -123,11 +135,18 @@ 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
+
+ # This is an optimization to have a smoother animation. We
+ # render the widget into a pixmap and animate that instead of
+ # moving the whole widget around.
pixmap = QPixmap(self.screens.size())
- self.screens.currentWidget().render(pixmap)
+ curr_screen.render(pixmap)
self.screens.setCurrentWidget(self.pix)
self.pix.setPixmap(pixmap)
@@ -143,24 +162,18 @@ 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.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.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)
+ def nodeSelectionChanged(self, hostname):
+ if self.rspecWindow.isVisible():
+ self.rspecWindow.showNode(hostname)