X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=0b52d95670689bad917ae6632d5eeb43005edb07;hp=140a6ffe6e0a1469d6e3ef308e05578cd860f74d;hb=08264e3523d39d7dc843c3a96a0a2849c6eb8a49;hpb=4afda5e76d8fabd8615ca0f18302337edeae1d36

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 140a6ff..0b52d95 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -8,9 +8,9 @@ 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):
@@ -20,9 +20,6 @@ class Nav(QWidget):
         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)
         
@@ -31,16 +28,14 @@ class Nav(QWidget):
         hlayout.addStretch()
         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 setLinks(self, main, rspec, config):
+    def setLinks(self, main, config):
         self.main.setText(main)
-        self.rspec.setText(rspec)
         self.config.setText(config)
 
 
@@ -67,36 +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.main_screen.getLinkText(),
-                          self.rspec_screen.getLinkText(),
                           self.config_screen.getLinkText())
 
         self.status = Status(self)
         self.log = QLabel("<a href='showlog'>Show Log</a>", self)
+        self.rspec = QLabel("<a href='showlog'>Show RSpec</a>", self)
 
         hlayout = QHBoxLayout()
         hlayout.addWidget(self.status)
         hlayout.addStretch()
+        hlayout.addWidget(self.rspec)
         hlayout.addWidget(self.log)
 
         layout = QVBoxLayout()
@@ -106,22 +102,31 @@ class MainWindow(QWidget):
         self.setLayout(layout)
         self.resize(800, 600)
 
-        for link in (self.nav.main, self.nav.rspec, self.nav.config):
+        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)
 
@@ -130,8 +135,6 @@ 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()
 
@@ -139,6 +142,9 @@ class MainWindow(QWidget):
             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())
         curr_screen.render(pixmap)
         self.screens.setCurrentWidget(self.pix)
@@ -156,8 +162,6 @@ 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)
@@ -167,10 +171,9 @@ class MainWindow(QWidget):
         self.screens.setCurrentWidget(self.main_screen)
         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)
 
+    def nodeSelectionChanged(self, hostname):
+        if self.rspecWindow.isVisible():
+            self.rspecWindow.showNode(hostname)