Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][newcontrol] 2 commits: MessageInput: Use JID for draft dict key
by Daniel Brötzmann (＠wurstsalat) 12 Jul '22

12 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 4e88fb41 by wurstsalat at 2022-07-12T13:47:09+02:00 MessageInput: Use JID for draft dict key - - - - - 45624f6d by wurstsalat at 2022-07-12T13:47:39+02:00 Cleanup - - - - - 4 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -397,7 +397,10 @@ def _on_send_message(self) -> None: control = self._control_stack.get_current_control() action = app.window.lookup_action('set-encryption') - encryption = action.get_state().get_string() + assert action is not None + state = action.get_state() + assert state is not None + encryption = state.get_string() if encryption: self.sendmessage = True ===================================== gajim/gtk/controls/base.py ===================================== @@ -217,9 +217,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: def _connect_contact_signals(self) -> None: raise NotImplementedError - def _get_action(self, name: str) -> Gio.SimpleAction: - return app.window.lookup_action(f'{name}{self.control_id}') - def process_event(self, event: events.ApplicationEvent) -> None: if event.account != self.account: return ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -309,9 +309,10 @@ def _set_encryption_details(self, state: str) -> None: if state: app.plugin_manager.extension_point( - 'encryption_state' + state, self, encryption_state) + f'encryption_state{state}', self, encryption_state) visible, enc_type, authenticated = encryption_state.values() + assert isinstance(visible, bool) if authenticated: authenticated_string = _('and authenticated') @@ -333,7 +334,7 @@ def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() encryption = contact.settings.get('encryption') app.plugin_manager.extension_point( - 'encryption_dialog' + encryption, contact) + f'encryption_dialog{encryption}', contact) def _set_settings_menu(self, contact: ChatContactT) -> None: if isinstance(contact, GroupchatContact): @@ -481,13 +482,16 @@ def _update_send_file_button_tooltip(self): def _on_buffer_changed(self, textbuffer: Gtk.TextBuffer) -> None: has_text = self.msg_textview.has_text() - app.window.lookup_action('send-message').set_enabled(has_text) + send_message_action = app.window.lookup_action('send-message') + assert send_message_action is not None + send_message_action.set_enabled(has_text) encryption_enabled, encryption_name = self._get_encryption_state() if has_text and encryption_enabled: app.plugin_manager.extension_point('typing' + encryption_name, self) + assert self._contact client = app.get_client(self._contact.account) client.get_module('Chatstate').set_keyboard_activity(self._contact) if not has_text: ===================================== gajim/gtk/message_input.py ===================================== @@ -30,6 +30,8 @@ from gi.repository import GLib from gi.repository import Pango +from nbxmpp.protocol import JID + from gajim.common import app from gajim.common.i18n import _ from gajim.common.styling import process @@ -75,7 +77,7 @@ def __init__(self) -> None: self.undo_pressed: bool = False self._contact: Optional[ChatContactT] = None - self._drafts: dict[str, str] = {} + self._drafts: dict[JID, str] = {} self._chat_action_processor = ChatActionProcessor(self) @@ -94,12 +96,12 @@ def __init__(self) -> None: def switch_contact(self, contact: ChatContactT) -> None: if self._contact is not None: if self.has_text(): - self._drafts[str(self._contact.jid)] = self.get_text() + self._drafts[self._contact.jid] = self.get_text() else: - self._drafts.pop(str(self._contact.jid), None) + self._drafts.pop(self._contact.jid, None) self.clear() - draft = self._drafts.get(str(contact.jid)) + draft = self._drafts.get(contact.jid) if draft is not None: self.insert_text(draft) @@ -345,7 +347,6 @@ def _on_populate_popup(self, _textview: MessageInputTextView, menu: Gtk.Widget ) -> None: - assert isinstance(menu, Gtk.Menu) item = Gtk.MenuItem.new_with_mnemonic(_('_Undo')) menu.prepend(item) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f8ef2624bbac60ee41752ae8c889a12… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f8ef2624bbac60ee41752ae8c889a12… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Remove obsolete methods and code
by Daniel Brötzmann (＠wurstsalat) 11 Jul '22

11 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: f8ef2624 by wurstsalat at 2022-07-11T23:39:50+02:00 Remove obsolete methods and code - - - - - 5 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py - gajim/gtk/roster_item_exchange.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -107,9 +107,6 @@ class BaseControl(ChatCommandProcessor, CommandTools, EventHelper): def __init__(self, widget_name: str, account: str, jid: JID) -> None: EventHelper.__init__(self) - # Undo needs this variable to know if space has been pressed. - # Initialize it to True so empty textview is saved in undo list - self.space_pressed: bool = True self.handlers: dict[int, Any] = {} @@ -122,10 +119,7 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: jid, groupchat=groupchat) self._connect_contact_signals() - # control_id is a unique id for the control, - # its used as action name for actions that belong to a control self.control_id: str = str(uuid.uuid4()) - self.session = None if app.settings.get('use_kib_mib'): self._units = GLib.FormatSizeFlags.IEC_UNITS @@ -321,11 +315,6 @@ def is_groupchat(self) -> bool: def focus(self) -> None: raise NotImplementedError - def update_ui(self) -> None: - """ - Derived types SHOULD implement this - """ - def _nec_ping(self, obj): raise NotImplementedError ===================================== gajim/gtk/controls/chat.py ===================================== @@ -77,8 +77,6 @@ def __init__(self, account: str, jid: JID) -> None: self.correcting: bool = False self.last_sent_msg: Optional[str] = None - self.update_ui() - # PluginSystem: adding GUI extension point for this ChatControl # instance object app.plugin_manager.gui_extension_point('chat_control', self) @@ -194,9 +192,6 @@ def _nec_ping(self, event: events.ApplicationEvent): elif isinstance(event, events.PingError): self.add_info_message(event.error) - def update_ui(self) -> None: - BaseControl.update_ui(self) - def add_message(self, text: str, kind: str, @@ -258,8 +253,6 @@ def _on_drag_data_received(self, self.drag_data_file_transfer(selection) def _on_presence_received(self, event: events.PresenceReceived) -> None: - self.update_ui() - if not app.settings.get('print_status_in_chats'): return ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -42,13 +42,10 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -from gi.repository import Gio from gajim.common import app from gajim.common import events from gajim.common import helpers -from gajim.common.client import Client -from gajim.common.const import SimpleClientState from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import event_filter from gajim.common.helpers import to_user_string @@ -56,7 +53,6 @@ from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant -from gajim.common.structs import OutgoingMessage from gajim.gui.controls.base import BaseControl @@ -89,12 +85,9 @@ def __init__(self, account: str, jid: JID) -> None: account, jid) - self._client.connect_signal('state-changed', - self._on_client_state_changed) - self.is_anonymous: bool = True - self.room_jid: str = str(self.contact.jid) + self.room_jid = str(self.contact.jid) # Stores nickname we want to kick self._kick_nick: Optional[str] = None @@ -144,7 +137,6 @@ def __init__(self, account: str, jid: JID) -> None: self.xml.stack.show_all() self.xml.stack.set_visible_child_name('groupchat') - self.update_ui() self.widget.show_all() # PluginSystem: adding GUI extension point for this GroupchatControl @@ -190,22 +182,9 @@ def _on_muc_state_changed(self, elif self.contact.is_not_joined: self._set_control_inactive() - def _on_client_state_changed(self, - _client: Client, - _signal_name: str, - state: SimpleClientState - ) -> None: + def _on_muc_disco_update(self, event: events.MucDiscoUpdate) -> None: pass - @property - def disco_info(self): - return app.storage.cache.get_last_disco_info(self.contact.jid) - - def is_irc(self) -> bool: - if self.disco_info is None: - return False - return self.disco_info.is_irc - def _show_page(self, name: str) -> None: transition = Gtk.StackTransitionType.SLIDE_DOWN if name == 'groupchat': @@ -851,9 +830,7 @@ def delegate_action(self, action: str) -> int: return res if action == 'change-nickname': - # TODO - control_action = f'{action}-{self.control_id}' - app.window.lookup_action(control_action).activate() + app.window.activate_action('muc-change-nickname', None) return Gdk.EVENT_STOP if action == 'escape': @@ -952,7 +929,7 @@ def _on_password_set_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') - def _on_password_changed(self, entry, _param): + 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: @@ -1006,7 +983,7 @@ def _on_captcha_set_clicked(self, _button: Gtk.Button) -> None: self._remove_captcha_request() self._show_page('groupchat') - def _on_captcha_cancel_clicked(self, _button: Gtk.Button) -> None: + 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() @@ -1026,7 +1003,7 @@ def _on_retry_join_clicked(self, _button: Gtk.Button) -> None: def _on_page_cancel_clicked(self, _button: Gtk.Button) -> None: self._show_page('groupchat') - def _on_page_close_clicked(self, _button: Gtk.Button) -> None: + def _on_page_close_clicked(self, *args: Any) -> None: self._close_control() def _on_groupchat_state_abort_clicked(self, _button: Gtk.Button) -> None: ===================================== gajim/gtk/controls/private.py ===================================== @@ -25,13 +25,11 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from nbxmpp import JID -from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ -from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.gui.controls.chat import ChatControl @@ -89,8 +87,6 @@ def _on_user_nickname_changed(self, self.add_info_message(message) - self.update_ui() - def _on_user_status_show_changed(self, _user_contact: GroupchatParticipant, _signal_name: str, @@ -103,7 +99,6 @@ def _on_user_status_show_changed(self, show = helpers.get_uf_show(properties.show.value) if not self._room_contact.settings.get('print_status'): - self.update_ui() return if properties.is_muc_self_presence: @@ -115,7 +110,6 @@ def _on_user_status_show_changed(self, show=show, status=status) self.add_info_message(message) - self.update_ui() def send_message(self, message: str, @@ -144,6 +138,3 @@ def send_message(self, message, process_commands=process_commands, attention=attention) - - def update_ui(self) -> None: - ChatControl.update_ui(self) ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -243,11 +243,6 @@ def _on_accept_button_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('Roster').set_item( jid, model[iter_][2], groups) - # Update opened chats - ctrl = app.window.get_control(self.account, jid) - if ctrl: - ctrl.update_ui() - iter_ = model.iter_next(iter_) elif self._action == 'delete': count = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f8ef2624bbac60ee41752ae8c889a129… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f8ef2624bbac60ee41752ae8c889a129… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] MessageActionBox: Use client's is_available
by Daniel Brötzmann (＠wurstsalat) 11 Jul '22

11 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: e196d613 by wurstsalat at 2022-07-11T20:38:37+02:00 MessageActionBox: Use client's is_available - - - - - 1 changed file: - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -233,7 +233,7 @@ def _on_user_state_changed(self, *args: Any) -> None: def _update_message_input_state(self) -> None: assert self._client - state = self._client.state.is_connected + state = self._client.state.is_available if isinstance(self._contact, GroupchatContact): state = self._contact.is_joined View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e196d613a5282c6422e63fb9b379eb65… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e196d613a5282c6422e63fb9b379eb65… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Remove update_actions method
by Daniel Brötzmann (＠wurstsalat) 11 Jul '22

11 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 32cd853a by wurstsalat at 2022-07-11T20:19:17+02:00 Remove update_actions method - - - - - 4 changed files: - gajim/common/modules/httpupload.py - gajim/gtk/accounts.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -95,9 +95,6 @@ def pass_disco(self, info: DiscoInfo) -> None: GLib.FormatSizeFlags.IEC_UNITS) self._log.info('Component has a maximum file size of: %s', size) - for ctrl in app.window.get_controls(account=self._account): - ctrl.update_actions() - def make_transfer(self, path: str, encryption: Optional[str], ===================================== gajim/gtk/accounts.py ===================================== @@ -872,8 +872,6 @@ def _reset_send_read_marker(self, button: Gtk.Button) -> None: app.settings.set_contact_settings('send_marker', None) app.settings.set_group_chat_settings( 'send_marker', None, context='private') - for ctrl in app.window.get_controls(account=self._account): - ctrl.update_actions() class ConnectionPage(GenericSettingPage): ===================================== gajim/gtk/controls/base.py ===================================== @@ -321,11 +321,6 @@ def is_groupchat(self) -> bool: def focus(self) -> None: raise NotImplementedError - def update_actions(self) -> None: - """ - Derived types MAY implement this - """ - def update_ui(self) -> None: """ Derived types SHOULD implement this ===================================== gajim/gtk/controls/chat.py ===================================== @@ -40,12 +40,8 @@ from gajim.common import app from gajim.common import events -from gajim.common import helpers -from gajim.common import types -from gajim.common.client import Client from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict -from gajim.common.const import SimpleClientState from gajim.common.const import KindConstant from gajim.common.modules.contacts import BareContact @@ -81,16 +77,11 @@ def __init__(self, account: str, jid: JID) -> None: self.correcting: bool = False self.last_sent_msg: Optional[str] = None - if self._type == ControlType.CHAT: - self._client.connect_signal('state-changed', - self._on_client_state_changed) - self.update_ui() # PluginSystem: adding GUI extension point for this ChatControl # instance object app.plugin_manager.gui_extension_point('chat_control', self) - self.update_actions() def _connect_contact_signals(self) -> None: pass @@ -205,7 +196,6 @@ def _nec_ping(self, event: events.ApplicationEvent): def update_ui(self) -> None: BaseControl.update_ui(self) - self.update_actions() def add_message(self, text: str, @@ -267,12 +257,6 @@ def _on_drag_data_received(self, # File drag and drop (handled in chat_control_base) self.drag_data_file_transfer(selection) - def _on_client_state_changed(self, - _client: Client, - _signal_name: str, - state: SimpleClientState): - self.update_actions() - def _on_presence_received(self, event: events.PresenceReceived) -> None: self.update_ui() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32cd853a3aae9d25b34e10433d017017… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32cd853a3aae9d25b34e10433d017017… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 3 commits: Contacts: Add is_irc property
by Daniel Brötzmann (＠wurstsalat) 11 Jul '22

11 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 1627d7ae by wurstsalat at 2022-07-11T13:32:03+02:00 Contacts: Add is_irc property - - - - - 3d849e73 by wurstsalat at 2022-07-11T13:32:39+02:00 GroupchatControl UI: Remove obsolete destroy page - - - - - 58aa8db0 by wurstsalat at 2022-07-11T13:36:53+02:00 Move actions from GroupchatControl to ChatStack - - - - - 9 changed files: - gajim/common/modules/contacts.py - gajim/data/gui/groupchat_control.ui - gajim/gtk/chat_banner.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/controls/base.py - gajim/gtk/controls/groupchat.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -551,6 +551,13 @@ def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: def is_groupchat(self) -> bool: return True + @property + def is_irc(self) -> bool: + disco_info = self.get_disco() + if disco_info is None: + return False + return disco_info.is_irc + def add_resource(self, resource: str) -> GroupchatParticipant: jid = self._jid.new_with(resource=resource) assert isinstance(self._log, LogAdapter) ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -921,164 +921,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">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-bottom">6</property> - <property name="label" translatable="yes">Destroy This Chat</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="max-width-chars">22</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_page_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="destroy_button"> - <property name="label" translatable="yes">_Destroy</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_destroy_confirm" swapped="no"/> - <style> - <class name="destructive-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">5</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="destroy_alternate_entry"> - <property name="width-request">200</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="margin-bottom">6</property> - <property name="activates-default">True</property> - <property name="caps-lock-warning">False</property> - <property name="secondary-icon-tooltip-text" translatable="yes">Insert Emoji</property> - <property name="placeholder-text" translatable="yes">Alternate venue (optional)...</property> - <signal name="notify::text" handler="_on_destroy_alternate_changed" swapped="no"/> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="destroy_reason_entry"> - <property name="width-request">200</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="margin-bottom">6</property> - <property name="activates-default">True</property> - <property name="caps-lock-warning">False</property> - <property name="secondary-icon-tooltip-text" translatable="yes">Insert Emoji</property> - <property name="placeholder-text" translatable="yes">Reason (optional)...</property> - <property name="show-emoji-icon">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Reason for destruction</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Where participants should go</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</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">destroy</property> - <property name="position">8</property> - </packing> + <placeholder/> </child> <child> <object class="GtkBox"> ===================================== gajim/gtk/chat_banner.py ===================================== @@ -17,7 +17,6 @@ from typing import Any from typing import Optional -from gi.repository import Gio from gi.repository import Gtk import cairo @@ -73,9 +72,6 @@ def __init__(self) -> None: 'hide_groupchat_occupants_list', self._set_toggle_roster_button_icon) - action = Gio.SimpleAction.new('request-voice', None) - app.window.add_action(action) - self.show_all() def switch_contact(self, @@ -290,7 +286,7 @@ def _update_account_badge(self) -> None: def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: self._ui.visitor_popover.popdown() - app.window.activate_action('request-voice', None) + app.window.activate_action('muc-request-voice', None) def _on_toggle_roster_clicked(self, _button: Gtk.Button) -> None: state = app.settings.get('hide_groupchat_occupants_list') ===================================== gajim/gtk/chat_stack.py ===================================== @@ -28,6 +28,7 @@ from nbxmpp.structs import PresenceProperties from gajim.common import app, helpers +from gajim.common.events import MucDiscoUpdate from gajim.common.i18n import _ from gajim.common.const import CallType from gajim.common.modules.contacts import BareContact @@ -38,6 +39,7 @@ from .chat_banner import ChatBanner from .control_stack import ControlStack +from .controls.groupchat import GroupchatControl from .message_actions_box import MessageActionsBox from .util import EventHelper, open_window @@ -92,8 +94,10 @@ def show_chat(self, account: str, jid: JID) -> None: self._update_base_actions(self._current_contact) if isinstance(self._current_contact, GroupchatContact): self._current_contact.multi_connect({ + 'user-joined': self._on_user_joined, 'user-role-changed': self._on_user_role_changed, - 'state-changed': self._on_muc_state_changed + 'user-affiliation-changed': self._on_user_affiliation_changed, + 'state-changed': self._on_muc_state_changed, }) self._update_group_chat_actions(self._current_contact) elif isinstance(self._current_contact, GroupchatParticipant): @@ -109,6 +113,14 @@ def _on_muc_state_changed(self, ) -> None: self._update_group_chat_actions(contact) + def _on_user_joined(self, + contact: GroupchatContact, + _signal_name: str, + _user_contact: GroupchatParticipant, + _properties: PresenceProperties + ) -> None: + self._update_group_chat_actions(contact) + def _on_user_role_changed(self, contact: GroupchatContact, _signal_name: str, @@ -117,6 +129,24 @@ def _on_user_role_changed(self, ) -> None: self._update_group_chat_actions(contact) + def _on_user_affiliation_changed(self, + contact: GroupchatContact, + _signal_name: str, + _user_contact: GroupchatParticipant, + _properties: PresenceProperties + ) -> None: + self._update_group_chat_actions(contact) + + def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: + if self._current_contact is None: + return + + if event.jid != self._current_contact.jid: + return + + if isinstance(self._current_contact, GroupchatContact): + self._update_group_chat_actions(self._current_contact) + def _connect_actions(self) -> None: actions = [ 'add-to-roster', @@ -129,7 +159,15 @@ def _connect_actions(self) -> None: 'start-video-call', 'start-voice-call', 'send-message', - 'request-voice', + 'muc-change-nickname', + 'muc-invite', + 'muc-contact-info', + 'muc-execute-command', + 'muc-ban', + 'muc-kick', + 'muc-change-role', + 'muc-change-affiliation', + 'muc-request-voice', ] stateful_actions = [ @@ -203,9 +241,18 @@ def _update_group_chat_actions(self, contact: GroupchatContact) -> None: assert self_contact is_visitor = self_contact.role.is_visitor - app.window.get_action('request-voice').set_enabled(is_visitor) + app.window.get_action('muc-change-nickname').set_enabled( + joined and not contact.is_irc) + + app.window.get_action('muc-contact-info').set_enabled(joined) + app.window.get_action('muc-execute-command').set_enabled(joined) + app.window.get_action('muc-ban').set_enabled(joined) + app.window.get_action('muc-kick').set_enabled(joined) + app.window.get_action('muc-change-role').set_enabled(joined) + app.window.get_action('muc-change-affiliation').set_enabled(joined) + app.window.get_action('muc-invite').set_enabled(joined) - app.window.get_action('show-contact-info').set_enabled(joined) + app.window.get_action('muc-request-voice').set_enabled(is_visitor) app.window.get_action('quote').set_enabled(joined) app.window.get_action('mention').set_enabled(joined) @@ -224,6 +271,7 @@ def _on_action(self, account = contact.account client = app.get_client(account) jid = contact.jid + current_control = self._control_stack.get_current_control() if action_name == 'send-message': self._on_send_message() @@ -236,9 +284,8 @@ def _on_action(self, elif action_name.startswith('send-file'): name = action.get_name() - control = self._control_stack.get_current_control() if 'httpupload' in name: - app.interface.send_httpupload(control) + app.interface.send_httpupload(current_control) return if 'jingle' in name: @@ -251,7 +298,7 @@ def _on_action(self, return if method == 'httpupload': - app.interface.send_httpupload(control) + app.interface.send_httpupload(current_control) else: app.interface.instances[ 'file_transfers'].show_file_send_request(account, contact) @@ -266,7 +313,7 @@ def _on_action(self, open_window('AddContact', account=account, jid=jid) elif action_name == 'clear-chat': - self._control_stack.get_current_control().reset_view() + current_control.reset_view() elif action_name == 'show-contact-info': if isinstance(contact, GroupchatContact): @@ -274,7 +321,58 @@ def _on_action(self, else: app.window.contact_info(account, str(jid)) - elif action_name == 'request-voice': + elif action_name == 'muc-contact-info': + assert param is not None + nick = param.get_string() + assert isinstance(contact, GroupchatContact) + resource_contact = contact.get_resource(nick) + open_window( + 'ContactInfo', account=account, contact=resource_contact) + + elif action_name == 'muc-invite': + assert isinstance(current_control, GroupchatControl) + current_control.show_inviter() + + elif action_name == 'muc-change-nickname': + assert isinstance(current_control, GroupchatControl) + current_control.show_change_nick() + + elif action_name == 'muc-execute-command': + assert isinstance(current_control, GroupchatControl) + nick = None + if param is not None: + nick = param.get_string() + if nick: + assert isinstance(contact, GroupchatContact) + resource_contact = contact.get_resource(nick) + jid = resource_contact.jid + open_window('AdHocCommands', account=account, jid=jid) + + elif action_name == 'muc-kick': + assert isinstance(current_control, GroupchatControl) + assert param is not None + kick_nick = param.get_string() + current_control.show_kick(kick_nick) + + elif action_name == 'muc-ban': + assert isinstance(current_control, GroupchatControl) + assert param is not None + ban_jid = param.get_string() + current_control.show_ban(ban_jid) + + elif action_name == 'muc-change-role': + assert param is not None + nick, role = param.get_strv() + client.get_module('MUC').set_role(contact.jid, nick, role) + + elif action_name == 'muc-change-affiliation': + assert param is not None + jid, affiliation = param.get_strv() + client.get_module('MUC').set_affiliation( + contact.jid, + {jid: {'affiliation': affiliation}}) + + elif action_name == 'muc-request-voice': client.get_module('MUC').request_voice(contact.jid) def _on_stateful_action(self, @@ -374,6 +472,8 @@ def clear(self) -> None: self._control_stack.clear() def process_event(self, event: Any) -> None: + if isinstance(event, MucDiscoUpdate): + self._on_muc_disco_update(event) self._control_stack.process_event(event) ===================================== gajim/gtk/const.py ===================================== @@ -206,6 +206,15 @@ def __str__(self): ('clear-chat', None, False), ('show-contact-info', None, False), ('send-message', None, False), + ('muc-change-nickname', None, False), + ('muc-invite', None, False), + ('muc-contact-info', 's', False), + ('muc-execute-command', 's', False), + ('muc-ban', 's', False), + ('muc-kick', 's', False), + ('muc-change-role', 'as', False), + ('muc-change-affiliation', 'as', False), + ('muc-request-voice', None, False), ] ===================================== gajim/gtk/controls/base.py ===================================== @@ -133,8 +133,7 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self._units = GLib.FormatSizeFlags.DEFAULT self.xml = get_builder(f'{widget_name}.ui') - # TODO - # self.xml.connect_signals(self) + self.xml.connect_signals(self) self.widget: Gtk.Box = self.xml.get_object(f'{widget_name}_hbox') # Drag and drop ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -128,27 +128,16 @@ 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) - self.add_actions() - GLib.idle_add(self.update_actions) - # Holds CaptchaRequest widget self._captcha_request: Optional[DataFormWidget] = None self._subject_text = '' # Groupchat invite - # self.xml.quick_invite_button.set_action_name( - # f'win.invite-{self.control_id}') - self._invite_box = GroupChatInviter(self.room_jid) self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) self._invite_box.connect('listbox-changed', self._on_invite_ready) - app.settings.connect_signal('gc_print_join_left_default', - self.update_actions) - app.settings.connect_signal('gc_print_status_default', - self.update_actions) - self._set_control_inactive() # Stack @@ -212,60 +201,6 @@ def _on_client_state_changed(self, def disco_info(self): return app.storage.cache.get_last_disco_info(self.contact.jid) - def add_actions(self) -> None: - actions = [ - ('change-nickname-', None, self._on_change_nick), - ('destroy-', None, self._on_destroy_room), - ('invite-', None, self._on_invite), - ('contact-information-', 's', self._on_contact_information), - ('execute-command-', 's', self._on_execute_command), - ('ban-', 's', self._on_ban), - ('kick-', 's', self._on_kick), - ('change-role-', 'as', self._on_change_role), - ('change-affiliation-', 'as', self._on_change_affiliation), - ] - - for action in actions: - action_name, variant, func = action - if variant is not None: - variant = GLib.VariantType.new(variant) - act = Gio.SimpleAction.new(action_name + self.control_id, variant) - act.connect("activate", func) - app.window.add_action(act) - - def update_actions(self, *args: Any) -> None: - joined = self.contact.is_joined - - self._get_action('change-nickname-').set_enabled( - joined and not self.is_irc()) - - self._get_action('execute-command-').set_enabled(joined) - - self._get_action('contact-information-').set_enabled(joined) - - self._get_action('ban-').set_enabled(joined) - - self._get_action('kick-').set_enabled(joined) - - self._get_action('invite-').set_enabled(joined) - - def remove_actions(self) -> None: - actions = [ - 'change-nickname-', - 'destroy-', - 'configure-', - 'invite-', - 'contact-information-', - 'execute-command-', - 'ban-', - 'kick-', - 'change-role-', - 'change-affiliation-', - ] - - for action in actions: - app.window.remove_action(f'{action}{self.control_id}') - def is_irc(self) -> bool: if self.disco_info is None: return False @@ -277,20 +212,15 @@ def _show_page(self, name: str) -> None: transition = Gtk.StackTransitionType.SLIDE_UP active_control = app.window.get_active_control() if active_control == self: - self.msg_textview.grab_focus() + 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() - def _on_muc_disco_update(self, _event: events.MucDiscoUpdate) -> None: - self.update_actions() - # Actions - def _on_invite(self, - _action: Gio.SimpleAction, - _param: Optional[GLib.Variant] - ) -> None: + def show_inviter(self) -> None: self._invite_box.load_contacts() self._show_page('invite') @@ -314,98 +244,24 @@ def invite(self, invited_jid: JID) -> None: self.add_info_message( _('%s has been invited to this group chat') % invited_contact.name) - def _on_destroy_room(self, _button: Gtk.Button) -> None: - self.xml.destroy_reason_entry.grab_focus() - self.xml.destroy_button.grab_default() - self._show_page('destroy') - - def _on_destroy_alternate_changed(self, - entry: Gtk.Entry, - _param: Any - ) -> None: - jid = entry.get_text() - if jid: - try: - jid = helpers.validate_jid(jid) - except Exception: - icon = 'dialog-warning-symbolic' - text = _('Invalid XMPP Address') - self.xml.destroy_alternate_entry.set_icon_from_icon_name( - Gtk.EntryIconPosition.SECONDARY, icon) - self.xml.destroy_alternate_entry.set_icon_tooltip_text( - Gtk.EntryIconPosition.SECONDARY, text) - self.xml.destroy_button.set_sensitive(False) - return - self.xml.destroy_alternate_entry.set_icon_from_icon_name( - Gtk.EntryIconPosition.SECONDARY, None) - self.xml.destroy_button.set_sensitive(True) - - def _on_destroy_confirm(self, _button: Gtk.Button) -> None: - reason = self.xml.destroy_reason_entry.get_text() - jid = self.xml.destroy_alternate_entry.get_text() - self._client.get_module('MUC').destroy(self.room_jid, reason, jid) - self._show_page('groupchat') - - def _on_execute_command(self, - _action: Gio.SimpleAction, - param: GLib.Variant - ) -> None: - jid = self.room_jid - nick = param.get_string() - if nick: - jid += '/' + nick - open_window('AdHocCommands', account=self.account, jid=jid) - - def _on_contact_information(self, - _action: Gio.SimpleAction, - param: GLib.Variant - ) -> None: - nick = param.get_string() - contact = self.contact.get_resource(nick) - open_window('ContactInfo', account=self.account, contact=contact) - - def _on_kick(self, - _action: Gio.SimpleAction, - param: GLib.Variant - ) -> None: - nick = param.get_string() - self._kick_nick = nick - text = _('Kick %s') % nick + def show_kick(self, kick_nick: str) -> None: + self._kick_nick = kick_nick + text = _('Kick %s') % kick_nick self.xml.kick_label.set_text(text) self.xml.kick_label.set_tooltip_text(text) self.xml.kick_reason_entry.grab_focus() self.xml.kick_participant_button.grab_default() self._show_page('kick') - def _on_ban(self, - _action: Gio.SimpleAction, - param: GLib.Variant - ) -> None: - jid = param.get_string() - self._ban_jid = jid - text = _('Ban %s') % jid + def show_ban(self, ban_jid: str) -> None: + self._ban_jid = ban_jid + text = _('Ban %s') % ban_jid self.xml.ban_label.set_text(text) self.xml.ban_label.set_tooltip_text(text) self.xml.ban_reason_entry.grab_focus() self.xml.ban_participant_button.grab_default() self._show_page('ban') - def _on_change_role(self, - _action: Gio.SimpleAction, - param: GLib.Variant - ) -> None: - nick, role = param.get_strv() - self._client.get_module('MUC').set_role(self.room_jid, nick, role) - - def _on_change_affiliation(self, - _action: Gio.SimpleAction, - param: GLib.Variant - ) -> None: - jid, affiliation = param.get_strv() - self._client.get_module('MUC').set_affiliation( - self.room_jid, - {jid: {'affiliation': affiliation}}) - def _show_roster(self, show_roster: bool, *args: Any) -> None: transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show_roster: @@ -613,16 +469,12 @@ def _set_control_active(self) -> None: self.roster.initial_draw() self.conversation_view.update_avatars() - self.update_actions() - def _set_control_inactive(self) -> None: self.roster.enable_sort(False) self.roster.clear() self._client.get_module('Chatstate').remove_delay_timeout(self.contact) - self.update_actions() - def rejoin(self) -> None: self._client.get_module('MUC').join(self.room_jid) @@ -657,9 +509,6 @@ def _on_user_joined(self, _('The server has assigned or modified your nickname in this ' 'group chat')) - # Update Actions - self.update_actions() - def _on_room_config_finished(self, _contact: GroupchatContact, _signal_name: str @@ -735,7 +584,6 @@ def _on_user_affiliation_changed(self, reason=reason) self.add_info_message(message) - self.update_actions() def _on_user_role_changed(self, _contact: GroupchatContact, @@ -765,7 +613,6 @@ def _on_user_role_changed(self, reason=reason) self.add_info_message(message) - self.update_actions() def _on_room_kicked(self, _contact: GroupchatContact, @@ -968,8 +815,6 @@ def shutdown(self, reason: Optional[str] = None) -> None: self.roster.destroy() self.roster = None - self.remove_actions() - super(GroupchatControl, self).shutdown() app.check_finalize(self) @@ -1006,6 +851,7 @@ def delegate_action(self, action: str) -> int: return res if action == 'change-nickname': + # TODO control_action = f'{action}-{self.control_id}' app.window.lookup_action(control_action).activate() return Gdk.EVENT_STOP @@ -1046,8 +892,6 @@ def focus(self) -> None: self._captcha_request.focus_first_entry() elif page_name == 'invite': self._invite_box.focus_search_entry() - elif page_name == 'destroy': - self.xml.destroy_reason_entry.grab_focus_without_selecting() def _on_kick_participant_clicked(self, _button: Gtk.Button) -> None: reason = self.xml.kick_reason_entry.get_text() @@ -1077,10 +921,7 @@ def _on_page_change(self, stack: Gtk.Stack, _param: Any) -> None: elif page_name == 'error': self.xml.close_button.grab_default() - def _on_change_nick(self, - _action: Gio.SimpleAction, - _param: Optional[GLib.Variant] - ) -> None: + def show_change_nick(self) -> None: if self._get_current_page() != 'groupchat': return self.xml.nickname_entry.set_text(self.contact.nickname) ===================================== gajim/gtk/menus.py ===================================== @@ -117,9 +117,9 @@ def get_send_file_submenu() -> GajimMenu: def get_groupchat_menu(contact: GroupchatContact) -> GajimMenu: menuitems: MenuItemListT = [ (_('Details'), 'win.show-contact-info', None), - (_('Change Nickname…'), 'win.change-nickname', None), - (_('Request Voice'), 'win.request-voice', None), - (_('Execute Command…'), 'win.execute-command', '""'), + (_('Change Nickname…'), 'win.muc-change-nickname', None), + (_('Request Voice'), 'win.muc-request-voice', None), + (_('Execute Command…'), 'win.muc-execute-command', '""'), (_('Search…'), 'win.search-history', None) ] @@ -452,13 +452,12 @@ def get_workspace_params(current_workspace_id: str, yield name, params -def get_groupchat_admin_menu(control_id: str, - self_contact: types.GroupchatParticipant, +def get_groupchat_admin_menu(self_contact: types.GroupchatParticipant, contact: types.GroupchatParticipant) -> GajimMenu: menu = GajimMenu() - action = f'win.change-affiliation-{control_id}' + action = 'win.muc-change-affiliation' if is_affiliation_change_allowed(self_contact, contact, 'owner'): value = f'["{contact.real_jid}", "owner"]' @@ -478,7 +477,7 @@ def get_groupchat_admin_menu(control_id: str, if is_affiliation_change_allowed(self_contact, contact, 'outcast'): value = f'"{contact.real_jid}"' - menu.add_item(_('Ban…'), f'win.ban-{control_id}', value) + menu.add_item(_('Ban…'), 'win.muc-ban', value) if not menu.get_n_items(): menu.add_item(_('Not Available'), 'dummy', None) @@ -486,8 +485,7 @@ def get_groupchat_admin_menu(control_id: str, return menu -def get_groupchat_mod_menu(control_id: str, - self_contact: types.GroupchatParticipant, +def get_groupchat_mod_menu(self_contact: types.GroupchatParticipant, contact: types.GroupchatParticipant ) -> GajimMenu: @@ -495,9 +493,9 @@ def get_groupchat_mod_menu(control_id: str, if is_role_change_allowed(self_contact, contact): value = f'"{contact.name}"' - menu.add_item(_('Kick…'), f'win.kick-{control_id}', value) + menu.add_item(_('Kick…'), 'win.muc-kick', value) - action = f'win.change-role-{control_id}' + action = 'win.muc-change-role' if is_role_change_allowed(self_contact, contact): if contact.role.is_visitor: @@ -514,7 +512,6 @@ def get_groupchat_mod_menu(control_id: str, def get_groupchat_roster_menu(account: str, - control_id: str, self_contact: types.GroupchatParticipant, contact: types.GroupchatParticipant ) -> GajimMenu: @@ -522,8 +519,8 @@ def get_groupchat_roster_menu(account: str, value = f'"{contact.name}"' general_items: MenuItemListT = [ - (_('Details'), f'win.contact-information-{control_id}', value), - (_('Execute Command…'), f'win.execute-command-{control_id}', value), + (_('Details'), 'win.muc-contact-info', value), + (_('Execute Command…'), 'win.muc-execute-command', value), ] real_contact = contact.get_real_contact() @@ -532,8 +529,8 @@ def get_groupchat_roster_menu(account: str, action = f'app.{account}-add-contact' general_items.insert(1, (_('Add to Contact List…'), action, value)) - mod_menu = get_groupchat_mod_menu(control_id, self_contact, contact) - admin_menu = get_groupchat_admin_menu(control_id, self_contact, contact) + mod_menu = get_groupchat_mod_menu(self_contact, contact) + admin_menu = get_groupchat_admin_menu(self_contact, contact) menu = GajimMenu.from_list(general_items) menu.append_section(_('Moderation'), mod_menu) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -101,6 +101,8 @@ def __init__(self) -> None: self._ui.formattings_button.set_menu_model(get_format_menu()) self._ui.encryption_menu_button.set_menu_model(get_encryption_menu()) + self._ui.quick_invite_button.set_action_name('win.muc-invite') + self._init_emoticon_popover() # TODO init spellchecker uses a contact on callback, contact might # be None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/40f863f18c83c0f62cbb08941b8c1d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/40f863f18c83c0f62cbb08941b8c1d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: Roster: Don’t invalidate filter on contact update
by Philipp Hörist (＠lovetox) 10 Jul '22

10 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9aa42d78 by lovetox at 2022-07-10T22:21:46+02:00 perf: Roster: Don’t invalidate filter on contact update It’s enough to just evaluate the visibility for the contact instead of the whole roster - - - - - 1 changed file: - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/roster.py ===================================== @@ -528,7 +528,6 @@ def _on_contact_update(self, _signal_name: str) -> None: self._draw_contact(contact) - self._refilter() @event_filter(['account']) def _on_roster_received(self, _event: RosterReceived) -> None: @@ -693,6 +692,7 @@ def _draw_contact_row(self, surface = contact.get_avatar( AvatarSize.ROSTER, self.get_scale_factor()) self._store[iter_][Column.AVATAR] = surface + self._store[iter_][Column.VISIBLE] = self._get_contact_visible(contact) def _get_total_user_count(self) -> int: count = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9aa42d7826e1ac336eee5bef7d67c2c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9aa42d7826e1ac336eee5bef7d67c2c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: Remove 'update_toolbar' and its GUI extension point
by Daniel Brötzmann (＠wurstsalat) 10 Jul '22

10 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: bd4ce98e by wurstsalat at 2022-07-09T17:59:14+02:00 Remove 'update_toolbar' and its GUI extension point - - - - - 40f863f1 by wurstsalat at 2022-07-10T19:07:03+02:00 Fix updating message input state - - - - - 7 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -117,6 +117,8 @@ def switch_contact(self, if isinstance(self._contact, GroupchatParticipant): self._contact.multi_connect({ + 'user-joined': self._on_user_state_changed, + 'user-left': self._on_user_state_changed, 'user-avatar-update': self._on_user_avatar_update, 'user-nickname-changed': self._on_user_nickname_changed }) @@ -193,6 +195,9 @@ def _on_user_nickname_changed(self, self._update_content() + def _on_user_state_changed(self, *args: Any) -> None: + self._update_avatar() + def _on_user_avatar_update(self, *args: Any) -> None: self._update_avatar() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -96,6 +96,8 @@ def show_chat(self, account: str, jid: JID) -> None: 'state-changed': self._on_muc_state_changed }) self._update_group_chat_actions(self._current_contact) + elif isinstance(self._current_contact, GroupchatParticipant): + self._update_participant_actions(self._current_contact) else: self._update_chat_actions(self._current_contact) ===================================== gajim/gtk/controls/base.py ===================================== @@ -327,24 +327,11 @@ def update_actions(self) -> None: Derived types MAY implement this """ - def update_toolbar(self) -> None: - """ - update state of buttons in toolbar - """ - self._update_toolbar() - app.plugin_manager.gui_extension_point( - 'chat_control_base_update_toolbar', self) - def update_ui(self) -> None: """ Derived types SHOULD implement this """ - def _update_toolbar(self) -> None: - """ - Derived types MAY implement this - """ - def _nec_ping(self, obj): raise NotImplementedError @@ -382,8 +369,6 @@ def shutdown(self) -> None: # Plugins might want to remove their widgets on # remove_gui_extension_point(), so delete the objects only afterwards. app.plugin_manager.remove_gui_extension_point('chat_control_base', self) - app.plugin_manager.remove_gui_extension_point( - 'chat_control_base_update_toolbar', self) self._client.disconnect_all_from_obj(self) self.contact.disconnect_all_from_obj(self) @@ -688,12 +673,6 @@ def set_control_active(self, state: bool) -> None: if not self._chat_loaded: self.fetch_n_lines_history(self._scrolled_view, True, 20) - def set_message_input_state(self, state: bool) -> None: - return - # self.xml.formattings_button.set_sensitive(state) - # self.msg_textview.set_sensitive(state) - # self.msg_textview.set_editable(state) - @property def is_chat_loaded(self) -> bool: return self._chat_loaded ===================================== gajim/gtk/controls/chat.py ===================================== @@ -85,7 +85,6 @@ def __init__(self, account: str, jid: JID) -> None: self._client.connect_signal('state-changed', self._on_client_state_changed) - self.update_toolbar() self.update_ui() # PluginSystem: adding GUI extension point for this ChatControl @@ -94,9 +93,7 @@ def __init__(self, account: str, jid: JID) -> None: self.update_actions() def _connect_contact_signals(self) -> None: - self.contact.multi_connect({ - 'caps-update': self._on_caps_update, - }) + pass @property def jid(self) -> JID: @@ -114,12 +111,6 @@ def focus(self) -> None: def delegate_action(self, action: str) -> int: return Gdk.EVENT_PROPAGATE - def _on_caps_update(self, - _contact: types.BareContact, - _signal_name: str - ) -> None: - self.update_ui() - def _on_mam_message_received(self, event: events.MamMessageReceived) -> None: if event.properties.is_muc_pm: @@ -214,7 +205,6 @@ def _nec_ping(self, event: events.ApplicationEvent): def update_ui(self) -> None: BaseControl.update_ui(self) - self.update_toolbar() self.update_actions() def add_message(self, @@ -281,9 +271,6 @@ def _on_client_state_changed(self, _client: Client, _signal_name: str, state: SimpleClientState): - self.set_message_input_state(state.is_connected) - - self.update_toolbar() self.update_actions() def _on_presence_received(self, event: events.PresenceReceived) -> None: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -610,17 +610,12 @@ def _nec_ping(self, event: events.ApplicationEvent) -> None: self.add_info_message(event.error) def _set_control_active(self) -> None: - self_contact = self.contact.get_self() - self.set_message_input_state(not self_contact.role.is_visitor) - self.roster.initial_draw() self.conversation_view.update_avatars() self.update_actions() def _set_control_inactive(self) -> None: - self.set_message_input_state(False) - self.roster.enable_sort(False) self.roster.clear() @@ -758,7 +753,6 @@ def _on_user_role_changed(self, actor = '' if actor is None else _(' by {actor}').format(actor=actor) if properties.is_muc_self_presence: - self.set_message_input_state(not user_contact.role.is_visitor) message = _('** Your Role has been set to ' '{role}{actor}{reason}').format(role=role, actor=actor, ===================================== gajim/gtk/controls/private.py ===================================== @@ -58,14 +58,10 @@ def __init__(self, account: str, jid: JID) -> None: def _connect_contact_signals(self) -> None: self.contact.multi_connect({ - 'user-joined': self._on_user_joined, - 'user-left': self._on_user_left, 'user-status-show-changed': self._on_user_status_show_changed, 'user-nickname-changed': self._on_user_nickname_changed, # 'room-kicked': self._on_room_kicked, # 'room-destroyed': self._on_room_destroyed, - 'room-joined': self._on_room_joined, - # 'room-left': self._on_room_left }) @property @@ -121,33 +117,6 @@ def _on_user_status_show_changed(self, self.add_info_message(message) self.update_ui() - # def _on_disconnected(self, event): - # if event.properties.jid != self.contact.jid: - # return - # self.set_message_input_state(False) - - def _on_user_left(self, - _user_contact: GroupchatParticipant, - _signal_name: str, - _properties: MessageProperties - ) -> None: - self.set_message_input_state(False) - - def _on_user_joined(self, - _user_contact: GroupchatParticipant, - _signal_name: str, - _properties: MessageProperties - ) -> None: - self.set_message_input_state(True) - - def _on_room_joined(self, - _contact: GroupchatContact, - _signal_name: str - ) -> None: - if not self.contact.is_available: - return - self.set_message_input_state(True) - def send_message(self, message: str, process_commands: bool = True, ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -36,6 +36,8 @@ from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.client import Client +from gajim.common.const import SimpleClientState from gajim.common.const import Direction from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant @@ -65,6 +67,7 @@ class MessageActionsBox(Gtk.Grid): def __init__(self) -> None: super().__init__() + self._client: Optional[Client] = None self._contact: Optional[ChatContactT] = None self._ui = get_builder('message_actions_box.ui') @@ -175,7 +178,30 @@ def _on_action(self, self.msg_textview.mention_participant(param.get_string()) def switch_contact(self, contact: ChatContactT) -> None: + if self._client is not None: + self._client.disconnect_all_from_obj(self) + + if self._contact is not None: + self._contact.disconnect_all_from_obj(self) + + self._client = app.get_client(contact.account) + self._client.connect_signal( + 'state-changed', self._on_client_state_changed) + self._contact = contact + if isinstance(self._contact, GroupchatContact): + self._contact.multi_connect({ + 'state-changed': self._on_muc_state_changed, + 'user-role-changed': self._on_muc_state_changed, + }) + if isinstance(self._contact, GroupchatParticipant): + self._contact.multi_connect({ + 'user-joined': self._on_user_state_changed, + 'user-left': self._on_user_state_changed, + 'room-joined': self._on_user_state_changed, + 'room-left': self._on_user_state_changed, + }) + self._set_settings_menu(contact) encryption = self._contact.settings.get('encryption') @@ -188,6 +214,40 @@ def switch_contact(self, contact: ChatContactT) -> None: self.msg_textview.switch_contact(contact) self._security_label_selector.switch_contact(contact) + self._update_message_input_state() + + def _on_client_state_changed(self, + _client: Client, + _signal_name: str, + state: SimpleClientState + ) -> None: + self._update_message_input_state() + + def _on_muc_state_changed(self, *args: Any) -> None: + self._update_message_input_state() + + def _on_user_state_changed(self, *args: Any) -> None: + self._update_message_input_state() + + def _update_message_input_state(self) -> None: + assert self._client + state = self._client.state.is_connected + + if isinstance(self._contact, GroupchatContact): + state = self._contact.is_joined + if self._contact.is_joined: + self_contact = self._contact.get_self() + assert self_contact + state = not self_contact.role.is_visitor + + if isinstance(self._contact, GroupchatParticipant): + state = self._contact.is_available + + self._ui.emoticons_button.set_sensitive(state) + self._ui.formattings_button.set_sensitive(state) + self.msg_textview.set_sensitive(state) + self.msg_textview.set_editable(state) + def _set_chatstate(self) -> None: return #TODO if state: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6365d0a09c9d6ecbf465885ed126e3f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6365d0a09c9d6ecbf465885ed126e3f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] perf: Use cache when calling JID.new_as_bare()
by Philipp Hörist (＠lovetox) 10 Jul '22

10 Jul '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d1780d81 by lovetox at 2022-07-10T17:42:47+02:00 perf: Use cache when calling JID.new_as_bare() - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -700,9 +700,7 @@ class JID: def new_as_bare(self) -> JID: if self.resource is None: return self - new = asdict(self) - new.pop('resource') - return JID(**new) + return JID.from_string(self.bare) def bare_match(self, other: Union[str, JID]) -> bool: if isinstance(other, str): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d1780d814db35b02f72ac445… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d1780d814db35b02f72ac445… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Ignore pyright error
by Philipp Hörist (＠lovetox) 10 Jul '22

10 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0bb75cdf by lovetox at 2022-07-10T17:31:45+02:00 chore: Ignore pyright error - - - - - 1 changed file: - gajim/common/const.py Changes: ===================================== gajim/common/const.py ===================================== @@ -1180,6 +1180,6 @@ def is_offline(self): def __lt__(self, other: Union[PresenceShowExt, PresenceShow]) -> bool: if isinstance(other, PresenceShowExt): return False - if not isinstance(other, PresenceShow): + if not isinstance(other, PresenceShow): # pyright: ignore return NotImplemented return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0bb75cdff065bbd622158a2ce78887bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0bb75cdff065bbd622158a2ce78887bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: Roster: Sort more efficiently
by Philipp Hörist (＠lovetox) 10 Jul '22

10 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1405f22f by lovetox at 2022-07-10T17:00:19+02:00 perf: Roster: Sort more efficiently - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/gtk/roster.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -144,6 +144,16 @@ def get_contact(self, contact = contact.get_resource(resource) return contact + def get_bare_contact(self, jid: Union[str, JID]) -> Union[BareContact, + GroupchatContact]: + '''This method gives direct access to the contacts dict. + This is helpful when performance is essential. In difference to + get_contact() this method does not create contacts nor can it handle + JIDs which are not bare. Use this only if you know the contact + exists. + ''' + return self._contacts[jid] + def get_group_chat_contact(self, jid: Union[str, JID] ) -> Union[BareContact, ===================================== gajim/gtk/roster.py ===================================== @@ -79,6 +79,7 @@ def __init__(self, account: str) -> None: self._account = account self._client = app.get_client(account) + self._contacts = self._client.get_module('Contacts') self._roster_tooltip = RosterTooltip() @@ -195,9 +196,6 @@ def _remove_actions(self): for action in actions: app.window.remove_action(f'{action}-{self._account}') - def _get_contact(self, jid: str) -> types.BareContact: - return self._client.get_module('Contacts').get_contact(jid) - def _on_account_state(self, _event: ApplicationEvent) -> None: self.update_actions() @@ -300,7 +298,8 @@ def _on_query_tooltip(self, self._roster_tooltip.clear_tooltip() return False - contact = self._get_contact(model[iter_][Column.JID_OR_GROUP]) + contact = self._contacts.get_bare_contact( + model[iter_][Column.JID_OR_GROUP]) value, widget = self._roster_tooltip.get_tooltip(path, contact) tooltip.set_custom(widget) return value @@ -352,7 +351,7 @@ def _on_remove_contact(self, param: GLib.Variant): jid = JID.from_string(param.get_string()) - selected_contact = self._client.get_module('Contacts').get_contact(jid) + selected_contact = self._contacts.get_contact(jid) if selected_contact.is_gateway: # Check for transport users in roster and warn about removing the # transport if there are any @@ -438,7 +437,7 @@ def _show_contact_menu(self, treeview: Gtk.TreeView, event: Gdk.EventButton) -> None: - contact = self._client.get_module('Contacts').get_contact(jid) + contact = self._contacts.get_bare_contact(jid) gateway_register = contact.is_gateway and contact.supports( Namespace.REGISTER) menu = get_roster_menu( @@ -537,7 +536,7 @@ def _on_roster_received(self, _event: RosterReceived) -> None: @event_filter(['account']) def _on_roster_push(self, event: RosterPush) -> None: - contact = self._get_contact(str(event.item.jid)) + contact = self._contacts.get_contact(str(event.item.jid)) if event.item.subscription == 'remove': contact.disconnect(self) @@ -665,7 +664,8 @@ def _refilter(self) -> None: for group in self._store: group_is_visible = False for child in group.iterchildren(): - contact = self._get_contact(child[Column.JID_OR_GROUP]) + contact = self._contacts.get_bare_contact( + child[Column.JID_OR_GROUP]) is_visible = self._get_contact_visible(contact) child[Column.VISIBLE] = is_visible if is_visible: @@ -758,8 +758,10 @@ def _tree_compare_iters(self, if not app.settings.get('sort_by_show_in_roster'): return locale.strcoll(name1.lower(), name2.lower()) - contact1 = self._get_contact(model[iter1][Column.JID_OR_GROUP]) - contact2 = self._get_contact(model[iter2][Column.JID_OR_GROUP]) + contact1 = self._contacts.get_bare_contact( + model[iter1][Column.JID_OR_GROUP]) + contact2 = self._contacts.get_bare_contact( + model[iter2][Column.JID_OR_GROUP]) if contact1.show != contact2.show: if contact1.show == PresenceShow.DND: @@ -795,4 +797,5 @@ def _on_destroy(self, _roster: Roster) -> None: del self._roster del self._store del self._roster_tooltip + del self._contacts app.check_finalize(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1405f22f8215c98dd1b0be50fe6fd854… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1405f22f8215c98dd1b0be50fe6fd854… 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