Commits October 2011

commits@gajim.org

3 participants
64 discussions

gajim: fix traceback when we don't use a profile
by Yann Leboulanger 23 Oct '11

23 Oct '11

changeset 7d715bcd769d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7d715bcd769d description: fix traceback when we don't use a profile diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 28a01075f7cb -r 7d715bcd769d src/gajim.py --- a/src/gajim.py Sun Oct 23 18:55:14 2011 +0200 +++ b/src/gajim.py Sun Oct 23 19:52:32 2011 +0200 @@ -144,7 +144,8 @@ import locale profile, config_path = parseOpts() -config_path = unicode(config_path, locale.getpreferredencoding()) +if config_path: + config_path = unicode(config_path, locale.getpreferredencoding()) del parseOpts profile = unicode(profile, locale.getpreferredencoding())

1 0

gajim: fix some encoding problems when looking for plugin config...
by Yann Leboulanger 23 Oct '11

23 Oct '11

changeset 28a01075f7cb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=28a01075f7cb description: fix some encoding problems when looking for plugin config with non-ascii chars in path. Fixes #7015 diffstat: src/gajim.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (27 lines): diff -r 7e5d27f71996 -r 28a01075f7cb src/gajim.py --- a/src/gajim.py Sun Oct 23 13:48:00 2011 +0200 +++ b/src/gajim.py Sun Oct 23 18:55:14 2011 +0200 @@ -142,10 +142,11 @@ config_path_ = a return profile_, config_path_ +import locale profile, config_path = parseOpts() +config_path = unicode(config_path, locale.getpreferredencoding()) del parseOpts -import locale profile = unicode(profile, locale.getpreferredencoding()) import common.configpaths @@ -155,8 +156,8 @@ del profile if os.name == 'nt': - plugins_locale_dir = str(os.path.join(common.configpaths.gajimpaths[ - 'PLUGINS_USER'], 'locale')) + plugins_locale_dir = os.path.join(common.configpaths.gajimpaths[ + 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding()) libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8')

1 0

gajim: fixes some traceback when doing filetransfer. Fixes #1205
by Yann Leboulanger 23 Oct '11

23 Oct '11

changeset 7e5d27f71996 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7e5d27f71996 description: fixes some traceback when doing filetransfer. Fixes #1205 diffstat: src/chat_control.py | 4 ++-- src/common/protocol/bytestream.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 7fbdd41509cc -r 7e5d27f71996 src/chat_control.py --- a/src/chat_control.py Sat Oct 22 10:58:09 2011 +0200 +++ b/src/chat_control.py Sun Oct 23 13:48:00 2011 +0200 @@ -3194,7 +3194,7 @@ Show an InfoBar on top of control """ markup = '%s: %s' % (_('File transfer'), file_props['name']) - if file_props['desc']: + if 'desc' in file_props and file_props['desc']: markup += ' (%s)' % file_props['desc'] markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes( file_props['size'])) @@ -3223,7 +3223,7 @@ def _got_file_completed(self, file_props): markup = '%s: %s' % (_('File transfer completed'), file_props['name']) - if file_props['desc']: + if 'desc' in file_props and file_props['desc']: markup += ' (%s)' % file_props['desc'] b1 = gtk.Button(_('_Open Containing Folder')) b1.connect('clicked', self._on_open_ft_folder, file_props) diff -r 7fbdd41509cc -r 7e5d27f71996 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Oct 22 10:58:09 2011 +0200 +++ b/src/common/protocol/bytestream.py Sun Oct 23 13:48:00 2011 +0200 @@ -620,6 +620,10 @@ self.send_success_connect_reply, None) raise xmpp.NodeProcessed + if file_props is None: + log.warn('Gajim got streamhosts for unknown transfer. Ignoring it.') + raise xmpp.NodeProcessed + file_props['streamhosts'] = streamhosts if file_props['type'] == 'r': gajim.socks5queue.connect_to_hosts(self.name, sid,

1 0

