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

Commits:

4 changed files:

Changes:

  • gajim/data/gui/shortcuts_window.ui
    ... ... @@ -127,13 +127,6 @@
    127 127
                     <property name="title" translatable="yes">Scroll down</property>
    
    128 128
                   </object>
    
    129 129
                 </child>
    
    130
    -            <child>
    
    131
    -              <object class="GtkShortcutsShortcut">
    
    132
    -                <property name="visible">1</property>
    
    133
    -                <property name="accelerator">&lt;primary&gt;l</property>
    
    134
    -                <property name="title" translatable="yes">Clear chat window</property>
    
    135
    -              </object>
    
    136
    -            </child>
    
    137 130
                 <child>
    
    138 131
                   <object class="GtkShortcutsShortcut">
    
    139 132
                     <property name="visible">1</property>
    

  • gajim/data/other/shortcuts.json
    ... ... @@ -14,7 +14,6 @@
    14 14
         "win.send-file": ["<Primary>F"],
    
    15 15
         "win.show-contact-info": ["<Primary>I"],
    
    16 16
         "win.show-emoji-chooser": ["<Primary><Shift>M"],
    
    17
    -    "win.clear-chat": ["<Primary>L"],
    
    18 17
         "win.input-clear": ["<Primary>U"],
    
    19 18
         "win.close-tab": ["<Primary>W"],
    
    20 19
         "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:
    313 313
         def _connect_actions(self) -> None:
    
    314 314
             actions = [
    
    315 315
                 'add-to-roster',
    
    316
    -            'clear-chat',
    
    317 316
                 'invite-contacts',
    
    318 317
                 'send-file',
    
    319 318
                 'send-file-httpupload',
    
    ... ... @@ -364,7 +363,6 @@ def _update_base_actions(self, contact: ChatContactT) -> None:
    364 363
             app.window.get_action('input-italic').set_enabled(True)
    
    365 364
             app.window.get_action('input-strike').set_enabled(True)
    
    366 365
             app.window.get_action('input-clear').set_enabled(True)
    
    367
    -        app.window.get_action('clear-chat').set_enabled(True)
    
    368 366
     
    
    369 367
         def _update_chat_actions(self, contact: BareContact) -> None:
    
    370 368
             account = contact.account
    
    ... ... @@ -449,9 +447,6 @@ def _on_action(self,
    449 447
                     jid = contact.real_jid
    
    450 448
                 open_window('AddContact', account=account, jid=jid)
    
    451 449
     
    
    452
    -        elif action_name == 'clear-chat':
    
    453
    -            self._chat_control.reset_view()
    
    454
    -
    
    455 450
             elif action_name == 'show-contact-info':
    
    456 451
                 if isinstance(contact, GroupchatContact):
    
    457 452
                     open_window('GroupchatDetails', contact=contact)
    

  • gajim/gtk/const.py
    ... ... @@ -204,7 +204,6 @@ def __str__(self):
    204 204
         ('add-to-roster', None, True),
    
    205 205
         ('start-voice-call', None, False),
    
    206 206
         ('start-video-call', None, False),
    
    207
    -    ('clear-chat', None, False),
    
    208 207
         ('show-contact-info', None, False),
    
    209 208
         ('send-message', None, False),
    
    210 209
         ('muc-change-nickname', None, False),