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
set verbose to True by default
[sface.git]
/
sface
/
mainwindow.py
diff --git
a/sface/mainwindow.py
b/sface/mainwindow.py
index
89ca0d6
..
0ae038d
100644
(file)
--- a/
sface/mainwindow.py
+++ b/
sface/mainwindow.py
@@
-6,6
+6,7
@@
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from sface.config import config
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
+58,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)
@@
-88,7
+91,13
@@
class MainWindow(QWidget):
self.connect(self.nav.link, SIGNAL('linkActivated(QString)'),
self.animateToScreen)
self.connect(self.nav.link, SIGNAL('linkActivated(QString)'),
self.animateToScreen)
+ self.connect(self.log, SIGNAL('linkActivated(QString)'),
+ self.showLogWindow)
+ def showLogWindow(self, link):
+ self.logWindow.show()
+ self.logWindow.raise_()
+ self.logWindow.activateWindow()
def animatePixmap(self, y):
self.pix.move(0, y)
def animatePixmap(self, y):
self.pix.move(0, y)