gajim: [Sergiy Yegorov] updated ukrainian translation
by Yann Leboulanger 22 Oct '11

22 Oct '11

changeset 7fbdd41509cc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7fbdd41509cc description: [Sergiy Yegorov] updated ukrainian translation diffstat: po/uk.po | 3400 ++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 1763 insertions(+), 1637 deletions(-) diffs (truncated from 8317 to 300 lines): diff -r f79f2e05a96e -r 7fbdd41509cc po/uk.po --- a/po/uk.po Thu Oct 20 14:12:21 2011 +0300 +++ b/po/uk.po Sat Oct 22 10:58:09 2011 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.0.1-2fa5ddcd1adf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:14+0100\n" -"PO-Revision-Date: 2011-03-06 10:45+0200\n" +"POT-Creation-Date: 2011-10-22 10:57+0200\n" +"PO-Revision-Date: 2011-10-19 12:08+0300\n" "Last-Translator: Sergiy Yegorov <prapor(a)unixzone.org.ua>\n" "Language-Team: Ukrainian <kde-i18n-doc(a)kde.org>\n" "Language: uk\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 1.1\n" +"X-Generator: Lokalize 1.2\n" #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." @@ -27,7 +27,7 @@ msgid "_Add Contact..." msgstr "_Додати контакт..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" msgstr "Ви_явити служби" @@ -119,12 +119,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1295 ../src/config.py:1398 ../src/config.py:1709 -#: ../src/config.py:1714 ../src/config.py:2280 ../src/config.py:2359 -#: ../src/config.py:2372 ../src/config.py:3649 ../src/config.py:3724 -#: ../src/dialogs.py:312 ../src/dialogs.py:314 ../src/dialogs.py:520 -#: ../src/dialogs.py:533 ../src/roster_window.py:3047 -#: ../src/roster_window.py:3053 ../src/roster_window.py:3058 +#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703 +#: ../src/config.py:1708 ../src/config.py:2284 ../src/config.py:2363 +#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730 +#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 +#: ../src/dialogs.py:532 ../src/roster_window.py:3092 +#: ../src/roster_window.py:3098 ../src/roster_window.py:3103 msgid "None" msgstr "Немає" @@ -154,7 +154,7 @@ "запис." #: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 +#: ../data/gui/roster_window.ui.h:17 msgid "_Advanced" msgstr "Д_одатково" @@ -167,12 +167,12 @@ msgstr "Назва _вузла:" #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:62 +#: ../data/gui/accounts_window.ui.h:61 msgid "_Jabber ID:" msgstr "_Jabber ID:" #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/accounts_window.ui.h:63 #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "_Password:" @@ -235,10 +235,14 @@ msgstr "_З'єднуватись після запуску Gajim" #: ../data/gui/accounts_window.ui.h:13 +msgid "Certificate is e_ncrypted" +msgstr "Сертифікат зашифровано" + +#: ../data/gui/accounts_window.ui.h:14 msgid "Chan_ge Password" msgstr "_Змінити пароль" -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:15 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -246,10 +250,6 @@ "Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через " "незахищеним з’єднанням." -#: ../data/gui/accounts_window.ui.h:15 -msgid "Choose Client Cert" -msgstr "Оберіть клієнтський сертифікат" - #: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." msgstr "Обрати _ключ..." @@ -288,9 +288,9 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:546 ../src/notify.py:569 ../src/notify.py:618 -#: ../src/notify.py:634 +#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160 +#: ../src/notify.py:318 ../src/notify.py:341 ../src/notify.py:391 +#: ../src/notify.py:407 msgid "Gajim" msgstr "Gajim" @@ -298,9 +298,9 @@ #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57 -#: ../src/common/contacts.py:141 ../src/dialogs.py:113 ../src/dialogs.py:125 -#: ../src/roster_window.py:2989 ../src/roster_window.py:5570 +#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56 +#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124 +#: ../src/roster_window.py:3034 ../src/roster_window.py:5652 msgid "General" msgstr "Загальне" @@ -360,8 +360,8 @@ msgstr "Відомості про вас, які зберігаються на сервері" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1832 -#: ../src/dialogs.py:838 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826 +#: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -374,8 +374,8 @@ msgid "Mer_ge accounts" msgstr "Об’є_днати облікові записи" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1805 -#: ../src/config.py:2373 +#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799 +#: ../src/config.py:2377 msgid "No key selected" msgstr "Не обрано жодного ключа" @@ -402,7 +402,7 @@ msgstr "Пріоритет змінюватиметься залежно від вашого стану." #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5520 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602 msgid "Re_name" msgstr "Пере_йменувати" @@ -446,55 +446,51 @@ msgstr "Синхронізувати контакти" #: ../data/gui/accounts_window.ui.h:53 -msgid "The path to the client certificate and key in PKCS#12 format" -msgstr "Шлях до клієнтського сертифікату та ключа у форматі PKCS#12" - -#: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent" msgstr "Використовувати _агент GnuPG" -#: ../data/gui/accounts_window.ui.h:55 +#: ../data/gui/accounts_window.ui.h:54 msgid "Use cust_om hostname/port" msgstr "Використовувати інші вузол/порт" -#: ../data/gui/accounts_window.ui.h:56 +#: ../data/gui/accounts_window.ui.h:55 msgid "Use cust_om port:" msgstr "Використовувати інший порт:" -#: ../data/gui/accounts_window.ui.h:57 +#: ../data/gui/accounts_window.ui.h:56 msgid "Use file transfer proxies" msgstr "Використовувати проксі передавання файлів" -#: ../data/gui/accounts_window.ui.h:58 +#: ../data/gui/accounts_window.ui.h:57 msgid "_Client Cert File:" msgstr "Файл клієнтського _сертифікату:" -#: ../data/gui/accounts_window.ui.h:59 +#: ../data/gui/accounts_window.ui.h:58 msgid "_Edit Personal Information..." msgstr "Редагувати особисті відомості..." #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:59 ../data/gui/xml_console_window.ui.h:11 msgid "_Enable" msgstr "Увімкнути" -#: ../data/gui/accounts_window.ui.h:61 +#: ../data/gui/accounts_window.ui.h:60 msgid "_Hostname: " msgstr "Назва _вузла:" -#: ../data/gui/accounts_window.ui.h:63 +#: ../data/gui/accounts_window.ui.h:62 msgid "_Manage..." msgstr "Керування..." -#: ../data/gui/accounts_window.ui.h:65 +#: ../data/gui/accounts_window.ui.h:64 msgid "_Port: " msgstr "_Порт:" -#: ../data/gui/accounts_window.ui.h:66 +#: ../data/gui/accounts_window.ui.h:65 msgid "_Warn before using an insecure connection" msgstr "_Попереджати перед використанням незахищеного з’єднання" -#: ../data/gui/accounts_window.ui.h:67 +#: ../data/gui/accounts_window.ui.h:66 msgid "_use HTTP__PROXY environment variable" msgstr "використовувати змінну середовища HTTP_PROXY" @@ -510,7 +506,7 @@ msgid "Add New Contact" msgstr "Додати новий контакт" -#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1341 +#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339 msgid "I would like to add you to my contact list." msgstr "Я хочу додати вас до мого списку контактів." @@ -666,182 +662,6 @@ msgid "_Send Server Message..." msgstr "_Надіслати серверне повідомлення..." -#: ../data/gui/advanced_notifications_window.ui.h:1 -msgid " a window/tab opened with that contact " -msgstr " вікно/закладка відкрите з цим контактом " - -#: ../data/gui/advanced_notifications_window.ui.h:2 -msgid "Actions" -msgstr "Дії" - -#: ../data/gui/advanced_notifications_window.ui.h:3 -msgid "Conditions" -msgstr "Умови" - -#: ../data/gui/advanced_notifications_window.ui.h:4 -#: ../data/gui/preferences_window.ui.h:17 -msgid "Sounds" -msgstr "Звуки" - -#: ../data/gui/advanced_notifications_window.ui.h:5 -msgid "Advanced Actions" -msgstr "Додаткові дії" - -#: ../data/gui/advanced_notifications_window.ui.h:6 -msgid "Advanced Notifications Control" -msgstr "Розширене керування сповіщеннями" - -#: ../data/gui/advanced_notifications_window.ui.h:7 -msgid "All statuses" -msgstr "Усі стани" - -#: ../data/gui/advanced_notifications_window.ui.h:8 -#: ../src/common/commands.py:106 ../src/common/helpers.py:239 -#: ../src/tooltips.py:193 -msgid "Away" -msgstr "Далеко" - -#: ../data/gui/advanced_notifications_window.ui.h:9 -msgid "Busy " -msgstr "У справах " - -#: ../data/gui/advanced_notifications_window.ui.h:10 -msgid "Contact Change Status " -msgstr "Зміна стану контакту" - -#: ../data/gui/advanced_notifications_window.ui.h:11 -msgid "Contact Disconnected " -msgstr "Контакт від'єднано" - -#: ../data/gui/advanced_notifications_window.ui.h:12 -msgid "Don't have " -msgstr "Не має " - -#: ../data/gui/advanced_notifications_window.ui.h:13 -msgid "File Transfer Finished" -msgstr "Перенесення файлу завершено" - -#: ../data/gui/advanced_notifications_window.ui.h:14 -msgid "File Transfer Request " -msgstr "Запит на передавання файла" - -#: ../data/gui/advanced_notifications_window.ui.h:15 -msgid "File Transfer Started "

1 0

gajim: add comment
by Fomin Denis 20 Oct '11

20 Oct '11

changeset f79f2e05a96e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f79f2e05a96e description: add comment diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 1b33cafd8624 -r f79f2e05a96e src/roster_window.py --- a/src/roster_window.py Thu Oct 20 13:49:16 2011 +0300 +++ b/src/roster_window.py Thu Oct 20 14:12:21 2011 +0300 @@ -2388,6 +2388,7 @@ accounts_to_disconnect.append(acct) if not self.quit_on_next_offline: + # all accounts offline, quit self.quit_gtkgui_interface() return

1 0

gajim: don't call quit_gtkgui_interface twice
by Fomin Denis 20 Oct '11

20 Oct '11

changeset 1b33cafd8624 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1b33cafd8624 description: don't call quit_gtkgui_interface twice diffstat: src/roster_window.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (21 lines): diff -r 7b9e2819ef9b -r 1b33cafd8624 src/roster_window.py --- a/src/roster_window.py Mon Oct 17 18:00:27 2011 +0200 +++ b/src/roster_window.py Thu Oct 20 13:49:16 2011 +0300 @@ -2387,13 +2387,14 @@ self.quit_on_next_offline += 1 accounts_to_disconnect.append(acct) + if not self.quit_on_next_offline: + self.quit_gtkgui_interface() + return + for acct in accounts_to_disconnect: self.send_status(acct, 'offline', message) self.send_pep(acct, pep_dict) - if not self.quit_on_next_offline: - self.quit_gtkgui_interface() - def on_continue2(message, pep_dict): # check if there is an active file transfer from common.protocol.bytestream import (is_transfer_active)

1 0

gajim: remove buttons from infobar just before adding new instea...
by Yann Leboulanger 17 Oct '11

17 Oct '11

changeset 7b9e2819ef9b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7b9e2819ef9b description: remove buttons from infobar just before adding new instead of when hidding infobar diffstat: src/chat_control.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (30 lines): diff -r bd685a34e6c8 -r 7b9e2819ef9b src/chat_control.py --- a/src/chat_control.py Mon Oct 17 17:55:43 2011 +0200 +++ b/src/chat_control.py Mon Oct 17 18:00:27 2011 +0200 @@ -3150,8 +3150,16 @@ return markup, buttons, args, type_ = self.info_bar_queue[0] self.info_bar_label.set_markup(markup) + + # Remove old buttons + area = self.info_bar.get_action_area() + for b in area.get_children(): + area.remove(b) + + # Add new buttons for button in buttons: self.info_bar.add_action_widget(button, 0) + self.info_bar.set_message_type(type_) self.info_bar.set_no_show_all(False) self.info_bar.show_all() @@ -3269,9 +3277,6 @@ self.info_bar_queue.remove(ib_msg) if i == 0: # We are removing the one currently displayed - area = self.info_bar.get_action_area() - for b in area.get_children(): - area.remove(b) self.info_bar.hide() # show next one? gobject.idle_add(self._info_bar_show_message)

1 0

gajim: improve strings
by Yann Leboulanger 17 Oct '11

17 Oct '11

changeset bd685a34e6c8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bd685a34e6c8 description: improve strings diffstat: src/chat_control.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diffs (33 lines): diff -r c49c8c8abedc -r bd685a34e6c8 src/chat_control.py --- a/src/chat_control.py Mon Oct 17 17:12:19 2011 +0200 +++ b/src/chat_control.py Mon Oct 17 17:55:43 2011 +0200 @@ -3185,11 +3185,11 @@ """ Show an InfoBar on top of control """ - markup = '' + _('File transfer:') + ' ' + file_props['name'] + markup = '%s: %s' % (_('File transfer'), file_props['name']) if file_props['desc']: - markup += ' (' + file_props['desc'] + ')' - markup += '\n' + _('Size:') + ' ' + helpers.convert_bytes( - file_props['size']) + markup += ' (%s)' % file_props['desc'] + markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes( + file_props['size'])) b1 = gtk.Button(_('_Accept')) b1.connect('clicked', self._on_accept_file_request, file_props) b2 = gtk.Button(stock=gtk.STOCK_CANCEL) @@ -3213,10 +3213,10 @@ gajim.events.remove_events(self.account, self.contact.jid, event=ev) def _got_file_completed(self, file_props): - markup = '' + _('File transfer completed:') + ' ' + \ - file_props['name'] + markup = '%s: %s' % (_('File transfer completed'), + file_props['name']) if file_props['desc']: - markup += ' (' + file_props['desc'] + ')' + markup += ' (%s)' % file_props['desc'] b1 = gtk.Button(_('_Open Containing Folder')) b1.connect('clicked', self._on_open_ft_folder, file_props) b2 = gtk.Button(stock=gtk.STOCK_OK)

1 0

gajim: add infobar in chat window for file transfer events. Fixe...
by Yann Leboulanger 17 Oct '11

17 Oct '11

