X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=sface%2Fmainwindow.py;h=0b52d95670689bad917ae6632d5eeb43005edb07;hb=8ec23b298e338e6005b7a4d12480cc06a38ec03e;hp=46eb79ed73ef5be168225f3b105c75908435ed12;hpb=b09988e1840c80455eef1e745a4205b49c03d6d0;p=sface.git
diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 46eb79e..0b52d95 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,11 +1,14 @@
import os
+import sys
import time
from PyQt4.QtCore import *
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
@@ -14,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):
@@ -53,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)
@@ -69,19 +82,49 @@ 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()
layout.addWidget(self.nav)
layout.addWidget(self.screens)
- layout.addWidget(self.status)
+ layout.addLayout(hlayout)
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):
+ 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):
@@ -92,13 +135,22 @@ 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)
- timeLine = QTimeLine(800, self)
+ timeLine = QTimeLine(500, self)
timeLine.setFrameRange(0, self.screens.height());
self.connect(timeLine, SIGNAL('frameChanged(int)'), self.animatePixmap)
self.connect(timeLine, SIGNAL('finished()'), self.toNextScreen)
@@ -113,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)