Commits June 2022

commits@gajim.org

1 participants
132 discussions

[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

[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

← Newer
1
...
8
9
10
11
12
13
14
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2022