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

Commits:

2 changed files:

Changes:

  • gajim/common/setting_values.py
    ... ... @@ -100,12 +100,11 @@ class _ACCOUNT_DEFAULT:
    100 100 
         'hide_groupchat_banner': False,
    101 101 
         'hide_chat_banner': False,
    102 102 
         'hide_groupchat_occupants_list': False,
    103 
    -    'chat_merge_consecutive_nickname': False,
    103 
    +    'chat_merge_consecutive_nickname': True,
    104 104 
         'metacontacts_enabled': False,
    105 105 
         'confirm_metacontacts': '',
    106 106 
         'confirm_block': '',
    107 107 
         'enable_negative_priority': False,
    108 
    -    'max_conversation_lines': 500,
    109 108 
         'shell_like_completion': False,
    110 109 
         'audio_input_device': 'autoaudiosrc ! volume name=gajim_vol',
    111 110 
         'audio_output_device': 'autoaudiosink',
    ... ... @@ -393,11 +392,10 @@ class _ACCOUNT_DEFAULT:
    393 392 
             'hide_groupchat_banner': _('Hides the banner in a group chat window.'),
    394 393 
             'hide_chat_banner': _('Hides the banner in a 1:1 chat window.'),
    395 394 
             'hide_groupchat_occupants_list': _('Hides the group chat participants list in a group chat window.'),
    396 
    -        '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.'),
    395 
    +        '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.'),
    397 396 
             'confirm_metacontacts': _('Show a confirmation dialog to create metacontacts? Empty string means never show the dialog.'),
    398 397 
             'confirm_block': _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.'),
    399 398 
             '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.'),
    400 
    -        'max_conversation_lines': _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.'),
    401 399 
             'shell_like_completion': _('If enabled, completion in group chats will be like a shell auto-completion.'),
    402 400 
             '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.'),
    403 401 
             'stun_server': _('STUN server to use when using Jingle'),

  • gajim/gtk/conversation/view.py
    ... ... @@ -258,6 +258,9 @@ def _check_for_merge(self, message):
    258 258 
             if message.type != 'chat':
    259 259 
                 return
    260 260
    261 
    +        if not app.settings.get('chat_merge_consecutive_nickname'):
    262 
    +            return
    263 
    +
    261 264 
             ancestor = self._find_ancestor(message)
    262 265 
             if ancestor is None:
    263 266 
                 self._update_descendants(message)

    • —
    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.