Commits September 2008

commits@gajim.org

4 participants
83 discussions

[commit-gajim] r10384 - trunk/src
by asterix＠gajim.org 03 Sep '08

03 Sep '08

Author: asterix Date: 2008-09-03 16:16:13 +0200 (Wed, 03 Sep 2008) New Revision: 10384 Modified: trunk/src/roster_window.py Log: [Dicson] fix string. Fixes #4280 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-03 11:25:27 UTC (rev 10383) +++ trunk/src/roster_window.py 2008-09-03 14:16:13 UTC (rev 10384) @@ -2708,7 +2708,7 @@ self.remove_contact(contact.jid, account, backend=True) dialogs.ConfirmationDialogCheck(_('Remove Group'), - _('Do you want to remove group %s from the roster?' % group), + _('Do you want to remove group %s from the roster?') % group, _('Also remove all contacts in this group from your roster'), on_response_ok=on_ok)

1 0

[commit-gajim] r10383 - trunk/src
by asterix＠gajim.org 03 Sep '08

03 Sep '08

Author: asterix Date: 2008-09-03 13:25:27 +0200 (Wed, 03 Sep 2008) New Revision: 10383 Modified: trunk/src/dialogs.py Log: coding standards Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-09-03 07:24:42 UTC (rev 10382) +++ trunk/src/dialogs.py 2008-09-03 11:25:27 UTC (rev 10383) @@ -188,7 +188,7 @@ self.list.append_column(column) renderer = gtk.CellRendererText() column.pack_start(renderer) - column.set_attributes(renderer, text = 0) + column.set_attributes(renderer, text=0) column = gtk.TreeViewColumn(_('In the group')) column.set_expand(False) @@ -197,7 +197,7 @@ column.pack_start(renderer) renderer.set_property('activatable', True) renderer.connect('toggled', self.group_toggled_cb) - column.set_attributes(renderer, active = 1, inconsistent = 2) + column.set_attributes(renderer, active=1, inconsistent=2) class PassphraseDialog: '''Class for Passphrase dialog''' @@ -280,7 +280,7 @@ col.set_sort_column_id(0) renderer = gtk.CellRendererText() col = self.keys_treeview.insert_column_with_attributes(-1, - _('Contact name'), renderer, text = 1) + _('Contact name'), renderer, text=1) col.set_sort_column_id(1) self.keys_treeview.set_search_column(1) self.fill_tree(secret_keys, selected) @@ -529,7 +529,7 @@ self.window.destroy() class ChangeStatusMessageDialog: - def __init__(self, on_response, show = None): + def __init__(self, on_response, show=None): self.show = show self.on_response = on_response self.xml = gtkgui_helpers.get_glade('change_status_message_dialog.glade') @@ -673,8 +673,7 @@ 'icq': _('ICQ Number:'), 'msn': _('MSN Address:'), 'yahoo': _('Yahoo! Address:')} - def __init__(self, account = None, jid = None, user_nick = None, - group = None): + def __init__(self, account=None, jid=None, user_nick=None, group=None): self.account = account if account is None: # fill accounts with active accounts @@ -1057,7 +1056,7 @@ return None class Dialog(gtk.Dialog): - def __init__(self, parent, title, buttons, default = None, + def __init__(self, parent, title, buttons, default=None, on_response_ok=None, on_response_cancel=None): gtk.Dialog.__init__(self, title, parent, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR) @@ -1149,8 +1148,8 @@ select_multiple = False, current_folder = None, on_response_ok = None, on_response_cancel = None): - gtk.FileChooserDialog.__init__(self, title = title_text, - action = action, buttons = buttons) + gtk.FileChooserDialog.__init__(self, title=title_text, action=action, + buttons=buttons) self.set_default_response(default_response) self.set_select_multiple(select_multiple) @@ -1224,8 +1223,8 @@ class NonModalConfirmationDialog(HigDialog): '''HIG compliant non modal confirmation dialog.''' - def __init__(self, pritext, sectext='', on_response_ok = None, - on_response_cancel = None): + def __init__(self, pritext, sectext='', on_response_ok=None, + on_response_cancel=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel HigDialog.__init__(self, None, @@ -1318,8 +1317,8 @@ class ConfirmationDialogCheck(ConfirmationDialog): '''HIG compliant confirmation dialog with checkbutton.''' - def __init__(self, pritext, sectext='', checktext = '', - on_response_ok = None, on_response_cancel = None, is_modal = True): + def __init__(self, pritext, sectext='', checktext='', + on_response_ok=None, on_response_cancel=None, is_modal=True): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel @@ -1333,7 +1332,7 @@ ok_button.grab_focus() self.checkbutton = gtk.CheckButton(checktext) - self.vbox.pack_start(self.checkbutton, expand = False, fill = True) + self.vbox.pack_start(self.checkbutton, expand=False, fill=True) self.set_modal(is_modal) self.popup() @@ -1363,8 +1362,8 @@ class ConfirmationDialogDubbleCheck(ConfirmationDialog): '''HIG compliant confirmation dialog with 2 checkbuttons.''' - def __init__(self, pritext, sectext='', checktext1 = '', checktext2 = '', - on_response_ok = None, on_response_cancel = None, is_modal = True): + def __init__(self, pritext, sectext='', checktext1='', checktext2='', + on_response_ok=None, on_response_cancel=None, is_modal=True): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel @@ -1379,12 +1378,12 @@ if checktext1: self.checkbutton1 = gtk.CheckButton(checktext1) - self.vbox.pack_start(self.checkbutton1, expand = False, fill = True) + self.vbox.pack_start(self.checkbutton1, expand=False, fill=True) else: self.checkbutton1 = None if checktext2: self.checkbutton2 = gtk.CheckButton(checktext2) - self.vbox.pack_start(self.checkbutton2, expand = False, fill = True) + self.vbox.pack_start(self.checkbutton2, expand=False, fill=True) else: self.checkbutton2 = None @@ -1813,10 +1812,10 @@ # columns renderer = gtk.CellRendererText() self.accounts_treeview.insert_column_with_attributes(-1, - _('Name'), renderer, text = 0) + _('Name'), renderer, text=0) renderer = gtk.CellRendererText() self.accounts_treeview.insert_column_with_attributes(-1, - _('Server'), renderer, text = 1) + _('Server'), renderer, text=1) self.xml.signal_autoconnect(self) self.init_accounts() @@ -1874,10 +1873,10 @@ renderer1.set_property('activatable', True) renderer1.connect('toggled', self.toggled_callback) self.contacts_treeview.insert_column_with_attributes(-1, - _('Synchronise'), renderer1, active = 0) + _('Synchronise'), renderer1, active=0) renderer2 = gtk.CellRendererText() self.contacts_treeview.insert_column_with_attributes(-1, - _('Name'), renderer2, text = 1) + _('Name'), renderer2, text=1) self.xml.signal_autoconnect(self) self.init_contacts() @@ -1936,7 +1935,7 @@ else: title = _('Start Chat') prompt_text = _('Fill in the nickname or the Jabber ID of the contact you would like\nto send a chat message to:') - InputDialog.__init__(self, title, prompt_text, is_modal = False) + InputDialog.__init__(self, title, prompt_text, is_modal=False) self.completion_dict = {} liststore = gtkgui_helpers.get_completion_liststore(self.input_entry) @@ -2167,7 +2166,7 @@ parent_box = self.xml.get_widget('conversation_scrolledwindow').\ get_parent() if form_node: - dataform = dataforms.ExtendForm(node = form_node) + dataform = dataforms.ExtendForm(node=form_node) self.form_widget = dataforms_widget.DataFormWidget(dataform) self.form_widget.show_all() parent_box.add(self.form_widget) @@ -2384,9 +2383,9 @@ # add > at the begining of each line self.message = self.message.replace('\n', '\n> ') + '\n\n' self.window.destroy() - SingleMessageWindow(self.account, to = self.from_whom, - action = 'send', from_whom = self.from_whom, subject = self.subject, - message = self.message, session = self.session) + SingleMessageWindow(self.account, to=self.from_whom, action='send', + from_whom=self.from_whom, subject=self.subject, message=self.message, + session=self.session) def on_send_and_close_button_clicked(self, widget): self.send_single_message() @@ -3169,8 +3168,8 @@ def on_cancel(widget): widget.set_active(0) # go back to No Sound - self.dialog = SoundChooserDialog(on_response_ok = on_ok, - on_response_cancel = on_cancel) + self.dialog = SoundChooserDialog(on_response_ok=on_ok, + on_response_cancel=on_cancel) def on_ok_button_clicked(self, widget): conditions = ('online', 'chat', 'online_and_chat', @@ -3223,14 +3222,14 @@ col = gtk.TreeViewColumn(_('#')) self.conditions_treeview.append_column(col) renderer = gtk.CellRendererText() - col.pack_start(renderer, expand = False) - col.set_attributes(renderer, text = 0) + col.pack_start(renderer, expand=False) + col.set_attributes(renderer, text=0) col = gtk.TreeViewColumn(_('Condition')) self.conditions_treeview.append_column(col) renderer = gtk.CellRendererText() - col.pack_start(renderer, expand = True) - col.set_attributes(renderer, text = 1) + col.pack_start(renderer, expand=True) + col.set_attributes(renderer, text=1) self.xml.signal_autoconnect(self) @@ -3787,7 +3786,7 @@ self.set_resizable(True) gtkgui_helpers.resize_window(self, 600, 400) self.dataform_widget = dataforms_widget.DataFormWidget() - self.dataform = dataforms.ExtendForm(node = form) + self.dataform = dataforms.ExtendForm(node=form) self.dataform_widget.set_sensitive(True) self.dataform_widget.data_form = self.dataform self.dataform_widget.show_all()

