Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] 2 commits: Settings: Add missing comma for BoolSettings
by Daniel Brötzmann (＠wurstsalat) 01 Feb '22

01 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f2fc8c9b by wurstsalat at 2022-02-01T18:44:24+01:00 Settings: Add missing comma for BoolSettings - - - - - 82467226 by wurstsalat at 2022-02-01T18:44:45+01:00 Preview: Typing - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -59,7 +59,7 @@ class _ACCOUNT_DEFAULT: 'notify_on_file_complete', 'positive_184_ack', 'preview_allow_all_images', - 'preview_anonymous_muc' + 'preview_anonymous_muc', 'preview_verify_https', 'print_status_in_chats', 'quit_on_main_window_x_button', ===================================== gajim/gtk/preview.py ===================================== @@ -12,6 +12,7 @@ # 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 import logging @@ -147,7 +148,7 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.file_name.set_tooltip_text(preview.filename) def _get_context_menu(self) -> Gtk.Menu: - def _destroy(menu, _pspec): + def _destroy(menu: Gtk.Menu, _pspec: Any) -> None: visible = menu.get_property('visible') if not visible: GLib.idle_add(menu.destroy) @@ -156,6 +157,7 @@ def _destroy(menu, _pspec): menu.connect_signals(self) menu.context_menu.connect('notify::visible', _destroy) + assert self._preview if self._preview.is_aes_encrypted: menu.open_link_in_browser.hide() @@ -195,6 +197,7 @@ def _on_open(self, _menu: Gtk.Menu) -> None: self._preview, force=True) return + assert self._preview.orig_path open_file(self._preview.orig_path) def _on_save_as(self, _menu: Gtk.Menu) -> None: @@ -233,21 +236,26 @@ def _on_ok(target: str) -> None: transient_for=app.app.get_active_window()) def _on_open_folder(self, _menu: Gtk.Menu) -> None: + assert self._preview if not self._preview.orig_exists(): app.interface.preview_manager.download_content( self._preview, force=True) return + assert self._preview.orig_path 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()) + assert self._preview clipboard.set_text(self._preview.uri, -1) def _on_open_link_in_browser(self, _menu: Gtk.Menu) -> None: + assert self._preview if self._preview.is_aes_encrypted: if self._preview.is_geo_uri: open_uri(self._preview.uri) return + assert self._preview.orig_path open_file(self._preview.orig_path) else: open_uri(self._preview.uri) @@ -268,4 +276,6 @@ def _on_button_press_event(self, @staticmethod def _on_realize(event_box: Gtk.EventBox) -> None: - event_box.get_window().set_cursor(get_cursor('pointer')) + window = event_box.get_window() + assert window + window.set_cursor(get_cursor('pointer')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c5b27c8e2e154f4566b3eefd95ef8a1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c5b27c8e2e154f4566b3eefd95ef8a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Helpers: Fix get_uf_relative_time
by Daniel Brötzmann (＠wurstsalat) 01 Feb '22

01 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c5b27c8e by wurstsalat at 2022-02-01T18:06:50+01:00 Helpers: Fix get_uf_relative_time - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -319,8 +319,8 @@ def get_uf_relative_time(timestamp: float) -> str: return ngettext('%i min ago', '%i mins ago', minutes, - str(minutes), - str(minutes)) + minutes, + minutes) return _('Just now') def get_sorted_keys(adict): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5b27c8e2e154f4566b3eefd95ef8a1c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5b27c8e2e154f4566b3eefd95ef8a1c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Update man pages
by Daniel Brötzmann (＠wurstsalat) 01 Feb '22

