Changeset 7984 for branches/gajim_0.11/src

Timestamp:

02/15/07 19:05:38 (19 months ago)

Author:

asterix

Message:

mrege diff from trunk

Location:

branches/gajim_0.11/src

Files:

• chat_control.py (modified) (6 diffs)
• common/connection.py (modified) (3 diffs)
• common/dataforms.py (modified) (2 diffs)
• config.py (modified) (2 diffs)
• conversation_textview.py (modified) (3 diffs)
• disco.py (modified) (8 diffs)
• gajim.py (modified) (2 diffs)
• groupchat_control.py (modified) (8 diffs)
• message_control.py (modified) (2 diffs)
• message_window.py (modified) (1 diff)
• roster_window.py (modified) (1 diff)

branches/gajim_0.11/src/chat_control.py

@@ -118 +118 @@
                 pass # Derived should implement this rather than connecting to the event itself.
 
-        def __init__(self, type_id, parent_win, widget_name, display_names, contact,
-        acct, resource = None):
+        def __init__(self, type_id, parent_win, widget_name, contact, acct, 
+        resource = None):
                 MessageControl.__init__(self, type_id, parent_win, widget_name,
-                        display_names,  contact, acct, resource = resource);
+                        contact, acct, resource = resource);
                 # when/if we do XHTML we will put formatting buttons back
                 widget = self.xml.get_widget('emoticons_button')
@@ -171 +171 @@
                 self.sent_history = []
                 self.sent_history_pos = 0
-                self.typing_new = False
-                self.orig_msg = ''
+                self.orig_msg = None
 
                 # Emoticons menu
@@ -542 +541 @@
                         self.sent_history.append(message)
                         self.sent_history_pos = size + 1
-
-                self.typing_new = True
-                self.orig_msg = ''
+                self.orig_msg = None
 
         def print_conversation_line(self, text, kind, name, tim,
@@ -787 +784 @@
         def sent_messages_scroll(self, direction, conv_buf):
                 size = len(self.sent_history) 
-                if self.typing_new:
-                        #user was typing something and then went into history, so save
-                        #whatever is already typed
+                if self.orig_msg is None:
+                        # user was typing something and then went into history, so save
+                        # whatever is already typed
                         start_iter = conv_buf.get_start_iter()
                         end_iter = conv_buf.get_end_iter()
                         self.orig_msg = conv_buf.get_text(start_iter, end_iter, 0).decode(
                                 'utf-8')
-                        self.typing_new = False
                 if direction == 'up':
                         if self.sent_history_pos == 0:
@@ -803 +799 @@
                         if self.sent_history_pos >= size - 1:
                                 conv_buf.set_text(self.orig_msg);
-                                self.typing_new = True
+                                self.orig_msg = None
                                 self.sent_history_pos = size
                                 return
@@ -854 +850 @@
         def __init__(self, parent_win, contact, acct, resource = None):
                 ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
-                        'chat_child_vbox', (_('Chat'), _('Chats')), contact, acct, resource)
+                        'chat_child_vbox', contact, acct, resource)
                         
                 # for muc use:

branches/gajim_0.11/src/common/connection.py

@@ -638 +638 @@
                         msg = ''
                 keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-                if keyID and USE_GPG and not msg:
-                        lowered_uf_status_msg = helpers.get_uf_show(show).lower()
-                        # do not show I'm invisible!
-                        if lowered_uf_status_msg == _('invisible').lower():
-                                lowered_uf_status_msg = _('offline').lower()
-                        msg = _("I'm %s") % lowered_uf_status_msg
                 signed = ''
                 if not auto and not show == 'offline':
@@ -1058 +1052 @@
                 self.connection.send(p)
 
-                #last date/time in history to avoid duplicate
+                # last date/time in history to avoid duplicate
                 if not self.last_history_line.has_key(room_jid): 
                         # Not in memory, get it from DB
@@ -1086 +1080 @@
                         to = room_jid)
                 self.connection.send(iq)
-
-        def change_gc_nick(self, room_jid, nick):
-                if not self.connection:
-                        return
-                p = common.xmpp.Presence(to = '%s/%s' % (room_jid, nick))
-                p = self.add_sha(p)
-                self.connection.send(p)
 
         def send_gc_status(self, nick, jid, show, status):

branches/gajim_0.11/src/common/dataforms.py

@@ -367 +367 @@
                 def fget(self):
                         value = u''
-                        for valuenode in self.getTags('value'):
+                        for valuenode in self.getTags('instructions'):
                                 value += '\n' + valuenode.getData()
                         return value[1:]
@@ -374 +374 @@
                         if value == '': return
                         for line in value.split('\n'):
-                                self.addChild('value').setData(line)
-                def fdel(self):
-                        for value in self.getTags('value'):
+                                self.addChild('instructions').setData(line)
+                def fdel(self):
+                        for value in self.getTags('instructions'):
                                 self.delChild(value)
                 return locals()

branches/gajim_0.11/src/config.py

@@ -762 +762 @@
         def on_reset_colors_button_clicked(self, widget):
                 for i in ('inmsgcolor', 'outmsgcolor', 'statusmsgcolor', 'urlmsgcolor'):
-                        gajim.config.set(i, gajim.interface.default_values[i])
+                        gajim.config.set(i, gajim.interface.default_colors[i])
 
                 self.xml.get_widget('incoming_msg_colorbutton').set_color(\
@@ -901 +901 @@
                         model[iter][3])
                 gajim.config.set_per('defaultstatusmsg', status, 'message', message)
+
+        def on_default_status_expander_activate(self, expander):
+                eventbox = self.xml.get_widget('default_status_eventbox')
+                vbox = self.xml.get_widget('status_vbox')
+                vbox.set_child_packing(eventbox, not expander.get_expanded(), True, 0,
+                        gtk.PACK_START)
 
         def save_status_messages(self, model):

branches/gajim_0.11/src/conversation_textview.py

@@ -36 +36 @@
         '''Class for the conversation textview (where user reads already said messages)
         for chat/groupchat windows'''
+        
+        path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png')
+        FOCUS_OUT_LINE_PIXBUF = gtk.gdk.pixbuf_new_from_file(path_to_file)
+
         def __init__(self, account, used_in_history_window = False):
                 '''if used_in_history_window is True, then we do not show
@@ -139 +143 @@
 
                 self.line_tooltip = tooltips.BaseTooltip()
-                
-                path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png')
-                self.focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file)
                 # use it for hr too
-                self.tv.focus_out_line_pixbuf = self.focus_out_line_pixbuf
+                self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF
 
         def del_handlers(self):
@@ -240 +241 @@
                         end_iter = buffer.get_end_iter()
                         buffer.insert(end_iter, '\n')
-                        buffer.insert_pixbuf(end_iter, self.focus_out_line_pixbuf)
+                        buffer.insert_pixbuf(end_iter, 
+                                ConversationTextview.FOCUS_OUT_LINE_PIXBUF)
 
                         end_iter = buffer.get_end_iter()

branches/gajim_0.11/src/disco.py

@@ -1725 +1725 @@
                 ''' Create treemodel for the window. '''
                 # JID, node, name (with description) - pango markup, dont have info?, subscribed?
-                model = gtk.ListStore(str, str, str, bool, bool)
-                model.set_sort_column_id(3, gtk.SORT_ASCENDING)
-                self.window.services_treeview.set_model(model)
+                self.model = gtk.ListStore(str, str, str, bool, bool)
+                self.model.set_sort_column_id(3, gtk.SORT_ASCENDING)
+                self.window.services_treeview.set_model(self.model)
 
                 # Name column
@@ -1749 +1749 @@
                 self.window.services_treeview.set_headers_visible(True)
 
-        def _add_item(self, model, jid, node, item, force):
+        def _add_item(self, jid, node, item, force):
                 ''' Called when we got basic information about new node from query.
                 Show the item. '''
@@ -1756 +1756 @@
                 if self.subscriptions is not None:
                         dunno = False
-                        subscribed = name in self.subscriptions
+                        subscribed = node in self.subscriptions
                 else:
                         dunno = True
@@ -1764 +1764 @@
                 name = '<b>%s</b>' % name
 
-                model.append((jid, node, name, dunno, subscribed))
+                self.model.append((jid, node, name, dunno, subscribed))
 
         def _add_actions(self):
@@ -1846 +1846 @@
                 ''' We got the subscribed groups list stanza. Now, if we already
                 have items on the list, we should actualize them. '''
-                print 0
                 try:
                         subscriptions = request.getTag('pubsub').getTag('subscriptions')
@@ -1852 +1851 @@
                         return 
 
-                print 1
                 groups = set()
                 for child in subscriptions.getTags('subscription'):
-                        print 2, repr(child), str(child)
                         groups.add(child['node'])
-                print 3, groups
 
                 self.subscriptions = groups
@@ -1863 +1859 @@
                 # try to setup existing items in model
                 model = self.window.services_treeview.get_model()
-                print 4
                 for row in model:
-                        print 5
                         # 1 = group node
                         # 3 = insensitive checkbox for subscribed
@@ -1872 +1866 @@
                         row[3]=False
                         row[4]=groupnode in groups
-                print 6
 
                 # we now know subscriptions, update button states

branches/gajim_0.11/src/gajim.py

@@ -2010 +2010 @@
                 # handler when an emoticon is clicked in emoticons_menu
                 self.emoticon_menuitem_clicked = None
-                self.default_values = {
+                self.default_colors = {
                         'inmsgcolor': gajim.config.get('inmsgcolor'),
                         'outmsgcolor': gajim.config.get('outmsgcolor'),
@@ -2213 +2213 @@
                                 try:
                                         cli.set_restart_command(argv)
-                                except TypeError:
+                                except AttributeError:
                                         cli.set_restart_command(len(argv), argv)
                 

branches/gajim_0.11/src/groupchat_control.py

@@ -104 +104 @@
                 ChatControl.__init__(self, parent_win, contact, acct)
                 self.TYPE_ID = 'pm'
-                self.display_names = (_('Private Chat'), _('Private Chats'))
 
         def send_message(self, message):
@@ -139 +138 @@
 class GroupchatControl(ChatControlBase):
         TYPE_ID = message_control.TYPE_GC
+        # alphanum sorted
+        MUC_CMDS = ['ban', 'chat', 'query', 'clear', 'close', 'compact',
+                'help', 'invite', 'join', 'kick', 'leave', 'me', 'msg', 'nick',
+                'part', 'names', 'say', 'topic']
 
         def __init__(self, parent_win, contact, acct):
                 ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
-                                        'muc_child_vbox', (_('Group Chat'), _('Group Chats')),
-                                        contact, acct);
+                                        'muc_child_vbox', contact, acct);
 
                 widget = self.xml.get_widget('muc_window_actions_button')
@@ -190 +192 @@
 
                 self._last_selected_contact = None # None or holds jid, account tuple
-                # alphanum sorted
-                self.muc_cmds = ['ban', 'chat', 'query', 'clear', 'close', 'compact',
-                        'help', 'invite', 'join', 'kick', 'leave', 'me', 'msg', 'nick',
-                        'part', 'names', 'say', 'topic']
+
                 # muc attention flag (when we are mentioned in a muc)
                 # if True, the room has mentioned us
                 self.attention_flag = False
-                self.room_creation = time.time()
+                self.room_creation = int(time.time()) # Use int to reduce mem usage
                 self.nick_hits = []
                 self.cmd_hits = []
@@ -1050 +1049 @@
                                 nick = message_array[0]
                                 nick = helpers.parse_resource(nick)
-                                gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
+                                gajim.connections[self.account].join_gc(nick, self.room_jid, None)
                                 self.clear(self.msg_textview)
                         else:
@@ -1258 +1257 @@
         def get_command_help(self, command):
                 if command == 'help':
-                        self.print_conversation(_('Commands: %s') % self.muc_cmds, 'info')
+                        self.print_conversation(_('Commands: %s') % GroupchatControl.MUC_CMDS,
+                                'info')
                 elif command == 'ban':
                         s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the group chat.'
@@ -1330 +1330 @@
                         nick = instance.input_entry.get_text().decode('utf-8')
                         nick = helpers.parse_resource(nick)
-                        gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
+                        gajim.connections[self.account].join_gc(nick, self.room_jid, None)
                         self.nick = nick
                 instance = dialogs.InputDialog(title, prompt, proposed_nick,
@@ -1506 +1506 @@
                                 text = splitted_text[0]
                                 if len(text) == 1: # user wants to cycle all commands
-                                        self.cmd_hits = self.muc_cmds
+                                        self.cmd_hits = GroupchatControl.MUC_CMDS
                                 else:
                                         # cycle possible commands depending on what the user typed
@@ -1515 +1515 @@
                                         else: # find possible commands
                                                 self.cmd_hits = []
-                                                for cmd in self.muc_cmds:
+                                                for cmd in GroupchatControl.MUC_CMDS:
                                                         if cmd.startswith(text.lstrip('/')):
                                                                 self.cmd_hits.append(cmd)

branches/gajim_0.11/src/message_control.py

@@ -26 +26 @@
         '''An abstract base widget that can embed in the gtk.Notebook of a MessageWindow'''
 
-        def __init__(self, type_id, parent_win, widget_name, display_names, contact, account, resource = None):
-                '''The display_names argument is a two element tuple containing the desired
-                display name (pretty string) for the control in both singular and plural form'''
+        def __init__(self, type_id, parent_win, widget_name, contact, account, resource = None):
                 # dict { cb id : widget} 
                 # keep all registered callbacks of widgets, created by self.xml
@@ -35 +33 @@
                 self.parent_win = parent_win
                 self.widget_name = widget_name
-                self.display_names = display_names
                 self.contact = contact
                 self.account = account

branches/gajim_0.11/src/message_window.py

@@ -265 +265 @@
 
                 window_mode = gajim.interface.msg_win_mgr.mode
+
                 if self.get_num_controls() == 1:
                         label = name
                 elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
                         # Show the plural form since number of tabs > 1
-                        label = control.display_names[1]
+                        if self.type == 'chat':
+                                label = _('Chats')
+                        elif self.type == 'gc':
+                                label = _('Group Chats')
+                        else:
+                                label = _('Private Chats')
                 else:
                         label = _('Messages')

branches/gajim_0.11/src/roster_window.py

@@ -2813 +2813 @@
                         common.sleepy.STATE_UNKNOWN:
                                 gajim.sleeper_state[account] = 'online'
-                        else:
+                        elif gajim.sleeper_state[account] not in ('autoaway', 'autoxa'):
                                 gajim.sleeper_state[account] = 'off'
                 gajim.connections[account].change_status(status, txt, auto)