Changeset 9157

Timestamp:

12/16/07 01:47:20 (10 months ago)

Author:

nicfit

Message:

Resizing fixes and make the roster window shrink when last tab is removed

Location:

branches/one_window/src

Files:

• message_control.py (modified) (3 diffs)
• message_window.py (modified) (5 diffs)
• roster_window.py (modified) (2 diffs)

branches/one_window/src/message_control.py

@@ -1 +1 @@
 ##      message_control.py
 ##
-## Copyright (C) 2006 Travis Shirk <travis@pobox.com>
+## Copyright (C) 2006-2007 Travis Shirk <travis@pobox.com>
 ## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de> 
 ##
@@ -35 +35 @@
                 # dict { cb id : widget} 
                 # keep all registered callbacks of widgets, created by self.xml
-                self.handlers = {} 
+                self.handlers = {}
                 self.type_id = type_id
                 self.parent_win = parent_win
@@ -127 +127 @@
                                 was_encrypted = True
 
-                        print "starting a new session, dropping the old one!"
-                        gajim.connections[self.account].delete_session(self.session.jid, self.session.thread_id)
+                        gajim.connections[self.account].delete_session(self.session.jid,
+                                                                        self.session.thread_id)
 
                 self.session = session

branches/one_window/src/message_window.py

@@ -428 +428 @@
                         # dnd clean up
                         self.notebook.drag_dest_unset()
-                        self.window.destroy()
+                        if self.parent_paned:
+                                # Don't close parent window, just remove the child
+                                child = self.parent_paned.get_child2()
+                                self.parent_paned.remove(child)
+                                # FIXME: restore preferred roster size
+                        else:
+                                self.window.destroy()
                         return # don't show_title, we are dead
                 elif self.get_num_controls() == 1: # we are going from two tabs to one
@@ -694 +700 @@
 
 ################################################################################
-class MessageWindowMgr:
+class MessageWindowMgr(gobject.GObject):
         '''A manager and factory for MessageWindow objects'''
+        __gsignals__ = {
+                'window-delete': (gobject.SIGNAL_RUN_LAST, None, (object,)),
+        }
 
         # These constants map to common.config.opt_one_window_types indices
@@ -717 +726 @@
                 ONE_MSG_WINDOW_PERACCT: The key is the account name
                 ONE_MSG_WINDOW_PERTYPE: The key is a message type constant'''
+                gobject.GObject.__init__(self)
                 self._windows = {}
 
@@ -879 +889 @@
                 for k in self._windows.keys():
                         if self._windows[k].window == win:
+                                self.emit('window-delete', self._windows[k])
                                 del self._windows[k]
                                 return
@@ -945 +956 @@
                         size_height_key = type + '-msgwin-height'
                 elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
-                        width -= msg_win.parent_paned.get_position()
+                        # Ignore any hpaned width
+                        width = msg_win.notebook.allocation.width
 
                 if acct:

branches/one_window/src/roster_window.py

@@ -5326 +5326 @@
                 return
 
+        def _on_message_window_delete(self, win_mgr, msg_win):
+                if gajim.config.get('one_message_window') == 'always_with_roster':
+                        gtkgui_helpers.resize_window(self.window,
+                                gajim.config.get('roster_width'),
+                                gajim.config.get('roster_height'))
+
         def __init__(self):
                 self.xml = gtkgui_helpers.get_glade('roster_window.glade')
@@ -5332 +5338 @@
                 self._music_track_changed_signal = None
                 gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned)
+                gajim.interface.msg_win_mgr.connect('window-delete', self._on_message_window_delete)
                 self.advanced_menus = [] # We keep them to destroy them
                 if gajim.config.get('roster_window_skip_taskbar'):