01 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: baefbe4e by wurstsalat at 2022-02-01T16:43:47+01:00 Update man pages - - - - - 3ff6cc94 by wurstsalat at 2022-02-01T17:27:21+01:00 Helpers: Typing - - - - - 4 changed files: - data/gajim-remote.1 - data/gajim.1 - gajim/common/helpers.py - gajim/gtk/chat_list.py Changes: ===================================== data/gajim-remote.1 ===================================== @@ -116,4 +116,3 @@ https://lists.gajim.org/cgi-bin/listinfo Please submit bugs at https://dev.gajim.org/gajim/gajim/issues .Sh SEE ALSO .Xr gajim 1 -.Xr gajim-history-manager 1 ===================================== data/gajim.1 ===================================== @@ -3,7 +3,7 @@ .Os UNIX .Sh NAME .Nm gajim -.Nd a Jabber/XMPP client +.Nd A fully-featured XMPP chat client .Sh SYNOPSIS .Nm .Fl h @@ -17,18 +17,19 @@ .Op Fl c Ar directory .Sh DESCRIPTION .Nm -is a Jabber/XMPP client written in Python and GTK+. +aims to be an easy to use and fully-featured XMPP client. +Just chat with your friends or family, easily share pictures and thoughts or +discuss the news with your groups. +Chat securely with End-to-End encryption via OMEMO or OpenPGP. .Nm -works nicely with GNOME, yet it does not require it to run. -.Nm -is designed for novice and advanced users as one, as well for XMPP -server admins. +integrates well with your other devices: +simply continue conversations on your mobile device. .Pp XMPP is the Extensible Messaging and Presence Protocol, a set of open technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data. For more information -on the XMPP protocol see <https://xmpp.org/about-xmpp/>. +on the XMPP protocol see <https://xmpp.org/about/>. .Sh OPTIONS .Bl -tag -width Ds .It Fl h Fl Fl help @@ -44,10 +45,11 @@ Show all GTK warnings with traceback .It Fl l Fl Fl loglevel Em subsystem=level Bq , Em subsystem=level Bq Em ... Configure logging system. Subsystem can be -.Em gajim.interface , -.Em gajim.c.connection , -.Em .nbxmpp.client_nb , +.Em gajim.c.preview , +.Em gajim.gui.preview , +.Em .nbxmpp.stream , etc. +.Pp Level can be .Em DEBUG , .Em INFO , @@ -70,8 +72,6 @@ Where to look for configuration files Cache database file of transports, caps, roster entry, and roster group. .It $XDG_CACHE_HOME/gajim/avatars/ Cache directory of avatars. -.It $XDG_CACHE_HOME/gajim/vcards/ -Cache directory of vCards (virtual cards). .It $XDG_CONFIG_HOME/gajim/ The config-path used when .Op Fl c @@ -130,9 +130,8 @@ https://lists.gajim.org/cgi-bin/listinfo Please submit bugs at .Bd -literal -offset indent https://dev.gajim.org/gajim/gajim/issues -https://dev.gajim.org/gajim/gajim-plugins -https://dev.gajim.org/gajim/python-nbxmpp +https://dev.gajim.org/gajim/gajim-plugins/issues +https://dev.gajim.org/gajim/python-nbxmpp/issues .Ed .Sh SEE ALSO .Xr gajim-remote 1 -.Xr gajim-history-manager 1 ===================================== gajim/common/helpers.py ===================================== @@ -29,10 +29,7 @@ from typing import Any from typing import Callable -from typing import Dict from typing import Optional -from typing import List -from typing import Tuple from typing import Union import sys @@ -74,10 +71,14 @@ from nbxmpp.structs import ProxyData from nbxmpp.protocol import JID from nbxmpp.protocol import InvalidJid +from nbxmpp.protocol import Iq + from OpenSSL.crypto import X509, load_certificate from OpenSSL.crypto import FILETYPE_PEM + from gi.repository import Gio from gi.repository import GLib + import precis_i18n.codec # pylint: disable=unused-import from gajim.common import app @@ -318,8 +319,8 @@ def get_uf_relative_time(timestamp: float) -> str: return ngettext('%i min ago', '%i mins ago', minutes, - minutes, - minutes) + str(minutes), + str(minutes)) return _('Just now') def get_sorted_keys(adict): @@ -478,7 +479,9 @@ def play_sound(sound_event: str, app.settings.get_soundevent_settings(sound_event)['path'], loop) -def check_soundfile_path(file_, dirs=None): +def check_soundfile_path(file_: str, + dirs: Optional[list[Path]] = None + ) -> Optional[Path]: """ Check if the sound file exists @@ -532,8 +535,8 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): return name return file_ -def play_sound_file(path_to_soundfile: str, loop: bool = False) -> None: - path_to_soundfile = check_soundfile_path(path_to_soundfile) +def play_sound_file(str_path_to_soundfile: str, loop: bool = False) -> None: + path_to_soundfile = check_soundfile_path(str_path_to_soundfile) if path_to_soundfile is None: return @@ -595,7 +598,7 @@ def statuses_unified() -> bool: return True -def get_full_jid_from_iq(iq_obj): +def get_full_jid_from_iq(iq_obj: Iq) -> Optional[str]: """ Return the full jid (with resource) from an iq """ @@ -604,11 +607,13 @@ def get_full_jid_from_iq(iq_obj): return None return parse_jid(str(iq_obj.getFrom())) -def get_jid_from_iq(iq_obj): +def get_jid_from_iq(iq_obj: Iq) -> Optional[str]: """ Return the jid (without resource) from an iq """ jid = get_full_jid_from_iq(iq_obj) + if jid is None: + return None return app.get_jid_without_resource(jid) def get_auth_sha(sid: str, initiator: str, target: str) -> str: @@ -697,8 +702,8 @@ def allow_sound_notification(account: str, sound_event: str) -> bool: return False -def get_optional_features(account: str) -> List[Namespace]: - features = [] +def get_optional_features(account: str) -> list[Namespace]: + features: list[str] = [] if app.settings.get_account_setting(account, 'request_user_data'): features.append(Namespace.TUNE + '+notify') @@ -764,7 +769,7 @@ def get_proxy(proxy_name: str) -> Optional[ProxyData]: username, password = settings['user'], settings['pass'] return ProxyData(type=settings['type'], - host='%s:%s' % (settings['host'], settings['port']), + host=f"{settings['host']}:{settings['port']}", username=username, password=password) @@ -773,8 +778,8 @@ def version_condition(current_version: str, required_version: str) -> bool: return False return True -def get_available_emoticon_themes() -> List[str]: - files = [] +def get_available_emoticon_themes() -> list[str]: + files: list[Path] = [] for folder in configpaths.get('EMOTICONS').iterdir(): if not folder.is_dir(): continue @@ -879,8 +884,10 @@ def copy(self) -> AdditionalDataDict: class Singleton(type): - _instances = {} # type: Dict[Any, Any] - def __call__(cls, *args, **kwargs): + + _instances: dict[Any, Any] = {} + + def __call__(cls, *args: Any, **kwargs: Any): if cls not in cls._instances: cls._instances[cls] = super(Singleton, cls).__call__( *args, **kwargs) @@ -938,7 +945,7 @@ def func_wrapper(self, *args, **kwargs): return func_wrapper -def parse_uri_actions(uri: str) -> Tuple[str, Dict[str, str]]: +def parse_uri_actions(uri: str) -> tuple[str, dict[str, str]]: uri = uri[5:] if '?' not in uri: return 'message', {'jid': uri} @@ -1065,7 +1072,7 @@ def open_file(path: Union[str, Path]) -> None: Gio.AppInfo.launch_default_for_uri(path) -def file_is_locked(path_to_file): +def file_is_locked(path_to_file: str) -> bool: """ Return True if file is locked NOTE: Windows only. @@ -1112,7 +1119,7 @@ def get_resource(account: str) -> Optional[str]: return resource -def get_default_muc_config() -> Dict[str, Union[bool, str]]: +def get_default_muc_config() -> dict[str, Union[bool, str]]: return { # XEP-0045 options 'muc#roomconfig_allowinvites': True, @@ -1147,7 +1154,7 @@ def validate_jid(jid: Union[str, JID], type_: Optional[str] = None) -> JID: if type_ == 'domain' and jid.is_domain: return jid - raise ValueError('Not a %s JID' % type_) + raise ValueError(f'Not a {type_} JID') def to_user_string(error: StanzaError) -> str: @@ -1161,7 +1168,7 @@ def to_user_string(error: StanzaError) -> str: return condition -def get_groupchat_name(client: types.Client, jid: Union[str, JID]) -> str: +def get_groupchat_name(client: types.Client, jid: JID) -> str: name = client.get_module('Bookmarks').get_name_from_bookmark(jid) if name: return name @@ -1336,7 +1343,7 @@ def convert_gio_to_openssl_cert(cert: Gio.TlsCertificate) -> X509: return load_certificate(FILETYPE_PEM, cert.props.certificate_pem.encode()) -def get_custom_host(account: str) -> Optional[Tuple[str, +def get_custom_host(account: str) -> Optional[tuple[str, ConnectionProtocol, ConnectionType]]: if not app.settings.get_account_setting(account, 'use_custom_host'): @@ -1355,7 +1362,7 @@ def get_custom_host(account: str) -> Optional[Tuple[str, def warn_about_plain_connection(account: str, - connection_types: List[ConnectionType] + connection_types: list[ConnectionType] ) -> bool: warn = app.settings.get_account_setting( account, 'confirm_unencrypted_connection') ===================================== gajim/gtk/chat_list.py ===================================== @@ -756,7 +756,7 @@ def update_avatar(self) -> None: def update_name(self) -> None: if self.type == 'pm': client = app.get_client(self.account) - muc_name = get_groupchat_name(client, self.jid.bare) + muc_name = get_groupchat_name(client, self.jid.new_as_bare()) self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})') return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/170692d1e50161d6cd9f40bdef5110e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/170692d1e50161d6cd9f40bdef5110e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist (＠lovetox) 31 Jan '22

