Commits December 2010

commits@gajim.org

2 participants
81 discussions

gajim: Updated Russian translation
by Denis Fomin 13 Dec '10

13 Dec '10

changeset 975d7f7b6c5d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=975d7f7b6c5d description: Updated Russian translation diffstat: po/ru.po | 987 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 520 insertions(+), 467 deletions(-) diffs (truncated from 2510 to 300 lines): diff -r a38cccdfa01d -r 975d7f7b6c5d po/ru.po --- a/po/ru.po Mon Dec 13 17:06:55 2010 +0300 +++ b/po/ru.po Mon Dec 13 17:30:45 2010 +0300 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-06 12:12+0300\n" -"PO-Revision-Date: 2010-12-06 12:25+0300\n" +"POT-Creation-Date: 2010-12-13 16:57+0300\n" +"PO-Revision-Date: 2010-12-13 17:26+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -139,9 +139,9 @@ #: ../src/dialogs.py:314 #: ../src/dialogs.py:520 #: ../src/dialogs.py:533 -#: ../src/roster_window.py:3006 -#: ../src/roster_window.py:3012 -#: ../src/roster_window.py:3017 +#: ../src/roster_window.py:3046 +#: ../src/roster_window.py:3052 +#: ../src/roster_window.py:3057 msgid "None" msgstr "Нет" @@ -318,8 +318,8 @@ #: ../src/common/contacts.py:141 #: ../src/dialogs.py:113 #: ../src/dialogs.py:125 -#: ../src/roster_window.py:2948 -#: ../src/roster_window.py:5483 +#: ../src/roster_window.py:2988 +#: ../src/roster_window.py:5569 msgid "General" msgstr "Общие" @@ -396,7 +396,7 @@ #. Rename #: ../data/gui/accounts_window.ui.h:44 -#: ../src/roster_window.py:5433 +#: ../src/roster_window.py:5519 msgid "Re_name" msgstr "П_ереименовать" @@ -892,9 +892,9 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 #: ../data/gui/gc_occupants_menu.ui.h:13 -#: ../src/roster_window.py:5452 -#: ../src/roster_window.py:5579 -#: ../src/roster_window.py:5712 +#: ../src/roster_window.py:5538 +#: ../src/roster_window.py:5665 +#: ../src/roster_window.py:5798 msgid "_Unblock" msgstr "_Разблокировать" @@ -1076,7 +1076,7 @@ #: ../data/gui/chat_control.ui.h:23 #: ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/xml_console_window.ui.h:16 -#: ../src/filetransfers_window.py:268 +#: ../src/filetransfers_window.py:266 msgid "_Send" msgstr "_Отправить" @@ -1132,8 +1132,8 @@ #. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:6 -#: ../src/roster_window.py:5388 -#: ../src/roster_window.py:5547 +#: ../src/roster_window.py:5474 +#: ../src/roster_window.py:5633 msgid "In_vite to" msgstr "_Пригласить в" @@ -1146,8 +1146,8 @@ msgstr "_Удалить" #: ../data/gui/contact_context_menu.ui.h:9 -#: ../src/roster_window.py:5398 -#: ../src/roster_window.py:5636 +#: ../src/roster_window.py:5484 +#: ../src/roster_window.py:5722 msgid "Send Cus_tom Status" msgstr "Установи_ть статус" @@ -1181,9 +1181,9 @@ #: ../data/gui/contact_context_menu.ui.h:18 #: ../data/gui/gc_occupants_menu.ui.h:7 -#: ../src/roster_window.py:5460 -#: ../src/roster_window.py:5585 -#: ../src/roster_window.py:5715 +#: ../src/roster_window.py:5546 +#: ../src/roster_window.py:5671 +#: ../src/roster_window.py:5801 msgid "_Block" msgstr "_Блокировать" @@ -1195,7 +1195,7 @@ #: ../data/gui/gc_control_popup_menu.ui.h:6 #: ../data/gui/gc_occupants_menu.ui.h:8 #: ../data/gui/roster_window.ui.h:22 -#: ../src/roster_window.py:5786 +#: ../src/roster_window.py:5872 msgid "_History" msgstr "_История" @@ -1296,7 +1296,7 @@ msgstr "Показать уведомление по окончании загрузки" #: ../data/gui/filetransfers.ui.h:13 -#: ../src/filetransfers_window.py:794 +#: ../src/filetransfers_window.py:788 msgid "_Continue" msgstr "_Продолжить" @@ -1305,7 +1305,7 @@ msgstr "_Уведомить меня, когда передача файлов закончится" #: ../data/gui/filetransfers.ui.h:15 -#: ../src/filetransfers_window.py:207 +#: ../src/filetransfers_window.py:205 msgid "_Open Containing Folder" msgstr "_Открыть папку с принятым файлом" @@ -1792,42 +1792,46 @@ msgstr "Настроить" #: ../data/gui/plugins_window.ui.h:6 +msgid "Description:" +msgstr "Описание: " + +#: ../data/gui/plugins_window.ui.h:7 msgid "Descrition:" msgstr "Описание: " -#: ../data/gui/plugins_window.ui.h:7 +#: ../data/gui/plugins_window.ui.h:8 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../data/gui/plugins_window.ui.h:8 +#: ../data/gui/plugins_window.ui.h:9 msgid "Install" msgstr "Установить" -#: ../data/gui/plugins_window.ui.h:9 +#: ../data/gui/plugins_window.ui.h:10 msgid "Installed" msgstr "Установленные" -#: ../data/gui/plugins_window.ui.h:10 +#: ../data/gui/plugins_window.ui.h:11 msgid "Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization." msgstr "Описание модуля. Эта строка будет стерта при загрузке модуля." -#: ../data/gui/plugins_window.ui.h:11 +#: ../data/gui/plugins_window.ui.h:12 msgid "Plugins" msgstr "Модули" -#: ../data/gui/plugins_window.ui.h:12 +#: ../data/gui/plugins_window.ui.h:13 msgid "Uninstall" msgstr "Удалить" -#: ../data/gui/plugins_window.ui.h:13 +#: ../data/gui/plugins_window.ui.h:14 msgid "Version:" msgstr "Версия:" -#: ../data/gui/plugins_window.ui.h:14 +#: ../data/gui/plugins_window.ui.h:15 msgid "button" msgstr "" -#: ../data/gui/plugins_window.ui.h:15 +#: ../data/gui/plugins_window.ui.h:16 msgid "homepage url" msgstr "домашняя страница" @@ -2637,9 +2641,9 @@ #. Remove group #. Remove #: ../data/gui/remove_account_window.ui.h:4 -#: ../src/roster_window.py:5470 -#: ../src/roster_window.py:5595 -#: ../src/roster_window.py:5725 +#: ../src/roster_window.py:5556 +#: ../src/roster_window.py:5681 +#: ../src/roster_window.py:5811 msgid "_Remove" msgstr "_Удалить" @@ -2754,7 +2758,7 @@ #. Information #: ../data/gui/search_window.ui.h:4 -#: ../src/roster_window.py:5737 +#: ../src/roster_window.py:5823 msgid "_Information" msgstr "_Информация о контакте" @@ -3245,7 +3249,7 @@ msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID." #: ../src/chat_control.py:1574 -#: ../src/chat_control.py:2094 +#: ../src/chat_control.py:2096 msgid "GPG encryption enabled" msgstr "GPG шифрование включено" @@ -3256,7 +3260,7 @@ msgstr "Требует python-farsight." #. Add to roster -#: ../src/chat_control.py:1620 +#: ../src/chat_control.py:1622 #: ../src/common/contacts.py:158 #: ../src/common/contacts.py:277 #: ../src/common/helpers.py:57 @@ -3264,89 +3268,89 @@ #: ../src/dialogs.py:1077 #: ../src/dialogs.py:2106 #: ../src/dialogs.py:2135 -#: ../src/gui_interface.py:493 +#: ../src/gui_interface.py:495 #: ../src/gui_menu_builder.py:252 #: ../src/gui_menu_builder.py:395 -#: ../src/roster_window.py:1608 -#: ../src/roster_window.py:1610 -#: ../src/roster_window.py:1943 -#: ../src/roster_window.py:3405 -#: ../src/roster_window.py:3432 +#: ../src/roster_window.py:1647 +#: ../src/roster_window.py:1649 +#: ../src/roster_window.py:1982 +#: ../src/roster_window.py:3457 +#: ../src/roster_window.py:3484 msgid "Not in Roster" msgstr "Не в ростере" -#: ../src/chat_control.py:1650 +#: ../src/chat_control.py:1652 msgid "This contact does not support file transfer." msgstr "Этот контакт не поддерживает передачу файлов." -#: ../src/chat_control.py:1653 +#: ../src/chat_control.py:1655 msgid "You need to know the real JID of the contact to send him or her a file." msgstr "Необходимо знать настоящий JID контакта для того, чтобы отправить ему или ей файл." -#: ../src/chat_control.py:1761 +#: ../src/chat_control.py:1763 #, python-format msgid "%(type)s state : %(state)s, reason: %(reason)s" msgstr "%(type)s состояние : %(state)s, причина: %(reason)s" -#: ../src/chat_control.py:1953 +#: ../src/chat_control.py:1955 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s из комнаты %(room_name)s" #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:2074 +#: ../src/chat_control.py:2076 #: ../src/dialogs.py:5378 msgid "No GPG key assigned" msgstr "Ключ GPG не присвоен" -#: ../src/chat_control.py:2075 +#: ../src/chat_control.py:2077 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG." msgstr "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать сообщения с помощью GPG." -#: ../src/chat_control.py:2084 +#: ../src/chat_control.py:2086 msgid "GPG encryption disabled" msgstr "GPG шифрование выключено" -#: ../src/chat_control.py:2110 +#: ../src/chat_control.py:2112 msgid "Session WILL be logged" msgstr "Для сеанса БУДЕТ сохранена история сообщений" -#: ../src/chat_control.py:2112 +#: ../src/chat_control.py:2114 msgid "Session WILL NOT be logged" msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений" #. encryption %s active -#: ../src/chat_control.py:2129 +#: ../src/chat_control.py:2131

