X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=ab552ce41e2626fd41b091c6d75ad0526d1c99e7;hp=fcedbd004d12f9341efbab4aa59b2c453b4508d1;hb=e3ff7b1a829714d72e135fd11f7746a01bc2492b;hpb=225f44c6dd0ced8e880a5a106f0563d390af54ee
diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index fcedbd0..ab552ce 100644
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -1,11 +1,14 @@
import os
+import sys
import time
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from sface.config import config
+from sface.logwindow import LogWindow
+from sface.xmlwindow import XmlWindow
from sface.screens.configscreen import ConfigScreen
from sface.screens.mainscreen import MainScreen
@@ -53,38 +56,91 @@ 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.xmlWindow = XmlWindow(self)
+
+ self.pix = QLabel(self)
self.config_screen = ConfigScreen(self)
self.main_screen = MainScreen(self)
self.screens = QStackedWidget(self)
self.screens.addWidget(self.main_screen)
self.screens.addWidget(self.config_screen)
+ self.screens.addWidget(self.pix)
+ self.next_screen = None
self.nav = Nav(self)
self.nav.setTitle(self.main_screen.getTitleText())
self.nav.setLink(self.config_screen.getLinkText())
self.status = Status(self)
+ self.log = QLabel("Show Log", self)
+ self.xml = QLabel("Show RSpec", self)
+
+ hlayout = QHBoxLayout()
+ hlayout.addWidget(self.status)
+ hlayout.addStretch()
+ hlayout.addWidget(self.log)
+ hlayout.addWidget(self.xml)
layout = QVBoxLayout()
layout.addWidget(self.nav)
layout.addWidget(self.screens)
- layout.addWidget(self.status)
+ layout.addLayout(hlayout)
self.setLayout(layout)
self.resize(800, 600)
self.connect(self.nav.link, SIGNAL('linkActivated(QString)'),
- self.toScreen)
-
- def toScreen(self, link):
+ self.animateToScreen)
+ self.connect(self.log, SIGNAL('linkActivated(QString)'),
+ self.showLogWindow)
+ self.connect(self.xml, SIGNAL('linkActivated(QString)'),
+ self.showXmlWindow)
+
+ def redirectOutputToLog(self):
+ self.logWindow.redirectOutput()
+
+ def showLogWindow(self, link):
+ self.logWindow.show()
+ self.logWindow.resize(500, 500)
+ self.logWindow.raise_()
+ self.logWindow.activateWindow()
+
+ def showXmlWindow(self, link):
+ self.xmlWindow.show()
+ self.xmlWindow.resize(500, 500)
+ self.xmlWindow.raise_()
+ self.xmlWindow.activateWindow()
+
+ def animatePixmap(self, y):
+ self.pix.move(0, y)
+
+ def animateToScreen(self, link):
if link == self.config_screen.name:
- self.toConfigScreen()
+ self.next_screen = self.config_screen
elif link == self.main_screen.name:
+ self.next_screen = self.main_screen
+
+ pixmap = QPixmap(self.screens.size())
+ self.screens.currentWidget().render(pixmap)
+ self.screens.setCurrentWidget(self.pix)
+ self.pix.setPixmap(pixmap)
+
+ timeLine = QTimeLine(500, self)
+ timeLine.setFrameRange(0, self.screens.height());
+ self.connect(timeLine, SIGNAL('frameChanged(int)'), self.animatePixmap)
+ self.connect(timeLine, SIGNAL('finished()'), self.toNextScreen)
+ timeLine.start()
+
+
+ def toNextScreen(self):
+ if self.next_screen == self.config_screen:
+ self.toConfigScreen()
+ elif self.next_screen == self.main_screen:
self.toMainScreen()
def toConfigScreen(self):