Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: chore: Add type annotation for emoji_data
by Daniel Brötzmann (＠wurstsalat) 11 Jun '22

11 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d8a7b278 by wurstsalat at 2022-06-11T17:03:00+02:00 chore: Add type annotation for emoji_data - - - - - e6393492 by wurstsalat at 2022-06-11T17:46:48+02:00 imprv: Gateways: Use avatar if published - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/gtk/emoji_data.pyi Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -361,7 +361,6 @@ def get_avatar(self, transport_icon = None if self.is_gateway: - show = None disco_info = app.storage.cache.get_last_disco_info(self._jid) if disco_info is not None: if disco_info.gateway_type == 'sms': @@ -374,6 +373,9 @@ def get_avatar(self, transport_icon = 'gajim-agent-sms' break + if self.avatar_sha is not None: + transport_icon = None + if pixbuf: return app.app.avatar_storage.get_pixbuf( self, ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -22,6 +22,7 @@ class Emoji(IntEnum): ... def is_emoji(codepoints: str) -> bool: ... +def get_emoji_font() -> str: ... def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ... class EmojiData(OrderedDict): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/901014263230f6a8042922fab65a94c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/901014263230f6a8042922fab65a94c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Workspaces: Fix image scaling
by Daniel Brötzmann (＠wurstsalat) 11 Jun '22

11 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 90101426 by wurstsalat at 2022-06-11T14:37:33+02:00 fix: Workspaces: Fix image scaling Fixes #10961 - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -127,9 +127,8 @@ def make_workspace_avatar(letter: str, style: str = 'round-corners') -> cairo.ImageSurface: surface = generate_avatar(letter, color, size, scale) - surface = clip(surface, style) surface.set_device_scale(scale, scale) - return surface + return clip(surface, style) def add_status_to_avatar(surface: cairo.ImageSurface, @@ -294,18 +293,21 @@ def clip_circle(surface: cairo.ImageSurface) -> cairo.ImageSurface: def round_corners(surface: cairo.ImageSurface) -> cairo.ImageSurface: - new_surface = cairo.ImageSurface(cairo.Format.ARGB32, - surface.get_width(), - surface.get_height()) + width = surface.get_width() + height = surface.get_height() + scale = surface.get_device_scale()[0] + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, + width, + height) new_surface.set_device_scale(*surface.get_device_scale()) context = cairo.Context(new_surface) context.set_source_surface(surface, 0, 0) - width = surface.get_width() - height = surface.get_height() - scale = surface.get_device_scale()[0] - radius = 9 * scale + width = width / scale + height = height / scale + + radius = 9 degrees = pi / 180 context.new_sub_path() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/901014263230f6a8042922fab65a94c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/901014263230f6a8042922fab65a94c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AvatarSelector: Add fail-safes for loading images
by Daniel Brötzmann (＠wurstsalat) 11 Jun '22

11 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9bc3ef10 by wurstsalat at 2022-06-11T13:32:13+02:00 fix: AvatarSelector: Add fail-safes for loading images Fixes #10965 - - - - - 3 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/workspace_dialog.py - pyrightconfig.json Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -16,6 +16,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any +from typing import cast from typing import Optional import os @@ -34,6 +35,7 @@ from gajim.common.i18n import _ from gajim.common.helpers import get_file_path_from_dnd_dropped_uri +from .dialogs import ErrorDialog from .filechoosers import AvatarChooserDialog from .util import scale_with_ratio @@ -107,6 +109,11 @@ def __init__(self) -> None: def _on_destroy(self, *args: Any) -> None: app.check_finalize(self) + def reset(self) -> None: + self._load_button.show() + self._helper_label.show() + self._crop_area.hide() + def prepare_crop_area(self, path: str) -> None: pixbuf = self._get_pixbuf_from_path(path) if pixbuf is None: @@ -165,9 +172,10 @@ def _scale_for_publish(pixbuf: GdkPixbuf.Pixbuf if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: # Scale only down, never up width, height = scale_with_ratio(AvatarSize.PUBLISH, width, height) - pixbuf = pixbuf.scale_simple(width, - height, - GdkPixbuf.InterpType.BILINEAR) + scaled_pixbuf = pixbuf.scale_simple( + width, height, GdkPixbuf.InterpType.BILINEAR) + assert scaled_pixbuf is not None + return scaled_pixbuf, width, height return pixbuf, width, height def get_avatar_surface(self) -> Optional[tuple[cairo.Surface, int, int]]: @@ -238,14 +246,16 @@ def set_contstrain_aspect(self, constrain: bool) -> None: else: self._aspect = -1 - def set_pixbuf(self, pixbuf: GdkPixbuf.Pixbuf) -> None: - if pixbuf: - self._browse_pixbuf = pixbuf - width = pixbuf.get_width() - height = pixbuf.get_height() - else: - width = 0 - height = 0 + def set_pixbuf(self, pixbuf: Optional[GdkPixbuf.Pixbuf]) -> None: + if pixbuf is None: + self._browse_pixbuf = None + avatar_selector = cast(AvatarSelector, self.get_parent()) + avatar_selector.reset() + return + + self._browse_pixbuf = pixbuf + width = pixbuf.get_width() + height = pixbuf.get_height() self._crop.width = 2 * self._base_width self._crop.height = 2 * self._base_height @@ -281,7 +291,12 @@ def _on_draw(self, _widget: Gtk.Widget, context: cairo.Context) -> bool: self._update_pixbufs() - assert self._pixbuf + if self._pixbuf is None: + ErrorDialog(_('Error Loading Image'), + _('Selected image could not be loaded.')) + self.set_pixbuf(None) + return False + width = self._pixbuf.get_width() height = self._pixbuf.get_height() crop = self._crop_to_widget() @@ -289,6 +304,7 @@ def _on_draw(self, _widget: Gtk.Widget, context: cairo.Context) -> bool: ix = self._image.x iy = self._image.y + assert self._color_shifted_pixbuf is not None Gdk.cairo_set_source_pixbuf( context, self._color_shifted_pixbuf, ix, iy) context.rectangle( @@ -604,9 +620,13 @@ def _update_pixbufs(self) -> None: dest_width = int(width * scale) dest_height = int(height * scale) + if dest_width == 0 or dest_height == 0: + log.warning('Image width or height is zero') + return + if (self._pixbuf is None or - self._pixbuf.get_width != allocation.width or - self._pixbuf.get_height != allocation.height): + self._pixbuf.get_width() != allocation.width or + self._pixbuf.get_height() != allocation.height): self._pixbuf = GdkPixbuf.Pixbuf.new( GdkPixbuf.Colorspace.RGB, @@ -614,6 +634,7 @@ def _update_pixbufs(self) -> None: 8, dest_width, dest_height) + if self._pixbuf is None: return @@ -770,5 +791,6 @@ def _generate_color_shifted_pixbuf(self) -> None: context.paint() surface = context.get_target() + assert isinstance(surface, cairo.ImageSurface) self._color_shifted_pixbuf = Gdk.pixbuf_get_from_surface( surface, 0, 0, surface.get_width(), surface.get_height()) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -134,6 +134,7 @@ def _on_image_switch_toggled(self, switch: Gtk.Switch, *args: Any) -> None: else: self._ui.style_stack.set_visible_child_name('color') self._avatar_sha = None + self._avatar_selector.reset() self._update_avatar() def _update_avatar(self) -> None: ===================================== pyrightconfig.json ===================================== @@ -50,6 +50,7 @@ "gajim/gtk/app_side_bar.py", "gajim/gtk/application.py", "gajim/gtk/apply_button_box.py", + "gajim/gtk/avatar_selector.py", "gajim/gtk/blocking.py", "gajim/gtk/bookmarks.py", "gajim/gtk/builder.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9bc3ef100a5c4b334f4833d9536c7695… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9bc3ef100a5c4b334f4833d9536c7695… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Add new profiling command line switch
by Philipp Hörist (＠lovetox) 11 Jun '22

11 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 47c04155 by lovetox at 2022-06-11T11:59:53+02:00 feat: Add new profiling command line switch Usage: gajim --cprofile > stats.txt - - - - - 2 changed files: - gajim/common/application.py - gajim/gtk/application.py Changes: ===================================== gajim/common/application.py ===================================== @@ -22,6 +22,9 @@ import sys import json import logging +import cProfile +import pstats +from pstats import SortKey from datetime import datetime from packaging.version import Version as V @@ -46,6 +49,9 @@ class CoreApplication: + def __init__(self) -> None: + self._profiling_session = None + def _init_core(self) -> None: # Create and initialize Application Paths & Databases app.app = self @@ -88,6 +94,21 @@ def _init_core(self) -> None: def _log(self) -> logging.Logger: return app.log('gajim.application') + def start_profiling(self) -> None: + self._log.info('Start profiling') + self._profiling_session = cProfile.Profile() + self._profiling_session.enable() + + def end_profiling(self) -> None: + if self._profiling_session is None: + return + + self._profiling_session.disable() + self._log.info('End profiling') + ps = pstats.Stats(self._profiling_session) + ps = ps.sort_stats(SortKey.CUMULATIVE) + ps.print_stats() + def start_shutdown(self, *args: Any, **kwargs: Any) -> None: app.app.systray.shutdown() @@ -119,6 +140,7 @@ def _shutdown_core(self) -> None: app.storage.archive.cleanup_chat_history() app.storage.cache.shutdown() app.storage.archive.shutdown() + self.end_profiling() def _quit_app(self) -> None: self._shutdown_core() ===================================== gajim/gtk/application.py ===================================== @@ -96,6 +96,7 @@ class GajimApplication(Gtk.Application, CoreApplication): '''Main class handling activation and command line.''' def __init__(self): + CoreApplication.__init__(self) flags = (Gio.ApplicationFlags.HANDLES_COMMAND_LINE | Gio.ApplicationFlags.CAN_OVERRIDE_APP_ID) Gtk.Application.__init__(self, @@ -180,6 +181,13 @@ def __init__(self): _('Sets an environment variable so ' 'GLib debug messages are printed')) + self.add_main_option( + 'cprofile', + 0, + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Profile application with cprofile')) + self.add_main_option( 'start-chat', 0, GLib.OptionFlags.NONE, @@ -356,6 +364,9 @@ def _handle_local_options(self, print(gajim.__version__) return 0 + if options.contains('cprofile'): + self.start_profiling() + profile = options.lookup_value('profile') if profile is not None: # Incorporate profile name into application id View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47c04155978951df5972fccd0952d7a6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47c04155978951df5972fccd0952d7a6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Use newest pyright version
by Philipp Hörist (＠lovetox) 08 Jun '22

08 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9e04b522 by lovetox at 2022-06-08T23:44:28+02:00 ci: Use newest pyright version - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -27,7 +27,7 @@ test-pyright: script: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - pip3 install git+https://github.com/pygobject/pygobject-stubs.git - - npm install pyright(a)1.1.249 + - npm install pyright - python3 .ci/link-gtk.py - $(npm bin)/pyright --version - $(npm bin)/pyright View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9e04b5223adee02fee496e126100bd86… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9e04b5223adee02fee496e126100bd86… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: imprv: Main: Add methods to get current window state
by Philipp Hörist (＠lovetox) 08 Jun '22

08 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a173c4f by lovetox at 2022-06-08T22:01:19+02:00 imprv: Main: Add methods to get current window state - - - - - 3d99f93b by lovetox at 2022-06-08T22:01:19+02:00 fix: Hide instead of minimize when `Show on Startup` is used - - - - - b7516ac8 by lovetox at 2022-06-08T22:01:19+02:00 imprv: Main: Separate minimize/hide - Rename setting - Add hide()/show() - Move Minimize to Tray code to window-delete event - - - - - 4 changed files: - gajim/common/setting_values.py - gajim/gtk/main.py - gajim/gtk/status_icon.py - gajim/gtk/util.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -66,7 +66,7 @@ class _ACCOUNT_DEFAULT: 'hide_groupchat_banner', 'hide_groupchat_occupants_list', 'ignore_incoming_attention', - 'last_main_window_visible', + 'is_window_visible', 'log_contact_status_changes', 'minimize_on_window_delete', 'minimize_to_tray', @@ -227,7 +227,7 @@ class _ACCOUNT_DEFAULT: 'hide_groupchat_occupants_list': False, 'ignore_incoming_attention': False, 'key_up_lines': 25, - 'last_main_window_visible': True, + 'is_window_visible': True, 'last_save_dir': '', 'last_send_dir': '', 'last_sounds_dir': '', ===================================== gajim/gtk/main.py ===================================== @@ -33,6 +33,7 @@ from gajim.common import ged from gajim.common.client import Client from gajim.common.const import Direction +from gajim.common.const import Display from gajim.common.const import SimpleClientState from gajim.common.ged import EventHelper from gajim.common.helpers import ask_for_status_message @@ -53,8 +54,6 @@ from .types import ControlT from .builder import get_builder from .util import get_app_window -from .util import is_minimized -from .util import is_minimize_event from .util import get_key_theme from .util import resize_window from .util import restore_main_window_position @@ -156,11 +155,32 @@ def __init__(self) -> None: client.connect_signal('state-changed', self._on_client_state_changed) + def is_minimized(self) -> bool: + if app.is_display(Display.WAYLAND): + # There is no way to discover if a window is minimized on wayland + return False + + window = self.get_window() + assert window is not None + return bool(Gdk.WindowState.ICONIFIED & window.get_state()) + + def is_withdrawn(self) -> bool: + window = self.get_window() + assert window is not None + return bool(Gdk.WindowState.WITHDRAWN & window.get_state()) + + def hide(self) -> None: + save_main_window_position() + Gtk.ApplicationWindow.hide(self) + + def show(self) -> None: + restore_main_window_position() + self.present_with_time(Gtk.get_current_event_time()) + def minimize(self) -> None: self.iconify() def unminimize(self) -> None: - restore_main_window_position() self.deiconify() self.present_with_time(Gtk.get_current_event_time()) @@ -171,15 +191,15 @@ def _prepare_window(self) -> None: self.set_skip_taskbar_hint(not app.settings.get('show_in_taskbar')) + self.show_all() + show_main_window = app.settings.get('show_main_window_on_startup') if show_main_window == 'never': - self.minimize() + self.hide() elif (show_main_window == 'last_state' and - not app.settings.get('last_main_window_visible')): - self.minimize() - - self.show_all() + not app.settings.get('is_window_visible')): + self.hide() def _on_account_enabled(self, event: events.AccountEnabled) -> None: self._account_side_bar.add_account(event.account) @@ -404,7 +424,10 @@ def _on_window_delete(self, ) -> int: if app.settings.get('minimize_on_window_delete'): - self.minimize() + if app.settings.get('minimize_to_tray'): + self.hide() + else: + self.minimize() return Gdk.EVENT_STOP if not app.settings.get('confirm_on_window_delete'): @@ -441,13 +464,7 @@ def _on_window_state_changed(self, log.debug('Window state changed: ICONIFIED: %s, WITHDRAWN: %s', is_iconified, is_withdrawn) - app.settings.set('last_main_window_visible', - not is_minimized(event)) - - if is_minimize_event(event) and app.settings.get('minimize_to_tray'): - save_main_window_position() - log.debug('Minimize to tray') - self.hide() + app.settings.set('is_window_visible', not is_withdrawn) def _set_startup_finished(self) -> None: self._startup_finished = True ===================================== gajim/gtk/status_icon.py ===================================== @@ -189,10 +189,12 @@ def _on_toggle_window(self, _widget: Gtk.MenuItem) -> None: self._on_activate() def _on_activate(self, *args: Any) -> None: - if app.settings.get('last_main_window_visible'): - app.window.hide() - else: + if app.window.is_minimized(): app.window.unminimize() + if app.window.is_withdrawn(): + app.window.show() + else: + app.window.hide() @staticmethod def _on_preferences(_widget: Gtk.MenuItem) -> None: ===================================== gajim/gtk/util.py ===================================== @@ -773,17 +773,6 @@ def get_gtk_version() -> str: return gtk_ver -def is_minimize_event(event: Gdk.EventWindowState) -> bool: - if Gdk.WindowState.ICONIFIED & event.changed_mask: - return bool(Gdk.WindowState.ICONIFIED & event.new_window_state) - return False - - -def is_minimized(event: Gdk.EventWindowState) -> bool: - minimized_states = Gdk.WindowState.ICONIFIED | Gdk.WindowState.WITHDRAWN - return bool(minimized_states & event.new_window_state) - - class EventHelper(CommonEventHelper): def __init__(self): CommonEventHelper.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f4e7a75b3749ed49994b922f0ede073… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f4e7a75b3749ed49994b922f0ede073… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Status messages: Check for correct setting
by Daniel Brötzmann (＠wurstsalat) 08 Jun '22

08 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4e76819e by wurstsalat at 2022-06-08T18:15:49+02:00 fix: Status messages: Check for correct setting Fixes #10953 - - - - - f4e7a75b by wurstsalat at 2022-06-08T18:16:22+02:00 fix: MucJoinLeft: Align timestamp correctly - - - - - 3 changed files: - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -846,11 +846,13 @@ def _on_user_nickname_changed(self, self.add_info_message(message) def _on_user_status_show_changed(self, - _contact: GroupchatContact, + contact: GroupchatContact, _signal_name: str, user_contact: GroupchatParticipant, properties: MessageProperties ) -> None: + if not contact.settings.get('print_status'): + return self.conversation_view.add_user_status(user_contact.name, user_contact.show.value, ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -61,7 +61,7 @@ def __init__(self, type_: str, account: str, nick: str, timestamp_widget = self.create_timestamp_widget(self.timestamp) timestamp_widget.set_halign(Gtk.Align.START) - timestamp_widget.set_valign(Gtk.Align.END) + timestamp_widget.set_valign(Gtk.Align.FILL) self.grid.attach(timestamp_widget, 3, 0, 1, 1) self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -201,8 +201,6 @@ def add_muc_user_joined(self, nick: str) -> None: self._insert_message(join_left) def add_user_status(self, name: str, show: str, status: str) -> None: - if not self._contact.settings.get('print_status'): - return user_status = UserStatus(self._account, name, show, status) self._insert_message(user_status) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d6f67e1440b5fde22abe058ae47d3fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d6f67e1440b5fde22abe058ae47d3fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: StatusIcon: Hide instead of minimize
by Philipp Hörist (＠lovetox) 08 Jun '22

08 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d6f67e14 by lovetox at 2022-06-08T17:11:29+02:00 fix: StatusIcon: Hide instead of minimize - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -190,7 +190,7 @@ def _on_toggle_window(self, _widget: Gtk.MenuItem) -> None: def _on_activate(self, *args: Any) -> None: if app.settings.get('last_main_window_visible'): - app.window.minimize() + app.window.hide() else: app.window.unminimize() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d6f67e1440b5fde22abe058ae47d3fa6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d6f67e1440b5fde22abe058ae47d3fa6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: fix: MessageInputTextView: Don’t remove tags for spell checking
by Daniel Brötzmann (＠wurstsalat) 07 Jun '22

07 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 27989487 by wurstsalat at 2022-06-07T23:31:07+02:00 fix: MessageInputTextView: Don’t remove tags for spell checking Fixes #10955 - - - - - 95bd55cd by wurstsalat at 2022-06-07T23:31:07+02:00 chore: Update pyrightconfig - - - - - cadc09dd by wurstsalat at 2022-06-07T23:31:07+02:00 imprv: Preview: Improve layout and display errors Fixes #10958, #10949, #10943 - - - - - 75b83369 by wurstsalat at 2022-06-07T23:31:07+02:00 imprv: Group chats: Ask for confirmation before leaving Fixes #10908 - - - - - d3d342ca by wurstsalat at 2022-06-07T23:31:07+02:00 chore: Control: Remove obsolete methods - - - - - 4daa0f12 by wurstsalat at 2022-06-07T23:31:07+02:00 perf: Limit message size for styling Fixes #10828 - - - - - bd06bca4 by wurstsalat at 2022-06-07T23:34:36+02:00 chore: Settings: Add missing comma - - - - - 12 changed files: - gajim/common/preview.py - gajim/common/setting_values.py - gajim/data/gui/preview.ui - gajim/gtk/builder.pyi - gajim/gtk/chat_list_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/message_input.py - gajim/gtk/preview.py - pyrightconfig.json Changes: ===================================== gajim/common/preview.py ===================================== @@ -33,6 +33,7 @@ from gajim.common.helpers import write_file_async from gajim.common.helpers import get_tls_error_phrase from gajim.common.helpers import get_account_proxy +from gajim.common.i18n import _ from gajim.common.preview_helpers import aes_decrypt from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import parse_fragment @@ -78,6 +79,8 @@ def __init__(self, self.file_size: int = 0 self._received_size: int = 0 + self.info_message: Optional[str] = None + self._soup_message: Optional[Soup.Message] = None self.key: Optional[bytes] = None @@ -151,6 +154,9 @@ def create_thumbnail(self, data: bytes) -> bool: return False return True + def reset_received_size(self) -> None: + self._received_size = 0 + def update_widget(self, data: Optional[GdkPixbufType] = None) -> None: self._widget.update(self, data) @@ -395,7 +401,8 @@ def _check_certificate(self, log.warning('TLS verification failed: %s', phrase) session = self._get_session(preview.account) session.cancel_message(message, Soup.Status.CANCELLED) - return + preview.info_message = _('TLS verification failed: %s') % phrase + preview.update_widget() def _on_content_sniffed(self, message: Soup.Message, @@ -425,6 +432,8 @@ def _on_content_sniffed(self, file_size, uri) if not force: session.cancel_message(message, Soup.Status.CANCELLED) + preview.info_message = _('Automatic preview disabled ' + '(file too big)') preview.update_widget() @@ -441,7 +450,12 @@ def _on_finished(self, preview: Preview) -> None: if message.status_code != Soup.Status.OK: log.warning('Download failed: %s', preview.request_uri) - log.warning(Soup.Status.get_phrase(message.status_code)) + status_code = Soup.Status.get_phrase(message.status_code) + log.warning(status_code) + preview.reset_received_size() + if message.status_code != 1: + # status_code 1: 'Cancelled' + preview.info_message = _('Download failed (%s)') % status_code preview.update_widget() return ===================================== gajim/common/setting_values.py ===================================== @@ -499,7 +499,7 @@ class _ACCOUNT_DEFAULT: } StringWorkspaceSettings = Literal[ - 'avatar_sha' + 'avatar_sha', 'color', 'name', ] ===================================== gajim/data/gui/preview.ui ===================================== @@ -43,30 +43,64 @@ <property name="orientation">vertical</property> <property name="spacing">3</property> <child> - <object class="GtkBox" id="content_box"> - <property name="visible">True</property> + <object class="GtkBox" id="progress_box"> <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="no-show-all">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkProgressBar" id="progressbar"> + <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="halign">center</property> + <property name="valign">end</property> <signal name="realize" handler="_on_realize" swapped="no"/> <child> - <object class="GtkButton" id="image_button"> + <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="button-press-event" handler="_on_button_press_event" swapped="no"/> - <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> + <signal name="clicked" handler="_on_cancel_download_clicked" swapped="no"/> <child> - <placeholder/> + <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="preview-image-button"/> + <class name="preview-button"/> + <class name="flat"/> </style> </object> </child> @@ -74,39 +108,46 @@ <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">True</property> - <property name="no-show-all">True</property> - <property name="relief">none</property> - </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> </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="progress_box"> + <object class="GtkBox" id="content_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="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkProgressBar" id="progressbar"> + <object class="GtkEventBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="show-text">True</property> + <property name="halign">center</property> + <signal name="realize" handler="_on_realize" swapped="no"/> + <child> + <object class="GtkButton" id="image_button"> + <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> + <style> + <class name="preview-image-button"/> + </style> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -115,23 +156,11 @@ </packing> </child> <child> - <object class="GtkButton"> - <property name="visible">True</property> + <object class="GtkLinkButton" id="link_button"> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Cancel</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="preview-button"/> - <class name="flat"/> - </style> + <property name="no-show-all">True</property> + <property name="relief">none</property> </object> <packing> <property name="expand">False</property> @@ -183,7 +212,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -217,7 +246,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -251,7 +280,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -298,6 +327,25 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="info_message"> + <property name="visible">True</property> + <property name="can-focus">False</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> ===================================== gajim/gtk/builder.pyi ===================================== @@ -720,17 +720,20 @@ class PreviewBuilder(Builder): icon_event_box: Gtk.EventBox icon_button: Gtk.Button right_box: Gtk.Box + progress_box: Gtk.Box + progressbar: Gtk.ProgressBar + progress_text: Gtk.Label + cancel_download_button: Gtk.Button content_box: Gtk.Box image_button: Gtk.Button link_button: Gtk.LinkButton - progress_box: Gtk.Box - progressbar: Gtk.ProgressBar button_box: Gtk.Box download_button: Gtk.Button save_as_button: Gtk.Button open_folder_button: Gtk.Button file_name: Gtk.Label file_size: Gtk.Label + info_message: Gtk.Label class PreviewContextMenuBuilder(Builder): ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -27,11 +27,14 @@ from gajim.common import app from gajim.common import events +from gajim.common.i18n import _ from . import structs from .chat_filter import ChatFilter from .chat_list import ChatList from .chat_list import ChatRow +from .dialogs import DialogButton +from .dialogs import ConfirmationCheckDialog HANDLED_EVENTS = ( @@ -249,9 +252,32 @@ 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) - chat_list.remove_chat(account, jid, emit_unread=False) - self.store_open_chats(workspace_id) - self.emit('chat-removed', account, jid, type_) + + def _leave(is_checked: bool) -> None: + if is_checked: + app.settings.set('confirm_close_muc', False) + + chat_list.remove_chat(account, jid, emit_unread=False) + self.store_open_chats(workspace_id) + self.emit('chat-removed', account, jid, type_) + + if type_ == 'groupchat' and app.settings.get('confirm_close_muc'): + client = app.get_client(account) + contact = client.get_module('Contacts').get_group_chat_contact(jid) + ConfirmationCheckDialog( + _('Leave Group Chat'), + _('Are you sure you want to leave this group chat?'), + _('If you close this chat, you will leave ' + '\'%s\'.') % contact.name, + _('_Do not ask me again'), + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Leave'), + callback=_leave)], + transient_for=app.window).show() + return + + _leave(True) def remove_chats_for_account(self, account: str) -> None: for workspace_id, chat_list in self._chat_lists.items(): ===================================== gajim/gtk/controls/base.py ===================================== @@ -389,25 +389,6 @@ def is_privatechat(self) -> bool: def is_groupchat(self) -> bool: return self._type.is_groupchat - def safe_shutdown(self) -> bool: - """ - Called to check if control can be closed without losing data. - returns True if control can be closed safely else False - - Derived classes MAY implement this. - """ - return True - - def allow_shutdown(self, method, on_response_yes, on_response_no): - """ - Called to check is a control is allowed to shutdown. - If a control is not in a suitable shutdown state this method - should call on_response_no, else on_response_yes or - - Derived classes MAY implement this. - """ - on_response_yes(self) - def focus(self) -> None: raise NotImplementedError ===================================== gajim/gtk/controls/chat.py ===================================== @@ -569,9 +569,6 @@ def shutdown(self) -> None: super(ChatControl, self).shutdown() app.check_finalize(self) - def allow_shutdown(self, _method, on_yes, on_no): - on_yes(self) - def _on_avatar_update(self, _contact: types.BareContact, _signal_name: str ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -67,7 +67,6 @@ from gajim.gui.const import ControlType from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.gui.dialogs import DialogButton -from gajim.gui.dialogs import ConfirmationCheckDialog from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dataform import DataFormWidget from gajim.gui.groupchat_inviter import GroupChatInviter @@ -1179,43 +1178,6 @@ def shutdown(self, reason: Optional[str] = None) -> None: super(GroupchatControl, self).shutdown() app.check_finalize(self) - def safe_shutdown(self) -> bool: - # whether to ask for confirmation before closing muc - if app.settings.get('confirm_close_muc') and self.contact.is_joined: - return False - return True - - def allow_shutdown(self, _method, on_yes, on_no): - # whether to ask for confirmation before closing muc - if app.settings.get('confirm_close_muc') and self.contact.is_joined: - def on_ok(is_checked: bool) -> None: - if is_checked: - # User does not want to be asked again - app.settings.set('confirm_close_muc', False) - on_yes(self) - - def on_cancel(is_checked: bool) -> None: - if is_checked: - # User does not want to be asked again - app.settings.set('confirm_close_muc', False) - on_no(self) - - ConfirmationCheckDialog( - _('Leave Group Chat'), - _('Are you sure you want to leave this group chat?'), - _('If you close this window, you will leave ' - '\'%s\'.') % self.contact.name, - _('_Do not ask me again'), - [DialogButton.make('Cancel', - callback=on_cancel), - DialogButton.make('Accept', - text=_('_Leave'), - callback=on_ok)], - transient_for=app.window).show() - return - - on_yes(self) - def _close_control(self) -> None: app.window.activate_action( 'remove-chat', ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -117,6 +117,11 @@ def print_text_with_styling(self, block: PlainBlock) -> None: text += after self.set_markup(text) + + if len(self.get_text()) > 10000: + # Limit message styling processing + return + self.set_attributes(make_pango_attributes(block)) def add_action_phrase(self, text: str) -> None: @@ -209,6 +214,10 @@ def print_text_with_styling(self, block: PlainBlock) -> None: buffer_ = self.get_buffer() buffer_.insert(buffer_.get_start_iter(), block.text.strip()) + if len(self.get_text()) > 10000: + # Limit message styling processing + return + for span in block.spans: start_iter = buffer_.get_iter_at_offset(span.start) end_iter = buffer_.get_iter_at_offset(span.end) ===================================== gajim/gtk/message_input.py ===================================== @@ -121,9 +121,19 @@ def _on_focus_out(self, return False def _clear_tags(self) -> None: + to_remove: list[Gtk.TextTag] = [] + def _check(tag: Gtk.TextTag) -> None: + if tag.get_property('underline-rgba-set') is True: + # Don’t remove spell checking underlines + return + to_remove.append(tag) + buf = self.get_buffer() start, end = buf.get_bounds() - buf.remove_all_tags(start, end) + tag_table = buf.get_tag_table() + tag_table.foreach(_check) + for tag in to_remove: + buf.remove_tag(tag, start, end) def _on_text_changed(self, buf: Gtk.TextBuffer) -> None: text = self.get_text() @@ -132,7 +142,7 @@ def _on_text_changed(self, buf: Gtk.TextBuffer) -> None: self._clear_tags() - if len(text) > 20000: + if len(text) > 10000: # Limit message styling processing return ===================================== gajim/gtk/preview.py ===================================== @@ -53,6 +53,8 @@ def __init__(self, account: str) -> None: self.account = account self._preview: Optional[Preview] = None + self._in_progress = False + if app.settings.get('use_kib_mib'): self._units = GLib.FormatSizeFlags.IEC_UNITS else: @@ -69,12 +71,22 @@ def get_text(self) -> str: return self._preview.uri def update_progress(self, _preview: Preview, progress: float) -> None: + self._in_progress = True + + self._ui.download_button.hide() + self._ui.progress_box.show() + self._ui.progress_text.set_label(f'{int(progress * 100)} %') self._ui.progressbar.set_fraction(progress) + self._ui.info_message.set_text(_('Downloading…')) + self._ui.info_message.set_tooltip_text('') def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._preview = preview + + self._in_progress = False self._ui.progress_box.hide() + self._ui.info_message.hide() if preview.is_geo_uri: data = load_icon_pixbuf('map', size=preview.size) @@ -143,6 +155,11 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.right_box.pack_end(audio_widget, False, True, 0) self._ui.right_box.reorder_child(audio_widget, 1) else: + if preview.info_message is not None: + self._ui.info_message.set_text(preview.info_message) + self._ui.info_message.set_tooltip_text(preview.info_message) + self._ui.info_message.show() + if preview.file_size == 0: self._ui.download_button.hide() self._ui.link_button.show() @@ -186,6 +203,8 @@ def _destroy(menu: Gtk.Menu, _pspec: Any) -> None: if self._preview.orig_exists(): menu.download.hide() else: + if self._in_progress: + menu.download.hide() menu.open.hide() menu.save_as.hide() menu.open_folder.hide() @@ -256,7 +275,9 @@ def _on_open_folder(self, _menu: Gtk.Menu) -> None: open_file(self._preview.orig_path.parent) def _on_copy_link_location(self, _menu: Gtk.Menu) -> None: - clipboard = Gtk.Clipboard.get_default(Gdk.Display.get_default()) + display = Gdk.Display.get_default() + assert display is not None + clipboard = Gtk.Clipboard.get_default(display) assert self._preview clipboard.set_text(self._preview.uri, -1) ===================================== pyrightconfig.json ===================================== @@ -16,15 +16,14 @@ "scripts/*", "win/*", "gajim/gajim.py", - "gajim/plugins/gajimplugin.py", - "gajim/plugins/helpers.py", - "gajim/plugins/plugins_i18n.py", - "gajim/plugins/repository.py", "gajim/common/application.py", "gajim/common/call_manager.py", "gajim/common/cert_store.py", "gajim/common/configpaths.py", "gajim/common/const.py", + "gajim/common/dbus/location.py", + "gajim/common/dbus/music_track.py", + "gajim/common/dbus/system_style.py", "gajim/common/events.py", "gajim/common/exceptions.py", "gajim/common/filetransfer.py", @@ -114,6 +113,10 @@ "gajim/gtk/util.py", "gajim/gtk/video_preview.py", "gajim/gtk/workspace_dialog.py", - "gajim/gtk/xml_console.py" + "gajim/gtk/xml_console.py", + "gajim/plugins/gajimplugin.py", + "gajim/plugins/helpers.py", + "gajim/plugins/plugins_i18n.py", + "gajim/plugins/repository.py" ], } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4d967f889bd3853896bfd3aa9e898e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4d967f889bd3853896bfd3aa9e898e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: SystemStyleListener: Correctly return expected prefer_dark value
by Daniel Brötzmann (＠wurstsalat) 07 Jun '22

07 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e4d967f8 by wurstsalat at 2022-06-07T09:46:18+02:00 fix: SystemStyleListener: Correctly return expected prefer_dark value - - - - - 1 changed file: - gajim/common/dbus/system_style.py Changes: ===================================== gajim/common/dbus/system_style.py ===================================== @@ -69,7 +69,6 @@ def read_color_scheme(self) -> None: except GLib.Error as error: log.error('Couldn’t read the color-scheme setting: %s', error.message) - self._prefer_dark = False return def _signal_setting_changed(self, @@ -90,6 +89,5 @@ def _signal_setting_changed(self, app.ged.raise_event(StyleChanged()) @property - def prefer_dark(self) -> bool: - assert self._prefer_dark is not None + def prefer_dark(self) -> Optional[bool]: return self._prefer_dark View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4d967f889bd3853896bfd3aa9e898e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4d967f889bd3853896bfd3aa9e898e4… 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