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
start output redirecting to the log viewer
[sface.git]
/
sface
/
mainwindow.py
diff --git
a/sface/mainwindow.py
b/sface/mainwindow.py
index
f3115a5
..
39e68a0
100644
(file)
--- a/
sface/mainwindow.py
+++ b/
sface/mainwindow.py
@@
-1,11
+1,13
@@
import os
import os
+import sys
import time
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from sface.config import config
import time
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from sface.config import config
+from sface.logwindow import LogWindow
from sface.screens.configscreen import ConfigScreen
from sface.screens.mainscreen import MainScreen
from sface.screens.configscreen import ConfigScreen
from sface.screens.mainscreen import MainScreen
@@
-57,6
+59,8
@@
class MainWindow(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
def __init__(self, parent=None):
QWidget.__init__(self, parent)
+ self.logWindow = LogWindow(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)
@@
-72,17
+76,33
@@
class MainWindow(QWidget):
self.nav.setLink(self.config_screen.getLinkText())
self.status = Status(self)
self.nav.setLink(self.config_screen.getLinkText())
self.status = Status(self)
+ self.log = QLabel("<a href='showlog'>Show Log</a>", self)
+
+ hlayout = QHBoxLayout()
+ hlayout.addWidget(self.status)
+ hlayout.addStretch()
+ hlayout.addWidget(self.log)
layout = QVBoxLayout()
layout.addWidget(self.nav)
layout.addWidget(self.screens)
layout = QVBoxLayout()
layout.addWidget(self.nav)
layout.addWidget(self.screens)
- layout.add
Widget(self.status
)
+ layout.add
Layout(hlayout
)
self.setLayout(layout)
self.resize(800, 600)
self.connect(self.nav.link, SIGNAL('linkActivated(QString)'),
self.animateToScreen)
self.setLayout(layout)
self.resize(800, 600)
self.connect(self.nav.link, SIGNAL('linkActivated(QString)'),
self.animateToScreen)
+ self.connect(self.log, SIGNAL('linkActivated(QString)'),
+ self.showLogWindow)
+
+ 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 animatePixmap(self, y):
self.pix.move(0, y)
def animatePixmap(self, y):
self.pix.move(0, y)