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

Commits: c65abca3 by wurstsalat at 2021-05-16T11:10:09+02:00 Remove obsolete settings

- - - - - 4b8462c0 by wurstsalat at 2021-05-16T11:23:45+02:00 Remove obosolete window size settings

- - - - -

3 changed files:

- gajim/common/config.py - gajim/common/setting_values.py - gajim/gtk/conversation/rows/message.py

Changes:

===================================== gajim/common/config.py ===================================== @@ -91,7 +91,6 @@ class Config: 'use_speller': [opt_bool, False, ], 'show_xhtml': [opt_bool, True, ], 'speller_language': [opt_str, '', _('Language used for spell checking.')], - 'print_time': [opt_str, 'always', _(''always' - print time for every message.\n'sometimes' - print time every print_ichat_every_foo_minutes minute.\n'never' - never print time.')], 'emoticons_theme': [opt_str, 'noto-emoticons', '', True], 'ascii_formatting': [opt_bool, True, _('Treat * / _ pairs as possible formatting characters.'), True], @@ -104,31 +103,15 @@ class Config: 'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-width': [opt_int, 500], 'msgwin-height': [opt_int, 440], - 'chat-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide - 'chat-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide - 'chat-msgwin-width': [opt_int, 480], - 'chat-msgwin-height': [opt_int, 440], - 'gc-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide - 'gc-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide - 'gc-msgwin-width': [opt_int, 600], - 'gc-msgwin-height': [opt_int, 440], - 'pm-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide - 'pm-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide - 'pm-msgwin-width': [opt_int, 480], - 'pm-msgwin-height': [opt_int, 440], 'save-roster-position': [opt_bool, True, _('If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.')], 'roster_x-position': [opt_int, 0], 'roster_y-position': [opt_int, 0], 'roster_width': [opt_int, 200], 'roster_height': [opt_int, 400], - 'roster_hpaned_position': [opt_int, 200], 'roster_on_the_right': [opt_bool, False, _('Place the contact list on the right in single window mode'), True], 'latest_disco_addresses': [opt_str, ''], 'time_stamp': [opt_str, '%x | %X ', _('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).')], - 'before_nickname': [opt_str, '', _('Characters that are printed before the nickname in conversations.')], - 'after_nickname': [opt_str, ':', _('Characters that are printed after the nickname in conversations.')], 'change_roster_title': [opt_bool, True, _('If enabled, Gajim will add * and [n] in contact list window title.')], - 'restore_lines': [opt_int, 10, _('Number of messages from chat history to be restored when a chat tab/window is reopened.')], 'restore_timeout': [opt_int, -1, _('How far back in time (minutes) chat history is restored. -1 means no limit.')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')], 'last_roster_visible': [opt_bool, True], @@ -139,7 +122,6 @@ class Config: 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], - 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message ('print_time'==sometimes), print it every x minutes.')], 'confirm_paste_image': [opt_bool, True, _('Ask before pasting an image.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat, group chat that will not be minimized).')], @@ -185,13 +167,11 @@ class Config: '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.')], 'chat_merge_consecutive_nickname': [opt_bool, False, _('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_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickname.')], 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl+Tab switches to the next composing tab when there are no tabs with messages pending.')], 'confirm_metacontacts': [opt_str, '', _('Show a confirmation dialog to create metacontacts? Empty string means never show the dialog.')], 'confirm_block': [opt_str, '', _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.')], 'enable_negative_priority': [opt_bool, False, _('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.')], 'show_contacts_number': [opt_bool, True, _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.')], - 'scroll_roster_to_last_message': [opt_bool, True, _('If enabled, Gajim will scroll and select the contact who sent you the last message, if the chat window is not already opened.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal:// aesgcm://', _('Valid URI schemes. Only schemes in this list will be accepted as 'real' URI (mailto and xmpp are handled separately).'), True],

===================================== gajim/common/setting_values.py ===================================== @@ -42,7 +42,6 @@ class _ACCOUNT_DEFAULT: 'use_speller': False, 'show_xhtml': True, 'speller_language': '', - 'print_time': 'always', 'emoticons_theme': 'noto-emoticons', 'ascii_formatting': True, 'show_ascii_formatting_chars': True, @@ -53,31 +52,15 @@ class _ACCOUNT_DEFAULT: 'msgwin-y-position': -1, 'msgwin-width': 500, 'msgwin-height': 440, - 'chat-msgwin-x-position': -1, - 'chat-msgwin-y-position': -1, - 'chat-msgwin-width': 480, - 'chat-msgwin-height': 440, - 'gc-msgwin-x-position': -1, - 'gc-msgwin-y-position': -1, - 'gc-msgwin-width': 600, - 'gc-msgwin-height': 440, - 'pm-msgwin-x-position': -1, - 'pm-msgwin-y-position': -1, - 'pm-msgwin-width': 480, - 'pm-msgwin-height': 440, 'save-roster-position': True, 'roster_x-position': 0, 'roster_y-position': 0, 'roster_width': 200, 'roster_height': 400, - 'roster_hpaned_position': 200, 'roster_on_the_right': False, 'latest_disco_addresses': '', 'time_stamp': '%x | %X ', - 'before_nickname': '', - 'after_nickname': ':', 'change_roster_title': True, - 'restore_lines': 10, 'restore_timeout': -1, 'send_on_ctrl_enter': False, 'last_roster_visible': True, @@ -87,7 +70,6 @@ class _ACCOUNT_DEFAULT: 'always_english_wikipedia': False, 'always_english_wiktionary': True, 'remote_control': False, - 'print_ichat_every_foo_minutes': 5, 'confirm_paste_image': True, 'confirm_close_muc': True, 'confirm_close_multiple_tabs': True, @@ -130,14 +112,12 @@ class _ACCOUNT_DEFAULT: 'hide_chat_banner': False, 'hide_groupchat_occupants_list': False, 'chat_merge_consecutive_nickname': False, - 'chat_merge_consecutive_nickname_indent': ' ', 'ctrl_tab_go_to_next_composing': True, 'metacontacts_enabled': True, 'confirm_metacontacts': '', 'confirm_block': '', 'enable_negative_priority': False, 'show_contacts_number': True, - 'scroll_roster_to_last_message': True, 'change_status_window_timeout': 15, 'max_conversation_lines': 500, 'shell_like_completion': False, @@ -397,7 +377,6 @@ class _ACCOUNT_DEFAULT: ADVANCED_SETTINGS = { 'app': { 'allow_hide_roster': _('Allow to hide the contact list window even if the notification area icon is not shown.'), - 'print_time': _(''always' - print time for every message.\n'sometimes' - print time every print_ichat_every_foo_minutes minute.\n'never' - never print time.'), '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.'), @@ -405,10 +384,7 @@ class _ACCOUNT_DEFAULT: 'roster_on_the_right': _('Place the contact list on the right in single window mode'), '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).'), 'chat_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', - 'before_nickname': _('Characters that are printed before the nickname in conversations.'), - 'after_nickname': _('Characters that are printed after the nickname in conversations.'), 'change_roster_title': _('If enabled, Gajim will add * and [n] in contact list window title.'), - 'restore_lines': _('Number of messages from chat history to be restored when a chat tab/window is reopened.'), 'restore_timeout': _('How far back in time (minutes) chat history is restored. -1 means no limit.'), 'send_on_ctrl_enter': _('Send message on Ctrl+Enter and make a new line with Enter.'), 'key_up_lines': _('How many lines to store for Ctrl+KeyUP (previously sent messages).'), @@ -417,7 +393,6 @@ class _ACCOUNT_DEFAULT: 'always_english_wikipedia': '', 'always_english_wiktionary': '', 'remote_control': _('If checked, Gajim can be controlled remotely using gajim-remote.'), - 'print_ichat_every_foo_minutes': _('When not printing time for every message ('print_time'==sometimes, print it every x minutes.'), 'confirm_paste_image': _('Ask before pasting an image.'), 'confirm_close_muc': _('Ask before closing a group chat tab/window.'), 'confirm_close_multiple_tabs': _('Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat, group chat that will not be minimized).'), @@ -445,13 +420,11 @@ class _ACCOUNT_DEFAULT: '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_indent': _('Indentation when using merge consecutive nickname.'), 'ctrl_tab_go_to_next_composing': _('Ctrl+Tab switches to the next composing tab when there are no tabs with messages pending.'), '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.'), 'show_contacts_number': _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.'), - 'scroll_roster_to_last_message': _('If enabled, Gajim will scroll and select the contact who sent you the last message, if the chat window is not already opened.'), 'change_status_window_timeout': _('Time of inactivity needed before the change status window closes down.'), '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.'),

===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -84,7 +84,6 @@ def __init__(self, timestamp_label = self.create_timestamp_widget(self.timestamp) timestamp_label.set_margin_start(6) self._meta_box.pack_end(timestamp_label, False, True, 0) - # TODO: implement app.settings.get('print_time') 'always', 'sometimes'?

if kind in ('incoming', 'incoming_queue', 'outgoing'): encryption_img = self._get_encryption_image(

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bdb1053719f01ff0e42687f0f5d5bcd8...