1 0

[commit-gajim] r10382 - trunk/src
by asterix＠gajim.org 03 Sep '08

03 Sep '08

Author: asterix Date: 2008-09-03 09:24:42 +0200 (Wed, 03 Sep 2008) New Revision: 10382 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: correctly remove contacts (force = True when we re-add them after) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-09-02 20:34:11 UTC (rev 10381) +++ trunk/src/gajim.py 2008-09-03 07:24:42 UTC (rev 10382) @@ -1476,7 +1476,7 @@ not name and not groups: # contact removes us. if contacts: - self.roster.remove_contact(jid, account, backend=True) + self.roster.remove_contact(jid, account, force=True, backend=True) return elif not contacts: if sub == 'remove': @@ -1496,7 +1496,7 @@ old_groups = contacts[0].get_shown_groups() if contacts[0].sub != sub or contacts[0].ask != ask\ or old_groups != groups: - self.roster.remove_contact(jid, account) + self.roster.remove_contact(jid, account, force=True) re_add = True for contact in contacts: if not name: @@ -2737,7 +2737,7 @@ if session: ctrl = session.control - else: + if not ctrl: win = self.msg_win_mgr.get_window(fjid, account) if win: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-02 20:34:11 UTC (rev 10381) +++ trunk/src/roster_window.py 2008-09-03 07:24:42 UTC (rev 10382) @@ -1870,7 +1870,7 @@ _('If "%s" accepts this request you will know his or her status.' ) % jid) return - self.remove_contact(contact.jid, account) + self.remove_contact(contact.jid, account, force=True) contact.groups = groups if nickname: contact.name = nickname

1 0

[commit-gajim] r10381 - trunk/src
by asterix＠gajim.org 02 Sep '08

02 Sep '08

