Changeset 9260

Timestamp:

01/22/08 22:08:24 (10 months ago)

Author:

jim++

Message:

Remove saveposition. Now we always save and restore positions and sizes. See #3638. steve-e, this bug
is still opened for what you told ;)

Location:

trunk/src

Files:

• common/config.py (modified) (1 diff)
• config.py (modified) (1 diff)
• dialogs.py (modified) (2 diffs)
• message_window.py (modified) (3 diffs)
• roster_window.py (modified) (2 diffs)

trunk/src/common/config.py

@@ -101 +101 @@
                 'collapsed_rows': [ opt_str, '', _('List (space separated) of rows (accounts and groups) that are collapsed.'), True ],
                 'roster_theme': [ opt_str, _('default'), '', True ],
-                'saveposition': [ opt_bool, True ],
                 'mergeaccounts': [ opt_bool, False, '', True ],
                 'sort_by_show': [ opt_bool, True, '', True ],

trunk/src/config.py

@@ -591 +591 @@
         def on_subscribe_tune_checkbutton_toggled(self, widget):
                 self.on_checkbutton_toggled(widget, 'subscribe_tune')
-
-        def on_save_position_checkbutton_toggled(self, widget):
-                self.on_checkbutton_toggled(widget, 'saveposition')
 
         def on_sort_by_show_checkbutton_toggled(self, widget):

trunk/src/dialogs.py

@@ -2062 +2062 @@
                 self.xml.signal_autoconnect(self)
 
-                if gajim.config.get('saveposition'):
-                        # get window position and size from config
-                        gtkgui_helpers.resize_window(self.window,
-                                gajim.config.get('single-msg-width'),
-                                gajim.config.get('single-msg-height'))
-                        gtkgui_helpers.move_window(self.window,
-                                gajim.config.get('single-msg-x-position'),
-                                gajim.config.get('single-msg-y-position'))
+                # get window position and size from config
+                gtkgui_helpers.resize_window(self.window,
+                        gajim.config.get('single-msg-width'),
+                        gajim.config.get('single-msg-height'))
+                gtkgui_helpers.move_window(self.window,
+                        gajim.config.get('single-msg-x-position'),
+                        gajim.config.get('single-msg-y-position'))
+
                 self.window.show_all()
 
@@ -2080 +2080 @@
 
         def save_pos(self):
-                if gajim.config.get('saveposition'):
-                        # save the window size and position
-                        x, y = self.window.get_position()
-                        gajim.config.set('single-msg-x-position', x)
-                        gajim.config.set('single-msg-y-position', y)
-                        width, height = self.window.get_size()
-                        gajim.config.set('single-msg-width', width)
-                        gajim.config.set('single-msg-height', height)
-                        gajim.interface.save_config()
+                # save the window size and position
+                x, y = self.window.get_position()
+                gajim.config.set('single-msg-x-position', x)
+                gajim.config.set('single-msg-y-position', y)
+                width, height = self.window.get_size()
+                gajim.config.set('single-msg-width', width)
+                gajim.config.set('single-msg-height', height)
+                gajim.interface.save_config()
 
         def on_single_message_window_delete_event(self, window, ev):

trunk/src/message_window.py

@@ -783 +783 @@
         def _resize_window(self, win, acct, type):
                 '''Resizes window according to config settings'''
-                if not gajim.config.get('saveposition'):
-                        return
-
                 if self.mode in (self.ONE_MSG_WINDOW_ALWAYS,
                                 self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER):
@@ -808 +805 @@
         def _position_window(self, win, acct, type):
                 '''Moves window according to config settings'''
-                if (not gajim.config.get('saveposition') or
-                self.mode in [self.ONE_MSG_WINDOW_NEVER,
-                                self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER]):
+                if (self.mode in [self.ONE_MSG_WINDOW_NEVER,
+                self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER]):
                         return
 
@@ -935 +931 @@
 
         def save_state(self, msg_win, width_adjust=0):
-                if not gajim.config.get('saveposition'):
-                        return
-
                 # Save window size and position
                 pos_x_key = 'msgwin-x-position'

trunk/src/roster_window.py

@@ -4250 +4250 @@
                 tell that to the core and exit gtk'''
                 msgwin_width_adjust = 0
-                if gajim.config.get('saveposition'):
-                        # in case show_roster_on_start is False and roster is never shown
-                        # window.window is None
-                        if self.window.window is not None:
-                                x, y = self.window.window.get_root_origin()
-                                gajim.config.set('roster_x-position', x)
-                                gajim.config.set('roster_y-position', y)
-                                width, height = self.window.get_size()
-                                # For the width use the size of the vbox containing the tree and
-                                # status combo, this will cancel out any hpaned width
-                                width = self.xml.get_widget('roster_vbox2').allocation.width
-                                gajim.config.set('roster_width', width)
-                                gajim.config.set('roster_height', height)
-                                if not self.xml.get_widget('roster_vbox2').get_property('visible'):
-                                        # The roster vbox is hidden, so the message window is larger
-                                        # then we want to save (i.e. the window will grow every startup)
-                                        # so adjust.
-                                        msgwin_width_adjust = -1 * width
+
+                # in case show_roster_on_start is False and roster is never shown
+                # window.window is None
+                if self.window.window is not None:
+                        x, y = self.window.window.get_root_origin()
+                        gajim.config.set('roster_x-position', x)
+                        gajim.config.set('roster_y-position', y)
+                        width, height = self.window.get_size()
+                        # For the width use the size of the vbox containing the tree and
+                        # status combo, this will cancel out any hpaned width
+                        width = self.xml.get_widget('roster_vbox2').allocation.width
+                        gajim.config.set('roster_width', width)
+                        gajim.config.set('roster_height', height)
+                        if not self.xml.get_widget('roster_vbox2').get_property('visible'):
+                                # The roster vbox is hidden, so the message window is larger
+                                # then we want to save (i.e. the window will grow every startup)
+                                # so adjust.
+                                msgwin_width_adjust = -1 * width
 
 
@@ -5420 +5420 @@
                 # no need of this variable
                 self.have_new_chat_accel = False # Is the "Ctrl+N" shown ?
-                if gajim.config.get('saveposition'):
-                        gtkgui_helpers.resize_window(self.window,
-                                gajim.config.get('roster_width'),
-                                gajim.config.get('roster_height'))
-                        gtkgui_helpers.move_window(self.window,
-                                gajim.config.get('roster_x-position'),
-                                gajim.config.get('roster_y-position'))
+                gtkgui_helpers.resize_window(self.window,
+                        gajim.config.get('roster_width'),
+                        gajim.config.get('roster_height'))
+                gtkgui_helpers.move_window(self.window,
+                        gajim.config.get('roster_x-position'),
+                        gajim.config.get('roster_y-position'))
 
                 self.popups_notification_height = 0