Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits: 5a27ffe7 by wurstsalat at 2021-09-05T19:44:20+02:00 ConversationView: Add back chat_merge_consecutive_nickname setting
- - - - - f7a5d2c7 by wurstsalat at 2021-09-05T19:45:25+02:00 Settings: Remove max_conversation_lines
- - - - -
2 changed files:
- gajim/common/setting_values.py - gajim/gtk/conversation/view.py
Changes:
===================================== gajim/common/setting_values.py ===================================== @@ -100,12 +100,11 @@ class _ACCOUNT_DEFAULT: 'hide_groupchat_banner': False, 'hide_chat_banner': False, 'hide_groupchat_occupants_list': False, - 'chat_merge_consecutive_nickname': False, + 'chat_merge_consecutive_nickname': True, 'metacontacts_enabled': False, 'confirm_metacontacts': '', 'confirm_block': '', 'enable_negative_priority': False, - 'max_conversation_lines': 500, 'shell_like_completion': False, 'audio_input_device': 'autoaudiosrc ! volume name=gajim_vol', 'audio_output_device': 'autoaudiosink', @@ -393,11 +392,10 @@ class _ACCOUNT_DEFAULT: 'hide_groupchat_banner': _('Hides the banner in a group chat window.'), 'hide_chat_banner': _('Hides the banner in a 1:1 chat window.'), 'hide_groupchat_occupants_list': _('Hides the group chat participants list in a group chat window.'), - 'chat_merge_consecutive_nickname': _('In a chat, show the nickname at the beginning of a line only when it's not the same person talking as in the previous message.'), + 'chat_merge_consecutive_nickname': _('Show message meta data (avatar, nickname, timestamp) only once, if there are multiple messages from the same sender within a specific timespan.'), 'confirm_metacontacts': _('Show a confirmation dialog to create metacontacts? Empty string means never show the dialog.'), 'confirm_block': _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.'), 'enable_negative_priority': _('If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.'), - 'max_conversation_lines': _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.'), 'shell_like_completion': _('If enabled, completion in group chats will be like a shell auto-completion.'), 'use_stun_server': _('If enabled, Gajim will try to use a STUN server when using Jingle. The one in 'stun_server' option, or the one given by the XMPP server.'), 'stun_server': _('STUN server to use when using Jingle'),
===================================== gajim/gtk/conversation/view.py ===================================== @@ -258,6 +258,9 @@ def _check_for_merge(self, message): if message.type != 'chat': return
+ if not app.settings.get('chat_merge_consecutive_nickname'): + return + ancestor = self._find_ancestor(message) if ancestor is None: self._update_descendants(message)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ef2ba3eccd94ebe8b40211ed266b1788...