X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=c5e0183358b5900424a82b9f20a120d8d85e8631;hp=7017dd7f40974a00a8979f5c25e1b9e10453133e;hb=75899ea9c4dbc29e3bb382a25b1f99730d5645c3;hpb=b9019fc9e549041f8f356aa1849ecb5cf1813e0d
diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 7017dd7..c5e0183 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,5 +1,4 @@
-
-import os
+import os, os.path
import sys
import time
@@ -8,35 +7,58 @@ 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
+from sface.screens.helpscreen import HelpScreen
+
+# depending on the platform..
+# could probably use Qt's resource system but looks overkill for just one file...
+def locate_image_file (filename):
+ for dir in [ '/usr/share', '/Applications/sface.app/Contents/Resources/sface' ] :
+ for suffix in ['png','jpg']:
+ attempt=os.path.join(dir,'images',"%s.%s"%(filename,suffix))
+ if os.path.isfile(attempt) : return attempt
+ return os.path.join('/could/not/locate/image/file',filename)
+
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.link2 = QLabel("", self)
- self.link2.setAlignment(Qt.AlignRight)
+ scene=QGraphicsScene()
+ pixmap = QPixmap(locate_image_file('graphic-sfa64'))
+ logolabel=QLabel("",self)
+ logolabel.setPixmap(pixmap)
+ self.main = QLabel("", self)
+ self.main.setAlignment(Qt.AlignRight)
+
+ self.config = QLabel("", self)
+ self.config.setAlignment(Qt.AlignRight)
+ self.help = QLabel("", self)
+ self.help.setAlignment(Qt.AlignRight)
+
hlayout = QHBoxLayout()
+ hlayout.addWidget(logolabel)
hlayout.addWidget(self.title)
hlayout.addStretch()
- hlayout.addWidget(QLabel("Go to: ", self))
- hlayout.addWidget(self.link1)
- hlayout.addWidget(self.link2)
+ gotolabel=QLabel("Go to: ", self)
+ gotolabel.setAlignment(Qt.AlignRight)
+ hlayout.addWidget(gotolabel)
+ hlayout.addWidget(self.main)
+ hlayout.addWidget(self.config)
+ hlayout.addWidget(self.help)
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, help):
+ self.main.setText(main)
+ self.config.setText(config)
+ self.help.setText(help)
class Status(QLabel):
@@ -62,34 +84,40 @@ 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.help_screen = HelpScreen(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.help_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.help_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()
@@ -97,24 +125,33 @@ class MainWindow(QWidget):
layout.addWidget(self.screens)
layout.addLayout(hlayout)
self.setLayout(layout)
- self.resize(800, 600)
+ self.resize(800, 500)
+
+ for link in (self.nav.main, self.nav.config, self.nav.help):
+ self.connect(link, SIGNAL('linkActivated(QString)'),
+ self.animateToScreen)
- 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.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, 200)
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 +160,20 @@ 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
-
+ elif link == self.help_screen.name:
+ self.next_screen = self.help_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,26 +189,24 @@ class MainWindow(QWidget):
self.toConfigScreen()
elif self.next_screen == self.main_screen:
self.toMainScreen()
- elif self.next_screen == self.rspec_screen:
- self.toRSpecScreen()
+ elif self.next_screen == self.help_screen:
+ self.toHelpScreen()
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 toHelpScreen(self):
+ self.screens.setCurrentWidget(self.help_screen)
+ self.nav.setTitle(self.help_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 rspecUpdated(self):
- self.rspec_screen.update_view()
+ def nodeSelectionChanged(self, hostname):
+ if self.rspecWindow.isVisible():
+ self.rspecWindow.showNode(hostname)