Commits May 2023

commits@gajim.org

1 participants
125 discussions

[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

[Git][gajim/gajim][master] fix: GroupchatManage: Improve checks for joined state
by Daniel Brötzmann (＠wurstsalat) 28 May '23

28 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bbc6c55d by wurstsalat at 2023-05-29T00:37:27+02:00 fix: GroupchatManage: Improve checks for joined state Fixes #11231 - - - - - 1 changed file: - gajim/gtk/groupchat_manage.py Changes: ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -82,17 +82,18 @@ def _prepare_subject(self) -> None: text = self._contact.subject.text self._ui.subject_textview.get_buffer().set_text(text) - - joined = self._contact.is_joined - change_allowed = self._is_subject_change_allowed() - self._ui.subject_textview.set_sensitive(joined and change_allowed) + self._ui.subject_textview.set_sensitive( + self._is_subject_change_allowed()) def _is_subject_change_allowed(self) -> bool: - contact = self._contact.get_self() - if contact is None: + if not self._contact.is_joined: return False - if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): + self_contact = self._contact.get_self() + if self_contact is None: + return False + + if self_contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): return True if self.disco_info is None: @@ -131,8 +132,6 @@ def _on_room_subject(self, def _prepare_manage(self) -> None: joined = self._contact.is_joined vcard_support = False - self_contact = self._contact.get_self() - assert self_contact if self.disco_info is not None: vcard_support = self.disco_info.supports(Namespace.VCARD) @@ -141,12 +140,15 @@ def _prepare_manage(self) -> None: self._ui.muc_description_entry.set_text( self.disco_info.muc_description or '') - if (joined and vcard_support and - self_contact.affiliation.is_owner): - self._ui.avatar_select_button.show() - self.update_avatar() + self_contact = self._contact.get_self() + if not joined or self_contact is None: + return + + if vcard_support and self_contact.affiliation.is_owner: + self._ui.avatar_select_button.show() + if self_contact.affiliation.is_owner: self._client.get_module('MUC').request_config( self._contact.jid, callback=self._on_manage_form_received) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bbc6c55d85362de5cbc2aab65680e952… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bbc6c55d85362de5cbc2aab65680e952… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag 4.3.1
by Philipp Hörist (＠lovetox) 28 May '23

28 May '23

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

1 0

[Git][gajim/python-nbxmpp][master] release: 4.3.1
by Philipp Hörist (＠lovetox) 28 May '23

28 May '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: feb5cc66 by Philipp Hörist at 2023-05-28T23:18:18+02:00 release: 4.3.1 - - - - - 2 changed files: - ChangeLog - nbxmpp/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,10 @@ +nbxmpp 4.3.1 (28 May 2023) + + Bug Fixes + + * HTTP: Abort correctly on content overflow + * Websocket: Always set peer certificate + nbxmpp 4.3.0 (21 May 2023) New ===================================== nbxmpp/__init__.py ===================================== @@ -3,4 +3,4 @@ gi.require_version('Soup', '3.0') from .protocol import * # pylint: disable=wrong-import-position -__version__: str = '4.3.0' +__version__: str = '4.3.1' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/feb5cc66560bade7f1e3e2e6… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/feb5cc66560bade7f1e3e2e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Search: Restore group chat participants list to previous state when closing search via Escape
by Daniel Brötzmann (＠wurstsalat) 28 May '23

28 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 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 - - - - - 1 changed file: - gajim/gtk/chat_page.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -171,7 +171,8 @@ def _on_search_history(self, self._chat_control.contact.jid) if not app.settings.get('hide_groupchat_occupants_list'): - # Hide group chat roster in order to make some space horizontally + # Hide group chat roster in order to make some space horizontally. + # Store state to be able to restore it when hiding search. self._restore_occupants_list = True app.settings.set('hide_groupchat_occupants_list', True) @@ -179,11 +180,7 @@ def _on_search_history(self, self._search_view.set_focus() def _on_search_hide(self, *args: Any) -> None: - if self._restore_occupants_list: - app.settings.set('hide_groupchat_occupants_list', False) - self._restore_occupants_list = False - - self._search_revealer.set_reveal_child(False) + self.hide_search() def _on_chat_list_changed(self, chat_list_stack: ChatListStack, @@ -344,6 +341,11 @@ def get_control(self) -> ChatControl: def hide_search(self) -> bool: if self._search_revealer.get_reveal_child(): self._search_revealer.set_reveal_child(False) + + if self._restore_occupants_list: + app.settings.set('hide_groupchat_occupants_list', False) + self._restore_occupants_list = False + return True return False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9b44d7693f3b478b6ed5bffd680f588f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9b44d7693f3b478b6ed5bffd680f588f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] new: Tests: Add decorator to catch all exceptions
by Philipp Hörist (＠lovetox) 28 May '23

28 May '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 84f80b2a by Philipp Hörist at 2023-05-28T21:56:00+02:00 new: Tests: Add decorator to catch all exceptions - - - - - 2 changed files: - test/lib/util.py - test/unit/test_http.py Changes: ===================================== test/lib/util.py ===================================== @@ -1,3 +1,4 @@ +import sys import unittest from unittest.mock import Mock @@ -18,3 +19,29 @@ class StanzaHandlerTest(unittest.TestCase): self.dispatcher.reset_parser() self.dispatcher.process_data(STREAM_START) + + +def raise_all_exceptions(func): + # Exceptions which are raised from async callbacks + # in GLib or GTK do not bubble up to the unittest + # This decorator catches all exceptions and raises them + # after the unittest + def func_wrapper(self, *args, **kwargs): + + exceptions = [] + + def on_hook(type_, value, tback): + exceptions.append((type_, value, tback)) + + orig_excepthook = sys.excepthook + sys.excepthook = on_hook + try: + result = func(self) + finally: + sys.excepthook = orig_excepthook + if exceptions: + tp, value, tb = exceptions[0] + raise tp(value).with_traceback(tb) + + return result + return func_wrapper ===================================== test/unit/test_http.py ===================================== @@ -9,6 +9,7 @@ from gi.repository import Soup from nbxmpp.const import HTTPRequestError from nbxmpp.http import HTTPSession +from test.lib.util import raise_all_exceptions SMALL_FILE_URL = 'https://gajim.org/downloads/ci/unittest_small_file' # 200 KB @@ -236,6 +237,7 @@ class HTTP(unittest.TestCase): self.assertTrue(request4.is_finished()) self.assertTrue(request4.is_complete()) + @raise_all_exceptions def test_content_overflow(self): mainloop = GLib.MainLoop() @@ -243,7 +245,6 @@ class HTTP(unittest.TestCase): session = HTTPSession() request = session.create_request() - def _on_starting(req) -> None: req._received_size = 100000000000 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/84f80b2a1dcb664d58938027… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/84f80b2a1dcb664d58938027… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: cq: Avoid extraneous parentheses
by Philipp Hörist (＠lovetox) 28 May '23

28 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 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 - - - - - 30 changed files: - gajim/common/commands.py - gajim/common/configpaths.py - gajim/common/dbus/remote_control.py - gajim/common/dbus/system_style.py - gajim/common/events.py - gajim/common/file_props.py - gajim/common/ged.py - gajim/common/helpers.py - gajim/common/jingle_content.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/logging_helpers.py - gajim/common/modules/blocking.py - gajim/common/modules/caps.py - gajim/common/modules/contacts.py - gajim/common/modules/delimiter.py - gajim/common/modules/httpupload.py - gajim/common/modules/omemo.py - gajim/common/modules/ping.py - gajim/common/modules/pubsub.py - gajim/common/modules/roster.py - gajim/common/modules/security_labels.py - gajim/common/modules/user_avatar.py - gajim/common/modules/vcard_avatars.py - gajim/common/preview.py - gajim/common/preview_helpers.py - gajim/common/settings.py - gajim/common/storage/archive.py - gajim/common/storage/base.py - gajim/common/styling.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/173d6f78e903bda15daed08d40c535b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/173d6f78e903bda15daed08d40c535b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: SystemStyle: Move code into helper method
by Philipp Hörist (＠lovetox) 28 May '23

28 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 173d6f78 by Philipp Hörist at 2023-05-28T21:16:52+02:00 refactor: SystemStyle: Move code into helper method - - - - - 1 changed file: - gajim/common/winapi/system_style.py Changes: ===================================== gajim/common/winapi/system_style.py ===================================== @@ -16,6 +16,7 @@ from __future__ import annotations +from typing import Any from typing import Callable import logging @@ -37,25 +38,31 @@ def __init__(self, callback: Callable[..., None]) -> None: try: self._ui_settings = UISettings() - except OSError as err: - log.warning('winsdk UISettings not available:%s', err) + self._ui_settings.add_color_values_changed( + self._signal_color_values_changed) + self._prefer_dark = self._get_prefer_dark() + except Exception as error: + log.warning('Failed to init winsdk.UISettings: %s', error) return - self._ui_settings.add_color_values_changed( - self._signal_color_values_changed) + def _get_prefer_dark(self) -> bool: foreground_color = self._ui_settings.get_color_value( UIColorType.FOREGROUND) - self._prefer_dark = self._is_color_light(foreground_color) + return self._is_color_light(foreground_color) @staticmethod def _is_color_light(clr: Color) -> bool: return ((5 * clr.g) + (2 * clr.r) + clr.b) > (8 * 128) - def _signal_color_values_changed(self, ui_settings: UISettings, _) -> None: - foreground_color = ui_settings.get_color_value(UIColorType.FOREGROUND) - dark_theme = self._is_color_light(foreground_color) - if dark_theme != self._prefer_dark: - self._prefer_dark = dark_theme + def _signal_color_values_changed( + self, + _ui_settings: UISettings | None, + *args: Any + ) -> None: + + prefer_dark = self._get_prefer_dark() + if prefer_dark != self._prefer_dark: + self._prefer_dark = prefer_dark self._callback() app.ged.raise_event(StyleChanged()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/173d6f78e903bda15daed08d40c535b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/173d6f78e903bda15daed08d40c535b8… 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 May 2023