Changeset 281

Timestamp:

07/28/09 08:02:40 (3 years ago)

Author:

marc

Message:

new global for itaka min screen height, expander will hide prefs too

Location:

trunk

Files:

• config.py (modified) (1 diff)
• uigtk.py (modified) (12 diffs)

trunk/config.py

@@ -49 +49 @@
 image_dir = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), 'share/images/')
 system = os.name
+#: Minimum screen height to display all panes of Itaka
+min_screen_height = 800
 
 #: To be changed on install to specify where the installed files actually are

trunk/uigtk.py

@@ -404 +404 @@
 
         self.button_preferences = gtk.Button('Preferences', gtk.STOCK_PREFERENCES)
-        self.button_preferences.connect('clicked', self.expand_preferences)
+        self.button_preferences.connect('clicked', self._expand_preferences)
 
         # Set up some variables for our timeouts/animations
@@ -477 +477 @@
         self.button_log_clear_image.set_from_stock(gtk.STOCK_CLEAR, gtk.ICON_SIZE_BUTTON)
         self.button_log_clear.set_image(self.button_log_clear_image)
-        self.button_log_clear.connect('clicked', self.clear_logger)
+        self.button_log_clear.connect('clicked', self._clear_logger)
 
         self.button_log_pause = gtk.ToggleButton(_('Pause'))
@@ -497 +497 @@
         self.expander = gtk.Expander(None)
         self.expander.set_label_widget(self.label_log_box)
-        self.expander.connect('notify::expanded', self.expand_logger)
+        self.expander.connect('notify::expanded', self._expand_logger)
 
         self.vbox.pack_start(self.hbox_status, False, False, 4)
@@ -623 +623 @@
 
         self.button_preferences_close = gtk.Button('Close', gtk.STOCK_SAVE)
-        self.button_preferences_close.connect('clicked', self.contractpreferences)
+        self.button_preferences_close.connect('clicked', self._contract_preferences)
         
         self.button_preferences_about = gtk.Button('About', gtk.STOCK_ABOUT)
@@ -798 +798 @@
                 self.log.failure(('Gui', '_save_preferences'), _('Could not save preferences'), 'ERROR')
 
-    def expand_preferences(self, *args):
+    def _expand_preferences(self, *args):
         """
         Expands the window for preferences
@@ -807 +807 @@
         # start timer, resize, catch configure-notify, set up idle handler, when idle resize to what the size should be at this point of time, repeat
         if not self.preferences_expanded:
-            if ((gtk.gdk.screen_height() < 800) and self.expander.get_property("expanded")):
+            # Close log in small screen displays
+            if ((gtk.gdk.screen_height() < self.itaka_globals.min_screen_height) and self.expander.get_property("expanded")):
                 self.expander.set_expanded(False)
+
             if self.timeout_expand is not None:
                 """NOTE: GTK+ GtkWidget.size_request() method can give you the amount of size a widget will take
@@ -853 +855 @@
                     return False
             else:
-                self.timeout_expand = gobject.timeout_add(30, self.expand_preferences)
-
-    def contractpreferences(self, *args):
+                self.timeout_expand = gobject.timeout_add(30, self._expand_preferences)
+
+    def _contract_preferences(self, save):
         """
         Contracts the window of preferences
+
+        @type args: unknown
+        @param args: gtk.Widget or "False" if you don't want to save preferences, just hide the pane
         """
 
@@ -883 +888 @@
                 self.button_preferences.set_sensitive(True)
                 
-                # Save our settings 
-                self._save_preferences()
+                # Save our settings (but not if we are on small displays and we just want to hide the pane)
+                if save is not False:
+                    print_m("Saving")
+                    self._save_preferences()
 
                 self.timeout_contract = None
                 return False
         else:
-            self.timeout_contract = gobject.timeout_add(30, self.contractpreferences)
+            self.timeout_contract = gobject.timeout_add(30, self._contract_preferences, save)
 
     def _window_size_changed(self, widget=None, data=None):
@@ -917 +924 @@
         
         @type widget: instance
-        @SAVE widget: gtk.Widget
+        @param widget: gtk.Widget
 
         @type button: int
-        @SAVE button: The button pressed.
+        @param button: The button pressed.
 
         @type time: unknown
@@ -1012 +1019 @@
         self.about_dialog.destroy()
 
-    def expand_logger(self, expander, params):
+    def _expand_logger(self, expander, params):
         """
         Expand or contract the logger
@@ -1024 +1031 @@
 
         if self.expander.get_expanded():
+            # Close preferences pane in small screen displays
+            if ((gtk.gdk.screen_height() < self.itaka_globals.min_screen_height) and self.preferences_expanded):
+                # Tell it to not save
+                self._contract_preferences(False)
+
             # Show the debugvbox() and it's subwidgets
             self.vbox_log.show_all()
@@ -1033 +1045 @@
         return
 
-    def clear_logger(self, *args):
+    def _clear_logger(self, *args):
         """
         Clear the log