X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;fp=sface%2Fmainwindow.py;h=2068989e6f57e3de0631763ff78e8f585bb1bde3;hp=719fd07884415169cae5360e6072fcbec312d800;hb=dc5a4a16b0819bc27efd1f77d632a76463db82c0;hpb=16876384173c217448f977faac6daa95702aea58 diff --git a/sface/mainwindow.py b/sface/mainwindow.py index 719fd07..2068989 100644 --- a/sface/mainwindow.py +++ b/sface/mainwindow.py @@ -9,7 +9,7 @@ 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 @@ -127,6 +127,7 @@ 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) @@ -155,15 +156,17 @@ class MainWindow(QWidget): self.nav.setTitle(self.screenWidgets[0].getTitleText()) self.status = Status(self) - self.tracker = QLabel("Show Xmlrpc", 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() @@ -183,6 +186,8 @@ class MainWindow(QWidget): 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() @@ -206,6 +211,12 @@ 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)