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

Commits: bd67cd00 by André Apitzsch at 2020-08-30T09:38:10+02:00 Don't close chat with escape key by default

Fixes #10180.

- - - - -

3 changed files:

- gajim/common/config.py - gajim/common/setting_values.py - gajim/data/gui/shortcuts_window.ui

Changes:

===================================== gajim/common/config.py ===================================== @@ -195,7 +195,7 @@ class Config: _('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.')], '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.')], 'show_avatar_in_chat': [opt_bool, True, _('If enabled, Gajim displays the avatar in the chat window.')], - 'escape_key_closes': [opt_bool, True, _('If enabled, pressing Esc closes a tab/window.')], + 'escape_key_closes': [opt_bool, False, _('If enabled, pressing Esc closes a tab/window.')], 'hide_groupchat_banner': [opt_bool, False, _('Hides the banner in a group chat window.')], 'hide_chat_banner': [opt_bool, False, _('Hides the banner in a 1:1 chat window.')], '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 = { 'one_message_window': 'always', 'show_roster_on_startup': 'always', 'show_avatar_in_chat': True, - 'escape_key_closes': True, + 'escape_key_closes': False, 'hide_groupchat_banner': False, 'hide_chat_banner': False, 'hide_groupchat_occupants_list': False,

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

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bd67cd00b5a1135d29271fa60a1f4ba97...