Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist 29 Dec '17

29 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 361ad92b by Philipp Hörist at 2017-12-29T19:08:05+01:00 Remove unused code - - - - - 2 changed files: - gajim/common/resolver.py - gajim/gui_interface.py Changes: ===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -20,18 +20,12 @@ import sys import logging import functools -log = logging.getLogger('gajim.c.resolver') - -if __name__ == '__main__': - sys.path.append('../..') - from gajim.common import i18n - from gajim.common import configpaths - configpaths.gajimpaths.init(None) from gi.repository import Gio, GLib +log = logging.getLogger('gajim.c.resolver') -def get_resolver(idlequeue): +def get_resolver(): return GioResolver() @@ -141,10 +135,7 @@ class GioResolver(CommonResolver): # below lines is on how to use API and assist in testing if __name__ == '__main__': from gi.repository import Gtk - from nbxmpp import idlequeue - - idlequeue = idlequeue.get_idlequeue() - resolver = get_resolver(idlequeue) + resolver = get_resolver() def clicked(widget): global resolver @@ -165,5 +156,4 @@ if __name__ == '__main__': but.connect('clicked', clicked) win.add(hbox) win.show_all() - GLib.timeout_add(200, idlequeue.process) Gtk.main() ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2773,7 +2773,7 @@ class Interface: app.idlequeue = idlequeue.get_idlequeue() # resolve and keep current record of resolved hosts - app.resolver = resolver.get_resolver(app.idlequeue) + app.resolver = resolver.get_resolver() app.socks5queue = socks5.SocksQueue(app.idlequeue, self.handle_event_file_rcv_completed, self.handle_event_file_progress, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/361ad92b26ba45b67bac0c748cff0914b8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/361ad92b26ba45b67bac0c748cff0914b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise nbxmpp version
by Philipp Hörist 28 Dec '17

28 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d835fbf by Philipp Hörist at 2017-12-28T18:10:26+01:00 Raise nbxmpp version - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -53,7 +53,7 @@ from gajim.common import i18n from gajim.common import logging_helpers from gajim.common import crypto -MIN_NBXMPP_VER = "0.6.1" +MIN_NBXMPP_VER = "0.6.2" MIN_GTK_VER = "3.20.0" View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d835fbfd74fc7019ccf197fdeef6ae9a4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d835fbfd74fc7019ccf197fdeef6ae9a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix LMC in Groupchats
by Philipp Hörist 28 Dec '17

