Changeset 249:d055e454a7ea for src/mlx/gui

Timestamp:

06/19/12 14:52:44 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Implemented option to control whether to quit or hide when the window close button is pressed

Location:

src/mlx/gui

Files:

• gui.py (modified) (2 diffs)
• prefs.py (modified) (3 diffs)

src/mlx/gui/gui.py

@@ -83 +83 @@
         window.set_icon_from_file(os.path.join(iconDirectory, "logo.ico"))
         window.set_resizable(False)
-        window.connect("delete-event",
-                       lambda a, b: self.hideMainWindow())
+        window.connect("delete-event", self.deleteMainWindow)
         window.connect("window-state-event", self._handleMainWindowState)
         accelGroup = gtk.AccelGroup()
@@ -568 +567 @@
             self.showMainWindow()
         self._mainWindow.present()
+
+    def deleteMainWindow(self, window, event):
+        """Handle the delete event for the main window."""
+        if self.config.quitOnClose:
+            self._quit()
+        else:
+            self.hideMainWindow()
+        return True
 
     def hideMainWindow(self, savePosition = True):

src/mlx/gui/prefs.py

@@ -225 +225 @@
         self._setLanguage(config.language)
         self._hideMinimizedWindow.set_active(config.hideMinimizedWindow)
+        self._quitOnClose.set_active(config.quitOnClose)
         self._onlineGateSystem.set_active(config.onlineGateSystem)
         self._onlineACARS.set_active(config.onlineACARS)
@@ -270 +271 @@
         config.language = self._getLanguage()
         config.hideMinimizedWindow = self._hideMinimizedWindow.get_active()
+        config.quitOnClose = self._quitOnClose.get_active()
         config.onlineGateSystem = self._onlineGateSystem.get_active()
         config.onlineACARS = self._onlineACARS.get_active()
@@ -347 +349 @@
         self._hideMinimizedWindow.set_tooltip_text(xstr("prefs_hideMinimizedWindow_tooltip"))
         guiBox.pack_start(self._hideMinimizedWindow, False, False, 4)
+
+        self._quitOnClose = gtk.CheckButton(xstr("prefs_quitOnClose"))
+        self._quitOnClose.set_use_underline(True)
+        self._quitOnClose.set_tooltip_text(xstr("prefs_quitOnClose_tooltip"))
+        guiBox.pack_start(self._quitOnClose, False, False, 4)
 
         onlineBox = self._createFrame(mainBox, xstr("prefs_frame_online"))