Changeset 7841 for branches/gajim_0.11/src

Timestamp:

01/15/07 19:51:27 (19 months ago)

Author:

asterix

Message:

merge usefull diff from trunk

Location:

branches/gajim_0.11/src

Files:

• advanced.py (modified) (5 diffs)
• common/commands.py (modified) (14 diffs)
• common/config.py (modified) (1 diff)
• config.py (modified) (5 diffs)
• conversation_textview.py (modified) (2 diffs)
• dialogs.py (modified) (44 diffs)
• message_window.py (modified) (1 diff)
• roster_window.py (modified) (8 diffs)

branches/gajim_0.11/src/advanced.py

@@ -47 +47 @@
                 # value = array(oldval, newval)
                 self.changed_opts = {}
+                
+                # For i18n
+                self.right_true_dict = {True: _('Activated'), False: _('Deactivated')} 
+                self.types = {
+                        'boolean': _('Boolean'),
+                        'integer': _('Integer'),
+                        'string': _('Text'),
+                        'color': _('Color')} 
 
                 treeview = self.xml.get_widget('advanced_treeview')
@@ -92 +100 @@
                 optname = model[iter][C_PREFNAME]
                 opttype = model[iter][C_TYPE]
-                if opttype == 'boolean' or optname in ('password', 'gpgpassword'):
+                if opttype == self.types['boolean'] or optname in ('password', 
+                        'gpgpassword'):
                         cell.set_property('editable', False)
                 else:
@@ -138 +147 @@
                 modelrow = self.model[modelpath]
                 option = modelrow[0].decode('utf-8')
-                if modelrow[2] == 'boolean':
-                        newval = {'False': 'True', 'True': 'False'}[modelrow[1]]
+                if modelrow[2] == self.types['boolean']:
+                        for key in self.right_true_dict.keys():
+                                if self.right_true_dict[key] == modelrow[1]:
+                                        modelrow[1] = key
+                        newval = {'False': True, 'True': False}[modelrow[1]]
                         if len(modelpath) > 1:
                                 optnamerow = self.model[modelpath[0]]
@@ -153 +165 @@
                                 gajim.config.set(option, newval)
                         gajim.interface.save_config()
-                        modelrow[1] = newval
+                        modelrow[1] = self.right_true_dict[newval]
                         self.check_for_restart()
 
@@ -222 +234 @@
                 if val[OPT_TYPE]:
                         type = val[OPT_TYPE][0]
+                        type = self.types[type] # i18n
                 value = val[OPT_VAL]
                 if name in ('password', 'gpgpassword'):
                         #we talk about password
                         value = _('Hidden') # override passwords with this string
+                if value in self.right_true_dict:
+                        value = self.right_true_dict[value]
                 model.append(iter, [name, value, type])
 

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