28 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ccc69bc7 by Philipp Hörist at 2017-12-28T17:37:37+01:00 Fix LMC in Groupchats - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1994,6 +1994,8 @@ class GroupchatControl(ChatControlBase): self.model.remove(parent_iter) def _message_sent(self, obj): + if not obj.message: + return # we'll save sent message text when we'll receive it in # _nec_gc_message_received self.last_sent_msg = obj.stanza_id View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ccc69bc7ee04824a3e51a2f01260098a41… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ccc69bc7ee04824a3e51a2f01260098a41… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add support for XEP-0368
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e09fd92 by Marc Schink at 2017-12-20T18:38:01+01:00 Add support for XEP-0368 - Use xmpps-client SRV records - Use separate host entry per connection type - Replace 'connection_types' with 'allow_plaintext_connection' option - - - - - d3333ba9 by Philipp Hörist at 2017-12-27T22:10:26+01:00 Merge branch 'xep_0368' into 'master' Add support for XEP-0368 See merge request gajim/gajim!177 - - - - - 2 changed files: - gajim/common/config.py - gajim/common/connection.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -339,8 +339,7 @@ class Config: 'keyname': [ opt_str, '', '', True ], 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.'), True], 'autonegotiate_esessions': [opt_bool, False, _('Should Gajim automatically start an encrypted session when possible?')], - #keep tls, ssl and plain lowercase - 'connection_types': [ opt_str, 'tls', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'allow_plaintext_connection': [ opt_bool, False, _('Allow plaintext connections')], 'tls_version': [ opt_str, '1.2', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'authentication_mechanisms': [ opt_str, '', _('List (space separated) of authentication mechanisms to try. Can contain ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 or XEP-0078') ], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -110,6 +110,9 @@ ssl_error = { #100 is for internal usage: host not correct } +SERVICE_START_TLS = 'xmpp-client' +SERVICE_DIRECT_TLS = 'xmpps-client' + class CommonConnection: """ Common connection class, can be derivated for normal connection or zeroconf @@ -643,10 +646,8 @@ class Connection(CommonConnection, ConnectionHandlers): CommonConnection.__init__(self, name) ConnectionHandlers.__init__(self) # this property is used to prevent double connections - self.last_connection = None # last ClientCommon instance # If we succeed to connect, remember it so next time we try (after a # disconnection) we try only this type. - self.last_connection_type = None self.lang = None if locale.getdefaultlocale()[0]: self.lang = locale.getdefaultlocale()[0].split('_')[0] @@ -789,7 +790,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.terminate_sessions() self.remove_all_transfers() self.connection.disconnect() - self.last_connection = None self.connection = None def set_oldst(self): # Set old state @@ -1078,29 +1078,50 @@ class Connection(CommonConnection, ConnectionHandlers): self.redirected = None # SRV resolver self._proxy = proxy - self._hosts = [ {'host': h, 'port': p, 'ssl_port': ssl_p, 'prio': 10, - 'weight': 10} ] + self._hosts = [ + {'host': h, 'port': p, 'type': 'tls', 'prio': 10, 'weight': 10}, + {'host': h, 'port': ssl_p, 'type': 'ssl', 'prio': 10, 'weight': 10}, + {'host': h, 'port': p, 'type': 'plain', 'prio': 10, 'weight': 10} + ] self._hostname = hostname if use_srv and self._proxy is None: - # add request for srv query to the resolve, on result '_on_resolve' - # will be called - app.resolver.resolve('_xmpp-client._tcp.' + helpers.idn_to_ascii( - h), self._on_resolve) + self._srv_hosts = [] + + services = [SERVICE_START_TLS, SERVICE_DIRECT_TLS] + self._num_pending_srv_records = len(services) + + for service in services: + record_name = '_' + service + '._tcp.' + helpers.idn_to_ascii(h) + app.resolver.resolve(record_name, self._on_resolve_srv) else: - self._on_resolve('', []) + self._connect_to_next_host() + + def _append_srv_record(self, record, con_type): + tmp = record.copy() + tmp['type'] = con_type + + if tmp in self._srv_hosts: + return + + self._srv_hosts.append(tmp) + + def _on_resolve_srv(self, host, result): + for record in result: + service = host[1:] + if service.startswith(SERVICE_START_TLS): + self._append_srv_record(record, 'tls') + self._append_srv_record(record, 'plain') + elif service.startswith(SERVICE_DIRECT_TLS): + self._append_srv_record(record, 'ssl') + + self._num_pending_srv_records -= 1 + if self._num_pending_srv_records: + return + + if self._srv_hosts: + self._hosts = self._srv_hosts.copy() - def _on_resolve(self, host, result_array): - # SRV query returned at least one valid result, we put it in hosts dict - if len(result_array) != 0: - self._hosts = [i for i in result_array] - # Add ssl port - ssl_p = 5223 - if app.config.get_per('accounts', self.name, 'use_custom_host'): - ssl_p = app.config.get_per('accounts', self.name, - 'custom_port') - for i in self._hosts: - i['ssl_port'] = ssl_p self._connect_to_next_host() def _on_resolve_txt(self, host, result_array): @@ -1128,34 +1149,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _connect_to_next_host(self, retry=False): log.debug('Connection to next host') - if len(self._hosts): - # No config option exist when creating a new account - if self.name in app.config.get_per('accounts'): - self._connection_types = app.config.get_per('accounts', self.name, - 'connection_types').split() - else: - self._connection_types = ['tls', 'ssl'] - if self.last_connection_type: - if self.last_connection_type in self._connection_types: - self._connection_types.remove(self.last_connection_type) - self._connection_types.insert(0, self.last_connection_type) - - - if self._proxy and self._proxy['type']=='bosh': - # with BOSH, we can't do TLS negotiation with <starttls>, we do only "plain" - # connection and TLS with handshake right after TCP connecting ("ssl") - scheme = nbxmpp.transports_nb.urisplit(self._proxy['bosh_uri'])[0] - if scheme=='https': - self._connection_types = ['ssl'] - else: - self._connection_types = ['plain'] - - host = self._select_next_host(self._hosts) - self._current_host = host - self._hosts.remove(host) - self.connect_to_next_type() - - else: + if not self._hosts: if not retry and self.retrycount == 0: log.debug("Out of hosts, giving up connecting to %s", self.name) self.time_to_reconnect = None @@ -1169,66 +1163,74 @@ class Connection(CommonConnection, ConnectionHandlers): # try reconnect if connection has failed before auth to server self.disconnectedReconnCB() - def connect_to_next_type(self, retry=False): + return + + connection_types = ['tls', 'ssl'] + allow_plaintext_connection = app.config.get_per('accounts', self.name, + 'allow_plaintext_connection') + + if allow_plaintext_connection: + connection_types.append('plain') + + if self._proxy and self._proxy['type'] == 'bosh': + # with BOSH, we can't do TLS negotiation with <starttls>, we do only "plain" + # connection and TLS with handshake right after TCP connecting ("ssl") + scheme = nbxmpp.transports_nb.urisplit(self._proxy['bosh_uri'])[0] + if scheme == 'https': + connection_types = ['ssl'] + else: + connection_types = ['plain'] + + host = self._select_next_host(self._hosts) + self._hosts.remove(host) + + # Skip record if connection type is not supported. + if host['type'] not in connection_types: + log.debug("Skipping connection record with unsupported type: %s" % + host['type']) + self._connect_to_next_host(retry) + return + + self._current_host = host + if self.redirected: self.disconnect(on_purpose=True) self.connect() return - if len(self._connection_types): - self._current_type = self._connection_types.pop(0) - if self.last_connection: - self.last_connection.socket.disconnect() - self.last_connection = None - self.connection = None - - if self._current_type == 'ssl': - # SSL (force TLS on different port than plain) - # If we do TLS over BOSH, port of XMPP server should be the standard one - # and TLS should be negotiated because TLS on 5223 is deprecated - if self._proxy and self._proxy['type']=='bosh': - port = self._current_host['port'] - else: - port = self._current_host['ssl_port'] - elif self._current_type == 'tls': - # TLS - negotiate tls after XMPP stream is estabilished - port = self._current_host['port'] - elif self._current_type == 'plain': - # plain connection on defined port - port = self._current_host['port'] - - cacerts = os.path.join(common.app.DATA_DIR, 'other', 'cacerts.pem') - if not os.path.exists(cacerts): - cacerts = '' - mycerts = common.app.MY_CACERTS - tls_version = app.config.get_per('accounts', self.name, - 'tls_version') - cipher_list = app.config.get_per('accounts', self.name, - 'cipher_list') - secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list) - - con = nbxmpp.NonBlockingClient( - domain=self._hostname, - caller=self, - idlequeue=app.idlequeue) - - self.last_connection = con - # increase default timeout for server responses - nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ - self.try_connecting_for_foo_secs - # FIXME: this is a hack; need a better way - if self.on_connect_success == self._on_new_account: - con.RegisterDisconnectHandler(self._on_new_account) - - if self.client_cert and app.config.get_per('accounts', self.name, - 'client_cert_encrypted'): - app.nec.push_incoming_event(ClientCertPassphraseEvent( - None, conn=self, con=con, port=port, - secure_tuple=secure_tuple)) - return - self.on_client_cert_passphrase('', con, port, secure_tuple) - else: - self._connect_to_next_host(retry) + self._current_type = self._current_host['type'] + + port = self._current_host['port'] + cacerts = os.path.join(common.app.DATA_DIR, 'other', 'cacerts.pem') + if not os.path.exists(cacerts): + cacerts = '' + mycerts = common.app.MY_CACERTS + tls_version = app.config.get_per('accounts', self.name, + 'tls_version') + cipher_list = app.config.get_per('accounts', self.name, + 'cipher_list') + secure_tuple = (self._current_type, cacerts, mycerts, tls_version, + cipher_list) + + con = nbxmpp.NonBlockingClient( + domain=self._hostname, + caller=self, + idlequeue=app.idlequeue) + + # increase default timeout for server responses + nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ + self.try_connecting_for_foo_secs + # FIXME: this is a hack; need a better way + if self.on_connect_success == self._on_new_account: + con.RegisterDisconnectHandler(self._on_new_account) + + if self.client_cert and app.config.get_per('accounts', self.name, + 'client_cert_encrypted'): + app.nec.push_incoming_event(ClientCertPassphraseEvent( + None, conn=self, con=con, port=port, + secure_tuple=secure_tuple)) + return + self.on_client_cert_passphrase('', con, port, secure_tuple) def on_client_cert_passphrase(self, passphrase, con, port, secure_tuple): self.client_cert_passphrase = passphrase @@ -1239,7 +1241,7 @@ class Connection(CommonConnection, ConnectionHandlers): port=port, on_connect=self.on_connect_success, on_proxy_failure=self.on_proxy_failure, - on_connect_failure=self.connect_to_next_type, + on_connect_failure=self._connect_to_next_host, on_stream_error_cb=self._StreamCB, proxy=self._proxy, secure_tuple = secure_tuple) @@ -1295,9 +1297,9 @@ class Connection(CommonConnection, ConnectionHandlers): return _con_type = con_type if _con_type != self._current_type: - log.info('Connecting to next type beacuse desired is %s and returned is %s' + log.info('Connecting to next host beacuse desired type is %s and returned is %s' % (self._current_type, _con_type)) - self.connect_to_next_type() + self._connect_to_next_host() return con.RegisterDisconnectHandler(self._on_disconnected) if _con_type == 'plain' and app.config.get_per('accounts', self.name, @@ -1329,7 +1331,7 @@ class Connection(CommonConnection, ConnectionHandlers): msg=_('Connection with account %s has been lost. Retry ' 'connecting.') % self.name)) return - self.hosts = [] + self._hosts = [] self.connection_auto_accepted = False self.connected_hostname = self._current_host['host'] self.on_connect_failure = None @@ -1338,15 +1340,6 @@ class Connection(CommonConnection, ConnectionHandlers): log.debug('Connected to server %s:%s with %s' % ( self._current_host['host'], self._current_host['port'], con_type)) - self.last_connection_type = con_type - if con_type == 'tls' and 'ssl' in self._connection_types: - # we were about to try ssl after tls, but tls succeed, so - # definitively stop trying ssl - con_types = app.config.get_per('accounts', self.name, - 'connection_types').split() - con_types.remove('ssl') - app.config.set_per('accounts', self.name, 'connection_types', - ' '.join(con_types)) if app.config.get_per('accounts', self.name, 'anonymous_auth'): name = None else: @@ -2228,7 +2221,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _on_new_account(self, con=None, con_type=None): if not con_type: - if len(self._connection_types) or len(self._hosts): + if self._hosts: # There are still other way to try to connect return reason = _('Could not connect to "%s"') % self._hostname View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8ea39cff754c87ec6a6e51e7c1e8f1e26… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8ea39cff754c87ec6a6e51e7c1e8f1e26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.6.2
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed new tag nbxmpp-0.6.2 at gajim / python-nbxmpp --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/nbxmpp-0.6.2 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Update Changelog
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bd95b25f by Philipp Hörist at 2017-12-27T20:22:17+01:00 Update Changelog - - - - - 82fafe74 by Philipp Hörist at 2017-12-27T20:23:06+01:00 Prepare 0.6.2 release - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +python-nbxmpp 0.6.2 (27 December 2017) + + * Correctly load client certs + * Warn on any error in the certificate chain + * Fixed a traceback loop + python-nbxmpp 0.6.1 (29 November 2017) * Add new getStanzaIDAttrs method ===================================== nbxmpp/__init__.py ===================================== --- a/nbxmpp/__init__.py +++ b/nbxmpp/__init__.py @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.6.1" +__version__ = "0.6.2" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.6.1', + version='0.6.2', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/abfe8658091b987f76732c74f… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/abfe8658091b987f76732c74f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix SSL verify
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: abfe8658 by Philipp Hörist at 2017-12-27T19:57:28+01:00 Fix SSL verify Fixes #37 This commit was lost while migrating from mercurial to Git - - - - - 1 changed file: - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -494,13 +494,13 @@ class NonBlockingTLS(PlugIn): def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: + if not self._owner.ssl_errnum: + self._owner.ssl_errnum = errnum if depth == 0: self._owner.ssl_certificate = cert - if not ok: - self._owner.ssl_errnum = errnum return True - except: - log.error("Exception caught in _ssl_info_callback:", exc_info=True) + except Exception: + log.exception("Exception caught in _ssl_info_callback:") # Make sure something is printed, even if log is disabled. traceback.print_exc() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/abfe8658091b987f76732c74f7… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/abfe8658091b987f76732c74f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add 'active' chatstate to groupchat messages
by Philipp Hörist 27 Dec '17

