Changeset 9159

Timestamp:

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

Author:

nicfit

Message:

Handle window title setting in always_with_roster mode.

Location:

branches/one_window/src

Files:

• message_window.py (modified) (3 diffs)
• roster_window.py (modified) (1 diff)

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:

branches/one_window/src/roster_window.py

@@ -5228 +5228 @@
         def show_title(self):
                 change_title_allowed = gajim.config.get('change_roster_title')
+                if not change_title_allowed:
+                        return
+
+                if gajim.config.get('one_message_window') == 'always_with_roster':
+                        # always_with_roster mode defers to the MessageWindow
+                        if not gajim.interface.msg_win_mgr.one_window_opened(None, None, None):
+                                # No MessageWindow to defer to
+                                self.window.set_title('Gajim')
+                        return
+
                 nb_unread = 0
-                if change_title_allowed:
-                        start = ''
-                        for account in gajim.connections:
-                                # Count events in roster title only if we don't auto open them
-                                if not helpers.allow_popup_window(account):
-                                        nb_unread += gajim.events.get_nb_events(['chat', 'normal',
-                                                'file-request', 'file-error', 'file-completed',
-                                                'file-request-error', 'file-send-error', 'file-stopped',
-                                                'printed_chat'], account)
-                        if nb_unread > 1:
-                                start = '[' + str(nb_unread) + ']  '
-                        elif nb_unread == 1:
-                                start = '*  '
-                        self.window.set_title(start + 'Gajim')
+                start = ''
+                for account in gajim.connections:
+                        # Count events in roster title only if we don't auto open them
+                        if not helpers.allow_popup_window(account):
+                                nb_unread += gajim.events.get_nb_events(['chat', 'normal',
+                                        'file-request', 'file-error', 'file-completed',
+                                        'file-request-error', 'file-send-error', 'file-stopped',
+                                        'printed_chat'], account)
+                if nb_unread > 1:
+                        start = '[' + str(nb_unread) + ']  '
+                elif nb_unread == 1:
+                        start = '*  '
+                self.window.set_title(start + 'Gajim')
 
                 gtkgui_helpers.set_unset_urgency_hint(self.window, nb_unread)