Author: asterix Date: 2008-09-02 22:34:11 +0200 (Tue, 02 Sep 2008) New Revision: 10381 Modified: trunk/src/roster_window.py Log: some more coding standards Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-02 20:31:05 UTC (rev 10380) +++ trunk/src/roster_window.py 2008-09-02 20:34:11 UTC (rev 10381) @@ -1013,7 +1013,7 @@ return False def draw_group(self, group, account): - child_iter = self._get_group_iter(group, account, model = self.model) + child_iter = self._get_group_iter(group, account, model=self.model) if not child_iter: # Eg. We redraw groups after we removed a entitiy # and its empty groups @@ -1034,7 +1034,7 @@ return False def draw_parent_contact(self, jid, account): - child_iters = self._get_contact_iter(jid, account, model = self.model) + child_iters = self._get_contact_iter(jid, account, model=self.model) if not child_iters: return False parent_iter = self.model.iter_parent(child_iters[0]) @@ -1203,7 +1203,7 @@ for group in contact.get_shown_groups(): # We need to make sure that _visible_func is called for # our groups otherwise we might not be shown - iterG = self._get_group_iter(group, account, model = self.model) + iterG = self._get_group_iter(group, account, model=self.model) if iterG: # it's not self contact self.model[iterG][C_JID] = self.model[iterG][C_JID] @@ -1212,7 +1212,7 @@ def draw_mood(self, jid, account): - iters = self._get_contact_iter(jid, account, model = self.model) + iters = self._get_contact_iter(jid, account, model=self.model) if not iters or not gajim.config.get('show_mood_in_roster'): return jid = self.model[iters[0]][C_JID] @@ -1232,7 +1232,7 @@ def draw_activity(self, jid, account): - iters = self._get_contact_iter(jid, account, model = self.model) + iters = self._get_contact_iter(jid, account, model=self.model) if not iters or not gajim.config.get('show_activity_in_roster'): return jid = self.model[iters[0]][C_JID] @@ -1253,7 +1253,7 @@ def draw_tune(self, jid, account): - iters = self._get_contact_iter(jid, account, model = self.model) + iters = self._get_contact_iter(jid, account, model=self.model) if not iters or not gajim.config.get('show_tunes_in_roster'): return jid = self.model[iters[0]][C_JID] @@ -1270,7 +1270,7 @@ def draw_avatar(self, jid, account): - iters = self._get_contact_iter(jid, account, model = self.model) + iters = self._get_contact_iter(jid, account, model=self.model) if not iters or not gajim.config.get('show_avatars_in_roster'): return jid = self.model[iters[0]][C_JID] @@ -2069,7 +2069,7 @@ # Force the rebuild now since the on_activates on the menu itself does # not work with the os/x top level menubar if sys.platform == 'darwin': - self.make_menu(force = True) + self.make_menu(force=True) def get_status_message(self, show, on_response): if show in gajim.config.get_per('defaultstatusmsg'): @@ -2163,7 +2163,7 @@ ''' if account in gajim.interface.instances: self.close_all_from_dict(gajim.interface.instances[account]) - for ctrl in gajim.interface.msg_win_mgr.get_controls(acct = account): + for ctrl in gajim.interface.msg_win_mgr.get_controls(acct=account): ctrl.parent_win.remove_tab(ctrl, ctrl.parent_win.CLOSE_CLOSE_BUTTON, force = force) @@ -2779,7 +2779,7 @@ msg = str(msg) dialogs.ErrorDialog(_('Could not load image'), msg) return - gajim.interface.save_avatar_files(contact.jid, pixbuf, local = True) + gajim.interface.save_avatar_files(contact.jid, pixbuf, local=True) dlg.destroy() self.update_avatar_in_gui(contact.jid, account) @@ -2789,8 +2789,8 @@ gajim.interface.remove_avatar_files(contact.jid, local=True) self.update_avatar_in_gui(contact.jid, account) - dlg = dialogs.AvatarChooserDialog(on_response_ok = on_ok, - on_response_clear = on_clear) + dlg = dialogs.AvatarChooserDialog(on_response_ok=on_ok, + on_response_clear=on_clear) def on_edit_groups(self, widget, list_): dialogs.EditGroupsDialog(list_) @@ -2814,7 +2814,7 @@ def on_send_single_message_menuitem_activate(self, widget, account, contact = None): if contact is None: - dialogs.SingleMessageWindow(account, action = 'send') + dialogs.SingleMessageWindow(account, action='send') elif type(contact) == type([]): dialogs.SingleMessageWindow(account, contact, 'send') else: @@ -3372,8 +3372,7 @@ # or not if len(self._last_selected_contact): for (jid, account) in self._last_selected_contact: - self.draw_contact(jid, account, selected = True, - focus = True) + self.draw_contact(jid, account, selected=True, focus=True) def on_roster_window_focus_out_event(self, widget, event): # if a contact row is selected, update colors (eg. for status msg) @@ -3381,8 +3380,7 @@ # or not if len(self._last_selected_contact): for (jid, account) in self._last_selected_contact: - self.draw_contact(jid, account, selected = True, - focus = False) + self.draw_contact(jid, account, selected=True, focus=False) def on_roster_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: @@ -3626,7 +3624,7 @@ else: try: # Object will add itself to the window dict - disco.ServiceDiscoveryWindow(account, address_entry = True) + disco.ServiceDiscoveryWindow(account, address_entry=True) except GajimGeneralException: pass @@ -3962,8 +3960,8 @@ if (type_dest == 'account' or not self.regroup) and \ account_source != account_dest: # add to account in specified group - dialogs.AddNewContactWindow(account = account_dest, jid = jid_source, - user_nick = c_source.name, group = grp_dest) + dialogs.AddNewContactWindow(account=account_dest, jid=jid_source, + user_nick=c_source.name, group=grp_dest) return # we may not add contacts from special_groups @@ -4792,7 +4790,7 @@ status_menuitem.set_submenu(sub_menu) for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'): - uf_show = helpers.get_uf_show(show, use_mnemonic = True) + uf_show = helpers.get_uf_show(show, use_mnemonic=True) item = gtk.ImageMenuItem(uf_show) icon = state_images[show] item.set_image(icon) @@ -4821,7 +4819,7 @@ item = gtk.SeparatorMenuItem() sub_menu.append(item) - uf_show = helpers.get_uf_show('offline', use_mnemonic = True) + uf_show = helpers.get_uf_show('offline', use_mnemonic=True) item = gtk.ImageMenuItem(uf_show) icon = state_images['offline'] item.set_image(icon) @@ -4906,7 +4904,7 @@ status_menuitem.set_submenu(sub_menu) for show in ('online', 'away', 'dnd', 'invisible'): - uf_show = helpers.get_uf_show(show, use_mnemonic = True) + uf_show = helpers.get_uf_show(show, use_mnemonic=True) item = gtk.ImageMenuItem(uf_show) icon = state_images[show] item.set_image(icon) @@ -4927,7 +4925,7 @@ if gajim.connections[account].connected < 2: item.set_sensitive(False) - uf_show = helpers.get_uf_show('offline', use_mnemonic = True) + uf_show = helpers.get_uf_show('offline', use_mnemonic=True) item = gtk.ImageMenuItem(uf_show) icon = state_images['offline'] item.set_image(icon) @@ -5972,7 +5970,7 @@ # Force the rebuild now since the on_activates on the menu itself does # not work with the os/x top level menubar if sys.platform == 'darwin': - self.make_menu(force = True) + self.make_menu(force=True) return def show_appropriate_context_menu(self, event, iters): @@ -6058,7 +6056,7 @@ app_menu.show_all() # Do the merge baby! syncmenu.takeover_menu(main_menu) - self.make_menu(force = True) + self.make_menu(force=True) # Hide the GTK menubar itself and let the OS/X menubar do its thing #self.xml.get_widget('menubar').hide() return @@ -6200,7 +6198,7 @@ def add_avatar_renderer(): render_pixbuf = gtk.CellRendererPixbuf() # avatar img - col.pack_start(render_pixbuf, expand = False) + col.pack_start(render_pixbuf, expand=False) col.add_attribute(render_pixbuf, 'pixbuf', C_AVATAR_PIXBUF) col.set_cell_data_func(render_pixbuf, @@ -6211,30 +6209,30 @@ render_image = cell_renderer_image.CellRendererImage(0, 0) # show img or +- - col.pack_start(render_image, expand = False) + col.pack_start(render_image, expand=False) col.add_attribute(render_image, 'image', C_IMG) col.set_cell_data_func(render_image, self._iconCellDataFunc, None) render_text = gtk.CellRendererText() # contact or group or account name render_text.set_property('ellipsize', pango.ELLIPSIZE_END) - col.pack_start(render_text, expand = True) + col.pack_start(render_text, expand=True) col.add_attribute(render_text, 'markup', C_NAME) # where we hold the name col.set_cell_data_func(render_text, self._nameCellDataFunc, None) render_pixbuf = gtk.CellRendererPixbuf() - col.pack_start(render_pixbuf, expand = False) + col.pack_start(render_pixbuf, expand=False) col.add_attribute(render_pixbuf, 'pixbuf', C_MOOD_PIXBUF) col.set_cell_data_func(render_pixbuf, self._fill_mood_pixbuf_rederer, None) render_pixbuf = gtk.CellRendererPixbuf() - col.pack_start(render_pixbuf, expand = False) + col.pack_start(render_pixbuf, expand=False) col.add_attribute(render_pixbuf, 'pixbuf', C_ACTIVITY_PIXBUF) col.set_cell_data_func(render_pixbuf, self._fill_activity_pixbuf_rederer, None) render_pixbuf = gtk.CellRendererPixbuf() - col.pack_start(render_pixbuf, expand = False) + col.pack_start(render_pixbuf, expand=False) col.add_attribute(render_pixbuf, 'pixbuf', C_TUNE_PIXBUF) col.set_cell_data_func(render_pixbuf, self._fill_tune_pixbuf_rederer, None) @@ -6243,7 +6241,7 @@ add_avatar_renderer() render_pixbuf = gtk.CellRendererPixbuf() # tls/ssl img - col.pack_start(render_pixbuf, expand = False) + col.pack_start(render_pixbuf, expand=False) col.add_attribute(render_pixbuf, 'pixbuf', C_PADLOCK_PIXBUF) col.set_cell_data_func(render_pixbuf, self._fill_padlock_pixbuf_rederer, None) @@ -6252,7 +6250,7 @@ # do not show gtk arrows workaround col = gtk.TreeViewColumn() render_pixbuf = gtk.CellRendererPixbuf() - col.pack_start(render_pixbuf, expand = False) + col.pack_start(render_pixbuf, expand=False) self.tree.append_column(col) col.set_visible(False) self.tree.set_expander_column(col)

