git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iteration on the dmg packager
[sface.git]
/
sface
/
mainwindow.py
diff --git
a/sface/mainwindow.py
b/sface/mainwindow.py
index
b04e638
..
6a0175e
100644
(file)
--- a/
sface/mainwindow.py
+++ b/
sface/mainwindow.py
@@
-8,9
+8,10
@@
from PyQt4.QtGui import *
from sface.config import config
from sface.logwindow import LogWindow
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.configscreen import ConfigScreen
from sface.screens.mainscreen import MainScreen
-from sface.screens.
rspecscreen import RSpec
Screen
+from sface.screens.
helpscreen import Help
Screen
class Nav(QWidget):
def __init__(self, parent=None):
class Nav(QWidget):
def __init__(self, parent=None):
@@
-20,28
+21,28
@@
class Nav(QWidget):
self.main = QLabel("", self)
self.main.setAlignment(Qt.AlignRight)
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)
self.config = QLabel("", self)
self.config.setAlignment(Qt.AlignRight)
+ self.help = QLabel("", self)
+ self.help.setAlignment(Qt.AlignRight)
+
hlayout = QHBoxLayout()
hlayout.addWidget(self.title)
hlayout.addStretch()
hlayout.addWidget(QLabel("Go to: ", self))
hlayout.addWidget(self.main)
hlayout = QHBoxLayout()
hlayout.addWidget(self.title)
hlayout.addStretch()
hlayout.addWidget(QLabel("Go to: ", self))
hlayout.addWidget(self.main)
- hlayout.addWidget(self.rspec)
hlayout.addWidget(self.config)
hlayout.addWidget(self.config)
+ hlayout.addWidget(self.help)
self.setLayout(hlayout)
def setTitle(self, title):
self.title.setText(title)
self.setLayout(hlayout)
def setTitle(self, title):
self.title.setText(title)
- def setLinks(self, main,
rspec, config
):
+ def setLinks(self, main,
config, help
):
self.main.setText(main)
self.main.setText(main)
- self.rspec.setText(rspec)
self.config.setText(config)
self.config.setText(config)
+ self.help.setText(help)
class Status(QLabel):
class Status(QLabel):
@@
-67,36
+68,40
@@
class Status(QLabel):
self.setText("")
QTimer.singleShot(1500, self.sliceUpdateDate)
self.setText("")
QTimer.singleShot(1500, self.sliceUpdateDate)
+
class MainWindow(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
self.logWindow = LogWindow(self)
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.pix = QLabel(self)
self.config_screen = ConfigScreen(self)
self.main_screen = MainScreen(self)
- self.
rspec_screen = RSpec
Screen(self)
+ self.
help_screen = Help
Screen(self)
self.screens = QStackedWidget(self)
self.screens.addWidget(self.main_screen)
self.screens.addWidget(self.config_screen)
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.main_screen.getLinkText(),
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.
config
_screen.getLinkText(),
+ self.
help
_screen.getLinkText())
self.status = Status(self)
self.log = QLabel("<a href='showlog'>Show Log</a>", self)
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 = QHBoxLayout()
hlayout.addWidget(self.status)
hlayout.addStretch()
+ hlayout.addWidget(self.rspec)
hlayout.addWidget(self.log)
layout = QVBoxLayout()
hlayout.addWidget(self.log)
layout = QVBoxLayout()
@@
-104,24
+109,33
@@
class MainWindow(QWidget):
layout.addWidget(self.screens)
layout.addLayout(hlayout)
self.setLayout(layout)
layout.addWidget(self.screens)
layout.addLayout(hlayout)
self.setLayout(layout)
- self.resize(800,
6
00)
+ self.resize(800,
5
00)
- for link in (self.nav.main, self.nav.
rspec, self.nav.config
):
+ for link in (self.nav.main, self.nav.
config, self.nav.help
):
self.connect(link, SIGNAL('linkActivated(QString)'),
self.animateToScreen)
self.connect(self.log, SIGNAL('linkActivated(QString)'),
self.showLogWindow)
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()
def redirectOutputToLog(self):
self.logWindow.redirectOutput()
def showLogWindow(self, link):
self.logWindow.show()
- self.logWindow.resize(800,
4
00)
+ self.logWindow.resize(800,
2
00)
self.logWindow.raise_()
self.logWindow.activateWindow()
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)
def animatePixmap(self, y):
self.pix.move(0, y)
@@
-130,8
+144,8
@@
class MainWindow(QWidget):
self.next_screen = self.config_screen
elif link == self.main_screen.name:
self.next_screen = self.main_screen
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()
curr_screen = self.screens.currentWidget()
@@
-139,6
+153,9
@@
class MainWindow(QWidget):
self.setStatus("Already showing %s" % curr_screen.getTitleText(), timeout=1000)
return
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)
pixmap = QPixmap(self.screens.size())
curr_screen.render(pixmap)
self.screens.setCurrentWidget(self.pix)
@@
-156,21
+173,24
@@
class MainWindow(QWidget):
self.toConfigScreen()
elif self.next_screen == self.main_screen:
self.toMainScreen()
self.toConfigScreen()
elif self.next_screen == self.main_screen:
self.toMainScreen()
- elif self.next_screen == self.
rspec
_screen:
- self.to
RSpec
Screen()
+ elif self.next_screen == self.
help
_screen:
+ self.to
Help
Screen()
def toConfigScreen(self):
self.screens.setCurrentWidget(self.config_screen)
self.nav.setTitle(self.config_screen.getTitleText())
def toConfigScreen(self):
self.screens.setCurrentWidget(self.config_screen)
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.setTitle(self.main_screen.getTitleText())
def toMainScreen(self):
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 setStatus(self, msg, timeout):
self.status.set(msg, timeout)
+ def nodeSelectionChanged(self, hostname):
+ if self.rspecWindow.isVisible():
+ self.rspecWindow.showNode(hostname)