Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: DataForm: Handle destroy correctly
by Philipp Hörist (＠lovetox) 06 Jun '23

06 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 126babff by Philipp Hörist at 2023-06-06T18:36:14+02:00 fix: DataForm: Handle destroy correctly Fixes #11548 - - - - - 1 changed file: - gajim/gtk/dataform.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -78,6 +78,8 @@ def __init__(self, self.add(self._form_grid) + self.connect('destroy', self._on_destroy) + @property def title(self) -> str | None: return self._form_grid.title @@ -112,6 +114,9 @@ def focus_first_entry(self) -> None: widget.grab_focus_without_selecting() break + def _on_destroy(self, widget: Gtk.ScrolledWindow) -> None: + self._form_grid.destroy() + class FormGrid(Gtk.Grid): def __init__(self, @@ -163,6 +168,8 @@ def __init__(self, self._analyse_fields(form_node, options) self._parse_form(form_node, options) + self.connect('destroy', self._on_destroy) + def _add_row( self, field: SizeAdjustment | Title | Instructions | Field | ImageMediaField @@ -239,6 +246,12 @@ def validate(self, is_valid: bool) -> None: dataform_widget = cast(DataFormWidget, viewport.get_parent()) dataform_widget.emit('is-valid', value) + def _on_destroy(self, widget: Gtk.Grid) -> None: + for row in self.rows: + if isinstance(row, Field): + row.destroy() + self.rows.clear() + class SizeAdjustment: def __init__(self, options: dict[str, Any]) -> None: @@ -373,6 +386,10 @@ def _start_validation() -> None: self._validate_source_id = GLib.timeout_add(200, _start_validation) + def destroy(self) -> None: + if self._validate_source_id is not None: + GLib.source_remove(self._validate_source_id) + class BooleanField(Field): def __init__(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/126babff737a12519e4a9b0209a2923e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/126babff737a12519e4a9b0209a2923e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Use contact signals instead of event signals
by Philipp Hörist (＠lovetox) 06 Jun '23