@@ -26 +26 @@
                 ''' This returns True if that command should be visible and invokable
                 for others.
-                samejid - True when command is invoked by an entity with the same bare jid.
-                '''
+                samejid - True when command is invoked by an entity with the same bare 
+                jid.'''
                 return True
 
@@ -35 +35 @@
                 self.sessionid = sessionid
 
-        def buildResponse(self, request, status='executing', defaultaction=None, actions=None):
+        def buildResponse(self, request, status = 'executing', defaultaction = None,
+        actions = None):
                 assert status in ('executing', 'completed', 'canceled')
 
@@ -46 +47 @@
                 if defaultaction is not None or actions is not None:
                         if defaultaction is not None:
-                                assert defaultaction in ('cancel', 'execute', 'prev', 'next', 'complete')
+                                assert defaultaction in ('cancel', 'execute', 'prev', 'next',
+                                        'complete')
                                 attrs = {'action': defaultaction}
                         else:
@@ -55 +57 @@
 
         def badRequest(self, stanza):
-                self.connection.connection.send(xmpp.Error(stanza, xmpp.NS_STANZAS+' bad-request'))
+                self.connection.connection.send(xmpp.Error(stanza, xmpp.NS_STANZAS + \
+                        ' bad-request'))
 
         def cancel(self, request):
-                response, cmd = self.buildResponse(request, status='canceled')
+                response, cmd = self.buildResponse(request, status = 'canceled')
                 self.connection.connection.send(response)
                 return False    # finish the session
@@ -64 +67 @@
 class ChangeStatusCommand(AdHocCommand):
         commandnode = 'change-status'
-        commandname = 'Change status information'
+        commandname = _('Change status information')
 
         @staticmethod
@@ -73 +76 @@
         def execute(self, request):
                 # first query...
-                response, cmd = self.buildResponse(request, defaultaction='execute', actions=['execute'])
+                response, cmd = self.buildResponse(request, defaultaction = 'execute',
+                        actions = ['execute'])
                 
-                cmd.addChild(node=dataforms.SimpleDataForm(
-                        title='Change status',
-                        instructions='Set the presence type and description',
-                        fields=[
+                cmd.addChild(node = dataforms.SimpleDataForm(
+                        title = _('Change status'),
+                        instructions = _('Set the presence type and description'),
+                        fields = [
                                 dataforms.Field('list-single',
-                                        var='presence-type',
-                                        label='Type of presence:',
-                                        options=[
-                                                (u'free-for-chat', u'Free for chat'),
-                                                (u'online', u'Online'),
-                                                (u'away', u'Away'),
-                                                (u'xa', u'Extended away'),
-                                                (u'dnd', u'Do not disturb'),
-                                                (u'offline', u'Offline - disconnect')],
-                                        value='online',
-                                        required=True),
+                                        var = 'presence-type',
+                                        label = 'Type of presence:',
+                                        options = [
+                                                (u'free-for-chat', _('Free for chat')),
+                                                (u'online', _('Online')),
+                                                (u'away', _('Away')),
+                                                (u'xa', _('Extended away')),
+                                                (u'dnd', _('Do not disturb')),
+                                                (u'offline', _('Offline - disconnect'))],
+                                        value = 'online',
+                                        required = True),
                                 dataforms.Field('text-multi',
-                                        var='presence-desc',
-                                        label='Presence description:')]))
+                                        var = 'presence-desc',
+                                        label = _('Presence description:'))]))
 
                 self.connection.connection.send(response)
@@ -105 +109 @@
                 # check if the data is correct
                 try:
-                        form=dataforms.SimpleDataForm(extend=request.getTag('command').getTag('x'))
+                        form = dataforms.SimpleDataForm(extend = request.getTag('command').\
+                                getTag('x'))
                 except:
                         self.badRequest(request)
                         return False
-                
+
                 try:
                         presencetype = form['presence-type'].value
@@ -126 +131 @@
                         presencedesc = u''
 
-                response, cmd = self.buildResponse(request, status='completed')
-                cmd.addChild('note', {}, 'The status has been changed.')
+                response, cmd = self.buildResponse(request, status = 'completed')
+                cmd.addChild('note', {}, _('The status has been changed.'))
 
                 # if going offline, we need to push response so it won't go into
                 # queue and disappear
-                self.connection.connection.send(response, presencetype=='offline')
+                self.connection.connection.send(response, presencetype == 'offline')
 
                 # send new status
-                gajim.interface.roster.send_status(self.connection.name, presencetype, presencedesc)
+                gajim.interface.roster.send_status(self.connection.name, presencetype,
+                        presencedesc)
 
                 return False    # finish the session
+
+def find_current_groupchats(account):
+        import message_control
+        rooms = []
+        for gc_control in gajim.interface.msg_win_mgr.get_controls(
+        message_control.TYPE_GC):
+                acct = gc_control.account
+                # check if account is the good one
+                if acct != account:
+                        continue
+                room_jid = gc_control.room_jid
+                nick = gc_control.nick
+                if gajim.gc_connected[acct].has_key(room_jid) and \
+                gajim.gc_connected[acct][room_jid]:
+                        rooms.append((room_jid, nick,))
+        return rooms
+
+
+class LeaveGroupchatsCommand(AdHocCommand):
+        commandnode = 'leave-groupchats'
+        commandname = 'Leave Groupchats'
+
+        @staticmethod
+        def isVisibleFor(samejid):
+                ''' Change status is visible only if the entity has the same bare jid. '''
+                return samejid
+
+        def execute(self, request):
+                # first query...
+                response, cmd = self.buildResponse(request, defaultaction = 'execute',
+                        actions=['execute'])
+                options = []
+                account = self.connection.name
+                for gc in find_current_groupchats(account):
+                        options.append((u'%s' %(gc[0]), _('%(nickname)s on %(room_jid)s') % \
+                                {'nickname': gc[1], 'room_jid': gc[0]}))
+                if not len(options):
+                        response, cmd = self.buildResponse(request, status = 'completed')
+                        cmd.addChild('note', {}, _('You have not joined a groupchat.'))
+                
+                        self.connection.connection.send(response)
+                        return False
+
+                cmd.addChild(node=dataforms.SimpleDataForm(
+                        title = _('Leave Groupchats'),
+                        instructions = _('Choose the groupchats you want to leave'),
+                        fields=[
+                                dataforms.Field('list-multi',
+                                        var = 'groupchats',
+                                        label = _('Groupchats'),
+                                        options = options,
+                                        required = True)]))
+
+                self.connection.connection.send(response)
+
+                # for next invocation
+                self.execute = self.leavegroupchats
+                
+                return True     # keep the session
+
+        def leavegroupchats(self, request):
+                # check if the data is correct
+                try:
+                        form = dataforms.SimpleDataForm(extend = request.getTag('command').\
+                                getTag('x'))
+                except:
+                        self.badRequest(request)
+                        return False
+
+                try:
+                        gc = form['groupchats'].values
+                except: # KeyError if there's no presence-type field in form or
+                        # AttributeError if that field is of wrong type
+                        self.badRequest(request)
+                        return False
+                account = self.connection.name
+                try:
+                        for room_jid in gc:
+                                gc_control = gajim.interface.msg_win_mgr.get_control(room_jid,
+                                        account)
+                                gc_control.parent_win.remove_tab(gc_control, None, force = True)
+                except: # KeyError if there's no presence-type field in form or
+                        self.badRequest(request)
+                        return False
+                response, cmd = self.buildResponse(request, status = 'completed')
+                note = _('You leaved the following groupchats:')
+                for room_jid in gc:
+                        note += '\n\t' + room_jid
+                cmd.addChild('note', {}, note)
+
+                self.connection.connection.send(response)
+                return False
+
 
 class ConnectionCommands:
@@ -143 +242 @@
                 # a list of all commands exposed: node -> command class
                 self.__commands = {}
-                for cmdobj in (ChangeStatusCommand,):
+                for cmdobj in (ChangeStatusCommand, LeaveGroupchatsCommand):
                         self.__commands[cmdobj.commandnode] = cmdobj
 
@@ -165 +264 @@
                                 q.addChild('item', {
                                         # TODO: find the jid
-                                        'jid': self.getOurBareJID()+u'/'+self.server_resource,
+                                        'jid': self.getOurBareJID() + u'/' + self.server_resource,
                                         'node': node,
                                         'name': cmd.commandname})
@@ -210 +309 @@
                         if node not in self.__commands.keys():
                                 self.connection.send(
-                                        xmpp.Error(iq_obj, xmpp.NS_STANZAS+' item-not-found'))
+                                        xmpp.Error(iq_obj, xmpp.NS_STANZAS + ' item-not-found'))
                                 raise xmpp.NodeProcessed
 
@@ -221 +320 @@
 
                         # create new instance and run it
-                        obj = newcmd(conn=self, jid=jid, sessionid=sessionid)
+                        obj = newcmd(conn = self, jid = jid, sessionid = sessionid)
                         rc = obj.execute(iq_obj)
                         if rc:
@@ -237 +336 @@
 
                         try:
-                                if action == 'cancel':          rc = obj.cancel(iq_obj)
-                                elif action == 'prev':          rc = obj.prev(iq_obj)
-                                elif action == 'next':          rc = obj.next(iq_obj)
+                                if action == 'cancel':
+                                        rc = obj.cancel(iq_obj)
+                                elif action == 'prev':
+                                        rc = obj.prev(iq_obj)
+                                elif action == 'next':
+                                        rc = obj.next(iq_obj)
                                 elif action == 'execute' or action is None:
-                                                                rc = obj.execute(iq_obj)
-                                elif action == 'complete':      rc = obj.complete(iq_obj)
+                                        rc = obj.execute(iq_obj)
+                                elif action == 'complete':
+                                        rc = obj.complete(iq_obj)
                                 else:
                                         # action is wrong. stop the session, send error
@@ -257 +360 @@
 
                         raise xmpp.NodeProcessed
-

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

@@ -131 +131 @@
                 'latest_disco_addresses': [ opt_str, '' ],
                 'recently_groupchat': [ opt_str, '' ],
-                'before_nickname': [ opt_str, '' ],
-                'time_stamp': [ opt_str, '[%H:%M] ' ],
-                'after_nickname': [ opt_str, ':' ],
+                'time_stamp': [ opt_str, '[%X] ', _('This option let you customize timestamp that is printed in conversation. For exemple "[%H:%M] " will show "[hour:minute] ". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html') ],
+                'before_nickname': [ opt_str, '', _('Characters that are printed before the nickname in conversations') ],
+                'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ],
                 'send_os_info': [ opt_bool, True ],
                 'set_status_msg_from_current_music_track': [ opt_bool, False ],

branches/gajim_0.11/src/config.py

@@ -93 +93 @@
                 w.hide()
 
-                #trayicon
+                # trayicon
                 if gajim.interface.systray_capabilities:
                         st = gajim.config.get('trayicon')
@@ -100 +100 @@
                         self.trayicon_checkbutton.set_sensitive(False)
 
-                #Save position
+                # Save position
                 st = gajim.config.get('saveposition')
                 self.xml.get_widget('save_position_checkbutton').set_active(st)
@@ -241 +241 @@
                         self.xml.get_widget('time_always_radiobutton').set_active(True)
 
-                # TimeStamp
-                st = gajim.config.get('time_stamp')
-                st = helpers.from_one_line(st)
-                self.xml.get_widget('time_stamp_textview').get_buffer().set_text(st)
-
-                # before nickname
-                st = gajim.config.get('before_nickname')
-                st = helpers.from_one_line(st)
-                self.xml.get_widget('before_nickname_textview').get_buffer().set_text(st)
-
-                # after nickanme
-                st = gajim.config.get('after_nickname')
-                st = helpers.from_one_line(st)
-                self.xml.get_widget('after_nickname_textview').get_buffer().set_text(st)
-
                 # Color for incoming messages
                 colSt = gajim.config.get('inmsgcolor')
@@ -732 +717 @@
                         gajim.config.set('print_time', 'always')
                 self._set_sensitivity_for_before_after_time_widgets(True)
-                gajim.interface.save_config()
-
-        def _get_textview_text(self, tv):
-                buffer = tv.get_buffer()
-                begin, end = buffer.get_bounds()
-                return buffer.get_text(begin, end).decode('utf-8')
-
-        def on_time_stamp_textview_focus_out_event(self, widget, event):
-                text = self._get_textview_text(widget)
-                text = helpers.to_one_line(text)
-                gajim.config.set('time_stamp', text)
-                gajim.interface.save_config()
-
-        def on_before_nickname_textview_focus_out_event(self, widget, event):
-                text = self._get_textview_text(widget)
-                text = helpers.to_one_line(text)
-                gajim.config.set('before_nickname', text)
-                gajim.interface.save_config()
-
-        def on_after_nickname_textview_focus_out_event(self, widget, event):
-                text = self._get_textview_text(widget)
-                text = helpers.to_one_line(text)
-                gajim.config.set('after_nickname', text)
                 gajim.interface.save_config()
 
@@ -2660 +2622 @@
                 self.option_list = {'': _('Default'), 'all': Q_('?print_status:All'),
                         'in_and_out': _('Enter and leave only'),
-                        'none': _('?print_status:None')}
+                        'none': Q_('?print_status:None')}
                 opts = self.option_list.keys()
                 opts.sort()

branches/gajim_0.11/src/conversation_textview.py

@@ -689 +689 @@
                 current_print_time = gajim.config.get('print_time')
                 if current_print_time == 'always' and kind != 'info':
-                        timestamp_str = gajim.config.get('time_stamp')
-                        timestamp_str = helpers.from_one_line(timestamp_str)
+                        timestamp_str = self.get_time_to_show(tim)
                         timestamp = time.strftime(timestamp_str, tim)
                         buffer.insert_with_tags_by_name(end_iter, timestamp,
@@ -758 +757 @@
                 if day_str:
                         format += day_str + ' '
-                format += '%X'
+                timestamp_str = gajim.config.get('time_stamp')
+                timestamp_str = helpers.from_one_line(timestamp_str)
+                format += timestamp_str
                 tim_format = time.strftime(format, tim)
                 if locale.getpreferredencoding() != 'KOI8-R':

branches/gajim_0.11/src/dialogs.py

@@ -215 +215 @@
                 column.pack_start(renderer)
                 column.set_attributes(renderer, text = 0)
-                
+
                 column = gtk.TreeViewColumn(_('In the group'))
                 column.set_expand(False)
@@ -320 +320 @@
                         title_text = _('Status Message')
                 self.window.set_title(title_text)
-                
+
                 message_textview = self.xml.get_widget('message_textview')
                 self.message_buffer = message_textview.get_buffer()
@@ -332 +332 @@
                 msg = helpers.from_one_line(msg)
                 self.message_buffer.set_text(msg)
-                
+
                 # have an empty string selectable, so user can clear msg
                 self.preset_messages_dict = {'': ''}
@@ -340 +340 @@
                         self.preset_messages_dict[msg_name] = msg_text
                 sorted_keys_list = helpers.get_sorted_keys(self.preset_messages_dict)
-                
+
                 self.message_liststore = gtk.ListStore(str) # msg_name
                 self.message_combobox = self.xml.get_widget('message_combobox')
@@ -375 +375 @@
                 name = model[active][0].decode('utf-8')
                 self.message_buffer.set_text(self.preset_messages_dict[name])
-        
+
         def on_change_status_message_dialog_key_press_event(self, widget, event):
                 if event.keyval == gtk.keysyms.Return or \
@@ -388 +388 @@
                 else:
                         btn.set_sensitive(True)
-        
+
         def on_save_as_preset_button_clicked(self, widget):
                 start_iter, finish_iter = self.message_buffer.get_bounds()
@@ -404 +404 @@
                         msg_name = msg_name.decode('utf-8')
                         iter_ = self.message_liststore.append((msg_name,))
-                        
+
                         gajim.config.add_per('statusmsg', msg_name)
                         gajim.config.set_per('statusmsg', msg_name, 'message', msg_text_1l)
@@ -602 +602 @@
                                 'utf-8')
                         jid = jid.replace('@', '%') + '@' + transport
-                
+
                 # check if jid is conform to RFC and stringprep it
                 try:
@@ -727 +727 @@
                         text = open(copying_file_path).read()
                         dlg.set_license(text)
-                
+
                 dlg.set_comments('%s\n%s %s\n%s %s' 
                         % (_('A GTK+ jabber client'), \