Changeset 46:43e46847479a for src

Timestamp:

03/18/12 19:18:36 (13 years ago)

Author:

István Váradi <locvais@…>

Branch:

default

Phase:

public

Message:

Some further enhancements on the GUI

Location:

src/mlx/gui

Files:

• flight.py (modified) (6 diffs)
• gui.py (modified) (5 diffs)

src/mlx/gui/flight.py

@@ -17 +17 @@
         self.add(frame)
 
-        print self.get_style()
         style = self.get_style() if pygobject else self.rc_get_style()
 
@@ -56 +55 @@
 
         self._buttonBox = gtk.HButtonBox()
+        self._defaultButton = None
         buttonAlignment.add(self._buttonBox)
 
@@ -66 +66 @@
         self._mainAlignment.add(widget)
 
-    def addButton(self, label):
+    def addButton(self, label, default = False):
         """Add a button with the given label.
 
@@ -72 +72 @@
         button = gtk.Button(label)
         self._buttonBox.add(button)
+        if default:
+            button.set_can_default(True)
+            self._defaultButton = button
         return button
 
+    def grabDefault(self):
+        """If the page has a default button, make it the default one."""
+        if self._defaultButton is not None:
+            self._defaultButton.grab_default()
+    
 #-----------------------------------------------------------------------------
 
@@ -128 +136 @@
         table.attach(self._rememberButton, 1, 2, 2, 3, ypadding = 8)
 
-        self._loginButton = self.addButton("_Login")
+        self._loginButton = self.addButton("_Login", default = True)
         self._loginButton.set_sensitive(False)
         self._loginButton.set_use_underline(True)
@@ -232 +240 @@
         """Go to the next page."""
         self.setCurrentPage(self._currentPage + 1)
+
+    def grabDefault(self):
+        """Make the default button of the current page the default."""
+        self._pages[self._currentPage].grabDefault()
     
 #-----------------------------------------------------------------------------

src/mlx/gui/gui.py

@@ -73 +73 @@
         mainVBox.add(notebook)
 
-        notebook.append_page(Wizard(self), gtk.Label("Flight"))
+        self._wizard = Wizard(self)
+        label = gtk.Label("_Flight")
+        label.set_use_underline(True)
+        label.set_tooltip_text("Flight wizard")
+        notebook.append_page(self._wizard, label)
 
         dataVBox = gtk.VBox()
-        notebook.append_page(dataVBox, gtk.Label("Data"))
+        label = gtk.Label("_Data")
+        label.set_use_underline(True)
+        label.set_tooltip_text("FSUIPC data access")
+        notebook.append_page(dataVBox, label)
 
         setupFrame = self._buildSetupFrame()
@@ -87 +94 @@
 
         logVBox = gtk.VBox()
-        notebook.append_page(logVBox, gtk.Label("Log"))
+        label = gtk.Label("_Log")
+        label.set_use_underline(True)
+        label.set_tooltip_text("Flight log")
+        notebook.append_page(logVBox, label)
         
         logFrame = self._buildLogFrame()
@@ -98 +108 @@
         mainVBox.pack_start(self._statusbar, False, False, 0)
 
-        window.show_all()        
+        notebook.connect("switch-page", self._notebookPageSwitch)
+
+        window.show_all()
+        self._wizard.grabDefault()
 
         self._mainWindow = window
@@ -374 +387 @@
         setupBox.pack_start(gtk.VSeparator(), False, False, 8)    
 
-        self._quitButton = gtk.Button(label = "Quit")
+        self._quitButton = gtk.Button(label = "_Quit", use_underline = True)
+        self._quitButton.set_can_default(True)
         self._quitButton.set_tooltip_text("Quit the program.")
         
@@ -707 +721 @@
         return gtk.main_quit()
 
+    def _notebookPageSwitch(self, notebook, page, page_num):
+        """Called when the current page of the notebook has changed."""
+        if page_num==0:
+            self._wizard.grabDefault()
+        elif page_num==1:
+            self._quitButton.grab_default()
+        else:
+            self._mainWindow.set_default(None)
+
 class TrackerStatusIcon(gtk.StatusIcon):
         def __init__(self):