1 0

[commit-gajim] r10380 - trunk/src
by asterix＠gajim.org 02 Sep '08

02 Sep '08

Author: asterix Date: 2008-09-02 22:31:05 +0200 (Tue, 02 Sep 2008) New Revision: 10380 Modified: trunk/src/roster_window.py Log: coding standards Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-02 07:13:24 UTC (rev 10379) +++ trunk/src/roster_window.py 2008-09-02 20:31:05 UTC (rev 10380) @@ -95,7 +95,7 @@ class RosterWindow: '''Class for main window of the GTK+ interface''' - def _get_account_iter(self, name, model = None): + def _get_account_iter(self, name, model=None): ''' Return the gtk.TreeIter of the given account or None if not found. @@ -119,8 +119,7 @@ return account_iter - def _get_group_iter(self, name, account, account_iter = None, - model = None): + def _get_group_iter(self, name, account, account_iter=None, model=None): ''' Return the gtk.TreeIter of the given group or None if not found. @@ -145,7 +144,7 @@ return group_iter - def _get_self_contact_iter(self, jid, account, model = None): + def _get_self_contact_iter(self, jid, account, model=None): ''' Return the gtk.TreeIter of SelfContact or None if not found. Keyword arguments: @@ -249,7 +248,7 @@ return False - def _iter_contact_rows(self, model = None): + def _iter_contact_rows(self, model=None): '''Iterate over all contact rows in given model. Keyword argument @@ -411,7 +410,7 @@ "Iters invalidated for %s" % contact.jid return added_iters - def _remove_entity(self, contact, account, groups = None): + def _remove_entity(self, contact, account, groups=None): '''Remove the given contact from roster data model. Empty groups after contact removal are removed too. @@ -776,7 +775,7 @@ return True - def add_groupchat(self, jid, account, status = ''): + def add_groupchat(self, jid, account, status=''): '''Add groupchat to roster and draw it. Return the added contact instance. ''' @@ -837,7 +836,7 @@ self.remove_contact(jid, account, force=True, backend=True) return True - def add_contact_to_groups(self, jid, account, groups, update = True): + def add_contact_to_groups(self, jid, account, groups, update=True): '''Add contact to given groups and redraw them. Contact on server is updated too. When the contact has a family, @@ -916,7 +915,7 @@ self.draw_contact(jid, account) #FIXME: integrate into add_contact() - def add_to_not_in_the_roster(self, account, jid, nick = '', resource = ''): + def add_to_not_in_the_roster(self, account, jid, nick='', resource=''): keyID = '' attached_keys = gajim.config.get_per('accounts', account, 'attached_gpg_keys').split() @@ -1047,7 +1046,7 @@ self.draw_contact(parent_jid, parent_account) return False - def draw_contact(self, jid, account, selected = False, focus = False): + def draw_contact(self, jid, account, selected=False, focus=False): '''draw the correct state image, name BUT not avatar''' # focus is about if the roster window has toplevel-focus or not # FIXME: We really need a custom cell_renderer @@ -1502,7 +1501,7 @@ gajim.config.get('showoffline')) return True - def _compareIters(self, model, iter1, iter2, data = None): + def _compareIters(self, model, iter1, iter2, data=None): '''Compare two iters to sort them''' name1 = model[iter1][C_NAME] name2 = model[iter2][C_NAME] @@ -1849,8 +1848,8 @@ dialogs.InformationDialog(_('Authorization has been sent'), _('Now "%s" will know your status.') %jid) - def req_sub(self, widget, jid, txt, account, groups = [], nickname = None, - auto_auth = False): + def req_sub(self, widget, jid, txt, account, groups=[], nickname=None, + auto_auth=False): '''Request subscription to a contact''' gajim.connections[account].request_subscription(jid, txt, nickname, groups, auto_auth, gajim.nicks[account]) @@ -2158,7 +2157,7 @@ else: w.window.destroy() - def close_all(self, account, force = False): + def close_all(self, account, force=False): '''close all the windows from an account if force is True, do not ask confirmation before closing chat/gc windows ''' @@ -2832,7 +2831,7 @@ def on_add_special_notification_menuitem_activate(self, widget, jid): dialogs.AddSpecialNotificationDialog(jid) - def on_invite_to_new_room(self, widget, list_, resource = None): + def on_invite_to_new_room(self, widget, list_, resource=None): ''' resource parameter MUST NOT be used if more than one contact in list ''' account_list = [] @@ -3467,7 +3466,7 @@ gajim.interface.on_open_chat_window(None, contact, account, \ resource=resource, session=session) - def on_roster_treeview_row_activated(self, widget, path, col = 0): + def on_roster_treeview_row_activated(self, widget, path, col=0): '''When an iter is double clicked: open the first event window''' if not gajim.single_click: self.on_row_activated(widget, path) @@ -3999,8 +3998,7 @@ ### Cleanup assigned to Jim++ :-) ################################################################################ - def get_appropriate_state_images(self, jid, size = '16', - icon_name = 'online'): + def get_appropriate_state_images(self, jid, size='16', icon_name='online'): '''check jid and return the appropriate state images dict for the demanded size. icon_name is taken into account when jid is from transport: transport iconset doesn't contain all icons, so we fall back @@ -4137,7 +4135,7 @@ self.draw_contact(contact[C_JID].decode('utf-8'), contact[C_ACCOUNT].decode('utf-8')) - def set_renderer_color(self, renderer, style, set_background = True): + def set_renderer_color(self, renderer, style, set_background=True): '''set style for treeview cell, using PRELIGHT system color''' if set_background: bgcolor = self.tree.style.bg[style] @@ -4146,7 +4144,7 @@ fgcolor = self.tree.style.fg[style] renderer.set_property('foreground-gdk', fgcolor) - def _iconCellDataFunc(self, column, renderer, model, titer, data = None): + def _iconCellDataFunc(self, column, renderer, model, titer, data=None): '''When a row is added, set properties for icon renderer''' theme = gajim.config.get('roster_theme') type_ = model[titer][C_TYPE] @@ -4189,7 +4187,7 @@ renderer.set_property('xalign', 0.4) renderer.set_property('width', 26) - def _nameCellDataFunc(self, column, renderer, model, titer, data = None): + def _nameCellDataFunc(self, column, renderer, model, titer, data=None): '''When a row is added, set properties for name renderer''' theme = gajim.config.get('roster_theme') type_ = model[titer][C_TYPE] @@ -4474,7 +4472,7 @@ ### FIXME: We really need to make it simpler! 1465 lines are a few to much.... ################################################################################ - def make_menu(self, force = False): + def make_menu(self, force=False): '''create the main window\'s menus''' if not force and not self.actions_menu_needs_rebuild: return

