Changeset 7829 for branches/gajim_0.11/src/chat_control.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/chat_control.py (modified) (8 diffs)

branches/gajim_0.11/src/chat_control.py

@@ -92 +92 @@
 
         def draw_banner(self):
-                self._paint_banner()
+                '''Draw the fat line at the top of the window that 
+                houses the icon, jid, ... 
+                '''
+                self.draw_banner_text()
                 self._update_banner_state_image()
-                # Derived types SHOULD implement this
+                # Derived types MAY implement this
+
+        def draw_banner_text(self):
+                pass # Derived types SHOULD implement this
 
         def update_ui(self):
@@ -101 +107 @@
 
         def repaint_themed_widgets(self):
+                self._paint_banner()
                 self.draw_banner()
                 # Derived classes MAY implement this
@@ -209 +216 @@
                 self.style_event_id = 0
                 self.conv_textview.tv.show()
+                self._paint_banner()
 
                 # For JEP-0172
@@ -850 +858 @@
                 self.handlers[id] = widget
 
-                self.hide_chat_buttons_always = gajim.config.get(
+                hide_chat_buttons_always = gajim.config.get(
                         'always_hide_chat_buttons')
-                self.chat_buttons_set_visible(self.hide_chat_buttons_always)
+                self.chat_buttons_set_visible(hide_chat_buttons_always)
                 self.widget_set_visible(self.xml.get_widget('banner_eventbox'),
                         gajim.config.get('hide_chat_banner'))
@@ -1012 +1020 @@
                 self._update_gpg()
 
-        def draw_banner(self, chatstate = None):
-                '''Draw the fat line at the top of the window that 
-                houses the status icon, name, jid.  The chatstate arg should
-                only be used if the control's chatstate member is NOT to be use, such as
-                composing, paused, etc.
+        def draw_banner_text(self):
+                '''Draw the text in the fat line at the top of the window that 
+                houses the name, jid. 
                 '''
-                ChatControlBase.draw_banner(self)
-
                 contact = self.contact
                 jid = contact.jid
@@ -1071 +1075 @@
                                 else:
                                         chatstate = ''
-                        elif chatstate is None:
+                        else:
+                                # When does that happen ? See [7797] and [7804]
                                 chatstate = helpers.get_uf_chatstate(cs)
 
@@ -1552 +1557 @@
         def handle_incoming_chatstate(self):
                 ''' handle incoming chatstate that jid SENT TO us '''
-                self.draw_banner()
+                self.draw_banner_text()
                 # update chatstate in tab for this chat
                 self.parent_win.redraw_tab(self, self.contact.chatstate)
@@ -1650 +1655 @@
                                         constants.KIND_CHAT_MSG_RECV):
                                 kind = 'incoming'
+                                name = self.contact.get_shown_name()
+                        elif row[1] == constants.KIND_ERROR:
+                                kind = 'status'
                                 name = self.contact.get_shown_name()