Daniel Brötzmann pushed to branch master at gajim / gajim
Commits: 5ffba61d by wurstsalat at 2021-12-16T20:53:59+01:00 ChatList: Fix nick spacing
- - - - - d907f1b8 by wurstsalat at 2021-12-16T20:53:59+01:00 Notifications: Markup escape title and text
- - - - - e4e58e7c by wurstsalat at 2021-12-16T21:05:59+01:00 Settings: Remove show_ascii_formatting_chars
- - - - - c92f686e by wurstsalat at 2021-12-16T21:14:04+01:00 Settings: Remove opened_chat_controls account setting
- - - - - 699d7e6c by wurstsalat at 2021-12-16T21:18:00+01:00 Settings: Remove collapsed_rows
- - - - -
3 changed files:
- gajim/common/setting_values.py - gajim/gtk/chat_list.py - gajim/gtk/notification.py
Changes:
===================================== gajim/common/setting_values.py ===================================== @@ -32,7 +32,6 @@ class _ACCOUNT_DEFAULT: 'trayicon': 'always', 'allow_hide_roster': False, 'iconset': 'dcraven', - 'collapsed_rows': '', 'roster_theme': 'default', 'sort_by_show_in_roster': True, 'sort_by_show_in_muc': False, @@ -41,7 +40,6 @@ class _ACCOUNT_DEFAULT: 'speller_language': '', 'emoticons_theme': 'noto-emoticons', 'ascii_formatting': True, - 'show_ascii_formatting_chars': True, 'sounds_on': True, 'gc_refer_to_nick_char': ',', 'mainwin_x_position': 0, @@ -201,7 +199,6 @@ class _ACCOUNT_DEFAULT: 'roster_version': '', 'subscription_request_msg': '', 'ft_send_local_ips': True, - 'opened_chat_controls': '', 'recent_groupchats': '', 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', @@ -332,7 +329,6 @@ class _ACCOUNT_DEFAULT: 'app': { 'allow_hide_roster': _('Allow to hide the contact list window even if the notification area icon is not shown.'), 'ascii_formatting': _('Treat * / _ pairs as possible formatting characters.'), - 'show_ascii_formatting_chars': _('If enabled, do not remove */_ . So *abc* will be bold but with * * not removed.'), 'gc_refer_to_nick_char': _('Character to add after nickname when using nickname completion (tab) in group chat.'), 'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'), 'time_stamp': _('This option lets you customize the timestamp that is printed in conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'),
===================================== gajim/gtk/chat_list.py ===================================== @@ -581,7 +581,7 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, if line.contact_name == our_nick: self._ui.nick_label.set_text(_('Me:')) else: - self._ui.nick_label.set_text(_('%(muc_nick)s: ') % { + self._ui.nick_label.set_text(_('%(muc_nick)s:') % { 'muc_nick': line.contact_name}) self._ui.nick_label.show()
===================================== gajim/gtk/notification.py ===================================== @@ -206,6 +206,9 @@ def _issue_notification(self, if timeout < 0: timeout = app.settings.get('notification_timeout')
+ title = GLib.markup_escape_text(title) + text = GLib.markup_escape_text(text) + if sys.platform == 'win32': self._withdraw() self._win32_active_popup = PopupNotification(
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fea3b71a2ed85a25000e7d5d42fc81d6...