X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=2068989e6f57e3de0631763ff78e8f585bb1bde3;hp=1079fe00ed3430b92b0ae687a3fe9f36809520fd;hb=dc5a4a16b0819bc27efd1f77d632a76463db82c0;hpb=45b9f4bf0be035b42bb7b30c10628c0119661473 diff --git a/sface/mainwindow.py b/sface/mainwindow.py index 1079fe0..2068989 100644 --- a/sface/mainwindow.py +++ b/sface/mainwindow.py @@ -9,8 +9,9 @@ from PyQt4.QtGui import * import sface.screens from sface.config import config from sface.logwindow import LogWindow -from sface.rspecwindow import RSpecWindow +from sface.rspecwindow import RSpecWindow, ResourcesWindow from sface.screens.sfascreen import SfaScreen +from sface.xmlrpcwindow import get_tracker, init_tracker # depending on the platform.. # could probably use Qt's resource system but looks overkill for just one file... @@ -96,6 +97,7 @@ class Nav(QWidget): class Status(QLabel): def __init__(self, parent=None): QLabel.__init__(self, "", parent) + self.setMaximumWidth(640) self.sliceUpdateDate() def set(self, msg, timeout): @@ -125,6 +127,8 @@ class MainWindow(QWidget): # to our parent. Otherwise, getting a segfault on exit in Ubuntu. self.logWindow = LogWindow(parent) self.rspecWindow = RSpecWindow(parent) + self.resourcesWindow = ResourcesWindow(parent) + self.trackerWindow = init_tracker(parent) self.pix = QLabel(self) @@ -152,13 +156,17 @@ class MainWindow(QWidget): self.nav.setTitle(self.screenWidgets[0].getTitleText()) self.status = Status(self) - self.log = QLabel("Show Log", self) - self.rspec = QLabel("Show RSpec", self) + self.tracker = QLabel("Xmlrpc", self) + self.log = QLabel("Log", self) + self.rspec = QLabel("RSpec", self) + self.resources = QLabel("Resources", self) hlayout = QHBoxLayout() hlayout.addWidget(self.status) hlayout.addStretch() + hlayout.addWidget(self.tracker) hlayout.addWidget(self.rspec) + hlayout.addWidget(self.resources) hlayout.addWidget(self.log) layout = QVBoxLayout() @@ -172,14 +180,25 @@ class MainWindow(QWidget): self.connect(link, SIGNAL('linkActivated(QString)'), self.animateToScreen) + self.connect(self.tracker, SIGNAL('linkActivated(QString)'), + self.showTrackerWindow) self.connect(self.log, SIGNAL('linkActivated(QString)'), self.showLogWindow) self.connect(self.rspec, SIGNAL('linkActivated(QString)'), self.showRSpecWindow) + self.connect(self.resources, SIGNAL('linkActivated(QString)'), + self.showResourcesWindow) def redirectOutputToLog(self): self.logWindow.redirectOutput() + def showTrackerWindow(self): + tracker = get_tracker() + tracker.show() + tracker.resize(500, 640) + tracker.raise_() + tracker.activateWindow() + def showLogWindow(self, link): self.logWindow.show() self.logWindow.resize(800, 200) @@ -192,6 +211,11 @@ class MainWindow(QWidget): self.rspecWindow.raise_() self.rspecWindow.activateWindow() + def showResourcesWindow(self, link): + self.resourcesWindow.show() + self.resourcesWindow.resize(500, 640) + self.resourcesWindow.raise_() + self.resourcesWindow.activateWindow() def animatePixmap(self, y): self.pix.move(0, y) @@ -221,7 +245,6 @@ class MainWindow(QWidget): self.connect(timeLine, SIGNAL('finished()'), self.toNextScreen) timeLine.start() - def toNextScreen(self): self.screens.setCurrentWidget(self.next_screen) self.nav.setTitle(self.next_screen.getTitleText())