Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] imprv: Preferences: Change Section titel and setting
by Philipp Hörist (＠lovetox) 06 Jun '22

06 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 67a9d9fd by lovetox at 2022-06-06T21:40:59+02:00 imprv: Preferences: Change Section titel and setting - - - - - 2 changed files: - gajim/data/gui/preferences.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/preferences.ui ===================================== @@ -39,7 +39,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Behaviour of Windows & Tabs</property> + <property name="label" translatable="yes">Behaviour of Application Window</property> <property name="xalign">0</property> <style> <class name="bold"/> ===================================== gajim/gtk/preferences.py ===================================== @@ -193,7 +193,7 @@ def __init__(self, *args: Any) -> None: settings = [ Setting(SettingKind.POPOVER, - _('Show Gajim on Startup'), + _('Show on Startup'), SettingType.CONFIG, 'show_main_window_on_startup', props={'entries': main_window_on_startup_items}, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67a9d9fd77f05c4d3f120970c589e0e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67a9d9fd77f05c4d3f120970c589e0e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: refactor: Make minimize to tray more reliable
by Philipp Hörist (＠lovetox) 06 Jun '22

06 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 46176a91 by lovetox at 2022-06-06T21:32:43+02:00 refactor: Make minimize to tray more reliable - Use hide() and instead of skip_taskbar_hint - Move show/hide logic into MainWindow from StatusIcon - - - - - 9503b6c5 by lovetox at 2022-06-06T21:32:43+02:00 feat: Add `Show in Taskbar` preference setting - - - - - 631b22ec by lovetox at 2022-06-06T21:32:43+02:00 refactor: Simplify MainWindow delete event - Don’t check if tray icon is active, this makes `allow_hide_roster` obsolete. - Rename `quit_on_main_window_x_button` to `confirm_on_window_delete` for clarity - Remove `hide_on_main_window_x_button` because it is obsolete. NOTES: The ACE setting `hide_on_main_window_x_button` was replaced with the preference setting `Minimize on Close` without migration. The ACE setting `allow_hide_roster` was removed as it is now obsolete. You can now use the `Minimize on Close` preference setting also when no tray icon is displayed. The ACE setting `quit_on_main_window_x_button` was renamed to `confirm_on_window_delete`. The setting was reset to its default `True`. - - - - - 5 changed files: - gajim/common/setting_values.py - gajim/gtk/main.py - gajim/gtk/preferences.py - gajim/gtk/status_icon.py - gajim/gtk/util.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -34,7 +34,6 @@ class _ACCOUNT_DEFAULT: # pylint: disable=line-too-long BoolSettings = Literal[ - 'allow_hide_roster', 'always_ask_for_status_message', 'always_english_wikipedia', 'always_english_wiktionary', @@ -62,7 +61,6 @@ class _ACCOUNT_DEFAULT: 'hide_chat_banner', 'hide_groupchat_banner', 'hide_groupchat_occupants_list', - 'hide_on_main_window_x_button', 'ignore_incoming_attention', 'last_main_window_visible', 'log_contact_status_changes', @@ -76,7 +74,7 @@ class _ACCOUNT_DEFAULT: 'preview_anonymous_muc', 'preview_verify_https', 'print_status_in_chats', - 'quit_on_main_window_x_button', + 'minimize_on_window_delete', 'remote_commands', 'remote_control', 'save_main_window_position', @@ -94,6 +92,8 @@ class _ACCOUNT_DEFAULT: 'show_xhtml', 'show_trayicon', 'showoffline', + 'show_in_taskbar', + 'confirm_on_window_delete', 'sort_by_show_in_muc', 'sort_by_show_in_roster', 'sounddnd', @@ -187,7 +187,6 @@ class _ACCOUNT_DEFAULT: 'ask_online_status': False, 'ask_offline_status': False, 'show_trayicon': True, - 'allow_hide_roster': False, 'roster_theme': 'default', 'sort_by_show_in_roster': True, 'sort_by_show_in_muc': False, @@ -205,8 +204,7 @@ class _ACCOUNT_DEFAULT: 'save_main_window_position': True, 'show_main_window_on_startup': 'always', 'last_main_window_visible': True, - 'quit_on_main_window_x_button': False, - 'hide_on_main_window_x_button': False, + 'minimize_on_window_delete': True, 'minimize_to_tray': False, 'latest_disco_addresses': '', 'change_roster_title': True, @@ -300,6 +298,8 @@ class _ACCOUNT_DEFAULT: 'plugins_update_check': True, 'plugins_auto_update': False, 'plugins_notify_after_update': True, + 'show_in_taskbar': True, + 'confirm_on_window_delete': True, } BoolAccountSettings = Literal[ @@ -619,7 +619,6 @@ class WorkspaceSettings(TypedDict): ADVANCED_SETTINGS = { 'app': { - 'allow_hide_roster': _('Allow to hide the contact list window even if the notification area icon is not shown.'), 'ascii_formatting': _('Treat * / _ pairs as possible formatting characters.'), 'gc_refer_to_nick_char': _('Character to add after nickname when using nickname completion (tab) in group chat.'), 'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'), @@ -637,6 +636,7 @@ class WorkspaceSettings(TypedDict): 'confirm_paste_image': _('Ask before pasting an image.'), 'confirm_close_muc': _('Ask before closing a group chat tab/window.'), 'confirm_close_multiple_tabs': _('Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat).'), + 'confirm_on_window_delete': _('Ask before quitting when Gajim’s window is closed'), 'file_transfers_port': '', 'ft_add_hosts_to_send': _('List of send hosts (comma separated) in addition to local interfaces for file transfers (in case of address translation/port forwarding).'), 'use_kib_mib': _('IEC standard says KiB = 1024 bytes, KB = 1000 bytes.'), @@ -644,7 +644,6 @@ class WorkspaceSettings(TypedDict): 'trayicon_notification_on_events': _('Notify of events in the notification area.'), 'notification_preview_message': _('Preview new messages in notification popup?'), 'muc_highlight_words': _('A list of words (semicolon separated) that will be highlighted in group chats.'), - 'hide_on_main_window_x_button': _('If enabled, Gajim hides the main window when pressing the X button instead of minimizing into the notification area.'), 'use_urgency_hint': _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.'), 'notification_timeout': '', 'escape_key_closes': _('If enabled, pressing Esc closes a tab/window.'), ===================================== gajim/gtk/main.py ===================================== @@ -20,7 +20,6 @@ from typing import Optional import logging -import os from gi.repository import Gtk from gi.repository import Gdk @@ -54,6 +53,8 @@ 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 @@ -155,25 +156,30 @@ def __init__(self) -> None: client.connect_signal('state-changed', self._on_client_state_changed) - def _prepare_window(self) -> None: - if app.settings.get('minimize_to_tray'): - self.set_skip_taskbar_hint(True) + 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()) + + def _prepare_window(self) -> None: window_width = app.settings.get('mainwin_width') window_height = app.settings.get('mainwin_height') resize_window(self, window_width, window_height) - self.show_all() + + self.set_skip_taskbar_hint(not app.settings.get('show_in_taskbar')) show_main_window = app.settings.get('show_main_window_on_startup') - if (show_main_window == 'always' or - not app.settings.get('show_trayicon')): - # Without trayicon, we have to show the main window - return + if show_main_window == 'never': + self.minimize() - if (show_main_window == 'never' or + elif (show_main_window == 'last_state' and not app.settings.get('last_main_window_visible')): - self.hide() + self.minimize() + + self.show_all() def _on_account_enabled(self, event: events.AccountEnabled) -> None: self._account_side_bar.add_account(event.account) @@ -395,45 +401,53 @@ def _on_window_motion_notify(self, def _on_window_delete(self, _widget: Gtk.ApplicationWindow, _event: Gdk.Event - ) -> bool: - # Main window X button was clicked - if app.settings.get('quit_on_main_window_x_button'): + ) -> int: + + if app.settings.get('minimize_on_window_delete'): + self.minimize() + return Gdk.EVENT_STOP + + if not app.settings.get('confirm_on_window_delete'): self.quit() - else: - if (app.settings.get('allow_hide_roster') or - app.app.systray.is_visible()): - save_main_window_position() - if (os.name == 'nt' or - app.settings.get('hide_on_main_window_x_button')): - self.hide() - else: - self.iconify() - return True - - def _on_ok(is_checked: bool) -> None: - if is_checked: - app.settings.set('quit_on_main_window_x_button', True) - self.quit() - - ConfirmationCheckDialog( - _('Quit Gajim'), - _('You are about to quit Gajim'), - _('Are you sure you want to quit Gajim?'), - _('_Always quit when closing Gajim'), - [DialogButton.make('Cancel'), - DialogButton.make('Remove', - text=_('_Quit'), - callback=_on_ok)]).show() - return True + return Gdk.EVENT_STOP + + def _on_ok(is_checked: bool) -> None: + if is_checked: + app.settings.set('confirm_on_window_delete', False) + self.quit() + + ConfirmationCheckDialog( + _('Quit Gajim'), + _('You are about to quit Gajim'), + _('Are you sure you want to quit Gajim?'), + _('_Don’t ask again'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=_on_ok)]).show() + + return Gdk.EVENT_STOP def _on_window_state_changed(self, window: MainWindow, event: Gdk.EventWindowState) -> None: - iconified = bool(Gdk.WindowState.ICONIFIED & event.new_window_state) - hidden = bool(Gdk.WindowState.WITHDRAWN & event.new_window_state) - visible = not (iconified or hidden) - app.settings.set('last_main_window_visible', visible) + states = Gdk.WindowState.WITHDRAWN | Gdk.WindowState.ICONIFIED + if states & event.changed_mask: + is_withdrawn = bool(Gdk.WindowState.WITHDRAWN & + event.new_window_state) + is_iconified = bool(Gdk.WindowState.ICONIFIED & + event.new_window_state) + 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() def _set_startup_finished(self) -> None: self._startup_finished = True ===================================== gajim/gtk/preferences.py ===================================== @@ -200,24 +200,31 @@ def __init__(self, *args: Any) -> None: desc=_('Show window when starting Gajim')), Setting(SettingKind.SWITCH, - _('Quit Gajim on Close'), + _('Minimize on Close'), SettingType.CONFIG, - 'quit_on_main_window_x_button', - desc=_('Quit when closing Gajim’s window')), + 'minimize_on_window_delete', + desc=_('Minimize when closing Gajim’s window')), Setting(SettingKind.SWITCH, _('Minimize to Tray'), SettingType.CONFIG, 'minimize_to_tray', - desc=_('Hide window to system tray when minimized'), - callback=self._on__minimize_to_tray), + desc=_('Hide window to system tray when minimized')), + + Setting(SettingKind.SWITCH, + _('Show in Taskbar'), + SettingType.CONFIG, + 'show_in_taskbar', + desc=_('Show window in the taskbar'), + callback=self._on_show_in_taskbar), + ] PreferenceBox.__init__(self, settings) @staticmethod - def _on__minimize_to_tray(value: bool, *args: Any) -> None: - app.window.set_skip_taskbar_hint(value) + def _on_show_in_taskbar(value: bool, *args: Any) -> None: + app.window.set_skip_taskbar_hint(not value) class Plugins(PreferenceBox): ===================================== gajim/gtk/status_icon.py ===================================== @@ -42,8 +42,6 @@ from .builder import get_builder from .util import get_icon_name -from .util import save_main_window_position -from .util import restore_main_window_position from .util import open_window if app.is_installed('APPINDICATOR'): @@ -192,15 +190,9 @@ def _on_toggle_window(self, _widget: Gtk.MenuItem) -> None: def _on_activate(self, *args: Any) -> None: if app.settings.get('last_main_window_visible'): - save_main_window_position() - app.window.hide() - return - - if not app.window.get_property('visible'): - # Window was minimized - restore_main_window_position() - - app.window.present_with_time(Gtk.get_current_event_time()) + app.window.minimize() + else: + app.window.unminimize() @staticmethod def _on_preferences(_widget: Gtk.MenuItem) -> None: ===================================== gajim/gtk/util.py ===================================== @@ -776,6 +776,17 @@ 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/b21320e603877b53b1bf9a4654d8aec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b21320e603877b53b1bf9a4654d8aec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add type annotations to DBus modules
by Daniel Brötzmann (＠wurstsalat) 06 Jun '22

06 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b21320e6 by wurstsalat at 2022-06-06T18:15:58+02:00 chore: Add type annotations to DBus modules - - - - - 4 changed files: - gajim/common/dbus/location.py - gajim/common/dbus/logind.py - gajim/common/dbus/music_track.py - gajim/common/dbus/system_style.py Changes: ===================================== gajim/common/dbus/location.py ===================================== @@ -14,12 +14,18 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any from typing import Optional import logging from datetime import datetime +from gi.repository import Gio from gi.repository import GLib +from gi.repository import GObject + from nbxmpp.structs import LocationData from gajim.common import app @@ -34,21 +40,21 @@ class LocationListener: - _instance = None + _instance: Optional[LocationListener] = None @classmethod - def get(cls): + def get(cls) -> LocationListener: if cls._instance is None: cls._instance = cls() if app.is_installed('GEOCLUE') and not cls._instance._running: cls._instance.start() return cls._instance - def __init__(self): - self._data = {} - self.location_info = {} - self.simple = None - self._current_location = None + def __init__(self) -> None: + self._data: dict[str, Any] = {} + self.location_info: dict[str, Any] = {} + self.simple: Optional[Geoclue.Simple] = None + self._current_location: Optional[LocationData] = None self._running = False def _emit(self, info: Optional[LocationData]) -> None: @@ -59,33 +65,38 @@ def _emit(self, info: Optional[LocationData]) -> None: def current_location(self) -> Optional[LocationData]: return self._current_location - # Note: do not remove third parameter `param` - # because notify signal expects three parameters - def _on_location_update(self, simple, _param=None): + def _on_location_update(self, simple: Geoclue.Simple, *args: Any) -> None: location = simple.get_location() - timestamp = location.get_property("timestamp")[0] - lat = location.get_property("latitude") - lon = location.get_property("longitude") - alt = location.get_property("altitude") + timestamp = location.get_property('timestamp')[0] + lat = location.get_property('latitude') + lon = location.get_property('longitude') + alt = location.get_property('altitude') # in XEP-0080 it's horizontal accuracy - acc = location.get_property("accuracy") + acc = location.get_property('accuracy') # update data with info we just received self._data = {'lat': lat, 'lon': lon, 'alt': alt, 'accuracy': acc} self._data['timestamp'] = self._timestamp_to_utc(timestamp) self._send_location() - def _on_client_update(self, client, _param=None): + def _on_client_update(self, + client: Geoclue.Client, + *args: Any + ) -> None: if not client.get_property('active'): self._emit(None) - def _on_simple_ready(self, _obj, result): + def _on_simple_ready(self, + _obj: GObject.Object, + result: Gio.AsyncResult + ) -> None: try: self.simple = Geoclue.Simple.new_finish(result) except GLib.Error as error: - log.warning("Could not enable geolocation: %s", error.message) + log.warning('Could not enable geolocation: %s', error.message) self._running = False else: + assert self.simple is not None self.simple.connect('notify::location', self._on_location_update) client = self.simple.get_client() # Inside the flatpak sandbox client will be None, @@ -95,18 +106,18 @@ def _on_simple_ready(self, _obj, result): self._on_location_update(self.simple) - def get_data(self): - Geoclue.Simple.new("org.gajim.Gajim", + def get_data(self) -> None: + Geoclue.Simple.new('org.gajim.Gajim', Geoclue.AccuracyLevel.EXACT, None, self._on_simple_ready) - def start(self): + def start(self) -> None: self._running = True self.location_info = {} self.get_data() - def _send_location(self): + def _send_location(self) -> None: if self.location_info == self._data: return if 'timestamp' in self.location_info and 'timestamp' in self._data: @@ -121,6 +132,6 @@ def _send_location(self): self._emit(info) @staticmethod - def _timestamp_to_utc(timestamp): + def _timestamp_to_utc(timestamp: float) -> str: time = datetime.utcfromtimestamp(timestamp) return time.strftime('%Y-%m-%dT%H:%MZ') ===================================== gajim/common/dbus/logind.py ===================================== @@ -18,6 +18,10 @@ Watch for system sleep using systemd-logind. Documentation: http://www.freedesktop.org/wiki/Software/systemd/inhibit ''' +from __future__ import annotations + +from typing import Any +from typing import Optional import os import logging @@ -32,17 +36,17 @@ class LogindListener: - _instance = None + _instance: Optional[LogindListener] = None @classmethod - def get(cls): + def get(cls) -> LogindListener: if cls._instance is None: cls._instance = cls() return cls._instance - def __init__(self): + def __init__(self) -> None: # file descriptor object of the inhibitor - self._inhibit_fd = None + self._inhibit_fd: Optional[int] = None Gio.bus_watch_name( Gio.BusType.SYSTEM, @@ -51,14 +55,20 @@ def __init__(self): self._on_appear_logind, self._on_vanish_logind) - def _on_prepare_for_sleep(self, connection, _sender_name, _object_path, - interface_name, signal_name, parameters, - *_user_data): + def _on_prepare_for_sleep(self, + connection: Gio.DBusConnection, + _sender_name: str, + _object_path: str, + interface_name: str, + signal_name: str, + parameters: tuple[str, str, str], + *_user_data: Any + ) -> None: '''Signal handler for PrepareForSleep event''' log.debug('Received signal %s.%s%s', interface_name, signal_name, parameters) - before = parameters[0] # Signal is either before or after sleep occurs + before = parameters[0] # Signal is either before or after sleep occurs if before: warn = self._inhibit_fd is None log.log( @@ -86,7 +96,7 @@ def _on_prepare_for_sleep(self, connection, _sender_name, _object_path, if conn.state.is_disconnected and conn.time_to_reconnect: conn.reconnect() - def _inhibit_sleep(self, connection): + def _inhibit_sleep(self, connection: Gio.DBusConnection) -> None: '''Obtain a sleep delay inhibitor from logind''' if self._inhibit_fd is not None: # Something is wrong, we have an inhibitor fd, and we are asking for @@ -95,7 +105,7 @@ def _inhibit_sleep(self, connection): 'while already holding one.') try: - ret, ret_fdlist = connection.call_with_unix_fd_list_sync( + result = connection.call_with_unix_fd_list_sync( 'org.freedesktop.login1', '/org/freedesktop/login1', 'org.freedesktop.login1.Manager', @@ -104,10 +114,18 @@ def _inhibit_sleep(self, connection): 'sleep', 'org.gajim.Gajim', _('Disconnect from the network'), - 'delay' # Inhibitor will delay but not block sleep + 'delay' # Inhibitor will delay but not block sleep )), GLib.VariantType.new('(h)'), - Gio.DBusCallFlags.NONE, -1, None, None) + Gio.DBusCallFlags.NONE, + -1, + None, + None) + if result is None: + log.warning( + 'Cannot obtain a sleep delay inhibitor from logind') + return + ret, ret_fdlist = result except GLib.Error as error: log.warning( 'Cannot obtain a sleep delay inhibitor from logind: %s', error) @@ -116,14 +134,19 @@ def _inhibit_sleep(self, connection): log.info('Inhibit sleep') self._inhibit_fd = ret_fdlist.get(ret.unpack()[0]) - def _disinhibit_sleep(self): + def _disinhibit_sleep(self) -> None: '''Relinquish our sleep delay inhibitor''' if self._inhibit_fd is not None: os.close(self._inhibit_fd) self._inhibit_fd = None log.info('Disinhibit sleep') - def _on_appear_logind(self, connection, name, name_owner, *_user_data): + def _on_appear_logind(self, + connection: Gio.DBusConnection, + name: str, + name_owner: str, + *_user_data: Any + ) -> None: '''Use signal and locks provided by org.freedesktop.login1''' log.info('Name %s appeared, owned by %s', name, name_owner) @@ -138,13 +161,17 @@ def _on_appear_logind(self, connection, name, name_owner, *_user_data): None) self._inhibit_sleep(connection) - def _on_vanish_logind(self, _connection, name, *_user_data): + def _on_vanish_logind(self, + _connection: Gio.DBusConnection, + name: str, + *_user_data: Any + ) -> None: '''Release remaining resources related to org.freedesktop.login1''' log.info('Name %s vanished', name) self._disinhibit_sleep() -def enable(): +def enable() -> None: # Module should be rewritten # Its not useful to know when the computer goes to sleep. # Because of stream management we don’t need to do anything in that case. ===================================== gajim/common/dbus/music_track.py ===================================== @@ -19,6 +19,10 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import cast from typing import Optional import logging @@ -38,18 +42,18 @@ class MusicTrackListener: - _instance = None + _instance: Optional[MusicTrackListener] = None @classmethod - def get(cls): + def get(cls) -> MusicTrackListener: if cls._instance is None: cls._instance = cls() return cls._instance - def __init__(self): - self.players = {} - self.connection = None - self._current_tune = None + def __init__(self) -> None: + self.players: dict[str, int] = {} + self.connection: Optional[Gio.DBusConnection] = None + self._current_tune: Optional[TuneData] = None self._running = False if sys.platform not in ('win32', 'darwin'): @@ -94,7 +98,7 @@ def start(self): -1, None) except GLib.Error as error: - log.debug("Could not list names: %s", error.message) + log.debug('Could not list names: %s', error.message) return for name in result[0]: @@ -106,19 +110,19 @@ def start(self): self._running = True - def stop(self): + def stop(self) -> None: for name in list(self.players): if name.startswith(MPRIS_PLAYER_PREFIX): self._remove_player(name) def _signal_name_owner_changed(self, - _connection, - _sender_name, - _object_path, - _interface_name, - _signal_name, - parameters, - *_user_data): + _connection: Gio.DBusConnection, + _sender_name: str, + _object_path: str, + _interface_name: str, + _signal_name: str, + parameters: tuple[str, str, str], + *_user_data: Any): name, old_owner, new_owner = parameters if name.startswith(MPRIS_PLAYER_PREFIX): if new_owner and not old_owner: @@ -126,13 +130,14 @@ def _signal_name_owner_changed(self, else: self._remove_player(name) - def _add_player(self, name): + def _add_player(self, name: str) -> None: '''Set up a listener for music player signals''' log.info('%s appeared', name) if name in self.players: return + assert self.connection is not None self.players[name] = self.connection.signal_subscribe( name, 'org.freedesktop.DBus.Properties', @@ -143,9 +148,13 @@ def _add_player(self, name): self._signal_received, name) - def _remove_player(self, name): + def _remove_player(self, name: str) -> None: log.info('%s vanished', name) if name in self.players: + if self.connection is None: + self._emit(None) + return + self.connection.signal_unsubscribe( self.players[name]) self.players.pop(name) @@ -153,21 +162,21 @@ def _remove_player(self, name): self._emit(None) def _signal_received(self, - _connection, - _sender_name, - _object_path, - interface_name, - _signal_name, - parameters, - *user_data): + _connection: Gio.DBusConnection, + _sender_name: str, + _object_path: str, + interface_name: str, + _signal_name: str, + parameters: tuple[str, str, str], + *user_data: str): '''Signal handler for PropertiesChanged event''' log.info('Signal received: %s - %s', interface_name, parameters) self._get_playing_track(user_data[0]) @staticmethod - def _get_music_info(properties): - meta = properties.get('Metadata') + def _get_music_info(properties: dict[str, str]) -> Optional[TuneData]: + meta = cast(dict[str, str], properties.get('Metadata')) if meta is None or not meta: return None @@ -183,7 +192,7 @@ def _get_music_info(properties): artist = ', '.join(artist) return TuneData(artist=artist, title=title, source=album) - def _get_playing_track(self, name): + def _get_playing_track(self, name: str) -> None: '''Return a TuneData for the currently playing song, or None if no song is playing''' proxy = Gio.DBusProxy.new_for_bus_sync( @@ -195,18 +204,21 @@ def _get_playing_track(self, name): 'org.freedesktop.DBus.Properties', None) - def proxy_call_finished(proxy, res): + def proxy_call_finished(proxy: Gio.DBusProxy, + res: Gio.AsyncResult + ) -> None: try: result = proxy.call_finish(res) except GLib.Error as error: - log.debug("Could not enable music listener: %s", error.message) + log.debug('Could not enable music listener: %s', error.message) return + assert result is not None info = self._get_music_info(result[0]) if info is not None: self._emit(info) - proxy.call("GetAll", + proxy.call('GetAll', GLib.Variant('(s)', ('org.mpris.MediaPlayer2.Player',)), Gio.DBusCallFlags.NONE, -1, ===================================== gajim/common/dbus/system_style.py ===================================== @@ -13,7 +13,11 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations + +from typing import Any +from typing import Callable from typing import cast +from typing import Optional import sys import logging @@ -28,8 +32,8 @@ class SystemStyleListener: - def __init__(self, callback) -> None: - self._prefer_dark = None + def __init__(self, callback: Callable[..., None]) -> None: + self._prefer_dark: Optional[bool] = None self._callback = callback if sys.platform in ('win32', 'darwin'): @@ -57,32 +61,35 @@ def read_color_scheme(self) -> None: result = self.dbus_proxy.call_sync( 'Read', GLib.Variant('(ss)', ('org.freedesktop.appearance', - 'color-scheme')), + 'color-scheme')), Gio.DBusCallFlags.NO_AUTO_START, -1, None) (self._prefer_dark,) = cast(tuple[bool], result) except GLib.Error as error: - log.error("Couldn't read the color-scheme setting: %s", + log.error('Couldn’t read the color-scheme setting: %s', error.message) + self._prefer_dark = False return def _signal_setting_changed(self, - _proxy, - _sender_name, - signal_name, - parameters, - *_user_data) -> None: + _proxy: Gio.DBusProxy, + _sender_name: Optional[str], + signal_name: str, + parameters: GLib.Variant, + *_user_data: Any + ) -> None: if signal_name != 'SettingChanged': return namespace, name, value = parameters - if (namespace == "org.freedesktop.appearance" and - name == "color-scheme"): + if (namespace == 'org.freedesktop.appearance' and + name == 'color-scheme'): self._prefer_dark = (value == 1) self._callback() app.ged.raise_event(StyleChanged()) @property def prefer_dark(self) -> bool: + assert self._prefer_dark is not None return self._prefer_dark View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b21320e603877b53b1bf9a4654d8aec2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b21320e603877b53b1bf9a4654d8aec2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Add freedesktop colorscheme preference support
by Daniel Brötzmann (＠wurstsalat) 06 Jun '22

06 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b4182c9c by André at 2022-06-06T10:01:14+00:00 feat: Add freedesktop colorscheme preference support - - - - - 2 changed files: - + gajim/common/dbus/system_style.py - gajim/gtk/css_config.py Changes: ===================================== gajim/common/dbus/system_style.py ===================================== @@ -0,0 +1,88 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations +from typing import cast + +import sys +import logging + +from gi.repository import Gio +from gi.repository import GLib + +from gajim.common import app +from gajim.common.events import StyleChanged + +log = logging.getLogger('gajim.c.dbus.system_style') + + +class SystemStyleListener: + def __init__(self, callback) -> None: + self._prefer_dark = None + self._callback = callback + + if sys.platform in ('win32', 'darwin'): + return + + try: + self.dbus_proxy = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SESSION, + Gio.DBusProxyFlags.NONE, + None, + 'org.freedesktop.portal.Desktop', + '/org/freedesktop/portal/desktop', + 'org.freedesktop.portal.Settings', + None + ) + except GLib.Error as error: + log.info('Settings portal not found: %s', error) + return + + self.dbus_proxy.connect('g-signal', self._signal_setting_changed) + self.read_color_scheme() + + def read_color_scheme(self) -> None: + try: + result = self.dbus_proxy.call_sync( + 'Read', + GLib.Variant('(ss)', ('org.freedesktop.appearance', + 'color-scheme')), + Gio.DBusCallFlags.NO_AUTO_START, + -1, + None) + (self._prefer_dark,) = cast(tuple[bool], result) + except GLib.Error as error: + log.error("Couldn't read the color-scheme setting: %s", + error.message) + return + + def _signal_setting_changed(self, + _proxy, + _sender_name, + signal_name, + parameters, + *_user_data) -> None: + if signal_name != 'SettingChanged': + return + + namespace, name, value = parameters + if (namespace == "org.freedesktop.appearance" and + name == "color-scheme"): + self._prefer_dark = (value == 1) + self._callback() + app.ged.raise_event(StyleChanged()) + + @property + def prefer_dark(self) -> bool: + return self._prefer_dark ===================================== gajim/gtk/css_config.py ===================================== @@ -32,6 +32,7 @@ from gajim.common import app from gajim.common import configpaths from gajim.common.const import StyleAttr, CSSPriority +from gajim.common.dbus.system_style import SystemStyleListener from .const import Theme @@ -106,6 +107,8 @@ def __init__(self) -> None: # Holds all currently available themes self.themes: list[str] = [] + self._system_style = SystemStyleListener(callback=self.set_dark_theme) + self.set_dark_theme() self._load_css() self._gather_available_themes() @@ -122,6 +125,8 @@ def __init__(self) -> None: def prefer_dark(self) -> bool: setting = app.settings.get('dark_theme') if setting == Theme.SYSTEM: + if self._system_style.prefer_dark is not None: + return self._system_style.prefer_dark if settings is None: return False return settings.get_property('gtk-application-prefer-dark-theme') @@ -136,8 +141,10 @@ def set_dark_theme(self, value: Optional[int] = None) -> None: if settings is None: return if value == Theme.SYSTEM: - settings.reset_property('gtk-application-prefer-dark-theme') - return + if self._system_style.prefer_dark is None: + settings.reset_property('gtk-application-prefer-dark-theme') + return + value = self._system_style.prefer_dark settings.set_property('gtk-application-prefer-dark-theme', bool(value)) self._load_css() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b4182c9c14f88feb065d12566135b0d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b4182c9c14f88feb065d12566135b0d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: WorkspaceDialog: Show correct settings for workspace if there is only one
by Daniel Brötzmann (＠wurstsalat) 06 Jun '22

06 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 27175d60 by wurstsalat at 2022-06-06T10:48:46+02:00 fix: WorkspaceDialog: Show correct settings for workspace if there is only one Fixes #10950 - - - - - 1 changed file: - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -56,8 +56,12 @@ def __init__(self, workspace_id: Optional[str] = None) -> None: color: Optional[str] = None self._avatar_sha: Optional[str] = None - workspaces = app.settings.get_workspaces() - if workspace_id is None or len(workspaces) == 1: + if len(app.settings.get_workspaces()) == 1: + # Don't allow to remove last workspace + self._ui.remove_workspace_button.set_sensitive(False) + + if workspace_id is None: + # This is a new workspace self._ui.remove_workspace_button.set_sensitive(False) else: name = app.settings.get_workspace_setting( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27175d60ddf5c029f0ada1fd63e65ebb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27175d60ddf5c029f0ada1fd63e65ebb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Add ChatActionProcessor
by Daniel Brötzmann (＠wurstsalat) 06 Jun '22

06 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 86c52d6b by wurstsalat at 2022-06-06T10:37:05+02:00 feat: Add ChatActionProcessor - - - - - 5 changed files: - + gajim/gtk/chat_action_processor.py - gajim/gtk/controls/base.py - + gajim/gtk/emoji_data_gtk.py - gajim/gtk/message_input.py - pyrightconfig.json Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -0,0 +1,303 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import cast +from typing import Optional +from typing import TYPE_CHECKING + +from gi.repository import Gdk +from gi.repository import Gio +from gi.repository import GLib +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.const import Direction + +from .emoji_data_gtk import get_emoji_data +if TYPE_CHECKING: + from .message_input import MessageInputTextView + +MAX_ENTRIES = 5 + + +class ChatActionProcessor(Gtk.Popover): + def __init__(self, message_input: MessageInputTextView) -> None: + Gtk.Popover.__init__(self) + self._menu = Gio.Menu() + self.bind_model(self._menu) + self.set_relative_to(message_input) + self.set_position(Gtk.PositionType.TOP) + self.set_modal(False) + self.set_size_request(250, -1) + self.connect('closed', self._on_popover_closed) + self.connect('destroy', self._on_destroy) + + self._message_input = message_input + self._message_input.connect('key-press-event', self._on_key_press) + + self._buf = message_input.get_buffer() + self._buf.connect('changed', self._on_changed) + + self._start_mark: Optional[Gtk.TextMark] = None + self._current_iter: Optional[Gtk.TextIter] = None + + self._active = False + + def _on_destroy(self, _popover: Gtk.Popover) -> None: + app.check_finalize(self) + + def _on_key_press(self, + _textview: Gtk.TextView, + event: Gdk.EventKey + ) -> bool: + if not self._active: + return False + + if event.keyval == Gdk.KEY_Up: + self._move_selection(Direction.PREV) + return True + + if event.keyval == Gdk.KEY_Down: + self._move_selection(Direction.NEXT) + return True + + if event.keyval == Gdk.KEY_Return: + selected_action = self._get_selected_action() + self._replace_text(selected_action) + self.popdown() + return True + + if event.keyval == Gdk.KEY_Tab: + selected_action = self._get_selected_action() + self._replace_text(selected_action) + self.popdown() + return True + + return False + + def _on_popover_closed(self, _popover: Gtk.Popover) -> None: + self._active = False + self._message_input.grab_focus() + + def _get_text(self) -> str: + start, end = self._buf.get_bounds() + return self._buf.get_text(start, end, True) + + def _replace_text(self, selected_action: str) -> None: + assert self._start_mark is not None + start_iter = self._buf.get_iter_at_mark(self._start_mark) + assert self._current_iter is not None + self._buf.delete(start_iter, self._current_iter) + self._buf.insert(start_iter, selected_action) + + def _get_commands(self) -> list[str]: + commands: list[str] = [] + control = app.window.get_control( + self._message_input.account, self._message_input.contact.jid) + assert control is not None + for command in control.list_commands(): + for name in command.names: + commands.append(name) + return commands + + def _on_changed(self, _textview: MessageInputTextView) -> None: + insert = self._buf.get_insert() + self._current_iter = self._buf.get_iter_at_mark(insert) + current_offset = self._current_iter.get_offset() + + if self._start_mark is None: + start_iter = self._buf.get_iter_at_offset(current_offset - 1) + else: + start_iter = self._buf.get_iter_at_mark(self._start_mark) + + command_found = self._check_for_command(start_iter) + emoji_found = self._check_for_emoji(start_iter) + + if not command_found and not emoji_found: + if self._start_mark is not None: + self._buf.delete_mark(self._start_mark) + self._start_mark = None + self.popdown() + + def _check_for_command(self, start_iter: Gtk.TextIter) -> bool: + assert self._current_iter is not None + search = self._current_iter.backward_search( + '/', + Gtk.TextSearchFlags.VISIBLE_ONLY, + start_iter) + + if search is not None: + start, _end = search + if start.get_offset() > 0: + # '/' not at the beginning + return False + + action_text = self._buf.get_text(start, self._current_iter, False) + if self._start_mark is None: + self._start_mark = Gtk.TextMark.new('chat-action-start', True) + self._buf.add_mark(self._start_mark, start) + self._update_commands_menu(action_text, start) + return True + + return False + + def _update_commands_menu(self, + action_text: str, + start: Gtk.TextIter + ) -> None: + self._menu.remove_all() + command_list = self._get_commands() + for command in command_list: + if not command.startswith(action_text[1:]): + continue + if command_list.index(command) >= MAX_ENTRIES: + continue + action_data = GLib.Variant('s', f'/{command}') + menu_item = Gio.MenuItem() + menu_item.set_label(f'/{command}') + menu_item.set_attribute_value('action-data', action_data) + self._menu.append_item(menu_item) + + if self._menu.get_n_items() > 0: + self._show_menu(start) + else: + self.popdown() + + def _check_for_emoji(self, start_iter: Gtk.TextIter) -> bool: + assert self._current_iter is not None + search = self._current_iter.backward_search( + ':', + Gtk.TextSearchFlags.CASE_INSENSITIVE, + start_iter) + + if search is not None: + start, _end = search + colon_offset = start.get_offset() + before_colon = self._buf.get_iter_at_offset(colon_offset - 1) + if before_colon.get_char() != ' ': + # We want to show the menu only if text begins with a colon, + # or if a colon follows on a space. This avoids showing the + # menu within normal sentences containing colons. + text = self._get_text() + if not text.startswith(':'): + return False + + action_text = self._buf.get_text(start, self._current_iter, False) + if self._start_mark is None: + self._start_mark = Gtk.TextMark.new('chat-action-start', True) + self._buf.add_mark(self._start_mark, start) + self._update_emoji_menu(action_text, start) + return True + + return False + + def _update_emoji_menu(self, + action_text: str, + start: Gtk.TextIter + ) -> None: + self._menu.remove_all() + emoji_data = get_emoji_data() + menu_entry_count = 0 + for shortcode, codepoint in emoji_data.items(): + if not shortcode.startswith(action_text[1:]): + continue + if menu_entry_count >= MAX_ENTRIES: + continue + action_data = GLib.Variant('s', codepoint) + menu_item = Gio.MenuItem() + menu_item.set_label(f'{codepoint} {shortcode}') + menu_item.set_attribute_value('action-data', action_data) + self._menu.append_item(menu_item) + menu_entry_count += 1 + + if self._menu.get_n_items() > 0: + self._show_menu(start) + else: + self.popdown() + + def _show_menu(self, start: Gtk.TextIter) -> None: + self._active = True + rectangle = self._message_input.get_iter_location(start) + self.set_pointing_to(rectangle) + self.popup() + menu_items = self._get_menu_items() + menu_items[0].set_state_flags( + Gtk.StateFlags.FOCUSED | Gtk.StateFlags.PRELIGHT, False) + for item in menu_items: + item.connect( + 'clicked', self._on_item_clicked, menu_items.index(item)) + + def _on_item_clicked(self, _button: Gtk.MenuButton, index: int) -> None: + variant = self._menu.get_item_attribute_value( + index, 'action-data') + self._replace_text(variant.get_string()) + self.popdown() + + def _get_menu_items(self) -> list[Gtk.ModelButton]: + stack = cast(Gtk.Stack, self.get_children()[0]) + menu_section_box = cast(Gtk.Box, stack.get_children()[0]) + box = cast(Gtk.Box, menu_section_box.get_children()[0]) + items = cast(list[Gtk.ModelButton], box.get_children()) + return items + + def _get_selected_action(self) -> str: + items = self._get_menu_items() + for item in items: + if self._item_has_focus(item): + variant = self._menu.get_item_attribute_value( + items.index(item), 'action-data') + return variant.get_string() + return '' + + def _move_selection(self, direction: Direction) -> None: + # The popover cannot have real focus, since we want to continue + # writing in the message input. Instead, we emulate focus/prelight + # state for menu items when pressing Up/Down arrows. Reference: + # https://gitlab.gnome.org/GNOME/gtk/-/blob/main/gtk/ + # gtkemojicompletion.c + items = self._get_menu_items() + num_items = len(items) + if num_items == 1: + return + + new_item = items[0] # default item + for item in items: + if self._item_has_focus(item): + item.unset_state_flags( + Gtk.StateFlags.FOCUSED | Gtk.StateFlags.PRELIGHT) + else: + continue + + if direction is Direction.NEXT: + if items.index(item) == num_items - 1: + # Select first (default) + break + new_item = items[items.index(item) + 1] + break + + if items.index(item) == 0: + new_item = items[num_items -1] + break + new_item = items[items.index(item) - 1] + break + + new_item.set_state_flags( + Gtk.StateFlags.FOCUSED | Gtk.StateFlags.PRELIGHT, False) + + @staticmethod + def _item_has_focus(item: Gtk.ModelButton) -> bool: + flags = item.get_state_flags() + return 'GTK_STATE_FLAG_FOCUSED' in str(flags) ===================================== gajim/gtk/controls/base.py ===================================== @@ -213,7 +213,7 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: account, self.contact) self.xml.hbox.pack_start(self._security_label_selector, False, True, 0) - self.msg_textview = MessageInputTextView() + self.msg_textview = MessageInputTextView(self.account, self.contact) self.msg_textview.connect('paste-clipboard', self._on_message_textview_paste_event) self.msg_textview.connect('key-press-event', ===================================== gajim/gtk/emoji_data_gtk.py ===================================== @@ -0,0 +1,78 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Any + +import logging +from packaging.version import Version as V + +from gi.repository import Gio +from gi.repository import GLib + +from .util import get_gtk_version + +log = logging.getLogger('gajim.gui.emoji_data_gtk') + + +def get_emoji_data() -> dict[str, str]: + return emoji_data + + +def load_emoji_data() -> dict[str, str]: + # Location of emoji data resource changed in GTK >= 3.24.30 + if V(get_gtk_version()) >= V('3.24.30'): + emoji_data_resource = '/org/gtk/libgtk/emoji/en.data' + else: + emoji_data_resource = '/org/gtk/libgtk/emoji/emoji.data' + + try: + bytes_ = Gio.resources_lookup_data( + emoji_data_resource, + Gio.ResourceLookupFlags.NONE) + assert bytes_ is not None + # We have to store bytes_data in a variable to make sure Python + # keeps it until it is processed. + bytes_data = bytes_.get_data() + + def _pass(_user_data: Any) -> None: + pass + + variant = GLib.Variant.new_from_data( + GLib.VariantType('a(auss)'), + bytes_data, + True, + _pass) + + emoji_data_dict: dict[str, str] = {} + index = 0 + for _item in variant: + emoji = variant.get_child_value(index) + points = emoji.get_child_value(0) + codepoint = points.get_child_value(0).get_uint32() + shortcode = emoji.get_child_value(1).get_string() + emoji_data_dict[shortcode] = chr(codepoint) + index += 1 + + # Add commonly used shortcodes + emoji_data_dict['+1'] = '\U0001F44D' + emoji_data_dict['-1'] = '\U0001F44E' + return emoji_data_dict + + except GLib.Error: + return {} + + +emoji_data = load_emoji_data() ===================================== gajim/gtk/message_input.py ===================================== @@ -30,7 +30,9 @@ from gajim.common import app from gajim.common.styling import process from gajim.common.styling import PlainBlock +from gajim.common.types import ChatContactT +from .chat_action_processor import ChatActionProcessor from .util import scroll_to_end if app.is_installed('GSPELL'): @@ -50,8 +52,11 @@ class MessageInputTextView(Gtk.TextView): """ A Gtk.Textview for chat message input """ - def __init__(self) -> None: + def __init__(self, account: str, contact: ChatContactT) -> None: Gtk.TextView.__init__(self) + self.account = account + self.contact = contact + self.set_border_width(3) self.set_accepts_tab(True) self.set_editable(True) @@ -68,6 +73,8 @@ def __init__(self) -> None: self._undo_list: list[str] = [] self.undo_pressed: bool = False + self._chat_action_processor = ChatActionProcessor(self) + self.get_buffer().create_tag('strong', weight=Pango.Weight.BOLD) self.get_buffer().create_tag('emphasis', style=Pango.Style.ITALIC) self.get_buffer().create_tag('strike', strikethrough=True) @@ -89,6 +96,8 @@ def _on_destroy(self, _widget: Gtk.Widget) -> None: Gtk.DestDefaults.ALL, None, Gdk.DragAction.DEFAULT) + self._chat_action_processor.destroy() + app.check_finalize(self) def _on_focus_in(self, _widget: Gtk.Widget, ===================================== pyrightconfig.json ===================================== @@ -57,6 +57,7 @@ "gajim/gtk/call_window.py", "gajim/gtk/certificate_dialog.py", "gajim/gtk/change_password.py", + "gajim/gtk/chat_action_processor.py", "gajim/gtk/chat_filter.py", "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_list.py", @@ -68,6 +69,7 @@ "gajim/gtk/contact_settings.py", "gajim/gtk/conversation", "gajim/gtk/dialogs.py", + "gajim/gtk/emoji_data_gtk.py", "gajim/gtk/exception.py", "gajim/gtk/features.py", "gajim/gtk/file_transfer_send.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86c52d6bd49c5dde584ccc9e34eaa400… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86c52d6bd49c5dde584ccc9e34eaa400… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: feat: Add `Minimize to Tray` preference setting
by Philipp Hörist (＠lovetox) 04 Jun '22

04 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f7cae73e by lovetox at 2022-06-05T01:47:51+02:00 feat: Add `Minimize to Tray` preference setting NOTES: The ACE setting `main_window_skip_taskbar` is replaced with the preference setting `Minimize to Tray` without migration. - - - - - f8ea8b87 by lovetox at 2022-06-05T01:49:59+02:00 chore: Add NOTES section to ChangeLog - - - - - 5 changed files: - .chglog/config.yml - gajim/common/setting_values.py - gajim/gtk/main.py - gajim/gtk/preferences.py - gajim/gtk/status_icon.py Changes: ===================================== .chglog/config.yml ===================================== @@ -34,3 +34,6 @@ options: refs: actions: - Fixes + notes: + keywords: + - NOTES ===================================== gajim/common/setting_values.py ===================================== @@ -66,7 +66,7 @@ class _ACCOUNT_DEFAULT: 'ignore_incoming_attention', 'last_main_window_visible', 'log_contact_status_changes', - 'main_window_skip_taskbar', + 'minimize_to_tray', 'muc_prefer_direct_msg', 'notification_preview_message', 'notify_on_all_muc_messages', @@ -207,7 +207,7 @@ class _ACCOUNT_DEFAULT: 'last_main_window_visible': True, 'quit_on_main_window_x_button': False, 'hide_on_main_window_x_button': False, - 'main_window_skip_taskbar': False, + 'minimize_to_tray': False, 'latest_disco_addresses': '', 'change_roster_title': True, 'restore_timeout': -1, @@ -645,7 +645,6 @@ class WorkspaceSettings(TypedDict): 'notification_preview_message': _('Preview new messages in notification popup?'), 'muc_highlight_words': _('A list of words (semicolon separated) that will be highlighted in group chats.'), 'hide_on_main_window_x_button': _('If enabled, Gajim hides the main window when pressing the X button instead of minimizing into the notification area.'), - 'main_window_skip_taskbar': _('Don’t show main window in the system taskbar.'), 'use_urgency_hint': _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.'), 'notification_timeout': '', 'escape_key_closes': _('If enabled, pressing Esc closes a tab/window.'), ===================================== gajim/gtk/main.py ===================================== @@ -156,8 +156,8 @@ def __init__(self) -> None: self._on_client_state_changed) def _prepare_window(self) -> None: - if app.settings.get('main_window_skip_taskbar'): - self.set_property('skip-taskbar-hint', True) + if app.settings.get('minimize_to_tray'): + self.set_skip_taskbar_hint(True) restore_main_window_position() window_width = app.settings.get('mainwin_width') ===================================== gajim/gtk/preferences.py ===================================== @@ -204,10 +204,21 @@ def __init__(self, *args: Any) -> None: SettingType.CONFIG, 'quit_on_main_window_x_button', desc=_('Quit when closing Gajim’s window')), + + Setting(SettingKind.SWITCH, + _('Minimize to Tray'), + SettingType.CONFIG, + 'minimize_to_tray', + desc=_('Hide window to system tray when minimized'), + callback=self._on__minimize_to_tray), ] PreferenceBox.__init__(self, settings) + @staticmethod + def _on__minimize_to_tray(value: bool, *args: Any) -> None: + app.window.set_skip_taskbar_hint(value) + class Plugins(PreferenceBox): def __init__(self, *args: Any) -> None: ===================================== gajim/gtk/status_icon.py ===================================== @@ -200,8 +200,6 @@ def _on_activate(self, *args: Any) -> None: # Window was minimized restore_main_window_position() - if not app.settings.get('main_window_skip_taskbar'): - app.window.set_property('skip-taskbar-hint', False) app.window.present_with_time(Gtk.get_current_event_time()) @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2c54d9e674f1ffd4f00bea1e8c1419b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2c54d9e674f1ffd4f00bea1e8c1419b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: History: Add Keep History 'Until Gajim is Closed' option
by Daniel Brötzmann (＠wurstsalat) 03 Jun '22

03 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2c54d9e6 by wurstsalat at 2022-06-03T20:43:38+02:00 imprv: History: Add Keep History 'Until Gajim is Closed' option This moves history cleanup from startup to Gajim’s shutdown routine - - - - - 3 changed files: - gajim/common/application.py - gajim/common/storage/archive.py - gajim/gtk/accounts.py Changes: ===================================== gajim/common/application.py ===================================== @@ -116,6 +116,7 @@ def _on_disconnect(event: AccountDisonnected) -> None: def _shutdown_core(self) -> None: # Commit any outstanding SQL transactions + app.storage.archive.cleanup_chat_history() app.storage.cache.shutdown() app.storage.archive.shutdown() ===================================== gajim/common/storage/archive.py ===================================== @@ -181,7 +181,6 @@ def init(self, **kwargs: Any) -> None: self._con.create_function("get_timeout", 0, self._get_timeout) self._get_jid_ids_from_db() - self._cleanup_chat_history() def _namedtuple_factory(self, cursor: sqlite.Cursor, @@ -1391,7 +1390,7 @@ def remove_all_history(self) -> None: self._execute_multiple(statements) log.info('Removed all chat history') - def _cleanup_chat_history(self) -> None: + def cleanup_chat_history(self) -> None: """ Remove messages from account where messages are older than max_age """ ===================================== gajim/gtk/accounts.py ===================================== @@ -722,6 +722,7 @@ def __init__(self, account: str) -> None: history_max_age = { -1: _('Forever'), + 0: _('Until Gajim is Closed'), 86400: _('1 Day'), 604800: _('1 Week'), 2629743: _('1 Month'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c54d9e674f1ffd4f00bea1e8c1419b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c54d9e674f1ffd4f00bea1e8c1419b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update debian control file
by Philipp Hörist (＠lovetox) 03 Jun '22

03 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 329739a9 by lovetox at 2022-06-03T09:38:13+02:00 ci: Update debian control file Add python3-pil to the build dependencys, it is needed for running tests - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -13,6 +13,7 @@ Build-Depends: python3-gi-cairo, python3-nbxmpp-nightly (>=20220501), python3-setuptools, + python3-pil, gir1.2-gtk-3.0, Rules-Requires-Root: no Standards-Version: 4.1.4 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/329739a98b25a86dcea4f2f960711cfe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/329739a98b25a86dcea4f2f960711cfe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Application: Split adding and connecting to actions
by Philipp Hörist (＠lovetox) 02 Jun '22

02 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 074606d1 by lovetox at 2022-06-02T23:54:03+02:00 refactor: Application: Split adding and connecting to actions - - - - - 3316e479 by lovetox at 2022-06-02T23:54:03+02:00 fix: StatusIcon: Reliably raise/hide window - - - - - 3 changed files: - gajim/gtk/application.py - gajim/gtk/const.py - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -42,7 +42,6 @@ import os import sys - from urllib.parse import unquote from nbxmpp.namespaces import Namespace @@ -74,6 +73,11 @@ from gajim.gui.about import AboutDialog from gajim.gui.avatar import AvatarStorage from gajim.gui.builder import get_builder +from gajim.gui.const import ACCOUNT_ACTIONS +from gajim.gui.const import ALWAYS_ACCOUNT_ACTIONS +from gajim.gui.const import APP_ACTIONS +from gajim.gui.const import FEATURE_ACCOUNT_ACTIONS +from gajim.gui.const import ONLINE_ACCOUNT_ACTIONS from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import ShortcutsWindow @@ -85,7 +89,6 @@ ActionListT = list[tuple[str, - Optional[str], Callable[[Gio.SimpleAction, GLib.Variant], Any]]] @@ -246,7 +249,11 @@ def _startup(self, _application: GajimApplication) -> None: from gajim.gui.status_icon import StatusIcon self.systray = StatusIcon() - self.add_actions() + self._add_app_actions() + accounts = app.settings.get_accounts() + for account in accounts: + self.add_account_actions(account) + self._load_shortcuts() menus.build_accounts_menu() self.update_app_actions_state() @@ -389,109 +396,109 @@ def _handle_local_options(self, return -1 - def add_actions(self) -> None: - actions: ActionListT = [ - ('quit', None, self._on_quit_action), - ('add-account', None, self._on_add_account_action), - ('manage-proxies', None, self._on_manage_proxies_action), - ('preferences', None, self._on_preferences_action), - ('plugins', None, self._on_plugins_action), - ('xml-console', None, self._on_xml_console_action), - ('file-transfer', None, self._on_file_transfer_action), - ('shortcuts', None, self._on_shortcuts_action), - ('features', None, self._on_features_action), - ('content', None, self._on_content_action), - ('join-support-chat', None, self._on_join_support_chat), - ('about', None, self._on_about_action), - ('faq', None, self._on_faq_action), - ('ipython', None, self._on_ipython_action), - ('start-chat', 's', self._on_new_chat_action), - ('accounts', 's', self._on_accounts_action), - ('add-contact', 's', self._on_add_contact_action), - ('copy-text', 's', self._on_copy_text_action), - ('open-link', 'as', self._on_open_link_action), - ('open-mail', 's', self._on_open_mail_action), - ('remove-history', 'a{sv}', self._on_remove_history_action), - ('create-groupchat', 's', self._on_create_groupchat_action), - ('forget-groupchat', 'a{sv}', self._on_forget_groupchat_action), - ('groupchat-join', 'as', self._on_groupchat_join_action), - ] - - for action in actions: - action_name, variant, func = action + def _add_app_actions(self) -> None: + for action in APP_ACTIONS: + action_name, variant = action if variant is not None: variant = GLib.VariantType.new(variant) act = Gio.SimpleAction.new(action_name, variant) - act.connect('activate', func) self.add_action(act) - accounts_list = sorted(app.settings.get_accounts()) - if not accounts_list: - return - if len(accounts_list) > 1: - for acc in accounts_list: - self.add_account_actions(acc) - else: - self.add_account_actions(accounts_list[0]) - - def _get_account_actions(self, - account: str) -> list[tuple[str, Any, str, str]]: - # pylint: disable=line-too-long - return [ - ('-bookmarks', self._on_bookmarks_action, 'online', 's'), - ('-open-chat', self._on_open_chat_action, 'online', 'as'), - ('-add-contact', self._on_add_contact_account_action, 'online', 'as'), - ('-services', self._on_services_action, 'online', 's'), - ('-profile', self._on_profile_action, 'online', 's'), - ('-server-info', self._on_server_info_action, 'online', 's'), - ('-archive', self._on_archive_action, 'feature', 's'), - ('-pep-config', self._on_pep_config_action, 'online', 's'), - ('-sync-history', self._on_sync_history_action, 'online', 's'), - ('-blocking', self._on_blocking_action, 'feature', 's'), - ('-open-event', self._on_open_event_action, 'always', 'a{sv}'), - ('-mark-as-read', self._on_mark_as_read_action, 'always', 'a{sv}'), - ('-import-contacts', self._on_import_contacts_action, 'online', 's'), - ('-export-history', self._on_export_history, 'always', 's'), + self._connect_app_actions() + + def _connect_app_actions(self) -> None: + actions: ActionListT = [ + ('quit', self._on_quit_action), + ('add-account', self._on_add_account_action), + ('manage-proxies', self._on_manage_proxies_action), + ('preferences', self._on_preferences_action), + ('plugins', self._on_plugins_action), + ('xml-console', self._on_xml_console_action), + ('file-transfer', self._on_file_transfer_action), + ('shortcuts', self._on_shortcuts_action), + ('features', self._on_features_action), + ('content', self._on_content_action), + ('join-support-chat', self._on_join_support_chat), + ('about', self._on_about_action), + ('faq', self._on_faq_action), + ('ipython', self._on_ipython_action), + ('start-chat', self._on_new_chat_action), + ('accounts', self._on_accounts_action), + ('add-contact', self._on_add_contact_action), + ('copy-text', self._on_copy_text_action), + ('open-link', self._on_open_link_action), + ('open-mail', self._on_open_mail_action), + ('remove-history', self._on_remove_history_action), + ('create-groupchat', self._on_create_groupchat_action), + ('forget-groupchat', self._on_forget_groupchat_action), + ('groupchat-join', self._on_groupchat_join_action), ] - # pylint: enable=line-too-long + + for action in actions: + action_name, func = action + act = self.lookup_action(action_name) + assert act is not None + act.connect('activate', func) + self.add_action(act) def add_account_actions(self, account: str) -> None: - for action in self._get_account_actions(account): - action_name, func, state, type_ = action - action_name = account + action_name - if self.lookup_action(action_name) is not None: - # We already added this action - continue - act = Gio.SimpleAction.new( - action_name, GLib.VariantType.new(type_)) - act.connect("activate", func) - if state != 'always': - act.set_enabled(False) + for action_name, type_ in ACCOUNT_ACTIONS: + account_action_name = f'{account}-{action_name}' + if self.has_action(account_action_name): + raise ValueError('Trying to add action more than once') + + act = Gio.SimpleAction.new(account_action_name, + GLib.VariantType.new(type_)) + act.set_enabled(action_name in ALWAYS_ACCOUNT_ACTIONS) self.add_action(act) + self._connect_account_actions(account) + + def _connect_account_actions(self, account: str) -> None: + actions = [ + ('bookmarks', self._on_bookmarks_action), + ('open-chat', self._on_open_chat_action), + ('add-contact', self._on_add_contact_account_action), + ('services', self._on_services_action), + ('profile', self._on_profile_action), + ('server-info', self._on_server_info_action), + ('archive', self._on_archive_action), + ('pep-config', self._on_pep_config_action), + ('sync-history', self._on_sync_history_action), + ('blocking', self._on_blocking_action), + ('open-event', self._on_open_event_action), + ('mark-as-read', self._on_mark_as_read_action), + ('import-contacts', self._on_import_contacts_action), + ('export-history', self._on_export_history), + ] + + for action_name, func in actions: + account_action_name = f'{account}-{action_name}' + act = self.lookup_action(account_action_name) + assert act is not None + act.connect('activate', func) + def remove_account_actions(self, account: str) -> None: - for action in self._get_account_actions(account): - action_name = account + action[0] - self.remove_action(action_name) + for action_name in self.list_actions(): + if action_name.startswith(f'{account}-'): + self.remove_action(action_name) def set_action_state(self, action_name: str, state: bool) -> None: action = self.lookup_action(action_name) - if action is None: - raise ValueError('Action %s does not exist' % action_name) + assert action is not None action.set_enabled(state) def set_account_actions_state(self, account: str, new_state: bool = False) -> None: - for action in self._get_account_actions(account): - action_name, _, state, _ = action - if not new_state and state in ('online', 'feature'): - # We go offline - self.set_action_state(account + action_name, False) - elif new_state and state == 'online': - # We go online - self.set_action_state(account + action_name, True) + + for action_name in ONLINE_ACCOUNT_ACTIONS: + self.set_action_state(f'{account}-{action_name}', new_state) + + if not new_state: + for action_name in FEATURE_ACCOUNT_ACTIONS: + self.set_action_state(f'{account}-{action_name}', new_state) def update_app_actions_state(self) -> None: active_accounts = bool(app.get_connected_accounts(exclude_local=True)) ===================================== gajim/gtk/const.py ===================================== @@ -156,3 +156,75 @@ def __str__(self): 'WorkspaceDialog': 'gajim.gui.workspace_dialog', 'XMLConsoleWindow': 'gajim.gui.xml_console', } + + +APP_ACTIONS = [ + ('about', None), + ('accounts', 's'), + ('add-account', None), + ('add-contact', 's'), + ('content', None), + ('copy-text', 's'), + ('create-groupchat', 's'), + ('faq', None), + ('features', None), + ('file-transfer', None), + ('forget-groupchat', 'a{sv}'), + ('groupchat-join', 'as'), + ('ipython', None), + ('join-support-chat', None), + ('manage-proxies', None), + ('open-link', 'as'), + ('open-mail', 's'), + ('plugins', None), + ('preferences', None), + ('quit', None), + ('remove-history', 'a{sv}'), + ('shortcuts', None), + ('start-chat', 's'), + ('xml-console', None), +] + + +ACCOUNT_ACTIONS = [ + ('add-contact', 'as'), + ('archive', 's'), + ('blocking', 's'), + ('bookmarks', 's'), + ('export-history', 's'), + ('import-contacts', 's'), + ('mark-as-read', 'a{sv}'), + ('open-chat', 'as'), + ('open-event', 'a{sv}'), + ('pep-config', 's'), + ('profile', 's'), + ('server-info', 's'), + ('services', 's'), + ('sync-history', 's'), +] + + +ALWAYS_ACCOUNT_ACTIONS = { + 'export-history', + 'import-contacts', + 'open-event', +} + + +ONLINE_ACCOUNT_ACTIONS = { + 'add-contact', + 'bookmarks', + 'import-contacts', + 'open-chat', + 'pep-config', + 'profile', + 'server-info', + 'services', + 'sync-history', +} + + +FEATURE_ACCOUNT_ACTIONS = { + 'archive', + 'blocking', +} ===================================== gajim/gtk/status_icon.py ===================================== @@ -188,12 +188,10 @@ def _on_sounds_mute(widget: Gtk.CheckMenuItem) -> None: app.settings.set('sounds_on', not widget.get_active()) def _on_toggle_window(self, _widget: Gtk.MenuItem) -> None: - # When using Gtk.StatusIcon, app.window will never return True for - # 'has-toplevel-focus' while clicking the menu item - GLib.idle_add(self._on_activate) + self._on_activate() def _on_activate(self, *args: Any) -> None: - if app.window.get_property('has-toplevel-focus'): + if app.settings.get('last_main_window_visible'): save_main_window_position() app.window.hide() return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3db1e09c59d82f982801f90f13ae459… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3db1e09c59d82f982801f90f13ae459… 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