Commits July 2021

commits@gajim.org

1 participants
34 discussions

[Git][gajim/gajim][mainwindow] Append group chat name in PM conversation
by Daniel Brötzmann (＠wurstsalat) 19 Jul '21

19 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 0767454c by wurstsalat at 2021-07-19T21:13:46+02:00 Append group chat name in PM conversation - - - - - 2 changed files: - gajim/gtk/chat_list.py - gajim/gtk/controls/chat.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -416,9 +416,10 @@ def update_avatar(self): def update_name(self): if self.type == 'pm': client = app.get_client(self.account) - muc_name = get_groupchat_name(client, self.jid) + muc_name = get_groupchat_name(client, self.jid.bare) self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})') return + own_jid = self._client.get_own_jid().bare if self.jid == own_jid: self._ui.name_label.set_text(_('Note to myself')) ===================================== gajim/gtk/controls/chat.py ===================================== @@ -860,40 +860,35 @@ def update_ui(self): def draw_banner_text(self): """ - Draw the text in the fat line at the top of the window that houses the - name, jid + Draws the chat banner's text (e.g. name, chat state) in the top of the + chat window """ contact = self.contact name = contact.name - # if self.resource: - # name += '/' + self.resource - # if self._type.is_privatechat: - # name = i18n.direction_mark + _( - # '%(nickname)s from group chat %(room_name)s') % \ - # {'nickname': name, 'room_name': self.room_name} - # name = i18n.direction_mark + GLib.markup_escape_text(name) + if self._type.is_privatechat: + name = f'{name} ({self.room_name})' - cs = self.contact.chatstate - if cs is not None: - cs = cs.value + chatstate = self.contact.chatstate + if chatstate is not None: + chatstate = chatstate.value if app.settings.get('show_chatstate_in_banner'): - chatstate = helpers.get_uf_chatstate(cs) + chatstate = helpers.get_uf_chatstate(chatstate) - label_text = '%s %s' % \ - (name, chatstate) - label_tooltip = '%s %s' % (name, chatstate) + label_text = f'{name}' \ + f'' \ + f'{chatstate}' + label_tooltip = f'{name} {chatstate}' else: - label_text = '%s' % name + label_text = f'{name}' label_tooltip = name status_text = '' self.xml.banner_label.hide() self.xml.banner_label.set_no_show_all(True) - self.xml.banner_label.set_markup(status_text) - # setup the label that holds name and jid + self.xml.banner_name_label.set_markup(label_text) self.xml.banner_name_label.set_tooltip_text(label_tooltip) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0767454c015f1c44f3293deb89c25289… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0767454c015f1c44f3293deb89c25289… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] SearchView: Improve behavior when unselecting chat
by Daniel Brötzmann (＠wurstsalat) 18 Jul '21

18 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b5682727 by wurstsalat at 2021-07-18T16:30:28+02:00 SearchView: Improve behavior when unselecting chat - - - - - 2 changed files: - gajim/gtk/chat_page.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -132,6 +132,7 @@ def _on_chat_selected(self, _chat_list_stack, workspace_id, account, jid): def _on_chat_unselected(self, _chat_list_stack): self._chat_stack.clear() + self._search_view.set_context(None, None) def _on_search_history(self, _action, _param): control = self.get_active_control() ===================================== gajim/gtk/search_view.py ===================================== @@ -179,7 +179,7 @@ def set_focus(self): def set_context(self, account, jid): self._account = account self._jid = jid - self._ui.search_checkbutton.set_active(False) + self._ui.search_checkbutton.set_active(jid is None) class RowHeader(Gtk.Box): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b56827279886abb5c0e540dab9716e62… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b56827279886abb5c0e540dab9716e62… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ScrolledView: Improvements
by Daniel Brötzmann (＠wurstsalat) 18 Jul '21

18 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 5078b38f by wurstsalat at 2021-07-18T15:49:11+02:00 ScrolledView: Improvements - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gtk/conversation/scrolled.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1340,6 +1340,9 @@ def fetch_n_lines_history(self, _scrolled, before, n_lines): self.add_messages(messages) + if len(messages) < n_lines: + self._scrolled_view.set_history_complete(before, True) + if self._scrolled_view.get_autoscroll(): if self.conversation_view.reduce_message_count(before): self._scrolled_view.set_history_complete(before, False) ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -75,6 +75,7 @@ def reset(self): self._upper_complete = False self._lower_complete = False self._requesting = None + self.set_history_complete(True, False) def set_history_complete(self, before, complete): if before: @@ -104,6 +105,9 @@ def _on_adj_upper_changed(self, adj, *args): if upper == adj.get_page_size(): # There is no scrollbar, request history until there is self.emit('request-history', True) + self._lower_complete = True + self._autoscroll = True + self.emit('autoscroll-changed', self._autoscroll) self._requesting = None def _on_adj_value_changed(self, adj, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5078b38f45e5345a48859759bf1f8430… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5078b38f45e5345a48859759bf1f8430… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Replace discouraged pkg_resources for Python 3.9+
by Philipp Hörist (＠lovetox) 18 Jul '21

18 Jul '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5e8ef4a3 by André Apitzsch at 2021-07-18T11:38:16+00:00 Replace discouraged pkg_resources for Python 3.9+ See https://setuptools.readthedocs.io/en/latest/pkg_resources.html - - - - - 2 changed files: - gajim/common/configpaths.py - setup.cfg Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -118,8 +118,12 @@ def __init__(self) -> None: self.cache_root = Path(GLib.get_user_cache_dir()) / 'gajim' self.data_root = Path(GLib.get_user_data_dir()) / 'gajim' - import pkg_resources - basedir = Path(pkg_resources.resource_filename("gajim", ".")) + if sys.version_info < (3, 9): + import pkg_resources + basedir = Path(pkg_resources.resource_filename("gajim", ".")) + else: + import importlib.resources + basedir = importlib.resources.files('gajim') source_paths = [ ('DATA', basedir / 'data'), ===================================== setup.cfg ===================================== @@ -24,7 +24,7 @@ install_requires = keyring nbxmpp>=2.0.1 packaging - setuptools + setuptools; python_version < '3.9' precis-i18n>=1.0.0 pyOpenSSL>=16.2 pycairo>=1.16.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5e8ef4a38d836936d1f9aa1936becff2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5e8ef4a38d836936d1f9aa1936becff2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: HistoryManager: Allow it to start in standalone mode
by Philipp Hörist (＠lovetox) 18 Jul '21

18 Jul '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: a08eab5a by Matthew White at 2021-07-18T11:26:58+00:00 HistoryManager: Allow it to start in standalone mode Fixes the following error when starting gajim-history-manager: ModuleNotFoundError: No module named 'gajim.gui.emoji_data' - - - - - 15cf0e2a by Matthew White at 2021-07-18T11:26:58+00:00 Test: Fix test_gui_interface failure Partially fixes #10478 about the following error: ERROR: test_gui_interface (unittest.loader._FailedTest) ... ModuleNotFoundError: No module named 'gajim.gui.emoji_data' - - - - - 2 changed files: - gajim/history_manager.py - test/unit/test_gui_interface.py Changes: ===================================== gajim/history_manager.py ===================================== @@ -55,7 +55,6 @@ from gajim.common.const import JIDConstant from gajim.common.const import KindConstant from gajim.common.const import ShowConstant -from gajim.common.settings import Settings def is_standalone(): @@ -76,6 +75,8 @@ def init_gtk(): if is_standalone(): init_gtk() + from gajim.common.settings import Settings + try: shortargs = 'hvsc:l:p:' longargs = 'help verbose separate config-path= loglevel= profile=' @@ -100,6 +101,8 @@ def init_gtk(): app.settings = Settings() app.settings.init() app.load_css_config() +else: + from gajim.common.settings import Settings from gajim.common import helpers from gajim.gui.dialogs import ErrorDialog ===================================== test/unit/test_gui_interface.py ===================================== @@ -3,6 +3,9 @@ ''' import unittest +import gajim.gui +gajim.gui.init('gtk') + from test import lib lib.setup_env() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f9f2a88b9f698e3aaaf5ffe8e24176f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f9f2a88b9f698e3aaaf5ffe8e24176f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: Startup: Show AccountWizzard if no account available
by Daniel Brötzmann (＠wurstsalat) 16 Jul '21

16 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: bbe243c9 by wurstsalat at 2021-07-16T20:32:27+02:00 Startup: Show AccountWizzard if no account available - - - - - 082537f1 by wurstsalat at 2021-07-16T21:16:26+02:00 Ellipsize nickname in ChatList and ConversationView - - - - - cd151520 by wurstsalat at 2021-07-16T21:36:09+02:00 MessageRow: Improve detecting own nickname - - - - - 5ddf2d40 by wurstsalat at 2021-07-16T22:47:53+02:00 Settings: Fix initial workspace and migration - - - - - 5 changed files: - gajim/common/settings.py - gajim/data/gui/chat_list_row.ui - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/main.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -163,6 +163,8 @@ def init(self) -> None: self._load_settings() self._load_account_settings() if not self._settings['app']: + # ['app'] is empty in a newly created database. + # If there is an old config, it gets migrated at this point. self._migrate_old_config() self._commit() self._migrate_database() @@ -247,7 +249,8 @@ def _migrate(self) -> None: sql = '''INSERT INTO settings(name, settings) VALUES ('workspaces', ?)''' self._con.execute(sql, (json.dumps(INITAL_WORKSPACE),)) - self._set_user_version(2) + self._settings['workspaces'] = INITAL_WORKSPACE + self._set_user_version(1) def _migrate_old_config(self) -> None: config_file = configpaths.get('CONFIG_FILE') ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -148,6 +148,7 @@ <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">start</property> + <property name="ellipsize">end</property> <property name="single-line-mode">True</property> <property name="xalign">0</property> <style> ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -77,6 +77,7 @@ def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: def create_name_widget(name: str, is_self: bool) -> Gtk.Label: label = Gtk.Label() label.set_selectable(True) + label.set_ellipsize(Pango.EllipsizeMode.END) label.get_style_context().add_class('conversation-nickname') label.set_markup(GLib.markup_escape_text(name)) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -22,6 +22,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.const import TRUST_SYMBOL_DATA +from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_muc_context from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string @@ -87,11 +88,14 @@ def __init__(self, self._message_widget = MessageWidget(account) self._message_widget.add_content(result) if self._is_groupchat: - if self._contact.get_self().name != name: + our_nick = get_group_chat_nick( + self._account, self._contact.jid) + if name != our_nick: self._check_for_highlight(result) if self._is_groupchat: - is_self = name == self._contact.get_self().name + our_nick = get_group_chat_nick(self._account, self._contact.jid) + is_self = name == our_nick else: is_self = kind == 'outgoing' name_widget = self.create_name_widget(name, is_self) ===================================== gajim/gtk/main.py ===================================== @@ -80,6 +80,7 @@ def __init__(self): ('account-disabled', ged.GUI1, self._on_account_disabled), ]) + self._check_for_account() self._load_chats() self._add_actions() self._add_actions2() @@ -414,6 +415,17 @@ def _remove_contact(): DialogButton.make('Remove', callback=_remove_contact)]).show() + @staticmethod + def _check_for_account(): + accounts = app.settings.get_accounts() + if (not accounts or accounts == ['Local'] and + not app.settings.get_account_setting('Local', 'active')): + # Either no account configured or only disabled Local account + def _open_wizard(): + open_window('AccountWizard') + + GLib.idle_add(_open_wizard) + def _load_chats(self): for workspace_id in app.settings.get_workspaces(): self.add_workspace(workspace_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/318ca493a6d716bb69d927c0bbb6d9b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/318ca493a6d716bb69d927c0bbb6d9b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Workspaces: Add image avatars
by Daniel Brötzmann (＠wurstsalat) 14 Jul '21

14 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 318ca493 by wurstsalat at 2021-07-14T19:46:41+02:00 Workspaces: Add image avatars - - - - - 2 changed files: - gajim/gtk/avatar.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -349,13 +349,18 @@ def get_workspace_surface(self, workspace_id, size, scale): color = app.settings.get_workspace_setting(workspace_id, 'color') avatar_sha = app.settings.get_workspace_setting( workspace_id, 'avatar_sha') - if not avatar_sha: - rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) - letter = name[:1].upper() - surface = make_workspace_avatar( - letter, rgba_to_float(rgba), size, scale) - self._cache[workspace_id][(size, scale)] = surface - return surface + if avatar_sha: + surface = self._load_surface_from_storage(avatar_sha, size, scale) + if surface is None: + return None + return clip(surface, 'round-corners') + + rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) + letter = name[:1].upper() + surface = make_workspace_avatar( + letter, rgba_to_float(rgba), size, scale) + self._cache[workspace_id][(size, scale)] = surface + return surface def prepare_for_publish(self, path): success, data = self._load_for_publish(path) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -49,7 +49,7 @@ def __init__(self, workspace_id=None): name = _('My Workspace') color = None - avatar_sha = None + self._avatar_sha = None if workspace_id is None: self._ui.remove_workspace_button.set_sensitive(False) @@ -58,8 +58,15 @@ def __init__(self, workspace_id=None): workspace_id, 'name') color = app.settings.get_workspace_setting( workspace_id, 'color') + self._avatar_sha = app.settings.get_workspace_setting( + workspace_id, 'avatar_sha') + if self._avatar_sha == '': + self._avatar_sha = None rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) + if self._avatar_sha is not None: + self._ui.image_switch.set_state(True) + self._ui.style_stack.set_visible_child_name('image') self._ui.entry.set_text(name) self._ui.color_chooser.set_rgba(rgba) @@ -92,25 +99,36 @@ def _on_text_changed(self, entry, _param): def _on_image_switch_toggled(self, switch, *args): if switch.get_active(): self._ui.style_stack.set_visible_child_name('image') + if self._workspace_id is not None: + self._avatar_sha = app.settings.get_workspace_setting( + self._workspace_id, 'avatar_sha') else: self._ui.style_stack.set_visible_child_name('color') + self._avatar_sha = None + self._update_avatar() def _update_avatar(self): name = self._ui.entry.get_text() rgba = self._ui.color_chooser.get_rgba() scale = self.get_scale_factor() - surface = make_workspace_avatar( - name[:1].upper(), - rgba_to_float(rgba), - AvatarSize.WORKSPACE_EDIT, - scale) + if self._avatar_sha is not None: + surface = app.interface.avatar_storage.get_workspace_surface( + self._workspace_id, + AvatarSize.WORKSPACE_EDIT, + scale) + else: + surface = make_workspace_avatar( + name[:1].upper(), + rgba_to_float(rgba), + AvatarSize.WORKSPACE_EDIT, + scale) self._ui.preview.set_from_surface(surface) def _get_avatar_data(self): if not self._avatar_selector.get_prepared(): return None - success, data, width, height = self._avatar_selector.get_avatar_bytes() + success, data, _wid, _hei = self._avatar_selector.get_avatar_bytes() if not success: return None @@ -119,15 +137,23 @@ def _get_avatar_data(self): def _on_save(self, _button): name = self._ui.entry.get_text() rgba = self._ui.color_chooser.get_rgba() - # use_image = self._ui.image_switch.get_active() - # if use_image: - # avatar = self._get_avatar_data() + use_image = self._ui.image_switch.get_active() + if use_image: + data = self._get_avatar_data() + if data is not None: + self._avatar_sha = app.interface.save_avatar(data) if self._workspace_id is not None: app.settings.set_workspace_setting( self._workspace_id, 'name', name) app.settings.set_workspace_setting( self._workspace_id, 'color', rgba.to_string()) + if self._avatar_sha is None: + app.settings.set_workspace_setting( + self._workspace_id, 'avatar_sha', '') + else: + app.settings.set_workspace_setting( + self._workspace_id, 'avatar_sha', self._avatar_sha) app.window.update_workspace(self._workspace_id) self.destroy() @@ -136,6 +162,9 @@ def _on_save(self, _button): workspace_id = app.settings.add_workspace(name) app.settings.set_workspace_setting( workspace_id, 'color', rgba.to_string()) + if self._avatar_sha is not None: + app.settings.set_workspace_setting( + workspace_id, 'avatar_sha', self._avatar_sha) app.window.add_workspace(workspace_id) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/318ca493a6d716bb69d927c0bbb6d9b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/318ca493a6d716bb69d927c0bbb6d9b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update API JID for search.jabber.network integration
by Philipp Hörist (＠lovetox) 13 Jul '21

13 Jul '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: f9f2a88b by Jonas Schäfer at 2021-07-13T19:50:38+02:00 Update API JID for search.jabber.network integration The JID has been changed recently and this needs to be reflected. The old JID was available for a certain transition period, but that period ended a few weeks back because of a necessary architectural change which decoupled the two domains. Signed-off-by: lovetox <philipp(a)hoerist.com> - - - - - 2 changed files: - gajim/common/config.py - gajim/common/setting_values.py Changes: ===================================== gajim/common/config.py ===================================== @@ -229,7 +229,7 @@ class Config: 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chat state of the contact.')], 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: \'all\', \'composing_only\', \'disabled\'')], - 'muclumbus_api_jid': [opt_str, 'rodrigo.de.mucobedo(a)dreckshal.de'], + 'muclumbus_api_jid': [opt_str, 'api(a)search.jabber.network'], 'muclumbus_api_http_uri': [opt_str, 'https://search.jabber.network/api/1.0/search'], 'muclumbus_api_pref': [opt_str, 'http', _('API Preferences. Possible values: \'http\', \'iq\'')], 'command_system_execute': [opt_bool, False, _('If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).')], ===================================== gajim/common/setting_values.py ===================================== @@ -169,7 +169,7 @@ class _ACCOUNT_DEFAULT: 'show_chatstate_in_roster': True, 'show_chatstate_in_tabs': True, 'show_chatstate_in_banner': True, - 'muclumbus_api_jid': 'rodrigo.de.mucobedo(a)dreckshal.de', + 'muclumbus_api_jid': 'api(a)search.jabber.network', 'muclumbus_api_http_uri': 'https://search.jabber.network/api/1.0/search', 'muclumbus_api_pref': 'http', 'command_system_execute': False, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f9f2a88b9f698e3aaaf5ffe8e24176fd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f9f2a88b9f698e3aaaf5ffe8e24176fd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Preview: Catch errors when closing pixbuf loader
by Daniel Brötzmann (＠wurstsalat) 06 Jul '21

06 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 4c0033ae by wurstsalat at 2021-07-06T20:08:25+02:00 Preview: Catch errors when closing pixbuf loader - - - - - 1 changed file: - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -138,11 +138,11 @@ def create_thumbnail_with_pixbuf(data, size): loader = GdkPixbuf.PixbufLoader() try: loader.write(data) + loader.close() except GLib.Error as error: log.warning('making pixbuf failed: %s', error) return None - loader.close() pixbuf = loader.get_pixbuf() if size > pixbuf.get_width() and size > pixbuf.get_height(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4c0033ae3b3876bc32db185618a53b55… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4c0033ae3b3876bc32db185618a53b55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MessageRow: Simplify nick colors
by Daniel Brötzmann (＠wurstsalat) 05 Jul '21

05 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 5241c4ea by wurstsalat at 2021-07-05T22:07:49+02:00 MessageRow: Simplify nick colors - - - - - 2 changed files: - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -74,26 +74,16 @@ def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: return label @staticmethod - def create_name_widget(name: str, kind: str, - is_groupchat: bool) -> Gtk.Label: + def create_name_widget(name: str, is_self: bool) -> Gtk.Label: label = Gtk.Label() label.set_selectable(True) label.get_style_context().add_class('conversation-nickname') + label.set_markup(GLib.markup_escape_text(name)) - name = GLib.markup_escape_text(name) - if is_groupchat: - rgba = Gdk.RGBA(*text_to_color(name)) - nick_color = convert_rgba_to_hex(rgba) - label.set_markup( - f'{name}') + if is_self: + label.get_style_context().add_class('gajim-outgoing-nickname') else: - if kind in ('incoming', 'incoming_queue'): - label.get_style_context().add_class( - 'gajim-incoming-nickname') - elif kind == 'outgoing': - label.get_style_context().add_class( - 'gajim-outgoing-nickname') - label.set_markup(name) + label.get_style_context().add_class('gajim-incoming-nickname') return label ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -87,13 +87,17 @@ def __init__(self, self._message_widget = MessageWidget(account) self._message_widget.add_content(result) if self._is_groupchat: - self_contact = self._contact.get_self() - if self_contact.name != name: + if self._contact.get_self().name != name: self._check_for_highlight(result) + if self._is_groupchat: + is_self = name == self._contact.get_self().name + else: + is_self = kind == 'outgoing' + name_widget = self.create_name_widget(name, is_self) + self._meta_box = Gtk.Box(spacing=6) self._meta_box.set_hexpand(True) - name_widget = self.create_name_widget(name, kind, self._is_groupchat) self._meta_box.pack_start(name_widget, False, True, 0) timestamp_label = self.create_timestamp_widget(self.timestamp) timestamp_label.set_margin_start(6) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5241c4ea271889a938e38255ef229462… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5241c4ea271889a938e38255ef229462… 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 July 2021