Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] 2 commits: cq: Simplify string formatting
by Philipp Hörist (＠lovetox) 28 May '23

28 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 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 - - - - - 19 changed files: - gajim/common/jingle_session.py - gajim/common/modules/base.py - gajim/common/modules/omemo.py - gajim/common/preview_helpers.py - gajim/common/settings.py - gajim/common/structs.py - gajim/common/styling.py - gajim/common/util/text.py - gajim/gajim.py - gajim/gtk/accounts.py - gajim/gtk/application.py - gajim/gtk/certificate_dialog.py - gajim/gtk/css_config.py - gajim/gtk/discovery.py - gajim/gtk/exception.py - gajim/gtk/groupchat_join.py - gajim/gtk/omemo_trust_manager.py - gajim/gtk/util.py - pyproject.toml Changes: ===================================== gajim/common/jingle_session.py ===================================== @@ -731,8 +731,7 @@ def __broadcast(self, name = content['name'] creator = content['creator'] if (creator, name) not in self.contents: - text = 'Content %s (created by %s) does not exist' % (name, - creator) + text = f'Content {name} (created by {creator}) does not exist' self.__send_error(stanza, 'bad-request', text=text, @@ -753,7 +752,7 @@ def __on_session_terminate(self, if reason not in ('success', 'cancel', 'decline'): self.__dispatch_error(reason, text) if text: - text = '%s (%s)' % (reason, text) + text = f'{reason} ({text})' else: # TODO text = reason @@ -828,7 +827,7 @@ def __dispatch_error(self, type_: str | None = None ) -> None: if text: - text = '%s (%s)' % (error, text) + text = '{error} ({text})' if type_ != 'modify': self._raise_event('jingle-error-received', reason=text or error) @@ -877,7 +876,7 @@ def __send_error(self, text: str | None = None, type_: str | None = None ) -> None: - err_stanza = nbxmpp.Error(stanza, '%s %s' % (Namespace.STANZAS, error)) + err_stanza = nbxmpp.Error(stanza, f'{Namespace.STANZAS} {error}') err = err_stanza.getTag('error') if type_: err.setAttr('type', type_) ===================================== gajim/common/modules/base.py ===================================== @@ -65,9 +65,9 @@ def _set_logger(self, plugin: bool) -> LogAdapter: def __getattr__(self, key: str) -> Any: if key not in self._nbxmpp_methods: raise AttributeError( - "attribute '%s' is neither part of object '%s' " - " nor declared in '_nbxmpp_methods'" % ( - key, self.__class__.__name__)) + f'attribute "{key}" is neither part of object ' + f'"{self.__class__.__name__}" nor declared in ' + '"_nbxmpp_methods"') if not app.account_is_connected(self._account): self._log.warning('Account not connected, can’t use %s', key) ===================================== gajim/common/modules/omemo.py ===================================== @@ -317,7 +317,7 @@ def _encrypt_file_thread(transfer: HTTPFileTransfer, transfer.size = len(result.payload) fragment = binascii.hexlify(result.iv + result.key).decode() transfer.set_uri_transform_func( - lambda uri: 'aesgcm%s#%s' % (uri[5:], fragment)) + lambda uri: f'aesgcm{uri[5:]}#{fragment}') transfer.set_encrypted_data(result.payload) GLib.idle_add(callback, transfer) ===================================== gajim/common/preview_helpers.py ===================================== @@ -391,7 +391,7 @@ def fmt(f: float) -> str: slon = p_('positive longitude', '%sE') % fmt(lon) else: slon = p_('negative longitude', '%sW') % fmt(-lon) - return '%s %s' % (slat, slon) + return f'{slat} {slon}' def filename_from_uri(uri: str) -> str: ===================================== gajim/common/settings.py ===================================== @@ -92,18 +92,18 @@ settings TEXT ); - INSERT INTO settings(name, settings) VALUES ('app', '{}'); - INSERT INTO settings(name, settings) VALUES ('soundevents', '{}'); - INSERT INTO settings(name, settings) VALUES ('status_presets', '%s'); - INSERT INTO settings(name, settings) VALUES ('proxies', '%s'); - INSERT INTO settings(name, settings) VALUES ('plugins', '{}'); - INSERT INTO settings(name, settings) VALUES ('workspaces', '%s'); - - PRAGMA user_version=%s; - ''' % (json.dumps(STATUS_PRESET_EXAMPLES), - json.dumps(PROXY_EXAMPLES), - json.dumps(INITAL_WORKSPACE), - CURRENT_USER_VERSION) + INSERT INTO settings(name, settings) VALUES ('app', '{{}}'); + INSERT INTO settings(name, settings) VALUES ('soundevents', '{{}}'); + INSERT INTO settings(name, settings) VALUES ('status_presets', '{status}'); + INSERT INTO settings(name, settings) VALUES ('proxies', '{proxies}'); + INSERT INTO settings(name, settings) VALUES ('plugins', '{{}}'); + INSERT INTO settings(name, settings) VALUES ('workspaces', '{workspaces}'); + + PRAGMA user_version={version}; + '''.format(status=json.dumps(STATUS_PRESET_EXAMPLES), + proxies=json.dumps(PROXY_EXAMPLES), + workspaces=json.dumps(INITAL_WORKSPACE), + version=CURRENT_USER_VERSION) _SignalCallable = Callable[[Any, str, str | None, JID | None], Any] ===================================== gajim/common/structs.py ===================================== @@ -106,7 +106,7 @@ def __init__(self, ) -> None: if type_ not in ('chat', 'groupchat', 'normal', 'headline'): - raise ValueError('Unknown message type: %s' % type_) + raise ValueError(f'Unknown message type: {type_}') if not message and chatstate is None and marker is None: raise ValueError('Trying to send message without content') @@ -286,7 +286,7 @@ def _get_type_and_variant_string(self, if 'JID' in field_type: return JID, f'{variant_str}s' - raise ValueError('unknown type: %s' % field_type) + raise ValueError(f'unknown type: {field_type}') def to_variant(self) -> GLib.Variant: __types = {} @@ -299,8 +299,7 @@ def to_variant(self) -> GLib.Variant: continue if not isinstance(value, field_t): - raise ValueError('invalid type: %s is not a %s' % (value, - field_t)) + raise ValueError(f'invalid type: {value} is not a {field_t}') conversion_func = self._type_to_variant_funcs.get(field_t) if conversion_func is not None: @@ -322,6 +321,6 @@ def from_variant(cls: type[_T], variant: GLib.Variant) -> _T: value = vdict[field_name] conversion_func = cls._variant_to_type_funcs.get(value_t_name) if conversion_func is None: - raise ValueError('no conversion for: %s' % value_t_name) + raise ValueError(f'no conversion for: {value_t_name}') vdict[field_name] = conversion_func(value) return cls(**vdict) ===================================== gajim/common/styling.py ===================================== @@ -185,7 +185,7 @@ def find_byte_index(text: str, index: int): if index == index_: return byte_index - raise ValueError('index not in string: %s, %s' % (text, index)) + raise ValueError(f'index not in string: {text}, {index}') def process(text: str | bytes, level: int = 0) -> ParsingResult: ===================================== gajim/common/util/text.py ===================================== @@ -14,6 +14,8 @@ from __future__ import annotations +from typing import Literal + import re from gi.repository import GLib @@ -70,3 +72,18 @@ def format_duration(ns: float, total_ns: float) -> str: return (f'%0{width}d' % i_minutes) + f':{i_seconds:02d}' return f'0:{i_seconds:02d}' + + +def format_sha_bytes(algo: Literal['sha1', 'sha256'], sha_bytes: bytes) -> str: + if algo == 'sha1': + stop, step = 20, 10 + elif algo == 'sha256': + stop, step = 32, 8 + else: + raise ValueError(f'Unknown algo: {algo}') + + lines: list[str] = [] + hex_list = [f'{b:02X}' for b in sha_bytes] + for pos in range(0, stop, step): + lines.append(':'.join(hex_list[pos:pos + step])) + return '\n'.join(lines) ===================================== gajim/gajim.py ===================================== @@ -40,22 +40,22 @@ def check_version(dep_name: str, current_ver: str, min_ver: str) -> None: if V(current_ver) < V(min_ver): - sys.exit('Gajim needs %s >= %s (found %s) to run. ' - 'Quitting...' % (dep_name, min_ver, current_ver)) + sys.exit(f'Gajim needs {dep_name} >= {min_ver} ' + f'(found {current_ver}) to run. Quitting...') def _check_required_deps() -> None: - error_message = 'Gajim needs %s to run. Quitting… (Error: %s)' + error_message = 'Gajim needs {lib} to run. Quitting… (Error: {error})' try: import nbxmpp except ImportError as error: - sys.exit(error_message % ('python-nbxmpp', error)) + sys.exit(error_message.format('python-nbxmpp', error)) try: import gi except ImportError as error: - sys.exit(error_message % ('pygobject', error)) + sys.exit(error_message.format('pygobject', error)) try: gi.require_versions({'GLib': '2.0', @@ -66,17 +66,17 @@ def _check_required_deps() -> None: 'Pango': '1.0', 'PangoCairo': '1.0'}) except ValueError as error: - sys.exit('Missing dependency: %s' % error) + sys.exit(f'Missing dependency: {error}') try: import cairo except ImportError as error: - sys.exit(error_message % ('pycairo', error)) + sys.exit(error_message.format('pycairo', error)) from gi.repository import Gtk - gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), - Gtk.get_minor_version(), - Gtk.get_micro_version()) + gtk_ver = '.'.join(map(str, [Gtk.get_major_version(), + Gtk.get_minor_version(), + Gtk.get_micro_version()])) from gi.repository import GLib glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, ===================================== gajim/gtk/accounts.py ===================================== @@ -941,9 +941,9 @@ def __init__(self, account: str) -> None: btbv_label = Gtk.Label() btbv_label.set_xalign(0) - markup = '<a href="%s">%s</a>' % ( - 'https://dev.gajim.org/gajim/gajim/-/wikis/help/OMEMO', - _('Read more about blind trust')) + wiki_url = 'https://dev.gajim.org/gajim/gajim/-/wikis/help/OMEMO' + link_text = _('Read more about blind trust') + markup = f'<a href="{wiki_url}">{link_text}</a>' btbv_label.set_markup(markup) self.add(btbv_label) ===================================== gajim/gtk/application.py ===================================== @@ -372,7 +372,7 @@ def _handle_local_options(self, # Incorporate profile name into application id # to have a single app instance for each profile. profile = profile.get_string() - app_id = '%s.%s' % (self.get_application_id(), profile) + app_id = f'{self.get_application_id()}.{profile}' self.set_application_id(app_id) configpaths.set_profile(profile) ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -29,6 +29,7 @@ from gajim.common import app from gajim.common.helpers import get_x509_cert_from_gio_cert from gajim.common.i18n import _ +from gajim.common.util.text import format_sha_bytes from gajim.gtk.builder import get_builder @@ -109,13 +110,10 @@ def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: self._expires = cert.not_valid_after.strftime('%c %Z') sha1_bytes = cert.fingerprint(hashes.SHA1()) - sha1 = ':'.join(f'{b:02X}' for b in sha1_bytes) - self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) + self._sha1 = format_sha_bytes('sha1', sha1_bytes) sha256_bytes = cert.fingerprint(hashes.SHA256()) - sha256 = ':'.join(f'{b:02X}' for b in sha256_bytes) - self._sha256 = '%s\n%s\n%s\n%s' % ( - sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) + self._sha256 = format_sha_bytes('sha256', sha256_bytes) public_key = cert.public_key() self._pk_algorithm = '' ===================================== gajim/gtk/css_config.py ===================================== @@ -640,7 +640,7 @@ def refresh(self) -> None: for index, account in enumerate(accounts): color = app.settings.get_account_setting(account, 'account_color') css_class = f'gajim_class_{index}' - css += '.%s { background-color: %s }\n' % (css_class, color) + css += f'.{css_class} {{ background-color: {color} }}\n' self._dynamic_dict[account] = css_class self._dynamic_provider.load_from_data(css.encode()) ===================================== gajim/gtk/discovery.py ===================================== @@ -208,7 +208,7 @@ def get_agent_address(jid, node=None): Get an agent's address for displaying in the GUI ''' if node: - return '%s@%s' % (node, str(jid)) + return f'{node}@{str(jid)}' return str(jid) @@ -301,7 +301,7 @@ def get_icon(self, identities=None, addr=''): service_name = addr.split('.')[0] # Or load it - icon_name = 'gajim-agent-%s' % service_name + icon_name = f'gajim-agent-{service_name}' if icon_exists(icon_name): return icon_name return 'gajim-agent-jabber' @@ -1139,7 +1139,7 @@ def __init__(self, *args): def add_self_line(self): addr = get_agent_address(self.jid, self.node) - descr = '<b>%s</b>' % addr + descr = f'<b>{addr}</b>' # Guess which kind of service this is identities = [] type_ = app.get_transport_name_from_jid(self.jid, @@ -1541,9 +1541,9 @@ def _add_item(self, jid, node, parent_node, item, force): # Row text addr = get_agent_address(jid, node) if 'name' in item: - descr = '<b>%s</b>\n%s' % (item['name'], addr) + descr = f'<b>{item["name"]}</b>\n{addr}' else: - descr = '<b>%s</b>' % addr + descr = f'<b>{addr}</b>' # Guess which kind of service this is identities = [] type_ = app.get_transport_name_from_jid( @@ -1570,21 +1570,21 @@ def _add_item(self, jid, node, parent_node, item, force): def _update_item(self, iter_, jid, node, item): addr = get_agent_address(jid, node) if 'name' in item: - descr = '<b>%s</b>\n%s' % (item['name'], addr) + descr = f'<b>{item["name"]}</b>\n{addr}' else: - descr = '<b>%s</b>' % addr + descr = f'<b>{addr}</b>' self.model[iter_][3] = descr def _update_info(self, iter_, jid, node, identities, features, data): addr = get_agent_address(jid, node) if not identities: - descr = '<b>%s</b>' % addr + descr = '<b>{addr}</b>' else: name = identities[0].name or '' if name: - descr = '<b>%s</b>\n%s' % (name, addr) + descr = f'<b>{name}</b>\n{addr}' else: - descr = '<b>%s</b>' % addr + descr = f'<b>{addr}</b>' # Update progress self._progress += 1 ===================================== gajim/gtk/exception.py ===================================== @@ -190,13 +190,13 @@ def _request_sentry_endpoint(self) -> None: def _parse_endpoint(self, request: HTTPRequest) -> str: if not request.is_complete(): - raise ValueError('Failed to retrieve sentry endpoint: %s %s' % ( - request.get_status(), request.get_error())) + raise ValueError('Failed to retrieve sentry endpoint: ' + f'{request.get_status()} {request.get_error()}') try: data = json.loads(request.get_data()) except Exception as error: - raise ValueError('Json parsing error: %s' % error) + raise ValueError(f'Json parsing error: {error}') endpoint = data.get('sentry_endpoint') if endpoint is None: ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -142,7 +142,7 @@ def _set_error(self, error: StanzaError) -> None: if error.condition == 'gone': reason = error.get_text(get_rfc5646_lang()) if reason: - text = '%s:\n%s' % (text, reason) + text = f'{text}:\n{reason}' self._show_error_page(text) def _set_error_from_code(self, error_code: str) -> None: ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -355,7 +355,7 @@ def update(self) -> None: if not self._row.active: css_class = 'omemo-inactive-color' - tooltip = '%s - %s' % (_('Inactive'), tooltip) + tooltip = f'{_("Inactive")} - {tooltip}' image.get_style_context().add_class(css_class) self._css_class = css_class ===================================== gajim/gtk/util.py ===================================== @@ -323,7 +323,7 @@ def convert_rgba_to_hex(rgba: Gdk.RGBA) -> str: red = int(rgba.red * 255) green = int(rgba.green * 255) blue = int(rgba.blue * 255) - return '#%02x%02x%02x' % (red, green, blue) + return f'#{red:02x}{green:02x}{blue:02x}' def convert_rgb_to_hex(rgb_string: str) -> str: @@ -428,8 +428,7 @@ def format_location(location: LocationData) -> str: tag = LOCATION_DATA.get(attr) if tag is None: continue - location_string += '\n<b>%(tag)s</b>: %(text)s' % { - 'tag': tag.capitalize(), 'text': text} + location_string += f'\n<b>{tag.capitalize()}</b>: {text}' return location_string.strip() @@ -456,7 +455,7 @@ def format_fingerprint(fingerprint: str) -> str: wordsize = fplen // 8 buf = '' for char in range(0, fplen, wordsize): - buf += '{0} '.format(fingerprint[char:char + wordsize]) + buf += f'{fingerprint[char:char + wordsize]} ' buf = textwrap.fill(buf, width=36) return buf.rstrip().upper() @@ -670,8 +669,8 @@ def _to_href(match: Match[str]) -> str: url = match.group() if '://' not in url: url = 'https://' + url - return '<a href="%s"><span foreground="%s">%s</span></a>' % ( - url, color, match.group()) + return (f'<a href="{url}"><span foreground="{color}">' + f'{match.group()}</span></a>') return URL_REGEX.sub(_to_href, string) ===================================== pyproject.toml ===================================== @@ -233,8 +233,6 @@ ignore = [ "SIM201", # Use x instead of not x "SIM212", # Use `value if value else ''` instead of `'' if not value else value` "SIM300", # Yoda conditions are discouraged use x instead - "UP030", # Use implicit references for positional format fields - "UP031", # Use format specifiers instead of percent format "UP032", # Use f-string instead of `format` call "UP034", # Avoid extraneous parentheses "UP035", # Import from `collections.abc` instead: `Callable` View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/79f003214d7df869c53fcd1a05374d9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/79f003214d7df869c53fcd1a05374d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Preview: Add back preview_box
by Daniel Brötzmann (＠wurstsalat) 28 May '23

28 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 79f00321 by wurstsalat at 2023-05-28T19:56:17+02:00 cfix: Preview: Add back preview_box - - - - - 2 changed files: - gajim/data/gui/preview.ui - gajim/gtk/builder.pyi Changes: ===================================== gajim/data/gui/preview.ui ===================================== @@ -53,7 +53,7 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkBox" id="preview_box"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="spacing">12</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -702,6 +702,7 @@ class PreferencesBuilder(Builder): class PreviewBuilder(Builder): preview_stack: Gtk.Stack + preview_box: Gtk.Box icon_event_box: Gtk.EventBox icon_button: Gtk.Button right_box: Gtk.Box View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/79f003214d7df869c53fcd1a05374d97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/79f003214d7df869c53fcd1a05374d97… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preview: Add loading placeholder
by Daniel Brötzmann (＠wurstsalat) 28 May '23

28 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: acf0c8f6 by wurstsalat at 2023-05-28T19:51:44+02:00 imprv: Preview: Add loading placeholder Fixes #11264 - - - - - 4 changed files: - gajim/data/gui/preview.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/preview.py Changes: ===================================== gajim/data/gui/preview.ui ===================================== @@ -1,379 +1,436 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkBox" id="preview_box"> + <object class="GtkStack" id="preview_stack"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">12</property> + <property name="hhomogeneous">False</property> + <property name="vhomogeneous">False</property> + <property name="transition-duration">50</property> + <property name="transition-type">crossfade</property> <child> - <object class="GtkEventBox" id="icon_event_box"> + <object class="GtkBox"> + <property name="width-request">300</property> + <property name="height-request">200</property> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">start</property> - <signal name="realize" handler="_on_realize" swapped="no"/> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <property name="homogeneous">True</property> <child> - <object class="GtkButton" id="icon_button"> + <object class="GtkSpinner"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="relief">none</property> - <signal name="button-press-event" handler="_on_button_press_event" swapped="no"/> - <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> - <child> - <placeholder/> - </child> + <property name="can-focus">False</property> + <property name="valign">end</property> + <property name="active">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Loading Preview…</property> <style> - <class name="preview-image-button"/> + <class name="dim-label"/> </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="name">loading</property> </packing> </child> <child> - <object class="GtkBox" id="right_box"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">3</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="progress_box"> + <object class="GtkEventBox" id="icon_event_box"> + <property name="visible">True</property> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="spacing">12</property> + <property name="halign">start</property> + <signal name="realize" handler="_on_realize" swapped="no"/> <child> - <object class="GtkProgressBar" id="progressbar"> + <object class="GtkButton" id="icon_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="progress_text"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="width-chars">4</property> - <property name="single-line-mode">True</property> - <style> - <class name="dim-label"/> - <class name="small-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkEventBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">end</property> - <signal name="realize" handler="_on_realize" swapped="no"/> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="relief">none</property> + <signal name="button-press-event" handler="_on_button_press_event" swapped="no"/> + <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> <child> - <object class="GtkButton" id="cancel_download_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">Cancel Download</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_cancel_download_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">process-stop-symbolic</property> - </object> - </child> - <style> - <class name="border"/> - <class name="flat"/> - </style> - </object> + <placeholder/> </child> + <style> + <class name="preview-image-button"/> + </style> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">2</property> - </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="content_box"> + <object class="GtkBox" id="right_box"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">3</property> <child> - <object class="GtkEventBox"> - <property name="visible">True</property> + <object class="GtkBox" id="progress_box"> <property name="can-focus">False</property> - <property name="halign">center</property> - <signal name="realize" handler="_on_realize" swapped="no"/> + <property name="no-show-all">True</property> + <property name="spacing">12</property> <child> - <object class="GtkButton" id="image_button"> + <object class="GtkProgressBar" id="progressbar"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="relief">none</property> - <signal name="button-press-event" handler="_on_button_press_event" swapped="no"/> - <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> - <child> - <placeholder/> - </child> + <property name="can-focus">False</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="progress_text"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="width-chars">4</property> + <property name="single-line-mode">True</property> <style> - <class name="preview-image-button"/> + <class name="dim-label"/> + <class name="small-label"/> </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLinkButton" id="link_button"> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="no-show-all">True</property> - <property name="halign">start</property> - <property name="relief">none</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="button_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkEventBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">end</property> - <signal name="realize" handler="_on_realize" swapped="no"/> <child> - <object class="GtkButton" id="download_button"> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Download</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_download" swapped="no"/> + <object class="GtkEventBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">end</property> + <signal name="realize" handler="_on_realize" swapped="no"/> <child> - <object class="GtkImage"> + <object class="GtkButton" id="cancel_download_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">folder-download-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Cancel Download</property> + <property name="relief">none</property> + <signal name="clicked" handler="_on_cancel_download_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">process-stop-symbolic</property> + </object> + </child> + <style> + <class name="border"/> + <class name="flat"/> + </style> </object> </child> - <style> - <class name="border"/> - <class name="flat"/> - </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkEventBox"> + <object class="GtkBox" id="content_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">end</property> - <signal name="realize" handler="_on_realize" swapped="no"/> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="save_as_button"> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Save as...</property> - <signal name="clicked" handler="_on_save_as" swapped="no"/> + <object class="GtkEventBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <signal name="realize" handler="_on_realize" swapped="no"/> <child> - <object class="GtkImage"> + <object class="GtkButton" id="image_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-save-as-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="relief">none</property> + <signal name="button-press-event" handler="_on_button_press_event" swapped="no"/> + <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> + <child> + <placeholder/> + </child> + <style> + <class name="preview-image-button"/> + </style> </object> </child> - <style> - <class name="border"/> - <class name="flat"/> - </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEventBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">end</property> - <signal name="realize" handler="_on_realize" swapped="no"/> <child> - <object class="GtkButton" id="open_folder_button"> + <object class="GtkLinkButton" id="link_button"> <property name="can-focus">True</property> <property name="receives-default">False</property> <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Open folder</property> - <signal name="clicked" handler="_on_open_folder" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">folder-symbolic</property> - </object> - </child> - <style> - <class name="border"/> - <class name="flat"/> - </style> + <property name="halign">start</property> + <property name="relief">none</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkBox" id="button_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="file_name"> + <object class="GtkEventBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="max-width-chars">30</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - <class name="small-label"/> - </style> + <property name="can-focus">False</property> + <property name="valign">end</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="download_button"> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Download</property> + <property name="relief">none</property> + <signal name="clicked" handler="_on_download" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">folder-download-symbolic</property> + </object> + </child> + <style> + <class name="border"/> + <class name="flat"/> + </style> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="pack-type">end</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkLabel" id="file_size"> + <object class="GtkEventBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="selectable">True</property> - <property name="single-line-mode">True</property> - <property name="max-width-chars">30</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - <class name="small-label"/> - </style> + <property name="can-focus">False</property> + <property name="valign">end</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="save_as_button"> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Save as...</property> + <signal name="clicked" handler="_on_save_as" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-save-as-symbolic</property> + </object> + </child> + <style> + <class name="border"/> + <class name="flat"/> + </style> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="pack-type">end</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkLabel" id="info_message"> + <object class="GtkEventBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="max-width-chars">30</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - <class name="small-label"/> - </style> + <property name="can-focus">False</property> + <property name="valign">end</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="open_folder_button"> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Open folder</property> + <signal name="clicked" handler="_on_open_folder" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">folder-symbolic</property> + </object> + </child> + <style> + <class name="border"/> + <class name="flat"/> + </style> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="pack-type">end</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="file_name"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">30</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + <class name="small-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_size"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">30</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + <class name="small-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="info_message"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">30</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + <class name="small-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">4</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> + <property name="name">preview</property> <property name="position">1</property> </packing> </child> <style> - <class name="preview-box"/> + <class name="preview-stack"/> </style> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -644,7 +644,7 @@ .code-widget-header button { } /* PreviewWidget */ -.preview-box { +.preview-stack > box { border: 1px solid; border-color: @borders; border-radius: 4px; ===================================== gajim/gtk/builder.pyi ===================================== @@ -701,7 +701,7 @@ class PreferencesBuilder(Builder): class PreviewBuilder(Builder): - preview_box: Gtk.Box + preview_stack: Gtk.Stack icon_event_box: Gtk.EventBox icon_button: Gtk.Button right_box: Gtk.Box ===================================== gajim/gtk/preview.py ===================================== @@ -67,7 +67,7 @@ def __init__(self, account: str) -> None: self._ui = get_builder('preview.ui') self._ui.connect_signals(self) - self.add(self._ui.preview_box) + self.add(self._ui.preview_stack) leftclick_action = app.settings.get('preview_leftclick_action') self._ui.icon_button.set_tooltip_text( @@ -93,6 +93,7 @@ def get_text(self) -> str: @ensure_not_destroyed def update_progress(self, _preview: Preview, progress: float) -> None: + self._ui.preview_stack.set_visible_child_name('preview') self._ui.download_button.hide() self._ui.progress_box.show() @@ -105,6 +106,7 @@ def update_progress(self, _preview: Preview, progress: float) -> None: def update(self, preview: Preview, data: GdkPixbufType | None) -> None: self._preview = preview + self._ui.preview_stack.set_visible_child_name('preview') self._ui.progress_box.hide() self._ui.info_message.hide() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/acf0c8f692ce7c2185c1b053a6201c2e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/acf0c8f692ce7c2185c1b053a6201c2e… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
...
1764
Older →

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