Commits March 2019

commits@gajim.org

1 participants
63 discussions

[Git][gajim/gajim][gajim_1.1] 7 commits: Get module instance after checking for zeroconf
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: c1948d05 by Philipp Hörist at 2019-03-16T14:38:19Z Get module instance after checking for zeroconf - - - - - 36e80622 by Philipp Hörist at 2019-03-16T14:47:51Z Notifications: Check if DBus is available - - - - - 3729b8f9 by Philipp Hörist at 2019-03-16T15:17:05Z Themes: Better visibility of scrollbar - - - - - 76cb4d1d by Philipp Hörist at 2019-03-16T15:18:49Z HistoryWindow: Center top widgets vertically - - - - - 7ba9bc4b by Philipp Hörist at 2019-03-16T15:19:11Z Dont leak DNS query if we connect via proxy Fixes #9573 - - - - - d159a7a1 by Philipp Hörist at 2019-03-16T15:19:26Z Fix error while quitting Fixes #9622 - - - - - bb4daa29 by Philipp Hörist at 2019-03-16T15:19:37Z Generate account label correctly - - - - - 7 changed files: - gajim/common/connection.py - gajim/data/gui/history_window.ui - gajim/data/gui/themes_window.ui - gajim/gtk/account_wizard.py - gajim/notify.py - gajim/plugins/pluginmanager.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -905,10 +905,6 @@ class Connection(CommonConnection, ConnectionHandlers): ] self._hostname = hostname - if h: - app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), - self._on_resolve_txt, type_='txt') - if use_srv and self._proxy is None: self._srv_hosts = [] @@ -918,6 +914,9 @@ class Connection(CommonConnection, ConnectionHandlers): for service in services: record_name = '_' + service + '._tcp.' + helpers.idn_to_ascii(h) app.resolver.resolve(record_name, self._on_resolve_srv) + + app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), + self._on_resolve_txt, type_='txt') else: self._connect_to_next_host() ===================================== gajim/data/gui/history_window.ui ===================================== @@ -311,6 +311,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">center</property> <property name="label" translatable="yes">Chat</property> <style> <class name="dim-label"/> @@ -326,6 +327,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes">Record history for this chat</property> + <property name="valign">center</property> <signal name="notify::active" handler="on_log_history_checkbutton_toggled" swapped="no"/> </object> <packing> @@ -337,6 +339,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="margin_left">6</property> <property name="label" translatable="yes">Record History</property> <style> @@ -353,6 +356,7 @@ <property name="width_request">400</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="hexpand">True</property> <property name="model">liststore1</property> <property name="tearoff_title" translatable="yes">Ttitle</property> ===================================== gajim/data/gui/themes_window.ui ===================================== @@ -10,7 +10,8 @@ <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> - <property name="min_content_height">200</property> + <property name="min_content_height">260</property> + <property name="overlay_scrolling">False</property> <child> <object class="GtkViewport"> <property name="visible">True</property> ===================================== gajim/gtk/account_wizard.py ===================================== @@ -564,6 +564,7 @@ class AccountCreationWizard: def create_vars(self, config): app.config.add_per('accounts', self.account) + config['account_label'] = '%s@%s' % (config['name'], config['hostname']) if not config['savepass']: config['password'] = '' ===================================== gajim/notify.py ===================================== @@ -75,31 +75,10 @@ class Notification: Handle notifications """ def __init__(self): + self._dbus_available = False self.daemon_capabilities = ['actions'] - # Detect if actions are supported by the notification daemon - if sys.platform not in ('win32', 'darwin'): - def on_proxy_ready(source, res, data=None): - try: - proxy = Gio.DBusProxy.new_finish(res) - self.daemon_capabilities = proxy.GetCapabilities() - except GLib.Error as e: - if e.domain == 'g-dbus-error-quark': - log.info('Notifications D-Bus connection failed: %s', - e.message) - else: - raise - else: - log.debug('Notifications D-Bus connected') - - log.debug('Connecting to Notifications D-Bus') - Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, - Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, - None, - 'org.freedesktop.Notifications', - '/org/freedesktop/Notifications', - 'org.freedesktop.Notifications', - None, on_proxy_ready) + self._detect_dbus_caps() app.ged.register_event_handler( 'notification', ged.GUI2, self._nec_notification) @@ -107,6 +86,30 @@ class Notification: 'our-show', ged.GUI2, self._nec_our_status) app.events.event_removed_subscribe(self._on_event_removed) + def _detect_dbus_caps(self): + if sys.platform in ('win32', 'darwin'): + return + + def on_proxy_ready(_source, res, _data=None): + try: + proxy = Gio.DBusProxy.new_finish(res) + self.daemon_capabilities = proxy.GetCapabilities() + except GLib.Error: + log.exception('Notifications D-Bus connection failed') + else: + self._dbus_available = True + log.info('Notifications D-Bus connected') + + log.info('Connecting to Notifications D-Bus') + Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, + Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, + None, + 'org.freedesktop.Notifications', + '/org/freedesktop/Notifications', + 'org.freedesktop.Notifications', + None, + on_proxy_ready) + def _nec_notification(self, obj): if obj.do_popup: icon_name = self._get_icon_name(obj) @@ -170,6 +173,9 @@ class Notification: app.interface.roster.popup_notification_windows.append(instance) return + if not self._dbus_available: + return + scale = gtkgui_helpers.get_monitor_scale_factor() icon_pixbuf = gtkgui_helpers.gtk_icon_theme.load_icon_for_scale( icon_name, 48, scale, 0) @@ -220,8 +226,9 @@ class Notification: app.app.send_notification(notif_id, notification) def withdraw(self, *args): - if sys.platform != 'win32': - app.app.withdraw_notification(self._id(*args)) + if not self._dbus_available: + return + app.app.withdraw_notification(self._id(*args)) def _id(self, *args): return ','.join(args) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -406,9 +406,9 @@ class PluginManager(metaclass=Singleton): return for con in app.connections.values(): for module in plugin.modules: - instance, name = module.get_instance(con) if not module.zeroconf and con.name == 'Local': continue + instance, name = module.get_instance(con) modules.register_single(con, instance, name) # If handlers have been registered, register the @@ -558,9 +558,9 @@ class PluginManager(metaclass=Singleton): return for module in plugin.modules: - instance, name = module.get_instance(con) if not module.zeroconf and con.name == 'Local': continue + instance, name = module.get_instance(con) modules.register_single(con, instance, name) def _plugin_is_active_in_global_config(self, plugin): ===================================== gajim/roster_window.py ===================================== @@ -2501,8 +2501,11 @@ class RosterWindow: self.send_pep(acct, pep_dict) def on_continue2(message, pep_dict): + if 'file_transfers' not in app.interface.instances: + on_continue3(message, pep_dict) + return # check if there is an active file transfer - from gajim.common.protocol.bytestream import (is_transfer_active) + from gajim.common.protocol.bytestream import is_transfer_active files_props = app.interface.instances['file_transfers'].\ files_props transfer_active = False View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c0178db779d8a6f25f986b7609174b367… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c0178db779d8a6f25f986b7609174b367… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Notifications: Check if DBus is available
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05dc0044 by Philipp Hörist at 2019-03-16T14:51:12Z Notifications: Check if DBus is available - - - - - 6ef3b8e0 by Philipp Hörist at 2019-03-16T15:06:00Z Windows: Dont steal focus on notification - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -52,29 +52,11 @@ class Notification: Handle notifications """ def __init__(self): + self._dbus_available = False self._daemon_capabilities = ['actions'] self._win32_active_popup = None - # Detect if actions are supported by the notification daemon - if sys.platform not in ('win32', 'darwin'): - def on_proxy_ready(_source, res, _data=None): - try: - proxy = Gio.DBusProxy.new_finish(res) - self._daemon_capabilities = proxy.GetCapabilities() - except GLib.Error: - log.exception('Notifications D-Bus connection failed') - else: - log.debug('Notifications D-Bus connected') - - log.debug('Connecting to Notifications D-Bus') - Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, - Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, - None, - 'org.freedesktop.Notifications', - '/org/freedesktop/Notifications', - 'org.freedesktop.Notifications', - None, - on_proxy_ready) + self._detect_dbus_caps() app.ged.register_event_handler( 'notification', ged.GUI2, self._nec_notification) @@ -82,6 +64,30 @@ class Notification: 'our-show', ged.GUI2, self._nec_our_status) app.events.event_removed_subscribe(self._on_event_removed) + def _detect_dbus_caps(self): + if sys.platform in ('win32', 'darwin'): + return + + def on_proxy_ready(_source, res, _data=None): + try: + proxy = Gio.DBusProxy.new_finish(res) + self.daemon_capabilities = proxy.GetCapabilities() + except GLib.Error: + log.exception('Notifications D-Bus connection failed') + else: + self._dbus_available = True + log.info('Notifications D-Bus connected') + + log.info('Connecting to Notifications D-Bus') + Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, + Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, + None, + 'org.freedesktop.Notifications', + '/org/freedesktop/Notifications', + 'org.freedesktop.Notifications', + None, + on_proxy_ready) + def _nec_notification(self, obj): if obj.do_popup: icon_name = self._get_icon_name(obj) @@ -149,6 +155,9 @@ class Notification: self._win32_active_popup.connect('destroy', self._on_popup_destroy) return + if not self._dbus_available: + return + scale = get_monitor_scale_factor() icon_pixbuf = load_icon(icon_name, size=48, pixbuf=True, scale=scale) @@ -210,7 +219,7 @@ class Notification: if sys.platform == 'win32': if self._win32_active_popup is not None: self._win32_active_popup.destroy() - else: + elif self._dbus_available: app.app.withdraw_notification(self._make_id(*args)) @staticmethod @@ -223,6 +232,8 @@ class PopupNotification(Gtk.Window): icon_name=None, title=None, text=None, timeout=-1): Gtk.Window.__init__(self) self.set_type_hint(Gdk.WindowTypeHint.NOTIFICATION) + self.set_focus_on_map(False) + self.set_accept_focus(False) self.set_name('NotificationPopup') self.set_skip_taskbar_hint(True) self.set_decorated(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c17b744465a371731d403f770280f283b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c17b744465a371731d403f770280f283b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Generate account label correctly
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c17b7444 by Philipp Hörist at 2019-03-16T14:33:58Z Generate account label correctly - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -561,6 +561,7 @@ class AccountCreationWizard: def create_vars(self, config): app.config.add_per('accounts', self.account) + config['account_label'] = '%s@%s' % (config['name'], config['hostname']) if not config['savepass']: config['password'] = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c17b744465a371731d403f770280f283be… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c17b744465a371731d403f770280f283be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove password before config values
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 196d856a by Philipp Hörist at 2019-03-16T13:47:42Z Remove password before config values - - - - - 1 changed file: - gajim/config.py Changes: ===================================== gajim/config.py ===================================== @@ -190,6 +190,9 @@ class RemoveAccountWindow: app.connections[self.account].cleanup() del app.connections[self.account] app.logger.remove_roster(app.get_jid_from_account(self.account)) + # Delete password must be before del_per() because it calls set_per() + # which would recreate the account with defaults values if not found + passwords.delete_password(self.account) app.config.del_per('accounts', self.account) del app.interface.instances[self.account] if self.account in app.nicks: @@ -214,7 +217,6 @@ class RemoveAccountWindow: app.interface.roster.setup_and_draw_roster() app.app.remove_account_actions(self.account) gui_menu_builder.build_accounts_menu() - passwords.delete_password(self.account) window = app.get_app_window('AccountsWindow') if window is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/196d856a544b92c6e44623ee7acd13a889… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/196d856a544b92c6e44623ee7acd13a889… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix nbxmpp method calls
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: be26f501 by Philipp Hörist at 2019-03-16T13:01:49Z Fix nbxmpp method calls features_nb was renamed - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -758,7 +758,7 @@ class Connection(CommonConnection, ConnectionHandlers): return if realm == nbxmpp.NS_REGISTER: - if event == nbxmpp.features_nb.REGISTER_DATA_RECEIVED: + if event == nbxmpp.features.REGISTER_DATA_RECEIVED: # data is (agent, DataFrom, is_form, error_msg) if self.new_account_info and \ self.new_account_info['hostname'] == data[0]: @@ -812,7 +812,7 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(NetworkEvent( 'account-not-created', conn=self, reason=reason)) return - nbxmpp.features_nb.register(self.connection, + nbxmpp.features.register(self.connection, self._hostname, self.new_account_form, _on_register_result) return @@ -1763,7 +1763,7 @@ class Connection(CommonConnection, ConnectionHandlers): return self.on_connect_failure = None self.connection = con - nbxmpp.features_nb.getRegInfo(con, self._hostname) + nbxmpp.features.getRegInfo(con, self._hostname) def getRoster(self): return self.get_module('Roster') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/be26f5012086b0d28a70a6db7b07ed0b2f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/be26f5012086b0d28a70a6db7b07ed0b2f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix error while quitting
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fa464d43 by Philipp Hörist at 2019-03-16T12:55:15Z Fix error while quitting Fixes #9622 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -2459,8 +2459,11 @@ class RosterWindow: self.send_pep(acct, pep_dict) def on_continue2(message, pep_dict): + if 'file_transfers' not in app.interface.instances: + on_continue3(message, pep_dict) + return # check if there is an active file transfer - from gajim.common.protocol.bytestream import (is_transfer_active) + from gajim.common.protocol.bytestream import is_transfer_active files_props = app.interface.instances['file_transfers'].\ files_props transfer_active = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fa464d4333b7b99a24ab045931ba6b276b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fa464d4333b7b99a24ab045931ba6b276b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont leak DNS query if we connect via proxy
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 979c7d25 by Philipp Hörist at 2019-03-16T12:22:05Z Dont leak DNS query if we connect via proxy Fixes #9573 - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -928,10 +928,6 @@ class Connection(CommonConnection, ConnectionHandlers): ] self._hostname = hostname - if h: - app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), - self._on_resolve_txt, type_='txt') - if use_srv and self._proxy is None: self._srv_hosts = [] @@ -941,6 +937,9 @@ class Connection(CommonConnection, ConnectionHandlers): for service in services: record_name = '_' + service + '._tcp.' + helpers.idn_to_ascii(h) app.resolver.resolve(record_name, self._on_resolve_srv) + + app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), + self._on_resolve_txt, type_='txt') else: self._connect_to_next_host() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/979c7d255316ea69bf688bf6940f91a1a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/979c7d255316ea69bf688bf6940f91a1a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Themes: Better visibility of scrollbar
by Philipp Hörist 12 Mar '19

12 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 62d12f43 by Philipp Hörist at 2019-03-12T17:52:05Z Themes: Better visibility of scrollbar - - - - - 11ae4fac by Philipp Hörist at 2019-03-12T17:58:52Z HistoryWindow: Center top widgets vertically - - - - - 2 changed files: - gajim/data/gui/history_window.ui - gajim/data/gui/themes_window.ui Changes: ===================================== gajim/data/gui/history_window.ui ===================================== @@ -299,6 +299,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">center</property> <property name="label" translatable="yes">Chat</property> <style> <class name="dim-label"/> @@ -314,6 +315,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes">Record history for this chat</property> + <property name="valign">center</property> <signal name="notify::active" handler="on_log_history_checkbutton_toggled" swapped="no"/> </object> <packing> @@ -325,6 +327,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="margin_left">6</property> <property name="label" translatable="yes">Record History</property> <style> @@ -341,6 +344,7 @@ <property name="width_request">400</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="hexpand">True</property> <property name="model">liststore1</property> <property name="tearoff_title" translatable="yes">Ttitle</property> ===================================== gajim/data/gui/themes_window.ui ===================================== @@ -10,7 +10,8 @@ <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> - <property name="min_content_height">200</property> + <property name="min_content_height">260</property> + <property name="overlay_scrolling">False</property> <child> <object class="GtkViewport"> <property name="visible">True</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4b3a5b7704dbf51afa2d0d71b8c4a53e5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4b3a5b7704dbf51afa2d0d71b8c4a53e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use Consistent Color Generation for MUC nicknames
by Philipp Hörist 12 Mar '19

12 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b3a5b77 by Philipp Hörist at 2019-03-12T17:44:20Z Use Consistent Color Generation for MUC nicknames - - - - - 4 changed files: - gajim/command_system/implementation/standard.py - gajim/common/config.py - gajim/conversation_textview.py - gajim/groupchat_control.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -250,8 +250,6 @@ class StandardGroupChatCommands(CommandContainer): @doc(_("Clear the text window")) def clear(self): self.conv_textview.clear() - self.gc_count_nicknames_colors = -1 - self.gc_custom_colors = {} @command(raw=True) @doc(_("Change your nickname in a group chat")) ===================================== gajim/common/config.py ===================================== @@ -253,7 +253,6 @@ class Config: 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat occupants list in group chat window.')], 'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking than in previous message.')], 'chat_merge_consecutive_nickname_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickname.')], - 'gc_nicknames_colors': [opt_str, '#4e9a06:#f57900:#ce5c00:#3465a4:#204a87:#75507b:#5c3566:#c17d11:#8f5902:#ef2929:#cc0000:#a40000', _('List of colors, separated by ":", that will be used to color nicknames in group chats.'), True], 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread.')], 'confirm_metacontacts': [opt_str, '', _('Show the confirm metacontacts creation dialog or not? Empty string means never show the dialog.')], 'confirm_block': [opt_str, '', _('Show the confirm block contact dialog or not? Empty string means never show the dialog.')], ===================================== gajim/conversation_textview.py ===================================== @@ -34,6 +34,9 @@ from gi.repository import Gtk from gi.repository import Pango from gi.repository import GObject from gi.repository import GLib +from gi.repository import Gdk + +from nbxmpp.util import text_to_colour from gajim.common import app from gajim.common import helpers @@ -43,14 +46,13 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.fuzzyclock import FuzzyClock from gajim.common.const import StyleAttr -from gajim.gtk.htmltextview import HtmlTextView - from gajim.gtk import util from gajim.gtk.util import load_icon from gajim.gtk.util import get_cursor from gajim.gtk.emoji_data import emoji_pixbufs from gajim.gtk.emoji_data import is_emoji from gajim.gtk.emoji_data import get_emoji_pixbuf +from gajim.gtk.htmltextview import HtmlTextView NOT_SHOWN = 0 ALREADY_RECEIVED = 1 @@ -247,13 +249,6 @@ class ConversationTextview(GObject.GObject): desc = app.css_config.get_font('.gajim-outgoing-message-text') self.tagOutText.set_property('font-desc', desc) - colors = app.config.get('gc_nicknames_colors') - colors = colors.split(':') - for i, color in enumerate(colors): - tagname = 'gc_nickname_color_' + str(i) - tag = buffer_.create_tag(tagname) - tag.set_property('foreground', color) - self.tagMarked = buffer_.create_tag('marked') color = app.css_config.get_value( '.gajim-highlight-message', StyleAttr.COLOR) @@ -1223,6 +1218,11 @@ class ConversationTextview(GObject.GObject): if other_tags_for_name: name_tags = other_tags_for_name[:] # create a new list name_tags.append(kind) + + for tag in name_tags: + if tag.startswith('muc_nickname_color_'): + self._add_new_colour_tags(tag, name) + before_str = app.config.get('before_nickname') before_str = helpers.from_one_line(before_str) after_str = app.config.get('after_nickname') @@ -1230,6 +1230,12 @@ class ConversationTextview(GObject.GObject): format_ = before_str + name + direction_mark + after_str + ' ' buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) + def _add_new_colour_tags(self, tag, name): + if self._buffer.get_tag_table().lookup(tag) is not None: + return + gdk_color = Gdk.Color.from_floats(*text_to_colour(name)) + self._buffer.create_tag(tag, foreground_gdk=gdk_color) + def print_subject(self, subject, iter_=None): if subject: # if we have subject, show it too! subject = _('Subject: %s\n') % subject ===================================== gajim/groupchat_control.py ===================================== @@ -193,12 +193,6 @@ class GroupchatControl(ChatControlBase): self.subject = '' - # nickname coloring - self.gc_count_nicknames_colors = -1 - self.gc_custom_colors = {} - self.number_of_colors = len(app.config.get('gc_nicknames_colors').\ - split(':')) - self.name_label = self.xml.get_object('banner_name_label') self.event_box = self.xml.get_object('banner_eventbox') @@ -1347,17 +1341,7 @@ class GroupchatControl(ChatControlBase): if kind == 'incoming': # it's a message NOT from us # highlighting and sounds highlight, _sound = self.highlighting_for_message(text, tim) - if contact in self.gc_custom_colors: - other_tags_for_name.append('gc_nickname_color_' + \ - str(self.gc_custom_colors[contact])) - else: - self.gc_count_nicknames_colors += 1 - if self.gc_count_nicknames_colors == self.number_of_colors: - self.gc_count_nicknames_colors = 0 - self.gc_custom_colors[contact] = \ - self.gc_count_nicknames_colors - other_tags_for_name.append('gc_nickname_color_' + \ - str(self.gc_count_nicknames_colors)) + other_tags_for_name.append('muc_nickname_color_%s' % contact) if highlight: # muc-specific chatstate if self.parent_win: @@ -1369,10 +1353,6 @@ class GroupchatControl(ChatControlBase): self._nick_completion.record_message(contact, highlight) - if text.startswith('/me ') or text.startswith('/me\n'): - other_tags_for_text.append('gc_nickname_color_' + \ - str(self.gc_custom_colors[contact])) - self.check_and_possibly_add_focus_out_line() ChatControlBase.print_conversation_line(self, text, kind, contact, tim, @@ -1858,10 +1838,6 @@ class GroupchatControl(ChatControlBase): tv.last_received_message_id[nick] del tv.last_received_message_id[nick] - # keep nickname color - if nick in self.gc_custom_colors: - self.gc_custom_colors[new_nick] = self.gc_custom_colors[nick] - self.remove_contact(nick) self.add_contact_to_roster(new_nick) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4b3a5b7704dbf51afa2d0d71b8c4a53e50… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4b3a5b7704dbf51afa2d0d71b8c4a53e50… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add Consistent Color Generation (XEP-0392)
by Philipp Hörist 12 Mar '19

12 Mar '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3a9957cd by Philipp Hörist at 2019-03-12T17:06:43Z Add Consistent Color Generation (XEP-0392) - - - - - 3 changed files: - + nbxmpp/third_party/__init__.py - + nbxmpp/third_party/hsluv.py - nbxmpp/util.py Changes: ===================================== nbxmpp/third_party/__init__.py ===================================== ===================================== nbxmpp/third_party/hsluv.py ===================================== @@ -0,0 +1,350 @@ +# This file was taken from https://github.com/hsluv/hsluv-python +# +# Copyright (c) 2015 Alexei Boronine +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +import math + +m = [[3.240969941904521, -1.537383177570093, -0.498610760293], + [-0.96924363628087, 1.87596750150772, 0.041555057407175], + [0.055630079696993, -0.20397695888897, 1.056971514242878]] +minv = [[0.41239079926595, 0.35758433938387, 0.18048078840183], + [0.21263900587151, 0.71516867876775, 0.072192315360733], + [0.019330818715591, 0.11919477979462, 0.95053215224966]] +refY = 1.0 +refU = 0.19783000664283 +refV = 0.46831999493879 +kappa = 903.2962962 +epsilon = 0.0088564516 +hex_chars = "0123456789abcdef" + + +def _distance_line_from_origin(line): + v = math.pow(line['slope'], 2) + 1 + return math.fabs(line['intercept']) / math.sqrt(v) + + +def _length_of_ray_until_intersect(theta, line): + return line['intercept'] / (math.sin(theta) - line['slope'] * math.cos(theta)) + + +def _get_bounds(l): + result = [] + sub1 = math.pow(l + 16, 3) / 1560896 + if sub1 > epsilon: + sub2 = sub1 + else: + sub2 = l / kappa + _g = 0 + while _g < 3: + c = _g + _g = _g + 1 + m1 = m[c][0] + m2 = m[c][1] + m3 = m[c][2] + _g1 = 0 + while _g1 < 2: + t = _g1 + _g1 = _g1 + 1 + top1 = (284517 * m1 - 94839 * m3) * sub2 + top2 = (838422 * m3 + 769860 * m2 + 731718 * m1) * l * sub2 - (769860 * t) * l + bottom = (632260 * m3 - 126452 * m2) * sub2 + 126452 * t + result.append({'slope': top1 / bottom, 'intercept': top2 / bottom}) + return result + + +def _max_safe_chroma_for_l(l): + bounds = _get_bounds(l) + _hx_min = 1.7976931348623157e+308 + _g = 0 + while _g < 2: + i = _g + _g = _g + 1 + length = _distance_line_from_origin(bounds[i]) + if math.isnan(_hx_min): + _hx_min = _hx_min + elif math.isnan(length): + _hx_min = length + else: + _hx_min = min(_hx_min, length) + return _hx_min + + +def _max_chroma_for_lh(l, h): + hrad = h / 360 * math.pi * 2 + bounds = _get_bounds(l) + _hx_min = 1.7976931348623157e+308 + _g = 0 + while _g < len(bounds): + bound = bounds[_g] + _g = (_g + 1) + length = _length_of_ray_until_intersect(hrad, bound) + if length >= 0: + if math.isnan(_hx_min): + _hx_min = _hx_min + elif math.isnan(length): + _hx_min = length + else: + _hx_min = min(_hx_min, length) + return _hx_min + + +def _dot_product(a, b): + sum = 0 + _g1 = 0 + _g = len(a) + while _g1 < _g: + i = _g1 + _g1 = _g1 + 1 + sum += a[i] * b[i] + return sum + + +def _from_linear(c): + if c <= 0.0031308: + return 12.92 * c + else: + return 1.055 * math.pow(c, 0.416666666666666685) - 0.055 + + +def _to_linear(c): + if c > 0.04045: + return math.pow((c + 0.055) / 1.055, 2.4) + else: + return c / 12.92 + + +def xyz_to_rgb(_hx_tuple): + return [ + _from_linear(_dot_product(m[0], _hx_tuple)), + _from_linear(_dot_product(m[1], _hx_tuple)), + _from_linear(_dot_product(m[2], _hx_tuple))] + + +def rgb_to_xyz(_hx_tuple): + rgbl = [_to_linear(_hx_tuple[0]), + _to_linear(_hx_tuple[1]), + _to_linear(_hx_tuple[2])] + return [_dot_product(minv[0], rgbl), + _dot_product(minv[1], rgbl), + _dot_product(minv[2], rgbl)] + + +def _y_to_l(y): + if y <= epsilon: + return y / refY * kappa + else: + return 116 * math.pow(y / refY, 0.333333333333333315) - 16 + + +def _l_to_y(l): + if l <= 8: + return refY * l / kappa + else: + return refY * math.pow((l + 16) / 116, 3) + + +def xyz_to_luv(_hx_tuple): + x = float(_hx_tuple[0]) + y = float(_hx_tuple[1]) + z = float(_hx_tuple[2]) + divider = x + 15 * y + 3 * z + var_u = 4 * x + var_v = 9 * y + if divider != 0: + var_u = var_u / divider + var_v = var_v / divider + else: + var_u = float("nan") + var_v = float("nan") + l = _y_to_l(y) + if l == 0: + return [0, 0, 0] + u = 13 * l * (var_u - refU) + v = 13 * l * (var_v - refV) + return [l, u, v] + + +def luv_to_xyz(_hx_tuple): + l = float(_hx_tuple[0]) + u = float(_hx_tuple[1]) + v = float(_hx_tuple[2]) + if l == 0: + return [0, 0, 0] + var_u = u / (13 * l) + refU + var_v = v / (13 * l) + refV + y = _l_to_y(l) + x = 0 - ((9 * y * var_u) / (((var_u - 4) * var_v) - var_u * var_v)) + z = (((9 * y) - (15 * var_v * y)) - (var_v * x)) / (3 * var_v) + return [x, y, z] + + +def luv_to_lch(_hx_tuple): + l = float(_hx_tuple[0]) + u = float(_hx_tuple[1]) + v = float(_hx_tuple[2]) + _v = (u * u) + (v * v) + if _v < 0: + c = float("nan") + else: + c = math.sqrt(_v) + if c < 0.00000001: + h = 0 + else: + hrad = math.atan2(v, u) + h = hrad * 180.0 / 3.1415926535897932 + if h < 0: + h = 360 + h + return [l, c, h] + + +def lch_to_luv(_hx_tuple): + l = float(_hx_tuple[0]) + c = float(_hx_tuple[1]) + h = float(_hx_tuple[2]) + hrad = h / 360.0 * 2 * math.pi + u = math.cos(hrad) * c + v = math.sin(hrad) * c + return [l, u, v] + + +def hsluv_to_lch(_hx_tuple): + h = float(_hx_tuple[0]) + s = float(_hx_tuple[1]) + l = float(_hx_tuple[2]) + if l > 99.9999999: + return [100, 0, h] + if l < 0.00000001: + return [0, 0, h] + _hx_max = _max_chroma_for_lh(l, h) + c = _hx_max / 100 * s + return [l, c, h] + + +def lch_to_hsluv(_hx_tuple): + l = float(_hx_tuple[0]) + c = float(_hx_tuple[1]) + h = float(_hx_tuple[2]) + if l > 99.9999999: + return [h, 0, 100] + if l < 0.00000001: + return [h, 0, 0] + _hx_max = _max_chroma_for_lh(l, h) + s = c / _hx_max * 100 + return [h, s, l] + + +def hpluv_to_lch(_hx_tuple): + h = float(_hx_tuple[0]) + s = float(_hx_tuple[1]) + l = float(_hx_tuple[2]) + if l > 99.9999999: + return [100, 0, h] + if l < 0.00000001: + return [0, 0, h] + _hx_max = _max_safe_chroma_for_l(l) + c = _hx_max / 100 * s + return [l, c, h] + + +def lch_to_hpluv(_hx_tuple): + l = float(_hx_tuple[0]) + c = float(_hx_tuple[1]) + h = float(_hx_tuple[2]) + if l > 99.9999999: + return [h, 0, 100] + if l < 0.00000001: + return [h, 0, 0] + _hx_max = _max_safe_chroma_for_l(l) + s = c / _hx_max * 100 + return [h, s, l] + + +def rgb_to_hex(_hx_tuple): + h = "#" + _g = 0 + while _g < 3: + i = _g + _g = _g + 1 + chan = float(_hx_tuple[i]) + c = math.floor(chan * 255 + 0.5) + digit2 = int(c % 16) + digit1 = int((c - digit2) / 16) + + h += hex_chars[digit1] + hex_chars[digit2] + return h + + +def hex_to_rgb(hex): + hex = hex.lower() + ret = [] + _g = 0 + while _g < 3: + i = _g + _g = _g + 1 + index = i * 2 + 1 + _hx_str = hex[index] + digit1 = hex_chars.find(_hx_str) + index1 = i * 2 + 2 + str1 = hex[index1] + digit2 = hex_chars.find(str1) + n = digit1 * 16 + digit2 + ret.append(n / 255.0) + return ret + + +def lch_to_rgb(_hx_tuple): + return xyz_to_rgb(luv_to_xyz(lch_to_luv(_hx_tuple))) + + +def rgb_to_lch(_hx_tuple): + return luv_to_lch(xyz_to_luv(rgb_to_xyz(_hx_tuple))) + + +def hsluv_to_rgb(_hx_tuple): + return lch_to_rgb(hsluv_to_lch(_hx_tuple)) + + +def rgb_to_hsluv(_hx_tuple): + return lch_to_hsluv(rgb_to_lch(_hx_tuple)) + + +def hpluv_to_rgb(_hx_tuple): + return lch_to_rgb(hpluv_to_lch(_hx_tuple)) + + +def rgb_to_hpluv(_hx_tuple): + return lch_to_hpluv(rgb_to_lch(_hx_tuple)) + + +def hsluv_to_hex(_hx_tuple): + return rgb_to_hex(hsluv_to_rgb(_hx_tuple)) + + +def hpluv_to_hex(_hx_tuple): + return rgb_to_hex(hpluv_to_rgb(_hx_tuple)) + + +def hex_to_hsluv(s): + return rgb_to_hsluv(hex_to_rgb(s)) + + +def hex_to_hpluv(s): + return rgb_to_hpluv(hex_to_rgb(s)) ===================================== nbxmpp/util.py ===================================== @@ -19,7 +19,9 @@ import logging import socket import base64 import weakref +import hashlib from functools import wraps +from functools import lru_cache import precis_i18n.codec @@ -31,6 +33,7 @@ from nbxmpp.structs import IqProperties from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties from nbxmpp.structs import CommonError +from nbxmpp.third_party.hsluv import hsluv_to_rgb log = logging.getLogger('nbxmpp.util') @@ -220,3 +223,21 @@ def raise_error(log_method, stanza, type_=None, message=None): def is_error_result(result): return isinstance(result, CommonError) + + +def clip_rgb(red, green, blue): + return ( + min(max(red, 0), 1), + min(max(green, 0), 1), + min(max(blue, 0), 1), + ) + + +@lru_cache() +def text_to_colour(text): + hash_ = hashlib.sha1() + hash_.update(text.encode()) + hue = (int.from_bytes(hash_.digest()[:2], 'little') & 0xffff) / 0xffff + + red, green, blue = clip_rgb(*hsluv_to_rgb((hue * 360, 100, 50))) + return red * 0.8, green * 0.8, blue * 0.8 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/3a9957cd6e31e0552c44742ead… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/3a9957cd6e31e0552c44742ead… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2019