Commits February 2022

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] Remove Single Message Window
by Philipp Hörist (＠lovetox) 02 Feb '22

02 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9feb0a0f by lovetox at 2022-02-02T23:41:11+01:00 Remove Single Message Window - - - - - 6 changed files: - − gajim/data/gui/single_message_window.ui - gajim/gtk/application.py - gajim/gtk/builder.pyi - gajim/gtk/const.py - gajim/gtk/menus.py - − gajim/gtk/single_message.py Changes: ===================================== gajim/data/gui/single_message_window.ui deleted ===================================== @@ -1,166 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.24"/> - <object class="GtkBox" id="box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> -  - <object class="GtkGrid" id="message_grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_To</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">recipients_entry</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="recipients_entry"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="placeholder-text" translatable="yes">user(a)example.org</property> - <signal name="changed" handler="_on_changed" swapped="no"/> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Su_bject</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">subject_entry</property> - <property name="single-line-mode">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="subject_entry"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="placeholder-text" translatable="yes">Type the subject here...</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Message</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">message_textview</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="height-request">100</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="vexpand">True</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="wrap-mode">word-char</property> - <property name="left-margin">6</property> - <property name="right-margin">6</property> - <property name="top-margin">6</property> - <property name="bottom-margin">6</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="count_chars_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Characters typed: 0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - <property name="width">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_button"> - <property name="label" translatable="yes">_Send</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">Send message and close window</property> - <property name="halign">end</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="padding-18"/> - </style> - </object> -</interface> ===================================== gajim/gtk/application.py ===================================== @@ -435,7 +435,6 @@ def _get_account_actions(self, # pylint: disable=line-too-long return [ ('-bookmarks', self._on_bookmarks_action, 'online', 's'), - ('-start-single-chat', self._on_start_single_message_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'), @@ -602,12 +601,6 @@ def _on_add_contact_account_action(_action: Gio.SimpleAction, jid = JID.from_string(jid) open_window('AddContact', account=account or None, jid=jid or None) - @staticmethod - def _on_start_single_message_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: - account = param.get_string() - open_window('SingleMessageWindow', account=account) - @staticmethod def _on_add_account_action(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: ===================================== gajim/gtk/builder.pyi ===================================== @@ -848,17 +848,6 @@ class ShortcutsWindowBuilder(Builder): shortcuts_window: Gtk.ShortcutsWindow -class SingleMessageWindowBuilder(Builder): - box: Gtk.Box - message_grid: Gtk.Grid - recipients_entry: Gtk.Entry - subject_entry: Gtk.Entry - message_scrolledwindow: Gtk.ScrolledWindow - message_textview: Gtk.TextView - count_chars_label: Gtk.Label - send_button: Gtk.Button - - class SslErrorDialogBuilder(Builder): ssl_error_box: Gtk.Box intro_text: Gtk.Label @@ -1074,8 +1063,6 @@ def get_builder(file_name: Literal['service_discovery_window.ui'], widgets: list @overload def get_builder(file_name: Literal['shortcuts_window.ui'], widgets: list[str] = ...) -> ShortcutsWindowBuilder: ... @overload -def get_builder(file_name: Literal['single_message_window.ui'], widgets: list[str] = ...) -> SingleMessageWindowBuilder: ... -@overload def get_builder(file_name: Literal['ssl_error_dialog.ui'], widgets: list[str] = ...) -> SslErrorDialogBuilder: ... @overload def get_builder(file_name: Literal['start_chat_dialog.ui'], widgets: list[str] = ...) -> StartChatDialogBuilder: ... ===================================== gajim/gtk/const.py ===================================== @@ -162,7 +162,6 @@ def __str__(self): 'ServerInfo': 'gajim.gui.server_info', 'ServiceDiscoveryWindow': 'gajim.gui.discovery', 'ServiceRegistration': 'gajim.gui.service_registration', - 'SingleMessageWindow': 'gajim.gui.single_message', 'SSLErrorDialog': 'gajim.gui.ssl_error_dialog', 'StartChatDialog': 'gajim.gui.start_chat', 'SynchronizeAccounts': 'gajim.gui.synchronize_accounts', ===================================== gajim/gtk/menus.py ===================================== @@ -171,7 +171,6 @@ def get_account_menu(account: str) -> Gio.Menu: menuitems: MenuItemListT = [ (_('Profile'), f'app.{account}-profile', val), - (_('Send Single Message…'), f'app.{account}-start-single-chat', val), (_('Discover Services…'), f'app.{account}-services', val), (_('Server Info'), f'app.{account}-server-info', val), ] ===================================== gajim/gtk/single_message.py deleted ===================================== @@ -1,150 +0,0 @@ -# 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 typing import Any -from typing import Optional - -from gi.repository import Gdk -from gi.repository import Gtk - -from nbxmpp.protocol import JID - -from gajim.common import app -from gajim.common.helpers import get_contact_dict_for_account -from gajim.common.helpers import validate_jid -from gajim.common.i18n import _ -from gajim.common.structs import OutgoingMessage - -from .dialogs import ErrorDialog -from .builder import get_builder -from .util import get_completion_liststore -from .util import get_icon_name - -if app.is_installed('GSPELL'): - from gi.repository import Gspell # pylint: disable=ungrouped-imports - - -class SingleMessageWindow(Gtk.ApplicationWindow): - def __init__(self, - account: str, - recipients: Optional[str] = None - ) -> None: - Gtk.ApplicationWindow.__init__(self) - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_show_menubar(False) - self.set_size_request(500, -1) - self.set_name('SingleMessageWindow') - - self.account = account - self._client = app.get_client(account) - self._recipients = recipients - self._completion_dict = {} - - if len(app.connections) > 1: - title = _('Single Message (%s)') % self.account - else: - title = _('Single Message') - self.set_title(title) - - self._ui = get_builder('single_message_window.ui') - self._message_buffer = self._ui.message_textview.get_buffer() - self._message_buffer.connect('changed', self._update_char_counter) - - if recipients is not None: - self._ui.recipients_entry.set_text(recipients) - - if (app.settings.get('use_speller') and - app.is_installed('GSPELL')): - lang = app.settings.get('speller_language') - gspell_lang = Gspell.language_lookup(lang) - if gspell_lang is None: - gspell_lang = Gspell.language_get_default() - spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( - self._ui.message_textview.get_buffer()) - spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) - spell_view = Gspell.TextView.get_from_gtk_text_view( - self._ui.message_textview) - spell_view.set_inline_spell_checking(True) - spell_view.set_enable_language_menu(True) - - liststore = get_completion_liststore(self._ui.recipients_entry) - self._completion_dict = get_contact_dict_for_account(account) - for jid, contact in self._completion_dict.items(): - icon_name = get_icon_name(contact.show.value) - liststore.append((icon_name, jid)) - - self.add(self._ui.box) - - if self._recipients is not None: - self._ui.message_textview.grab_focus() - - self.connect('key-press-event', self._on_key_press) - self._ui.connect_signals(self) - - self.show_all() - - def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - def _on_changed(self, *args: Any) -> None: - recipients = self._ui.recipients_entry.get_text() - begin, end = self._message_buffer.get_bounds() - message = self._message_buffer.get_text(begin, end, True) - self._ui.send_button.set_sensitive(bool(recipients and message)) - - def _update_char_counter(self, _widget: Gtk.TextView) -> None: - characters_no = self._message_buffer.get_char_count() - self._ui.count_chars_label.set_text( - _('Characters typed: %s') % str(characters_no)) - self._on_changed() - - def _on_send_clicked(self, _widget: Gtk.Button) -> None: - if not app.account_is_available(self.account): - ErrorDialog(_('Not Connected'), - _('Please make sure you are connected with "%s".') % - self.account) - return - - jids = self._ui.recipients_entry.get_text() - subject = self._ui.subject_entry.get_text() - begin, end = self._message_buffer.get_bounds() - message = self._message_buffer.get_text(begin, end, True) - - recipient_list: list[JID] = [] - for jid in jids.split(','): - try: - jid = validate_jid(jid.strip()) - except ValueError as err: - ErrorDialog( - _('Cannot Send Message'), - _('XMPP Address "%(jid)s" is invalid.\n%(error)s') % { - 'jid': jid, 'error': err}) - return - - if '/announce/' in str(jid): - self._client.get_module('Announce').set_announce( - jid, subject, message) - continue - - recipient_list.append(jid) - - message = OutgoingMessage(account=self.account, - contact=None, - message=message, - type_='normal', - subject=subject) - self._client.send_messages(recipient_list, message) - self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9feb0a0f92464179d04ac34e20c986ac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9feb0a0f92464179d04ac34e20c986ac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add SimpleClientState.CONNECTING
by Philipp Hörist (＠lovetox) 02 Feb '22

