Commits November 2016

commits@gajim.org

2 participants
61 discussions

gajim: don't crash when we get a wrong feature negotiation form
by Gajim 24 Nov '16

24 Nov '16

changeset 63d0d2393b63 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=63d0d2393b63 description: don't crash when we get a wrong feature negotiation form diffstat: src/common/connection_handlers_events.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 2faa34b18a19 -r 63d0d2393b63 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Nov 20 14:05:21 2016 +0100 +++ b/src/common/connection_handlers_events.py Thu Nov 24 22:42:33 2016 +0100 @@ -1272,6 +1272,9 @@ if not form: return + if not form.getField('FORM_TYPE'): + return + if form['FORM_TYPE'] == 'urn:xmpp:ssn': self.session.handle_negotiation(form) else:

1 0

gajim: Fix wrong label in preferences.
by Gajim 22 Nov '16

22 Nov '16

changeset 7dad93b4f1c9 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7dad93b4f1c9 description: Fix wrong label in preferences. diffstat: data/gui/preferences_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f6197b419a24 -r 7dad93b4f1c9 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Sun Nov 20 21:56:26 2016 +0000 +++ b/data/gui/preferences_window.ui Mon Nov 21 21:46:59 2016 +0000 @@ -270,7 +270,7 @@ </child> <child> <object class="GtkCheckButton" id="show_pep_in_roster_checkbutton"> - <property name="label" translatable="yes">Display e_xtra information of contacts in roster (mood, activity, ...)m_ood of contacts in roster</property> + <property name="label" translatable="yes">Display e_xtra information of contacts in roster (mood, activity, ...)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property>

1 0

gajim: Remove support for GNOME Keyring and KWalletCLI, instead ...
by Gajim 21 Nov '16

21 Nov '16

