refactor: Rename actions

Rename action which contain *-tab to *-chat

3 files changed, 48 insertions, 48 deletions

diff --git a/gajim/data/other/shortcuts.json b/gajim/data/other/shortcuts.json
index 73e33023e..22b135b45 100644
--- a/gajim/data/other/shortcuts.json
+++ b/gajim/data/other/shortcuts.json
@@ -14,20 +14,20 @@
     "win.show-contact-info": ["<Primary>I"],
     "win.show-emoji-chooser": ["<Primary><Shift>M"],
     "win.input-clear": ["<Primary>U"],
-    "win.close-tab": ["<Primary>W"],
-    "win.switch-next-tab": ["<Primary>Page_Down"],
-    "win.switch-prev-tab": ["<Primary>Page_Up"],
-    "win.switch-next-unread-tab": ["<Primary>Tab"],
-    "win.switch-prev-unread-tab": ["<Primary>ISO_Left_Tab"],
-    "win.switch-tab-1": ["<Alt>1", "<Alt>KP_1"],
-    "win.switch-tab-2": ["<Alt>2", "<Alt>KP_2"],
-    "win.switch-tab-3": ["<Alt>3", "<Alt>KP_3"],
-    "win.switch-tab-4": ["<Alt>4", "<Alt>KP_4"],
-    "win.switch-tab-5": ["<Alt>5", "<Alt>KP_5"],
-    "win.switch-tab-6": ["<Alt>6", "<Alt>KP_6"],
-    "win.switch-tab-7": ["<Alt>7", "<Alt>KP_7"],
-    "win.switch-tab-8": ["<Alt>8", "<Alt>KP_8"],
-    "win.switch-tab-9": ["<Alt>9", "<Alt>KP_9"],
+    "win.close-chat": ["<Primary>W"],
+    "win.switch-next-chat": ["<Primary>Page_Down"],
+    "win.switch-prev-chat": ["<Primary>Page_Up"],
+    "win.switch-next-unread-chat": ["<Primary>Tab"],
+    "win.switch-prev-unread-chat": ["<Primary>ISO_Left_Tab"],
+    "win.switch-chat-1": ["<Alt>1", "<Alt>KP_1"],
+    "win.switch-chat-2": ["<Alt>2", "<Alt>KP_2"],
+    "win.switch-chat-3": ["<Alt>3", "<Alt>KP_3"],
+    "win.switch-chat-4": ["<Alt>4", "<Alt>KP_4"],
+    "win.switch-chat-5": ["<Alt>5", "<Alt>KP_5"],
+    "win.switch-chat-6": ["<Alt>6", "<Alt>KP_6"],
+    "win.switch-chat-7": ["<Alt>7", "<Alt>KP_7"],
+    "win.switch-chat-8": ["<Alt>8", "<Alt>KP_8"],
+    "win.switch-chat-9": ["<Alt>9", "<Alt>KP_9"],
     "win.switch-workspace-1": ["<Primary>1", "<Primary>KP_1"],
     "win.switch-workspace-2": ["<Primary>2", "<Primary>KP_2"],
     "win.switch-workspace-3": ["<Primary>3", "<Primary>KP_3"],