1 0

[commit-gajim] r10379 - trunk/src
by asterix＠gajim.org 02 Sep '08

02 Sep '08

Author: asterix Date: 2008-09-02 09:13:24 +0200 (Tue, 02 Sep 2008) New Revision: 10379 Modified: trunk/src/roster_window.py Log: coding standards Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-02 07:12:56 UTC (rev 10378) +++ trunk/src/roster_window.py 2008-09-02 07:13:24 UTC (rev 10379) @@ -334,8 +334,8 @@ self.starting = False - def _add_entity(self, contact, account, groups = None, - big_brother_contact = None, big_brother_account = None): + def _add_entity(self, contact, account, groups=None, + big_brother_contact=None, big_brother_account=None): '''Add the given contact to roster data model. Contact is added regardless if he is already in roster or not. @@ -357,8 +357,7 @@ parent_iters = self._get_contact_iter( big_brother_contact.jid, big_brother_account, big_brother_contact, self.model) - assert len(parent_iters) > 0,\ - 'Big brother is not yet in roster!' + assert len(parent_iters) > 0, 'Big brother is not yet in roster!' # Do not confuse get_contact_iter: Sync groups of family members contact.groups = big_brother_contact.get_shown_groups()[:]

1 0

[commit-gajim] r10378 - trunk/src
by asterix＠gajim.org 02 Sep '08

02 Sep '08

Author: asterix Date: 2008-09-02 09:12:56 +0200 (Tue, 02 Sep 2008) New Revision: 10378 Modified: trunk/src/config.py Log: decode strings from GTK Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-09-02 07:00:35 UTC (rev 10377) +++ trunk/src/config.py 2008-09-02 07:12:56 UTC (rev 10378) @@ -1836,7 +1836,8 @@ def on_password_entry1_changed(self, widget): if self.ignore_events: return - passwords.save_password(self.current_account, widget.get_text()) + passwords.save_password(self.current_account, widget.get_text().decode( + 'utf-8')) def on_save_password_checkbutton1_toggled(self, widget): if self.ignore_events:

1 0

[commit-gajim] r10377 - in trunk/src: . common
by asterix＠gajim.org 02 Sep '08

02 Sep '08

Author: asterix Date: 2008-09-02 09:00:35 +0200 (Tue, 02 Sep 2008) New Revision: 10377 Modified: trunk/src/common/contacts.py trunk/src/groupchat_control.py Log: show number of participants in groupchats. fixes #3418 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-09-01 20:25:50 UTC (rev 10376) +++ trunk/src/common/contacts.py 2008-09-02 07:00:35 UTC (rev 10377) @@ -272,7 +272,7 @@ else: return [] - def get_contact(self, account, jid, resource = None): + def get_contact(self, account, jid, resource=None): ### WARNING ### # This function returns a *RANDOM* resource if resource = None! # Do *NOT* use if you need to get the contact to which you @@ -331,7 +331,7 @@ group_contacts += contacts return group_contacts - def get_nb_online_total_contacts(self, accounts = [], groups = []): + def get_nb_online_total_contacts(self, accounts=[], groups=[]): '''Returns the number of online contacts and the total number of contacts''' if accounts == []: @@ -590,7 +590,7 @@ gc_contact} return self._gc_contacts[account][gc_contact.room_jid][gc_contact.name] = \ - gc_contact + gc_contact def remove_gc_contact(self, account, gc_contact): if account not in self._gc_contacts: @@ -629,4 +629,17 @@ return None return self._gc_contacts[account][room_jid][nick] + def get_nb_role_total_gc_contacts(self, account, room_jid, role): + '''Returns the number of group chat contacts for the given role and the + total number of group chat contacts''' + if account not in self._gc_contacts: + return 0, 0 + if room_jid not in self._gc_contacts[account]: + return 0, 0 + nb_role = nb_total = 0 + for nick in self._gc_contacts[account][room_jid]: + if self._gc_contacts[account][room_jid][nick].role == role: + nb_role += 1 + nb_total += 1 + return nb_role, nb_total # vim: se ts=3: Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-09-01 20:25:50 UTC (rev 10376) +++ trunk/src/groupchat_control.py 2008-09-02 07:00:35 UTC (rev 10377) @@ -628,14 +628,14 @@ return self.gc_popup_menu - def on_message(self, nick, msg, tim, has_timestamp = False, xhtml = None, - status_code = []): + def on_message(self, nick, msg, tim, has_timestamp=False, xhtml=None, + status_code=[]): if '100' in status_code: # Room is not anonymous self.is_anonymous = False if not nick: # message from server - self.print_conversation(msg, tim = tim, xhtml = xhtml) + self.print_conversation(msg, tim=tim, xhtml=xhtml) else: # message from someone if has_timestamp: @@ -926,8 +926,8 @@ gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) self.add_contact_to_roster(nick, gc_contact.show, gc_contact.role, - gc_contact.affiliation, gc_contact.status, - gc_contact.jid) + gc_contact.affiliation, gc_contact.status, gc_contact.jid) + self.draw_all_roles() # Recalculate column width for ellipsizin self.list_treeview.columns_autosize() @@ -1005,6 +1005,22 @@ scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster') model[iter][C_AVATAR] = scaled_pixbuf + def draw_role(self, role): + role_iter = self.get_role_iter(role) + if not role_iter: + return + model = self.list_treeview.get_model() + role_name = helpers.get_uf_role(role, plural=True) + if gajim.config.get('show_contacts_number'): + nbr_role, nbr_total = gajim.contacts.get_nb_role_total_gc_contacts( + self.account, self.room_jid, role) + role_name += ' (%s/%s)' % (repr(nbr_role), repr(nbr_total)) + model[role_iter][C_TEXT] = role_name + + def draw_all_roles(self): + for role in ('visitor', 'participant', 'moderator'): + self.draw_role(role) + def chg_contact_status(self, nick, show, status, role, affiliation, jid, reason, actor, statusCode, new_nick, avatar_sha, tim = None): '''When an occupant changes his or her status''' @@ -1092,7 +1108,8 @@ puny_nick = helpers.sanitize_filename(nick) puny_new_nick = helpers.sanitize_filename(new_nick) old_path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_nick) - new_path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_new_nick) + new_path = os.path.join(gajim.VCARD_PATH, puny_jid, + puny_new_nick) files = {old_path: new_path} path = os.path.join(gajim.AVATAR_PATH, puny_jid) # possible extensions @@ -1126,6 +1143,7 @@ if len(gajim.events.get_events(self.account, fake_jid)) == 0: self.remove_contact(nick) + self.draw_all_roles() else: c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) c.show = show @@ -1145,6 +1163,7 @@ iter = self.add_contact_to_roster(nick, show, role, affiliation, status, jid) newly_created = True + self.draw_all_roles() if statusCode and '201' in statusCode: # We just created the room gajim.connections[self.account].request_gc_config(self.room_jid) else: @@ -1201,6 +1220,8 @@ self.remove_contact(nick) self.add_contact_to_roster(nick, show, role, affiliation, status, jid) + self.draw_role(actual_role) + self.draw_role(role) if actor: st = _('** Role of %(nick)s has been set to %(role)s by ' '%(actor)s') % {'nick': nick_jid, 'role': role, @@ -1247,12 +1268,12 @@ if st: if status: st += ' (' + status + ')' - self.print_conversation(st, tim = tim) + self.print_conversation(st, tim=tim) def add_contact_to_roster(self, nick, show, role, affiliation, status, - jid = ''): + jid=''): model = self.list_treeview.get_model() - role_name = helpers.get_uf_role(role, plural = True) + role_name = helpers.get_uf_role(role, plural=True) resource = '' if jid: @@ -1269,7 +1290,8 @@ if not role_iter: role_iter = model.append(None, (gajim.interface.jabber_state_images['16']['closed'], role, - 'role', '%s' % role_name, None)) + 'role', role_name, None)) + self.draw_all_roles() iter = model.append(role_iter, (None, nick, 'contact', name, None)) if not nick in gajim.contacts.get_nick_list(self.account, self.room_jid): gc_contact = gajim.contacts.create_gc_contact(room_jid = self.room_jid,

1 0

[commit-gajim] r10376 - trunk/src
by steve-e＠gajim.org 01 Sep '08

01 Sep '08

Author: steve-e Date: 2008-09-01 22:25:50 +0200 (Mon, 01 Sep 2008) New Revision: 10376 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: Do not always force backend removal when performing a delayed remove operation. Some coding standards. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-09-01 18:27:32 UTC (rev 10375) +++ trunk/src/gajim.py 2008-09-01 20:25:50 UTC (rev 10376) @@ -961,7 +961,8 @@ if jid in gajim.contacts.get_jid_list(account): c = gajim.contacts.get_first_contact_from_jid(account, jid) c.resource = array[1] - self.roster.remove_contact_from_groups(c.jid, account, [('Not in Roster'),]) + self.roster.remove_contact_from_groups(c.jid, account, + [('Not in Roster'),]) else: keyID = '' attached_keys = gajim.config.get_per('accounts', account, @@ -1493,7 +1494,8 @@ # according to xep 0162, contact is not an observer anymore when # we asked him is auth, so also remove him if ask changed old_groups = contacts[0].get_shown_groups() - if contacts[0].sub != sub or contacts[0].ask != ask or old_groups != groups: + if contacts[0].sub != sub or contacts[0].ask != ask\ + or old_groups != groups: self.roster.remove_contact(jid, account) re_add = True for contact in contacts: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-01 18:27:32 UTC (rev 10375) +++ trunk/src/roster_window.py 2008-09-01 20:25:50 UTC (rev 10376) @@ -851,7 +851,7 @@ update -- update contact on the server ''' - self.remove_contact(jid, account, force = True) + self.remove_contact(jid, account, force=True) for contact in gajim.contacts.get_contacts(account, jid): for group in groups: if group not in contact.groups: @@ -866,7 +866,7 @@ for group in groups: self._adjust_group_expand_collapse_state(group, account) - def remove_contact_from_groups(self, jid, account, groups, update = True): + def remove_contact_from_groups(self, jid, account, groups, update=True): '''Remove contact from given groups and redraw them. Contact on server is updated too. When the contact has a family, @@ -879,7 +879,7 @@ update -- update contact on the server ''' - self.remove_contact(jid, account, force = True) + self.remove_contact(jid, account, force=True) for contact in gajim.contacts.get_contacts(account, jid): for group in groups: if group in contact.groups: @@ -1643,7 +1643,7 @@ # .keys() is needed for jid in array.keys(): # Remove the contact in roster. It might has changed - self.remove_contact(jid, account, force = True) + self.remove_contact(jid, account, force=True) # Remove old Contact instances gajim.contacts.remove_jid(account, jid, remove_meta=False) jids = jid.split('/') @@ -1775,9 +1775,10 @@ # Remove contacts in roster if removal was requested key = (jid, account) if key in self.contacts_to_be_removed.keys(): + backend = self.contacts_to_be_removed[key]['backend'] del self.contacts_to_be_removed[key] # Remove contact will delay removal if there are more events pending - self.remove_contact(jid, account, backend=True) + self.remove_contact(jid, account, backend=backend) self.show_title() def open_event(self, account, jid, event): @@ -2787,7 +2788,7 @@ def on_clear(widget): dlg.destroy() # Delete file: - gajim.interface.remove_avatar_files(contact.jid, local = True) + gajim.interface.remove_avatar_files(contact.jid, local=True) self.update_avatar_in_gui(contact.jid, account) dlg = dialogs.AvatarChooserDialog(on_response_ok = on_ok,