changeset f6197b419a24 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f6197b419a24 description: Remove support for GNOME Keyring and KWalletCLI, instead always use libsecret. diffstat: README.html | 3 +- src/common/config.py | 2 - src/common/exceptions.py | 12 -- src/common/kwalletbinding.py | 80 ---------------- src/common/passwords.py | 208 ++---------------------------------------- src/features_window.py | 11 +- src/gui_interface.py | 5 - 7 files changed, 19 insertions(+), 302 deletions(-) diffs (truncated from 432 to 300 lines): diff -r b0962a4c0866 -r f6197b419a24 README.html --- a/README.html Sat Nov 19 17:31:23 2016 +0100 +++ b/README.html Sun Nov 20 21:56:26 2016 +0000 @@ -28,8 +28,7 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gir1.2-secret-1 or gir1.2-gnomekeyring-1.0 for GnomeKeyring support as password storage</li> -<li>kwalletcli (for support of KDE Wallet as password storage)</li> +<li>gir1.2-secret-1 for GNOMEÂ Keyring or KDE support as password storage</li> <li>gir1.2-notify-0.7 to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> <li>python3-dbus bindings (>=1.2.0)</li> diff -r b0962a4c0866 -r f6197b419a24 src/common/config.py --- a/src/common/config.py Sat Nov 19 17:31:23 2016 +0100 +++ b/src/common/config.py Sun Nov 20 21:56:26 2016 +0000 @@ -288,8 +288,6 @@ 'confirm_block': [ opt_str, '', _('Should we show the confirm block contact dialog or not? Empty string means we never show the dialog.')], 'confirm_custom_status': [ opt_str, '', _('Should we show the confirm custom status dialog or not? Empty string means we never show the dialog.')], 'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], - 'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')], - 'use_kwalletcli': [opt_bool, True, _('If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords.')], 'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')], 'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], diff -r b0962a4c0866 -r f6197b419a24 src/common/exceptions.py --- a/src/common/exceptions.py Sat Nov 19 17:31:23 2016 +0100 +++ b/src/common/exceptions.py Sun Nov 20 21:56:26 2016 +0000 @@ -143,15 +143,3 @@ def __str__(self): return self.text - -class GnomeKeyringError(Exception): - """ - Error with Gnome Keyring - """ - - def __init__(self, error): - Exception.__init__(self) - self.error = error - - def __str__(self): - return str(self.error) diff -r b0962a4c0866 -r f6197b419a24 src/common/kwalletbinding.py --- a/src/common/kwalletbinding.py Sat Nov 19 17:31:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -# -*- coding:utf-8 -*- -## src/common/kwalletbinding.py -## -## Copyright (c) 2009 Thorsten Glaser <t.glaser AT tarent.de> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. This file is -## also available under the terms of The MirOS Licence. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -__all__ = ['kwallet_available', 'kwallet_get', 'kwallet_put'] - -import subprocess - - -def kwallet_available(): - """ - Return True if kwalletcli can be run, False otherwise - """ - try: - p = subprocess.Popen(["kwalletcli", "-qV"]) - except Exception: - return False - p.communicate() - if p.returncode == 0: - return True - return False - - -def kwallet_get(folder, entry): - """ - Retrieve a passphrase from the KDE Wallet via kwalletcli - - Arguments: - â¢ folder: The top-level category to use (normally the programme name) - â¢ entry: The key of the entry to retrieve - - Returns the passphrase, False if it cannot be found, - or None if an error occured. - """ - p = subprocess.Popen(["kwalletcli", "-q", "-f", folder.encode('utf-8'), - "-e", entry.encode('utf-8')], stdout=subprocess.PIPE) - pw = p.communicate()[0] - if p.returncode == 0: - return pw - if p.returncode == 1 or p.returncode == 4: - # ENOENT - return False - # error - return None - - -def kwallet_put(folder, entry, passphrase): - """ - Store a passphrase into the KDE Wallet via kwalletcli - - Arguments: - â¢ folder: The top-level category to use (normally the programme name) - â¢ entry: The key of the entry to store - â¢ passphrase: The value to store - - Returns True on success, False otherwise. - """ - p = subprocess.Popen(["kwalletcli", "-q", "-f", folder.encode('utf-8'), - "-e", entry.encode('utf-8'), "-P"], stdin=subprocess.PIPE) - p.communicate(passphrase.encode('utf-8')) - if p.returncode == 0: - return True - return False diff -r b0962a4c0866 -r f6197b419a24 src/common/passwords.py --- a/src/common/passwords.py Sat Nov 19 17:31:23 2016 +0100 +++ b/src/common/passwords.py Sun Nov 20 21:56:26 2016 +0000 @@ -28,15 +28,8 @@ import warnings from common import gajim -from common import kwalletbinding -from common.exceptions import GnomeKeyringError import gi -USER_HAS_LIBSECRET = False -USER_HAS_GNOMEKEYRING = False -USER_USES_GNOMEKEYRING = False -USER_HAS_KWALLETCLI = False -GnomeKeyring = None Secret = None class PasswordStorage(object): @@ -49,10 +42,8 @@ class SimplePasswordStorage(PasswordStorage): def get_password(self, account_name): passwd = gajim.config.get_per('accounts', account_name, 'password') - if passwd and (passwd.startswith('gnomekeyring:') or passwd.startswith('libsecret:') or \ - passwd == '<kwallet>'): - # this is not a real password, it's either a gnome - # keyring token or stored in the KDE wallet + if passwd and passwd.startswith('libsecret:'): + # this is not a real password, itâs stored through libsecret. return None else: return passwd @@ -63,98 +54,6 @@ gajim.connections[account_name].password = password -class GnomePasswordStorage(PasswordStorage): - def __init__(self): - (err, self.keyring) = GnomeKeyring.get_default_keyring_sync() - if err != GnomeKeyring.Result.OK: - raise GnomeKeyringError(err) - if self.keyring is None: - self.keyring = 'login' - err = GnomeKeyring.create_sync(self.keyring, None) - if err not in (GnomeKeyring.Result.OK, - GnomeKeyring.Result.KEYRING_ALREADY_EXISTS): - raise GnomeKeyringError(err) - - def get_password(self, account_name): - conf = gajim.config.get_per('accounts', account_name, 'password') - if conf is None or conf == '<kwallet>': - return None - if not (conf.startswith('gnomekeyring:') or conf.startswith('libsecret')): - password = conf - ## migrate the password over to keyring - try: - self.save_password(account_name, password) - except GnomeKeyringError as e: - if e.error == GnomeKeyring.Result.NO_KEYRING_DAEMON: - ## no keyring daemon: in the future, stop using it - set_storage(SimplePasswordStorage()) - return password - server = gajim.config.get_per('accounts', account_name, 'hostname') - user = gajim.config.get_per('accounts', account_name, 'name') - attributes1 = GnomeKeyring.attribute_list_new() - GnomeKeyring.attribute_list_append_string(attributes1, 'server', - str(server)) - GnomeKeyring.attribute_list_append_string(attributes1, 'user', - str(user)) - GnomeKeyring.attribute_list_append_string(attributes1, 'protocol', - 'xmpp') - attributes2 = GnomeKeyring.attribute_list_new() - GnomeKeyring.attribute_list_append_string(attributes2, 'account_name', - str(account_name)) - GnomeKeyring.attribute_list_append_string(attributes2, 'gajim', - '1') - (err, items) = GnomeKeyring.find_items_sync( - GnomeKeyring.ItemType.NETWORK_PASSWORD, attributes1) - if err != GnomeKeyring.Result.OK: - (err, items) = GnomeKeyring.find_items_sync( - GnomeKeyring.ItemType.GENERIC_SECRET, attributes2) - if err == GnomeKeyring.Result.OK and len(items) > 0: - password = items[0].secret - self.save_password(account_name, password) - for item in items: - GnomeKeyring.item_delete_sync(item.keyring, - int(item.item_id)) - else: - items = [] - if len(items) > 1: - warnings.warn("multiple gnome keyring items found for account %s;" - " trying to use the first one..." % account_name) - if err == GnomeKeyring.Result.NO_KEYRING_DAEMON: - ## no keyring daemon: in the future, stop using it - set_storage(SimplePasswordStorage()) - if items: - return items[0].secret - return None - - def save_password(self, account_name, password, update=True): - server = gajim.config.get_per('accounts', account_name, 'hostname') - user = gajim.config.get_per('accounts', account_name, 'name') - display_name = _('XMPP account %s@%s') % (user, server) - attributes1 = GnomeKeyring.attribute_list_new() - GnomeKeyring.attribute_list_append_string(attributes1, 'server', - str(server)) - GnomeKeyring.attribute_list_append_string(attributes1, 'user', - str(user)) - GnomeKeyring.attribute_list_append_string(attributes1, 'protocol', - 'xmpp') - if password is None: - password = str() - (err, auth_token) = GnomeKeyring.item_create_sync(self.keyring, - GnomeKeyring.ItemType.NETWORK_PASSWORD, display_name, attributes1, - password, update) - if err != GnomeKeyring.Result.OK: - if err in (GnomeKeyring.Result.DENIED, - GnomeKeyring.Result.CANCELLED): - set_storage(SimplePasswordStorage()) - storage.save_password(account_name, password) - return - else: - raise GnomeKeyringError(err) - gajim.config.set_per('accounts', account_name, 'password', - 'gnomekeyring:') - if account_name in gajim.connections: - gajim.connections[account_name].password = password - class SecretPasswordStorage(PasswordStorage): def __init__(self): self.GAJIM_SCHEMA = Secret.Schema.new("org.gnome.keyring.NetworkPassword", @@ -170,14 +69,7 @@ conf = gajim.config.get_per('accounts', account_name, 'password') if conf is None: return None - if conf == '<kwallet>': - # Migrate from kwallet - if kwalletbinding.kwallet_available(): - kw_storage = KWalletPasswordStorage() - password = kw_storage.get_password(account_name) - self.save_password(account_name, password) - return password - if not (conf.startswith('libsecret:') or conf.startswith('gnomekeyring:')): + if not conf.startswith('libsecret:'): password = conf ## migrate the password over to keyring try: @@ -206,94 +98,22 @@ if account_name in gajim.connections: gajim.connections[account_name].password = password -class KWalletPasswordStorage(PasswordStorage): - def get_password(self, account_name): - pw = gajim.config.get_per('accounts', account_name, 'password') - if not pw or pw.startswith('gnomekeyring:'): - # unset, empty or not ours - return None - if pw != '<kwallet>': - # migrate the password - if kwalletbinding.kwallet_put('gajim', account_name, pw): - gajim.config.set_per('accounts', account_name, 'password', - '<kwallet>') - else: - # stop using the KDE Wallet - set_storage(SimplePasswordStorage()) - return pw - pw = kwalletbinding.kwallet_get('gajim', account_name) - if pw is None: - # stop using the KDE Wallet - set_storage(SimplePasswordStorage()) - if not pw: - # False, None, or the empty string