02 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: bab39049 by lovetox at 2022-02-02T23:34:41+01:00 Add SimpleClientState.CONNECTING - - - - - 2 changed files: - gajim/common/client.py - gajim/common/const.py Changes: ===================================== gajim/common/client.py ===================================== @@ -561,6 +561,7 @@ def connect(self, ignored_tls_errors: IgnoredTlsErrorsT = None) -> None: self._reconnect = True self._disable_reconnect_timer() self._set_state(ClientState.CONNECTING) + self.notify('state-changed', SimpleClientState.CONNECTING) if warn_about_plain_connection(self._account, self._client.connection_types): ===================================== gajim/common/const.py ===================================== @@ -304,18 +304,23 @@ def is_available(self): class SimpleClientState(Enum): + CONNECTING = 'connecting' DISCONNECTED = 'disconnected' CONNECTED = 'connected' RESUME_IN_PROGRESS = 'resume-in-progress' @property - def is_disconnected(self): - return self == SimpleClientState.DISCONNECTED + def is_connecting(self): + return self == SimpleClientState.CONNECTING @property def is_connected(self): return self == SimpleClientState.CONNECTED + @property + def is_disconnected(self): + return self == SimpleClientState.DISCONNECTED + @property def is_resume_in_progress(self): return self == SimpleClientState.RESUME_IN_PROGRESS View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bab39049531ea50ff488035b134ef30c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bab39049531ea50ff488035b134ef30c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove support for server announce
by Philipp Hörist (＠lovetox) 02 Feb '22

02 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 318001e5 by lovetox at 2022-02-02T22:53:40+01:00 Remove support for server announce The functionality is available via adhoc commands - - - - - 3 changed files: - − gajim/common/modules/announce.py - gajim/gtk/application.py - gajim/gtk/menus.py Changes: ===================================== gajim/common/modules/announce.py deleted ===================================== @@ -1,33 +0,0 @@ -# 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/>. - -# Server MOTD and Announce - -import nbxmpp - -from gajim.common.modules.base import BaseModule - - -class Announce(BaseModule): - def __init__(self, con): - BaseModule.__init__(self, con) - - def delete_motd(self): - server = self._con.get_own_jid().domain - jid = '%s/announce/motd/delete' % server - self.set_announce(jid) - - def set_announce(self, jid, subject=None, body=None): - message = nbxmpp.Message(to=jid, body=body, subject=subject) - self._nbxmpp().send(message) ===================================== gajim/gtk/application.py ===================================== @@ -445,10 +445,6 @@ def _get_account_actions(self, ('-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'), - ('-send-server-message', self._on_send_server_message_action, 'online', 's'), - ('-set-motd', self._on_set_motd_action, 'online', 's'), - ('-update-motd', self._on_update_motd_action, 'online', 's'), - ('-delete-motd', self._on_delete_motd_action, 'online', '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'), @@ -577,14 +573,6 @@ def _on_profile_action(_action: Gio.SimpleAction, account = param.get_string() open_window('ProfileWindow', account=account) - @staticmethod - def _on_send_server_message_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: - account = param.get_string() - server = app.settings.get_account_setting(account, 'hostname') - server += '/announce/online' - open_window('SingleMessageWindow', account=account, recipients=server) - @staticmethod def _on_services_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: @@ -676,28 +664,6 @@ def _on_manage_proxies_action(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: open_window('ManageProxies') - @staticmethod - def _on_set_motd_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: - account = param.get_string() - server = app.settings.get_account_setting(account, 'hostname') - server += '/announce/motd' - open_window('SingleMessageWindow', account=account, recipients=server) - - @staticmethod - def _on_update_motd_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: - account = param.get_string() - server = app.settings.get_account_setting(account, 'hostname') - server += '/announce/motd/update' - open_window('SingleMessageWindow', account=account, recipients=server) - - @staticmethod - def _on_delete_motd_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: - account = param.get_string() - app.connections[account].get_module('Announce').delete_motd() - @staticmethod def _on_content_action(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -191,15 +191,6 @@ def get_account_menu(account: str) -> Gio.Menu: menu.append_submenu(_('Advanced'), make_menu(advanced_menuitems)) - admin_menuitems: MenuItemListT = [ - (_('Send Server Message…'), f'app.{account}-send-server-message', val), - (_('Set MOTD…'), f'app.{account}-set-motd', val), - (_('Update MOTD…'), f'app.{account}-update-motd', val), - (_('Delete MOTD…'), f'app.{account}-delete-motd', val) - ] - - menu.append_submenu(_('Admin'), make_menu(admin_menuitems)) - return menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/318001e558b14863e0ce7ca2298fcc85… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/318001e558b14863e0ce7ca2298fcc85… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 02 Feb '22

