X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fmainwindow.py;h=0b52d95670689bad917ae6632d5eeb43005edb07;hb=cb346e87aaf444b1142e80a8cec1e64df6a122cf;hp=5ba17f11705e7328ed53fe9aad0faaf049e18d6e;hpb=4c1046ce18cb25a8a045ca588d975723af36ea1a;p=sface.git
diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 5ba17f1..0b52d95 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,5 +1,6 @@
import os
+import sys
import time
from PyQt4.QtCore import *
@@ -7,6 +8,7 @@ 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
@@ -15,20 +17,26 @@ class Nav(QWidget):
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.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.config)
self.setLayout(hlayout)
def setTitle(self, title):
self.title.setText(title)
- def setLink(self, link):
- self.link.setText(link)
+ def setLinks(self, main, config):
+ self.main.setText(main)
+ self.config.setText(config)
class Status(QLabel):
@@ -54,10 +62,14 @@ 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)
@@ -70,14 +82,17 @@ class MainWindow(QWidget):
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.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()
@@ -87,16 +102,30 @@ 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.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):
- log = LogWindow(self)
- log.show()
- log.raise_()
- log.activateWindow()
+ self.logWindow.show()
+ 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)
@@ -106,9 +135,18 @@ class MainWindow(QWidget):
self.next_screen = self.config_screen
elif link == self.main_screen.name:
self.next_screen = self.main_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)
@@ -127,13 +165,15 @@ class MainWindow(QWidget):
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 setStatus(self, msg, timeout):
self.status.set(msg, timeout)
+
+ def nodeSelectionChanged(self, hostname):
+ if self.rspecWindow.isVisible():
+ self.rspecWindow.showNode(hostname)