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
added XML visualization for RSpecs
[sface.git]
/
sface
/
mainwindow.py
diff --git
a/sface/mainwindow.py
b/sface/mainwindow.py
index
5ba17f1
..
39e68a0
100644
(file)
--- a/
sface/mainwindow.py
+++ b/
sface/mainwindow.py
@@
-1,5
+1,6
@@
import os
import os
+import sys
import time
from PyQt4.QtCore import *
import time
from PyQt4.QtCore import *
@@
-58,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)
@@
-92,11
+95,14
@@
class MainWindow(QWidget):
self.connect(self.log, SIGNAL('linkActivated(QString)'),
self.showLogWindow)
self.connect(self.log, SIGNAL('linkActivated(QString)'),
self.showLogWindow)
+ def redirectOutputToLog(self):
+ self.logWindow.redirectOutput()
+
def showLogWindow(self, link):
def showLogWindow(self, link):
-
log = LogWindow(self
)
-
log.show(
)
-
log
.raise_()
-
log
.activateWindow()
+
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)