1 0

gajim: Make a plugin interface translatable.
by Denis Fomin 13 Dec '10

13 Dec '10

changeset a38cccdfa01d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a38cccdfa01d description: Make a plugin interface translatable. (Put /src/plugins/*.py in POTFILES) diffstat: autogen.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c4bff349280b -r a38cccdfa01d autogen.sh --- a/autogen.sh Mon Dec 13 14:24:01 2010 +0100 +++ b/autogen.sh Mon Dec 13 17:06:55 2010 +0300 @@ -20,7 +20,7 @@ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ && ls -1 data/gajim.desktop.in.in \ - src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \ + src/*py src/common/*py src/common/zeroconf/*.py src/plugins/*.py| grep -v ipython_view.py >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***"

1 0

gajim: [Éric Araujo] fix typo un plugins window
by Yann Leboulanger 13 Dec '10

13 Dec '10

changeset c4bff349280b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c4bff349280b description: [Éric Araujo] fix typo un plugins window diffstat: data/gui/plugins_window.ui | 2 +- plugins/ftp_manager/config_dialog.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 997a15816bdc -r c4bff349280b data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Mon Dec 13 06:38:27 2010 +0100 +++ b/data/gui/plugins_window.ui Mon Dec 13 14:24:01 2010 +0100 @@ -172,7 +172,7 @@ <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> - <property name="label" translatable="yes">Descrition:</property> + <property name="label" translatable="yes">Description:</property> </object> <packing> <property name="expand">False</property> diff -r 997a15816bdc -r c4bff349280b plugins/ftp_manager/config_dialog.ui --- a/plugins/ftp_manager/config_dialog.ui Mon Dec 13 06:38:27 2010 +0100 +++ b/plugins/ftp_manager/config_dialog.ui Mon Dec 13 14:24:01 2010 +0100 @@ -129,7 +129,7 @@ <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> - <property name="label" translatable="yes">Descrition:</property> + <property name="label" translatable="yes">Description:</property> </object> <packing> <property name="expand">False</property>

1 0

gajim: [mako] missing translated string. Fixes #6103
by Yann Leboulanger 13 Dec '10

13 Dec '10

changeset 997a15816bdc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=997a15816bdc description: [mako] missing translated string. Fixes #6103 diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r da5c0ff460f4 -r 997a15816bdc src/common/config.py --- a/src/common/config.py Sat Dec 11 20:51:34 2010 +0300 +++ b/src/common/config.py Mon Dec 13 06:38:27 2010 +0100 @@ -169,7 +169,7 @@ 'muc_restore_lines': [opt_int, 20, _('How many lines to request to server when entering a groupchat.')], 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when a entering a groupchat.')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')], - 'muc_autorejoin_on_kick': [opt_bool, False, 'Should autorejoin be activated when we are being kicked from a conference?'], + 'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')], 'show_roster_on_startup': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')],

1 0

gajim: Fix 'treat_incoming_messages' option. (didn’t get messa...
by Denis Fomin 11 Dec '10

11 Dec '10

changeset da5c0ff460f4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=da5c0ff460f4 description: Fix 'treat_incoming_messages' option. (didn’t get messages from the room) diffstat: src/common/connection_handlers_events.py | 4 ---- src/session.py | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diffs (27 lines): diff -r fbc39b6087e0 -r da5c0ff460f4 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Dec 11 12:57:09 2010 +0100 +++ b/src/common/connection_handlers_events.py Sat Dec 11 20:51:34 2010 +0300 @@ -1091,10 +1091,6 @@ # XEP-0172 User Nickname self.user_nick = self.stanza.getTagData('nick') or '' - treat_as = gajim.config.get('treat_incoming_messages') - if treat_as: - self.mtype = treat_as - self.get_chatstate() return True diff -r fbc39b6087e0 -r da5c0ff460f4 src/session.py --- a/src/session.py Sat Dec 11 12:57:09 2010 +0100 +++ b/src/session.py Sat Dec 11 20:51:34 2010 +0300 @@ -97,6 +97,9 @@ common.logger.LOG_DB_PATH self.conn.dispatch('ERROR', (pritext, sectext)) + treat_as = gajim.config.get('treat_incoming_messages') + if treat_as: + obj.mtype = treat_as pm = False if obj.gc_control and obj.resource: # It's a Private message

1 0

gajim: handle nested roster group. TODO: Improve the way it's di...
by Yann Leboulanger 11 Dec '10

11 Dec '10

changeset fbc39b6087e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fbc39b6087e0 description: handle nested roster group. TODO: Improve the way it's displayed in roster. Fixes #1381 diffstat: src/common/connection.py | 44 ++++++++ src/common/connection_handlers.py | 28 ++-- src/roster_window.py | 191 +++++++++++++++++++++++++++---------- 3 files changed, 197 insertions(+), 66 deletions(-) diffs (truncated from 463 to 300 lines): diff -r 53b97cb41c61 -r fbc39b6087e0 src/common/connection.py --- a/src/common/connection.py Sat Dec 11 12:15:55 2010 +0300 +++ b/src/common/connection.py Sat Dec 11 12:57:09 2010 +0100 @@ -161,6 +161,8 @@ self.awaiting_cids = {} # Used for XEP-0231 + self.nested_group_delimiter = '::' + self.get_config_values_or_default() def _compute_resource(self): @@ -2103,6 +2105,32 @@ iq4.setData(self.annotations[jid]) self.connection.send(iq) + def get_roster_delimiter(self): + """ + Get roster group delimiter from storage as described in XEP 0083 + """ + if not gajim.account_is_connected(self.name): + return + iq = common.xmpp.Iq(typ='get') + iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) + iq2.addChild(name='roster', namespace='roster:delimiter') + id_ = self.connection.getAnID() + iq.setID(id_) + self.awaiting_answers[id_] = (DELIMITER_ARRIVED, ) + self.connection.send(iq) + + def set_roster_delimiter(self, delimiter='::'): + """ + Set roster group delimiter to the storage namespace + """ + if not gajim.account_is_connected(self.name): + return + iq = common.xmpp.Iq(typ='set') + iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) + iq3 = iq2.addChild(name='roster', namespace='roster:delimiter') + iq3.setData(delimiter) + + self.connection.send(iq) def get_metacontacts(self): """ @@ -2136,6 +2164,22 @@ iq3.addChild(name = 'meta', attrs = dict_) self.connection.send(iq) + def request_roster(self): + version = None + features = self.connection.Dispatcher.Stream.features + if features and features.getTag('ver', + namespace=common.xmpp.NS_ROSTER_VER): + version = gajim.config.get_per('accounts', self.name, + 'roster_version') + if version and not gajim.contacts.get_contacts_jid_list( + self.name): + gajim.config.set_per('accounts', self.name, 'roster_version', + '') + version = None + + iq_id = self.connection.initRoster(version=version) + self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) + def send_agent_status(self, agent, ptype): if not gajim.account_is_connected(self.name): return diff -r 53b97cb41c61 -r fbc39b6087e0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Dec 11 12:15:55 2010 +0300 +++ b/src/common/connection_handlers.py Sat Dec 11 12:57:09 2010 +0100 @@ -84,6 +84,7 @@ AGENT_REMOVED = 'agent_removed' METACONTACTS_ARRIVED = 'metacontacts_arrived' ROSTER_ARRIVED = 'roster_arrived' +DELIMITER_ARRIVED = 'delimiter_arrived' PRIVACY_ARRIVED = 'privacy_arrived' PEP_CONFIG = 'pep_config' HAS_IDLE = True @@ -525,21 +526,22 @@ else: if iq_obj.getErrorCode() not in ('403', '406', '404'): self.private_storage_supported = False + self.get_roster_delimiter() + elif self.awaiting_answers[id_][0] == DELIMITER_ARRIVED: + if not self.connection: + return + if iq_obj.getType() == 'result': + query = iq_obj.getTag('query') + delimiter = query.getTagData('roster') + if delimiter: + self.nested_group_delimiter = delimiter + else: + self.set_roster_delimiter('::') + else: + self.private_storage_supported = False # We can now continue connection by requesting the roster - version = None - if con.Stream.features and con.Stream.features.getTag('ver', - namespace=common.xmpp.NS_ROSTER_VER): - version = gajim.config.get_per('accounts', self.name, - 'roster_version') - if version and not gajim.contacts.get_contacts_jid_list( - self.name): - gajim.config.set_per('accounts', self.name, - 'roster_version', '') - version = None - - iq_id = self.connection.initRoster(version=version) - self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) + self.request_roster() elif self.awaiting_answers[id_][0] == ROSTER_ARRIVED: if iq_obj.getType() == 'result': if not iq_obj.getTag('query'): diff -r 53b97cb41c61 -r fbc39b6087e0 src/roster_window.py --- a/src/roster_window.py Sat Dec 11 12:15:55 2010 +0300 +++ b/src/roster_window.py Sat Dec 11 12:57:09 2010 +0100 @@ -284,6 +284,36 @@ self.starting = False + def _add_group_iter(self, account, group): + """ + Add a group iter in roster and return the newly created iter + """ + if self.regroup: + account_group = 'MERGED' + else: + account_group = account + delimiter = gajim.connections[account].nested_group_delimiter + group_splited = group.split(delimiter) + parent_group = delimiter.join(group_splited[:-1]) + if parent_group in self._iters[account_group]['groups']: + iter_parent = self._iters[account_group]['groups'][parent_group] + elif parent_group: + iter_parent = self._add_group_iter(account, parent_group) + if parent_group not in gajim.groups[account]: + if account + parent_group in self.collapsed_rows: + is_expanded = False + else: + is_expanded = True + gajim.groups[account][parent_group] = {'expand': is_expanded} + else: + iter_parent = self._get_account_iter(account, self.model) + iter_group = self.model.append(iter_parent, + [gajim.interface.jabber_state_images['16']['closed'], + gobject.markup_escape_text(group), 'group', group, account, None, + None, None, None, None, None] + [None] * self.nb_ext_renderers) + self.draw_group(group, account) + self._iters[account_group]['groups'][group] = iter_group + return iter_group def _add_entity(self, contact, account, groups=None, big_brother_contact=None, big_brother_account=None): @@ -328,23 +358,12 @@ # We are a normal contact. Add us to our groups. if not groups: groups = contact.get_shown_groups() - if self.regroup: - account_group = 'MERGED' - else: - account_group = account for group in groups: child_iterG = self._get_group_iter(group, account, model=self.model) if not child_iterG: # Group is not yet in roster, add it! - child_iterA = self._get_account_iter(account, self.model) - child_iterG = self.model.append(child_iterA, - [gajim.interface.jabber_state_images['16']['closed'], - gobject.markup_escape_text(group), - 'group', group, account, None, None, None, None, None, - None] + [None] * self.nb_ext_renderers) - self.draw_group(group, account) - self._iters[account_group]['groups'][group] = child_iterG + child_iterG = self._add_group_iter(account, group) if contact.is_transport(): typestr = 'agent' @@ -419,8 +438,10 @@ "Invalidated iters of %s" % contact.jid parent_i = self.model.iter_parent(i) - - if parent_type == 'group' and \ + parent_type = self.model[parent_i][C_TYPE] + + to_be_removed = i + while parent_type == 'group' and \ self.model.iter_n_children(parent_i) == 1: if self.regroup: account_group = 'MERGED' @@ -429,10 +450,12 @@ group = self.model[parent_i][C_JID].decode('utf-8') if group in gajim.groups[account]: del gajim.groups[account][group] - self.model.remove(parent_i) + to_be_removed = parent_i del self._iters[account_group]['groups'][group] - else: - self.model.remove(i) + parent_i = self.model.iter_parent(parent_i) + parent_type = self.model[parent_i][C_TYPE] + self.model.remove(to_be_removed) + del self._iters[account]['contacts'][contact.jid] return True @@ -1248,13 +1271,19 @@ if family and not is_big_brother and not self.starting: self.draw_parent_contact(jid, account) + delimiter = gajim.connections[account].nested_group_delimiter 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) - if iterG: - # it's not self contact - self.model[iterG][C_JID] = self.model[iterG][C_JID] + group_splited = group.split(delimiter) + i = 1 + while i < len(group_splited) + 1: + g = delimiter.join(group_splited[:i]) + iterG = self._get_group_iter(g, account, model=self.model) + if iterG: + # it's not self contact + self.model[iterG][C_JID] = self.model[iterG][C_JID] + i += 1 gajim.plugin_manager.gui_extension_point('roster_draw_contact', self, jid, account, contact) @@ -1446,16 +1475,21 @@ """ if not self.tree.get_model(): return - iterG = self._get_group_iter(group, account) - if not iterG: - # Group not visible - return - path = self.modelfilter.get_path(iterG) - if account + group in self.collapsed_rows: - self.tree.collapse_row(path) - else: - self.tree.expand_row(path, False) - return False + delimiter = gajim.connections[account].nested_group_delimiter + group_splited = group.split(delimiter) + i = 1 + while i < len(group_splited) + 1: + g = delimiter.join(group_splited[:i]) + iterG = self._get_group_iter(g, account) + if not iterG: + # Group not visible + return + path = self.modelfilter.get_path(iterG) + if account + g in self.collapsed_rows: + self.tree.collapse_row(path) + else: + self.tree.expand_row(path, False) + i += 1 ############################################################################## ### Roster and Modelfilter handling @@ -1544,11 +1578,16 @@ else: accounts = [account] for _acc in accounts: + delimiter = gajim.connections[_acc].nested_group_delimiter for contact in gajim.contacts.iter_contacts(_acc): + if not self.contact_is_visible(contact, _acc): + continue # Is this contact in this group? - if group in contact.get_shown_groups(): - if self.contact_is_visible(contact, _acc): - return True + for grp in contact.get_shown_groups(): + while grp: + if group == grp: + return True + grp = delimiter.join(grp.split(delimiter)[:-1]) return False if type_ == 'contact': if gajim.config.get('showoffline'): @@ -2101,7 +2140,7 @@ ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account) if ctrl and ctrl.type_id != message_control.TYPE_GC: ctrl.contact = gajim.contacts.get_contact_with_highest_priority( - account, contact.jid) + account, contact.jid) ctrl.update_status_display(name, uf_show, status) if contact.resource: @@ -2111,7 +2150,7 @@ # Delete pep if needed keep_pep = any(c.show not in ('error', 'offline') for c in - contact_instances) + contact_instances)

1 0

gajim: tab_eventbox widget. do not grab focus
by Denis Fomin 11 Dec '10

11 Dec '10

changeset 53b97cb41c61 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=53b97cb41c61 description: tab_eventbox widget. do not grab focus diffstat: src/message_window.py | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diffs (103 lines): diff -r 03bb76314e01 -r 53b97cb41c61 src/message_window.py --- a/src/message_window.py Sat Dec 11 10:58:12 2010 +0300 +++ b/src/message_window.py Sat Dec 11 12:15:55 2010 +0300 @@ -219,9 +219,9 @@ # destroy window return False dialogs.YesNoDialog( - _('You are going to close several tabs'), -_('Do you really want to close them all?'), - checktext=_('_Do not ask me again'), on_response_yes=on_yes1) + _('You are going to close several tabs'), + _('Do you really want to close them all?'), + checktext=_('_Do not ask me again'), on_response_yes=on_yes1) return True def on_yes(ctrl): @@ -292,8 +292,8 @@ id_ = widget.connect('clicked', self._on_close_button_clicked, control) control.handlers[id_] = widget - id_ = tab_label_box.connect('button-press-event', self.on_tab_eventbox_button_press_event, - control.widget) + id_ = tab_label_box.connect('button-press-event', + self.on_tab_eventbox_button_press_event, control.widget) control.handlers[id_] = tab_label_box self.notebook.append_page(control.widget, tab_label_box) @@ -317,6 +317,9 @@ elif event.button == 2: # middle click ctrl = self._widget_to_control(child) self.remove_tab(ctrl, self.CLOSE_TAB_MIDDLE_CLICK) + else: + ctrl = self._widget_to_control(child) + gobject.idle_add(ctrl.msg_textview.grab_focus) def _on_message_textview_mykeypress_event(self, widget, event_keyval, event_keymod): @@ -591,7 +594,7 @@ elif self.get_num_controls() == 1: # we are going from two tabs to one window_mode = gajim.interface.msg_win_mgr.mode show_tabs_if_one_tab = gajim.config.get('tabs_always_visible') or \ - window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER + window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER self.notebook.set_show_tabs(show_tabs_if_one_tab) def redraw_tab(self, ctrl, chatstate = None): @@ -719,8 +722,8 @@ ind = self.notebook.get_current_page() current = ind found = False - first_composing_ind = -1 # id of first composing ctrl to switch to - # if no others controls have awaiting events + first_composing_ind = -1 # id of first composing ctrl to switch to + # if no others controls have awaiting events # loop until finding an unread tab or having done a complete cycle while True: if forward == True: # look for the first unread tab on the right @@ -735,7 +738,8 @@ if ctrl.get_nb_unread() > 0: found = True break # found - elif gajim.config.get('ctrl_tab_go_to_next_composing') : # Search for a composing contact + elif gajim.config.get('ctrl_tab_go_to_next_composing') : + # Search for a composing contact contact = ctrl.contact if first_composing_ind == -1 and contact.chatstate == 'composing': # If no composing contact found yet, check if this one is composing @@ -780,7 +784,8 @@ control.msg_textview.grab_focus() def _on_notebook_key_press(self, widget, event): - # when tab itself is selected, make sure <- and -> are allowed for navigating between tabs + # when tab itself is selected, + # make sure <- and -> are allowed for navigating between tabs if event.keyval in (gtk.keysyms.Left, gtk.keysyms.Right): return False @@ -888,11 +893,11 @@ def __init__(self, parent_window, parent_paned): """ A dictionary of windows; the key depends on the config: - ONE_MSG_WINDOW_NEVER: The key is the contact JID - ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN - ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: The key is MessageWindowMgr.MAIN_WIN - ONE_MSG_WINDOW_PERACCT: The key is the account name - ONE_MSG_WINDOW_PERTYPE: The key is a message type constant + ONE_MSG_WINDOW_NEVER: The key is the contact JID + ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN + ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: The key is MessageWindowMgr.MAIN_WIN + ONE_MSG_WINDOW_PERACCT: The key is the account name + ONE_MSG_WINDOW_PERTYPE: The key is a message type constant """ gobject.GObject.__init__(self) self._windows = {} @@ -939,7 +944,7 @@ def one_window_opened(self, contact=None, acct=None, type_=None): try: return \ - self._windows[self._mode_to_key(contact, acct, type_)] is not None + self._windows[self._mode_to_key(contact, acct, type_)] is not None except KeyError: return False

1 0

gajim: gc window. set focus to message textview(not to conversat...
by Denis Fomin 11 Dec '10

11 Dec '10

changeset 03bb76314e01 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=03bb76314e01 description: gc window. set focus to message textview(not to conversation textview) diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r fc783743003c -r 03bb76314e01 src/groupchat_control.py --- a/src/groupchat_control.py Fri Dec 10 23:53:47 2010 +0300 +++ b/src/groupchat_control.py Sat Dec 11 10:58:12 2010 +0300 @@ -471,7 +471,6 @@ ChatControlBase.got_disconnected(self) self.update_ui() - gobject.idle_add(self.conv_textview.tv.grab_focus) self.widget.show_all() # PluginSystem: adding GUI extension point for this GroupchatControl @@ -1254,6 +1253,7 @@ self._update_banner_state_image() if self.parent_win: self.parent_win.redraw_tab(self) + gobject.idle_add(self.msg_textview.grab_focus) def got_disconnected(self): self.list_treeview.get_model().clear()

1 0

gajim: Correctly set focus
by Denis Fomin 10 Dec '10

10 Dec '10

changeset fc783743003c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fc783743003c description: Correctly set focus diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a74decc17a69 -r fc783743003c src/groupchat_control.py --- a/src/groupchat_control.py Fri Dec 10 21:16:26 2010 +0300 +++ b/src/groupchat_control.py Fri Dec 10 23:53:47 2010 +0300 @@ -471,7 +471,7 @@ ChatControlBase.got_disconnected(self) self.update_ui() - self.conv_textview.tv.grab_focus() + gobject.idle_add(self.conv_textview.tv.grab_focus) self.widget.show_all() # PluginSystem: adding GUI extension point for this GroupchatControl

1 0

gajim: add lost signal
by Denis Fomin 10 Dec '10

10 Dec '10

changeset a74decc17a69 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a74decc17a69 description: add lost signal diffstat: data/gui/accounts_window.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r f1e631b59fef -r a74decc17a69 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Fri Dec 10 10:54:15 2010 +0300 +++ b/data/gui/accounts_window.ui Fri Dec 10 21:16:26 2010 +0300 @@ -484,6 +484,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Choose Client Cert</property> + <signal name="clicked" handler="on_browse_for_client_cert_button_clicked"/> </object> <packing> <property name="expand">False</property>

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 December 2010