changeset c49c8c8abedc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c49c8c8abedc description: add infobar in chat window for file transfer events. Fixes #1205 diffstat: src/chat_control.py | 168 ++++++++++++++++++++++++++++++++++++++++++++ src/filetransfers_window.py | 123 +++++++++++++++++--------------- 2 files changed, 233 insertions(+), 58 deletions(-) diffs (truncated from 336 to 300 lines): diff -r aae4f1ce73ad -r c49c8c8abedc src/chat_control.py --- a/src/chat_control.py Mon Oct 17 18:03:30 2011 +0300 +++ b/src/chat_control.py Mon Oct 17 17:12:19 2011 +0200 @@ -1592,6 +1592,22 @@ id_ = widget.connect('value_changed', self.on_sound_hscale_value_changed) self.handlers[id_] = widget + self.info_bar = gtk.InfoBar() + content_area = self.info_bar.get_content_area() + self.info_bar_label = gtk.Label() + self.info_bar_label.set_use_markup(True) + self.info_bar_label.set_alignment(0, 0) + content_area.add(self.info_bar_label) + self.info_bar.set_no_show_all(True) + widget = self.xml.get_object('vbox2') + widget.pack_start(self.info_bar, expand=False, padding=5) + widget.reorder_child(self.info_bar, 1) + + # List of waiting infobar messages + self.info_bar_queue = [] + + self.subscribe_events() + if not session: # Don't use previous session if we want to a specific resource # and it's not the same @@ -1661,6 +1677,20 @@ # instance object gajim.plugin_manager.gui_extension_point('chat_control', self) + def subscribe_events(self): + """ + Register listeners to the events class + """ + gajim.events.event_added_subscribe(self.on_event_added) + gajim.events.event_removed_subscribe(self.on_event_removed) + + def unsubscribe_events(self): + """ + Unregister listeners to the events class + """ + gajim.events.event_added_unsubscribe(self.on_event_added) + gajim.events.event_removed_unsubscribe(self.on_event_removed) + def _update_toolbar(self): # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: @@ -2598,6 +2628,8 @@ gajim.ged.remove_event_handler('caps-received', ged.GUI1, self._nec_caps_received) + self.unsubscribe_events() + # Send 'gone' chatstate self.send_chatstate('gone', self.contact) self.contact.chatstate = None @@ -3109,3 +3141,139 @@ self.print_conversation(' (', 'status', simple=True) self.print_conversation('%s' % (status), 'status', simple=True) self.print_conversation(')', 'status', simple=True) + + def _info_bar_show_message(self): + if self.info_bar.get_visible(): + # A message is already shown + return + if not self.info_bar_queue: + return + markup, buttons, args, type_ = self.info_bar_queue[0] + self.info_bar_label.set_markup(markup) + for button in buttons: + self.info_bar.add_action_widget(button, 0) + self.info_bar.set_message_type(type_) + self.info_bar.set_no_show_all(False) + self.info_bar.show_all() + + def _add_info_bar_message(self, markup, buttons, args, + type_=gtk.MESSAGE_INFO): + self.info_bar_queue.append((markup, buttons, args, type_)) + self._info_bar_show_message() + + def _get_file_props_event(self, file_props, type_): + evs = gajim.events.get_events(self.account, self.contact.jid, [type_]) + for ev in evs: + if ev.parameters == file_props: + return ev + return None + + def _on_accept_file_request(self, widget, file_props): + gajim.interface.instances['file_transfers'].on_file_request_accepted( + self.account, self.contact, file_props) + ev = self._get_file_props_event(file_props, 'file-request') + if ev: + gajim.events.remove_events(self.account, self.contact.jid, event=ev) + + def _on_cancel_file_request(self, widget, file_props): + gajim.connections[self.account].send_file_rejection(file_props) + ev = self._get_file_props_event(file_props, 'file-request') + if ev: + gajim.events.remove_events(self.account, self.contact.jid, event=ev) + + def _got_file_request(self, file_props): + """ + Show an InfoBar on top of control + """ + markup = '' + _('File transfer:') + ' ' + file_props['name'] + if file_props['desc']: + markup += ' (' + file_props['desc'] + ')' + markup += '\n' + _('Size:') + ' ' + helpers.convert_bytes( + file_props['size']) + b1 = gtk.Button(_('_Accept')) + b1.connect('clicked', self._on_accept_file_request, file_props) + b2 = gtk.Button(stock=gtk.STOCK_CANCEL) + b2.connect('clicked', self._on_cancel_file_request, file_props) + self._add_info_bar_message(markup, [b1, b2], file_props, + gtk.MESSAGE_QUESTION) + + def _on_open_ft_folder(self, widget, file_props): + if 'file-name' not in file_props: + return + path = os.path.split(file_props['file-name'])[0] + if os.path.exists(path) and os.path.isdir(path): + helpers.launch_file_manager(path) + ev = self._get_file_props_event(file_props, 'file-completed') + if ev: + gajim.events.remove_events(self.account, self.contact.jid, event=ev) + + def _on_ok(self, widget, file_props, type_): + ev = self._get_file_props_event(file_props, type_) + if ev: + gajim.events.remove_events(self.account, self.contact.jid, event=ev) + + def _got_file_completed(self, file_props): + markup = '' + _('File transfer completed:') + ' ' + \ + file_props['name'] + if file_props['desc']: + markup += ' (' + file_props['desc'] + ')' + b1 = gtk.Button(_('_Open Containing Folder')) + b1.connect('clicked', self._on_open_ft_folder, file_props) + b2 = gtk.Button(stock=gtk.STOCK_OK) + b2.connect('clicked', self._on_ok, file_props, 'file-completed') + self._add_info_bar_message(markup, [b1, b2], file_props) + + def _got_file_error(self, file_props, type_, pri_txt, sec_txt): + markup = '%s: %s' % (pri_txt, sec_txt) + b = gtk.Button(stock=gtk.STOCK_OK) + b.connect('clicked', self._on_ok, file_props, type_) + self._add_info_bar_message(markup, [b], file_props, gtk.MESSAGE_ERROR) + + def on_event_added(self, event): + if event.account != self.account: + return + if event.jid != self.contact.jid: + return + if event.type_ == 'file-request': + self._got_file_request(event.parameters) + elif event.type_ == 'file-completed': + self._got_file_completed(event.parameters) + elif event.type_ in ('file-error', 'file-stopped'): + msg_err = '' + if event.parameters['error'] == -1: + msg_err = _('Remote contact stopped transfer') + elif event.parameters['error'] == -6: + msg_err = _('Error opening file') + self._got_file_error(event.parameters, event.type_, + _('File transfer stopped'), msg_err) + elif event.type_ in ('file-request-error', 'file-send-error'): + self._got_file_error(event.parameters, event.type_, + _('File transfer cancelled'), + _('Connection with peer cannot be established.')) + + def on_event_removed(self, event_list): + """ + Called when one or more events are removed from the event list + """ + for ev in event_list: + if ev.account != self.account: + continue + if ev.jid != self.contact.jid: + continue + if ev.type_ not in ('file-request', 'file-completed', 'file-error', + 'file-stopped', 'file-request-error', 'file-send-error'): + continue + i = 0 + for ib_msg in self.info_bar_queue: + if ib_msg[2] == ev.parameters: + self.info_bar_queue.remove(ib_msg) + if i == 0: + # We are removing the one currently displayed + area = self.info_bar.get_action_area() + for b in area.get_children(): + area.remove(b) + self.info_bar.hide() + # show next one? + gobject.idle_add(self._info_bar_show_message) + break + i += 1 diff -r aae4f1ce73ad -r c49c8c8abedc src/filetransfers_window.py --- a/src/filetransfers_window.py Mon Oct 17 18:03:30 2011 +0300 +++ b/src/filetransfers_window.py Mon Oct 17 17:12:19 2011 +0200 @@ -320,6 +320,70 @@ self.add_transfer(account, contact, file_props) gajim.connections[account].send_file_approval(file_props) + def on_file_request_accepted(self, account, contact, file_props): + def on_ok(widget, account, contact, file_props): + file_path = dialog2.get_filename() + file_path = gtkgui_helpers.decode_filechooser_file_paths( + (file_path,))[0] + if os.path.exists(file_path): + # check if we have write permissions + if not os.access(file_path, os.W_OK): + file_name = os.path.basename(file_path) + dialogs.ErrorDialog( + _('Cannot overwrite existing file "%s"' % file_name), + _('A file with this name already exists and you do not ' + 'have permission to overwrite it.')) + return + stat = os.stat(file_path) + dl_size = stat.st_size + file_size = file_props['size'] + dl_finished = dl_size >= file_size + + def on_response(response): + if response < 0: + return + elif response == 100: + file_props['offset'] = dl_size + dialog2.destroy() + self._start_receive(file_path, account, contact, file_props) + + dialog = dialogs.FTOverwriteConfirmationDialog( + _('This file already exists'), _('What do you want to do?'), + propose_resume=not dl_finished, on_response=on_response) + dialog.set_transient_for(dialog2) + dialog.set_destroy_with_parent(True) + return + else: + dirname = os.path.dirname(file_path) + if not os.access(dirname, os.W_OK) and os.name != 'nt': + # read-only bit is used to mark special folder under + # windows, not to mark that a folder is read-only. + # See ticket #3587 + dialogs.ErrorDialog(_('Directory "%s" is not writable') % \ + dirname, _('You do not have permission to create files ' + 'in this directory.')) + return + dialog2.destroy() + self._start_receive(file_path, account, contact, file_props) + + def on_cancel(widget, account, contact, file_props): + dialog2.destroy() + gajim.connections[account].send_file_rejection(file_props) + + dialog2 = dialogs.FileChooserDialog( + title_text=_('Save File as...'), + action=gtk.FILE_CHOOSER_ACTION_SAVE, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_SAVE, gtk.RESPONSE_OK), + default_response=gtk.RESPONSE_OK, + current_folder=gajim.config.get('last_save_dir'), + on_response_ok=(on_ok, account, contact, file_props), + on_response_cancel=(on_cancel, account, contact, file_props)) + + dialog2.set_current_name(file_props['name']) + dialog2.connect('delete-event', lambda widget, event: + on_cancel(widget, account, contact, file_props)) + def show_file_request(self, account, contact, file_props): """ Show dialog asking for comfirmation and store location of new file @@ -340,64 +404,7 @@ dialog = None def on_response_ok(account, contact, file_props): - - def on_ok(widget, account, contact, file_props): - file_path = dialog2.get_filename() - file_path = gtkgui_helpers.decode_filechooser_file_paths( - (file_path,))[0] - if os.path.exists(file_path): - # check if we have write permissions - if not os.access(file_path, os.W_OK): - file_name = os.path.basename(file_path) - dialogs.ErrorDialog(_('Cannot overwrite existing file "%s"' % file_name), - _('A file with this name already exists and you do not have permission to overwrite it.')) - return - stat = os.stat(file_path) - dl_size = stat.st_size - file_size = file_props['size'] - dl_finished = dl_size >= file_size - - def on_response(response): - if response < 0: - return - elif response == 100: - file_props['offset'] = dl_size - dialog2.destroy() - self._start_receive(file_path, account, contact, file_props) - - dialog = dialogs.FTOverwriteConfirmationDialog(

1 0

gajim: add button icons in the account window
by Fomin Denis 17 Oct '11

17 Oct '11

changeset aae4f1ce73ad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aae4f1ce73ad description: add button icons in the account window diffstat: data/gui/accounts_window.ui | 133 +++++++++++++++++++++++++++++-------------- 1 files changed, 88 insertions(+), 45 deletions(-) diffs (172 lines): diff -r a59be967aa02 -r aae4f1ce73ad data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Sun Oct 16 22:40:42 2011 +0300 +++ b/data/gui/accounts_window.ui Mon Oct 17 18:03:30 2011 +0300 @@ -63,13 +63,42 @@ </child> <child> <object class="GtkButton" id="add_button"> - <property name="label">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_stock">True</property> <signal name="clicked" handler="on_add_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment5"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label29"> + <property name="visible">True</property> + <property name="label" translatable="yes">Add</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -78,13 +107,42 @@ </child> <child> <object class="GtkButton" id="remove_button"> - <property name="label">gtk-remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_stock">True</property> <signal name="clicked" handler="on_remove_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment7"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label26"> + <property name="visible">True</property> + <property name="label" translatable="yes">Delete</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -99,52 +157,37 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <signal name="clicked" handler="on_rename_button_clicked"/> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkAlignment" id="alignment6"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="spacing">6</property> + <property name="xscale">0</property> + <property name="yscale">0</property> <child> - <object class="GtkLabel" id="label26"> + <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="rename_image"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label25"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Re_name</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="rename_image"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Re_name</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label27"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - </object> - <packing> - <property name="position">3</property> - </packing> </child> </object> </child>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2011