27 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8ea39cff by Philipp Hörist at 2017-12-27T19:09:12+01:00 Add 'active' chatstate to groupchat messages Fixes #8801 - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2032,11 +2032,19 @@ class GroupchatControl(ChatControlBase): correct_id = self.last_sent_msg else: correct_id = None + + # Set chatstate + chatstate = None + if app.config.get('outgoing_chat_state_notifications') != 'disabled': + chatstate = 'active' + self.reset_kbd_mouse_timeout_vars() + self.contact.our_chatstate = chatstate + # Send the message - app.nec.push_outgoing_event(GcMessageOutgoingEvent(None, - account=self.account, jid=self.room_jid, message=message, - xhtml=xhtml, label=label, correct_id=correct_id, - automatic_message=False)) + app.nec.push_outgoing_event(GcMessageOutgoingEvent( + None, account=self.account, jid=self.room_jid, message=message, + xhtml=xhtml, label=label, chatstate=chatstate, + correct_id=correct_id, automatic_message=False)) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8ea39cff754c87ec6a6e51e7c1e8f1e260… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8ea39cff754c87ec6a6e51e7c1e8f1e260… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Use higher level API to focus windows
by Philipp Hörist 26 Dec '17

26 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 23de7d53 by Philipp Hörist at 2017-12-26T21:55:19+01:00 Use higher level API to focus windows set_active_tab() already calls present(), no need to call it afterwards again - - - - - 1b2ab928 by Philipp Hörist at 2017-12-26T21:55:19+01:00 Fix focus after destruction of StartChatDialog On destroy() the window that was last focused gets the focus again. if destroy() is called from the StartChat Dialog, the new ChatControl is not yet focused, because present() seems to be asynchron, at least on KDE, and takes time. - - - - - 6 changed files: - gajim/dialogs.py - gajim/gui_interface.py - gajim/message_window.py - gajim/remote_control.py - gajim/roster_window.py - plugins/dbus_plugin/plugin.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2776,6 +2776,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self.set_show_menubar(False) self.set_title(_('Start new Conversation')) self.set_default_size(-1, 400) + self.ready_to_destroy = False self.builder = gtkgui_helpers.get_gtk_builder( 'start_chat_dialog.ui') @@ -2891,7 +2892,7 @@ class StartChatDialog(Gtk.ApplicationWindow): else: app.interface.new_chat_from_jid(row.account, row.jid) - self.destroy() + self.ready_to_destroy = True def _on_search_changed(self, entry): search_text = entry.get_text() ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1767,7 +1767,7 @@ class Interface: self.roster.draw_contact(jid, account) if w: w.set_active_tab(ctrl) - w.window.get_window().focus(Gtk.get_current_event_time()) + w.window.present() # Using isinstance here because we want to catch all derived types if isinstance(ctrl, ChatControlBase): tv = ctrl.conv_textview @@ -2145,7 +2145,6 @@ class Interface: # For JEP-0172 if added_to_roster: ctrl.user_nick = app.nicks[account] - GLib.idle_add(mw.window.grab_focus) return ctrl ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -204,6 +204,14 @@ class MessageWindow(object): gtkgui_helpers.resize_window(self.window, width, height) def _on_window_focus(self, widget, event): + # on destroy() the window that was last focused gets the focus + # again. if destroy() is called from the StartChat Dialog, this + # Window is not yet focused, because present() seems to be asynchron + # at least on KDE, and takes time. + if 'start_chat' in app.interface.instances: + if app.interface.instances['start_chat'].ready_to_destroy: + app.interface.instances['start_chat'].destroy() + # window received focus, so if we had urgency REMOVE IT # NOTE: we do not have to read the message (it maybe in a bg tab) # to remove urgency hint so this functions does that ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -519,7 +519,7 @@ class SignalObject(dbus.service.Object): win = app.interface.msg_win_mgr.get_window(jid, connected_account).window if win.get_property('visible'): - win.window.focus(Gtk.get_current_event_time()) + win.window.present() return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) @@ -658,9 +658,9 @@ class SignalObject(dbus.service.Object): win.present() # preserve the 'steal focus preservation' if self._is_first(): - win.window.focus(Gtk.get_current_event_time()) + win.window.present() else: - win.window.focus(int(time())) + win.window.present_with_time(int(time())) @dbus.service.method(INTERFACE, in_signature='', out_signature='') def show_roster(self): @@ -671,9 +671,9 @@ class SignalObject(dbus.service.Object): win.present() # preserve the 'steal focus preservation' if self._is_first(): - win.window.focus(Gtk.get_current_event_time()) + win.window.present() else: - win.window.focus(int(time())) + win.window.present_with_time(int(time())) @dbus.service.method(INTERFACE, in_signature='', out_signature='') def toggle_ipython(self): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3131,7 +3131,6 @@ class RosterWindow: if gc_control: mw = app.interface.msg_win_mgr.get_window(jid, account) mw.set_active_tab(gc_control) - mw.window.get_window().focus(Gtk.get_current_event_time()) return ctrl = app.interface.minimized_controls[account][jid] mw = app.interface.msg_win_mgr.get_window(jid, account) @@ -3145,7 +3144,6 @@ class RosterWindow: ctrl.on_groupchat_maximize() mw.new_tab(ctrl) mw.set_active_tab(ctrl) - mw.window.get_window().focus(Gtk.get_current_event_time()) self.remove_groupchat(jid, account) def on_edit_account(self, widget, account): ===================================== plugins/dbus_plugin/plugin.py ===================================== --- a/plugins/dbus_plugin/plugin.py +++ b/plugins/dbus_plugin/plugin.py @@ -367,7 +367,7 @@ if dbus_support.supported: win = gajim.interface.msg_win_mgr.get_window(jid, connected_account).window if win.get_property('visible'): - win.window.focus() + win.window.present() return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) @@ -455,9 +455,9 @@ if dbus_support.supported: win.present() # preserve the 'steal focus preservation' if self._is_first(): - win.window.focus() + win.window.present() else: - win.window.focus(long(time())) + win.window.present_with_time(long(time())) @dbus.service.method(INTERFACE, in_signature='', out_signature='') def toggle_ipython(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fd7f30204413bbdf4b72b6fd8b2ab1b76… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fd7f30204413bbdf4b72b6fd8b2ab1b76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Refactor FileTransferWindow tooltip
by Philipp Hörist 24 Dec '17

