Changeset 147:7a297d30a0ce

Timestamp:

05/02/12 17:43:02 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added option to hide the window when minimized

Location:

src/mlx

Files:

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

src/mlx/config.py

@@ -37 +37 @@
 
         self._language = ""
+        self._hideMinimizedWindow = True
         self._onlineGateSystem = True
         self._onlineACARS = True
@@ -96 +97 @@
             self._modified = True
 
+    @property
+    def hideMinimizedWindow(self):
+        """Get whether a minimized window should be hidden."""
+        return self._hideMinimizedWindow
+
+    @hideMinimizedWindow.setter
+    def hideMinimizedWindow(self, hideMinimizedWindow):
+        """Set whether a minimized window should be hidden."""
+        if hideMinimizedWindow!=self._hideMinimizedWindow:
+            self._hideMinimizedWindow = hideMinimizedWindow
+            self._modified = True
+    
     @property
     def onlineGateSystem(self):
@@ -189 +202 @@
 
         self._language = self._get(config, "general", "language", "")
+        self._hideMinimizedWindow = self._getBoolean(config, "general",
+                                                     "hideMinimizedWindow",
+                                                     True)
         self._onlineGateSystem = self._getBoolean(config, "general",
                                                   "onlineGateSystem",
@@ -225 +241 @@
         if self._language:
             config.set("general", "language", self._language)
+        config.set("general", "hideMinimizedWindow",
+                   "yes" if self._hideMinimizedWindow else "no")
         config.set("general", "onlineGateSystem",
                    "yes" if self._onlineGateSystem else "no")

src/mlx/gui/gui.py

@@ -476 +476 @@
         iconified = gdk.WindowState.ICONIFIED if pygobject \
                     else gdk.WINDOW_STATE_ICONIFIED
-        if (event.changed_mask&iconified)!=0 and (event.new_window_state&iconified)!=0:
+        if self.config.hideMinimizedWindow and \
+           (event.changed_mask&iconified)!=0 and \
+           (event.new_window_state&iconified)!=0:
             self.hideMainWindow(savePosition = False)
 

src/mlx/gui/prefs.py

@@ -67 +67 @@
         """Setup the dialog from the given configuration."""
         self._setLanguage(config.language)
+        self._hideMinimizedWindow.set_active(config.hideMinimizedWindow)
         self._onlineGateSystem.set_active(config.onlineGateSystem)
         self._onlineACARS.set_active(config.onlineACARS)
@@ -91 +92 @@
         """Setup the given config from the settings in the dialog."""
         config.language = self._getLanguage()
+        config.hideMinimizedWindow = self._hideMinimizedWindow.get_active()
         config.onlineGateSystem = self._onlineGateSystem.get_active()
         config.onlineACARS = self._onlineACARS.get_active()
@@ -145 +147 @@
         self._changingLanguage = False
         self._warnedRestartNeeded = False
+
+        self._hideMinimizedWindow = gtk.CheckButton(xstr("prefs_hideMinimizedWindow"))
+        self._hideMinimizedWindow.set_use_underline(True)
+        self._hideMinimizedWindow.set_tooltip_text(xstr("prefs_hideMinimizedWindow_tooltip"))
+        mainBox.pack_start(self._hideMinimizedWindow, False, False, 4)
 
         self._onlineGateSystem = gtk.CheckButton(xstr("prefs_onlineGateSystem"))

src/mlx/i18n.py

@@ -595 +595 @@
         self.add("prefs_lang_en_GB", "English")
         self.add("prefs_lang_hu_HU", "Hungarian")
+        self.add("prefs_hideMinimizedWindow",
+                 "_Hide the main window when minimized")
+        self.add("prefs_hideMinimizedWindow_tooltip",
+                 "If checked, the main window will be hidden completely "
+                 "when minimized. You can still make it appear by "
+                 "clicking on the status icon or using its popup menu.")
         self.add("prefs_onlineGateSystem",
                  "_Use the Online Gate System")
@@ -1137 +1143 @@
         self.add("prefs_lang_en_GB", "angol")
         self.add("prefs_lang_hu_HU", "magyar")
+        self.add("prefs_hideMinimizedWindow",
+                 "A főablak _eltüntetése minimalizáláskor")
+        self.add("prefs_hideMinimizedWindow_tooltip",
+                 "Ha ezt kijelölöd, a főablak teljesen eltűnik, "
+                 "ha minimalizálod. A státuszikonra kattintással vagy annak "
+                 "menüje segítségével újra meg tudod jeleníteni.")
         self.add("prefs_onlineGateSystem",
                  "Az Online _Gate System használata")