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

Commits:

3 changed files:

Changes:

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

  • gajim/data/gui/shortcuts_window.ui
    ... ... @@ -45,13 +45,6 @@
    45 45 
                     <property name="title" translatable="yes">File transfers</property>
    46 46 
                   </object>
    47 47 
                 </child>
    48 
    -            <child>
    49 
    -              <object class="GtkShortcutsShortcut">
    50 
    -                <property name="visible">1</property>
    51 
    -                <property name="accelerator">&lt;primary&gt;s</property>
    52 
    -                <property name="title" translatable="yes">Set the status message</property>
    53 
    -              </object>
    54 
    -            </child>
    55 48 
                 <child>
    56 49 
                   <object class="GtkShortcutsShortcut">
    57 50 
                     <property name="visible">1</property>
    ... ... @@ -68,40 +61,6 @@
    68 61 
                 </child>
    69 62 
               </object>
    70 63 
             </child>
    71 
    -        <child>
    72 
    -          <object class="GtkShortcutsGroup">
    73 
    -            <property name="visible">1</property>
    74 
    -            <property name="title" translatable="yes">Appearance</property>
    75 
    -            <child>
    76 
    -              <object class="GtkShortcutsShortcut">
    77 
    -                <property name="visible">1</property>
    78 
    -                <property name="accelerator">&lt;primary&gt;o</property>
    79 
    -                <property name="title" translatable="yes">Show offline contacts</property>
    80 
    -              </object>
    81 
    -            </child>
    82 
    -            <child>
    83 
    -              <object class="GtkShortcutsShortcut">
    84 
    -                <property name="visible">1</property>
    85 
    -                <property name="accelerator">&lt;primary&gt;y</property>
    86 
    -                <property name="title" translatable="yes">Show only active contacts</property>
    87 
    -              </object>
    88 
    -            </child>
    89 
    -            <child>
    90 
    -              <object class="GtkShortcutsShortcut">
    91 
    -                <property name="visible">1</property>
    92 
    -                <property name="accelerator">&lt;primary&gt;k</property>
    93 
    -                <property name="title" translatable="yes">Enable contact list filtering</property>
    94 
    -              </object>
    95 
    -            </child>
    96 
    -            <child>
    97 
    -              <object class="GtkShortcutsShortcut">
    98 
    -                <property name="visible">1</property>
    99 
    -                <property name="accelerator">&lt;primary&gt;r</property>
    100 
    -                <property name="title" translatable="yes">Show / hide contact list</property>
    101 
    -              </object>
    102 
    -            </child>
    103 
    -          </object>
    104 
    -        </child>
    105 64 
             <child>
    106 65 
               <object class="GtkShortcutsGroup">
    107 66 
                 <property name="visible">1</property>
    ... ... @@ -113,20 +72,6 @@
    113 72 
                     <property name="title" translatable="yes">Contact information</property>
    114 73 
                   </object>
    115 74 
                 </child>
    116 
    -            <child>
    117 
    -              <object class="GtkShortcutsShortcut">
    118 
    -                <property name="visible">1</property>
    119 
    -                <property name="accelerator">F2</property>
    120 
    -                <property name="title" translatable="yes">Rename contact</property>
    121 
    -              </object>
    122 
    -            </child>
    123 
    -            <child>
    124 
    -              <object class="GtkShortcutsShortcut">
    125 
    -                <property name="visible">1</property>
    126 
    -                <property name="accelerator">Delete</property>
    127 
    -                <property name="title" translatable="yes">Delete contact</property>
    128 
    -              </object>
    129 
    -            </child>
    130 75 
               </object>
    131 76 
             </child>
    132 77 
           </object>
    ... ... @@ -234,7 +179,7 @@
    234 179 
                   <object class="GtkShortcutsShortcut">
    235 180 
                     <property name="visible">1</property>
    236 181 
                     <property name="accelerator">&lt;primary&gt;h</property>
    237 
    -                <property name="title" translatable="yes">Show chat history</property>
    182 
    +                <property name="title" translatable="yes">Open search bar</property>
    238 183 
                   </object>
    239 184 
                 </child>
    240 185 
               </object>
    ... ... @@ -278,20 +223,6 @@
    278 223 
                     <property name="title" translatable="yes">Switch to the next unread tab</property>
    279 224 
                   </object>
    280 225 
                 </child>
    281 
    -            <child>
    282 
    -              <object class="GtkShortcutsShortcut">
    283 
    -                <property name="visible">1</property>
    284 
    -                <property name="accelerator">&lt;primary&gt;&lt;shift&gt;Page_Up</property>
    285 
    -                <property name="title" translatable="yes">Move tab to the left</property>
    286 
    -              </object>
    287 
    -            </child>
    288 
    -            <child>
    289 
    -              <object class="GtkShortcutsShortcut">
    290 
    -                <property name="visible">1</property>
    291 
    -                <property name="accelerator">&lt;primary&gt;&lt;shift&gt;Page_Down</property>
    292 
    -                <property name="title" translatable="yes">Move tab to the right</property>
    293 
    -              </object>
    294 
    -            </child>
    295 226 
                 <child>
    296 227 
                   <object class="GtkShortcutsShortcut">
    297 228 
                     <property name="visible">1</property>

  • gajim/gtk/main.py
    ... ... @@ -201,8 +201,6 @@ def _add_actions2(self):
    201 201 
                 'clear-chat',
    202 202 
                 'delete-line',
    203 203 
                 'close-tab',
    204 
    -            'move-tab-up',
    205 
    -            'move-tab-down',
    206 204 
                 'switch-next-tab',
    207 205 
                 'switch-prev-tab',
    208 206 
                 'switch-next-unread-tab-right'
    ... ... @@ -258,22 +256,6 @@ def _on_action(self, action, _param):
    258 256 
                 self._chat_page.remove_chat(control.account, control.contact.jid)
    259 257 
                 return None
    260 258
    261 
    -        # if action == 'move-tab-up':
    262 
    -        #     old_position = self.notebook.get_current_page()
    263 
    -        #     self.notebook.reorder_child(control.widget,
    264 
    -        #                                 old_position - 1)
    265 
    -        #     return None
    266 
    -
    267 
    -        # if action == 'move-tab-down':
    268 
    -        #     old_position = self.notebook.get_current_page()
    269 
    -        #     total_pages = self.notebook.get_n_pages()
    270 
    -        #     if old_position == total_pages - 1:
    271 
    -        #         self.notebook.reorder_child(control.widget, 0)
    272 
    -        #     else:
    273 
    -        #         self.notebook.reorder_child(control.widget,
    274 
    -        #                                     old_position + 1)
    275 
    -        #     return None
    276 
    -
    277 259 
             if action == 'switch-next-tab':
    278 260 
                 self.select_next_chat(Direction.NEXT)
    279 261 
                 return None

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.