layouts

diff --git a/sface.py b/sface.py
index eff49d0..4146ad9 100644 (file)
--- a/sface.py
+++ b/sface.py
@@ -11,6 +11,7 @@ def main(args):
 
     win = SfaWindow()
     win.show()
+    app.setActiveWindow(win)
 
     sys.exit(app.exec_())
 

diff --git a/sface/screens/sfascreen.py b/sface/screens/sfascreen.py
index cb8a266..b3f68e8 100644 (file)
--- a/sface/screens/sfascreen.py
+++ b/sface/screens/sfascreen.py
@@ -16,14 +16,13 @@ class SfaScreen(QWidget):
         self.name = name
         self.title = title
         self.widget = widget
-        self.label = QLabel("<b>%s</b>" % self.title, self)
-        self.label.setScaledContents(False)
 
         layout = QVBoxLayout(self)
-        layout.addWidget(self.label)
         layout.addWidget(self.widget)
-
         self.setLayout(layout)
 
-    def getLabelText(self):
+    def getLinkText(self):
         return "<a href='%s'>Go to %s</a>" % (self.name, self.name)
+
+    def getTitleText(self):
+        return "<b>%s</b>" % self.title

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.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)
         
+        hlayout = QHBoxLayout()
+        hlayout.addWidget(self.title)
+        hlayout.addStretch()
+        hlayout.addWidget(self.switch)
+
         layout = QVBoxLayout()
-        layout.addWidget(self.switch)
+        layout.addLayout(hlayout)
         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)
-        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)
-        self.switch.setText(self.config_screen.getLabelText())
+        self.switch.setText(self.config_screen.getLinkText())
+        self.title.setText(self.main_screen.getTitleText())