Changeset 9159 for branches/one_window/src/message_window.py

Timestamp:

12/16/07 03:49:30 (11 months ago)

Author:

nicfit

Message:

Handle window title setting in always_with_roster mode.

Files:

• branches/one_window/src/message_window.py (modified) (3 diffs)

branches/one_window/src/message_window.py

@@ -322 +322 @@
                 self.remove_tab(control, self.CLOSE_CLOSE_BUTTON)
 
-        def show_title(self, urgent = True, control = None):
+        def show_title(self, urgent=True, control=None):
                 '''redraw the window's title'''
                 if not control:
@@ -356 +356 @@
 
                 window_mode = gajim.interface.msg_win_mgr.mode
-
-                if self.get_num_controls() == 1:
-                        label = name
-                elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
+                if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
                         # Show the plural form since number of tabs > 1
                         if self.type == 'chat':
@@ -367 +364 @@
                         else:
                                 label = _('Private Chats')
+                elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
+                        label = None
+                elif self.get_num_controls() == 1:
+                        label = name
                 else:
                         label = _('Messages')
-                title = _('%s - Gajim') % label
+
+                title = 'Gajim'
+                if label:
+                        title = _('%s - %s') % (label, title)
 
                 if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT: