a little better navigation

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 689707f..140a6ff 100644 (file)
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -17,26 +17,31 @@ class Nav(QWidget):
         QWidget.__init__(self, parent)
         
         self.title = QLabel("", self)
         QWidget.__init__(self, parent)
         
         self.title = QLabel("", self)

-        self.link1 = QLabel("", self)
-        self.link1.setAlignment(Qt.AlignRight)
+        self.main = QLabel("", self)
+        self.main.setAlignment(Qt.AlignRight)

 
 

-        self.link2 = QLabel("", self)
-        self.link2.setAlignment(Qt.AlignRight)
+        self.rspec = QLabel("", self)
+        self.rspec.setAlignment(Qt.AlignRight)
+
+        self.config = QLabel("", self)
+        self.config.setAlignment(Qt.AlignRight)

         
         hlayout = QHBoxLayout()
         hlayout.addWidget(self.title)
         hlayout.addStretch()
         hlayout.addWidget(QLabel("Go to: ", self))
         
         hlayout = QHBoxLayout()
         hlayout.addWidget(self.title)
         hlayout.addStretch()
         hlayout.addWidget(QLabel("Go to: ", self))

-        hlayout.addWidget(self.link1)
-        hlayout.addWidget(self.link2)
+        hlayout.addWidget(self.main)
+        hlayout.addWidget(self.rspec)
+        hlayout.addWidget(self.config)

         self.setLayout(hlayout)
 
     def setTitle(self, title):
         self.title.setText(title)
 
         self.setLayout(hlayout)
 
     def setTitle(self, title):
         self.title.setText(title)
 

-    def setLinks(self, link1, link2):
-        self.link1.setText(link1)
-        self.link2.setText(link2)
+    def setLinks(self, main, rspec, config):
+        self.main.setText(main)
+        self.rspec.setText(rspec)
+        self.config.setText(config)

 
 
 class Status(QLabel):
 
 
 class Status(QLabel):


@@ -82,7 +87,9 @@ class MainWindow(QWidget):
 
         self.nav = Nav(self)
         self.nav.setTitle(self.main_screen.getTitleText())
 
         self.nav = Nav(self)
         self.nav.setTitle(self.main_screen.getTitleText())

-        self.nav.setLinks(self.rspec_screen.getLinkText(), self.config_screen.getLinkText())
+        self.nav.setLinks(self.main_screen.getLinkText(),
+                          self.rspec_screen.getLinkText(),
+                          self.config_screen.getLinkText())

 
         self.status = Status(self)
         self.log = QLabel("<a href='showlog'>Show Log</a>", self)
 
         self.status = Status(self)
         self.log = QLabel("<a href='showlog'>Show Log</a>", self)


@@ -99,10 +106,10 @@ class MainWindow(QWidget):
         self.setLayout(layout)
         self.resize(800, 600)
 
         self.setLayout(layout)
         self.resize(800, 600)
 

-        self.connect(self.nav.link1, SIGNAL('linkActivated(QString)'),
-                     self.animateToScreen)
-        self.connect(self.nav.link2, SIGNAL('linkActivated(QString)'),
-                     self.animateToScreen)
+        for link in (self.nav.main, self.nav.rspec, self.nav.config):
+            self.connect(link, SIGNAL('linkActivated(QString)'),
+                         self.animateToScreen)
+

         self.connect(self.log, SIGNAL('linkActivated(QString)'),
                      self.showLogWindow)
 
         self.connect(self.log, SIGNAL('linkActivated(QString)'),
                      self.showLogWindow)
 


@@ -125,9 +132,15 @@ class MainWindow(QWidget):
             self.next_screen = self.main_screen
         elif link == self.rspec_screen.name:
             self.next_screen = self.rspec_screen
             self.next_screen = self.main_screen
         elif link == self.rspec_screen.name:
             self.next_screen = self.rspec_screen

-        
+
+        curr_screen = self.screens.currentWidget()
+
+        if self.next_screen == curr_screen:
+            self.setStatus("Already showing %s" % curr_screen.getTitleText(), timeout=1000)
+            return
+

         pixmap = QPixmap(self.screens.size())
         pixmap = QPixmap(self.screens.size())

-        self.screens.currentWidget().render(pixmap)
+        curr_screen.render(pixmap)

         self.screens.setCurrentWidget(self.pix)
         self.pix.setPixmap(pixmap)
 
         self.screens.setCurrentWidget(self.pix)
         self.pix.setPixmap(pixmap)
 


@@ -148,17 +161,14 @@ class MainWindow(QWidget):
 
     def toConfigScreen(self):
         self.screens.setCurrentWidget(self.config_screen)
 
     def toConfigScreen(self):
         self.screens.setCurrentWidget(self.config_screen)

-        self.nav.setLinks(self.main_screen.getLinkText(), self.rspec_screen.getLinkText())

         self.nav.setTitle(self.config_screen.getTitleText())
 
     def toMainScreen(self):
         self.screens.setCurrentWidget(self.main_screen)
         self.nav.setTitle(self.config_screen.getTitleText())
 
     def toMainScreen(self):
         self.screens.setCurrentWidget(self.main_screen)

-        self.nav.setLinks(self.rspec_screen.getLinkText(), self.config_screen.getLinkText())

         self.nav.setTitle(self.main_screen.getTitleText())
 
     def toRSpecScreen(self):
         self.screens.setCurrentWidget(self.rspec_screen)
         self.nav.setTitle(self.main_screen.getTitleText())
 
     def toRSpecScreen(self):
         self.screens.setCurrentWidget(self.rspec_screen)

-        self.nav.setLinks(self.main_screen.getLinkText(), self.config_screen.getLinkText())

         self.nav.setTitle(self.rspec_screen.getTitleText())
 
     def setStatus(self, msg, timeout):
         self.nav.setTitle(self.rspec_screen.getTitleText())
 
     def setStatus(self, msg, timeout):