1 0

gajim: Fixed typo and updated German translation
by Gajim 20 Nov '16

20 Nov '16

changeset 2faa34b18a19 in /home/hg/repos/gajim author: SaltyBones branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2faa34b18a19 description: Fixed typo and updated German translation diffstat: po/de.po | 507 ++++++++++++++++++++++++++++++++++---------------------- src/dialogs.py | 4 +- 2 files changed, 309 insertions(+), 202 deletions(-) diffs (truncated from 1504 to 300 lines): diff -r f1752fd85edf -r 2faa34b18a19 po/de.po --- a/po/de.po Sat Nov 05 23:51:31 2016 +0100 +++ b/po/de.po Sun Nov 20 14:05:21 2016 +0100 @@ -357,6 +357,8 @@ #: ../data/gui/accounts_window.ui.h:36 msgid "Receive conversations from other resources (If server supports it)" msgstr "" +"Unterhaltungen von anderen Ressourcen empfangen (Erfordert " +"ServerunterstÃ¼tzung)" #: ../data/gui/accounts_window.ui.h:37 msgid "Use file transfer proxies" @@ -367,9 +369,9 @@ "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" -"Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen IP-" -"Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen DateiÃ¼bertragung " -"erhÃ¶ht wird." +"Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen " +"IP-Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen " +"DateiÃ¼bertragung erhÃ¶ht wird." #. nick choosen by contact #. FIXME: Ugly workaround. @@ -761,7 +763,7 @@ #: ../data/gui/atom_entry_window.ui.h:6 msgid "Next entry" -msgstr "" +msgstr "NÃ¤chster Eintrag" #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" @@ -1438,13 +1440,14 @@ msgid "Search:" msgstr "Suchen:" +#TODO test #: ../data/gui/history_window.ui.h:6 msgid "_In date search" -msgstr "" +msgstr "_Datumssuche" #: ../data/gui/history_window.ui.h:7 msgid "Searching only in the selected day " -msgstr "" +msgstr "Nur in gewÃ¤hltem Tag suchen" #: ../data/gui/history_window.ui.h:8 #: ../data/gui/zeroconf_information_window.ui.h:5 @@ -1710,11 +1713,15 @@ msgid "Installed" msgstr "Installiert" +# TODO mark as donottranslate? +# TODO unify speliing of plug-in, plugin #: ../data/gui/plugins_window.ui.h:13 msgid "" "Plug-in decription should be displayed here. This text will be erased during " "PluginsWindow initialization." msgstr "" +"Plugin Beschreibung. Dieser Text wird bei der Initialisierung des " +"Pluginfensters gelÃ¶scht." #: ../data/gui/popup_notification_window.ui.h:1 msgid "Event Type" @@ -1937,8 +1944,8 @@ #: ../data/gui/preferences_window.ui.h:46 msgid "Allow popup/notifications when I'm _away/na/busy/invisible" msgstr "" -"Popups/Benachrichtigungen zulassen, wenn ich _abwesend/nicht verfÃ¼gbar/" -"beschÃ¤ftigt/unsichtbar bin" +"Popups/Benachrichtigungen zulassen, wenn ich _abwesend/nicht " +"verfÃ¼gbar/beschÃ¤ftigt/unsichtbar bin" #: ../data/gui/preferences_window.ui.h:47 msgid "Notify on new _GMail email" @@ -1962,8 +1969,8 @@ "If checked, Gajim will also include information about the sender of new " "emails" msgstr "" -"Falls aktiviert, fÃ¼gt Gajim auch Informationen Ã¼ber den Absender neuer E-" -"Mails hinzu." +"Falls aktiviert, fÃ¼gt Gajim auch Informationen Ã¼ber den Absender neuer " +"E-Mails hinzu." #: ../data/gui/preferences_window.ui.h:51 msgid "GMail Options" @@ -2069,9 +2076,9 @@ msgstr "" "Dieser Text wird als Statusnachricht zum Status Abwesend gesetzt, wenn der " "Computer fÃ¼r die angegebene Zeit nicht benutzt wurde. Wenn leer, wird die " -"aktuelle Statusnachricht belassen. $S kann fÃ¼r die vorherige Statusnachricht " -"eingesetzt werden. $T kann fÃ¼r die Zeit eingesetzt werden, seit der der " -"Status auf Abwesend gestellt ist." +"aktuelle Statusnachricht belassen. $S kann fÃ¼r die vorherige " +"Statusnachricht eingesetzt werden. $T kann fÃ¼r die Zeit eingesetzt werden, " +"seit der der Status auf Abwesend gestellt ist." #: ../data/gui/preferences_window.ui.h:73 msgid "" @@ -2146,8 +2153,8 @@ "etc...)" msgstr "" "Falls aktiviert, werden protokollspezifische Symbole verwendet. (Zum " -"Beispiel wird fÃ¼r einen MSN-Kontakt das jeweilige MSN-Symbol fÃ¼r den Status " -"\"Anwesend\", \"Abwesend\", \"BeschÃ¤ftigt\", etc. angezeigt.)" +"Beispiel wird fÃ¼r einen MSN-Kontakt das jeweilige MSN-Symbol fÃ¼r den " +"Status \"Anwesend\", \"Abwesend\", \"BeschÃ¤ftigt\", etc. angezeigt.)" #: ../data/gui/preferences_window.ui.h:89 msgid "Status _iconset:" @@ -2236,7 +2243,7 @@ #: ../data/gui/preferences_window.ui.h:110 msgid "View own video source" -msgstr "" +msgstr "Eigene Videoquelle ansehen" #: ../data/gui/preferences_window.ui.h:111 msgid "Video" @@ -2299,8 +2306,8 @@ "not in the roster" msgstr "" "Falls aktiviert, werden eingehende Ereignisse von nicht autorisierten " -"Kontakten ignoriert. Vorsicht: Sie kÃ¶nnen nur noch Nachrichten von Kontakten " -"empfangen, die in Ihrer Kontaktliste sind." +"Kontakten ignoriert. Vorsicht: Sie kÃ¶nnen nur noch Nachrichten von " +"Kontakten empfangen, die in Ihrer Kontaktliste sind." #: ../data/gui/preferences_window.ui.h:126 #, fuzzy @@ -2347,7 +2354,7 @@ #: ../data/gui/preferences_window.ui.h:133 msgid "Global proxy:" -msgstr "" +msgstr "Globaler Proxy" #: ../data/gui/preferences_window.ui.h:135 msgid "Privacy" @@ -2647,8 +2654,8 @@ #: ../data/gui/roster_item_exchange_window.ui.h:4 msgid "Message Body <currently unused, so it's hidden by default>" msgstr "" -"NachrichtenkÃ¶rper <gegenwÃ¤rtig unbenutzt, so dass er standardmÃ¤Ãig versteckt " -"wird>" +"NachrichtenkÃ¶rper <gegenwÃ¤rtig unbenutzt, so dass er standardmÃ¤Ãig " +"versteckt wird>" #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) #: ../data/gui/roster_window.ui.h:2 @@ -2723,7 +2730,7 @@ #: ../data/gui/roster_window.ui.h:25 msgid "Keyboard Shortcuts" -msgstr "" +msgstr "TastenkÃ¼rzel" #: ../data/gui/roster_window.ui.h:26 msgid "Fea_tures" @@ -2980,13 +2987,16 @@ msgid "A GTK+ Jabber client" msgstr "Ein Jabber-Client in GTK+" +#TODO mark as do not translate? +#TODO look up if there are other keywords like this in German #: ../data/gajim.desktop.in.in.h:4 ../data/gajim-remote.desktop.in.in.h:2 msgid "chat;messaging;im;jabber;xmpp;bonjour;voip" -msgstr "" - +msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip" + +#TODO mark as do not translate? #: ../data/gajim-remote.desktop.in.in.h:1 msgid "Gajim Remote" -msgstr "" +msgstr "Gajim Remote" #: ../src/adhoc_commands.py:325 msgid "Cancel confirmation" @@ -3129,7 +3139,7 @@ #: ../src/chat_control.py:1727 msgid "Formattings are not available when GPG is active" -msgstr "" +msgstr "Formatierung nicht verfÃ¼gbar wenn GPG aktiv ist." #: ../src/chat_control.py:1730 #, fuzzy @@ -3167,7 +3177,7 @@ #: ../src/chat_control.py:1767 msgid "Feature not supported by remote client" -msgstr "" +msgstr "FunktionalitÃ¤t wird vom GegenÃ¼ber nicht unterstÃ¼tzt" #: ../src/chat_control.py:1780 #, fuzzy @@ -3181,7 +3191,8 @@ #: ../src/chat_control.py:1789 msgid "You need to know the real JID of the contact to send him or her a file." msgstr "" -"Sie mÃ¼ssen die JID des Kontakts kennen, um ihm oder ihr eine Datei zu senden." +"Sie mÃ¼ssen die JID des Kontakts kennen, um ihm oder ihr eine Datei zu " +"senden." #: ../src/chat_control.py:1907 #, python-format @@ -3207,8 +3218,8 @@ "No OpenPGP key is assigned to this contact. So you cannot encrypt messages " "with OpenPGP." msgstr "" -"Dem Kontakt ist kein GPG-SchlÃ¼ssel zugewiesen. Nachrichten kÃ¶nnen nicht mit " -"GPG verschlÃ¼sselt werden." +"Dem Kontakt ist kein GPG-SchlÃ¼ssel zugewiesen. Nachrichten kÃ¶nnen nicht " +"mit GPG verschlÃ¼sselt werden." # TODO: GPG/PGP unification in original strings needed #: ../src/chat_control.py:2260 @@ -3407,19 +3418,19 @@ #: ../src/command_system/implementation/custom.py:105 msgid "The same as using a doc-string, except it supports translation" -msgstr "" +msgstr "Das gleiche wie ein doc-string, aber mit ÃbersetzungsunterstÃ¼tzung" #: ../src/command_system/implementation/execute.py:53 msgid "Execute expression inside a shell, show output" -msgstr "" +msgstr "Befehl in einer Shell ausfÃ¼hren, Ausgabe anzeigen" #: ../src/command_system/implementation/execute.py:109 msgid "Execute expression inside a shell, send output" -msgstr "" +msgstr "Befehl in einer Shell ausfÃ¼hren, Ausgabe senden" #: ../src/command_system/implementation/middleware.py:74 msgid "Error during command execution!" -msgstr "" +msgstr "Fehler bei der BefehlsausfÃ¼hrung!" #: ../src/command_system/implementation/standard.py:50 #, fuzzy @@ -3429,7 +3440,7 @@ #: ../src/command_system/implementation/standard.py:56 msgid "" "Show help on a given command or a list of available commands if -a is given" -msgstr "" +msgstr "Hilfe fÃ¼r Befehl oder mit -a Liste der verfÃ¼gbaren Befehle anzeigen." #: ../src/command_system/implementation/standard.py:83 #, fuzzy @@ -3438,11 +3449,11 @@ #: ../src/command_system/implementation/standard.py:88 msgid "Send action (in the third person) to the current chat" -msgstr "" +msgstr "Aktion (in dritter Person) an aktuellen Chat senden" #: ../src/command_system/implementation/standard.py:93 msgid "Show logged messages which mention given text" -msgstr "" +msgstr "Gespeicherte Nachrichten die angegeben Text enthalten anzeigen" #: ../src/command_system/implementation/standard.py:99 #, fuzzy, python-format @@ -3451,7 +3462,7 @@ #: ../src/command_system/implementation/standard.py:105 msgid "Limit must be an integer" -msgstr "" +msgstr "Grenze muss eine ganze Zahl sein" #. Do not translate online, away, chat, xa, dnd #: ../src/command_system/implementation/standard.py:130 @@ -3463,10 +3474,16 @@ " online, away, chat, xa, dnd.\n" " " msgstr "" +"\n" +" Aktuellen Status setzen\n" +"\n" +" Status kann einer der folgenden Werte sein:\n" +" online, away, chat, xa, dnd.\n" +" " #: ../src/command_system/implementation/standard.py:148 msgid "Set the current status to away" -msgstr "" +msgstr "Aktuellen Status auf away setzen." #: ../src/command_system/implementation/standard.py:151 #: ../src/common/commands.py:110 ../src/common/helpers.py:261 @@ -3476,7 +3493,7 @@ #: ../src/command_system/implementation/standard.py:162 msgid "Set the current status to online" -msgstr ""