1 0

[commit-gajim] r10375 - trunk/po
by asterix＠gajim.org 01 Sep '08

01 Sep '08

Author: asterix Date: 2008-09-01 20:27:32 +0200 (Mon, 01 Sep 2008) New Revision: 10375 Modified: trunk/po/ru.po Log: [Alexander Myltsev] update russion translation Modified: trunk/po/ru.po =================================================================== --- trunk/po/ru.po 2008-09-01 17:35:59 UTC (rev 10374) +++ trunk/po/ru.po 2008-09-01 18:27:32 UTC (rev 10375) @@ -1078,8 +1078,8 @@ "You are going to begin a Multi-User Chat.\n" "Select the contacts you want to invite" msgstr "" -"Вы хотите начать чат(Multi-User Chat).\n" -"Выберите контакты которых вы хотите пригласить" +"Вы хотите начать чат (Multi-User Chat).\n" +"Выберите контакты, которых вы хотите пригласить" #: ../data/glade/data_form_window.glade.h:1 msgid "Fill in the form." @@ -1860,7 +1860,7 @@ "If checked, Gajim will show a notification when a new e-mail is received via " "GMail" msgstr "" -"Если отмечено, то Gajim будет сообщать о новых письмах полученных в GMail" +"Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail" #: ../data/glade/preferences_window.glade.h:65 msgid "" @@ -1988,7 +1988,7 @@ "The auto away status message. If empty, Gajim will not change the current " "status message" msgstr "" -"Автоматическое статусное сообщение(Ушел). Если не указано, Gajim не будет " +"Автоматическое статусное сообщение (Ушел). Если не указано, Gajim не будет " "изменять статусное сообщение" #: ../data/glade/preferences_window.glade.h:91 @@ -1996,7 +1996,7 @@ "The auto not available status message. If empty, Gajim will not change the " "current status message" msgstr "" -"Автоматическое статусное сообщение(Недоступен). Если не указано, Gajim не " +"Автоматическое статусное сообщение (Недоступен). Если не указано, Gajim не " "будет изменять статусное сообщение" #: ../data/glade/preferences_window.glade.h:92 @@ -4414,7 +4414,7 @@ #: ../src/common/connection.py:792 msgid "Error while removing privacy list" -msgstr "Ошибка при удалении списка приватности" +msgstr "Ошибка при удалении списка доступа" #: ../src/common/connection.py:793 #, python-format @@ -4422,7 +4422,7 @@ "Privacy list %s has not been removed. It is maybe active in one of your " "connected resources. Deactivate it and try again." msgstr "" -"Список приватности %s не может быть удален. Возможно, он используется одним " +"Список доступа %s не может быть удален. Возможно, он используется одним " "из ваших активных ресурсов. Отключите ресурс и попробуйте снова." #: ../src/common/connection.py:1084 @@ -5447,7 +5447,7 @@ "The host %s you configured as the ft_add_hosts_to_send advanced option is " "not valid, so ignored." msgstr "" -"Хост %s, который настроен как ft_add_hosts_to_send не действителен, поэтому " +"Хост %s, который настроен как ft_add_hosts_to_send, не действителен, поэтому " "игнорируется." #: ../src/common/zeroconf/connection_zeroconf.py:215 @@ -6562,7 +6562,7 @@ #: ../src/dialogs.py:2922 msgid "You must enter a name to create a privacy list." -msgstr "Необходимо ввести имя для новой учетной записи." +msgstr "Необходимо ввести имя для нового списка доступа." #: ../src/dialogs.py:2955 msgid "You are invited to a groupchat" @@ -6570,7 +6570,7 @@ #: ../src/dialogs.py:2958 msgid "$Contact has invited you to join a discussion" -msgstr "$Contact приглашает вас присоединится к обсуждению." +msgstr "$Contact приглашает вас присоединиться к обсуждению." #: ../src/dialogs.py:2960 #, python-format @@ -7422,7 +7422,7 @@ "You configured Gajim to use GPG agent, but there is no GPG agent running or " "it returned a wrong passphrase.\n" msgstr "" -"Gajim настроен на использование GPG агента,но GPG агент не запущен или он " +"Gajim настроен на использование GPG агента, но GPG агент не запущен или он " "возвратил неверный пароль.\n" #: ../src/gajim.py:1449 @@ -7444,7 +7444,7 @@ msgid_plural "You have %d new mail conversations" msgstr[0] "У вас есть %d непрочитанное письмо" msgstr[1] "У вас есть %d непрочитанных письма" -msgstr[2] "У вас есть %d непрочитанных письма" +msgstr[2] "У вас есть %d непрочитанных писем" #: ../src/gajim.py:1569 #, python-format @@ -7618,7 +7618,7 @@ msgid "" "Your configured emoticons theme has not been found, so emoticons have been " "disabled." -msgstr "Тема смайликов не найдена,они будут отключены." +msgstr "Тема смайликов не найдена, они будут отключены." #: ../src/gajim.py:2570 msgid "" @@ -7952,7 +7952,7 @@ #: ../src/gajim-remote.py:261 msgid "Account in which you want to handle it" -msgstr "Учетная запись в которой вы хотите его использовать" +msgstr "Учетная запись, в которой вы хотите его использовать" #: ../src/gajim-remote.py:266 msgid "Join a MUC room" @@ -7984,7 +7984,7 @@ #: ../src/gajim-remote.py:271 msgid "Account from which you want to enter the room" -msgstr "Выберите учетную запись с которой вы хотите войти в комнату" +msgstr "Выберите учетную запись, с которой вы хотите войти в комнату" #: ../src/gajim-remote.py:276 msgid "Check if Gajim is running"

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2008