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