X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fmainwindow.py;h=c57c3137185f02f5a75654053587a697af24f486;hb=bc9cce47260c4847c2c613548ca3b2e0eaa6b510;hp=719fd07884415169cae5360e6072fcbec312d800;hpb=3f712fe77f9809d493ecd7c0aec9ec1005254c3c;p=sface.git
diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 719fd07..c57c313 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -6,13 +6,18 @@ import traceback
from PyQt4.QtCore import *
from PyQt4.QtGui import *
+from distutils.version import LooseVersion
+from sfa.util.version import version_core
+
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
+MINIMUM_SFA_VERSION = "1.0-37"
+
# depending on the platform..
# could probably use Qt's resource system but looks overkill for just one file...
def locate_image_file (filename):
@@ -36,7 +41,7 @@ def load_screens(dirname):
# we want the stock screens to show up in a specific order. plugins can
# show up in any order afterward.
- sort_order = ["mainscreen", "userscreen", "configscreen", "helpscreen"]
+ sort_order = ["mainscreen", "statusscreen", "userscreen", "configscreen", "helpscreen"]
sort_order.reverse()
for modname in sort_order:
if modname in modnames:
@@ -63,6 +68,15 @@ def load_screens(dirname):
return screens
+def check_version():
+ sfa_version = version_core()['code_tag']
+ if (LooseVersion(sfa_version) < LooseVersion(MINIMUM_SFA_VERSION)):
+ QMessageBox.warning(None, "Old SFA Version", "sfa version %s is required. "
+ "Your installed version is %s. "
+ "Please upgrade your sfa and sfa-client packages."
+ % (MINIMUM_SFA_VERSION, sfa_version) )
+ sys.exit(-1)
+
class Nav(QWidget):
def __init__(self, screens, parent=None):
QWidget.__init__(self, parent)
@@ -123,10 +137,13 @@ class MainWindow(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
+ check_version()
+
# These are top-level windows and should be initialized with parent set
# 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 +172,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 +202,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()
@@ -190,7 +211,7 @@ class MainWindow(QWidget):
def showTrackerWindow(self):
tracker = get_tracker()
tracker.show()
- tracker.resize(500, 640)
+ tracker.resize(750, 580)
tracker.raise_()
tracker.activateWindow()
@@ -206,6 +227,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)