Changeset 249:d055e454a7ea for src

Timestamp:

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

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

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

Location:

src/mlx

Files:

• config.py (modified) (4 diffs)
• gui/gui.py (modified) (2 diffs)
• gui/prefs.py (modified) (3 diffs)
• i18n.py (modified) (2 diffs)

src/mlx/config.py

@@ -121 +121 @@
         self._language = ""
         self._hideMinimizedWindow = True
+        self._quitOnClose = False
         self._onlineGateSystem = True
         self._onlineACARS = True
@@ -211 +212 @@
         if hideMinimizedWindow!=self._hideMinimizedWindow:
             self._hideMinimizedWindow = hideMinimizedWindow
+            self._modified = True
+    
+    @property
+    def quitOnClose(self):
+        """Get whether the application should quit when the close button is
+        clicked."""
+        return self._quitOnClose
+
+    @quitOnClose.setter
+    def quitOnClose(self, quitOnClose):
+        """Set whether the application should quit when the close button is
+        clicked."""
+        if quitOnClose!=self._quitOnClose:
+            self._quitOnClose = quitOnClose
             self._modified = True
     
@@ -482 +497 @@
 
         self._language = self._get(config, "general", "language", "")
+
         self._hideMinimizedWindow = self._getBoolean(config, "general",
                                                      "hideMinimizedWindow",
                                                      True)
+        self._quitOnClose = self._getBoolean(config, "general",
+                                             "quitOnClose", False)
+        
         self._onlineGateSystem = self._getBoolean(config, "general",
                                                   "onlineGateSystem",
@@ -557 +576 @@
         config.set("general", "hideMinimizedWindow",
                    "yes" if self._hideMinimizedWindow else "no")
+        config.set("general", "quitOnClose",
+                   "yes" if self._quitOnClose else "no")
         config.set("general", "onlineGateSystem",
                    "yes" if self._onlineGateSystem else "no")

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"))        

src/mlx/i18n.py

@@ -702 +702 @@
                  "when minimized. You can still make it appear by "
                  "clicking on the status icon or using its popup menu.")
+        self.add("prefs_quitOnClose",
+                 "_Quit when the window close button is clicked")
+        self.add("prefs_quitOnClose_tooltip",
+                 "If checked, the application will quit when the window close "
+                 "button is clicked. Before quitting, the confirmation "
+                 "will be asked. If not checked, the window will be hidden "
+                 "to the tray.")
         self.add("prefs_onlineGateSystem",
                  "_Use the Online Gate System")
@@ -1572 +1579 @@
                  "ha minimalizálod. A státuszikonra kattintással vagy annak "
                  "menüje segítségével újra meg tudod jeleníteni.")
+        self.add("prefs_quitOnClose",
+                 "_Kilépés az ablakzáró gomb megnyomásakor")
+        self.add("prefs_quitOnClose_tooltip",
+                 "Ha ezt kijelölöd, a program az ablakzáró gomb megnyomására "
+                 "kilép, ha ebbéli szándékát megerősíted. Ha nem jelölöd "
+                 "ki, a főablak eltűnik, de a tálcaikon a helyén marad.")
         self.add("prefs_onlineGateSystem",
                  "Az Online _Gate System használata")