Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][newcontrol] Main Window: Unify height of topmost widgets
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: d174f13e by wurstsalat at 2022-07-23T22:20:29+02:00 Main Window: Unify height of topmost widgets - - - - - 3 changed files: - gajim/data/gui/chat_paned.ui - gajim/data/gui/main.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/chat_paned.ui ===================================== @@ -22,6 +22,7 @@ <property name="row-spacing">3</property> <child> <object class="GtkBox"> + <property name="height-request">39</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="spacing">12</property> @@ -31,6 +32,7 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="tooltip-text" translatable="yes">Edit workspace…</property> + <property name="valign">center</property> <signal name="clicked" handler="_on_edit_workspace_clicked" swapped="no"/> <child> <object class="GtkImage"> @@ -69,6 +71,7 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="tooltip-text" translatable="yes">Filter Chats…</property> + <property name="valign">center</property> <child> <object class="GtkImage"> <property name="visible">True</property> ===================================== gajim/data/gui/main.ui ===================================== @@ -72,7 +72,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="spacing">5</property> <child> <placeholder/> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -186,10 +186,10 @@ .app-sidebar-image { padding: 4px; } .app-page-box { - margin-top: 6px; + margin-top: 3px; } .app-page-box > separator { - background-color: darker(@theme_bg_color); + background-color: @unfocused_borders; margin-left: 12px; margin-right: 12px; } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d174f13ee6138de1b9f9eaaa8475ad47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d174f13ee6138de1b9f9eaaa8475ad47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] fix: Preserve primary clipboard throughout switching chats
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: ae457655 by wurstsalat at 2022-07-23T21:59:56+02:00 fix: Preserve primary clipboard throughout switching chats - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -20,6 +20,7 @@ import sys import logging +from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gio from gi.repository import Gtk @@ -97,6 +98,10 @@ def get_control_stack(self) -> ControlStack: return self._control_stack def show_chat(self, account: str, jid: JID) -> None: + # Store (preserve) primary clipboard and restore it after switching + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_PRIMARY) + old_primary_clipboard = clipboard.wait_for_text() + if self._current_contact is not None: self._current_contact.disconnect_all_from_obj(self) @@ -151,6 +156,10 @@ def show_chat(self, account: str, jid: JID) -> None: self.set_transition_type(Gtk.StackTransitionType.NONE) self.set_visible_child_name('controls') + + if old_primary_clipboard is not None: + GLib.idle_add(clipboard.set_text, old_primary_clipboard, -1) + GLib.idle_add(self._message_action_box.msg_textview.grab_focus) def _on_room_password_required(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae45765584c4a0ff321ea37aef49a92c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae45765584c4a0ff321ea37aef49a92c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preview: Add setting to disable file preview
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4f486209 by wurstsalat at 2022-07-23T21:32:48+02:00 imprv: Preview: Add setting to disable file preview Fixes #10991 - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -53,7 +53,9 @@ class _ACCOUNT_DEFAULT: 'dev_force_bookmark_2', 'dev_use_message_label', 'developer_modus', + 'enable_emoji_shortcodes', 'enable_negative_priority', + 'enable_file_preview', 'escape_key_closes', 'gc_notify_on_all_messages_private_default', 'gc_notify_on_all_messages_public_default', @@ -107,7 +109,6 @@ class _ACCOUNT_DEFAULT: 'use_stun_server', 'use_urgency_hint', 'video_see_self', - 'enable_emoji_shortcodes', ] IntSettings = Literal[ @@ -203,7 +204,9 @@ class _ACCOUNT_DEFAULT: 'developer_modus': False, 'dictionary_url': 'WIKTIONARY', 'emoticons_theme': 'noto-emoticons', + 'enable_emoji_shortcodes': True, 'enable_negative_priority': False, + 'enable_file_preview': True, 'escape_key_closes': False, 'file_transfers_port': 28011, 'ft_add_hosts_to_send': '', @@ -295,7 +298,6 @@ class _ACCOUNT_DEFAULT: 'video_see_self': True, 'video_size': '', 'workspace_order': [], - 'enable_emoji_shortcodes': True, } BoolAccountSettings = Literal[ ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -123,9 +123,11 @@ def __init__(self, from_us = kind == 'outgoing' is_previewable = False - if additional_data is not None: + preview_enabled = app.settings.get('enable_file_preview') + if additional_data is not None and preview_enabled: is_previewable = app.preview_manager.is_previewable( text, additional_data) + if is_previewable: context = None if self._is_groupchat: ===================================== gajim/gtk/preferences.py ===================================== @@ -445,11 +445,17 @@ def __init__(self, *args: Any) -> None: } settings = [ + Setting(SettingKind.SWITCH, + _('File Preview'), + SettingType.CONFIG, + 'enable_file_preview', + desc=_('Show previews for files')), Setting(SettingKind.SPIN, _('Preview Size'), SettingType.CONFIG, 'preview_size', desc=_('Size of preview image'), + bind='enable_file_preview', props={'range_': (100, 1000)}), Setting(SettingKind.POPOVER, @@ -457,6 +463,7 @@ def __init__(self, *args: Any) -> None: SettingType.CONFIG, 'preview_max_file_size', desc=_('Maximum file size for preview generation'), + bind='enable_file_preview', props={'entries': sizes}), Setting(SettingKind.SWITCH, @@ -464,27 +471,31 @@ def __init__(self, *args: Any) -> None: SettingType.CONFIG, 'preview_anonymous_muc', desc=_('Generate preview automatically in public ' - 'group chats (may disclose your data)')), + 'group chats (may disclose your data)'), + bind='enable_file_preview'), Setting(SettingKind.SWITCH, _('Preview all Image URLs'), SettingType.CONFIG, 'preview_allow_all_images', desc=_('Generate preview for any URLs containing images ' - '(may be unsafe)')), + '(may be unsafe)'), + bind='enable_file_preview'), Setting(SettingKind.POPOVER, _('Left Click Action'), SettingType.CONFIG, 'preview_leftclick_action', desc=_('Action when left-clicking a preview'), + bind='enable_file_preview', props={'entries': actions}), Setting(SettingKind.SWITCH, _('HTTPS Verification'), SettingType.CONFIG, 'preview_verify_https', - desc=_('Whether to check for a valid certificate')), + desc=_('Whether to check for a valid certificate'), + bind='enable_file_preview'), ] PreferenceBox.__init__(self, settings) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f486209083c62ca2914fee5c9f758e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f486209083c62ca2914fee5c9f758e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: Hotkeys: Cleanup
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: cdc45c5f by wurstsalat at 2022-07-23T20:05:41+02:00 Hotkeys: Cleanup - - - - - 84e06821 by wurstsalat at 2022-07-23T20:21:47+02:00 MessageInputTextView: Clear undo list when clearing input - - - - - 3 changed files: - gajim/gtk/controls/base.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -273,15 +273,15 @@ def _on_conversation_view_key_press(self, # if textview.get_buffer().props.has_selection: # return Gdk.EVENT_PROPAGATE - if not self.msg_textview.get_sensitive(): - # If the input textview is not sensitive it can’t get the focus. - # In that case propagate_key_event() would send the event again - # to the conversation textview. This would mean a recursion. - return Gdk.EVENT_PROPAGATE - - # Focus the Message Input and resend the event - self.msg_textview.grab_focus() - self.msg_textview.get_toplevel().propagate_key_event(event) + # if not self.msg_textview.get_sensitive(): + # # If the input textview is not sensitive it can’t get the focus. + # # In that case propagate_key_event() would send the event again + # # to the conversation textview. This would mean a recursion. + # return Gdk.EVENT_PROPAGATE + + # # Focus the Message Input and resend the event + # self.msg_textview.grab_focus() + # self.msg_textview.get_toplevel().propagate_key_event(event) return Gdk.EVENT_STOP @property ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -537,7 +537,6 @@ def _on_msg_textview_key_press_event(self, self.space_pressed = False event_state = event.get_state() - # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here if event_state & Gdk.ModifierType.SHIFT_MASK: if event_state & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_ISO_Left_Tab: @@ -546,8 +545,10 @@ def _on_msg_textview_key_press_event(self, return True if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): - self.conversation_view.event(event) - return True + control = app.window.get_active_control() + if control is not None: + control.conversation_view.event(event) + return True if event_state & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: ===================================== gajim/gtk/message_input.py ===================================== @@ -323,6 +323,7 @@ def clear(self, *args: Any) -> None: buf = self.get_buffer() start, end = buf.get_bounds() buf.delete(start, end) + self._undo_list.clear() def save_undo(self, text: str) -> None: self._undo_list.append(text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b975ba28537d9ccb1f25d2c44b7ab53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b975ba28537d9ccb1f25d2c44b7ab53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Settings: Add type annotations for bind_signal
by Daniel Brötzmann (＠wurstsalat) 21 Jul '22

21 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: b975ba28 by wurstsalat at 2022-07-21T21:04:12+02:00 Settings: Add type annotations for bind_signal - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -146,19 +146,20 @@ def disconnect_signals(self, object_: object) -> Any: handlers.remove(handler) def bind_signal(self, - setting, - widget, - func_name, - account=None, - jid=None, - inverted=False, - default_text=None): + setting: str, + widget: Any, + func_name: str, + account: Optional[str] = None, + jid: Optional[JID] = None, + inverted: bool = False, + default_text: Optional[str] = None + ) -> None: callbacks = self._callbacks[(setting, account, jid)] func = getattr(widget, func_name) callbacks.append((func, inverted, default_text)) - def _on_destroy(*args): + def _on_destroy(*args: Any) -> None: callbacks.remove((func, inverted, default_text)) widget.connect('destroy', _on_destroy) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b975ba28537d9ccb1f25d2c44b7ab53b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b975ba28537d9ccb1f25d2c44b7ab53b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Remove scroll history and save_message remnants
by Daniel Brötzmann (＠wurstsalat) 21 Jul '22

21 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: a505fa99 by wurstsalat at 2022-07-21T20:42:20+02:00 Remove scroll history and save_message remnants - - - - - 2 changed files: - gajim/command_system/implementation/middleware.py - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/command_system/implementation/middleware.py ===================================== @@ -56,7 +56,6 @@ def process_as_command(self, text): parents = super(ChatCommandProcessor, self) flag = parents.process_as_command(text) if flag and self.command_succeeded: - self.add_history(text) self.clear_input() return flag @@ -147,13 +146,6 @@ def clear_input(self): """ self.set_input(str()) - def add_history(self, text): - """ - Add given text to the input history, so user can scroll through - it using ctrl + up/down arrow keys. - """ - self.save_message(text, 'sent') - @property def connection(self): """ ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -100,34 +100,6 @@ <property name="title" translatable="yes">Complete a command or a nickname</property> </object> </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary>Up</property> - <property name="title" translatable="yes">Previously sent message</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary>Down</property> - <property name="title" translatable="yes">Next sent messages</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary><shift>Up</property> - <property name="title" translatable="yes">Quote previous message</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary><shift>Down</property> - <property name="title" translatable="yes">Quote next message</property> - </object> - </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a505fa99a0118509dad297d2fa03b891… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a505fa99a0118509dad297d2fa03b891… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: ConversationView: Fix linting error
by Daniel Brötzmann (＠wurstsalat) 21 Jul '22