02 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a6615913 by lovetox at 2022-02-02T22:49:02+01:00 Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -71,6 +71,7 @@ "gajim/gtk/structs.py", "gajim/gtk/themes.py", "gajim/gtk/tooltips.py", + "gajim/gtk/util.py", "gajim/gtk/video_preview.py", "gajim/gtk/workspace_dialog.py", ], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a6615913fa489ba56b6f38e33d65ccb6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a6615913fa489ba56b6f38e33d65ccb6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: util: Add type annotations
by Philipp Hörist (＠lovetox) 02 Feb '22

02 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5c91d145 by lovetox at 2022-02-02T22:45:07+01:00 util: Add type annotations - - - - - 974b8dd3 by lovetox at 2022-02-02T22:45:17+01:00 Remove unused method - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -275,9 +275,11 @@ def get_total_screen_geometry() -> tuple[int, int]: total_width = 0 total_height = 0 display = Gdk.Display.get_default() + assert display is not None monitors = display.get_n_monitors() for num in range(0, monitors): monitor = display.get_monitor(num) + assert monitor is not None geometry = monitor.get_geometry() total_width += geometry.width total_height = max(total_height, geometry.height) @@ -358,6 +360,7 @@ def get_completion_liststore(entry: Gtk.Entry) -> Gtk.ListStore: def get_cursor(name: str) -> Gdk.Cursor: display = Gdk.Display.get_default() + assert display is not None cursor = Gdk.Cursor.new_from_name(display, name) if cursor is not None: return cursor @@ -412,13 +415,6 @@ def get_image_button(icon_name: str, tooltip: str, return button -def get_image_from_icon_name(icon_name: str, scale: int) -> Any: - icon_theme = Gtk.IconTheme.get_default() - icon = get_icon_name(icon_name) - surface = icon_theme.load_surface(icon, 16, scale, None, 0) - return Gtk.Image.new_from_surface(surface) - - def python_month(month: int) -> int: return month + 1 @@ -460,6 +456,7 @@ def make_rgba(color_string: str) -> Gdk.RGBA: def get_monitor_scale_factor() -> int: display = Gdk.Display.get_default() + assert display is not None monitor = display.get_primary_monitor() if monitor is None: log.warning('Could not determine scale factor') @@ -477,6 +474,7 @@ def get_primary_accel_mod() -> Optional[Gdk.ModifierType]: def get_hardware_key_codes(keyval: int) -> list[int]: display = Gdk.Display.get_default() + assert display is not None keymap = Gdk.Keymap.get_for_display(display) valid, key_map_keys = keymap.get_entries_for_keyval(keyval) @@ -485,9 +483,9 @@ def get_hardware_key_codes(keyval: int) -> list[int]: return [key.keycode for key in key_map_keys] -def ensure_not_destroyed(func): +def ensure_not_destroyed(func: Any) -> Any: @wraps(func) - def func_wrapper(self, *args, **kwargs): + def func_wrapper(self: Any, *args: Any, **kwargs: Any): if self._destroyed: # pylint: disable=protected-access return None return func(self, *args, **kwargs) @@ -513,9 +511,9 @@ def get_account_tune_icon_name(account: str) -> Optional[str]: def format_location(location: LocationData) -> str: - location = location._asdict() + location_dict = location._asdict() location_string = '' - for attr, value in location.items(): + for attr, value in location_dict.items(): if value is None: continue text = GLib.markup_escape_text(value) @@ -599,7 +597,7 @@ def text_to_color(text: str) -> tuple[float, float, float]: background = (0, 0, 0) # RGB (0, 0, 0) black else: background = (1, 1, 1) # RGB (255, 255, 255) white - return nbxmpp.util.text_to_color(text, background) + return nbxmpp.util.text_to_color(text, background) # type: ignore def get_color_for_account(account: str) -> str: @@ -646,7 +644,7 @@ def get_pixbuf_from_data(file_data: bytes) -> Optional[GdkPixbuf.Pixbuf]: 'convert avatar image using pillow') try: avatar = Image.open(BytesIO(file_data)).convert("RGBA") - array = GLib.Bytes.new(avatar.tobytes()) + array = GLib.Bytes.new(avatar.tobytes()) # type: ignore width, height = avatar.size pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( array, GdkPixbuf.Colorspace.RGB, @@ -683,6 +681,7 @@ def scale_pixbuf_from_data(data: bytes, size: int ) -> Optional[GdkPixbuf.Pixbuf]: pixbuf = get_pixbuf_from_data(data) + assert pixbuf is not None return scale_pixbuf(pixbuf, size) @@ -705,7 +704,7 @@ def load_pixbuf(path: Union[str, Path], log.debug('Error', exc_info=True) return None - array = GLib.Bytes.new(avatar.tobytes()) + array = GLib.Bytes.new(avatar.tobytes()) # type: ignore width, height = avatar.size pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( array, GdkPixbuf.Colorspace.RGB, True, @@ -746,7 +745,7 @@ def make_href_markup(string: str) -> str: assert isinstance(url_color, str) color = convert_rgb_to_hex(url_color) - def _to_href(match: Match) -> str: + def _to_href(match: Match[str]) -> str: url = match.group() if '://' not in url: url = 'https://' + url @@ -760,7 +759,7 @@ def get_app_windows(account: str) -> list[Gtk.Window]: windows: list[Gtk.Window] = [] for win in app.app.get_windows(): if hasattr(win, 'account'): - if win.account == account: + if win.account == account: # type: ignore windows.append(win) return windows @@ -774,11 +773,11 @@ def get_app_window(name: str, continue if account is not None: - if account != win.account: + if account != win.account: # type: ignore continue if jid is not None: - if jid != win.jid: + if jid != win.jid: # type: ignore continue return win return None @@ -800,7 +799,7 @@ def open_window(name: str, **kwargs: Any) -> Any: class EventHelper(CommonEventHelper): def __init__(self): CommonEventHelper.__init__(self) - self.connect('destroy', self.__on_destroy) # pylint: disable=no-member + self.connect('destroy', self.__on_destroy) # type: ignore def __on_destroy(self, *args: Any) -> None: self.unregister_events() @@ -812,7 +811,12 @@ def _destroy(*args: Any) -> None: widget.connect('destroy', _destroy) -def _connect_destroy(sender, func, detailed_signal, handler, *args, **kwargs): +def _connect_destroy(sender: Any, + func: Any, + detailed_signal: str, + handler: Any, + *args: Any, + **kwargs: Any) -> int: """Connect a bound method to a foreign object signal and disconnect if the object the method is bound to emits destroy (Gtk.Widget subclass). Also works if the handler is a nested function in a method and @@ -834,25 +838,27 @@ def _connect_destroy(sender, func, detailed_signal, handler, *args, **kwargs): handler_id = func(detailed_signal, handler, *args, **kwargs) - def disconnect_cb(*args): + def disconnect_cb(*args: Any) -> None: sender.disconnect(handler_id) obj.connect('destroy', disconnect_cb) return handler_id -def connect_destroy(sender, *args, **kwargs): +def connect_destroy(sender: Any, *args: Any, **kwargs: Any) -> int: return _connect_destroy(sender, sender.connect, *args, **kwargs) -def wrap_with_event_box(klass): +def wrap_with_event_box(klass: Any) -> Any: @wraps(klass) - def klass_wrapper(*args, **kwargs): + def klass_wrapper(*args: Any, **kwargs: Any) -> Gtk.EventBox: widget = klass(*args, **kwargs) event_box = Gtk.EventBox() - def _on_realize(*args): - event_box.get_window().set_cursor(get_cursor('pointer')) + def _on_realize(*args: Any) -> None: + window = event_box.get_window() + assert window is not None + window.set_cursor(get_cursor('pointer')) event_box.connect_after('realize', _on_realize) event_box.add(widget) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2d25dd85f2d3042d6dbcdf2fa9b0c92… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2d25dd85f2d3042d6dbcdf2fa9b0c92… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: StatusMessageSelector: Cleanup correctly when it gets destroyed
by Philipp Hörist (＠lovetox) 02 Feb '22

02 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 34c06500 by lovetox at 2022-02-02T21:40:36+01:00 StatusMessageSelector: Cleanup correctly when it gets destroyed - - - - - 20831fc8 by lovetox at 2022-02-02T21:41:05+01:00 StatusSelector: Cleanup correctly when it gets destroyed - - - - - 2d25dd85 by lovetox at 2022-02-02T21:44:01+01:00 AccountSideBar: Support all client states - Simplify code - - - - - 3 changed files: - gajim/gtk/account_side_bar.py - gajim/gtk/status_message_selector.py - gajim/gtk/status_selector.py Changes: ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -14,14 +14,15 @@ from __future__ import annotations +from typing import Any from typing import Optional from typing import cast from gi.repository import Gtk -from gajim.common.const import AvatarSize from gajim.common import app -from gajim.common import types +from gajim.common.const import AvatarSize +from gajim.common.helpers import get_client_status from gajim.common.i18n import _ @@ -105,33 +106,34 @@ def update(self) -> None: class AccountAvatar(Gtk.Image): def __init__(self, account: str) -> None: Gtk.Image.__init__(self) + self._account = account jid = app.get_jid_from_account(self._account) - client = app.get_client(self._account) - self._contact = client.get_module('Contacts').get_contact(jid) - self._contact.connect('avatar-update', self._on_avatar_update) - self._contact.connect('presence-update', self._on_presence_update) + self._client = app.get_client(self._account) - self.connect('destroy', self._on_destroy) - self._update_image() + self._client.connect_signal('state-changed', self._on_event) + + self._contact = self._client.get_module('Contacts').get_contact(jid) + self._contact.connect('avatar-update', self._on_event) + self._contact.connect('presence-update', self._on_event) - def _on_presence_update(self, - _contact: types.BareContact, - _signal_name: str) -> None: + self.connect('destroy', self._on_destroy) self._update_image() - def _on_avatar_update(self, - _contact: types.BareContact, - _signal_name: str) -> None: + def _on_event(self, *args: Any) -> None: self._update_image() def _update_image(self) -> None: - surface = self._contact.get_avatar(AvatarSize.ACCOUNT_SIDE_BAR, - self.get_scale_factor(), - style='circle') + status = get_client_status(self._account) + surface = app.app.avatar_storage.get_surface( + self._contact, + AvatarSize.ACCOUNT_SIDE_BAR, + self.get_scale_factor(), + status) self.set_from_surface(surface) def _on_destroy(self, _widget: Gtk.Image) -> None: self._contact.disconnect_all_from_obj(self) + self._client.disconnect_all_from_obj(self) app.check_finalize(self) ===================================== gajim/gtk/status_message_selector.py ===================================== @@ -12,6 +12,8 @@ # 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 @@ -26,10 +28,13 @@ from gajim.common.helpers import to_one_line from gajim.common.i18n import _ +from .util import EventHelper + -class StatusMessageSelector(Gtk.Box): +class StatusMessageSelector(Gtk.Box, EventHelper): def __init__(self, account: Optional[str] = None) -> None: Gtk.Box.__init__(self) + EventHelper.__init__(self) self.get_style_context().add_class('linked') self._account = account @@ -46,14 +51,15 @@ def __init__(self, account: Optional[str] = None) -> None: self._button.connect('clicked', self._set_status_message) self.add(self._entry) self.add(self._button) + + self.connect('destroy', self._on_destroy) + self.show_all() - app.ged.register_event_handler('our-show', - ged.POSTGUI, - self._on_our_show) - app.ged.register_event_handler('account-enabled', - ged.POSTGUI, - self._on_account_enabled) + self.register_event('our-show', ged.GUI1, self._on_our_show) + self.register_event('account-enabled', + ged.GUI1, + self._on_account_enabled) for client in app.get_clients(): client.connect_signal('state-changed', @@ -100,3 +106,6 @@ def update(self) -> None: message = client.status_message self._entry.set_text(message) + + def _on_destroy(self, widget: StatusMessageSelector) -> None: + app.check_finalize(self) ===================================== gajim/gtk/status_selector.py ===================================== @@ -32,11 +32,13 @@ from gajim.common.i18n import _ from .avatar import get_show_circle +from .util import EventHelper -class StatusSelector(Gtk.MenuButton): +class StatusSelector(Gtk.MenuButton, EventHelper): def __init__(self, account: Optional[str] = None, compact: bool = False): Gtk.MenuButton.__init__(self) + EventHelper.__init__(self) self.set_direction(Gtk.ArrowType.UP) self._account = account self._compact = compact @@ -60,12 +62,12 @@ def __init__(self, account: Optional[str] = None, compact: bool = False): box.show_all() self.add(box) - app.ged.register_event_handler('our-show', - ged.POSTGUI, - self._on_our_show) - app.ged.register_event_handler('account-enabled', - ged.POSTGUI, - self._on_account_enabled) + self.connect('destroy', self._on_destroy) + + self.register_event('our-show', ged.GUI1, self._on_our_show) + self.register_event('account-enabled', + ged.GUI1, + self._on_account_enabled) for client in app.get_clients(): client.connect_signal('state-changed', @@ -153,3 +155,7 @@ def update(self) -> None: _('Status: %s') % show_label) if not self._compact: self._current_show_label.set_text(show_label) + + def _on_destroy(self, widget: StatusSelector) -> None: + self._status_popover.destroy() + app.check_finalize(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba910b98c4d8f5546e8af8ac65bd76e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba910b98c4d8f5546e8af8ac65bd76e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Get rid of interface.get_avatar()
by Philipp Hörist (＠lovetox) 02 Feb '22

02 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: addf99f0 by lovetox at 2022-02-02T13:18:35+01:00 Get rid of interface.get_avatar() - - - - - e3b1b2a2 by lovetox at 2022-02-02T13:19:27+01:00 Pass show always as str to add_status_to_avatar() - - - - - ba910b98 by lovetox at 2022-02-02T13:20:11+01:00 Add css class for connecting state - - - - - 7 changed files: - gajim/common/modules/contacts.py - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/gtk/avatar.py - gajim/gtk/notification.py - gajim/gtk/util.py - gajim/gui_interface.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -318,7 +318,7 @@ def get_avatar(self, default: bool = False, style: str = 'circle'): - show = self.show if add_show else None + show = self.show.value if add_show else None transport_icon = None if self.is_gateway: @@ -698,7 +698,7 @@ def get_avatar(self, add_show: bool = True, style: str = 'circle') -> cairo.ImageSurface: - show = self.show if add_show else None + show = self.show.value if add_show else None return app.app.avatar_storage.get_surface( self, size, scale, show, style=style) ===================================== gajim/data/style/default-dark.css ===================================== @@ -67,3 +67,6 @@ .gajim-status-dnd { .gajim-status-offline { color: rgb(154, 154, 154); } +.gajim-status-connecting { + color: rgb(77, 166, 255); +} ===================================== gajim/data/style/default.css ===================================== @@ -69,3 +69,6 @@ .gajim-status-dnd { .gajim-status-offline { color: rgb(154, 154, 154); } +.gajim-status-connecting { + color: rgb(77, 166, 255); +} ===================================== gajim/gtk/avatar.py ===================================== @@ -127,7 +127,7 @@ def make_workspace_avatar(letter: str, def add_status_to_avatar(surface: cairo.ImageSurface, - show) -> cairo.ImageSurface: + show: str) -> cairo.ImageSurface: width = surface.get_width() height = surface.get_height() @@ -154,7 +154,7 @@ def add_status_to_avatar(surface: cairo.ImageSurface, context.arc(center_x, center_y, clip_radius, 0, 2 * pi) context.fill() - css_color = get_css_show_class(show.value) + css_color = get_css_show_class(show) color = convert_rgb_string_to_float( app.css_config.get_value(css_color, StyleAttr.COLOR)) @@ -165,7 +165,7 @@ def add_status_to_avatar(surface: cairo.ImageSurface, context.arc(center_x, center_y, show_radius, 0, 2 * pi) context.fill() - if show.value == 'dnd': + if show == 'dnd': line_length = clip_radius / 2 context.move_to(center_x - line_length, center_y) context.line_to(center_x + line_length, center_y) ===================================== gajim/gtk/notification.py ===================================== @@ -371,10 +371,9 @@ def _get_avatar_for_notification(account: str, scale = get_monitor_scale_factor() client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) - return app.interface.get_avatar(contact, - AvatarSize.NOTIFICATION, - scale, - pixbuf=True) + return contact.get_avatar(AvatarSize.NOTIFICATION, + scale, + pixbuf=True) def _make_icon(self, event: events.Notification) -> Gio.Icon: if (event.type == 'incoming-message' and app.desktop_env == 'gnome'): ===================================== gajim/gtk/util.py ===================================== @@ -616,7 +616,8 @@ def get_css_show_class(show: str) -> str: return '.gajim-status-away' if show in ('dnd', 'xa'): return '.gajim-status-dnd' - # 'offline', 'not in roster', 'requested' + if show == 'connecting': + return '.gajim-status-connecting' return '.gajim-status-offline' ===================================== gajim/gui_interface.py ===================================== @@ -75,9 +75,6 @@ from gajim.common.const import FTState from gajim.common.file_props import FileProp -from gajim.common.modules.contacts import GroupchatContact -from gajim.common.modules.contacts import GroupchatParticipant -from gajim.common.modules.contacts import BareContact from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.gui.dialogs import ErrorDialog @@ -91,8 +88,6 @@ log = logging.getLogger('gajim.interface') -ContactT = Union[BareContact, GroupchatContact, GroupchatParticipant] - class Interface: def __init__(self): @@ -693,19 +688,6 @@ def save_config() -> None: def save_avatar(self, data: bytes) -> Optional[str]: return app.app.avatar_storage.save_avatar(data) - def get_avatar(self, - contact: ContactT, - size: int, - scale: int, - show: Optional[str] = None, - pixbuf: bool = False, - style: str = 'circle') -> Any: - if pixbuf: - return app.app.avatar_storage.get_pixbuf( - contact, size, scale, show, style=style) - return app.app.avatar_storage.get_surface( - contact, size, scale, show, style=style) - def avatar_exists(self, filename: str) -> bool: return app.app.avatar_storage.get_avatar_path(filename) is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4dd332d08d91c56a7dca53b6cd45e77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4dd332d08d91c56a7dca53b6cd45e77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor displaying show
by Philipp Hörist (＠lovetox) 01 Feb '22

01 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4dd332d0 by lovetox at 2022-02-02T00:12:05+01:00 Refactor displaying show - ShowChanged is only raised from presence module - Client raises for all connection states SimpleClientState - Simplify helper methods for getting show and show string - - - - - 9 changed files: - gajim/common/app.py - gajim/common/client.py - gajim/common/const.py - gajim/common/helpers.py - gajim/gtk/main.py - gajim/gtk/notification.py - gajim/gtk/status_icon.py - gajim/gtk/status_message_selector.py - gajim/gtk/status_selector.py Changes: ===================================== gajim/common/app.py ===================================== @@ -145,6 +145,10 @@ def get_client(account: str) -> types.Client: return connections[account] +def get_clients() -> list[types.Client]: + return list(connections.values()) + + def is_installed(dependency: str) -> bool: return _dependencies[dependency] ===================================== gajim/common/client.py ===================================== @@ -39,7 +39,6 @@ from gajim.common.events import AccountDisonnected from gajim.common.events import PasswordRequired from gajim.common.events import PlainConnection -from gajim.common.events import ShowChanged from gajim.common.events import SignedIn from gajim.common.events import Notification from gajim.common.events import StanzaReceived @@ -203,8 +202,6 @@ def _on_resume_failed(self, log.info('Resume failed') self.notify('resume-failed') - app.ged.raise_event(ShowChanged(account=self._account, - show='offline')) def _on_resume_successful(self, _client: NBXMPPClient, @@ -216,12 +213,6 @@ def _on_resume_successful(self, if self._status_sync_on_resume: self._status_sync_on_resume = False self.update_presence() - else: - # Normally show is updated when we receive a presence reflection. - # On resume, if show has not changed while offline, we don’t send - # a new presence so we have to trigger the event here. - app.ged.raise_event(ShowChanged(account=self._account, - show=self._status)) self.notify('state-changed', SimpleClientState.CONNECTED) @@ -305,15 +296,11 @@ def _on_password(password: str) -> None: if self._reconnect: self._after_disconnect() self._schedule_reconnect() - app.ged.raise_event(ShowChanged(account=self._account, - show='error')) if not self._client.resumeable: self.notify('state-changed', SimpleClientState.DISCONNECTED) self.notify('state-changed', SimpleClientState.RESUME_IN_PROGRESS) else: - app.ged.raise_event(ShowChanged(account=self._account, - show='offline')) self._after_disconnect() self.notify('state-changed', SimpleClientState.DISCONNECTED) @@ -593,7 +580,7 @@ def _schedule_reconnect(self) -> None: def _abort_reconnect(self) -> None: self._set_state(ClientState.DISCONNECTED) self._disable_reconnect_timer() - app.ged.raise_event(ShowChanged(account=self._account, show='offline')) + self.notify('state-changed', SimpleClientState.DISCONNECTED) if self._destroy_client: self._client.destroy() ===================================== gajim/common/const.py ===================================== @@ -879,14 +879,33 @@ def is_active(self): SHOW_LIST = [ 'offline', 'connecting', - 'online', - 'chat', 'away', 'xa', + 'chat', + 'online', 'dnd', - 'error' ] +SHOW_STRING = { + 'dnd': _('Busy'), + 'xa': _('Not Available'), + 'chat': _('Free for Chat'), + 'online': Q_('?user status:Available'), + 'connecting': _('Connecting'), + 'away': _('Away'), + 'offline': _('Offline'), +} + +SHOW_STRING_MNEMONIC = { + 'dnd': _('_Busy'), + 'xa': _('_Not Available'), + 'chat': _('_Free for Chat'), + 'online': Q_('?user status:_Available'), + 'connecting': _('Connecting'), + 'away': _('A_way'), + 'offline': _('_Offline'), +} + GAJIM_FAQ_URI = 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq' GAJIM_WIKI_URI = 'https://dev.gajim.org/gajim/gajim/wikis' ===================================== gajim/common/helpers.py ===================================== @@ -87,7 +87,8 @@ from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.i18n import get_rfc5646_lang -from gajim.common.const import ShowConstant +from gajim.common.const import SHOW_STRING +from gajim.common.const import SHOW_STRING_MNEMONIC from gajim.common.const import URIType from gajim.common.const import URIAction from gajim.common.const import GIO_TLS_ERRORS @@ -179,57 +180,10 @@ def windowsify(word: str) -> str: return word.capitalize() return word -def get_uf_show(show: Union[ShowConstant, str], - use_mnemonic: bool = False) -> str: - """ - Return a userfriendly string for dnd/xa/chat and make all strings - translatable - - If use_mnemonic is True, it adds _ so GUI should call with True for - accessibility issues - """ - if isinstance(show, ShowConstant): - show = show.name.lower() - - if show == 'dnd': - if use_mnemonic: - uf_show = _('_Busy') - else: - uf_show = _('Busy') - elif show == 'xa': - if use_mnemonic: - uf_show = _('_Not Available') - else: - uf_show = _('Not Available') - elif show == 'chat': - if use_mnemonic: - uf_show = _('_Free for Chat') - else: - uf_show = _('Free for Chat') - elif show == 'online': - if use_mnemonic: - uf_show = Q_('?user status:_Available') - else: - uf_show = Q_('?user status:Available') - elif show == 'connecting': - uf_show = _('Connecting') - elif show == 'away': - if use_mnemonic: - uf_show = _('A_way') - else: - uf_show = _('Away') - elif show == 'offline': - if use_mnemonic: - uf_show = _('_Offline') - else: - uf_show = _('Offline') - elif show == 'not in roster': - uf_show = _('Not in contact list') - elif show == 'requested': - uf_show = Q_('?contact has status:Unknown') - else: - uf_show = Q_('?contact has status:Has errors') - return uf_show +def get_uf_show(show: str, use_mnemonic: bool = False) -> str: + if use_mnemonic: + return SHOW_STRING_MNEMONIC[show] + return SHOW_STRING[show] def get_uf_sub(sub: str) -> str: if sub == 'none': @@ -543,19 +497,17 @@ def play_sound_file(str_path_to_soundfile: str, loop: bool = False) -> None: from gajim.common import sound sound.play(path_to_soundfile, loop) -def get_connection_status(account: str) -> str: - if not app.account_is_available(account): - return 'error' - con = app.connections[account] - if con.state.is_reconnect_scheduled: - return 'error' +def get_client_status(account: str) -> str: + client = app.get_client(account) + if client.state.is_disconnected: + return 'offline' - if con.state.is_connecting or con.state.is_connected: + if (client.state.is_reconnect_scheduled or + client.state.is_connecting or + client.state.is_connected): return 'connecting' - if con.state.is_disconnected: - return 'offline' - return con.status + return client.status def get_global_show() -> str: maxi = 0 @@ -563,7 +515,7 @@ def get_global_show() -> str: if not app.settings.get_account_setting(account, 'sync_with_global_status'): continue - status = get_connection_status(account) + status = get_client_status(account) index = SHOW_LIST.index(status) if index > maxi: maxi = index @@ -587,13 +539,15 @@ def statuses_unified() -> bool: Test if all statuses are the same """ reference = None - for account, con in app.connections.items(): + for account in app.connections: if not app.settings.get_account_setting(account, 'sync_with_global_status'): continue + if reference is None: - reference = con.status - elif reference != con.status: + reference = get_client_status(account) + + elif reference != get_client_status(account): return False return True ===================================== gajim/gtk/main.py ===================================== @@ -31,7 +31,9 @@ from gajim.common import app from gajim.common import events from gajim.common import ged +from gajim.common.client import Client from gajim.common.const import Direction +from gajim.common.const import SimpleClientState from gajim.common.ged import EventHelper from gajim.common.helpers import ask_for_status_message from gajim.common.i18n import _ @@ -113,8 +115,6 @@ def __init__(self) -> None: ('jingle-error-received', ged.GUI1, self._on_event), ('file-request-received', ged.GUI1, self._on_file_request), ('file-request-sent', ged.GUI1, self._on_event), - ('our-show', ged.GUI1, self._on_our_show), - ('signed-in', ged.GUI1, self._on_signed_in), ('account-enabled', ged.GUI1, self._on_account_enabled), ('account-disabled', ged.GUI1, self._on_account_disabled), ('allow-gajim-update-check', ged.GUI1, self._on_allow_gajim_update), @@ -139,6 +139,10 @@ def __init__(self) -> None: app.app.systray.connect_unread_widget(chat_list_stack, 'unread-count-changed') + for client in app.get_clients(): + client.connect_signal('state-changed', + self._on_client_state_changed) + def _start_timers(self) -> None: GLib.timeout_add_seconds(UNLOAD_CHAT_TIME, self._chat_page.unload_idle_chats) @@ -167,6 +171,8 @@ def _prepare_window(self) -> None: def _on_account_enabled(self, event: events.AccountEnabled) -> None: self._account_side_bar.add_account(event.account) self._main_stack.add_account_page(event.account) + client = app.get_client(event.account) + client.connect_signal('state-changed', self._on_client_state_changed) def _on_account_disabled(self, event: events.AccountDisabled) -> None: workspace_id = self._workspace_side_bar.get_first_workspace() @@ -175,15 +181,12 @@ def _on_account_disabled(self, event: events.AccountDisabled) -> None: self._main_stack.remove_account_page(event.account) self._main_stack.remove_chats_for_account(event.account) - @staticmethod - def _on_our_show(event: events.ShowChanged) -> None: - if event.show == 'offline': - app.app.set_account_actions_state(event.account) - app.app.update_app_actions_state() + def _on_client_state_changed(self, + client: Client, + _signal_name: str, + state: SimpleClientState) -> None: - @staticmethod - def _on_signed_in(event: events.SignedIn) -> None: - app.app.set_account_actions_state(event.account, True) + app.app.set_account_actions_state(client.account, state.is_connected) app.app.update_app_actions_state() def _on_allow_gajim_update(self, ===================================== gajim/gtk/notification.py ===================================== @@ -43,7 +43,9 @@ from gajim.common import app from gajim.common import ged from gajim.common import events +from gajim.common.client import Client from gajim.common.const import AvatarSize +from gajim.common.const import SimpleClientState from gajim.common.const import StyleAttr from gajim.common.i18n import _ from gajim.common.helpers import allow_showing_notification @@ -79,9 +81,13 @@ def __init__(self) -> None: self.register_events([ ('notification', ged.GUI2, self._on_notification), - ('our-show', ged.GUI2, self._on_our_show) + ('account-enabled', ged.GUI2, self._on_account_enabled) ]) + for client in app.get_clients(): + client.connect_signal('state-changed', + self._on_client_state_changed) + def _on_notification(self, event: events.Notification) -> None: if event.sound is not None: play_sound(event.sound, event.account) @@ -91,11 +97,19 @@ def _on_notification(self, event: events.Notification) -> None: self._send(event) - def _on_our_show(self, event: events.ShowChanged) -> None: - if not app.account_is_connected(event.account): + def _on_account_enabled(self, event: events.AccountEnabled) -> None: + client = app.get_client(event.account) + client.connect_signal('state-changed', self._on_client_state_changed) + + def _on_client_state_changed(self, + client: Client, + _signal_name: str, + state: SimpleClientState) -> None: + + if not state.is_connected: return - self._withdraw(['connection-failed', event.account]) - self._withdraw(['server-shutdown', event.account]) + self._withdraw(['connection-failed', client.account]) + self._withdraw(['server-shutdown', client.account]) def _send(self, event: events.Notification) -> None: raise NotImplementedError ===================================== gajim/gtk/status_icon.py ===================================== @@ -31,11 +31,11 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import ged +from gajim.common import events +from gajim.common.client import Client from gajim.common.const import Display +from gajim.common.const import SimpleClientState from gajim.common.i18n import _ -from gajim.common.events import AccountConnected -from gajim.common.events import AccountDisonnected -from gajim.common.events import ShowChanged from gajim.common.helpers import get_global_show from gajim.common.helpers import get_uf_show from gajim.common.ged import EventHelper @@ -119,10 +119,15 @@ def __init__(self) -> None: self.register_events([ ('our-show', ged.GUI1, self._on_our_show), + ('account-enabled', ged.GUI1, self._on_account_enabled), ('account-connected', ged.CORE, self._on_account_state), ('account-disconnected', ged.CORE, self._on_account_state), ]) + for client in app.get_clients(): + client.connect_signal('state-changed', + self._on_client_state_changed) + def update_state(self, count: int = 0) -> None: raise NotImplementedError @@ -149,11 +154,22 @@ def _add_status_menu(self) -> None: self._popup_menus.append(sub_menu) self._ui.status_menu.set_submenu(sub_menu) - def _on_our_show(self, _event: ShowChanged) -> None: + def _on_account_enabled(self, event: events.AccountEnabled) -> None: + client = app.get_client(event.account) + client.connect_signal('state-changed', self._on_client_state_changed) + + def _on_client_state_changed(self, + _client: Client, + _signal_name: str, + _state: SimpleClientState) -> None: + self.update_state() + + def _on_our_show(self, _event: events.ShowChanged) -> None: self.update_state() def _on_account_state(self, - _event: Union[AccountConnected, AccountDisonnected] + _event: Union[events.AccountConnected, + events.AccountDisonnected] ) -> None: account_connected = bool(app.get_number_of_connected_accounts() > 0) self._ui.start_chat_menuitem.set_sensitive(account_connected) ===================================== gajim/gtk/status_message_selector.py ===================================== @@ -19,6 +19,9 @@ from gajim.common import app from gajim.common import ged +from gajim.common import events +from gajim.common.client import Client +from gajim.common.const import SimpleClientState from gajim.common.helpers import get_global_status_message from gajim.common.helpers import to_one_line from gajim.common.i18n import _ @@ -44,7 +47,30 @@ def __init__(self, account: Optional[str] = None) -> None: self.add(self._entry) self.add(self._button) self.show_all() - app.ged.register_event_handler('our-show', ged.POSTGUI, self.update) + + app.ged.register_event_handler('our-show', + ged.POSTGUI, + self._on_our_show) + app.ged.register_event_handler('account-enabled', + ged.POSTGUI, + self._on_account_enabled) + + for client in app.get_clients(): + client.connect_signal('state-changed', + self._on_client_state_changed) + + def _on_our_show(self, event: events.ShowChanged) -> None: + self.update() + + def _on_account_enabled(self, event: events.AccountEnabled) -> None: + client = app.get_client(event.account) + client.connect_signal('state-changed', self._on_client_state_changed) + + def _on_client_state_changed(self, + client: Client, + _signal_name: str, + state: SimpleClientState) -> None: + self.update() def _on_changed(self, _entry: Gtk.Entry) -> None: self._button.set_sensitive(True) @@ -64,7 +90,7 @@ def _set_status_message(self, *args: Any) -> None: client = app.get_client(account) client.change_status(client.status, message) - def update(self, *args: Any) -> None: + def update(self) -> None: if self._account is None: message = get_global_status_message() else: ===================================== gajim/gtk/status_selector.py ===================================== @@ -12,15 +12,20 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Any, Optional +from __future__ import annotations + +from typing import Optional from gi.repository import Gtk from gi.repository import Pango from gajim.common import app from gajim.common import ged +from gajim.common import events +from gajim.common.client import Client from gajim.common.const import AvatarSize -from gajim.common.helpers import get_connection_status +from gajim.common.const import SimpleClientState +from gajim.common.helpers import get_client_status from gajim.common.helpers import get_uf_show from gajim.common.helpers import get_global_show from gajim.common.helpers import statuses_unified @@ -55,7 +60,29 @@ def __init__(self, account: Optional[str] = None, compact: bool = False): box.show_all() self.add(box) - app.ged.register_event_handler('our-show', ged.POSTGUI, self.update) + app.ged.register_event_handler('our-show', + ged.POSTGUI, + self._on_our_show) + app.ged.register_event_handler('account-enabled', + ged.POSTGUI, + self._on_account_enabled) + + for client in app.get_clients(): + client.connect_signal('state-changed', + self._on_client_state_changed) + + def _on_our_show(self, event: events.ShowChanged) -> None: + self.update() + + def _on_account_enabled(self, event: events.AccountEnabled) -> None: + client = app.get_client(event.account) + client.connect_signal('state-changed', self._on_client_state_changed) + + def _on_client_state_changed(self, + client: Client, + _signal_name: str, + state: SimpleClientState) -> None: + self.update() def _create_popover(self) -> None: popover_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) @@ -105,11 +132,11 @@ def _on_change_status(self, button: Gtk.Button) -> None: new_status = button.get_name() app.interface.change_status(status=new_status, account=self._account) - def update(self, *args: Any, **kwargs: Any) -> None: + def update(self) -> None: if self._account is None: show = get_global_show() else: - show = get_connection_status(self._account) + show = get_client_status(self._account) surface = get_show_circle( show, AvatarSize.SHOW_CIRCLE, self.get_scale_factor()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4dd332d08d91c56a7dca53b6cd45e777… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4dd332d08d91c56a7dca53b6cd45e777… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix typo
by Philipp Hörist (＠lovetox) 01 Feb '22

01 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c5d5109f by lovetox at 2022-02-01T19:17:51+01:00 Fix typo - - - - - 882bc501 by lovetox at 2022-02-01T21:31:30+01:00 Client: Notify when the stream is not resumeable Modules use the state-changed signal to correctly handle connection loss - - - - - 2 changed files: - gajim/common/client.py - gajim/common/const.py Changes: ===================================== gajim/common/client.py ===================================== @@ -307,7 +307,9 @@ def _on_password(password: str) -> None: self._schedule_reconnect() app.ged.raise_event(ShowChanged(account=self._account, show='error')) - self.notify('state-changed', SimpleClientState.RESUME_IN_PREGRESS) + if not self._client.resumeable: + self.notify('state-changed', SimpleClientState.DISCONNECTED) + self.notify('state-changed', SimpleClientState.RESUME_IN_PROGRESS) else: app.ged.raise_event(ShowChanged(account=self._account, ===================================== gajim/common/const.py ===================================== @@ -306,7 +306,7 @@ def is_available(self): class SimpleClientState(Enum): DISCONNECTED = 'disconnected' CONNECTED = 'connected' - RESUME_IN_PREGRESS = 'resume-in-progress' + RESUME_IN_PROGRESS = 'resume-in-progress' @property def is_disconnected(self): @@ -318,7 +318,7 @@ def is_connected(self): @property def is_resume_in_progress(self): - return self == SimpleClientState.RESUME_IN_PREGRESS + return self == SimpleClientState.RESUME_IN_PROGRESS class JingleState(Enum): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/824672266d6deca5d0118908d85d15f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/824672266d6deca5d0118908d85d15f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Add resumeable property
by Philipp Hörist (＠lovetox) 01 Feb '22

01 Feb '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ddfe6217 by lovetox at 2022-02-01T21:24:54+01:00 Client: Add resumeable property Returns True if the stream is resumeable via stream management - - - - - 2 changed files: - nbxmpp/client.py - nbxmpp/smacks.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -149,6 +149,10 @@ class Client(Observable): def features(self): return self._stream_features + @property + def resumeable(self): + return self._smacks.resumeable + @property def sm_supported(self): return self._smacks.sm_supported ===================================== nbxmpp/smacks.py ===================================== @@ -73,6 +73,10 @@ class Smacks: self._log.info('Server supports detected: %s', value) self._sm_supported = value + @property + def resumeable(self): + return self._session_id is not None and self.resume_supported + def delegate(self, stanza): if stanza.getNamespace() != Namespace.STREAM_MGMT: return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ddfe6217a84d04f3ac331db8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ddfe6217a84d04f3ac331db8… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2022