Daniel Brötzmann pushed to branch mainwindow at gajim / gajim

Commits: 16712e13 by wurstsalat at 2021-12-02T20:08:11+01:00 Actions: Remove move-tab-{up,down}

- - - - - c2670ef1 by wurstsalat at 2021-12-02T20:15:10+01:00 Shortcuts: Remove obsolete shortcuts

- - - - -

3 changed files:

- gajim/application.py - gajim/data/gui/shortcuts_window.ui - gajim/gtk/main.py

Changes:

===================================== gajim/application.py ===================================== @@ -507,8 +507,6 @@ def _set_shortcuts(self): 'win.clear-chat': ['<Primary>L'], 'win.delete-line': ['<Primary>U'], 'win.close-tab': ['<Primary>W'], - 'win.move-tab-up': ['<Primary><Shift>Page_Up'], - 'win.move-tab-down': ['<Primary><Shift>Page_Down'], 'win.switch-next-tab': ['<Primary>Page_Down'], 'win.switch-prev-tab': ['<Primary>Page_Up'], 'win.switch-next-unread-tab-right': ['<Primary>Tab'],

===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -45,13 +45,6 @@ <property name="title" translatable="yes">File transfers</property> </object> </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">&lt;primary&gt;s</property> - <property name="title" translatable="yes">Set the status message</property> - </object> - </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> @@ -68,40 +61,6 @@ </child> </object> </child> - <child> - <object class="GtkShortcutsGroup"> - <property name="visible">1</property> - <property name="title" translatable="yes">Appearance</property> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">&lt;primary&gt;o</property> - <property name="title" translatable="yes">Show offline contacts</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">&lt;primary&gt;y</property> - <property name="title" translatable="yes">Show only active contacts</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">&lt;primary&gt;k</property> - <property name="title" translatable="yes">Enable contact list filtering</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">&lt;primary&gt;r</property> - <property name="title" translatable="yes">Show / hide contact list</property> - </object> - </child> - </object> - </child> <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> @@ -113,20 +72,6 @@ <property name="title" translatable="yes">Contact information</property> </object> </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">F2</property> - <property name="title" translatable="yes">Rename contact</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">Delete</property> - <property name="title" translatable="yes">Delete contact</property> - </object> - </child> </object> </child> </object> @@ -234,7 +179,7 @@ <object class="GtkShortcutsShortcut"> <property name="visible">1</property> <property name="accelerator">&lt;primary&gt;h</property> - <property name="title" translatable="yes">Show chat history</property> + <property name="title" translatable="yes">Open search bar</property> </object> </child> </object> @@ -278,20 +223,6 @@ <property name="title" translatable="yes">Switch to the next unread tab</property> </object> </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">&lt;primary&gt;&lt;shift&gt;Page_Up</property> - <property name="title" translatable="yes">Move tab to the left</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">&lt;primary&gt;&lt;shift&gt;Page_Down</property> - <property name="title" translatable="yes">Move tab to the right</property> - </object> - </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property>

===================================== gajim/gtk/main.py ===================================== @@ -201,8 +201,6 @@ def _add_actions2(self): 'clear-chat', 'delete-line', 'close-tab', - 'move-tab-up', - 'move-tab-down', 'switch-next-tab', 'switch-prev-tab', 'switch-next-unread-tab-right' @@ -258,22 +256,6 @@ def _on_action(self, action, _param): self._chat_page.remove_chat(control.account, control.contact.jid) return None

- # if action == 'move-tab-up': - # old_position = self.notebook.get_current_page() - # self.notebook.reorder_child(control.widget, - # old_position - 1) - # return None - - # if action == 'move-tab-down': - # old_position = self.notebook.get_current_page() - # total_pages = self.notebook.get_n_pages() - # if old_position == total_pages - 1: - # self.notebook.reorder_child(control.widget, 0) - # else: - # self.notebook.reorder_child(control.widget, - # old_position + 1) - # return None - if action == 'switch-next-tab': self.select_next_chat(Direction.NEXT) return None

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9ed81ea6ced11e82e2a9c5ca6271db3f...