diff --git a/gajim/gtk/const.py b/gajim/gtk/const.py
index 0ddedbc17..33800cdd1 100644
--- a/gajim/gtk/const.py
+++ b/gajim/gtk/const.py
@@ -219,20 +219,20 @@ MAIN_WIN_ACTIONS = [
     ('change-nickname', None, True),
     ('change-subject', None, True),
     ('escape', None, True),
-    ('close-tab', None, True),
-    ('switch-next-tab', None, True),
-    ('switch-prev-tab', None, True),
-    ('switch-next-unread-tab', None, True),
-    ('switch-prev-unread-tab', None, True),
-    ('switch-tab-1', None, True),
-    ('switch-tab-2', None, True),
-    ('switch-tab-3', None, True),
-    ('switch-tab-4', None, True),
-    ('switch-tab-5', None, True),
-    ('switch-tab-6', None, True),
-    ('switch-tab-7', None, True),
-    ('switch-tab-8', None, True),
-    ('switch-tab-9', None, True),
+    ('close-chat', None, True),
+    ('switch-next-chat', None, True),
+    ('switch-prev-chat', None, True),
+    ('switch-next-unread-chat', None, True),
+    ('switch-prev-unread-chat', None, True),
+    ('switch-chat-1', None, True),
+    ('switch-chat-2', None, True),
+    ('switch-chat-3', None, True),
+    ('switch-chat-4', None, True),
+    ('switch-chat-5', None, True),
+    ('switch-chat-6', None, True),
+    ('switch-chat-7', None, True),
+    ('switch-chat-8', None, True),
+    ('switch-chat-9', None, True),
     ('switch-workspace-1', None, True),
     ('switch-workspace-2', None, True),
     ('switch-workspace-3', None, True),
diff --git a/gajim/gtk/main.py b/gajim/gtk/main.py
index 48d74bf4a..f23bac73e 100644
--- a/gajim/gtk/main.py
+++ b/gajim/gtk/main.py
@@ -340,20 +340,20 @@ class MainWindow(Gtk.ApplicationWindow, EventHelper):
             ('change-nickname', self._on_action),
             ('change-subject', self._on_action),
             ('escape', self._on_action),
-            ('close-tab', self._on_action),
-            ('switch-next-tab', self._on_action),
-            ('switch-prev-tab', self._on_action),
-            ('switch-next-unread-tab', self._on_action),
-            ('switch-prev-unread-tab', self._on_action),
-            ('switch-tab-1', self._on_action),
-            ('switch-tab-2', self._on_action),
-            ('switch-tab-3', self._on_action),
-            ('switch-tab-4', self._on_action),
-            ('switch-tab-5', self._on_action),
-            ('switch-tab-6', self._on_action),
-            ('switch-tab-7', self._on_action),
-            ('switch-tab-8', self._on_action),
-            ('switch-tab-9', self._on_action),
+            ('close-chat', self._on_action),
+            ('switch-next-chat', self._on_action),
+            ('switch-prev-chat', self._on_action),
+            ('switch-next-unread-chat', self._on_action),
+            ('switch-prev-unread-chat', self._on_action),
+            ('switch-chat-1', self._on_action),
+            ('switch-chat-2', self._on_action),
+            ('switch-chat-3', self._on_action),
+            ('switch-chat-4', self._on_action),
+            ('switch-chat-5', self._on_action),
+            ('switch-chat-6', self._on_action),
+            ('switch-chat-7', self._on_action),
+            ('switch-chat-8', self._on_action),
+            ('switch-chat-9', self._on_action),
             ('switch-workspace-1', self._on_action),
             ('switch-workspace-2', self._on_action),
             ('switch-workspace-3', self._on_action),
@@ -409,24 +409,24 @@ class MainWindow(Gtk.ApplicationWindow, EventHelper):
                                                 control.contact.jid)
                     return None
 
-            elif action_name == 'close-tab':
+            elif action_name == 'close-chat':
                 self._chat_page.remove_chat(control.contact.account,
                                             control.contact.jid)
                 return None
 
-        if action_name == 'switch-next-tab':
+        if action_name == 'switch-next-chat':
             self.select_next_chat(Direction.NEXT)
 
-        elif action_name == 'switch-prev-tab':
+        elif action_name == 'switch-prev-chat':
             self.select_next_chat(Direction.PREV)
 
-        elif action_name == 'switch-next-unread-tab':
+        elif action_name == 'switch-next-unread-chat':
             self.select_next_chat(Direction.NEXT, unread_first=True)
 
-        elif action_name == 'switch-prev-unread-tab':
+        elif action_name == 'switch-prev-unread-chat':
             self.select_next_chat(Direction.PREV, unread_first=True)
 
-        elif action_name.startswith('switch-tab-'):
+        elif action_name.startswith('switch-chat-'):
             number = int(action_name[-1]) - 1
             self.select_chat_number(number)