06 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b6c82b9 by Philipp Hörist at 2023-06-06T15:04:39+02:00 refactor: Use contact signals instead of event signals - - - - - 2 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/groupchat_details.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -30,7 +30,6 @@ from gajim.common.events import AccountEnabled from gajim.common.events import BookmarksReceived from gajim.common.events import MessageReceived -from gajim.common.events import MucDiscoUpdate from gajim.common.ged import EventHelper from gajim.common.helpers import generate_qr_code from gajim.common.i18n import _ @@ -91,7 +90,6 @@ def switch_contact(self, contact: types.ChatContactT) -> None: if not self.has_events_registered(): self.register_events([ ('message-received', ged.GUI2, self._on_message_received), - ('muc-disco-update', ged.GUI2, self._on_muc_disco_update), ('bookmarks-received', ged.GUI2, self._on_bookmarks_received), ('account-enabled', ged.GUI2, self._on_account_changed), ('account-disabled', ged.GUI2, self._on_account_changed) @@ -125,7 +123,8 @@ def _connect_signals(self) -> None: self._contact.multi_connect({ 'user-role-changed': self._on_user_role_changed, 'state-changed': self._on_muc_state_changed, - 'room-voice-request': self._on_room_voice_request + 'room-voice-request': self._on_room_voice_request, + 'disco-info-update': self._on_disco_info_update, }) elif isinstance(self._contact, GroupchatParticipant): @@ -215,10 +214,10 @@ def _on_bookmarks_received(self, _event: BookmarksReceived) -> None: self._update_name_label() - def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: - assert self._contact is not None - if event.jid != self._contact.jid: - return + def _on_disco_info_update(self, + _contact: GroupchatContact, + _signal_name: str + ) -> None: self._update_name_label() self._update_description_label() ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -19,11 +19,9 @@ from gi.repository import Gtk from gajim.common import app -from gajim.common import ged from gajim.common import types from gajim.common.const import AvatarSize from gajim.common.const import SimpleClientState -from gajim.common.events import MucDiscoUpdate from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact @@ -60,6 +58,7 @@ def __init__(self, self._contact = contact self._contact.connect('avatar-update', self._on_avatar_update) + self._contact.connect('disco-info-update', self._on_disco_info_update) self._ui = get_builder('groupchat_details.ui') self._ui.connect_signals(self) @@ -91,9 +90,6 @@ def __init__(self, if page is not None: self._switcher.set_row(page) - app.ged.register_event_handler( - 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) - self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) @@ -109,9 +105,11 @@ def _on_client_state_changed(self, self._ui.edit_name_button.set_tooltip_text( _('Not connected') if not state.is_connected else _('Edit Name…')) - def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: - if event.jid != self._contact.jid: - return + def _on_disco_info_update(self, + _contact: GroupchatContact, + _signal_name: str + ) -> None: + self._ui.name_entry.set_text(self._contact.name) disco_info = self._contact.get_disco() assert disco_info is not None @@ -228,7 +226,4 @@ def _on_key_press(self, self.destroy() def _on_destroy(self, _widget: GroupchatDetails) -> None: - app.ged.remove_event_handler('muc-disco-update', - ged.GUI1, - self._on_muc_disco_update) app.check_finalize(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3b6c82b9833a83a54c62d0942b8cce4d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3b6c82b9833a83a54c62d0942b8cce4d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatListRow: Always update group chat name
by Philipp Hörist (＠lovetox) 06 Jun '23

06 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17a65362 by Philipp Hörist at 2023-06-06T14:05:32+02:00 fix: ChatListRow: Always update group chat name - - - - - 2 changed files: - gajim/common/modules/discovery.py - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== @@ -241,6 +241,10 @@ def disco_muc(self, account=self._account, jid=result.info.jid)) + contact = self._con.get_module('Contacts').get_contact( + result.info.jid, groupchat=True) + contact.notify('disco-info-update') + yield result @as_task ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -522,6 +522,8 @@ def _connect_contact_signals(self) -> None: elif isinstance(self.contact, GroupchatContact): self.contact.connect('avatar-update', self._on_avatar_update) + self.contact.connect('disco-info-update', + self._on_disco_info_update) self.contact.connect('state-changed', self._on_muc_state_changed) self.contact.connect('mam-sync-started', self._on_mam_sync_changed) self.contact.connect('mam-sync-finished', self._on_mam_sync_changed) @@ -557,6 +559,12 @@ def _on_avatar_update(self, ) -> None: self.update_avatar() + def _on_disco_info_update(self, + _contact: ChatContactT, + _signal_name: str + ) -> None: + self.update_name() + def _on_client_state_changed(self, *args: Any) -> None: self._update_joined_state() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17a653624ba8b10c015229bd5c080950… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17a653624ba8b10c015229bd5c080950… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix showing MAM sync errors and show error text
by Daniel Brötzmann (＠wurstsalat) 05 Jun '23

05 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f2c514f3 by wurstsalat at 2023-06-05T19:54:11+02:00 fix: Fix showing MAM sync errors and show error text - - - - - 4 changed files: - gajim/data/gui/groupchat_state.ui - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py - gajim/gtk/groupchat_state.py Changes: ===================================== gajim/data/gui/groupchat_state.ui ===================================== @@ -165,10 +165,9 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkLabel" id="mam_error_label"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">There has been an error while trying to fetch messages.</property> <property name="wrap">True</property> <property name="max-width-chars">50</property> <property name="xalign">0</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -522,6 +522,7 @@ class GroupchatRosterTooltipBuilder(Builder): class GroupchatStateBuilder(Builder): groupchat_state: Gtk.Stack + mam_error_label: Gtk.Label class GroupsPostWindowBuilder(Builder): ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -525,7 +525,7 @@ def _connect_contact_signals(self) -> None: self.contact.connect('state-changed', self._on_muc_state_changed) self.contact.connect('mam-sync-started', self._on_mam_sync_changed) self.contact.connect('mam-sync-finished', self._on_mam_sync_changed) - self.contact.connect('mam-sync-error', self._on_mam_sync_changed) + self.contact.connect('mam-sync-error', self._on_mam_sync_error) self._client.connect_signal('state-changed', self._on_client_state_changed) @@ -597,13 +597,21 @@ def _on_mam_sync_changed(self, context.add_class('info-color') self._ui.connection_icon.set_tooltip_text(_('Fetching messages…')) self._ui.connection_icon.show() - elif signal_name == 'mam-sync-error': - self._ui.connection_icon.set_from_icon_name( - 'feather-zap-symbolic', Gtk.IconSize.MENU) - context.add_class('error-color') - self._ui.connection_icon.set_tooltip_text( - _('There has been an error while trying to fetch messages.')) - self._ui.connection_icon.show() + + def _on_mam_sync_error(self, + _contact: GroupchatContact, + _signal_name: str, + error_text: str + ) -> None: + + self._reset_connection_icon() + self._ui.connection_icon.set_from_icon_name( + 'feather-zap-symbolic', Gtk.IconSize.MENU) + self._ui.connection_icon.get_style_context().add_class('error-color') + self._ui.connection_icon.set_tooltip_text( + _('There has been an error while trying to ' + 'fetch messages: %s') % error_text) + self._ui.connection_icon.show() def _reset_connection_icon(self) -> None: self._ui.connection_icon.hide() ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -19,6 +19,7 @@ from gajim.common import app from gajim.common import types from gajim.common.const import SimpleClientState +from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact from gajim.gtk.builder import get_builder @@ -61,7 +62,7 @@ def switch_contact(self, contact: types.ChatContactT) -> None: self._contact.connect('state-changed', self._on_muc_state_changed) self._contact.connect('mam-sync-started', self._on_mam_sync_changed) self._contact.connect('mam-sync-finished', self._on_mam_sync_changed) - self._contact.connect('mam-sync-error', self._on_mam_sync_changed) + self._contact.connect('mam-sync-error', self._on_mam_sync_error) self._client = app.get_client(contact.account) self._client.connect_signal('state-changed', @@ -97,16 +98,28 @@ def _update_state(self, contact: GroupchatContact) -> None: def _on_mam_sync_changed(self, _contact: GroupchatContact, - signal_name: str + signal_name: str, ) -> None: - if signal_name in ('mam-sync-started', 'mam-sync-error'): + if signal_name == 'mam-sync-started': self.set_visible(True) self._ui.groupchat_state.set_visible_child_name(signal_name) return self.hide() + def _on_mam_sync_error(self, + _contact: GroupchatContact, + signal_name: str, + error_text: str + ) -> None: + + self.set_visible(True) + self._ui.groupchat_state.set_visible_child_name(signal_name) + self._ui.mam_error_label.set_text( + _('There has been an error while trying to ' + 'fetch messages: %s') % error_text) + def _on_close_clicked(self, _button: Gtk.Button) -> None: self.hide() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f2c514f317737388cad1eea374c378e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f2c514f317737388cad1eea374c378e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][workspace-improvements] 2 commits: imprv: Restore chats when enabling account
by Daniel Brötzmann (＠wurstsalat) 02 Jun '23

02 Jun '23

Daniel Brötzmann pushed to branch workspace-improvements at gajim / gajim Commits: 43c262ac by wurstsalat at 2023-06-02T16:39:25+02:00 imprv: Restore chats when enabling account This moves settings formerly stored in workspace settings to contact's and group chat contact's settings respectively. New contact settings: 'opened', 'pinned', 'position' Fixes #10872 - - - - - 42748013 by wurstsalat at 2023-06-02T16:39:29+02:00 other: Add settings migration for workspace settings - - - - - 7 changed files: - gajim/common/modules/contacts.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/main.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -44,6 +44,7 @@ from gajim.common.modules.util import LogAdapter from gajim.common.setting_values import BoolContactSettings from gajim.common.setting_values import BoolGroupChatSettings +from gajim.common.setting_values import IntContactSettings from gajim.common.setting_values import IntGroupChatSettings from gajim.common.setting_values import StringContactSettings from gajim.common.setting_values import StringGroupChatSettings @@ -62,6 +63,8 @@ def __init__(self, account: str, jid: JID) -> None: def get(self, setting: StringContactSettings) -> str: ... # noqa: E704 @overload def get(self, setting: BoolContactSettings) -> bool: ... # noqa: E704 + @overload + def get(self, setting: IntContactSettings) -> int: ... # noqa: E704 def get(self, setting: Any) -> Any: return app.settings.get_contact_setting( @@ -71,6 +74,8 @@ def get(self, setting: Any) -> Any: def set(self, setting: StringContactSettings, value: str) -> None: ... # noqa: E501, E704 @overload def set(self, setting: BoolContactSettings, value: bool) -> None: ... # noqa: E501, E704 + @overload + def set(self, setting: IntContactSettings, value: int) -> None: ... # noqa: E501, E704 def set(self, setting: Any, value: Any) -> None: app.settings.set_contact_setting( ===================================== gajim/common/setting_values.py ===================================== @@ -368,6 +368,8 @@ class _ACCOUNTDEFAULT: BoolGroupChatSettings = Literal[ 'notify_on_all_messages', + 'opened', + 'pinned', 'print_join_left', 'print_status', 'send_marker', @@ -382,6 +384,7 @@ class _ACCOUNTDEFAULT: ] IntGroupChatSettings = Literal[ + 'position', 'sync_threshold', ] @@ -394,9 +397,15 @@ class _ACCOUNTDEFAULT: BoolContactSettings = Literal[ + 'opened', + 'pinned', 'send_marker', ] +IntContactSettings = Literal[ + 'position', +] + StringContactSettings = Literal[ 'encryption', 'mute_until', @@ -406,9 +415,10 @@ class _ACCOUNTDEFAULT: ] AllContactSettings = Literal[BoolContactSettings, + IntContactSettings, StringContactSettings] -AllContactSettingsT = str | bool +AllContactSettingsT = str | int | bool ACCOUNT_SETTINGS = { @@ -488,6 +498,9 @@ class _ACCOUNTDEFAULT: 'send_marker': HAS_ACCOUNT_DEFAULT, 'speller_language': '', 'workspace': '', + 'opened': False, + 'pinned': False, + 'position': -1, }, 'group_chat': { @@ -501,6 +514,9 @@ class _ACCOUNTDEFAULT: 'speller_language': '', 'sync_threshold': HAS_APP_DEFAULT, 'workspace': '', + 'opened': False, + 'pinned': False, + 'position': -1, }, } ===================================== gajim/common/settings.py ===================================== @@ -29,6 +29,7 @@ from collections import defaultdict from collections import namedtuple from collections.abc import Callable +from collections.abc import Generator from pathlib import Path from gi.repository import GLib @@ -56,6 +57,7 @@ from gajim.common.setting_values import HAS_APP_DEFAULT from gajim.common.setting_values import INITAL_WORKSPACE from gajim.common.setting_values import IntAccountSettings +from gajim.common.setting_values import IntContactSettings from gajim.common.setting_values import IntGroupChatSettings from gajim.common.setting_values import IntSettings from gajim.common.setting_values import OpenChatsSettingT @@ -73,6 +75,7 @@ from gajim.common.setting_values import WorkspaceSettings from gajim.common.storage.base import Encoder from gajim.common.storage.base import json_decoder +from gajim.common.types import ChatContactT SETTING_TYPE = bool | int | str | object @@ -388,6 +391,61 @@ def _migrate(self) -> None: self._settings['app'].pop('muclumbus_api_http_uri', None) self._set_user_version(5) + if version < 6: + # Migrate workspace chats to contact/group chat contact settings + for workspace_id, settings in self._settings['workspaces'].items(): + workspace_settings = cast( + OpenChatsSettingT, settings.get('chats', [])) + for chat in workspace_settings: + if chat['type'] in ('contact', 'pm'): + self.set_contact_setting( + chat['account'], + chat['jid'], + 'workspace', + workspace_id) + self.set_contact_setting( + chat['account'], + chat['jid'], + 'opened', + True) + if chat['pinned']: + self.set_contact_setting( + chat['account'], + chat['jid'], + 'pinned', + chat['pinned']) + if chat['position'] != -1: + self.set_contact_setting( + chat['account'], + chat['jid'], + 'position', + chat['position']) + elif chat['type'] == 'groupchat': + self.set_group_chat_setting( + chat['account'], + chat['jid'], + 'workspace', + workspace_id) + self.set_group_chat_setting( + chat['account'], + chat['jid'], + 'opened', + True) + if chat['pinned']: + self.set_group_chat_setting( + chat['account'], + chat['jid'], + 'pinned', + chat['pinned']) + if chat['position'] != -1: + self.set_group_chat_setting( + chat['account'], + chat['jid'], + 'position', + chat['position']) + + self._set_user_version(6) + def _migrate_old_config(self) -> None: if self._in_memory: return @@ -1022,6 +1080,14 @@ def get_contact_setting(self, ) -> bool: ... + @overload + def get_contact_setting(self, + account: str, + jid: JID, + setting: IntContactSettings + ) -> int: + ... + @overload def get_contact_setting(self, account: str, @@ -1062,6 +1128,14 @@ def set_contact_setting(self, value: str) -> None: ... + @overload + def set_contact_setting(self, + account: str, + jid: JID, + setting: IntContactSettings, + value: int) -> None: + ... + @overload def set_contact_setting(self, account: str, @@ -1122,6 +1196,19 @@ def set_contact_settings(self, for jid in acc_settings['contact']: self.set_contact_setting(account, jid, setting, value) + def iter_contact_settings(self, + account: str + ) -> Generator[ChatContactT, None, None]: + + client = app.get_client(account) + chats = self._account_settings[account]['contact'] + for address in chats: + yield client.get_module('Contacts').get_contact(address) + group_chats = self._account_settings[account]['group_chat'] + for address in group_chats: + yield client.get_module('Contacts').get_contact( + address, groupchat=True) + def set_soundevent_setting(self, event_name: str, setting: str, ===================================== gajim/gtk/chat_list.py ===================================== @@ -22,7 +22,6 @@ from gi.repository import Gdk from gi.repository import GLib -from gi.repository import GObject from gi.repository import Gtk from nbxmpp import JID @@ -47,13 +46,6 @@ class ChatList(Gtk.ListBox, EventHelper): - - __gsignals__ = { - 'chat-order-changed': (GObject.SignalFlags.RUN_LAST, - None, - ()), - } - def __init__(self, workspace_id: str) -> None: Gtk.ListBox.__init__(self) EventHelper.__init__(self) @@ -170,12 +162,20 @@ def mark_as_read(self, account: str, jid: JID) -> None: def toggle_chat_pinned(self, account: str, jid: JID) -> None: row = self._chats[(account, jid)] + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + if row.is_pinned: self._chat_order.remove(row) - row.position = -1 + contact.settings.set('pinned', False) + new_position = -1 else: self._chat_order.append(row) - row.position = self._chat_order.index(row) + contact.settings.set('pinned', True) + new_position = self._chat_order.index(row) + + row.position = new_position + contact.settings.set('position', new_position) row.toggle_pinned() self.invalidate_sort() @@ -287,7 +287,8 @@ def get_chat_list_rows(self) -> list[ChatListRow]: def remove_chat(self, account: str, jid: JID, - emit_unread: bool = True + emit_unread: bool = True, + store: bool = True ) -> None: row = self._chats.pop((account, jid)) @@ -295,6 +296,10 @@ def remove_chat(self, self._chat_order.remove(row) self.remove(row) row.destroy() + + if store: + app.settings.set_contact_setting(account, jid, 'opened', False) + if emit_unread: self._emit_unread_changed() @@ -302,7 +307,7 @@ def remove_chats_for_account(self, account: str) -> None: for row_account, jid in list(self._chats.keys()): if row_account != account: continue - self.remove_chat(account, jid) + self.remove_chat(account, jid, store=False) self._emit_unread_changed() def clear_chat_list_row(self, account: str, jid: JID) -> None: @@ -448,9 +453,10 @@ def _change_pinned_order(self, row_before: ChatListRow | None) -> None: row_before.position + offset, self._drag_row) for row in self._chat_order: - row.position = self._chat_order.index(row) + new_position = self._chat_order.index(row) + row.position = new_position + row.contact.settings.set('position', new_position) - self.emit('chat-order-changed') self._pinned_order_change = True self.invalidate_sort() self._pinned_order_change = False ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -147,7 +147,6 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: def add_chat_list(self, workspace_id: str) -> ChatList: chat_list = ChatList(workspace_id) chat_list.connect('row-selected', self._on_row_selected) - chat_list.connect('chat-order-changed', self._on_chat_order_changed) self._chat_lists[workspace_id] = chat_list self.add_named(chat_list, workspace_id) @@ -174,12 +173,6 @@ def _on_row_selected(self, self.emit('chat-selected', row.workspace_id, row.account, row.jid) - def _on_chat_order_changed(self, - chat_list: ChatList - ) -> None: - - self.store_open_chats(chat_list.workspace_id) - def show_chat_list(self, workspace_id: str) -> None: cur_workspace_id = self.get_visible_child_name() if cur_workspace_id != 'default' and cur_workspace_id is not None: @@ -209,17 +202,6 @@ def select_chat(self, account: str, jid: JID) -> None: self.show_chat_list(chat_list.workspace_id) chat_list.select_chat(account, jid) - def store_open_chats(self, workspace_id: str) -> None: - chat_list = self._chat_lists[workspace_id] - open_chats = chat_list.get_open_chats() - for chat in open_chats: - client = app.get_client(chat['account']) - contact = client.get_module('Contacts').get_contact(chat['jid']) - contact.settings.set('workspace', workspace_id) - - app.settings.set_workspace_setting( - workspace_id, 'chats', open_chats) - @structs.actionmethod def _toggle_chat_pinned(self, _action: Gio.SimpleAction, @@ -228,7 +210,6 @@ def _toggle_chat_pinned(self, chat_list = self._chat_lists[params.workspace_id] chat_list.toggle_chat_pinned(params.account, params.jid) - self.store_open_chats(params.workspace_id) @structs.actionmethod def _move_chat_to_workspace(self, @@ -245,13 +226,15 @@ def _move_chat_to_workspace(self, if type_ is None: return - source_chatlist.remove_chat(params.account, params.jid) + source_chatlist.remove_chat(params.account, params.jid, store=False) new_chatlist = self.get_chatlist(workspace_id) new_chatlist.add_chat(params.account, params.jid, type_, False, -1) - self.store_open_chats(source_chatlist.workspace_id) - self.store_open_chats(workspace_id) + client = app.get_client(params.account) + contact = client.get_module('Contacts').get_contact(params.jid) + contact.settings.set('workspace', workspace_id) + contact.settings.set('pinned', False) @structs.actionmethod def _mark_as_read(self, @@ -264,6 +247,7 @@ def _mark_as_read(self, def remove_chat(self, workspace_id: str, account: str, jid: JID) -> None: chat_list = self._chat_lists[workspace_id] type_ = chat_list.get_chat_type(account, jid) + client = app.get_client(account) def _leave(not_ask_again: bool) -> None: if not_ask_again: @@ -272,14 +256,14 @@ def _leave(not_ask_again: bool) -> None: def _remove() -> None: chat_list.remove_chat(account, jid, emit_unread=False) - self.store_open_chats(workspace_id) + contact = client.get_module('Contacts').get_contact(jid) + contact.settings.set('opened', False) self.emit('chat-removed', account, jid, type_) if type_ != 'groupchat' or not app.settings.get('confirm_close_muc'): _remove() return - client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid, groupchat=True) if contact.is_not_joined and client.state.is_available: @@ -300,9 +284,8 @@ def _remove() -> None: transient_for=app.window).show() def remove_chats_for_account(self, account: str) -> None: - for workspace_id, chat_list in self._chat_lists.items(): + for chat_list in self._chat_lists.values(): chat_list.remove_chats_for_account(account) - self.store_open_chats(workspace_id) def find_chat(self, account: str, jid: JID) -> ChatList | None: for chat_list in self._chat_lists.values(): ===================================== gajim/gtk/chat_page.py ===================================== @@ -264,27 +264,31 @@ def add_chat_for_workspace(self, if self._startup_finished: if select: self._chat_list_stack.select_chat(account, jid) - self._chat_list_stack.store_open_chats(workspace_id) + + contact = client.get_module('Contacts').get_contact(jid) + contact.settings.set('opened', True) + if message is not None: message_input = self._chat_stack.get_message_input() message_input.insert_text(message) def load_workspace_chats(self, workspace_id: str) -> None: - open_chats = app.settings.get_workspace_setting(workspace_id, - 'chats') - active_accounts = app.settings.get_active_accounts() - for open_chat in open_chats: - account = open_chat['account'] - if account not in active_accounts: - continue - - self.add_chat_for_workspace(workspace_id, - account, - open_chat['jid'], - open_chat['type'], - pinned=open_chat['pinned'], - position=open_chat['position']) + for account in active_accounts: + for contact in app.settings.iter_contact_settings(account): + if not contact.settings.get('workspace') == workspace_id: + continue + + if not contact.settings.get('opened'): + continue + + self.add_chat_for_workspace( + workspace_id, + account, + contact.jid, + contact.type_string, + pinned=contact.settings.get('pinned'), + position=contact.settings.get('position')) def is_chat_selected(self, account: str, jid: JID) -> bool: return self._chat_list_stack.is_chat_selected(account, jid) ===================================== gajim/gtk/main.py ===================================== @@ -238,6 +238,9 @@ def _on_account_enabled(self, event: events.AccountEnabled) -> None: client = app.get_client(event.account) client.connect_signal('state-changed', self._on_client_state_changed) + for workspace_id in app.settings.get_workspaces(): + self._chat_page.load_workspace_chats(workspace_id) + def _on_account_disabled(self, event: events.AccountDisabled) -> None: workspace_id = self._workspace_side_bar.get_first_workspace() self.activate_workspace(workspace_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/61101bf113dd14af4bcd187016dc2cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/61101bf113dd14af4bcd187016dc2cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][workspace-improvements] 124 commits: fix: Fix rendering of copied code blocks and quotes
by Daniel Brötzmann (＠wurstsalat) 02 Jun '23

02 Jun '23

Daniel Brötzmann pushed to branch workspace-improvements at gajim / gajim Commits: 60331ce5 by wurstsalat at 2023-05-05T23:13:58+02:00 fix: Fix rendering of copied code blocks and quotes Fixes #11499 - - - - - 8aa872b9 by wurstsalat at 2023-05-06T12:17:51+02:00 imprv: ChatList: Show indicator when joining group chat - - - - - 35b9ee28 by wurstsalat at 2023-05-06T21:21:59+02:00 imprv: ChatList: Show indicator if group chat is not connected - - - - - b13afcea by Philipp Hörist at 2023-05-06T21:39:01+02:00 refactor: OMEMO: Implement get_identity_infos() - Refactor KeyRow - - - - - 3a3ea83a by Philipp Hörist at 2023-05-06T23:44:36+02:00 refactor: OMEMO: Adapt to omemo-dr changes - - - - - 3c2c05f8 by wurstsalat at 2023-05-07T00:44:34+02:00 fix: XMLConsole: Select first account by default Fixes #11498 - - - - - ed697463 by Philipp Hörist at 2023-05-07T09:52:49+02:00 change: Enable spell checker by default - - - - - 4959e4db by Philipp Hörist at 2023-05-07T10:45:14+02:00 refactor: OMEMO: Change session import - - - - - 4489fffa by Philipp Hörist at 2023-05-07T10:45:48+02:00 refactor: OMEMO: Simplify deleting a session - - - - - 11e14286 by Philipp Hörist at 2023-05-07T10:48:45+02:00 refactor: OMEMO: Remove legacy code Code stems from a time where MAM archives did not communicate the real jid. - - - - - 3060641c by Philipp Hörist at 2023-05-07T10:54:43+02:00 refactor: OMEMO: Access set_trust() via SessionManager - - - - - 9719d42d by Philipp Hörist at 2023-05-07T11:12:38+02:00 refactor: OMEMO: Remove obsolete code - - - - - e55dcd4b by Philipp Hörist at 2023-05-07T12:35:28+02:00 refactor: OMEMO: Use get_identity_infos() in more places - - - - - 5aa9741e by Philipp Hörist at 2023-05-07T17:21:14+02:00 new: Attach omemo-dr logging to verbose mode - - - - - dcb304c5 by wurstsalat at 2023-05-07T21:00:57+02:00 cfix: ChatList: Use dim color for join icon - - - - - 3e1fa2e9 by Philipp Hörist at 2023-05-09T20:03:31+02:00 new: Client: Add convenience method for checking own JID - - - - - 0ecae706 by mjk at 2023-05-09T18:47:24+00:00 imprv: Notifications: Withdraw all when a corresponding chat is read Fixes #11030 - - - - - 4a68ce96 by Philipp Hörist at 2023-05-09T21:22:17+02:00 cfix: Fix own JID comparison - - - - - fa79e9be by Philipp Hörist at 2023-05-09T21:49:21+02:00 refactor: Chatstates: Simplify and use client attribute - - - - - eb0257bf by mjk at 2023-05-10T09:38:21+00:00 feat: JID sharing: Include verified OMEMO fingerprints - - - - - ef9479b9 by mjk at 2023-05-10T09:49:45+00:00 perf: QR codes: Avoid roundtrip to PNG in storage and back - - - - - c321a691 by Philipp Hörist at 2023-05-10T23:40:00+02:00 refactor: OMEMO: Adpat to changed API - - - - - 8694404e by Philipp Hörist at 2023-05-11T23:11:24+02:00 change: Remove "escape_key_closes" from ACE This setting is now available under Preferences -> Chat - - - - - 909bae91 by mjk at 2023-05-13T13:45:12+00:00 imprv: ACE: Make descriptions selectable and copyable - - - - - ff08ac13 by mjk at 2023-05-13T13:54:14+00:00 fix: ACE: Handle invalid numeric values gracefully - - - - - 63eb1041 by wurstsalat at 2023-05-13T22:33:58+02:00 imprv: Make contact details/settings available when offline - - - - - 1128a3db by Philipp Hörist at 2023-05-14T13:37:45+02:00 new: MAM: Add sync state signals - - - - - e205b303 by Philipp Hörist at 2023-05-14T11:38:57+00:00 imprv: ChatList: Improve sorting The sort of the chat list is inhibited when the mouse is over the chat list. This makes sure the sorting is invalidated once the mouse exits the chat list. - - - - - fa21ba4d by wurstsalat at 2023-05-14T14:42:34+00:00 new: Archive: Allow to create Archive in memory - - - - - 5784aa4a by wurstsalat at 2023-05-14T14:42:34+00:00 new: Tests: Add GUI test for ChatControl - - - - - 16618479 by wurstsalat at 2023-05-14T14:42:34+00:00 fix: ConversationView: Fix loading messages going forward from specific point Fixes #11201 - - - - - 3f8483c3 by Philipp Hörist at 2023-05-14T17:28:15+02:00 cfix: OMEMO: Remove JID from correct list after devicelist update - - - - - eeffaf9f by Philipp Hörist at 2023-05-14T21:21:48+02:00 new: Add lru cache decorate with ttl - - - - - bb78fa8b by Philipp Hörist at 2023-05-14T21:28:02+02:00 refactor: OMEMO: Simplify pre condition checks - Separate pre condition checks for group chats and single chats - Make more methods private - Use lru cache with ttl for device list and bundle queries - - - - - 49156380 by Philipp Hörist at 2023-05-14T21:35:09+02:00 refactor: OMEMO: Improve logging - - - - - 53f6e762 by Philipp Hörist at 2023-05-15T21:05:35+02:00 fix: Idle: Use default xa implemantation for XSS backend Fixes #11522 - - - - - 25500014 by Philipp Hörist at 2023-05-15T21:09:19+02:00 refactor: Idle: Remove unnecessary method override The base class has the same implementation - - - - - e145689e by Philipp Hörist at 2023-05-15T21:57:31+02:00 refactor: Idle: Make attributes private - - - - - 52d46908 by wurstsalat at 2023-05-18T00:33:50+02:00 imprv: GroupchatState: Show MAM sync - - - - - d88f7092 by Philipp Hörist at 2023-05-19T11:23:26+02:00 imprv: AboutDialog: Show libsoup version - - - - - cfddd3a1 by wurstsalat at 2023-05-19T19:11:06+02:00 fix: MessageWidget: Don't return truncated text for message actions Fixes #11526 - - - - - 2ecf8d46 by wurstsalat at 2023-05-19T19:33:37+02:00 fix: OMEMOTrustManager: Show correct JIDs for participant's keys Fixes #11530 - - - - - e3366360 by wurstsalat at 2023-05-19T22:11:18+02:00 fix: ChatActionProcessor: Allow to click items with mouse cursor Fixes #11445 - - - - - f2d22f6e by wurstsalat at 2023-05-19T23:50:53+02:00 fix: SearchView: Remove overlay Fixes #11412 - - - - - e1d063f2 by Philipp Hörist at 2023-05-20T20:13:13+02:00 refactor: Remove obsolete method - - - - - cf0c1981 by Philipp Hörist at 2023-05-20T20:13:13+02:00 refactor: Use helper methods to determine lib versions - - - - - c0c723e1 by Philipp Hörist at 2023-05-20T20:13:13+02:00 cfix: Add soup version to exception text - - - - - d1c80c84 by Philipp Hörist at 2023-05-20T20:39:26+02:00 new: OMEMO: Handle failed session build gracefully Fixes #11534 - - - - - 96bddaee by Philipp Hörist at 2023-05-20T21:57:25+02:00 new: Store logging records in memory - - - - - 2e6b9c5c by wurstsalat at 2023-05-21T11:35:55+02:00 cfix: Hide group chat roster when opening search bar - - - - - fc1a327f by wurstsalat at 2023-05-21T11:36:09+02:00 cfix: SearchView: Use correct padding for top edge - - - - - 0a922532 by wurstsalat at 2023-05-21T20:46:26+02:00 fix: SearchView: Don't change search context when switching chats - Simplify search context determination - Add fail-safe and improve GUI representation of context Fixes #11533 - - - - - 894938be by Philipp Hörist at 2023-05-21T22:14:47+02:00 new: Logging: Add callback for CustomStreamHandler - - - - - 2a338493 by Philipp Hörist at 2023-05-21T22:23:55+02:00 new: Logging: Add get_stream_handler() - - - - - e7aa6d3a by wurstsalat at 2023-05-21T22:24:55+02:00 imprv: XMLConsole: Always use dark theme - - - - - 5bab2f22 by wurstsalat at 2023-05-21T22:24:55+02:00 refactor: XMLConsole: Make attributes private - - - - - a7067ddb by wurstsalat at 2023-05-21T23:16:39+02:00 feat: XMLConsole: Add logging view - - - - - 25633186 by wurstsalat at 2023-05-21T23:42:54+02:00 cfix: CustomStreamHandler: Call super for emit() before working with LogRecords - - - - - e6241ffd by Philipp Hörist at 2023-05-21T23:49:19+02:00 other: Fix typo - - - - - 62ad4d8f by Philipp Hörist at 2023-05-21T23:50:54+02:00 cfix: XMLConsole: Unset callback on destroy - - - - - 54e1e89e by wurstsalat at 2023-05-21T23:56:57+02:00 cfix: XMLConsole: Fix typo in log formatting - - - - - a7c7b9d3 by wurstsalat at 2023-05-21T23:56:57+02:00 cfix: XMLConsole: Set filtering attributes correctly - - - - - 3bece8a3 by Philipp Hörist at 2023-05-22T00:24:30+02:00 refactor: Logging: Use separate handler for console log - - - - - 2b0e615e by wurstsalat at 2023-05-22T20:48:50+02:00 fix: AvatarSelector: Fix that images don't display after repeated loading - - - - - e0a207a9 by wurstsalat at 2023-05-22T20:49:55+02:00 fix: UI: Update avatar on muc-disco-update - - - - - 84fbaa87 by wurstsalat at 2023-05-22T21:41:45+02:00 imprv: ChatList: Clear row content when removing history Fixes #11420 - - - - - e73d1334 by wurstsalat at 2023-05-22T22:09:58+02:00 fix: Fix encryption deadlock with changed MUC configurations This disables encryption if MUC configuration changed and encryption is not applicable anymore Fixes #11421 - - - - - a7075aa0 by Philipp Hörist at 2023-05-22T22:44:39+02:00 other: Update .githooks - - - - - d896101a by Philipp Hörist at 2023-05-22T20:47:54+00:00 cfix: Revert: Update avatar on muc-disco-update - - - - - 8392372a by Philipp Hörist at 2023-05-23T00:34:23+02:00 refactor: Create contact cache per account - - - - - ae08c961 by mjk at 2023-05-23T19:06:31+00:00 fix: ChatActionProcessor: De-duplicate emojis - - - - - b8e51144 by wurstsalat at 2023-05-23T21:20:34+02:00 imprv: ChatBanner: Add share instructions - - - - - 688639bf by wurstsalat at 2023-05-23T21:40:29+02:00 cfix: ChatBanner: Fix text for contacts - - - - - 9807e28f by wurstsalat at 2023-05-23T22:15:10+02:00 fix: Exceptions: Fix sending reports via sentry in conjunction with proxy settings - - - - - 9f5633de by wurstsalat at 2023-05-23T23:45:16+02:00 imprv: Audio preview: Support more mime types - - - - - 037ddbdb by wurstsalat at 2023-05-25T11:43:16+02:00 fix: Message menu: Fix issue with chats not supplying correct ID - - - - - abff68be by Philipp Hörist at 2023-05-26T19:24:24+02:00 change: Raise nbxmpp version - - - - - 8e6188ce by Philipp Hörist at 2023-05-26T19:49:39+02:00 cfix: Raise omemo-dr version - - - - - 7e15ba0d by Philipp Hörist at 2023-05-26T19:57:44+02:00 ci: Adapt to release-helper changes - - - - - 4c7ddebc by Weblate at 2023-05-26T20:00:32+02:00 chore: Update translations - - - - - 30580132 by Philipp Hörist at 2023-05-26T20:11:35+02:00 chore: Update flatpak dependencies - - - - - 553be901 by Philipp Hörist at 2023-05-26T20:11:53+02:00 chore: Update IANA data - - - - - 8e8a78fb by wurstsalat at 2023-05-26T21:27:27+02:00 new: Return platform version details for Windows and MacOS when getting OS version - - - - - 89f316a8 by André Apitzsch at 2023-05-27T08:18:50+02:00 chore: Update flatpak dependencies - - - - - 732d381a by Philipp Hörist at 2023-05-27T09:41:05+02:00 fix: ContactInfo: Don’t fail when no vcard is set - - - - - a422f065 by André Apitzsch at 2023-05-27T11:11:55+02:00 fix: ProfileWindow: Don't fail when no vcard is set - - - - - 80d2f9f6 by Philipp Hörist at 2023-05-27T12:10:34+02:00 ci: Debian: Update control file - - - - - 754f9168 by Philipp Hörist at 2023-05-27T12:15:26+02:00 release: 1.8.0 - - - - - bd6c84ba by Philipp Hörist at 2023-05-27T13:58:45+02:00 other: Update git hook - - - - - 8986cb0c by Philipp Hörist at 2023-05-27T13:59:21+02:00 ci: Debian: Update control file - - - - - 17b9e7ac by Philipp Hörist at 2023-05-27T16:48:32+02:00 ci: Appveyor: Grab more commits on clone Otherwise we only can start builds for the last commit - - - - - 3baa6b33 by Philipp Hörist at 2023-05-27T17:28:13+02:00 refactor: Simplify launch.py - - - - - 4d3f632d by Philipp Hörist at 2023-05-27T17:31:59+02:00 cq: Use capitalized env var name - - - - - c5898f94 by Philipp Hörist at 2023-05-27T17:33:06+02:00 cq: Remove unnecessary list comprehension - - - - - 1de4921a by Philipp Hörist at 2023-05-27T23:03:47+02:00 cq: Ignore false positive ruff error - - - - - ffe5bdd0 by Philipp Hörist at 2023-05-27T23:03:47+02:00 refactor: JingleRTP: Don’t call external process for pipeline debug - - - - - b230d06a by Philipp Hörist at 2023-05-27T23:03:47+02:00 cq: Update ruff version - - - - - 04ea001d by Philipp Hörist at 2023-05-27T23:50:57+02:00 cq: Raise pyright version - - - - - 9a7f27ea by Philipp Hörist at 2023-05-27T23:51:37+02:00 cq: GajimPlugin: Add type annotation - - - - - dc0e2469 by Philipp Hörist at 2023-05-28T14:49:49+02:00 cq: Use union operator everywhere - - - - - 71f94434 by wurstsalat at 2023-05-28T16:16:55+02:00 fix: Windows themes: Don't fail hard when winsdk UISettings are not available Fixes #11542 - - - - - 9aaf4f9d by wurstsalat at 2023-05-28T16:40:58+02:00 imprv: Account page: Show our XMPP address - - - - - ca7e09da by wurstsalat at 2023-05-28T16:52:35+02:00 fix: Search: Restore group chat participants list to previous state when closing search Fixes #11536 - - - - - 317d1447 by wurstsalat at 2023-05-28T16:55:55+02:00 cfix: Account page: Enable copying for our XMPP address label - - - - - acf0c8f6 by wurstsalat at 2023-05-28T19:51:44+02:00 imprv: Preview: Add loading placeholder Fixes #11264 - - - - - 79f00321 by wurstsalat at 2023-05-28T19:56:17+02:00 cfix: Preview: Add back preview_box - - - - - ed674b8c by Philipp Hörist at 2023-05-28T21:12:04+02:00 cq: Simplify string formatting - - - - - fbb470b7 by Philipp Hörist at 2023-05-28T21:12:32+02:00 refactor: Add util methods for sha formatting - - - - - 173d6f78 by Philipp Hörist at 2023-05-28T21:16:52+02:00 refactor: SystemStyle: Move code into helper method - - - - - a4cacbfa by Philipp Hörist at 2023-05-28T21:19:39+02:00 cq: Avoid extraneous parentheses - - - - - 6e9eab11 by Philipp Hörist at 2023-05-28T21:21:11+02:00 cq: Import from collections.abc instead from typing - - - - - 5a9362fd by Philipp Hörist at 2023-05-28T21:23:36+02:00 cq: Use union operator in ininstance() calls - - - - - af4223a9 by Philipp Hörist at 2023-05-28T21:30:32+02:00 cq: Use f-string instead of `format` call - - - - - 9b44d769 by wurstsalat at 2023-05-28T22:39:27+02:00 cfix: Search: Restore group chat participants list to previous state when closing search via Escape Fixes #11536 - - - - - bbc6c55d by wurstsalat at 2023-05-29T00:37:27+02:00 fix: GroupchatManage: Improve checks for joined state Fixes #11231 - - - - - ae5ac2d3 by Philipp Hörist at 2023-05-29T11:43:30+02:00 refactor: Rename main application entry points - - - - - 32601f1c by Philipp Hörist at 2023-05-29T11:43:30+02:00 fix: Init plugin translation module later the plugins_i18n module needs to be imported after configpaths.init() has been called, otherwise the correct locale dir is not found - - - - - c45fbdd8 by Philipp Hörist at 2023-05-29T11:43:30+02:00 refactor: Allow to import i18n module without side effects - Add new method for translation - Remove stderr if translations are missing - - - - - 238ac329 by Philipp Hörist at 2023-05-29T12:31:45+02:00 cfix: I18n: Install NullTranslation on module init - - - - - 915a9f0f by wurstsalat at 2023-05-30T23:26:53+02:00 fix: Fix interaction of GroupchatRoster and SearchView Fixes #11546 - - - - - d639b32d by wurstsalat at 2023-06-02T14:35:54+02:00 fix: OMEMOTrustManager: React correctly to connection changes Fixes #11547 - - - - - a8aabbbd by wurstsalat at 2023-06-02T16:34:18+02:00 imprv: Store workspace when closing chat Fixes #11374 - - - - - f60df4af by wurstsalat at 2023-06-02T16:35:11+02:00 imprv: Restore chats when enabling account This moves settings formerly stored in workspace settings to contact's and group chat contact's settings respectively. New contact settings: 'opened', 'pinned', 'position' Fixes #10872 - - - - - 61101bf1 by wurstsalat at 2023-06-02T16:35:13+02:00 other: Add settings migration for workspace settings - - - - - 30 changed files: - .ci/appveyor.yml - .githooks/update - .gitlab-ci.yml - .pre-commit-config.yaml - CONTRIBUTING.md - ChangeLog - README.md - data/org.gajim.Gajim.appdata.xml.in - debian/control - debian/patches/remove-nbxmpp-from-deps.patch - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/app.py - gajim/common/application.py - gajim/common/call_manager.py - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/commands.py - gajim/common/configpaths.py - gajim/common/const.py - gajim/common/dbus/file_manager.py - gajim/common/dbus/location.py - gajim/common/dbus/logind.py - gajim/common/dbus/music_track.py - gajim/common/dbus/remote_control.py - gajim/common/dbus/system_style.py - gajim/common/events.py - gajim/common/file_props.py - gajim/common/filetransfer.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4c8a2f011098605c91943631a3f0265… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4c8a2f011098605c91943631a3f0265… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: OMEMOTrustManager: React correctly to connection changes
by Daniel Brötzmann (＠wurstsalat) 02 Jun '23

02 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d639b32d by wurstsalat at 2023-06-02T14:35:54+02:00 fix: OMEMOTrustManager: React correctly to connection changes Fixes #11547 - - - - - 1 changed file: - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -154,7 +154,7 @@ def _on_account_state(self, event: AccountConnected | AccountDisconnected ) -> None: - if not app.account_is_connected(self._account): + if event.account != self._account: return if isinstance(event, AccountConnected): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d639b32d8b9edc941373d05d26014f8b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d639b32d8b9edc941373d05d26014f8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix interaction of GroupchatRoster and SearchView
by Daniel Brötzmann (＠wurstsalat) 30 May '23

30 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 915a9f0f by wurstsalat at 2023-05-30T23:26:53+02:00 fix: Fix interaction of GroupchatRoster and SearchView Fixes #11546 - - - - - 1 changed file: - gajim/gtk/chat_page.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -153,7 +153,16 @@ def _on_chat_selected(self, self._chat_stack.show_chat(account, jid) - if self._search_revealer.get_reveal_child(): + if (not self._search_revealer.get_reveal_child() and + self._restore_occupants_list and + self._chat_control.contact.is_groupchat): + # GroupchatRoster was hidden by Search initially, but Search was + # afterwards closed in a 1:1 chat. Only restore GroupchatRoster if + # a group chat was selected. + app.settings.set('hide_groupchat_occupants_list', False) + self._restore_occupants_list = False + + if not app.settings.get('hide_groupchat_occupants_list'): self._search_view.set_context(account, jid) self.emit('chat-selected', workspace_id, account, jid) @@ -342,7 +351,11 @@ def hide_search(self) -> bool: if self._search_revealer.get_reveal_child(): self._search_revealer.set_reveal_child(False) - if self._restore_occupants_list: + if (self._restore_occupants_list and + self._chat_control.contact.is_groupchat): + # Restore GroupchatRoster only if a group chat is selected + # currently. If this condition isn' satisfied, it is checked + # again as soon as a chat is selected in _on_chat_selected. app.settings.set('hide_groupchat_occupants_list', False) self._restore_occupants_list = False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/915a9f0fbe638c994de29318bdc26f86… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/915a9f0fbe638c994de29318bdc26f86… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: I18n: Install NullTranslation on module init
by Philipp Hörist (＠lovetox) 29 May '23

29 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 238ac329 by Philipp Hörist at 2023-05-29T12:31:45+02:00 cfix: I18n: Install NullTranslation on module init - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -94,6 +94,8 @@ def __init__(self) -> None: self.translation = gettext.NullTranslations() self._default_lang = None + self.install() + def get_default_lang(self) -> str: assert self._default_lang is not None return self._default_lang View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/238ac3299a0c0b9b022df34ff0737ada… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/238ac3299a0c0b9b022df34ff0737ada… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: refactor: Rename main application entry points
by Philipp Hörist (＠lovetox) 29 May '23

29 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae5ac2d3 by Philipp Hörist at 2023-05-29T11:43:30+02:00 refactor: Rename main application entry points - - - - - 32601f1c by Philipp Hörist at 2023-05-29T11:43:30+02:00 fix: Init plugin translation module later the plugins_i18n module needs to be imported after configpaths.init() has been called, otherwise the correct locale dir is not found - - - - - c45fbdd8 by Philipp Hörist at 2023-05-29T11:43:30+02:00 refactor: Allow to import i18n module without side effects - Add new method for translation - Remove stderr if translations are missing - - - - - 9 changed files: - gajim/common/app.py - gajim/common/application.py - gajim/common/i18n.py - gajim/gtk/message_input.py - gajim/gajim.py → gajim/main.py - gajim/gajim_remote.py → gajim/remote.py - launch.py - pyproject.toml - win/misc/create-launcher.py Changes: ===================================== gajim/common/app.py ===================================== @@ -49,7 +49,7 @@ from gajim.common import ged as ged_module from gajim.common import types from gajim.common.const import Display -from gajim.common.i18n import LANG +from gajim.common.i18n import get_default_lang if typing.TYPE_CHECKING: from gajim.common.call_manager import CallManager @@ -294,7 +294,7 @@ def detect_dependencies() -> None: for dep, val in _dependencies.items(): log('gajim').info('%-13s %s', dep, val) - log('gajim').info('Used language: %s', LANG) + log('gajim').info('Used language: %s', get_default_lang()) def detect_desktop_env() -> str | None: ===================================== gajim/common/application.py ===================================== @@ -58,8 +58,6 @@ from gajim.common.storage.events import EventStorage from gajim.common.task_manager import TaskManager from gajim.common.util.http import create_http_request -from gajim.plugins.pluginmanager import PluginManager -from gajim.plugins.repository import PluginRepository class CoreApplication(ged.EventHelper): @@ -120,6 +118,9 @@ def _init_core(self) -> None: app.nicks[account] = app.settings.get_account_setting(account, 'name') + from gajim.plugins.pluginmanager import PluginManager + from gajim.plugins.repository import PluginRepository + app.plugin_manager = PluginManager() app.plugin_manager.init_plugins() app.plugin_repository = PluginRepository() ===================================== gajim/common/i18n.py ===================================== @@ -33,39 +33,23 @@ DOMAIN = 'gajim' -def get_win32_default_lang() -> str: - import ctypes - windll = ctypes.windll.kernel32 - return locale.windows_locale[windll.GetUserDefaultUILanguage()] - - -def get_darwin_default_lang() -> str: - from AppKit import NSLocale - - # FIXME: This returns a two letter language code (en, de, fr) - # We need a way to get en_US, de_DE etc. - return NSLocale.currentLocale().languageCode() +def init() -> None: + _trans.init() def get_default_lang() -> str: - if sys.platform == 'win32': - return get_win32_default_lang() - - if sys.platform == 'darwin': - return get_darwin_default_lang() - - return locale.getdefaultlocale()[0] or 'en' + return _trans.get_default_lang() def get_rfc5646_lang(lang: str | None = None) -> str: if lang is None: - lang = LANG + lang = _trans.get_default_lang() return lang.replace('_', '-') def get_short_lang_code(lang: str | None = None) -> str: if lang is None: - lang = LANG + lang = _trans.get_default_lang() return lang[:2] @@ -84,10 +68,6 @@ def is_rtl_text(text: str) -> bool: return False -def p_(context: str, message: str) -> str: - return _translation.pgettext(context, message) - - def ngettext(s_sing: str, s_plural: str, n: int, @@ -100,7 +80,7 @@ def ngettext(s_sing: str, In other words this is a hack to ngettext() to support %s %d etc.. ''' - text = _translation.ngettext(s_sing, s_plural, n) + text = _trans.translation.ngettext(s_sing, s_plural, n) if n == 1 and replace_sing is not None: return text % replace_sing @@ -109,29 +89,69 @@ def ngettext(s_sing: str, return text -try: - locale.setlocale(locale.LC_ALL, '') -except locale.Error as error: - print(error, file=sys.stderr) - -LANG = get_default_lang() -if sys.platform == 'win32': - # Set the env var on Windows because gettext.find() uses it to - # find the translation - # Use LANGUAGE instead of LANG, LANG sets LC_ALL and thus - # doesn't retain other region settings like LC_TIME - os.environ['LANGUAGE'] = LANG - - -package_dir = cast(Path, importlib.resources.files('gajim')) -locale_dir = package_dir / 'data' / 'locale' - -try: - _translation = gettext.translation(DOMAIN, locale_dir) - _ = _translation.gettext - if hasattr(locale, 'bindtextdomain'): - locale.bindtextdomain(DOMAIN, locale_dir) -except OSError: - _translation = gettext.NullTranslations() - _ = _translation.gettext - print('No translations found for', LANG, file=sys.stderr) +class Translation: + def __init__(self) -> None: + self.translation = gettext.NullTranslations() + self._default_lang = None + + def get_default_lang(self) -> str: + assert self._default_lang is not None + return self._default_lang + + @staticmethod + def _get_win32_default_lang() -> str: + import ctypes + windll = ctypes.windll.kernel32 + return locale.windows_locale[windll.GetUserDefaultUILanguage()] + + @staticmethod + def _get_darwin_default_lang() -> str: + from AppKit import NSLocale + + # FIXME: This returns a two letter language code (en, de, fr) + # We need a way to get en_US, de_DE etc. + return NSLocale.currentLocale().languageCode() + + def _get_default_lang(self) -> str: + if sys.platform == 'win32': + return self._get_win32_default_lang() + + if sys.platform == 'darwin': + return self._get_darwin_default_lang() + + return locale.getdefaultlocale()[0] or 'en' + + def init(self) -> None: + try: + locale.setlocale(locale.LC_ALL, '') + except locale.Error as error: + print(error, file=sys.stderr) + + self._default_lang = self._get_default_lang() + if sys.platform == 'win32': + # Set the env var on Windows because gettext.find() uses it to + # find the translation + # Use LANGUAGE instead of LANG, LANG sets LC_ALL and thus + # doesn't retain other region settings like LC_TIME + os.environ['LANGUAGE'] = self._default_lang + + package_dir = cast(Path, importlib.resources.files('gajim')) + locale_dir = package_dir / 'data' / 'locale' + + try: + self.translation = gettext.translation(DOMAIN, locale_dir) + if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, locale_dir) + except OSError: + pass + + self.install() + + def install(self) -> None: + global _, g_, p_ + _ = self.translation.gettext + g_ = self.translation.gettext + p_ = self.translation.pgettext + + +_trans = Translation() ===================================== gajim/gtk/message_input.py ===================================== @@ -34,7 +34,7 @@ from gajim.common.events import MessageSent from gajim.common.ged import EventHelper from gajim.common.i18n import _ -from gajim.common.i18n import LANG +from gajim.common.i18n import get_default_lang from gajim.common.styling import PlainBlock from gajim.common.styling import process from gajim.common.types import ChatContactT @@ -219,7 +219,7 @@ def _get_spell_checker_language(self, # use the default one lang = app.settings.get('speller_language') if not lang: - lang = LANG + lang = get_default_lang() assert isinstance(lang, str) lang = Gspell.language_lookup(lang) ===================================== gajim/gajim.py → gajim/main.py ===================================== @@ -95,6 +95,11 @@ def _check_required_deps() -> None: check_version('sqlite', sqlite3.sqlite_version, _MIN_SQLITE_VER) +def _init_translations() -> None: + import gajim.common.i18n + gajim.common.i18n.init() + + def _init_gui(gui: str) -> None: if gui == 'GTK': _init_gtk() @@ -154,7 +159,7 @@ def _set_proc_title() -> None: libc.setproctitle('gajim') -def main() -> None: +def run() -> None: if sys.platform != 'win32': if os.geteuid() == 0: sys.exit('You must not launch gajim as root, it is insecure.') @@ -162,5 +167,6 @@ def main() -> None: _check_required_deps() _set_proc_title() _set_env_vars() + _init_translations() _init_gui('GTK') _run_app() ===================================== gajim/gajim_remote.py → gajim/remote.py ===================================== @@ -133,7 +133,7 @@ def create_arg_parser() -> argparse.ArgumentParser: return parser -def main() -> None: +def run() -> None: args = create_arg_parser().parse_args() try: result = call_method(args) ===================================== launch.py ===================================== @@ -3,7 +3,7 @@ import subprocess import gajim -from gajim.gajim import main +import gajim.main try: res = subprocess.check_output( @@ -12,4 +12,4 @@ except Exception: pass -main() +gajim.main.run() ===================================== pyproject.toml ===================================== @@ -55,10 +55,10 @@ dev = [ ] [project.scripts] -gajim-remote = "gajim.gajim_remote:main" +gajim-remote = "gajim.remote:run" [project.gui-scripts] -gajim = "gajim.gajim:main" +gajim = "gajim.main:run" [tool.setuptools.packages.find] include = ["gajim*"] @@ -146,8 +146,8 @@ include = [ "gajim/common/styling.py", "gajim/common/task_manager.py", "gajim/common/util/*", - "gajim/gajim.py", - "gajim/gajim_remote.py", + "gajim/main.py", + "gajim/remote.py", "gajim/gtk/*", "gajim/plugins/*", "test/*", ===================================== win/misc/create-launcher.py ===================================== @@ -98,8 +98,8 @@ def get_launcher_code(*, debug: bool) -> str: "root_path = Path(sys.executable).parents[1];" "from ctypes import windll;" "windll.kernel32.SetDllDirectoryW(str(root_path / 'bin'));" - "from gajim import gajim;" - "gajim.main();"); + "import gajim.main;" + "gajim.main.run();"); Py_Finalize(); return result; } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bbc6c55d85362de5cbc2aab65680e95… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bbc6c55d85362de5cbc2aab65680e95… 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