Philipp Hörist pushed to branch master at gajim / gajim

Commits:

3 changed files:

Changes:

  • gajim/common/config.py
    ... ... @@ -195,7 +195,7 @@ class Config:
    195 195
                     _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the contact list.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g. chats vs. group chats) is sent to a specific window.')],
    
    196 196
             'show_roster_on_startup':[opt_str, 'always', _('Show contact list window on startup.\n\'always\' - Always show contact list window.\n\'never\' - Never show contact list window.\n\'last_state\' - Restore last state of the contact list window.')],
    
    197 197
             'show_avatar_in_chat': [opt_bool, True, _('If enabled, Gajim displays the avatar in the chat window.')],
    
    198
    -        'escape_key_closes': [opt_bool, True, _('If enabled, pressing Esc closes a tab/window.')],
    
    198
    +        'escape_key_closes': [opt_bool, False, _('If enabled, pressing Esc closes a tab/window.')],
    
    199 199
             'hide_groupchat_banner': [opt_bool, False, _('Hides the banner in a group chat window.')],
    
    200 200
             'hide_chat_banner': [opt_bool, False, _('Hides the banner in a 1:1 chat window.')],
    
    201 201
             'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat participants list in a group chat window.')],
    

  • gajim/common/setting_values.py
    ... ... @@ -132,7 +132,7 @@ APP_SETTINGS = {
    132 132
         'one_message_window': 'always',
    
    133 133
         'show_roster_on_startup': 'always',
    
    134 134
         'show_avatar_in_chat': True,
    
    135
    -    'escape_key_closes': True,
    
    135
    +    'escape_key_closes': False,
    
    136 136
         'hide_groupchat_banner': False,
    
    137 137
         'hide_chat_banner': False,
    
    138 138
         'hide_groupchat_occupants_list': False,
    

  • gajim/data/gui/shortcuts_window.ui
    ... ... @@ -165,7 +165,7 @@
    165 165
                 <child>
    
    166 166
                   <object class="GtkShortcutsShortcut">
    
    167 167
                     <property name="visible">1</property>
    
    168
    -                <property name="accelerator">Escape &lt;ctrl&gt;w</property>
    
    168
    +                <property name="accelerator">&lt;ctrl&gt;w</property>
    
    169 169
                     <property name="title" translatable="yes">Close chat</property>
    
    170 170
                   </object>
    
    171 171
                 </child>