31 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 170692d1 by lovetox at 2022-01-31T23:35:16+01:00 Remove unused imports - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -38,7 +38,6 @@ from nbxmpp.structs import PresenceProperties from nbxmpp.structs import MessageProperties from nbxmpp.structs import MucSubject -from nbxmpp.task import Task from gi.repository import Gtk from gi.repository import Gdk @@ -76,7 +75,6 @@ from gajim.gui.groupchat_state import GroupchatState from gajim.gui.message_input import MessageInputTextView from gajim.gui.util import NickCompletionGenerator -from gajim.gui.util import get_app_window from gajim.gui.util import open_window from ..menus import get_encryption_menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/170692d1e50161d6cd9f40bdef5110ee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/170692d1e50161d6cd9f40bdef5110ee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Add ApplyButtonBox
by Philipp Hörist (＠lovetox) 31 Jan '22

31 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4d650b6b by lovetox at 2022-01-31T23:28:42+01:00 Add ApplyButtonBox - - - - - e70f1eca by lovetox at 2022-01-31T23:28:42+01:00 GroupchatAffiliation/Outcasts: Use ApplyButtonBox - - - - - 7b758a6f by lovetox at 2022-01-31T23:28:42+01:00 Scripts: Ignore temporary files - - - - - e473eaa5 by lovetox at 2022-01-31T23:28:42+01:00 Dataform: Add was_modified() - - - - - a29e38d4 by lovetox at 2022-01-31T23:28:42+01:00 Dataform: Validate BooleanField The field can not be set to an invalid value, but we need the signal which validate generates to let users know that the form changed - - - - - 5e1a8a34 by lovetox at 2022-01-31T23:28:42+01:00 Dataform: Reduce validation delay - - - - - b359ef87 by lovetox at 2022-01-31T23:28:42+01:00 GroupchatDetails: Add GroupchatConfig - - - - - 15 changed files: - gajim/data/gui/groupchat_affiliation.ui - gajim/data/gui/groupchat_config.ui - gajim/data/gui/groupchat_details.ui - gajim/data/gui/groupchat_outcast.ui - + gajim/gtk/apply_button_box.py - gajim/gtk/builder.pyi - gajim/gtk/const.py - gajim/gtk/controls/groupchat.py - gajim/gtk/dataform.py - gajim/gtk/groupchat_affiliation.py - gajim/gtk/groupchat_config.py - gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_outcasts.py - pyrightconfig.json - scripts/dev/generate_ui_types.py Changes: ===================================== gajim/data/gui/groupchat_affiliation.ui ===================================== @@ -211,60 +211,7 @@ <placeholder/> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="status_image"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinner" id="spinner"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="apply_button"> - <property name="label">_Apply</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_apply" swapped="no"/> - <style> - <class name="suggested-action"/> - </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">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> <style> <class name="margin-12"/> ===================================== gajim/data/gui/groupchat_config.ui ===================================== @@ -1,481 +1,109 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkListStore" id="affiliation_store"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gboolean"/> -  - <column type="gboolean"/> - </columns> - </object> - <object class="GtkListStore" id="combo_store"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Owner</col> - <col id="1">owner</col> - </row> - <row> - <col id="0" translatable="yes">Admin</col> - <col id="1">admin</col> - </row> - <row> - <col id="0" translatable="yes">Member</col> - <col id="1">member</col> - </row> - </data> - </object> - <object class="GtkPopover" id="info_popover"> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>XMPP Address</b> -&lt;user@domain/resource&gt; (only that resource matches) -&lt;user@domain&gt; (any resource matches) -&lt;domain/resource&gt; (only that resource matches) -&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/resource) -</property> - <property name="use_markup">True</property> - <style> - <class name="padding-6"/> - </style> - </object> - </child> - </object> - <object class="GtkListStore" id="outcast_store"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gboolean"/> -  - <column type="gboolean"/> - </columns> - </object> - <object class="GtkGrid" id="grid"> - <property name="name">GroupchatConfig</property> - <property name="width_request">700</property> - <property name="height_request">500</property> + <requires lib="gtk+" version="3.24"/> + <object class="GtkStack" id="stack"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <child> - <object class="GtkBox"> + <object class="GtkBox" id="loading_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkBox" id="treeview_buttonbox"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="vexpand">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkMenuButton" id="info_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="popover">info_popover</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">dialog-information-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="add_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Only Admins and Owners can modify the affiliation</property> - <property name="halign">start</property> - <signal name="clicked" handler="_on_add" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Only Admins and Owners can modify the affiliation</property> - <signal name="clicked" handler="_on_remove" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Loading…</property> + <style> + <class name="bold24"/> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="ok_button"> - <property name="label">_Apply</property> + <object class="GtkSpinner"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_ok" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> + <property name="can-focus">False</property> + <property name="active">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">2</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="name">loading</property> + </packing> + </child> + <child> + <object class="GtkBox" id="config_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkButton"> - <property name="label">_Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_cancel" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">3</property> - </packing> + <placeholder/> + </child> + <child> + <placeholder/> </child> - <style> - <class name="margin-12"/> - </style> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="name">config</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkStack" id="stack"> + <object class="GtkBox" id="error_box"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="transition_type">crossfade</property> - <signal name="notify::visible-child-name" handler="_on_switch_page" swapped="no"/> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkGrid" id="config_grid"> + <object class="GtkImage" id="error_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="can-focus">False</property> + <property name="stock">gtk-missing-image</property> </object> <packing> - <property name="name">config</property> - <property name="title" translatable="yes">Configuration</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkGrid"> + <object class="GtkLabel" id="error_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="affiliation_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">affiliation_store</property> - <property name="search_column">0</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"> - <property name="mode">multiple</property> - <signal name="changed" handler="_on_selection_changed" swapped="no"/> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="resizable">True</property> - <property name="sizing">autosize</property> - <property name="title">XMPP Address</property> - <property name="expand">True</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">0</property> - <child> - <object class="GtkCellRendererText"> - <property name="placeholder_text">user(a)example.org</property> - <signal name="edited" handler="_on_jid_edited" swapped="no"/> - </object> - <attributes> - <attribute name="editable">6</attribute> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="reserved_name_column"> - <property name="resizable">True</property> - <property name="sizing">autosize</property> - <property name="title" translatable="yes">Reserved Name</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">1</property> - <child> - <object class="GtkCellRendererText"> - <property name="placeholder_text">Name</property> - <signal name="edited" handler="_on_nick_edited" swapped="no"/> - </object> - <attributes> - <attribute name="editable">6</attribute> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="role_column"> - <property name="visible">False</property> - <property name="resizable">True</property> - <property name="sizing">autosize</property> - <property name="min_width">100</property> - <property name="title" translatable="yes">Role</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">2</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">2</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="resizable">True</property> - <property name="sizing">autosize</property> - <property name="min_width">120</property> - <property name="title" translatable="yes">Affiliation</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">3</property> - <child> - <object class="GtkCellRendererCombo"> - <property name="has_entry">False</property> - <property name="model">combo_store</property> - <property name="text_column">0</property> - <signal name="changed" handler="_on_affiliation_changed" swapped="no"/> - </object> - <attributes> - <attribute name="editable">5</attribute> - <attribute name="text">4</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - <style> - <class name="margin-12"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="can-focus">False</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="name">affiliation</property> - <property name="title" translatable="yes">Affiliations</property> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkGrid"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="outcast_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">outcast_store</property> - <property name="search_column">0</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"> - <property name="mode">multiple</property> - <signal name="changed" handler="_on_selection_changed" swapped="no"/> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="resizable">True</property> - <property name="sizing">autosize</property> - <property name="title">XMPP Address</property> - <property name="expand">True</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">0</property> - <child> - <object class="GtkCellRendererText"> - <property name="placeholder_text">user(a)example.org</property> - <signal name="edited" handler="_on_outcast_jid_edited" swapped="no"/> - </object> - <attributes> - <attribute name="editable">6</attribute> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="resizable">True</property> - <property name="sizing">autosize</property> - <property name="min_width">250</property> - <property name="title" translatable="yes">Reason</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">1</property> - <child> - <object class="GtkCellRendererText"> - <property name="placeholder_text">Spam</property> - <signal name="edited" handler="_on_reason_edited" swapped="no"/> - </object> - <attributes> - <attribute name="editable">6</attribute> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - <style> - <class name="margin-12"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">outcast</property> - <property name="title" translatable="yes">Ban List</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkStackSidebar"> - <property name="width_request">140</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stack">stack</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="height">2</property> + <property name="name">error</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -128,9 +128,6 @@ <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> <child> <object class="GtkBox" id="manage_box"> <property name="visible">True</property> @@ -153,7 +150,7 @@ <property name="name">manage</property> <property name="title" translatable="yes">Manage</property> <property name="icon-name">preferences-other-symbolic</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -172,7 +169,7 @@ <property name="name">affiliations</property> <property name="title" translatable="yes">Affiliations</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -191,6 +188,22 @@ <property name="name">outcasts</property> <property name="title" translatable="yes">Outcasts</property> <property name="icon-name">system-users-symbolic</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkBox" id="configuration_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="name">config</property> + <property name="title" translatable="yes">Configuration</property> + <property name="icon-name">document-properties-symbolic</property> <property name="position">5</property> </packing> </child> ===================================== gajim/data/gui/groupchat_outcast.ui ===================================== @@ -197,60 +197,7 @@ </packing> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="status_image"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinner" id="spinner"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="apply_button"> - <property name="label">_Apply</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_apply" swapped="no"/> - <style> - <class name="suggested-action"/> - </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">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> <style> <class name="margin-12"/> ===================================== gajim/gtk/apply_button_box.py ===================================== @@ -0,0 +1,75 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Any +from typing import Callable + +from gi.repository import Gtk + + +class ApplyButtonBox(Gtk.Box): + def __init__(self, + button_text: str, + on_clicked: Callable[[Gtk.Button], Any]) -> None: + + Gtk.Box.__init__(self, + orientation=Gtk.Orientation.HORIZONTAL, + spacing=6) + + self._status_image = Gtk.Image(no_show_all=True) + self._spinner = Gtk.Spinner(no_show_all=True) + self._button = Gtk.Button(label=button_text, sensitive=False) + self._button.get_style_context().add_class('suggested-action') + self._button.connect('clicked', self._on_clicked) + self._button.connect('clicked', on_clicked) + + self.add(self._status_image) + self.add(self._spinner) + self.add(self._button) + + def _on_clicked(self, button: Gtk.Button) -> None: + button.set_sensitive(False) + self._spinner.show() + self._spinner.start() + + def set_button_state(self, state: bool) -> None: + if state: + self._status_image.hide() + self._button.set_sensitive(state) + + def set_success(self) -> None: + self._spinner.stop() + self._spinner.hide() + self._set_status_image('success') + + def set_error(self, tooltip_text: str): + self._spinner.stop() + self._spinner.hide() + self._set_status_image('error', tooltip_text) + self._button.set_sensitive(True) + + def _set_status_image(self, state: str, tooltip_text: str = '') -> None: + icon_name = 'feather-check-symbolic' + css_class = 'success-color' + + if state == 'error': + icon_name = 'dialog-warning-symbolic' + css_class = 'warning-color' + + self._status_image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + self._status_image.get_style_context().add_class(css_class) + self._status_image.set_tooltip_text(tooltip_text) + self._status_image.show() ===================================== gajim/gtk/builder.pyi ===================================== @@ -376,28 +376,15 @@ class GroupchatAffiliationBuilder(Builder): add_remove_button_box: Gtk.Box add_button: Gtk.Button remove_button: Gtk.Button - status_image: Gtk.Image - spinner: Gtk.Spinner - apply_button: Gtk.Button class GroupchatConfigBuilder(Builder): - affiliation_store: Gtk.ListStore - combo_store: Gtk.ListStore - info_popover: Gtk.Popover - outcast_store: Gtk.ListStore - grid: Gtk.Grid - treeview_buttonbox: Gtk.Box - info_button: Gtk.MenuButton - add_button: Gtk.Button - remove_button: Gtk.Button - ok_button: Gtk.Button stack: Gtk.Stack - config_grid: Gtk.Grid - affiliation_treeview: Gtk.TreeView - reserved_name_column: Gtk.TreeViewColumn - role_column: Gtk.TreeViewColumn - outcast_treeview: Gtk.TreeView + loading_box: Gtk.Box + config_box: Gtk.Box + error_box: Gtk.Box + error_image: Gtk.Image + error_label: Gtk.Label class GroupchatControlBuilder(Builder): @@ -487,6 +474,7 @@ class GroupchatDetailsBuilder(Builder): manage_box: Gtk.Box affiliation_box: Gtk.Box outcasts_box: Gtk.Box + configuration_box: Gtk.Box class GroupchatInfoScrolledBuilder(Builder): @@ -554,9 +542,6 @@ class GroupchatOutcastBuilder(Builder): add_button: Gtk.Button remove_button: Gtk.Button info_button: Gtk.MenuButton - status_image: Gtk.Image - spinner: Gtk.Spinner - apply_button: Gtk.Button class GroupchatRosterBuilder(Builder): ===================================== gajim/gtk/const.py ===================================== @@ -144,7 +144,6 @@ def __str__(self): 'ContactInfo': 'gajim.gui.contact_info', 'CreateGroupchatWindow': 'gajim.gui.groupchat_creation', 'Features': 'gajim.gui.features', - 'GroupchatConfig': 'gajim.gui.groupchat_config', 'GroupchatDetails': 'gajim.gui.groupchat_details', 'GroupChatInvitation': 'gajim.gui.groupchat_invitation', 'GroupchatJoin': 'gajim.gui.groupchat_join', ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -70,7 +70,6 @@ from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationCheckDialog from gajim.gui.dialogs import ConfirmationDialog -from gajim.gui.groupchat_config import GroupchatConfig from gajim.gui.dataform import DataFormWidget from gajim.gui.groupchat_inviter import GroupChatInviter from gajim.gui.groupchat_roster import GroupchatRoster @@ -273,7 +272,6 @@ def add_actions(self) -> None: actions = [ ('change-nickname-', None, self._on_change_nick), ('destroy-', None, self._on_destroy_room), - ('configure-', None, self._on_configure_room), ('request-voice-', None, self._on_request_voice), ('groupchat-details-', None, self._on_details), ('invite-', None, self._on_invite), @@ -442,31 +440,6 @@ def _on_destroy_confirm(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').destroy(self.room_jid, reason, jid) self._show_page('groupchat') - def _on_configure_room(self, _button: Gtk.Button) -> None: - win = get_app_window('GroupchatConfig', self.account, self.room_jid) - if win is not None: - win.present() - return - - contact = self.contact.get_self() - if contact.affiliation.is_owner: - self._client.get_module('MUC').request_config( - self.room_jid, callback=self._on_configure_form_received) - - elif contact.affiliation.is_admin: - GroupchatConfig(self.account, - self.room_jid, - contact.affiliation.value) - self._show_page('groupchat') - - def _on_configure_form_received(self, task: Task) -> None: - try: - result = task.finish() - except StanzaError as error: - log.info(error) - return - GroupchatConfig(self.account, result.jid, 'owner', result.form) - def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: self._request_voice() self.xml.visitor_popover.popdown() ===================================== gajim/gtk/dataform.py ===================================== @@ -59,6 +59,7 @@ def __init__(self, form_node, options=None): self._form_node = form_node self._form_grid = FormGrid(form_node, options) + self._original_form_hash = self.get_form_hash() self.add(self._form_grid) @@ -80,6 +81,15 @@ def get_submit_form(self): self._form_node.type_ = 'submit' return self._form_node + def get_form_hash(self): + return hash(str(self._form_node)) + + def was_modified(self): + return self._original_form_hash != self.get_form_hash() + + def reset_form_hash(self): + self._original_form_hash = self.get_form_hash() + def focus_first_entry(self): for row in range(0, self._form_grid.row_count): widget = self._form_grid.get_child_at(1, row) @@ -305,7 +315,7 @@ def _start_validation(): self._form_grid.validate(is_valid) self._validate_source_id = None - self._validate_source_id = GLib.timeout_add(500, _start_validation) + self._validate_source_id = GLib.timeout_add(200, _start_validation) class BooleanField(Field): @@ -324,6 +334,7 @@ def __init__(self, field, form_grid, options): def _toggled(self, _widget): self._field.value = self._widget.get_active() + self._validate() class FixedField(Field): ===================================== gajim/gtk/groupchat_affiliation.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact +from gajim.gui.apply_button_box import ApplyButtonBox from gajim.gui.builder import get_builder from gajim.gui.dialogs import ErrorDialog @@ -68,6 +69,9 @@ def __init__(self, client: Client, contact: GroupchatContact) -> None: self._store = self._ui.affiliation_store self.add(self._ui.main_box) + self._apply_button = ApplyButtonBox(_('Apply'), + on_clicked=self._on_apply) + self._ui.button_box.pack_end(self._apply_button, False, False, 0) if self._own_affiliation in ('admin', 'owner'): self._ui.add_button.set_sensitive(True) @@ -87,16 +91,10 @@ def _on_apply(self, _button: Gtk.Button) -> None: self._set_affiliations() def _begin_progress(self) -> None: - self._ui.spinner.show() - self._ui.spinner.start() - self._ui.apply_button.set_sensitive(False) self._ui.affiliation_scrolled.set_sensitive(False) self._ui.add_remove_button_box.set_sensitive(False) - def _end_progress(self, result: str) -> None: - self._ui.spinner.stop() - self._ui.spinner.hide() - self._ui.apply_button.set_sensitive(result == 'error') + def _end_progress(self) -> None: self._ui.affiliation_scrolled.set_sensitive(True) self._ui.add_remove_button_box.set_sensitive(True) @@ -228,8 +226,7 @@ def _update_apply_button_state(self): if self._own_affiliation not in ('admin', 'owner'): return new_rows = self._get_new_rows() - self._ui.apply_button.set_sensitive(new_rows != self._current_rows) - self._ui.status_image.hide() + self._apply_button.set_button_state(new_rows != self._current_rows) def _allowed_to_edit(self, affiliation: str) -> tuple[bool, bool]: if self._own_affiliation == 'owner': @@ -293,13 +290,13 @@ def _on_affiliation_finished(self, task: Task) -> None: task.finish() except StanzaError as error: log.info('Error while setting affiliations: %s', error) - self._end_progress('error') - self._set_status_image('error', tooltip_text=str(error)) + self._end_progress() + self._apply_button.set_error(str(error)) return self._current_rows = self._get_new_rows() - self._set_status_image('success') - self._end_progress('success') + self._end_progress() + self._apply_button.set_success() def _on_affiliations_received(self, task: Task) -> None: affiliation = task.get_user_data() @@ -326,19 +323,6 @@ def _on_affiliations_received(self, task: Task) -> None: nick=nick, affiliation=affiliation)) - def _set_status_image(self, state: str, tooltip_text: str = '') -> None: - icon_name = 'feather-check-symbolic' - css_class = 'success-color' - - if state == 'error': - icon_name = 'dialog-warning-symbolic' - css_class = 'warning-color' - - self._ui.status_image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) - self._ui.status_image.get_style_context().add_class(css_class) - self._ui.status_image.set_tooltip_text(tooltip_text) - self._ui.status_image.show() - @staticmethod def _raise_error() -> None: ErrorDialog(_('Error'), ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -12,389 +12,106 @@ # 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 + import logging -from nbxmpp.namespaces import Namespace -from nbxmpp.errors import StanzaError -from gi.repository import Gdk from gi.repository import Gtk +from nbxmpp.errors import StanzaError +from nbxmpp.task import Task -from gajim.common import app +from gajim.common.client import Client from gajim.common.i18n import _ -from gajim.common.const import MUCUser +from gajim.common.modules.contacts import GroupchatContact +from gajim.gtk.builder import get_builder -from .dialogs import ErrorDialog +from .apply_button_box import ApplyButtonBox from .dataform import DataFormWidget -from .builder import get_builder log = logging.getLogger('gajim.gui.groupchat_config') -class GroupchatConfig(Gtk.ApplicationWindow): - def __init__(self, account, jid, own_affiliation, form=None): - Gtk.ApplicationWindow.__init__(self) - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_show_menubar(False) - self.set_title(_('Group Chat Configuration')) - self._destroyed = False +class GroupchatConfig(Gtk.Box): + def __init__(self, client: Client, contact: GroupchatContact) -> None: + Gtk.Box.__init__(self) - self.account = account - self.jid = jid - self._own_affiliation = own_affiliation + self._contact = contact + self._client = client + self._data_form_widget = cast(DataFormWidget, None) + self_contact = self._contact.get_self() + assert self_contact is not None - self._ui = get_builder('groupchat_config.ui') - self.add(self._ui.grid) + self._own_affiliation = self_contact.affiliation - # Activate Add button only for Admins and Owners - if self._own_affiliation in ('admin', 'owner'): - self._ui.add_button.set_sensitive(True) - self._ui.add_button.set_tooltip_text('') - - disco_info = app.storage.cache.get_last_disco_info(self.jid) - visible = disco_info.supports(Namespace.REGISTER) - self._ui.reserved_name_column.set_visible(visible) - self._ui.info_button.set_sensitive(False) + self._ui = get_builder('groupchat_config.ui') - self._form = form - self._affiliations = {} - self._new_affiliations = {} + self._apply_button = ApplyButtonBox(_('Apply'), self._on_apply) + self._apply_button.set_halign(Gtk.Align.END) + self._apply_button.get_style_context().add_class('margin-18') - con = app.connections[self.account] - for affiliation in ('owner', 'admin', 'member', 'outcast'): - con.get_module('MUC').get_affiliation( - self.jid, - affiliation, - callback=self._on_affiliations_received, - user_data=affiliation) + self._ui.config_box.pack_end(self._apply_button, False, True, 0) - if form is not None: - self._ui.stack.set_visible_child_name('config') - self._data_form_widget = DataFormWidget(form) - self._data_form_widget.connect('is-valid', self._on_is_valid) - self._data_form_widget.validate() - self._ui.config_grid.add(self._data_form_widget) - else: - self._ui.stack.get_child_by_name('config').hide() - self._ui.stack.get_child_by_name('config').set_no_show_all(True) - self._ui.stack.set_visible_child_name('affiliation') + self.add(self._ui.stack) - self._ui.connect_signals(self) - self.connect('delete-event', self._cancel) - self.connect('destroy', self._on_destroy) - self.connect('key-press-event', self._on_key_press) self.show_all() - self._ui.stack.notify('visible-child-name') - - def _on_is_valid(self, _widget, is_valid): - self._ui.ok_button.set_sensitive(is_valid) - def _get_current_treeview(self): - page_name = self._ui.stack.get_visible_child_name() - return getattr(self._ui, '%s_treeview' % page_name) - - def _on_add(self, *args): - page_name = self._ui.stack.get_visible_child_name() - if page_name == 'outcast': - affiliation_edit, jid_edit = self._allowed_to_edit('outcast') - text = None - affiliation = 'outcast' + if self._own_affiliation.is_owner: + self._ui.stack.set_visible_child_name('loading') + self._client.get_module('MUC').request_config( + self._contact.jid, callback=self._on_config_received) else: - affiliation_edit, jid_edit = self._allowed_to_edit('member') - text = _('Member') - affiliation = 'member' - - treeview = self._get_current_treeview() - iter_ = treeview.get_model().append([None, - None, - None, - affiliation, - text, - affiliation_edit, - jid_edit]) - - # Scroll to added row - path = treeview.get_model().get_path(iter_) - treeview.scroll_to_cell(path, None, False, 0, 0) - treeview.get_selection().unselect_all() - treeview.get_selection().select_path(path) - - def _on_remove(self, *args): - treeview = self._get_current_treeview() - model, paths = treeview.get_selection().get_selected_rows() - - owner_count = self._get_owner_count() - references = [] - for path in paths: - if model[path][MUCUser.AFFILIATION] == 'owner': - if owner_count < 2: - # There must be at least one owner - ErrorDialog(_('Error'), - _('A Group Chat needs at least one Owner')) - return - owner_count -= 1 - references.append(Gtk.TreeRowReference.new(model, path)) - - for ref in references: - iter_ = model.get_iter(ref.get_path()) - model.remove(iter_) - - def _on_jid_edited(self, _renderer, path, new_text): - old_text = self._ui.affiliation_store[path][MUCUser.JID] - if new_text == old_text: - return - - if self._jid_exists(new_text): - self._raise_error() - return - - self._ui.affiliation_store[path][MUCUser.JID] = new_text - - def _on_outcast_jid_edited(self, _renderer, path, new_text): - old_text = self._ui.outcast_store[path][MUCUser.JID] - if new_text == old_text: - return - - if self._jid_exists(new_text): - self._raise_error() - return - - self._ui.outcast_store[path][MUCUser.JID] = new_text - self._ui.outcast_store[path][MUCUser.AFFILIATION] = 'outcast' - - def _on_nick_edited(self, _renderer, path, new_text): - self._ui.affiliation_store[path][MUCUser.NICK] = new_text - - def _on_reason_edited(self, _renderer, path, new_text): - self._ui.outcast_store[path][MUCUser.REASON] = new_text - - def _on_affiliation_changed(self, cell_renderer_combo, - path_string, new_iter): - combo_store = cell_renderer_combo.get_property('model') - affiliation_text = combo_store.get_value(new_iter, 0) - affiliation = combo_store.get_value(new_iter, 1) - - store = self._ui.affiliation_treeview.get_model() - - store[path_string][MUCUser.AFFILIATION] = affiliation - store[path_string][MUCUser.AFFILIATION_TEXT] = affiliation_text - - def _on_selection_changed(self, tree_selection): - sensitive = bool(tree_selection.count_selected_rows()) - selected_affiliations = self._get_selected_affiliations(tree_selection) - self._set_remove_button_state(sensitive, selected_affiliations) - - def _jid_exists(self, jid): - stores = [self._ui.affiliation_store, self._ui.outcast_store] - - for store in stores: - for row in store: - if row[MUCUser.JID] == jid: - return True - return False - - @staticmethod - def _get_selected_affiliations(tree_selection): - model, paths = tree_selection.get_selected_rows() - selected_affiliations = set() - for path in paths: - selected_affiliations.add(model[path][MUCUser.AFFILIATION]) - return selected_affiliations - - def _on_switch_page(self, stack, _pspec): - page_name = stack.get_visible_child_name() - self._set_button_box_state(page_name) - if page_name == 'config': - return - - treeview = getattr(self._ui, '%s_treeview' % page_name) - sensitive = bool(treeview.get_selection().count_selected_rows()) - - selected_affiliations = self._get_selected_affiliations( - treeview.get_selection()) - self._set_remove_button_state(sensitive, selected_affiliations) - - def _set_button_box_state(self, page_name): - affiliation = self._own_affiliation in ('admin', 'owner') - page = page_name != 'config' - self._ui.treeview_buttonbox.set_visible(affiliation and page) - self._ui.info_button.set_sensitive(page_name == 'outcast') - - def _set_remove_button_state(self, sensitive, selected_affiliations): - if self._own_affiliation not in ('admin', 'owner'): - self._ui.remove_button.set_sensitive(False) - return - - self._ui.remove_button.set_tooltip_text('') - - if not sensitive: - self._ui.remove_button.set_sensitive(False) - return - - if self._own_affiliation == 'owner': - self._ui.remove_button.set_sensitive(True) - return + self._ui.error_label.set_text( + _('You need Owner permission to change the configuration')) + self._ui.error_image.set_from_icon_name('dialog-error', + Gtk.IconSize.DIALOG) + self._ui.stack.set_visible_child_name('error') + + def _set_form(self, form: Any) -> None: + self._data_form_widget = DataFormWidget(form) + self._data_form_widget.connect('is-valid', self._on_is_valid) + self._data_form_widget.show_all() + self._ui.config_box.add(self._data_form_widget) + self._ui.stack.set_visible_child_name('config') + + def _on_is_valid(self, _widget: Any, is_valid: bool) -> None: + if not self._data_form_widget.was_modified(): + self._apply_button.set_button_state(False) + else: + self._apply_button.set_button_state(is_valid) - if set(['owner', 'admin']).intersection(selected_affiliations): - self._ui.remove_button.set_sensitive(False) - self._ui.remove_button.set_tooltip_text( - _('You are not allowed to modify the affiliation ' - 'of Admins and Owners')) + def _on_config_received(self, task: Task) -> None: + try: + result = task.finish() + except StanzaError as error: + self._ui.error_label.set_text(str(error)) + self._ui.error_image.set_from_icon_name('dialog-error', + Gtk.IconSize.DIALOG) + self._ui.stack.set_visible_child_name('error') return - self._ui.remove_button.set_sensitive(True) - - def _get_owner_count(self): - owner_count = 0 - for row in self._ui.affiliation_store: - if row[MUCUser.AFFILIATION] == 'owner': - owner_count += 1 - return owner_count - - def _allowed_to_edit(self, affiliation): - if self._own_affiliation == 'owner': - return True, True - - if self._own_affiliation == 'admin': - if affiliation in ('admin', 'owner'): - return False, False - return False, True - return False, False - - def _on_ok(self, *args): - if self._own_affiliation in ('admin', 'owner'): - self._set_affiliations() + self._set_form(result.form) + self._ui.stack.set_visible_child_name('config') - if self._form is not None and self._own_affiliation == 'owner': - form = self._data_form_widget.get_submit_form() - con = app.connections[self.account] - con.get_module('MUC').set_config(self.jid, form) - self.destroy() + def _on_apply(self, button: Gtk.Button) -> None: + form = self._data_form_widget.get_submit_form() # type: ignore - def _get_diff(self): - stores = [self._ui.affiliation_store, self._ui.outcast_store] + self._data_form_widget.set_sensitive(False) - self._new_affiliations = {} - for store in stores: - for row in store: - if not row[MUCUser.JID]: - # Ignore empty JID field - continue + self._client.get_module('MUC').set_config(self._contact.jid, + form, + callback=self._on_finished) - attr = 'nick' - if row[MUCUser.AFFILIATION] == 'outcast': - attr = 'reason' + def _on_finished(self, task: Task) -> None: + self._data_form_widget.set_sensitive(True) + self._data_form_widget.reset_form_hash() - self._new_affiliations[row[MUCUser.JID]] = { - 'affiliation': row[MUCUser.AFFILIATION], - attr: row[MUCUser.NICK_OR_REASON]} - - old_jids = set(self._affiliations.keys()) - new_jids = set(self._new_affiliations.keys()) - remove = old_jids - new_jids - add = new_jids - old_jids - modified = new_jids - remove - add - - return add, remove, modified - - def _on_key_press(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self._on_cancel() - - def _on_cancel(self, *args): - self._cancel() - self.destroy() - - def _cancel(self, *args): - if self._form and self._own_affiliation == 'owner': - con = app.connections[self.account] - con.get_module('MUC').cancel_config(self.jid) - - def _on_destroy(self, *args): - self._destroyed = True - - def _set_affiliations(self): - add, remove, modified = self._get_diff() - - diff_dict = {} - for jid in add: - diff_dict[jid] = self._new_affiliations[jid] - - for jid in remove: - diff_dict[jid] = {'affiliation': 'none'} - - for jid in modified: - if self._new_affiliations[jid] == self._affiliations[jid]: - # Not modified - continue - - diff_dict[jid] = self._new_affiliations[jid] - if self._new_affiliations[jid]['affiliation'] == 'outcast': - # New affiliation is outcast, check if the reason changed. - # In case the affiliation was 'admin', 'owner' or 'member' - # before, there is no reason. - new_reason = self._new_affiliations[jid]['reason'] - old_reason = self._affiliations[jid].get('reason') - if new_reason == old_reason: - diff_dict[jid].pop('reason', None) - - else: - # New affiliation is not outcast, check if the nick has changed. - # In case the affiliation was 'outcast' there is no nick. - new_nick = self._new_affiliations[jid]['nick'] - old_nick = self._affiliations[jid].get('nick') - if new_nick == old_nick: - diff_dict[jid].pop('nick', None) - - if not diff_dict: - # No changes were made - return - con = app.connections[self.account] - con.get_module('MUC').set_affiliation(self.jid, diff_dict) - - def _on_affiliations_received(self, task): - affiliation = task.get_user_data() try: - result = task.finish() + task.finish() except StanzaError as error: - log.info('Error while requesting %s affiliations: %s', - affiliation, error.condition) + self._apply_button.set_error(str(error)) return - if affiliation == 'outcast': - self._ui.stack.get_child_by_name('outcast').show() - - for jid, attrs in result.users.items(): - affiliation_edit, jid_edit = self._allowed_to_edit(affiliation) - if affiliation == 'outcast': - reason = attrs.get('reason') - self._ui.outcast_store.append( - [str(jid), - reason, - None, - affiliation, - None, - affiliation_edit, - jid_edit]) - self._affiliations[jid] = {'affiliation': affiliation, - 'reason': reason} - else: - nick = attrs.get('nick') - role = attrs.get('role') - self._ui.affiliation_store.append( - [str(jid), - nick, - role, - affiliation, - _(affiliation.capitalize()), - affiliation_edit, - jid_edit]) - self._affiliations[jid] = {'affiliation': affiliation, - 'nick': nick} - if role is not None: - self._ui.role_column.set_visible(True) - - @staticmethod - def _raise_error(): - ErrorDialog(_('Error'), - _('An entry with this XMPP Address already exists')) + self._apply_button.set_success() ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -31,6 +31,7 @@ from .builder import get_builder from .groupchat_info import GroupChatInfoScrolled +from .groupchat_config import GroupchatConfig from .groupchat_manage import GroupchatManage from .groupchat_settings import GroupChatSettings from .sidebar_switcher import SideBarSwitcher @@ -74,6 +75,7 @@ def __init__(self, self._add_groupchat_manage() self._add_affiliations() self._add_outcasts() + self._add_configuration() self._load_avatar() self._ui.name_entry.set_text(contact.name) @@ -90,6 +92,8 @@ def __init__(self, self.show_all() def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: + if event.jid != self._contact.jid: + return self._ui.name_entry.set_text(self._contact.name) disco_info = self._contact.get_disco() assert disco_info is not None @@ -127,8 +131,8 @@ def _on_avatar_update(self, def _add_groupchat_manage(self) -> None: self._groupchat_manage = GroupchatManage(self.account, - self._contact, - self._subject_text) + self._contact, + self._subject_text) self._ui.manage_box.add(self._groupchat_manage) def _add_groupchat_info(self) -> None: @@ -159,6 +163,10 @@ def _add_outcasts(self) -> None: affiliations = GroupchatOutcasts(self._client, self._contact) self._ui.outcasts_box.add(affiliations) + def _add_configuration(self) -> None: + config = GroupchatConfig(self._client, self._contact) + self._ui.configuration_box.add(config) + def _on_key_press(self, _widget: GroupchatDetails, event: Gdk.EventKey) -> None: ===================================== gajim/gtk/groupchat_outcasts.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact +from gajim.gui.apply_button_box import ApplyButtonBox from gajim.gui.builder import get_builder from gajim.gui.dialogs import ErrorDialog @@ -65,6 +66,9 @@ def __init__(self, client: Client, contact: GroupchatContact) -> None: self._store = self._ui.outcast_store self.add(self._ui.main_box) + self._apply_button = ApplyButtonBox(_('Apply'), + on_clicked=self._on_apply) + self._ui.button_box.pack_end(self._apply_button, False, False, 0) if self._own_affiliation in ('admin', 'owner'): self._ui.add_button.set_sensitive(True) @@ -82,16 +86,10 @@ def _on_apply(self, _button: Gtk.Button) -> None: self._set_outcasts() def _begin_progress(self) -> None: - self._ui.spinner.show() - self._ui.spinner.start() - self._ui.apply_button.set_sensitive(False) self._ui.outcast_scrolled.set_sensitive(False) self._ui.add_remove_button_box.set_sensitive(False) - def _end_progress(self, result: str) -> None: - self._ui.spinner.stop() - self._ui.spinner.hide() - self._ui.apply_button.set_sensitive(result == 'error') + def _end_progress(self) -> None: self._ui.outcast_scrolled.set_sensitive(True) self._ui.add_remove_button_box.set_sensitive(True) @@ -161,8 +159,7 @@ def _update_apply_button_state(self): if self._own_affiliation not in ('admin', 'owner'): return new_rows = self._get_new_rows() - self._ui.apply_button.set_sensitive(new_rows != self._current_rows) - self._ui.status_image.hide() + self._apply_button.set_button_state(new_rows != self._current_rows) def _allowed_to_edit(self) -> bool: return self._own_affiliation in ('owner', 'admin') @@ -216,13 +213,13 @@ def _on_affiliation_finished(self, task: Task) -> None: task.finish() except StanzaError as error: log.info('Error while setting outcasts: %s', error) - self._end_progress('error') - self._set_status_image('error', tooltip_text=str(error)) + self._end_progress() + self._apply_button.set_error(str(error)) return self._current_rows = self._get_new_rows() - self._set_status_image('success') - self._end_progress('success') + self._end_progress() + self._apply_button.set_success() def _on_outcasts_received(self, task: Task) -> None: try: @@ -240,19 +237,6 @@ def _on_outcasts_received(self, task: Task) -> None: self._current_rows.add(OutcastRow(jid=jid, reason=reason)) - def _set_status_image(self, state: str, tooltip_text: str = '') -> None: - icon_name = 'feather-check-symbolic' - css_class = 'success-color' - - if state == 'error': - icon_name = 'dialog-warning-symbolic' - css_class = 'warning-color' - - self._ui.status_image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) - self._ui.status_image.get_style_context().add_class(css_class) - self._ui.status_image.set_tooltip_text(tooltip_text) - self._ui.status_image.show() - @staticmethod def _raise_error() -> None: ErrorDialog(_('Error'), ===================================== pyrightconfig.json ===================================== @@ -24,6 +24,7 @@ "gajim/gtk/about.py", "gajim/gtk/account_page.py", "gajim/gtk/account_side_bar.py", + "gajim/gtk/apply_button_box.py", "gajim/gtk/app_page.py", "gajim/gtk/app_side_bar.py", "gajim/gtk/application.py", @@ -42,6 +43,7 @@ "gajim/gtk/features.py", "gajim/gtk/file_transfer_send.py", "gajim/gtk/groupchat_affiliation.py", + "gajim/gtk/groupchat_config.py", "gajim/gtk/groupchat_details.py", "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", ===================================== scripts/dev/generate_ui_types.py ===================================== @@ -85,6 +85,9 @@ def parse(path, file): for path in paths: if path.name.endswith('~'): continue + + if path.name.startswith('#'): + continue name = parse(path, file) builder_names.append((name, path.name)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a1f58a5a69c3a248f0883d5a889716f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a1f58a5a69c3a248f0883d5a889716f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ResourceSelector: Fix typo
by Daniel Brötzmann (＠wurstsalat) 31 Jan '22

31 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a1f58a5a by Daniel Brötzmann at 2022-01-31T09:18:18+00:00 ResourceSelector: Fix typo - - - - - 1 changed file: - gajim/gtk/resource_selector.py Changes: ===================================== gajim/gtk/resource_selector.py ===================================== @@ -147,7 +147,7 @@ def __init__(self, for constraint in constraints: if not resource_contact.supports(constraint): self.set_sensitive(False) - self.set_tooltip_text(_('This devices is not compatible.')) + self.set_tooltip_text(_('This device is not compatible.')) self.add(box) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1f58a5a69c3a248f0883d5a889716fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1f58a5a69c3a248f0883d5a889716fa… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits