Daniel Brötzmann pushed to branch master at gajim / gajim
Commits: eb445db8 by wurstsalat at 2022-08-11T18:00:43+02:00 change: Remove clear-chat action (Ctrl+L)
- - - - -
4 changed files:
- gajim/data/gui/shortcuts_window.ui - gajim/data/other/shortcuts.json - gajim/gtk/chat_stack.py - gajim/gtk/const.py
Changes:
===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -127,13 +127,6 @@ <property name="title" translatable="yes">Scroll down</property> </object> </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary>l</property> - <property name="title" translatable="yes">Clear chat window</property> - </object> - </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property>
===================================== gajim/data/other/shortcuts.json ===================================== @@ -14,7 +14,6 @@ "win.send-file": ["<Primary>F"], "win.show-contact-info": ["<Primary>I"], "win.show-emoji-chooser": ["<Primary><Shift>M"], - "win.clear-chat": ["<Primary>L"], "win.input-clear": ["<Primary>U"], "win.close-tab": ["<Primary>W"], "win.switch-next-tab": ["<Primary>Page_Down"],
===================================== gajim/gtk/chat_stack.py ===================================== @@ -313,7 +313,6 @@ def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: def _connect_actions(self) -> None: actions = [ 'add-to-roster', - 'clear-chat', 'invite-contacts', 'send-file', 'send-file-httpupload', @@ -364,7 +363,6 @@ def _update_base_actions(self, contact: ChatContactT) -> None: app.window.get_action('input-italic').set_enabled(True) app.window.get_action('input-strike').set_enabled(True) app.window.get_action('input-clear').set_enabled(True) - app.window.get_action('clear-chat').set_enabled(True)
def _update_chat_actions(self, contact: BareContact) -> None: account = contact.account @@ -449,9 +447,6 @@ def _on_action(self, jid = contact.real_jid open_window('AddContact', account=account, jid=jid)
- elif action_name == 'clear-chat': - self._chat_control.reset_view() - elif action_name == 'show-contact-info': if isinstance(contact, GroupchatContact): open_window('GroupchatDetails', contact=contact)
===================================== gajim/gtk/const.py ===================================== @@ -204,7 +204,6 @@ def __str__(self): ('add-to-roster', None, True), ('start-voice-call', None, False), ('start-video-call', None, False), - ('clear-chat', None, False), ('show-contact-info', None, False), ('send-message', None, False), ('muc-change-nickname', None, False),
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/eb445db82118b0441fff309c8348be7f9...