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
layouts
[sface.git]
/
sface
/
sfawindow.py
diff --git
a/sface/sfawindow.py
b/sface/sfawindow.py
index
9662160
..
4def49a
100644
(file)
--- a/
sface/sfawindow.py
+++ b/
sface/sfawindow.py
@@
-18,11
+18,17
@@
class SfaWindow(QWidget):
self.screens.addWidget(self.main_screen)
self.screens.addWidget(self.config_screen)
self.screens.addWidget(self.main_screen)
self.screens.addWidget(self.config_screen)
- self.switch = QLabel(self.config_screen.getLabelText(), self)
+ self.title = QLabel(self.main_screen.getTitleText(), self)
+ self.switch = QLabel(self.config_screen.getLinkText(), self)
self.switch.setAlignment(Qt.AlignRight)
self.switch.setAlignment(Qt.AlignRight)
+ hlayout = QHBoxLayout()
+ hlayout.addWidget(self.title)
+ hlayout.addStretch()
+ hlayout.addWidget(self.switch)
+
layout = QVBoxLayout()
layout = QVBoxLayout()
- layout.add
Widget(self.switch
)
+ layout.add
Layout(hlayout
)
layout.addWidget(self.screens)
self.setLayout(layout)
self.resize(800, 600)
layout.addWidget(self.screens)
self.setLayout(layout)
self.resize(800, 600)
@@
-38,11
+44,13
@@
class SfaWindow(QWidget):
def toConfigScreen(self):
self.screens.setCurrentWidget(self.config_screen)
def toConfigScreen(self):
self.screens.setCurrentWidget(self.config_screen)
- self.switch.setText(self.main_screen.getLabelText())
+ self.switch.setText(self.main_screen.getLinkText())
+ self.title.setText(self.config_screen.getTitleText())
def toMainScreen(self):
self.screens.setCurrentWidget(self.main_screen)
def toMainScreen(self):
self.screens.setCurrentWidget(self.main_screen)
- self.switch.setText(self.config_screen.getLabelText())
+ self.switch.setText(self.config_screen.getLinkText())
+ self.title.setText(self.main_screen.getTitleText())