Changeset 9155 for branches/one_window/src/roster_window.py

Timestamp:

12/16/07 01:01:13 (11 months ago)

Author:

nicfit

Message:

MessageWindowMgr? knows about ONE_MESSAGE_WINDOW_ALWAYS_WITH_ROSTER and MessageWindow? can reparent itself rather then the roster having to do so.

Files:

• branches/one_window/src/roster_window.py (modified) (5 diffs)

branches/one_window/src/roster_window.py

@@ -1380 +1380 @@
                                         name += '/' + contact.resource
                                 jid_with_resource = contact.jid + '/' + contact.resource
-                                if gajim.interface.msg_win_mgr.has_window(jid_with_resource,
-                                account):
+                                if gajim.interface.msg_win_mgr.has_window(jid_with_resource, account):
                                         win = gajim.interface.msg_win_mgr.get_window(jid_with_resource,
                                                 account)
@@ -2663 +2662 @@
                 mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid, ctrl.account)
                 if not mw:
-                        mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact, \
+                        mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact,
                                 ctrl.account, ctrl.type_id)
                 ctrl.parent_win = mw
@@ -4262 +4261 @@
                                 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)
@@ -4399 +4401 @@
                         win.get_control(fjid, account).got_disconnected()
 
-                # FIXME: This is probably not the right place for this code.
-                if (gajim.config.get('one_message_window') == 'always' and
-                                gajim.config.get('one_message_window_with_roster')):
-                        win.window.hide()
-                        hpaned = self.xml.get_widget('roster_hpaned')
-                        notebook = win.xml.get_widget('notebook')
-                        notebook.reparent(hpaned)
-                        hpaned.pack2(notebook, resize=True, shrink=True)
-                        notebook.show_all()
-                else:
-                        win.window.present()
+                win.window.present()
 
         def on_row_activated(self, widget, path):
@@ -5337 +5329 @@
                 self.xml = gtkgui_helpers.get_glade('roster_window.glade')
                 self.window = self.xml.get_widget('roster_window')
+                self.hpaned = self.xml.get_widget('roster_hpaned')
                 self._music_track_changed_signal = None
-                gajim.interface.msg_win_mgr = MessageWindowMgr()
+                gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned)
                 self.advanced_menus = [] # We keep them to destroy them
                 if gajim.config.get('roster_window_skip_taskbar'):