Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][newcontrol] Close chat when cancelling password prompt
by Daniel Brötzmann (＠wurstsalat) 20 Jul '22

20 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 9ed653f5 by wurstsalat at 2022-07-20T19:04:39+02:00 Close chat when cancelling password prompt - - - - - 1 changed file: - gajim/gtk/chat_function_page.py Changes: ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -272,6 +272,8 @@ def _on_cancel_clicked(self, _button: Gtk.Button) -> None: if self._mode == 'password-request': self._client.get_module('MUC').cancel_password_request( self._contact.jid) + self.emit('finish', True) + return if self._mode in ( 'join-failed', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ed653f5bdc4c37b47349ce06ad18112… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ed653f5bdc4c37b47349ce06ad18112… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Make password join work
by Philipp Hörist (＠lovetox) 18 Jul '22

18 Jul '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: c15e1ab1 by lovetox at 2022-07-19T00:04:23+02:00 Make password join work - - - - - 4 changed files: - gajim/common/const.py - gajim/common/modules/muc.py - gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py Changes: ===================================== gajim/common/const.py ===================================== @@ -246,6 +246,7 @@ class MUCJoinedState(Enum): CREATING = 'creating' CAPTCHA_REQUEST = 'captcha in progress' CAPTCHA_FAILED = 'captcha failed' + PASSWORD_REQUEST = 'password request' def __str__(self): return self.name @@ -274,6 +275,10 @@ def is_captcha_request(self): def is_captcha_failed(self): return self == MUCJoinedState.CAPTCHA_FAILED + @property + def is_password_request(self): + return self == MUCJoinedState.PASSWORD_REQUEST + class ClientState(IntEnum): DISCONNECTING = 0 ===================================== gajim/common/modules/muc.py ===================================== @@ -262,7 +262,8 @@ def join(self, # join a different nickname, so update MUCData here. muc_data.nick = nick - if not muc_data.state.is_not_joined: + if muc_data.state not in (MUCJoinedState.NOT_JOINED, + MUCJoinedState.PASSWORD_REQUEST): self._log.warning('Can’t join MUC %s, state: %s', jid, muc_data.state) return @@ -497,8 +498,7 @@ def _on_error_presence(self, elif properties.error.condition == 'not-authorized': self._remove_rejoin_timeout(room_jid) - muc_data.error = 'password-request' - self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.PASSWORD_REQUEST) room.notify('room-password-required', properties) else: @@ -774,6 +774,9 @@ def _fake_subject_change(self, room_jid: str) -> None: room = self._get_contact(room_jid) room.notify('room-joined') + def cancel_password_request(self, room_jid: str) -> None: + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + def _room_join_complete(self, muc_data: MUCData): self._remove_join_timeout(muc_data.jid) self._set_muc_state(muc_data.jid, MUCJoinedState.JOINED) ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -156,6 +156,7 @@ def set_mode(self, self._confirm_button.get_style_context().add_class( 'suggested-action') self._widget = InputWidget(self._contact, mode) + self._widget.connect('changed', self._on_ready) elif mode == 'captcha-request': self._confirm_button.set_label(_('Join')) @@ -259,14 +260,19 @@ def _on_confirm_clicked(self, _button: Gtk.Button) -> None: self.emit('finish', False) def _on_cancel_clicked(self, _button: Gtk.Button) -> None: + assert self._client is not None + assert self._contact is not None + if self._mode == 'captcha-request': - assert self._client is not None - assert self._contact is not None self._client.get_module('MUC').cancel_captcha( self._contact.jid) self.emit('finish', True) return + if self._mode == 'password-request': + self._client.get_module('MUC').cancel_password_request( + self._contact.jid) + if self._mode in ( 'join-failed', 'creation-failed', ===================================== gajim/gtk/chat_stack.py ===================================== @@ -135,10 +135,11 @@ def show_chat(self, account: str, jid: JID) -> None: self._show_chat_function_page('captcha-request') return + if muc_data.state.is_password_request: + self._show_chat_function_page('password-request') + return + if not muc_data.state.is_joined: - if muc_data.error == 'password-request': - self._show_chat_function_page('password-request') - return if muc_data.error == 'captcha-failed': self._show_chat_function_page( 'captcha-error', muc_data.error_text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c15e1ab1232dc3d52b700fe92503f597… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c15e1ab1232dc3d52b700fe92503f597… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Allow manual download for all mime types
by Daniel Brötzmann (＠wurstsalat) 18 Jul '22

18 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: feaf6f49 by wurstsalat at 2022-07-18T21:48:28+02:00 fix: Preview: Allow manual download for all mime types Fixes #11044 - - - - - 1 changed file: - gajim/common/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -428,7 +428,7 @@ def _on_content_sniffed(self, preview.mime_type = type_ preview.file_size = file_size - if type_ not in ALLOWED_MIME_TYPES: + if type_ not in ALLOWED_MIME_TYPES and not force: log.info('Not an allowed content type: %s, %s', type_, uri) session.cancel_message(message, Soup.Status.CANCELLED) return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/feaf6f4920145ec4ac69af364a406136… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/feaf6f4920145ec4ac69af364a406136… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] GroupChatNickCompletion: Process gc messages
by Daniel Brötzmann (＠wurstsalat) 18 Jul '22

18 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: d63e9b8f by wurstsalat at 2022-07-18T21:06:58+02:00 GroupChatNickCompletion: Process gc messages - - - - - 5 changed files: - gajim/gtk/chat_action_processor.py - gajim/gtk/controls/groupchat.py - gajim/gtk/groupchat_nick_completion.py - gajim/gtk/message_input.py - test/no_gui/test_nick_completion.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -326,7 +326,3 @@ def _move_selection(self, direction: Direction) -> None: def _item_has_focus(item: Gtk.ModelButton) -> bool: flags = item.get_state_flags() return 'GTK_STATE_FLAG_FOCUSED' in str(flags) - - def process_message(self, contact_name: str, highlight: bool) -> None: - if isinstance(self._contact, GroupchatContact): - self._nick_completion.process_message(contact_name, highlight) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -210,8 +210,7 @@ def on_approve() -> None: modal=False).show() def _on_message_received(self, event: events.MessageReceived) -> None: - if not event.msgtxt: - return + pass def _on_mam_message_received(self, event: events.MamMessageReceived @@ -246,10 +245,6 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: message_id=event.properties.id, stanza_id=event.stanza_id, additional_data=event.additional_data) - event.needs_highlight = helpers.message_needs_highlight( - event.msgtxt, - self.contact.nickname, - self._client.get_own_jid().bare) def add_message(self, text: str, @@ -268,13 +263,6 @@ def add_message(self, kind = 'incoming' # muc-specific chatstate - if kind == 'incoming': - highlight = helpers.message_needs_highlight( - text, self.contact.nickname, self._client.get_own_jid().bare) - - # TODO - # self.msg_textview.process_message(contact, highlight) - BaseControl.add_message(self, text, kind, ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -24,8 +24,12 @@ from gi.repository import Gdk from gajim.common import app +from gajim.common import ged from gajim.common import types +from gajim.common.events import GcMessageReceived +from gajim.common.ged import EventHelper from gajim.common.helpers import jid_is_blocked +from gajim.common.helpers import message_needs_highlight if TYPE_CHECKING: from .message_input import MessageInputTextView @@ -33,8 +37,10 @@ log = logging.getLogger('gajim.gui.groupchat_nick_completion') -class GroupChatNickCompletion: +class GroupChatNickCompletion(EventHelper): def __init__(self) -> None: + EventHelper.__init__(self) + self._account: Optional[str] = None self._contact: Optional[types.GroupchatContactT] = None @@ -45,6 +51,9 @@ def __init__(self) -> None: self._nick_data: dict[str, tuple[list[str], list[str]]] = {} + self.register_event( + 'gc-message-received', ged.GUI1, self._on_gc_message_received) + def switch_contact(self, contact: types.GroupchatContactT) -> None: self._nick_hits.clear() self._last_key_tab = False @@ -85,23 +94,41 @@ def _on_user_nickname_changed(self, if contact == old_name: lst[idx] = new_name - def process_message(self, contact_name: str, highlight: bool) -> None: - assert self._contact - if contact_name == self._contact.nickname: + def _on_gc_message_received(self, event: GcMessageReceived) -> None: + if event.properties.muc_nickname is None: + # Message from server return - log.debug('Recorded a message from %s, highlight; %s', - contact_name, - highlight) + client = app.get_client(event.account) + gc_contact = client.get_module('Contacts').get_contact( + event.room_jid) + + participant_nick = event.properties.muc_nickname + if participant_nick == gc_contact.nickname: + return + + highlight = message_needs_highlight( + event.msgtxt, gc_contact.nickname, client.get_own_jid().bare) + self._process_message(participant_nick, highlight, event.room_jid) + + def _process_message(self, + participant_nick: str, + highlight: bool, + room_jid: str + ) -> None: + nick_data = self._nick_data.get(room_jid) + if nick_data is None: + return + sender_list, highlight_list = nick_data if highlight: try: - self._highlight_list.remove(contact_name) + highlight_list.remove(participant_nick) except ValueError: pass - if len(self._highlight_list) > 6: - self._highlight_list.pop(0) # remove older - self._highlight_list.append(contact_name) + if len(highlight_list) > 6: + highlight_list.pop(0) # remove older + highlight_list.append(participant_nick) # TODO implement it in a more efficient way # Currently it's O(n*m + n*s), where n is the number of participants and @@ -113,10 +140,10 @@ def process_message(self, contact_name: str, highlight: bool) -> None: # for each suggestion (currently generating the suggestions is O(n)) # this would give the expected complexity of O(m + s * n log n) try: - self._sender_list.remove(contact_name) + sender_list.remove(participant_nick) except ValueError: pass - self._sender_list.append(contact_name) + sender_list.append(participant_nick) def _generate_suggestions(self, nicks: list[str], ===================================== gajim/gtk/message_input.py ===================================== @@ -336,9 +336,6 @@ def undo(self, *args: Any) -> None: buf.set_text(self._undo_list.pop()) self.undo_pressed = True - def process_message(self, contact_name: str, highlight: bool) -> None: - self._chat_action_processor.process_message(contact_name, highlight) - def _on_populate_popup(self, _textview: MessageInputTextView, menu: Gtk.Widget ===================================== test/no_gui/test_nick_completion.py ===================================== @@ -12,50 +12,35 @@ class Test(unittest.TestCase): def test_generate_suggestions(self): gen = GroupChatNickCompletion() contact = MagicMock() + contact.jid = 'test' gen.switch_contact(contact) - l = ['aaaa', 'fooo', 'xxxxz', 'xaaaz'] - for n in l: - gen.process_message(n, False) - l2 = ['xxx'] + l - r = gen._generate_suggestions(nicks=l2, beginning='x') - self.assertEqual(r, ['xaaaz', 'xxxxz', 'xxx']) + list_1 = ['aaaa', 'fooo', 'xxxxz', 'xaaaz'] + for name in list_1: + gen._process_message(name, False, contact.jid) + list_2 = list_1 + ['xxx'] + r = gen._generate_suggestions(nicks=list_2, beginning='x') + self.assertEqual(r, ['xaaaz', 'xxx', 'xxxxz']) r = gen._generate_suggestions( - nicks=l2, + nicks=list_2, beginning='m' ) self.assertEqual(r, []) - for n in ['xaaaz', 'xxxxz']: - gen.process_message(n, True) + for name in ['xaaaz', 'xxxxz']: + gen._process_message(name, True, contact.jid) r = gen._generate_suggestions( - nicks=l2, + nicks=list_2, beginning='x' ) - self.assertEqual(r, ['xxxxz', 'xaaaz', 'xxx']) + self.assertEqual(r, ['xaaaz', 'xxx', 'xxxxz']) r = gen._generate_suggestions( - nicks=l2, + nicks=list_2, beginning='' ) - self.assertEqual(r, ['xxxxz', 'xaaaz', 'aaaa', 'fooo', 'xxx']) - - l2[1] = 'bbbb' - - old_name = 'aaaa' - new_name = 'bbbb' - - for lst in (gen._highlight_list, gen._sender_list): - for idx, contact in enumerate(lst): - if contact == old_name: - lst[idx] = new_name - - r = gen._generate_suggestions( - nicks=l2, - beginning='' - ) - self.assertEqual(r, ['xxxxz', 'xaaaz', 'bbbb', 'fooo', 'xxx']) + self.assertEqual(r, ['aaaa', 'fooo', 'xaaaz', 'xxx', 'xxxxz']) if __name__ == '__main__': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d63e9b8f0911ccd9fbc1f7aeee02f6ce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d63e9b8f0911ccd9fbc1f7aeee02f6ce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Fix linting errors
by Daniel Brötzmann (＠wurstsalat) 17 Jul '22

17 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 0afdd0f1 by wurstsalat at 2022-07-17T21:59:20+02:00 Fix linting errors - - - - - 4 changed files: - gajim/gtk/chat_function_page.py - gajim/gtk/controls/groupchat.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -16,7 +16,6 @@ from typing import Optional -from gi.repository import Gdk from gi.repository import GObject from gi.repository import Gtk from gi.repository import Pango ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -61,7 +61,6 @@ from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.groupchat_roster import GroupchatRoster from gajim.gui.groupchat_state import GroupchatState -from gajim.gui.util import open_window log = logging.getLogger('gajim.gui.controls.groupchat') ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -181,6 +181,7 @@ def _on_action(self, def switch_contact(self, contact: ChatContactT) -> None: if self._client is not None: + self._set_chatstate(False) self._client.disconnect_all_from_obj(self) if self._contact is not None: @@ -211,7 +212,7 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_encryption_details(encryption) self._set_spell_checker_language(contact) - self._set_chatstate() + self._set_chatstate(True) self.msg_textview.switch_contact(contact) self._security_label_selector.switch_contact(contact) @@ -250,18 +251,18 @@ def _update_message_input_state(self) -> None: self.msg_textview.set_sensitive(state) self.msg_textview.set_editable(state) - def _set_chatstate(self) -> None: - return #TODO + def _set_chatstate(self, state: bool) -> None: + assert self._client is not None if state: if self.msg_textview.has_text(): self._client.get_module('Chatstate').set_chatstate( - self.contact, Chatstate.PAUSED) + self._contact, Chatstate.PAUSED) else: self._client.get_module('Chatstate').set_chatstate( - self.contact, Chatstate.ACTIVE) + self._contact, Chatstate.ACTIVE) else: self._client.get_module('Chatstate').set_chatstate( - self.contact, Chatstate.INACTIVE) + self._contact, Chatstate.INACTIVE) def _set_encryption_state(self, state: str) -> None: action = app.window.lookup_action('set-encryption') @@ -565,7 +566,7 @@ def _on_textview_key_press_event(self, app.window.activate_action('send-message', None) return True - elif event.keyval == Gdk.KEY_z: # CTRL+z + if event.keyval == Gdk.KEY_z: # CTRL+z if event_state & Gdk.ModifierType.CONTROL_MASK: self.msg_textview.undo() return True ===================================== gajim/gtk/message_input.py ===================================== @@ -346,20 +346,17 @@ def _on_populate_popup(self, assert isinstance(menu, Gtk.Menu) item = Gtk.MenuItem.new_with_mnemonic(_('_Undo')) menu.prepend(item) - id_ = item.connect('activate', self.undo) - # self.handlers[id_] = item + item.connect('activate', self.undo) item = Gtk.SeparatorMenuItem() menu.prepend(item) item = Gtk.MenuItem.new_with_mnemonic(_('_Clear')) menu.prepend(item) - id_ = item.connect('activate', self.clear) - # self.handlers[id_] = item + item.connect('activate', self.clear) paste_item = Gtk.MenuItem.new_with_label(_('Paste as quote')) - id_ = paste_item.connect('activate', self._paste_clipboard_as_quote) - # self.handlers[id_] = paste_item + paste_item.connect('activate', self._paste_clipboard_as_quote) menu.append(paste_item) menu.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0afdd0f1164959c499fc3a28bb3e40df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0afdd0f1164959c499fc3a28bb3e40df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] ChatStack: Process escape press
by Daniel Brötzmann (＠wurstsalat) 17 Jul '22

17 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 961310be by wurstsalat at 2022-07-17T16:13:06+02:00 ChatStack: Process escape press - - - - - 4 changed files: - gajim/gtk/chat_function_page.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -85,16 +85,14 @@ def __init__(self) -> None: button_box.pack_end(self._confirm_button, False, True, 0) self.add(button_box) - self.connect('key-press-event', self._on_key_press) - def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: - if event.keyval == Gdk.KEY_Escape: - close_control = self._mode in ( - 'join-failed', - 'creation-failed', - 'config-failed', - 'captcha-error') - self.emit('finish', close_control) + def process_escape(self) -> None: + close_control = self._mode in ( + 'join-failed', + 'creation-failed', + 'config-failed', + 'captcha-error') + self.emit('finish', close_control) def _clear(self) -> None: for child in self._content_box.get_children(): ===================================== gajim/gtk/chat_page.py ===================================== @@ -121,6 +121,9 @@ def set_startup_finished(self) -> None: def get_chat_list_stack(self) -> ChatListStack: return self._chat_list_stack + def get_chat_stack(self) -> ChatStack: + return self._chat_stack + def get_control_stack(self) -> ControlStack: return self._control_stack ===================================== gajim/gtk/chat_stack.py ===================================== @@ -87,6 +87,12 @@ def _get_current_contact(self) -> ChatContactT: assert self._current_contact is not None return self._current_contact + def process_escape(self) -> bool: + if self.get_visible_child_name() == 'function': + self._chat_function_page.process_escape() + return True + return False + def get_control_stack(self) -> ControlStack: return self._control_stack ===================================== gajim/gtk/main.py ===================================== @@ -391,6 +391,10 @@ def _on_action(self, if action_name == 'escape' and self._chat_page.hide_search(): return None + chat_stack = self._chat_page.get_chat_stack() + if action_name == 'escape' and chat_stack.process_escape(): + return None + control = self.get_active_control() if control is not None: if action_name == 'change-nickname': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/961310be27cea8672542dae536b0c9d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/961310be27cea8672542dae536b0c9d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Controls: Remove delegate_action
by Daniel Brötzmann (＠wurstsalat) 17 Jul '22

17 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 7ce668dd by wurstsalat at 2022-07-17T15:56:44+02:00 Controls: Remove delegate_action - - - - - 5 changed files: - gajim/gtk/control_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/control_stack.py ===================================== @@ -18,7 +18,6 @@ import logging -from gi.repository import GLib from gi.repository import Gtk from nbxmpp import JID ===================================== gajim/gtk/controls/base.py ===================================== @@ -309,9 +309,6 @@ def is_groupchat(self) -> bool: def _nec_ping(self, obj): raise NotImplementedError - def delegate_action(self, action: str) -> int: - pass - def mark_as_read(self, send_marker: bool = True) -> None: self._jump_to_end_button.reset_unread_count() ===================================== gajim/gtk/controls/chat.py ===================================== @@ -88,9 +88,6 @@ def _connect_contact_signals(self) -> None: def jid(self) -> JID: return self.contact.jid - def delegate_action(self, action: str) -> int: - return Gdk.EVENT_PROPAGATE - def _on_mam_message_received(self, event: events.MamMessageReceived) -> None: if event.properties.is_muc_pm: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -700,29 +700,6 @@ def _on_drag_data_received(self, # File drag and drop (handled in chat_control_base) self.drag_data_file_transfer(selection) - def delegate_action(self, action: str) -> int: - res = super().delegate_action(action) - if res == Gdk.EVENT_STOP: - return res - - if action == 'change-nickname': - app.window.activate_action('muc-change-nickname', None) - return Gdk.EVENT_STOP - - # if action == 'escape': - # if self._get_current_page() == 'groupchat': - # return Gdk.EVENT_PROPAGATE - - # return Gdk.EVENT_STOP - - if action == 'change-subject': - open_window('GroupchatDetails', - contact=self.contact, - page='manage') - return Gdk.EVENT_STOP - - return Gdk.EVENT_PROPAGATE - def _on_groupchat_state_abort_clicked(self, _button: Gtk.Button) -> None: app.window.activate_action( 'remove-chat', ===================================== gajim/gtk/main.py ===================================== @@ -393,10 +393,15 @@ def _on_action(self, control = self.get_active_control() if control is not None: + if action_name == 'change-nickname': + app.window.activate_action('muc-change-nickname', None) + return None - res = control.delegate_action(action_name) - if res != Gdk.EVENT_PROPAGATE: - return res + if action_name == 'change-subject': + open_window('GroupchatDetails', + contact=control.contact, + page='manage') + return None if action_name == 'escape': if app.settings.get('escape_key_closes'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7ce668dd0cb4654e19bb2117dd90a5f5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7ce668dd0cb4654e19bb2117dd90a5f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] GroupchatControl: Move password and error pages
by Daniel Brötzmann (＠wurstsalat) 17 Jul '22

17 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 891674cf by wurstsalat at 2022-07-17T15:30:32+02:00 GroupchatControl: Move password and error pages - - - - - 9 changed files: - gajim/common/const.py - gajim/common/modules/muc.py - gajim/data/gui/groupchat_control.ui - gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py - gajim/gtk/control_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/common/const.py ===================================== @@ -246,7 +246,6 @@ class MUCJoinedState(Enum): CREATING = 'creating' CAPTCHA_REQUEST = 'captcha in progress' CAPTCHA_FAILED = 'captcha failed' - PASSWORD_REQUEST = 'password required' def __str__(self): return self.name @@ -275,10 +274,6 @@ def is_captcha_request(self): def is_captcha_failed(self): return self == MUCJoinedState.CAPTCHA_FAILED - @property - def is_password_request(self): - return self == MUCJoinedState.PASSWORD_REQUEST - class ClientState(IntEnum): DISCONNECTING = 0 ===================================== gajim/common/modules/muc.py ===================================== @@ -497,16 +497,24 @@ def _on_error_presence(self, elif properties.error.condition == 'not-authorized': self._remove_rejoin_timeout(room_jid) + muc_data.error = 'password-request' self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.notify('room-password-required', properties) else: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) if room_jid not in self._rejoin_muc: + muc_data.error = 'join-failed' + assert isinstance(properties.error, CommonError) + muc_data.error_text = helpers.to_user_string( + properties.error) room.notify('room-join-failed', properties.error) elif muc_data.state == MUCJoinedState.CREATING: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + muc_data.error = 'creation-failed' + assert isinstance(properties.error, CommonError) + muc_data.error_text = helpers.to_user_string(properties.error) room.notify('room-creation-failed', properties) elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -54,317 +54,54 @@ <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkStack" id="stack"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <signal name="notify::visible-child-name" handler="_on_page_change" swapped="no"/> + <object class="GtkBox" id="groupchat_control_vbox"> + <property name="can-focus">True</property> + <property name="margin-start">7</property> + <property name="margin-end">7</property> + <property name="spacing">3</property> <child> - <object class="GtkBox" id="groupchat_control_vbox"> - <property name="can-focus">True</property> - <property name="margin-start">7</property> - <property name="margin-end">7</property> - <property name="spacing">3</property> - <child> - <object class="GtkBox" id="textview_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-end">4</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkOverlay" id="conv_view_overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </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">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRevealer" id="roster_revealer"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="transition-type">none</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="name">groupchat</property> - </packing> - </child> - <child> - <object class="GtkBox"> + <object class="GtkBox" id="textview_box"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-end">4</property> + <property name="hexpand">True</property> <property name="orientation">vertical</property> <child> -  - <object class="GtkGrid"> + <object class="GtkOverlay" id="conv_view_overlay"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row-spacing">12</property> <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Enter Password</property> - <property name="xalign">0</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_password_cancel_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="password_set_button"> - <property name="label" translatable="yes">_Join</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_password_set_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password_entry"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="visibility">False</property> - <property name="invisible-char">*</property> - <property name="activates-default">True</property> - <property name="input-purpose">password</property> - <signal name="notify::text" handler="_on_password_changed" swapped="no"/> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> + <placeholder/> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> </object> <packing> - <property name="name">password</property> - <property name="position">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <placeholder/> - </child> - <child> - <object class="GtkBox"> + <object class="GtkRevealer" id="roster_revealer"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> + <property name="transition-type">none</property> <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">dialog-error-symbolic</property> - <property name="icon_size">6</property> - <style> - <class name="error-color"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton" id="remove_bookmark_button"> - <property name="label" translatable="yes">_Forget Group Chat</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Gajim will not try to join this group chat again</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_remove_bookmark_button_clicked" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="retry_button"> - <property name="label" translatable="yes">T_ry Again</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_retry_join_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close_button"> - <property name="label" translatable="yes">_Close</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_page_close_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="error_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="justify">center</property> - <property name="wrap">True</property> - <property name="max-width-chars">40</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="error_heading"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">An Error Occurred</property> - <property name="justify">center</property> - <property name="wrap">True</property> - <property name="max-width-chars">40</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> </object> <packing> - <property name="name">error</property> - <property name="position">3</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="index">-1</property> ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -69,12 +69,19 @@ def __init__(self) -> None: cancel_button = Gtk.Button(label=_('Cancel')) cancel_button.connect('clicked', self._on_cancel_clicked) + self._forget_button = Gtk.Button(label=_('Forget Group Chat')) + self._forget_button.set_no_show_all(True) + self._forget_button.get_style_context().add_class( + 'destructive-action') + self._forget_button.connect('clicked', self._on_forget_clicked) + self._confirm_button = Gtk.Button() self._confirm_button.set_can_default(True) self._confirm_button.connect('clicked', self._on_confirm_clicked) button_box = Gtk.Box(spacing=18) button_box.pack_start(cancel_button, False, True, 0) + button_box.pack_end(self._forget_button, False, True, 0) button_box.pack_end(self._confirm_button, False, True, 0) self.add(button_box) @@ -82,7 +89,12 @@ def __init__(self) -> None: def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: - self.emit('finish', self._mode in ('error', 'captcha-error')) + close_control = self._mode in ( + 'join-failed', + 'creation-failed', + 'config-failed', + 'captcha-error') + self.emit('finish', close_control) def _clear(self) -> None: for child in self._content_box.get_children(): @@ -101,6 +113,8 @@ def set_mode(self, self._confirm_button.set_sensitive(False) self._confirm_button.grab_default() + self._forget_button.hide() + self._contact = contact self._heading.set_text(self._contact.name) self._client = app.get_client(contact.account) @@ -165,8 +179,18 @@ def set_mode(self, self._confirm_button.set_sensitive(True) self._confirm_button.get_style_context().add_class( 'suggested-action') - assert data is not None - self._widget = ErrorWidget(data) + self._widget = ErrorWidget(error_text=data) + + elif mode in ('join-failed', 'creation-failed', 'config-failed'): + self._confirm_button.set_label(_('Try Again')) + self._confirm_button.set_sensitive(True) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + if mode == 'join-failed': + is_bookmark = self._client.get_module('Bookmarks').is_bookmark( + self._contact.jid) + self._forget_button.set_visible(is_bookmark) + self._widget = ErrorWidget(error_mode=mode, error_text=data) assert self._widget is not None self._content_box.add(self._widget) @@ -230,7 +254,7 @@ def _on_confirm_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').send_captcha( self._contact.jid, form_node) - elif self._mode == 'captcha-error': + elif self._mode in ('join-failed', 'captcha-error'): assert self._client is not None assert self._contact is not None self._client.get_module('MUC').join(self._contact.jid) @@ -246,12 +270,22 @@ def _on_cancel_clicked(self, _button: Gtk.Button) -> None: self.emit('finish', True) return - if self._mode in ('error', 'captcha-error'): + if self._mode in ( + 'join-failed', + 'creation-failed', + 'config-failed', + 'captcha-error'): self.emit('finish', True) return self.emit('finish', False) + def _on_forget_clicked(self, _button: Gtk.Button) -> None: + assert self._client is not None + assert self._contact is not None + self._client.get_module('Bookmarks').remove(self._contact.jid) + self.emit('finish', True) + def _invite(self, invited_jid: JID) -> None: assert self._contact is not None client = app.get_client(self._contact.account) @@ -346,17 +380,32 @@ def get_text(self) -> str: class ErrorWidget(Gtk.Box): - def __init__(self, error_text: str) -> None: + def __init__(self, + error_mode: Optional[str] = None, + error_text: Optional[str] = None + ) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) image = Gtk.Image.new_from_icon_name( 'dialog-error-symbolic', Gtk.IconSize.DIALOG) image.get_style_context().add_class('error-color') - heading = Gtk.Label(label=_('Error')) + + heading = Gtk.Label() heading.get_style_context().add_class('bold16') - label = Gtk.Label(label=error_text) + heading_text = _('An Error Occurred') + if error_mode == 'join-failed': + heading_text = _('Failed to Join Group Chat') + elif error_mode == 'creation-failed': + heading_text = _('Failed to Create Group Chat') + elif error_mode == 'config-failed': + heading_text = _('Failed to Configure Group Chat') + heading.set_text(heading_text) + + label = Gtk.Label() label.set_max_width_chars(40) + if error_text is not None: + label.set_text(error_text) self.add(image) self.add(heading) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -108,8 +108,12 @@ def show_chat(self, account: str, jid: JID) -> None: 'user-role-changed': self._on_user_role_changed, 'user-affiliation-changed': self._on_user_affiliation_changed, 'state-changed': self._on_muc_state_changed, - 'room-captcha-challenge': self._on_muc_captcha_challenge, - 'room-captcha-error': self._on_muc_captcha_error, + 'room-password-required': self._on_room_password_required, + 'room-captcha-challenge': self._on_room_captcha_challenge, + 'room-captcha-error': self._on_room_captcha_error, + 'room-creation-failed': self._on_room_creation_failed, + 'room-join-failed': self._on_room_join_failed, + 'room-config-failed': self._on_room_config_failed, }) self._update_group_chat_actions(self._current_contact) elif isinstance(self._current_contact, GroupchatParticipant): @@ -125,33 +129,70 @@ def show_chat(self, account: str, jid: JID) -> None: self._show_chat_function_page('captcha-request') return - if muc_data.error == 'captcha-failed': - self._show_chat_function_page( - 'captcha-error', muc_data.error_text) - return - - if muc_data.state.is_password_request: - self._show_chat_function_page('password-request') - return + if not muc_data.state.is_joined: + if muc_data.error == 'password-request': + self._show_chat_function_page('password-request') + return + if muc_data.error == 'captcha-failed': + self._show_chat_function_page( + 'captcha-error', muc_data.error_text) + return + if muc_data.error in ('join-failed', 'creation-failed'): + self._show_chat_function_page( + muc_data.error, muc_data.error_text) + return self.set_transition_type(Gtk.StackTransitionType.NONE) self.set_visible_child_name('controls') - - def _on_muc_captcha_challenge(self, - contact: GroupchatContact, - _signal_name: str, - properties: MessageProperties - ) -> None: + GLib.idle_add(self._message_action_box.msg_textview.grab_focus) + + def _on_room_password_required(self, + _contact: GroupchatContact, + _signal_name: str, + _properties: MessageProperties + ) -> None: + self._show_chat_function_page('password-request') + + def _on_room_captcha_challenge(self, + contact: GroupchatContact, + _signal_name: str, + properties: MessageProperties + ) -> None: self._show_chat_function_page('captcha-request') - def _on_muc_captcha_error(self, - _contact: GroupchatContact, - _signal_name: str, - error: StanzaError - ) -> None: + def _on_room_captcha_error(self, + _contact: GroupchatContact, + _signal_name: str, + error: StanzaError + ) -> None: error_text = helpers.to_user_string(error) self._show_chat_function_page('captcha-error', error_text) + def _on_room_creation_failed(self, + _contact: GroupchatContact, + _signal_name: str, + properties: MessageProperties + ) -> None: + assert properties.error is not None + error_text = helpers.to_user_string(properties.error) + self._show_chat_function_page('creation-failed', error_text) + + def _on_room_join_failed(self, + _contact: GroupchatContact, + _signal_name: str, + error: StanzaError + ) -> None: + self._show_chat_function_page( + 'join-failed', helpers.to_user_string(error)) + + def _on_room_config_failed(self, + _contact: GroupchatContact, + _signal_name: str, + error: StanzaError + ) -> None: + self._show_chat_function_page( + 'config-failed', helpers.to_user_string(error)) + def _on_muc_state_changed(self, contact: GroupchatContact, _signal_name: str ===================================== gajim/gtk/control_stack.py ===================================== @@ -115,7 +115,6 @@ def show_chat(self, account: str, jid: JID) -> None: self._current_control = control self.set_visible_child_name(new_name) - GLib.idle_add(control.focus) def is_chat_loaded(self, account: str, jid: JID) -> bool: control = self.get_control(account, jid) ===================================== gajim/gtk/controls/base.py ===================================== @@ -306,9 +306,6 @@ def is_privatechat(self) -> bool: def is_groupchat(self) -> bool: return self._type.is_groupchat - def focus(self) -> None: - raise NotImplementedError - def _nec_ping(self, obj): raise NotImplementedError ===================================== gajim/gtk/controls/chat.py ===================================== @@ -88,15 +88,6 @@ def _connect_contact_signals(self) -> None: def jid(self) -> JID: return self.contact.jid - def focus(self) -> None: - # TODO does not work anymore - if not hasattr(self, 'msg_textview'): - # focus() is called sometimes with GLib.idle_add() - # This means there is the possibility that shutdown() was called - # before focus is executed. - return - self.msg_textview.grab_focus() - def delegate_action(self, action: str) -> int: return Gdk.EVENT_PROPAGATE ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -31,7 +31,6 @@ from nbxmpp import JID from nbxmpp.const import StatusCode -from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking from nbxmpp.structs import PresenceProperties from nbxmpp.structs import MessageProperties @@ -115,10 +114,6 @@ def __init__(self, account: str, jid: JID) -> None: self._set_control_inactive() - # Stack - self.xml.stack.show_all() - self.xml.stack.set_visible_child_name('groupchat') - self.widget.show_all() # PluginSystem: adding GUI extension point for this GroupchatControl @@ -137,15 +132,10 @@ def _connect_contact_signals(self) -> None: 'room-kicked': self._on_room_kicked, 'room-destroyed': self._on_room_destroyed, 'room-config-finished': self._on_room_config_finished, - 'room-config-failed': self._on_room_config_failed, 'room-config-changed': self._on_room_config_changed, - 'room-password-required': self._on_room_password_required, - 'room-creation-failed': self._on_room_creation_failed, 'room-presence-error': self._on_room_presence_error, 'room-voice-request': self._on_room_voice_request, 'room-subject': self._on_room_subject, - 'room-joined': self._on_room_joined, - 'room-join-failed': self._on_room_join_failed, }) def _on_muc_state_changed(self, @@ -165,19 +155,6 @@ def _on_muc_state_changed(self, def _on_muc_disco_update(self, event: events.MucDiscoUpdate) -> None: pass - def _show_page(self, name: str) -> None: - transition = Gtk.StackTransitionType.SLIDE_DOWN - if name == 'groupchat': - transition = Gtk.StackTransitionType.SLIDE_UP - active_control = app.window.get_active_control() - if active_control == self: - pass - #self.msg_textview.grab_focus() - self.xml.stack.set_visible_child_full(name, transition) - - def _get_current_page(self) -> str: - return self.xml.stack.get_visible_child_name() - # Actions def invite(self, invited_jid: JID) -> None: # TODO: Remove, used by command system @@ -439,18 +416,8 @@ def _on_room_config_finished(self, _contact: GroupchatContact, _signal_name: str ) -> None: - self._show_page('groupchat') self.add_info_message(_('A new group chat has been created')) - def _on_room_config_failed(self, - _contact: GroupchatContact, - _signal_name: str, - error: StanzaError - ) -> None: - self.xml.error_heading.set_text(_('Failed to Configure Group Chat')) - self.xml.error_label.set_text(to_user_string(error)) - self._show_page('error') - def _on_user_nickname_changed(self, _contact: GroupchatContact, _signal_name: str, @@ -650,39 +617,6 @@ def _on_user_left(self, self.conversation_view.add_muc_user_left( nick, properties.muc_user.reason) - def _on_room_joined(self, - _contact: GroupchatContact, - _signal_name: str - ) -> None: - self._show_page('groupchat') - - def _on_room_password_required(self, - _contact: GroupchatContact, - _signal_name: str, - _properties: MessageProperties): - self._show_page('password') - - def _on_room_join_failed(self, - _contact: GroupchatContact, - _signal_name: str, - error: StanzaError - ) -> None: - if self._client.get_module('Bookmarks').is_bookmark(self.room_jid): - self.xml.remove_bookmark_button.show() - - self.xml.error_heading.set_text(_('Failed to Join Group Chat')) - self.xml.error_label.set_text(to_user_string(error)) - self._show_page('error') - - def _on_room_creation_failed(self, - _contact: GroupchatContact, - _signal_name: str, - properties: MessageProperties - ) -> None: - self.xml.error_heading.set_text(_('Failed to Create Group Chat')) - self.xml.error_label.set_text(to_user_string(properties.error)) - self._show_page('error') - def _on_room_presence_error(self, _contact: GroupchatContact, _signal_name: str, @@ -744,11 +678,6 @@ def shutdown(self, reason: Optional[str] = None) -> None: super(GroupchatControl, self).shutdown() app.check_finalize(self) - def _close_control(self) -> None: - app.window.activate_action( - 'remove-chat', - GLib.Variant('as', [self.account, str(self.room_jid)])) - def set_control_active(self, state: bool) -> None: BaseControl.set_control_active(self, state) @@ -780,17 +709,11 @@ def delegate_action(self, action: str) -> int: app.window.activate_action('muc-change-nickname', None) return Gdk.EVENT_STOP - if action == 'escape': - if self._get_current_page() == 'groupchat': - return Gdk.EVENT_PROPAGATE + # if action == 'escape': + # if self._get_current_page() == 'groupchat': + # return Gdk.EVENT_PROPAGATE - if self._get_current_page() == 'password': - self._on_password_cancel_clicked() - elif self._get_current_page() == 'error': - self._on_page_close_clicked() - else: - self._show_page('groupchat') - return Gdk.EVENT_STOP + # return Gdk.EVENT_STOP if action == 'change-subject': open_window('GroupchatDetails', @@ -800,51 +723,10 @@ def delegate_action(self, action: str) -> int: return Gdk.EVENT_PROPAGATE - def focus(self) -> None: - page_name = self._get_current_page() - if page_name == 'groupchat': - # TODO - # self.msg_textview.grab_focus() - pass - elif page_name == 'password': - self.xml.password_entry.grab_focus_without_selecting() - - def _on_page_change(self, stack: Gtk.Stack, _param: Any) -> None: - page_name = stack.get_visible_child_name() - if page_name == 'groupchat': - pass - elif page_name == 'password': - self.xml.password_entry.set_text('') - self.xml.password_entry.grab_focus() - self.xml.password_set_button.grab_default() - elif page_name == 'error': - self.xml.close_button.grab_default() - - def _on_password_set_clicked(self, _button: Gtk.Button) -> None: - password = self.xml.password_entry.get_text() - self._client.get_module('MUC').set_password(self.room_jid, password) - self._client.get_module('MUC').join(self.room_jid) - self._show_page('groupchat') - - def _on_password_changed(self, entry: Gtk.Entry, *args: Any) -> None: - self.xml.password_set_button.set_sensitive(bool(entry.get_text())) - - def _on_password_cancel_clicked(self, *args: Any) -> None: - self._close_control() - - def _on_remove_bookmark_button_clicked(self, _button: Gtk.Button) -> None: - self._client.get_module('Bookmarks').remove(self.room_jid) - self._close_control() - - def _on_retry_join_clicked(self, _button: Gtk.Button) -> None: - self._client.get_module('MUC').join(self.room_jid) - self._show_page('groupchat') - - def _on_page_close_clicked(self, *args: Any) -> None: - self._close_control() - def _on_groupchat_state_abort_clicked(self, _button: Gtk.Button) -> None: - self._close_control() + app.window.activate_action( + 'remove-chat', + GLib.Variant('as', [self.account, str(self.room_jid)])) def _on_groupchat_state_join_clicked(self, _groupchat_state: GroupchatState View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/891674cf3242d9e9eba39d8f2690e858… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/891674cf3242d9e9eba39d8f2690e858… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: MUCData: Store error and error text
by Daniel Brötzmann (＠wurstsalat) 16 Jul '22

16 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 557079f5 by wurstsalat at 2022-07-16T17:52:48+02:00 MUCData: Store error and error text - - - - - 94c9a1eb by wurstsalat at 2022-07-16T17:54:00+02:00 Move captcha and captcha-error pages to ChatFunctionPage - - - - - 7 changed files: - gajim/common/helpers.py - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/data/gui/groupchat_control.ui - gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -68,6 +68,7 @@ from nbxmpp.const import ConnectionType from nbxmpp.const import Affiliation from nbxmpp.errors import StanzaError +from nbxmpp.structs import CommonError from nbxmpp.structs import ProxyData from nbxmpp.protocol import JID from nbxmpp.protocol import InvalidJid @@ -1145,7 +1146,7 @@ def validate_jid(jid: Union[str, JID], type_: Optional[str] = None) -> JID: raise ValueError(f'Not a {type_} JID') -def to_user_string(error: StanzaError) -> str: +def to_user_string(error: Union[CommonError, StanzaError]) -> str: text = error.get_text(get_rfc5646_lang()) if text: return text ===================================== gajim/common/modules/muc.py ===================================== @@ -34,6 +34,7 @@ from nbxmpp.protocol import JID from nbxmpp.protocol import Message from nbxmpp.protocol import Presence +from nbxmpp.structs import CommonError from nbxmpp.structs import DiscoInfo from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties @@ -511,6 +512,9 @@ def _on_error_presence(self, elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + muc_data.error = 'captcha-failed' + assert isinstance(properties.error, CommonError) + muc_data.error_text = helpers.to_user_string(properties.error) room.notify('room-captcha-error', properties.error) elif muc_data.state == MUCJoinedState.CAPTCHA_FAILED: ===================================== gajim/common/structs.py ===================================== @@ -70,6 +70,8 @@ def __init__(self, # Message id of the captcha challenge self.captcha_id: Optional[str] = None self.captcha_form: Optional[SimpleDataForm] = None + self.error: Optional[str] = None + self.error_text: Optional[str] = None self.subject: Optional[MucSubject] = None @property ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -221,96 +221,7 @@ </packing> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_captcha_cancel_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="captcha_set_button"> - <property name="label" translatable="yes">_Join</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_captcha_set_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="captcha_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">captcha</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> <child> <object class="GtkBox"> @@ -451,116 +362,6 @@ <property name="position">3</property> </packing> </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton" id="captcha_close_button"> - <property name="label" translatable="yes">_Close</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_page_close_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="captcha_try_again_button"> - <property name="label" translatable="yes">_Try Again</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_captcha_try_again_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">dialog-error-symbolic</property> - <property name="icon_size">6</property> - <style> - <class name="error-color"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="captcha_error_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="justify">center</property> - <property name="wrap">True</property> - <property name="max-width-chars">40</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">captcha-error</property> - <property name="position">4</property> - </packing> - </child> - <child> - <placeholder/> - </child> <child> <placeholder/> </child> ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -38,7 +38,7 @@ class ChatFunctionPage(Gtk.Box): __gsignals__ = { - 'finish': (GObject.SignalFlags.RUN_LAST, None, ()), + 'finish': (GObject.SignalFlags.RUN_LAST, None, (bool,)), 'message': (GObject.SignalFlags.RUN_LAST, None, (str,)), } @@ -63,6 +63,7 @@ def __init__(self) -> None: self.add(self._heading) self._content_box = Gtk.Box() + self._content_box.set_halign(Gtk.Align.CENTER) self.add(self._content_box) cancel_button = Gtk.Button(label=_('Cancel')) @@ -72,7 +73,7 @@ def __init__(self) -> None: self._confirm_button.set_can_default(True) self._confirm_button.connect('clicked', self._on_confirm_clicked) - button_box = Gtk.Box() + button_box = Gtk.Box(spacing=18) button_box.pack_start(cancel_button, False, True, 0) button_box.pack_end(self._confirm_button, False, True, 0) @@ -81,7 +82,7 @@ def __init__(self) -> None: def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: - self.emit('finish') + self.emit('finish', self._mode in ('error', 'captcha-error')) def _clear(self) -> None: for child in self._content_box.get_children(): @@ -159,6 +160,14 @@ def set_mode(self, self._widget.show_all() self._widget.connect('is-valid', self._on_ready) + elif mode == 'captcha-error': + self._confirm_button.set_label(_('Try Again')) + self._confirm_button.set_sensitive(True) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + assert data is not None + self._widget = ErrorWidget(data) + assert self._widget is not None self._content_box.add(self._widget) if isinstance(self._widget, InputWidget): @@ -221,7 +230,12 @@ def _on_confirm_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').send_captcha( self._contact.jid, form_node) - self.emit('finish') + elif self._mode == 'captcha-error': + assert self._client is not None + assert self._contact is not None + self._client.get_module('MUC').join(self._contact.jid) + + self.emit('finish', False) def _on_cancel_clicked(self, _button: Gtk.Button) -> None: if self._mode == 'captcha-request': @@ -229,8 +243,14 @@ def _on_cancel_clicked(self, _button: Gtk.Button) -> None: assert self._contact is not None self._client.get_module('MUC').cancel_captcha( self._contact.jid) + self.emit('finish', True) + return - self.emit('finish') + if self._mode in ('error', 'captcha-error'): + self.emit('finish', True) + return + + self.emit('finish', False) def _invite(self, invited_jid: JID) -> None: assert self._contact is not None @@ -323,3 +343,22 @@ def focus(self) -> None: def get_text(self) -> str: return self._entry.get_text() + + +class ErrorWidget(Gtk.Box): + def __init__(self, error_text: str) -> None: + Gtk.Box.__init__(self, + orientation=Gtk.Orientation.VERTICAL, + spacing=12) + image = Gtk.Image.new_from_icon_name( + 'dialog-error-symbolic', Gtk.IconSize.DIALOG) + image.get_style_context().add_class('error-color') + heading = Gtk.Label(label=_('Error')) + heading.get_style_context().add_class('bold16') + label = Gtk.Label(label=error_text) + label.set_max_width_chars(40) + + self.add(image) + self.add(heading) + self.add(label) + self.show_all() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -24,7 +24,9 @@ from gi.repository import Gio from gi.repository import Gtk +from nbxmpp.errors import StanzaError from nbxmpp.protocol import JID +from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties from gajim.common import app @@ -106,6 +108,8 @@ def show_chat(self, account: str, jid: JID) -> None: 'user-role-changed': self._on_user_role_changed, 'user-affiliation-changed': self._on_user_affiliation_changed, 'state-changed': self._on_muc_state_changed, + 'room-captcha-challenge': self._on_muc_captcha_challenge, + 'room-captcha-error': self._on_muc_captcha_error, }) self._update_group_chat_actions(self._current_contact) elif isinstance(self._current_contact, GroupchatParticipant): @@ -118,17 +122,36 @@ def show_chat(self, account: str, jid: JID) -> None: str(self._current_contact.jid)) if muc_data is not None: if muc_data.state.is_captcha_request: - self._chat_function_page.set_mode( - self._current_contact, 'captcha-request') + self._show_chat_function_page('captcha-request') return + + if muc_data.error == 'captcha-failed': + self._show_chat_function_page( + 'captcha-error', muc_data.error_text) + return + if muc_data.state.is_password_request: - self._chat_function_page.set_mode( - self._current_contact, 'password-request') + self._show_chat_function_page('password-request') return self.set_transition_type(Gtk.StackTransitionType.NONE) self.set_visible_child_name('controls') + def _on_muc_captcha_challenge(self, + contact: GroupchatContact, + _signal_name: str, + properties: MessageProperties + ) -> None: + self._show_chat_function_page('captcha-request') + + def _on_muc_captcha_error(self, + _contact: GroupchatContact, + _signal_name: str, + error: StanzaError + ) -> None: + error_text = helpers.to_user_string(error) + self._show_chat_function_page('captcha-error', error_text) + def _on_muc_state_changed(self, contact: GroupchatContact, _signal_name: str @@ -412,8 +435,16 @@ def _show_chat_function_page(self, self.set_transition_type(Gtk.StackTransitionType.SLIDE_UP_DOWN) self.set_visible_child_name('function') - def _on_function_finished(self, _function_page: ChatFunctionPage) -> None: - # TODO: close control on password/captcha cancel + def _on_function_finished(self, + _function_page: ChatFunctionPage, + close_control: bool + ) -> None: + if close_control: + self._close_control() + self.set_visible_child_name('empty') + self.set_transition_type(Gtk.StackTransitionType.NONE) + return + self.set_visible_child_name('controls') self.set_transition_type(Gtk.StackTransitionType.NONE) @@ -485,6 +516,14 @@ def _on_send_message(self) -> None: self._message_action_box.msg_textview.clear() + def _close_control(self) -> None: + assert self._current_contact is not None + app.window.activate_action( + 'remove-chat', + GLib.Variant('as', + [self._current_contact.account, + str(self._current_contact.jid)])) + def clear(self) -> None: self.set_visible_child_name('empty') self._control_stack.clear() ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -60,7 +60,6 @@ from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog -from gajim.gui.dataform import DataFormWidget from gajim.gui.groupchat_roster import GroupchatRoster from gajim.gui.groupchat_state import GroupchatState from gajim.gui.util import open_window @@ -112,9 +111,6 @@ def __init__(self, account: str, jid: JID) -> None: 'hide_groupchat_occupants_list', self._show_roster) self.roster.connect('row-activated', self._on_roster_row_activated) - # Holds CaptchaRequest widget - self._captcha_request: Optional[DataFormWidget] = None - self._subject_text = '' self._set_control_inactive() @@ -147,8 +143,6 @@ def _connect_contact_signals(self) -> None: 'room-creation-failed': self._on_room_creation_failed, 'room-presence-error': self._on_room_presence_error, 'room-voice-request': self._on_room_voice_request, - 'room-captcha-challenge': self._on_room_captcha_challenge, - 'room-captcha-error': self._on_room_captcha_error, 'room-subject': self._on_room_subject, 'room-joined': self._on_room_joined, 'room-join-failed': self._on_room_join_failed, @@ -792,9 +786,7 @@ def delegate_action(self, action: str) -> int: if self._get_current_page() == 'password': self._on_password_cancel_clicked() - elif self._get_current_page() == 'captcha': - self._on_captcha_cancel_clicked() - elif self._get_current_page() in ('error', 'captcha-error'): + elif self._get_current_page() == 'error': self._on_page_close_clicked() else: self._show_page('groupchat') @@ -816,8 +808,6 @@ def focus(self) -> None: pass elif page_name == 'password': self.xml.password_entry.grab_focus_without_selecting() - elif page_name == 'captcha': - self._captcha_request.focus_first_entry() def _on_page_change(self, stack: Gtk.Stack, _param: Any) -> None: page_name = stack.get_visible_child_name() @@ -827,10 +817,6 @@ def _on_page_change(self, stack: Gtk.Stack, _param: Any) -> None: self.xml.password_entry.set_text('') self.xml.password_entry.grab_focus() self.xml.password_set_button.grab_default() - elif page_name == 'captcha': - self.xml.captcha_set_button.grab_default() - elif page_name == 'captcha-error': - self.xml.captcha_try_again_button.grab_default() elif page_name == 'error': self.xml.close_button.grab_default() @@ -846,63 +832,6 @@ def _on_password_changed(self, entry: Gtk.Entry, *args: Any) -> None: def _on_password_cancel_clicked(self, *args: Any) -> None: self._close_control() - def _on_room_captcha_challenge(self, - _contact: GroupchatContact, - _signal_name: str, - properties: MessageProperties - ) -> None: - self._remove_captcha_request() - form = properties.captcha.form - - options = {'no-scrolling': True, - 'entry-activates-default': True} - self._captcha_request = DataFormWidget(form, options=options) - self._captcha_request.connect('is-valid', self._on_captcha_changed) - self._captcha_request.set_valign(Gtk.Align.START) - self._captcha_request.show_all() - self.xml.captcha_box.add(self._captcha_request) - - self._show_page('captcha') - self._captcha_request.focus_first_entry() - - def _on_room_captcha_error(self, - _contact: GroupchatContact, - _signal_name: str, - error: StanzaError - ) -> None: - error_text = to_user_string(error) - self.xml.captcha_error_label.set_text(error_text) - self._show_page('captcha-error') - - def _remove_captcha_request(self) -> None: - if self._captcha_request is None: - return - if self._captcha_request in self.xml.captcha_box.get_children(): - self.xml.captcha_box.remove(self._captcha_request) - self._captcha_request.destroy() - self._captcha_request = None - - def _on_captcha_changed(self, - _widget: DataFormWidget, - is_valid: bool - ) -> None: - self.xml.captcha_set_button.set_sensitive(is_valid) - - def _on_captcha_set_clicked(self, _button: Gtk.Button) -> None: - form_node = self._captcha_request.get_submit_form() - self._client.get_module('MUC').send_captcha(self.room_jid, form_node) - self._remove_captcha_request() - self._show_page('groupchat') - - def _on_captcha_cancel_clicked(self, *args: Any) -> None: - self._client.get_module('MUC').cancel_captcha(self.room_jid) - self._remove_captcha_request() - self._close_control() - - def _on_captcha_try_again_clicked(self, _button: Gtk.Button) -> None: - self._client.get_module('MUC').join(self.room_jid) - self._show_page('groupchat') - def _on_remove_bookmark_button_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('Bookmarks').remove(self.room_jid) self._close_control() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c671abf28db63c2bbf50ac07a6f54bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c671abf28db63c2bbf50ac07a6f54bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] imprv: Add more datetime test cases
by Philipp Hörist (＠lovetox) 16 Jul '22

16 Jul '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 07863d1d by lovetox at 2022-07-16T15:24:18+02:00 imprv: Add more datetime test cases - - - - - 1 changed file: - test/unit/test_datetime_parsing.py Changes: ===================================== test/unit/test_datetime_parsing.py ===================================== @@ -27,6 +27,8 @@ class TestDateTime(unittest.TestCase): # Valid strings with offset '2017-11-05T01:41:20-05:00': 1509864080.0, '2017-11-05T01:41:20+05:00': 1509828080.0, + '2017-11-05T01:41:20-00:00': 1509846080.0, + '2017-11-05T01:41:20+00:00': 1509846080.0, } strings2 = { View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/07863d1db22037b20a0b36e3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/07863d1db22037b20a0b36e3… 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