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/f8ef2624bbac60ee41752ae8c889a129c...