24 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9db9e69c by Philipp Hörist at 2017-12-23T22:04:49+01:00 Refactor FileTransferWindow tooltip - - - - - 912192ed by Philipp Hörist at 2017-12-23T22:04:54+01:00 NotificationAreaTooltip: Dont inherit from BaseTooltip - - - - - 2a41c719 by Philipp Hörist at 2017-12-23T22:04:54+01:00 Remove BaseTooltip We dont needed anymore - - - - - bc5d9c76 by Philipp Hörist at 2017-12-23T22:04:54+01:00 pep8/pylint: Fix imports - - - - - 8116ef13 by Philipp Hörist at 2017-12-23T22:04:54+01:00 Refactor GCTooltip - Dont create a Tooltip window - Just return the tooltip grid, so we can use it with set_custom() - - - - - fd7f3020 by Philipp Hörist at 2017-12-24T08:40:04+01:00 Merge branch 'master' into 'master' Refactor some Tooltips See merge request gajim/gajim!180 - - - - - 7 changed files: - gajim/data/gui/filetransfers.ui - gajim/filetransfers_window.py - gajim/groupchat_control.py - gajim/htmltextview.py - gajim/message_textview.py - gajim/statusicon.py - gajim/tooltips.py Changes: ===================================== gajim/data/gui/filetransfers.ui ===================================== --- a/gajim/data/gui/filetransfers.ui +++ b/gajim/data/gui/filetransfers.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -101,8 +101,6 @@ <signal name="button-press-event" handler="on_transfers_list_button_press_event" swapped="no"/> <signal name="button-release-event" handler="on_transfers_list_button_release_event" swapped="no"/> <signal name="key-press-event" handler="on_transfers_list_key_press_event" swapped="no"/> - <signal name="leave-notify-event" handler="on_transfers_list_leave_notify_event" swapped="no"/> - <signal name="motion-notify-event" handler="on_transfers_list_motion_notify_event" swapped="no"/> <signal name="row-activated" handler="on_transfers_list_row_activated" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> @@ -247,6 +245,9 @@ </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> <child internal-child="accessible"> <object class="AtkObject" id="file_transfers_window-atkobject"> <property name="AtkObject::accessible-name" translatable="yes">File Transfers</property> ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -140,7 +140,12 @@ class FileTransfersWindow: self.tree.get_selection().set_mode(Gtk.SelectionMode.SINGLE) self.tree.get_selection().connect('changed', self.selection_changed) + + # Tooltip + self.tree.connect('query-tooltip', self._query_tooltip) + self.tree.set_has_tooltip(True) self.tooltip = tooltips.FileTransfersTooltip() + self.file_transfers_menu = self.xml.get_object('file_transfers_menu') self.open_folder_menuitem = self.xml.get_object('open_folder_menuitem') self.cancel_menuitem = self.xml.get_object('cancel_menuitem') @@ -149,6 +154,33 @@ class FileTransfersWindow: self.remove_menuitem = self.xml.get_object('remove_menuitem') self.xml.connect_signals(self) + def _query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + try: + x_pos, y_pos = widget.convert_widget_to_bin_window_coords( + x_pos, y_pos) + row = widget.get_path_at_pos(x_pos, y_pos)[0] + except TypeError: + self.tooltip.clear_tooltip() + return False + if not row: + self.tooltip.clear_tooltip() + return False + + iter_ = None + try: + model = widget.get_model() + iter_ = model.get_iter(row) + except Exception: + self.tooltip.clear_tooltip() + return False + + sid = self.model[iter_][Column.SID] + file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) + + value, widget = self.tooltip.get_tooltip(file_props, sid) + tooltip.set_custom(widget) + return value + def find_transfer_by_jid(self, account, jid): """ Find all transfers with peer 'jid' that belong to 'account' @@ -301,9 +333,7 @@ class FileTransfersWindow: def on_ok(widget): file_dir = None files_path_list = dialog.get_filenames() - text_buffer = desc_entry.get_buffer() - desc = text_buffer.get_text(text_buffer.get_start_iter(), - text_buffer.get_end_iter(), True) + desc = desc_entry.get_text() for file_path in files_path_list: if self.send_file(account, contact, file_path, desc) \ and file_dir is None: @@ -721,7 +751,6 @@ class FileTransfersWindow: """ Add new transfer to FT window and show the FT window """ - self.on_transfers_list_leave_notify_event(None) if file_props is None: return file_props.elapsed_time = 0 @@ -752,45 +781,6 @@ class FileTransfersWindow: self.set_cleanup_sensitivity() self.window.show_all() - def on_transfers_list_motion_notify_event(self, widget, event): - w = self.tree.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = widget.get_path_at_pos(int(event.x), int(event.y)) - self.height_diff = pointer[2] - 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 = props[0] - iter_ = None - try: - iter_ = self.model.get_iter(row) - except Exception: - self.tooltip.hide_tooltip() - return - sid = self.model[iter_][Column.SID] - file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) - if file_props is not None: - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: - self.tooltip.id = row - self.tooltip.timeout = GLib.timeout_add(500, - self.show_tooltip, widget) - - def on_transfers_list_leave_notify_event(self, widget=None, event=None): - if event is not None: - self.height_diff = int(event.y) - elif self.height_diff is 0: - return - w = self.tree.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = self.tree.get_path_at_pos(pointer[1], - pointer[2] - self.height_diff) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id == props[0]: - self.tooltip.hide_tooltip() - def on_transfers_list_row_activated(self, widget, path, col): # try to open the containing folder self.on_open_folder_menuitem_activate(widget) @@ -954,37 +944,11 @@ class FileTransfersWindow: con.disconnect_transfer(file_props) self.set_status(file_props, 'stop') - def show_tooltip(self, widget): - self.tooltip.timeout = 0 - if self.height_diff == 0: - self.tooltip.hide_tooltip() - return - w = self.tree.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = self.tree.get_path_at_pos(pointer[1], - pointer[2] - self.height_diff) - # 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]: - iter_ = self.model.get_iter(props[0]) - sid = self.model[iter_][Column.SID] - file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) - # bounding rectangle of coordinates for the cell within the treeview - rect = self.tree.get_cell_area(props[0], props[1]) - # position of the treeview on the screen - position = widget.get_window().get_origin()[1:] - self.tooltip.show_tooltip(file_props, rect.height, - position[1] + rect.y + self.height_diff) - else: - self.tooltip.hide_tooltip() - def on_notify_ft_complete_checkbox_toggled(self, widget): app.config.set('notify_on_file_complete', widget.get_active()) def on_file_transfers_dialog_delete_event(self, widget, event): - self.on_transfers_list_leave_notify_event(widget, None) self.window.hide() return True # do NOT destory window @@ -1006,7 +970,6 @@ class FileTransfersWindow: """ When a key is pressed in the treeviews """ - self.tooltip.hide_tooltip() iter_ = None try: iter_ = self.tree.get_selection().get_selected()[1] @@ -1024,7 +987,6 @@ class FileTransfersWindow: def on_transfers_list_button_release_event(self, widget, event): # hide tooltip, no matter the button is pressed - self.tooltip.hide_tooltip() path = None try: path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0] @@ -1037,7 +999,6 @@ class FileTransfersWindow: def on_transfers_list_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed - self.tooltip.hide_tooltip() path, iter_ = None, None try: path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0] ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -303,7 +303,6 @@ class GroupchatControl(ChatControlBase): formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(False) - self.current_tooltip = None if parent_win is not None: # On AutoJoin with minimize Groupchats are created without parent # Tooltip Window and Actions have to be created with parent @@ -474,6 +473,9 @@ class GroupchatControl(ChatControlBase): self.banner_actionbar.pack_end(self.hide_roster_button) self.banner_actionbar.pack_start(self.subject_button) + # GC Roster tooltip + self.gc_tooltip = tooltips.GCTooltip() + self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id) app.ged.register_event_handler('gc-presence-received', ged.GUI1, @@ -714,8 +716,6 @@ class GroupchatControl(ChatControlBase): if widget.get_tooltip_window(): return widget.set_has_tooltip(True) - widget.set_tooltip_window(tooltips.GCTooltip( - self.account, self.parent_win.window)) id_ = widget.connect('query-tooltip', self.query_tooltip) self.handlers[id_] = widget @@ -723,41 +723,35 @@ class GroupchatControl(ChatControlBase): try: row = self.list_treeview.get_path_at_pos(x_pos, y_pos)[0] except TypeError: + self.gc_tooltip.clear_tooltip() return False if not row: + self.gc_tooltip.clear_tooltip() return False iter_ = None try: iter_ = self.model.get_iter(row) except Exception: + self.gc_tooltip.clear_tooltip() return False typ = self.model[iter_][Column.TYPE] nick = self.model[iter_][Column.NICK] if typ != 'contact': + self.gc_tooltip.clear_tooltip() 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 = app.contacts.get_gc_contact( self.account, self.room_jid, nick) if not contact: + self.gc_tooltip.clear_tooltip() return False - tooltip.populate(contact) - return True + value, widget = self.gc_tooltip.get_tooltip(contact) + tooltip.set_custom(widget) + return value def fill_column(self, col): for rend in self.renderers_list: ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -1102,8 +1102,6 @@ if __name__ == '__main__': htmlview = ConversationTextview(None) - tooltip = tooltips.BaseTooltip() - def on_textview_motion_notify_event(widget, event): """ Change the cursor to a hand when we are over a mail or an url @@ -1129,17 +1127,6 @@ if __name__ == '__main__': except Exception: pass - #if line_tooltip.timeout != 0: - # Check if we should hide the line tooltip - # if not over_line: - # line_tooltip.hide_tooltip() - #if over_line and not line_tooltip.win: - # line_tooltip.timeout = GLib.timeout_add(500, - # show_line_tooltip) - # htmlview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - # gtkgui_helpers.get_cursor('LEFT_PTR')) - # change_cursor = tag - htmlview.tv.connect('motion_notify_event', on_textview_motion_notify_event) def handler(texttag, widget, event, iter_, kind): ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -102,6 +102,15 @@ class MessageTextView(Gtk.TextView): text = buf.get_text(start, end, True) return text != self.PLACEHOLDER and text != '' + def get_text(self): + # gets the text if its not PLACEHOLDER + buf = self.get_buffer() + start, end = buf.get_bounds() + text = self.get_buffer().get_text(start, end, True) + if text == self.PLACEHOLDER: + return '' + return text + def is_placeholder(self): buf = self.get_buffer() start, end = buf.get_bounds() ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -104,8 +104,7 @@ class StatusIcon: self.make_menu(event_button, event_time) def on_status_icon_query_tooltip(self, widget, x, y, keyboard_mode, tooltip): - self.tooltip.populate() - tooltip.set_custom(self.tooltip.hbox) + tooltip.set_custom(self.tooltip.get_tooltip()) return True def hide_icon(self): ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -28,14 +28,14 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import os +import time +from datetime import datetime + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib from gi.repository import Pango -import os -import time -from datetime import datetime -from datetime import timedelta from gajim import gtkgui_helpers from gajim.common.const import AvatarSize @@ -43,147 +43,6 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import Q_ -class BaseTooltip: - """ - Base Tooltip class - - Usage: - tooltip = BaseTooltip() - .... - tooltip.show_tooltip(data, widget_height, widget_y_position) - .... - if tooltip.timeout != 0: - tooltip.hide_tooltip() - - * data - the text to be displayed (extenders override this argument and - display more complex contents) - * widget_height - the height of the widget on which we want to show tooltip - * widget_y_position - the vertical position of the widget on the screen - - Tooltip is displayed aligned centered to the mouse poiner and 4px below the widget. - In case tooltip goes below the visible area it is shown above the widget. - """ - - def __init__(self): - self.timeout = 0 - self.preferred_position = [0, 0] - self.win = None - self.id = None - self.cur_data = None - self.shown = False - self.position_computed = False - - def populate(self, data): - """ - This method must be overriden by all extenders. This is the most simple - implementation: show data as value of a label - """ - self.create_window() - self.win.add(Gtk.Label(label=data)) - - def create_window(self): - """ - Create a popup window each time tooltip is requested - """ - self.win = Gtk.Window.new(Gtk.WindowType.POPUP) - self.win.set_title('tooltip') - self.win.set_border_width(3) - self.win.set_resizable(False) - self.win.set_name('gtk-tooltips') - self.win.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) - - self.win.set_events(Gdk.EventMask.POINTER_MOTION_MASK) - self.win.connect('size-allocate', self.on_size_allocate) - self.win.connect('motion-notify-event', self.motion_notify_event) - self.screen = self.win.get_screen() - - def _get_icon_name_for_tooltip(self, contact): - """ - Helper function used for tooltip contacts/acounts - - Tooltip on account has fake contact with sub == '', in this case we show - real status of the account - """ - if contact.ask == 'subscribe': - return 'requested' - elif contact.sub in ('both', 'to', ''): - return contact.show - return 'not in roster' - - def motion_notify_event(self, widget, event): - GLib.idle_add(self.hide_tooltip) - - def on_size_allocate(self, widget, rect): - if not self.position_computed: - half_width = rect.width / 2 + 1 - if self.preferred_position[1] + rect.height > \ - self.screen.get_height(): - # flip tooltip up - self.preferred_position[1] -= rect.height + self.widget_height \ - + 8 - if self.preferred_position[1] < 0: - self.preferred_position[1] = self.screen.get_height() - \ - rect.height - 2 - - if self.preferred_position[0] + rect.width + 7 < \ - self.screen.get_width(): - self.preferred_position[0] = self.preferred_position[0]\ - + 7 - else: - self.preferred_position[0] = self.preferred_position[0]\ - - rect.width - 7 - self.win.move(self.preferred_position[0], - self.preferred_position[1]) - return - if self.preferred_position[0] < half_width: - self.preferred_position[0] = 0 - elif self.preferred_position[0] + rect.width > \ - self.screen.get_width() + half_width: - self.preferred_position[0] = self.screen.get_width() - \ - rect.width - else: - self.preferred_position[0] -= half_width - self.position_computed = True - self.win.move(self.preferred_position[0], self.preferred_position[1]) - - def show_tooltip(self, data, widget_height, widget_y_position): - """ - Show tooltip on widget - - Data contains needed data for tooltip contents. - widget_height is the height of the widget on which we show the tooltip. - widget_y_position is vertical position of the widget on the screen. - """ - if self.shown: - return - self.position_computed = False - self.cur_data = data - # set tooltip contents - self.populate(data) - - # get the X position of mouse pointer on the screen - pointer_x = self.screen.get_display().get_device_manager().\ - get_client_pointer().get_position()[1] - - # get the prefered X position of the tooltip on the screen in case this position is > - # than the height of the screen, tooltip will be shown above the widget - preferred_y = widget_y_position + widget_height + 4 - - self.preferred_position = [pointer_x, preferred_y] - self.widget_height = widget_height - self.win.show_all() - self.shown = True - - def hide_tooltip(self): - if self.timeout > 0: - GLib.source_remove(self.timeout) - self.timeout = 0 - if self.win: - self.win.destroy() - self.win = None - self.id = None - self.cur_data = None - self.shown = False class StatusTable: """ @@ -263,13 +122,13 @@ class StatusTable: self.table.attach(lock_image, 4, self.current_row, 1, 1) self.current_row += 1 -class NotificationAreaTooltip(BaseTooltip, StatusTable): + +class NotificationAreaTooltip(StatusTable): """ Tooltip that is shown in the notification area """ def __init__(self): - BaseTooltip.__init__(self) StatusTable.__init__(self) def fill_table_with_accounts(self, accounts): @@ -297,8 +156,7 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable): for line in acct['event_lines']: self.add_text_row(' ' + line, 1) - def populate(self, data=''): - self.create_window() + def get_tooltip(self): self.create_table() accounts = helpers.get_notification_icon_tooltip_dict() @@ -308,40 +166,43 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable): self.hbox.add(self.table) self.hbox.show_all() + return self.hbox -class GCTooltip(Gtk.Window): + +class GCTooltip(): # pylint: disable=E1101 - def __init__(self, account, parent): - Gtk.Window.__init__(self, type=Gtk.WindowType.POPUP, transient_for=parent) - self.account = account - self.row = None - self.set_title('tooltip') - self.set_border_width(3) - self.set_resizable(False) - self.set_name('gtk-tooltips') - self.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) + def __init__(self): + self.contact = None self.xml = gtkgui_helpers.get_gtk_builder('tooltip_gc_contact.ui') for name in ('nick', 'status', 'jid', 'user_show', 'fillelement', - 'resource', 'affiliation', 'avatar', 'resource_label', - 'jid_label', 'tooltip_grid'): + 'resource', 'affiliation', 'avatar', 'resource_label', + 'jid_label', 'tooltip_grid'): setattr(self, name, self.xml.get_object(name)) - self.add(self.tooltip_grid) - self.tooltip_grid.show() - def clear_tooltip(self): + self.contact = None + + def get_tooltip(self, contact): + if self.contact == contact: + return True, self.tooltip_grid + + self._populate_grid(contact) + self.contact = contact + return False, self.tooltip_grid + + def _hide_grid_childs(self): """ Hide all Elements of the Tooltip Grid """ for child in self.tooltip_grid.get_children(): child.hide() - def populate(self, contact): + def _populate_grid(self, contact): """ Populate the Tooltip Grid with data of from the contact """ - self.clear_tooltip() + self._hide_grid_childs() self.nick.set_text(contact.get_shown_name()) self.nick.show() @@ -750,19 +611,28 @@ class RosterTooltip(Gtk.Window, StatusTable): return 'not in roster' -class FileTransfersTooltip(BaseTooltip): - """ - Tooltip that is shown in the notification area - """ - +class FileTransfersTooltip(): def __init__(self): - BaseTooltip.__init__(self) + self.sid = None + self.widget = None + + def clear_tooltip(self): + self.sid = None + self.widget = None + + def get_tooltip(self, file_props, sid): + if self.sid == sid: + return True, self.widget - def populate(self, file_props): + self.widget = self._create_tooltip(file_props, sid) + self.sid = sid + return False, self.widget + + @staticmethod + def _create_tooltip(file_props, sid): ft_table = Gtk.Table(2, 1) ft_table.set_property('column-spacing', 2) current_row = 1 - self.create_window() properties = [] name = file_props.name if file_props.type_ == 'r': @@ -794,18 +664,18 @@ class FileTransfersTooltip(BaseTooltip): status = '' if file_props.started: status = _('Not started') - if file_props.stopped == True: + if file_props.stopped: status = _('Stopped') elif file_props.completed: status = _('Completed') - elif file_props.connected == False: + elif not file_props.connected: if file_props.completed: status = _('Completed') else: - if file_props.paused == True: + if file_props.paused: status = Q_('?transfer status:Paused') - elif file_props.stalled == True: - #stalled is not paused. it is like 'frozen' it stopped alone + elif file_props.stalled: + # stalled is not paused. it is like 'frozen' it stopped alone status = _('Stalled') else: status = _('Transferring') @@ -832,7 +702,8 @@ class FileTransfersTooltip(BaseTooltip): ft_table.attach(label, 2, 3, current_row, current_row + 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) - self.win.add(ft_table) + ft_table.show_all() + return ft_table def colorize_status(status): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bf3aac28cbfac3f0829f2fc84cd60e720… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bf3aac28cbfac3f0829f2fc84cd60e720… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits