Changeset 123:3b181cd0ab99 for src/mlx/gui

Timestamp:

04/29/12 06:48:38 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The Preferences dialog works

Location:

src/mlx/gui

Files:

• common.py (modified) (2 diffs)
• gui.py (modified) (6 diffs)
• info.py (modified) (1 diff)
• prefs.py (added)

src/mlx/gui/common.py

@@ -27 +27 @@
     BUTTONSTYPE_YES_NO = gtk.BUTTONS_YES_NO
     RESPONSETYPE_YES = gtk.RESPONSE_YES
+    RESPONSETYPE_ACCEPT = gtk.RESPONSE_ACCEPT
+    RESPONSETYPE_REJECT = gtk.RESPONSE_REJECT
     ACCEL_VISIBLE = gtk.ACCEL_VISIBLE
     CONTROL_MASK = gdk.CONTROL_MASK
+    DIALOG_MODAL = gtk.DIALOG_MODAL
 
     def text2unicode(text):
@@ -49 +52 @@
     BUTTONSTYPE_YES_NO = gtk.ButtonsType.YES_NO
     RESPONSETYPE_YES = gtk.ResponseType.YES
+    RESPONSETYPE_ACCEPT = gtk.ResponseType.ACCEPT
+    RESPONSETYPE_REJECT = gtk.ResponseType.REJECT
     ACCEL_VISIBLE = gtk.AccelFlags.VISIBLE
     CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
+    DIALOG_MODAL = gtk.DialogFlags.MODAL
 
     import codecs

src/mlx/gui/gui.py

@@ -10 +10 @@
 from mlx.gui.weighthelp import WeightHelp
 from mlx.gui.gates import FleetGateStatus
+from mlx.gui.prefs import Preferences
 
 import mlx.const as const
@@ -61 +62 @@
         """Build the GUI."""
         
-        window = gtk.Window()
+        self._mainWindow = window = gtk.Window()
         window.set_title(WINDOW_TITLE_BASE)
         window.set_icon_from_file(os.path.join(iconDirectory, "logo.ico"))
@@ -73 +74 @@
         window.add(mainVBox)
 
+        self._preferences = Preferences(self)
+
         menuBar = self._buildMenuBar(accelGroup)
         mainVBox.pack_start(menuBar, False, False, 0)
@@ -130 +133 @@
         self._weightHelp.reset()
         self._weightHelp.disable()
-
-        self._mainWindow = window
 
         self._statusIcon = StatusIcon(iconDirectory, self)
@@ -663 +664 @@
         fileMenu.append(quitMenuItem)
 
+        toolsMenuItem = gtk.MenuItem(xstr("menu_tools"))
+        toolsMenu = gtk.Menu()
+        toolsMenuItem.set_submenu(toolsMenu)
+        menuBar.append(toolsMenuItem)
+
+        prefsMenuItem = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
+        prefsMenuItem.set_use_stock(True)
+        prefsMenuItem.set_label(xstr("menu_tools_prefs"))
+        prefsMenuItem.add_accelerator("activate", accelGroup,
+                                      ord(xstr("menu_tools_prefs_key")),
+                                      CONTROL_MASK, ACCEL_VISIBLE)
+        prefsMenuItem.connect("activate", self._editPreferences)
+        toolsMenu.append(prefsMenuItem)
 
         viewMenuItem = gtk.MenuItem(xstr("menu_view"))
@@ -759 +773 @@
         else:
             self._mainWindow.set_default(None)
+
+    def _editPreferences(self, menuItem):
+        """Callback for editing the preferences."""
+        self._preferences.run(self.config)

src/mlx/gui/info.py

@@ -5 +5 @@
 from mlx.i18n import xstr
 import mlx.const as const
+
+#------------------------------------------------------------------------------
 
 class FlightInfo(gtk.VBox):