21 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: e45b19c0 by wurstsalat at 2022-07-20T21:51:03+02:00 ConversationView: Fix linting error - - - - - 1e44ef2f by wurstsalat at 2022-07-21T20:29:53+02:00 Fix message correction - - - - - 11 changed files: - gajim/common/storage/archive.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - gajim/gtk/main.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -992,6 +992,35 @@ def find_stanza_id(self, return True return False + @timeit + def get_last_correctable_message(self, + account: str, + jid: JID, + message_id: str + ) -> Optional[LastConversationRow]: + """ + Load the last correctable message of a conversation by message_id. + Conditions: max 5 min old + """ + jids = [jid] + account_id = self.get_account_id(account) + min_time = time.time() - 5 * 60 + print(min_time) + + sql = ''' + SELECT contact_name, time, kind, message, stanza_id, message_id, + additional_data + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND message_id = ? + AND time > ? + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) + + return self._con.execute( + sql, + tuple(jids) + (message_id, min_time)).fetchone() + @timeit def store_message_correction(self, account: str, ===================================== gajim/gtk/chat_stack.py ===================================== @@ -306,6 +306,8 @@ def _update_base_actions(self, contact: ChatContactT) -> None: httpupload.get_enabled()) app.window.get_action('show-contact-info').set_enabled(online) + app.window.get_action('correct-message').set_enabled(online) + app.window.get_action('input-bold').set_enabled(True) app.window.get_action('input-italic').set_enabled(True) app.window.get_action('input-strike').set_enabled(True) @@ -538,11 +540,11 @@ def _on_send_message(self) -> None: label = self._message_action_box.get_seclabel() - correct_id: Optional[str] = None - if control.correcting and control.last_sent_msg: - correct_id = control.last_sent_msg - else: - correct_id = None + correct_id = None + if self._message_action_box.is_correcting: + correct_id = self._message_action_box.last_message_id.get( + (contact.account, contact.jid)) + self._message_action_box.is_correcting = False chatstate = client.get_module('Chatstate').get_active_chatstate( contact) @@ -563,8 +565,9 @@ def _on_send_message(self) -> None: client.send_message(message_) self._message_action_box.msg_textview.clear() - self._message_action_box.msg_textview.get_style_context().remove_class( - 'gajim-msg-correcting') + + def get_last_message_id(self, account: str, jid: JID) -> Optional[str]: + return self._message_action_box.last_message_id.get((account, jid)) def _close_control(self) -> None: assert self._current_contact is not None @@ -582,6 +585,7 @@ def process_event(self, event: Any) -> None: if isinstance(event, MucDiscoUpdate): self._on_muc_disco_update(event) self._control_stack.process_event(event) + self._message_action_box.process_event(event) class ChatPlaceholderBox(Gtk.Box): ===================================== gajim/gtk/const.py ===================================== @@ -194,6 +194,7 @@ def __str__(self): ('input-strike', None, False), ('input-clear', None, False), ('show-emoji-chooser', None, False), + ('correct-message', None, False), ('quote', 's', False), ('mention', 's', False), ('send-file-httpupload', None, False), ===================================== gajim/gtk/controls/base.py ===================================== @@ -182,15 +182,10 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: # XEP-0333 Chat Markers self.last_msg_id: Optional[str] = None - # XEP-0308 Message Correction - self.last_sent_msg: Optional[str] = None - # XEP-0172 User Nickname # TODO: self.user_nick: Optional[str] = None - self.sendmessage: bool = True - self._client.get_module('Chatstate').set_active(self.contact) self.encryption: Optional[str] = self.get_encryption_state() @@ -501,11 +496,8 @@ def add_message(self, self.last_msg_id = message_id if kind == 'incoming': - # Record the history of received messages - # self.save_message(text, 'received') - - # Issue notification if notify: + # Issue notification self._notify(name, text, tim, additional_data) if not chat_active and notify: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -70,12 +70,6 @@ def __init__(self, account: str, jid: JID) -> None: 'chat_control', account, jid) - - self.sendmessage: bool = True - - # XEP-0308 Message Correction - self.last_sent_msg: Optional[str] = None - # PluginSystem: adding GUI extension point for this ChatControl # instance object app.plugin_manager.gui_extension_point('chat_control', self) @@ -132,13 +126,6 @@ def _on_message_sent(self, event: events.MessageSent) -> None: if not event.message: return - if event.correct_id is None: - oob_url = event.additional_data.get_value('gajim', 'oob_url') - if oob_url == event.message: - self.last_sent_msg = None - else: - self.last_sent_msg = event.message_id - message_id = event.message_id if event.label: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -82,15 +82,6 @@ def __init__(self, account: str, jid: JID) -> None: self.room_jid = str(self.contact.jid) - # Last sent message text - self.last_sent_txt: str = '' - - # Attribute, encryption plugins use to signal the message can be sent - self.sendmessage: bool = False - - # XEP-0308 Message Correction - self.last_sent_msg: Optional[str] = None - self._groupchat_state = GroupchatState(self.contact) self.xml.conv_view_overlay.add_overlay(self._groupchat_state) @@ -226,9 +217,6 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: displaymarking=event.displaymarking, additional_data=event.additional_data) else: - if event.properties.muc_nickname == self.contact.nickname: - self.last_sent_txt = event.msgtxt - self.add_message(event.msgtxt, contact=event.properties.muc_nickname, tim=event.properties.timestamp, @@ -634,16 +622,7 @@ def _on_room_destroyed(self, self.add_info_message(join_message) def _on_message_sent(self, event: events.MessageSent) -> None: - if not event.message: - return - # we'll save sent message text when we'll receive it in - # _nec_gc_message_received - if event.correct_id is None: - oob_url = event.additional_data.get_value('gajim', 'oob_url') - if oob_url == event.message: - self.last_sent_msg = None - else: - self.last_sent_msg = event.message_id + pass def _on_message_error(self, event: events.MessageError) -> None: self.conversation_view.show_error(event.message_id, event.error) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -319,6 +319,9 @@ def on_quote_message(self, _widget: Gtk.Widget) -> None: app.window.activate_action( 'quote', GLib.Variant('s', self._message_widget.get_text())) + def on_correct_message(self, _widget: Gtk.Widget) -> None: + app.window.activate_action('correct-message', None) + def on_retract_message(self, _widget: Gtk.Widget) -> None: def _on_retract(reason: str) -> None: self._client.get_module('MUC').retract_message( ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -14,8 +14,7 @@ from __future__ import annotations -from typing import Union -from typing import Any +from typing import TYPE_CHECKING from gi.repository import Gtk from gi.repository import Pango @@ -24,13 +23,13 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.common.helpers import is_retraction_allowed -from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact -from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.types import ChatContactT -from ...util import wrap_with_event_box +if TYPE_CHECKING: + from .message import MessageRow -ContactT = Union[BareContact, GroupchatContact, GroupchatParticipant] +from ...util import wrap_with_event_box class SimpleLabel(Gtk.Label): @@ -45,8 +44,8 @@ def __init__(self) -> None: @wrap_with_event_box class MoreMenuButton(Gtk.Button): def __init__(self, - row: Any, - contact: ContactT, + row: MessageRow, + contact: ChatContactT, name: str ) -> None: @@ -70,23 +69,33 @@ def _on_click(self, _button: Gtk.Button) -> None: show_retract = False if isinstance(self._contact, GroupchatContact): if not self._contact.is_joined: - self._create_popover(False) + self._create_popover(show_retract=False) return - disco_info = app.storage.cache.get_last_disco_info( - self._contact.jid) - assert disco_info is not None - contact = self._contact.get_resource(self._name) self_contact = self._contact.get_self() assert self_contact is not None - is_allowed = is_retraction_allowed(self_contact, contact) + + disco_info = app.storage.cache.get_last_disco_info( + self._contact.jid) + assert disco_info is not None + if disco_info.has_message_moderation and is_allowed: show_retract = True - self._create_popover(show_retract) - def _create_popover(self, show_retract: bool) -> None: + show_correction = False + if self._row.message_id is not None: + show_correction = app.window.is_message_correctable( + self._contact.account, self._contact.jid, self._row.message_id) + + self._create_popover(show_retract=show_retract, + show_correction=show_correction) + + def _create_popover(self, + show_retract: bool = False, + show_correction: bool = False + ) -> None: menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) menu_box.get_style_context().add_class('padding-6') @@ -116,6 +125,16 @@ def _create_popover(self, show_retract: bool) -> None: 'edit-copy-symbolic', Gtk.IconSize.MENU)) menu_box.add(copy_button) + if show_correction: + correct_button = Gtk.ModelButton() + correct_button.set_halign(Gtk.Align.START) + correct_button.connect( + 'clicked', self._row.on_correct_message) + correct_button.set_label(_('Correct')) + correct_button.set_image(Gtk.Image.new_from_icon_name( + 'document-edit-symbolic', Gtk.IconSize.MENU)) + menu_box.add(correct_button) + if show_retract: retract_button = Gtk.ModelButton() retract_button.set_halign(Gtk.Align.START) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -380,7 +380,7 @@ def _reduce_messages_before(self) -> bool: row1 = self.get_row_at_index(2) row2 = self.get_row_at_index(3) - if row1.type == row2.type == 'date': + if row1.type == 'date' and row2.type == 'date': # First two rows are date rows, # it’s safe to remove the fist row row1.destroy() ===================================== gajim/gtk/main.py ===================================== @@ -38,7 +38,8 @@ from gajim.common.ged import EventHelper from gajim.common.i18n import _ from gajim.common.modules.bytestream import is_transfer_active -from gajim.gtk.const import MAIN_WIN_ACTIONS, MAIN_WIN_STATEFUL_ACTIONS +from gajim.gtk.const import MAIN_WIN_ACTIONS +from gajim.gtk.const import MAIN_WIN_STATEFUL_ACTIONS from gajim.plugins.pluginmanager import PluginManifest from gajim.plugins.repository import PluginRepository @@ -731,6 +732,20 @@ def is_chat_loaded(self, account: str, jid: JID) -> bool: def chat_exists(self, account: str, jid: JID) -> bool: return self._chat_page.chat_exists(account, jid) + def is_message_correctable(self, + account: str, + jid: JID, + message_id: str + ) -> bool: + chat_stack = self._chat_page.get_chat_stack() + last_message_id = chat_stack.get_last_message_id(account, jid) + if last_message_id is None or last_message_id != message_id: + return False + + message_row = app.storage.archive.get_last_correctable_message( + account, jid, last_message_id) + return message_row is not None + def get_total_unread_count(self) -> int: chat_list_stack = self._chat_page.get_chat_list_stack() return chat_list_stack.get_total_unread_count() ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -32,8 +32,10 @@ from nbxmpp.const import Chatstate from nbxmpp.modules.security_labels import SecurityLabel +from nbxmpp.protocol import JID from gajim.common import app +from gajim.common import events from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.client import Client @@ -65,7 +67,7 @@ class MessageActionsBox(Gtk.Grid): def __init__(self) -> None: - super().__init__() + Gtk.Grid.__init__(self) self._client: Optional[Client] = None self._contact: Optional[ChatContactT] = None @@ -75,8 +77,13 @@ def __init__(self) -> None: self.attach(self._ui.box, 0, 0, 1, 1) + # For undo self.space_pressed = False + # XEP-0308 Message Correction + self.is_correcting = False + self.last_message_id: dict[tuple[str, JID], Optional[str]] = {} + self._ui.send_message_button.set_visible( app.settings.get('show_send_message_button')) app.settings.bind_signal('show_send_message_button', @@ -90,7 +97,7 @@ def __init__(self) -> None: self.msg_textview.get_buffer().connect('changed', self._on_buffer_changed) self.msg_textview.connect('key-press-event', - self._on_textview_key_press_event) + self._on_msg_textview_key_press_event) self.msg_textview.connect('paste-clipboard', self._on_paste_clipboard) @@ -133,6 +140,7 @@ def _connect_actions(self) -> None: 'show-emoji-chooser', 'quote', 'mention', + 'correct-message', ] for action in actions: @@ -179,6 +187,9 @@ def _on_action(self, assert param self.msg_textview.mention_participant(param.get_string()) + elif action_name == 'correct-message': + self.toggle_message_correction() + def switch_contact(self, contact: ChatContactT) -> None: if self._client is not None: self._set_chatstate(False) @@ -503,10 +514,10 @@ def _on_buffer_changed(self, textbuffer: Gtk.TextBuffer) -> None: client.get_module('Chatstate').set_chatstate( self._contact, Chatstate.COMPOSING) - def _on_textview_key_press_event(self, - textview: MessageInputTextView, - event: Gdk.EventKey - ) -> bool: + def _on_msg_textview_key_press_event(self, + textview: MessageInputTextView, + event: Gdk.EventKey + ) -> bool: # pylint: disable=too-many-nested-blocks if event.keyval == Gdk.KEY_space: self.space_pressed = True @@ -525,24 +536,33 @@ def _on_textview_key_press_event(self, True)) self.space_pressed = False + event_state = event.get_state() # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here - if event.get_state() & Gdk.ModifierType.SHIFT_MASK: - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and - event.keyval == Gdk.KEY_ISO_Left_Tab): - app.window.select_next_chat(Direction.PREV, unread_first=True) - return True + if event_state & Gdk.ModifierType.SHIFT_MASK: + if event_state & Gdk.ModifierType.CONTROL_MASK: + if event.keyval == Gdk.KEY_ISO_Left_Tab: + app.window.select_next_chat( + Direction.PREV, unread_first=True) + return True if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): self.conversation_view.event(event) return True - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: + if event_state & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: app.window.select_next_chat(Direction.NEXT, unread_first=True) return True - event_state = event.get_state() - if event.keyval in (Gdk.KEY_Return, Gdk.KEY_KP_Enter): # ENTER + if event.keyval == Gdk.KEY_z: + self.msg_textview.undo() + return True + + if event.keyval == Gdk.KEY_Up: + self.toggle_message_correction() + return True + + if event.keyval in (Gdk.KEY_Return, Gdk.KEY_KP_Enter): if event_state & Gdk.ModifierType.SHIFT_MASK: textview.insert_newline() return True @@ -566,11 +586,6 @@ def _on_textview_key_press_event(self, app.window.activate_action('send-message', None) return True - if event.keyval == Gdk.KEY_z: # CTRL+z - if event_state & Gdk.ModifierType.CONTROL_MASK: - self.msg_textview.undo() - return True - return False def _on_paste_clipboard(self, @@ -616,3 +631,52 @@ def _paste_event_confirmed(self, assert self._contact is not None app.interface.start_file_transfer(self._contact, path) + + def toggle_message_correction(self) -> None: + if self.is_correcting: + self.is_correcting = False + self.msg_textview.clear() + self.msg_textview.get_style_context().remove_class( + 'gajim-msg-correcting') + self.msg_textview.grab_focus() + return + + assert self._contact is not None + last_message_id = self.last_message_id.get( + (self._contact.account, self._contact.jid)) + if last_message_id is None: + return + + message_row = app.storage.archive.get_last_correctable_message( + self._contact.account, self._contact.jid, last_message_id) + if message_row is None: + return + + self.is_correcting = True + self.msg_textview.clear() + self.msg_textview.insert_text(message_row.message) + self.msg_textview.get_style_context().add_class('gajim-msg-correcting') + self.msg_textview.grab_focus() + + def _on_message_sent(self, event: events.MessageSent) -> None: + if not event.message: + return + + if event.correct_id is None: + # This wasn't a corrected message + assert self._contact is not None + oob_url = event.additional_data.get_value('gajim', 'oob_url') + account = self._contact.account + jid = self._contact.jid + if oob_url == event.message: + # Don't allow to correct HTTP Upload file transfer URLs + self.last_message_id[(account, jid)] = None + else: + self.last_message_id[(account, jid)] = event.message_id + + self.msg_textview.get_style_context().remove_class( + 'gajim-msg-correcting') + + def process_event(self, event: events.ApplicationEvent) -> None: + if isinstance(event, events.MessageSent): + self._on_message_sent(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/033080b26d7d426f2e607550ae9e762… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/033080b26d7d426f2e607550ae9e762… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] MessageInputTextView: Remove 'correcting' class after sending message
by Daniel Brötzmann (＠wurstsalat) 20 Jul '22

20 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 033080b2 by wurstsalat at 2022-07-20T20:46:15+02:00 MessageInputTextView: Remove 'correcting' class after sending message - - - - - 4 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -563,6 +563,8 @@ def _on_send_message(self) -> None: client.send_message(message_) self._message_action_box.msg_textview.clear() + self._message_action_box.msg_textview.get_style_context().remove_class( + 'gajim-msg-correcting') def _close_control(self) -> None: assert self._current_contact is not None ===================================== gajim/gtk/controls/base.py ===================================== @@ -183,7 +183,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.last_msg_id: Optional[str] = None # XEP-0308 Message Correction - self.correcting: bool = False self.last_sent_msg: Optional[str] = None # XEP-0172 User Nickname @@ -292,18 +291,22 @@ def _on_conversation_view_key_press(self, @property def type(self) -> ControlType: + assert self._type is not None return self._type @property def is_chat(self) -> bool: + assert self._type is not None return self._type.is_chat @property def is_privatechat(self) -> bool: + assert self._type is not None return self._type.is_privatechat @property def is_groupchat(self) -> bool: + assert self._type is not None return self._type.is_groupchat def _on_ping_event(self, event: events.PingEventT) -> None: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -74,7 +74,6 @@ def __init__(self, account: str, jid: JID) -> None: self.sendmessage: bool = True # XEP-0308 Message Correction - self.correcting: bool = False self.last_sent_msg: Optional[str] = None # PluginSystem: adding GUI extension point for this ChatControl @@ -146,10 +145,6 @@ def _on_message_sent(self, event: events.MessageSent) -> None: displaymarking = event.label.displaymarking else: displaymarking = None - if self.correcting: - self.correcting = False - self.msg_textview.get_style_context().remove_class( - 'gajim-msg-correcting') if event.correct_id: self.conversation_view.correct_message( ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -89,7 +89,6 @@ def __init__(self, account: str, jid: JID) -> None: self.sendmessage: bool = False # XEP-0308 Message Correction - self.correcting: bool = False self.last_sent_msg: Optional[str] = None self._groupchat_state = GroupchatState(self.contact) @@ -645,10 +644,6 @@ def _on_message_sent(self, event: events.MessageSent) -> None: self.last_sent_msg = None else: self.last_sent_msg = event.message_id - if self.correcting: - self.correcting = False - self.msg_textview.get_style_context().remove_class( - 'gajim-msg-correcting') def _on_message_error(self, event: events.MessageError) -> None: self.conversation_view.show_error(event.message_id, event.error) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/033080b26d7d426f2e607550ae9e7626… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/033080b26d7d426f2e607550ae9e7626… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 3 commits: Types: Use python’s integrated types
by Daniel Brötzmann (＠wurstsalat) 20 Jul '22

20 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: b871f524 by wurstsalat at 2022-07-20T20:24:38+02:00 Types: Use python’s integrated types - - - - - f2bcbe02 by wurstsalat at 2022-07-20T20:25:05+02:00 PrivateChatControl: Remove unused code - - - - - 57341420 by wurstsalat at 2022-07-20T20:27:03+02:00 Controls: Typing - - - - - 7 changed files: - gajim/common/events.py - gajim/common/types.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py - pyrightconfig.json Changes: ===================================== gajim/common/events.py ===================================== @@ -593,6 +593,9 @@ class PingReply(ApplicationEvent): seconds: float +PingEventT = Union[PingSent, PingReply, PingError] + + @dataclass class SecCatalogReceived(ApplicationEvent): name: str = field(init=False, default='sec-catalog-received') ===================================== gajim/common/types.py ===================================== @@ -16,10 +16,7 @@ from typing import Any from typing import Callable -from typing import Dict -from typing import List from typing import Optional -from typing import Tuple from typing import Union from typing import TYPE_CHECKING @@ -62,15 +59,15 @@ # PEP PEPNotifyCallback = Callable[[nbxmpp.JID, nbxmpp.Node], None] -PEPHandlersDict = Dict[str, List[PEPNotifyCallback]] +PEPHandlersDict = dict[str, list[PEPNotifyCallback]] # Plugins -PluginExtensionPoints = Dict[str, Tuple[Optional[Callable[..., None]], +PluginExtensionPoints = dict[str, tuple[Optional[Callable[..., None]], Optional[Callable[..., None]]]] SettingsT = Union['Settings'] -BookmarksDict = Dict[JID, BookmarkData] +BookmarksDict = dict[JID, BookmarkData] GdkPixbufType = Union[GdkPixbuf.Pixbuf, GdkPixbuf.PixbufAnimation] ===================================== gajim/gtk/controls/base.py ===================================== @@ -202,9 +202,9 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: app.plugin_manager.gui_extension_point('chat_control_base', self) self.register_events([ - ('ping-sent', ged.GUI1, self._nec_ping), - ('ping-reply', ged.GUI1, self._nec_ping), - ('ping-error', ged.GUI1, self._nec_ping), + ('ping-sent', ged.GUI1, self._on_ping_event), + ('ping-reply', ged.GUI1, self._on_ping_event), + ('ping-error', ged.GUI1, self._on_ping_event), ]) # This is basically a very nasty hack to surpass the inability @@ -306,7 +306,7 @@ def is_privatechat(self) -> bool: def is_groupchat(self) -> bool: return self._type.is_groupchat - def _nec_ping(self, obj): + def _on_ping_event(self, event: events.PingEventT) -> None: raise NotImplementedError def mark_as_read(self, send_marker: bool = True) -> None: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -169,7 +169,7 @@ def _on_receipt_received(self, event: events.ReceiptReceived) -> None: def _on_displayed_received(self, event: events.DisplayedReceived) -> None: self.conversation_view.set_read_marker(event.marker_id) - def _nec_ping(self, event: events.ApplicationEvent): + def _on_ping_event(self, event: events.PingEventT) -> None: if self.contact != event.contact: return if isinstance(event, events.PingSent): @@ -177,7 +177,7 @@ def _nec_ping(self, event: events.ApplicationEvent): elif isinstance(event, events.PingReply): self.add_info_message( _('Pong! (%s seconds)') % event.seconds) - elif isinstance(event, events.PingError): + else: self.add_info_message(event.error) def add_message(self, ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -184,6 +184,7 @@ def _on_room_voice_request(self, properties: MessageProperties ) -> None: voice_request = properties.voice_request + assert voice_request is not None def on_approve() -> None: self._client.get_module('MUC').approve_voice_request( @@ -292,6 +293,7 @@ def _on_room_config_changed(self, # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify status_codes = properties.muc_status_codes + assert status_codes is not None changes: list[str] = [] if StatusCode.SHOWING_UNAVAILABLE in status_codes: @@ -329,7 +331,7 @@ def _on_room_config_changed(self, self.add_info_message(change) @event_filter(['account']) - def _nec_ping(self, event: events.ApplicationEvent) -> None: + def _on_ping_event(self, event: events.PingEventT) -> None: if not event.contact.is_groupchat: return @@ -340,17 +342,19 @@ def _nec_ping(self, event: events.ApplicationEvent) -> None: if isinstance(event, events.PingSent): self.add_info_message(_('Ping? (%s)') % nick) elif isinstance(event, events.PingReply): - self.add_info_message( - _('Pong! (%(nick)s %(delay)s s.)') % {'nick': nick, - 'delay': event.seconds}) - elif isinstance(event, events.PingError): + self.add_info_message(_('Pong! (%(nick)s %(delay)s s.)') % { + 'nick': nick, + 'delay': event.seconds}) + else: self.add_info_message(event.error) def _set_control_active(self) -> None: + assert self.roster is not None self.roster.initial_draw() self.conversation_view.update_avatars() def _set_control_inactive(self) -> None: + assert self.roster is not None self.roster.enable_sort(False) self.roster.clear() @@ -403,6 +407,8 @@ def _on_user_nickname_changed(self, properties: MessageProperties ) -> None: nick = user_contact.name + + assert properties.muc_user is not None new_nick = properties.muc_user.nick if properties.is_muc_self_presence: message = _('You are now known as %s') % new_nick @@ -433,6 +439,8 @@ def _on_user_affiliation_changed(self, ) -> None: affiliation = helpers.get_uf_affiliation(user_contact.affiliation) nick = user_contact.name + + assert properties.muc_user is not None reason = properties.muc_user.reason reason = '' if reason is None else f': {reason}' @@ -464,6 +472,8 @@ def _on_user_role_changed(self, ) -> None: role = helpers.get_uf_role(user_contact.role) nick = user_contact.name + + assert properties.muc_user is not None reason = properties.muc_user.reason reason = '' if reason is None else f': {reason}' @@ -492,6 +502,7 @@ def _on_room_kicked(self, ) -> None: status_codes = properties.muc_status_codes or [] + assert properties.muc_user is not None reason = properties.muc_user.reason reason = '' if reason is None else f': {reason}' @@ -550,6 +561,7 @@ def _on_user_left(self, status_codes = properties.muc_status_codes or [] nick = user_contact.name + assert properties.muc_user is not None reason = properties.muc_user.reason reason = '' if reason is None else f': {reason}' ===================================== gajim/gtk/controls/private.py ===================================== @@ -35,7 +35,6 @@ from gajim.gui.controls.chat import ChatControl from gajim.command_system.implementation.hosts import PrivateChatCommands -from gajim.gui.dialogs import ErrorDialog from gajim.gui.const import ControlType @@ -78,6 +77,8 @@ def _on_user_nickname_changed(self, ) -> None: # TODO nick = properties.muc_nickname + + assert properties.muc_user is not None new_nick = properties.muc_user.nick if properties.is_muc_self_presence: message = _('You are now known as %s') % new_nick @@ -110,31 +111,3 @@ def _on_user_status_show_changed(self, show=show, status=status) self.add_info_message(message) - - def send_message(self, - message: str, - process_commands: bool = True, - attention: bool = False - ) -> None: - """ - Call this method to send the message - """ - message = helpers.remove_invalid_xml_chars(message) - if not message: - return - - # We need to make sure that we can still send through the room and that - # the recipient did not go away - if not self.contact.is_available: - ErrorDialog( - _('Sending private message failed'), - _('You are no longer joined "%(room)s" or ' - '"%(nick)s" has left the chat.') % { - 'room': self.room_name, - 'nick': self.contact.name}) - return - - ChatControl.send_message(self, - message, - process_commands=process_commands, - attention=attention) ===================================== pyrightconfig.json ===================================== @@ -41,6 +41,7 @@ "gajim/common/sound.py", "gajim/common/storage/", "gajim/common/task_manager.py", + "gajim/gtk/controls/private.py", "gajim/gtk/conversation", "gajim/gtk/about.py", "gajim/gtk/account_page.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b00603be6295ad66abddcdba1da6c2e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b00603be6295ad66abddcdba1da6c2e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 3 commits: GroupchatState: Connect to contact
by Daniel Brötzmann (＠wurstsalat) 20 Jul '22

20 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 5c450b09 by wurstsalat at 2022-07-20T19:22:32+02:00 GroupchatState: Connect to contact - - - - - e5703480 by wurstsalat at 2022-07-20T19:25:36+02:00 ChatFunctionPage: Set input visibility for password - - - - - b00603be by wurstsalat at 2022-07-20T19:25:50+02:00 GroupchatState: Fix indentation - - - - - 3 changed files: - gajim/gtk/chat_function_page.py - gajim/gtk/controls/groupchat.py - gajim/gtk/groupchat_state.py Changes: ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -354,6 +354,7 @@ def __init__(self, heading_label.set_text(_('Password Required')) sub_label.set_text(_('Enter a password to join this chat')) self._entry.set_input_purpose(Gtk.InputPurpose.PASSWORD) + self._entry.set_visibility(False) self.connect('destroy', self._on_destroy) self.show_all() ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -38,7 +38,6 @@ from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GLib from gajim.common import app from gajim.common import events @@ -93,11 +92,7 @@ def __init__(self, account: str, jid: JID) -> None: self.correcting: bool = False self.last_sent_msg: Optional[str] = None - self._groupchat_state = GroupchatState() - self._groupchat_state.connect('join-clicked', - self._on_groupchat_state_join_clicked) - self._groupchat_state.connect('abort-clicked', - self._on_groupchat_state_abort_clicked) + self._groupchat_state = GroupchatState(self.contact) self.xml.conv_view_overlay.add_overlay(self._groupchat_state) self.roster = GroupchatRoster(self.account, self.room_jid, self) @@ -141,12 +136,8 @@ def _on_muc_state_changed(self, _contact: GroupchatContact, _signal_name: str ) -> None: - if self.contact.is_joining: - self._groupchat_state.set_joining() - if self.contact.is_joined: self._set_control_active() - self._groupchat_state.set_joined() elif self.contact.is_not_joined: self._set_control_inactive() @@ -686,13 +677,3 @@ def _on_drag_data_received(self, if target_type == TARGET_TYPE_URI_LIST: # File drag and drop (handled in chat_control_base) self.drag_data_file_transfer(selection) - - def _on_groupchat_state_abort_clicked(self, _button: Gtk.Button) -> None: - 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 - ) -> None: - self._client.get_module('MUC').join(self.room_jid) ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -12,53 +12,64 @@ # 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 gi.repository import GLib from gi.repository import Gtk -from gi.repository import GObject + +from gajim.common import app +from gajim.common.modules.contacts import GroupchatContact from gajim.gui.builder import get_builder class GroupchatState(Gtk.Box): - - __gsignals__ = { - 'join-clicked': ( - GObject.SignalFlags.RUN_FIRST, - None, - ()), - 'abort-clicked': ( - GObject.SignalFlags.RUN_FIRST, - None, - ()), - } - - def __init__(self): + def __init__(self, contact: GroupchatContact) -> None: Gtk.Box.__init__(self) - self.set_halign(Gtk.Align.CENTER) self.set_valign(Gtk.Align.END) + self._contact = contact + self._contact.connect('state-changed', self._on_muc_state_changed) + self._ui = get_builder('groupchat_state.ui') self._ui.connect_signals(self) self.add(self._ui.groupchat_state) self.show_all() - def set_joining(self): + def _on_muc_state_changed(self, + contact: GroupchatContact, + _signal_name: str + ) -> None: + if contact.is_joining: + self._set_joining() + + if contact.is_joined: + self._set_joined() + + if contact.is_not_joined: + self._set_not_joined() + + def _set_joining(self) -> None: self._ui.groupchat_state.set_visible_child_name('joining') - def set_joined(self): + def _set_joined(self) -> None: self.hide() self.set_no_show_all(True) - def set_not_joined(self): + def _set_not_joined(self) -> None: self._ui.groupchat_state.set_visible_child_name('not-joining') self.show() - def set_fetching(self): + def set_fetching(self) -> None: self._ui.groupchat_state.set_visible_child_name('fetching') def _on_join_clicked(self, _button: Gtk.Button) -> None: - self.emit('join-clicked') + client = app.get_client(self._contact.account) + client.get_module('MUC').join(self._contact.jid) def _on_abort_clicked(self, _button: Gtk.Button) -> None: - self.emit('abort-clicked') + app.window.activate_action( + 'remove-chat', + GLib.Variant( + 'as', [self._contact.account, str(self._contact.jid)])) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9ed653f5bdc4c37b47349ce06ad1811… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9ed653f5bdc4c37b47349ce06ad1811… 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