1 0

gajim: Better align jid and resource in gc contact tooltip
by Gajim 19 Nov '16

19 Nov '16

changeset b0962a4c0866 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b0962a4c0866 description: Better align jid and resource in gc contact tooltip diffstat: data/gui/tooltip_gc_contact.ui | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 1348492cf5d5 -r b0962a4c0866 data/gui/tooltip_gc_contact.ui --- a/data/gui/tooltip_gc_contact.ui Sat Nov 19 17:25:48 2016 +0100 +++ b/data/gui/tooltip_gc_contact.ui Sat Nov 19 17:31:23 2016 +0100 @@ -120,6 +120,7 @@ <object class="GtkLabel" id="resource"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="xalign">0</property> </object> <packing> @@ -131,6 +132,7 @@ <object class="GtkLabel" id="jid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/>

1 0

gajim: Refactor Roster Tooltip
by Gajim 19 Nov '16

19 Nov '16

changeset 3dc0c2fae58b in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3dc0c2fae58b description: Refactor Roster Tooltip diffstat: data/gui/roster_window.ui | 3 - data/gui/tooltip_roster_contact.ui | 370 +++++++++++++++++++++++++ src/gui_interface.py | 15 +- src/roster_window.py | 194 +++--------- src/tooltips.py | 528 ++++++++++++++++++++++-------------- 5 files changed, 760 insertions(+), 350 deletions(-) diffs (truncated from 1320 to 300 lines): diff -r 2f47c7e8a9c0 -r 3dc0c2fae58b data/gui/roster_window.ui --- a/data/gui/roster_window.ui Fri Nov 18 03:41:37 2016 +0100 +++ b/data/gui/roster_window.ui Thu Nov 17 03:29:18 2016 +0100 @@ -366,12 +366,9 @@ <signal name="button-press-event" handler="on_roster_treeview_button_press_event" swapped="no"/> <signal name="button-release-event" handler="on_roster_treeview_button_release_event" swapped="no"/> <signal name="key-press-event" handler="on_roster_treeview_key_press_event" swapped="no"/> - <signal name="leave-notify-event" handler="on_roster_treeview_leave_notify_event" swapped="no"/> - <signal name="motion-notify-event" handler="on_roster_treeview_motion_notify_event" swapped="no"/> <signal name="row-activated" handler="on_roster_treeview_row_activated" swapped="no"/> <signal name="row-collapsed" handler="on_roster_treeview_row_collapsed" swapped="no"/> <signal name="row-expanded" handler="on_roster_treeview_row_expanded" swapped="no"/> - <signal name="scroll-event" handler="on_roster_treeview_scroll_event" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> diff -r 2f47c7e8a9c0 -r 3dc0c2fae58b data/gui/tooltip_roster_contact.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/gui/tooltip_roster_contact.ui Thu Nov 17 03:29:18 2016 +0100 @@ -0,0 +1,370 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkGrid" id="tooltip_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="column_spacing">5</property> + <child> + <object class="GtkLabel" id="name"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_markup">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Jabber ID:</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkImage" id="avatar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="height">14</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="resource_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Resource:</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="user_show"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="resource"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="status_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Status:</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="idle_since_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Idle since:</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">12</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="idle_for_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Idle for:</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">13</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="idle_since"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">12</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="idle_for"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">13</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="mood_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Mood:</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="activity_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Activity:</property> + <property name="lines">2</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tune_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Tune:</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="location_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Location:</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="mood"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="activity"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="tune"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="location"> + <property name="visible">True</property>

1 0

gajim: Dont use super() fpr Gtk.Window init, fixes deprecated msg
by Gajim 19 Nov '16

19 Nov '16

changeset 1348492cf5d5 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1348492cf5d5 description: Dont use super() fpr Gtk.Window init, fixes deprecated msg diffstat: src/tooltips.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3dc0c2fae58b -r 1348492cf5d5 src/tooltips.py --- a/src/tooltips.py Thu Nov 17 03:29:18 2016 +0100 +++ b/src/tooltips.py Sat Nov 19 17:25:48 2016 +0100 @@ -314,7 +314,7 @@ class GCTooltip(Gtk.Window): # pylint: disable=E1101 def __init__(self, parent): - super().__init__(self, type=Gtk.WindowType.POPUP, transient_for=parent) + Gtk.Window.__init__(self, type=Gtk.WindowType.POPUP, transient_for=parent) self.row = None self.set_title('tooltip') self.set_border_width(3)

1 0

gajim: Create GCTooltip window only when parent is available
by Gajim 18 Nov '16

18 Nov '16

changeset 2f47c7e8a9c0 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2f47c7e8a9c0 description: Create GCTooltip window only when parent is available diffstat: src/groupchat_control.py | 22 ++++++++++++++++------ src/roster_window.py | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diffs (51 lines): diff -r dcdd99cdc1e7 -r 2f47c7e8a9c0 src/groupchat_control.py --- a/src/groupchat_control.py Sun Nov 13 02:32:38 2016 +0000 +++ b/src/groupchat_control.py Fri Nov 18 03:41:37 2016 +0100 @@ -359,13 +359,14 @@ if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): img = self.xml.get_object('history_image') img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + + self.current_tooltip = None + if parent_win: + # On AutoJoin with minimize Groupchats are created without parent + # Tooltip Window has to be created with parent + self.set_tooltip() + widget = self.xml.get_object('list_treeview') - widget.set_has_tooltip(True) - widget.set_tooltip_window(tooltips.GCTooltip(self.parent_win.window)) - self.current_tooltip = None - id_ = widget.connect('query-tooltip', self.query_tooltip) - self.handlers[id_] = widget - id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget @@ -526,6 +527,15 @@ # instance object gajim.plugin_manager.gui_extension_point('groupchat_control', self) + def set_tooltip(self): + widget = self.xml.get_object('list_treeview') + if widget.get_tooltip_window(): + return + widget.set_has_tooltip(True) + widget.set_tooltip_window(tooltips.GCTooltip(self.parent_win.window)) + id_ = widget.connect('query-tooltip', self.query_tooltip) + self.handlers[id_] = widget + def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): try: row = self.list_treeview.get_path_at_pos(x_pos, y_pos)[0] diff -r dcdd99cdc1e7 -r 2f47c7e8a9c0 src/roster_window.py --- a/src/roster_window.py Sun Nov 13 02:32:38 2016 +0000 +++ b/src/roster_window.py Fri Nov 18 03:41:37 2016 +0100 @@ -3419,6 +3419,7 @@ mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact, ctrl.account, ctrl.type_id) ctrl.parent_win = mw + ctrl.set_tooltip() mw.new_tab(ctrl) mw.set_active_tab(ctrl) mw.window.get_window().focus(Gtk.get_current_event_time())

1 0

gajim: Remove the SRV feature, since the switch to Gio it?s alwa...
by Gajim 16 Nov '16

16 Nov '16

changeset dcdd99cdc1e7 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=dcdd99cdc1e7 description: Remove the SRV feature, since the switch to Gio it?s always enabled. diffstat: src/features_window.py | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diffs (26 lines): diff -r c44805f8d96b -r dcdd99cdc1e7 src/features_window.py --- a/src/features_window.py Sun Nov 13 21:06:37 2016 +0100 +++ b/src/features_window.py Sun Nov 13 02:32:38 2016 +0000 @@ -72,10 +72,6 @@ _('Passwords can be stored securely and not just in plaintext.'), _('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'), _('Feature not available under Windows.')), - _('SRV'): (self.srv_available, - _('Ability to connect to servers which are using SRV records.'), - _('Requires dnsutils.'), - _('Requires nslookup to use SRV records.')), _('Spell Checker'): (self.speller_available, _('Spellchecking of composed messages.'), _('Requires libgtkspell.'), @@ -199,11 +195,6 @@ return False return True - def srv_available(self): - if os.name == 'nt': - return True - return helpers.is_in_path('nslookup') - def speller_available(self): try: __import__('gtkspell')

1 0

gajim: Refactor GC Roster tooltip
by Gajim 16 Nov '16

16 Nov '16

changeset c44805f8d96b in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c44805f8d96b description: Refactor GC Roster tooltip diffstat: data/gui/tooltip_gc_contact.ui | 145 +++++++++++++++++++++++++++ src/groupchat_control.py | 107 ++++++++----------- src/tooltips.py | 220 ++++++++++++++++++---------------------- 3 files changed, 290 insertions(+), 182 deletions(-) diffs (truncated from 576 to 300 lines): diff -r bf2bfc1be419 -r c44805f8d96b data/gui/tooltip_gc_contact.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/gui/tooltip_gc_contact.ui Sun Nov 13 21:06:37 2016 +0100 @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkGrid" id="tooltip_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">5</property> + <child> + <object class="GtkLabel" id="nick"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="status"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <property name="xalign">0</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Jabber ID:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="avatar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="height">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="resource_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Resource:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="affiliation"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="user_show"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fillelement"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="resource"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + </object> +</interface> diff -r bf2bfc1be419 -r c44805f8d96b src/groupchat_control.py --- a/src/groupchat_control.py Sat Nov 12 23:54:33 2016 +0000 +++ b/src/groupchat_control.py Sun Nov 13 21:06:37 2016 +0100 @@ -360,6 +360,12 @@ img = self.xml.get_object('history_image') img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) widget = self.xml.get_object('list_treeview') + widget.set_has_tooltip(True) + widget.set_tooltip_window(tooltips.GCTooltip(self.parent_win.window)) + self.current_tooltip = None + id_ = widget.connect('query-tooltip', self.query_tooltip) + self.handlers[id_] = widget + id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget @@ -379,14 +385,6 @@ self.on_list_treeview_key_press_event) self.handlers[id_] = widget - id_ = widget.connect('motion_notify_event', - self.on_list_treeview_motion_notify_event) - self.handlers[id_] = widget - - id_ = widget.connect('leave_notify_event', - self.on_list_treeview_leave_notify_event) - self.handlers[id_] = widget - self.room_jid = self.contact.jid self.nick = contact.name self.new_nick = '' @@ -419,8 +417,6 @@ self.subject = '' - self.tooltip = tooltips.GCTooltip() - # nickname coloring self.gc_count_nicknames_colors = -1 self.gc_custom_colors = {} @@ -530,6 +526,46 @@ # instance object gajim.plugin_manager.gui_extension_point('groupchat_control', self) + def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + try: + row = self.list_treeview.get_path_at_pos(x_pos, y_pos)[0] + except TypeError: + return False + if not row: + return False + + iter_ = None + try: + iter_ = self.model.get_iter(row) + except Exception: + return False + + typ = self.model[iter_][C_TYPE] + nick = self.model[iter_][C_NICK] + + if typ != 'contact': + return False + + if self.current_tooltip != row: + # If the row changes we hide the current tooltip + self.current_tooltip = row + return False + + tooltip = widget.get_tooltip_window() + + if tooltip.row == row: + # We already populated the window with the row data + return True + tooltip.row = row + + contact = gajim.contacts.get_gc_contact( + self.account, self.room_jid, nick) + if not contact: + return False + + tooltip.populate(contact) + return True + def fill_column(self, col): for rend in self.renderers_list: col.pack_start(rend[1], rend[2]) @@ -2638,8 +2674,6 @@ """ Popup user's group's or agent menu """ - # hide tooltip, no matter the button is pressed - self.tooltip.hide_tooltip() try: pos = widget.get_path_at_pos(int(event.x), int(event.y)) path, x = pos[0], pos[2] @@ -2697,55 +2731,6 @@ add = gc_refer_to_nick_char + ' ' message_buffer.insert_at_cursor(start + nick + add) - def on_list_treeview_motion_notify_event(self, widget, event): - props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id != props[0]: - self.tooltip.hide_tooltip() - if props: - [row, col, x, y] = props - iter_ = None - try: - iter_ = self.model.get_iter(row) - except Exception: - self.tooltip.hide_tooltip() - return - typ = self.model[iter_][C_TYPE] - if typ == 'contact': - account = self.account - - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: - self.tooltip.id = row - nick = self.model[iter_][C_NICK] - self.tooltip.timeout = GLib.timeout_add(500, - self.show_tooltip, gajim.contacts.get_gc_contact( - account, self.room_jid, nick)) - - def on_list_treeview_leave_notify_event(self, widget, event): - props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id == props[0]: - self.tooltip.hide_tooltip() - - def show_tooltip(self, contact): - self.tooltip.timeout = 0 - if not self.list_treeview.get_window(): - # control has been destroyed since tooltip was requested - return - w = self.list_treeview.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = self.list_treeview.get_path_at_pos(pointer[1], pointer[2]) - # check if the current pointer is at the same path - # as it was before setting the timeout - if props and self.tooltip.id == props[0]: - rect = self.list_treeview.get_cell_area(props[0], props[1]) - position = w.get_origin()[1:] - self.tooltip.show_tooltip(contact, rect.height, - position[1] + rect.y) - else: - self.tooltip.hide_tooltip() - def grant_voice(self, widget, nick): """

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2016