Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] GUI Menu Builder: Improve imports
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a550aba5 by wurstsalat at 2021-09-05T22:17:19+02:00 GUI Menu Builder: Improve imports - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -19,9 +19,9 @@ from gi.repository import GLib from gajim.common import app -from gajim.common import helpers from gajim.common.helpers import is_affiliation_change_allowed from gajim.common.helpers import is_role_change_allowed +from gajim.common.helpers import jid_is_blocked from gajim.common.i18n import _ from gajim.common.const import URIType from gajim.common.const import URIAction @@ -321,7 +321,7 @@ def get_conv_context_menu(account, uri): def get_roster_menu(account, jid, transport=False): - if helpers.jid_is_blocked(account, jid): + if jid_is_blocked(account, jid): block_label = _('Unblock') else: block_label = _('Block…') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a550aba5acb110526ed38efc744b5900… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a550aba5acb110526ed38efc744b5900… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: GroupChatSettings: Add description for print_status
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 433a6e88 by wurstsalat at 2021-09-05T20:05:02+02:00 GroupChatSettings: Add description for print_status - - - - - d9fd0b90 by wurstsalat at 2021-09-05T22:08:51+02:00 Roster: Improve Transport handling - - - - - 7 changed files: - gajim/common/modules/contacts.py - gajim/gtk/contact_info.py - gajim/gtk/groupchat_settings.py - gajim/gtk/roster.py - gajim/gtk/tooltips.py - gajim/gtkgui_helpers.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -280,6 +280,16 @@ def is_in_roster(self): item = self._module('Roster').get_item(self._jid) return item is not None + @property + def is_transport(self): + disco_info = app.storage.cache.get_last_disco_info(self._jid) + if disco_info is None: + return False + for identity in disco_info.identities: + if identity.category == 'gateway': + return True + return False + @property def ask(self): return self._get_roster_attr('ask') ===================================== gajim/gtk/contact_info.py ===================================== @@ -78,8 +78,12 @@ def __init__(self, account, contact, page=None): if contact.is_in_roster: self._ui.edit_name_button.show() - self._fill_settings_page() self._fill_groups_page() + if contact.is_transport: + side_bar_switcher.hide_row('settings') + side_bar_switcher.hide_row('devices') + else: + self._fill_settings_page() else: side_bar_switcher.hide_row('settings') side_bar_switcher.hide_row('groups') ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -47,7 +47,8 @@ def __init__(self, account, jid): Setting(SettingKind.SWITCH, _('Show Status Changes'), SettingType.GROUP_CHAT, - 'print_status'), + 'print_status', + desc=_('For example: "Julia is now online"')), Setting(SettingKind.SWITCH, _('Notify on all Messages'), ===================================== gajim/gtk/roster.py ===================================== @@ -19,7 +19,10 @@ from gajim.gui_menu_builder import get_roster_menu +from .dialogs import ConfirmationDialog +from .dialogs import DialogButton from .tooltips import RosterTooltip +from .service_registration import ServiceRegistration from .util import EventHelper from .util import get_builder @@ -111,6 +114,7 @@ def __init__(self, account): def _add_actions(self): actions = [ ('contact-info', self._on_contact_info), + ('modify-transport', self._on_modify_transport), ('execute-command', self._on_execute_command), ('block-contact', self._on_block_contact), ('remove-contact', self._on_remove_contact), @@ -135,6 +139,8 @@ def update_actions(self): app.window.lookup_action( f'contact-info-{self._account}').set_enabled(online) + app.window.lookup_action( + f'modify-transport-{self._account}').set_enabled(online) app.window.lookup_action( f'execute-command-{self._account}').set_enabled(online) app.window.lookup_action( @@ -146,6 +152,7 @@ def update_actions(self): def _remove_actions(self): actions = [ 'contact-info', + 'modify-transport', 'execute-command', 'block-contact', 'remove-contact', @@ -258,6 +265,9 @@ def _on_show_offline(self, action, param): def _on_contact_info(self, _action, param): app.window.contact_info(self._account, param.get_string()) + def _on_modify_transport(self, _action, param): + ServiceRegistration(self._account, param.get_string()) + def _on_execute_command(self, _action, param): app.window.execute_command(self._account, param.get_string()) @@ -265,7 +275,37 @@ def _on_block_contact(self, _action, param): app.window.block_contact(self._account, param.get_string()) def _on_remove_contact(self, _action, param): - app.window.remove_contact(self._account, param.get_string()) + jid = param.get_string() + selected_contact = self._client.get_module('Contacts').get_contact(jid) + if selected_contact.is_transport: + # Check for transport users in roster and warn about removing the + # transport if there are any + has_transport_contacts = False + for contact in self._client.get_module('Roster').iter_contacts(): + if contact.jid.domain == selected_contact.jid.domain: + has_transport_contacts = True + break + if has_transport_contacts: + def _on_remove(): + self._client.get_module('Gateway').unsubscribe( + selected_contact.jid) + app.window.remove_contact(self._account, jid) + + ConfirmationDialog( + _('Remove Transport'), + _('Transport \'%s\' will be ' + 'removed') % selected_contact.name, + _('You will no longer be able to send and receive ' + 'messages from and to contacts using this transport.'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + callback=_on_remove)], + transient_for=app.window).show() + else: + _on_remove() + return + + app.window.remove_contact(self._account, jid) def _on_roster_row_activated(self, _treeview, path, _column): path = self._modelfilter.convert_path_to_child_path(path) @@ -305,7 +345,9 @@ def _on_focus_out(treeview, _param): treeview.get_selection().unselect_all() def _show_contact_menu(self, jid, treeview, event): - menu = get_roster_menu(self._account, jid) + contact = self._client.get_module('Contacts').get_contact(jid) + menu = get_roster_menu( + self._account, jid, transport=contact.is_transport) rectangle = Gdk.Rectangle() rectangle.x = event.x @@ -379,6 +421,7 @@ def _initial_draw(self): def _connect_contact_signals(self, contact): contact.connect('presence-update', self._on_contact_update) + contact.connect('caps-update', self._on_contact_update) contact.connect('avatar-update', self._on_contact_update) contact.connect('blocking-update', self._on_contact_update) @@ -531,7 +574,9 @@ def _draw_contact_row(self, ref, contact): self._store[iter_][Column.TEXT] = name surface = contact.get_avatar( - AvatarSize.ROSTER, self.get_scale_factor()) + AvatarSize.ROSTER, + self.get_scale_factor(), + add_show=bool(not contact.is_transport)) self._store[iter_][Column.AVATAR] = surface def _get_total_user_count(self): ===================================== gajim/gtk/tooltips.py ===================================== @@ -152,7 +152,10 @@ def _populate_grid(self, contact): scale = self._ui.tooltip_grid.get_scale_factor() # Avatar - surface = contact.get_avatar(AvatarSize.TOOLTIP, scale) + surface = contact.get_avatar( + AvatarSize.TOOLTIP, + scale, + add_show=bool(not contact.is_transport)) self._ui.avatar.set_from_surface(surface) self._ui.avatar.show() ===================================== gajim/gtkgui_helpers.py ===================================== @@ -122,8 +122,6 @@ def get_possible_button_event(event): # BUTTON_PRESS event, so pass event.button return event.button -def destroy_widget(widget): - widget.destroy() def scale_with_ratio(size, width, height): if height == width: ===================================== gajim/gui_menu_builder.py ===================================== @@ -25,94 +25,6 @@ from gajim.common.i18n import _ from gajim.common.const import URIType from gajim.common.const import URIAction -from gajim.gtkgui_helpers import destroy_widget - - -def get_transport_menu(contact, account): - # TODO: - roster = app.interface.roster - jid = contact.jid - - menu = Gtk.Menu() - - # Send single message - item = Gtk.MenuItem.new_with_mnemonic(_('Send Single _Message…')) - item.connect('activate', roster.on_send_single_message_menuitem_activate, - account, contact) - menu.append(item) - if app.account_is_disconnected(account): - item.set_sensitive(False) - - blocked = False - if helpers.jid_is_blocked(account, jid): - blocked = True - - item = Gtk.SeparatorMenuItem.new() - menu.append(item) - - # Execute Command - item = Gtk.MenuItem.new_with_mnemonic(_('E_xecute Command…')) - menu.append(item) - item.connect('activate', roster.on_execute_command, contact, account, - contact.resource) - if app.account_is_disconnected(account): - item.set_sensitive(False) - - # Manage Transport submenu - item = Gtk.MenuItem.new_with_mnemonic(_('_Manage Transport')) - manage_transport_submenu = Gtk.Menu() - item.set_submenu(manage_transport_submenu) - menu.append(item) - - # Modify Transport - item = Gtk.MenuItem.new_with_mnemonic(_('_Modify Transport')) - manage_transport_submenu.append(item) - item.connect('activate', roster.on_edit_agent, contact, account) - if app.account_is_disconnected(account): - item.set_sensitive(False) - - # Rename - item = Gtk.MenuItem.new_with_mnemonic(_('_Rename…')) - manage_transport_submenu.append(item) - item.connect('activate', roster.on_rename, 'agent', jid, account) - if app.account_is_disconnected(account): - item.set_sensitive(False) - - item = Gtk.SeparatorMenuItem.new() - manage_transport_submenu.append(item) - - # Block - if blocked: - item = Gtk.MenuItem.new_with_mnemonic(_('_Unblock')) - item.connect('activate', roster.on_unblock, [(contact, account)]) - else: - item = Gtk.MenuItem.new_with_mnemonic(_('_Block')) - item.connect('activate', roster.on_block, [(contact, account)]) - - manage_transport_submenu.append(item) - if app.account_is_disconnected(account): - item.set_sensitive(False) - - # Remove - item = Gtk.MenuItem.new_with_mnemonic(_('Remo_ve')) - manage_transport_submenu.append(item) - item.connect('activate', roster.on_remove_agent, [(contact, account)]) - if app.account_is_disconnected(account): - item.set_sensitive(False) - - item = Gtk.SeparatorMenuItem.new() - menu.append(item) - - # Information - information_menuitem = Gtk.MenuItem.new_with_mnemonic(_('_Information')) - menu.append(information_menuitem) - information_menuitem.connect('activate', roster.on_info, contact, account) - if app.account_is_disconnected(account): - information_menuitem.set_sensitive(False) - - menu.connect('selection-done', destroy_widget) - menu.show_all() - return menu def get_singlechat_menu(control_id, account, jid, type_): @@ -408,7 +320,7 @@ def get_conv_context_menu(account, uri): return menu -def get_roster_menu(account, jid): +def get_roster_menu(account, jid, transport=False): if helpers.jid_is_blocked(account, jid): block_label = _('Unblock') else: @@ -419,6 +331,8 @@ def get_roster_menu(account, jid): ('block-contact', block_label), ('remove-contact', _('Remove…')), ] + if transport: + menu_items.insert(1, ('modify-transport', _('Modify Transport…'))) menu = Gio.Menu() for item in menu_items: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f7a5d2c7fc5b42c48fbcf9e8718bdbd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f7a5d2c7fc5b42c48fbcf9e8718bdbd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ConversationView: Add back chat_merge_consecutive_nickname setting
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

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/ef2ba3eccd94ebe8b40211ed266b178… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ef2ba3eccd94ebe8b40211ed266b178… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Settings: Remove remember_opened_chat_controls
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e483fb7c by wurstsalat at 2021-09-05T18:17:06+02:00 Settings: Remove remember_opened_chat_controls - - - - - b5a186a0 by wurstsalat at 2021-09-05T18:18:08+02:00 Settings: Remove show_contacts_number - - - - - ef2ba3ec by wurstsalat at 2021-09-05T18:24:37+02:00 Settings: Remove ctrl_tab_go_to_next_composing - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -101,12 +101,10 @@ class _ACCOUNT_DEFAULT: 'hide_chat_banner': False, 'hide_groupchat_occupants_list': False, 'chat_merge_consecutive_nickname': False, - 'ctrl_tab_go_to_next_composing': True, 'metacontacts_enabled': False, 'confirm_metacontacts': '', 'confirm_block': '', 'enable_negative_priority': False, - 'show_contacts_number': True, 'max_conversation_lines': 500, 'shell_like_completion': False, 'audio_input_device': 'autoaudiosrc ! volume name=gajim_vol', @@ -121,7 +119,6 @@ class _ACCOUNT_DEFAULT: 'stun_server': '', 'global_proxy': '', 'ignore_incoming_attention': False, - 'remember_opened_chat_controls': True, 'positive_184_ack': False, 'use_keyring': True, 'remote_commands': False, @@ -397,17 +394,14 @@ 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.'), - '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.'), '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'), 'ignore_incoming_attention': _('If enabled, Gajim will ignore incoming attention requests (\'wizz\').'), - 'remember_opened_chat_controls': _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.'), 'remote_commands': _('If enabled, Gajim will execute XEP-0146 Commands.'), 'muclumbus_api_jid': '', 'muclumbus_api_http_uri': '', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/aca765b762aa42fb392cfffc9fbfb5b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/aca765b762aa42fb392cfffc9fbfb5b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Settings: Remove 'Show chatstate in tabs'
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: aca765b7 by wurstsalat at 2021-09-05T18:15:24+02:00 Settings: Remove 'Show chatstate in tabs' - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -129,7 +129,6 @@ class _ACCOUNT_DEFAULT: 'gc_sync_threshold_public_default': 1, 'gc_sync_threshold_private_default': 0, 'show_subject_on_join': True, - 'show_chatstate_in_tabs': True, 'show_chatstate_in_banner': True, 'muclumbus_api_jid': 'api(a)search.jabber.network', 'muclumbus_api_http_uri': 'https://search.jabber.network/api/1.0/search', ===================================== gajim/gtk/preferences.py ===================================== @@ -279,13 +279,6 @@ def __init__(self, *args): 'print_status_in_chats', desc=_('For example: "Julia is now online"')), - Setting(SettingKind.SWITCH, - _('Show Chat State In Tabs'), - SettingType.CONFIG, - 'show_chatstate_in_tabs', - desc=_('Show the contact’s chat state (e.g. typing) in ' - 'the chat’s tab')), - Setting(SettingKind.SWITCH, _('Show Chat State In Banner'), SettingType.CONFIG, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aca765b762aa42fb392cfffc9fbfb5b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aca765b762aa42fb392cfffc9fbfb5b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Settings: Remove Tab related settings
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 028a15ab by wurstsalat at 2021-09-05T17:48:24+02:00 Settings: Remove Tab related settings - - - - - 2d61f617 by wurstsalat at 2021-09-05T18:00:30+02:00 Preferences: Improve status settings (and naming) - - - - - 601bcc58 by wurstsalat at 2021-09-05T18:01:26+02:00 Disable Metacontacts by default - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -80,9 +80,6 @@ class _ACCOUNT_DEFAULT: 'last_save_dir': '', 'last_send_dir': '', 'last_sounds_dir': '', - 'tabs_always_visible': False, - 'tabs_border': False, - 'tabs_close_button': True, 'notification_preview_message': True, 'notification_position_x': -1, 'notification_position_y': -1, @@ -105,7 +102,7 @@ class _ACCOUNT_DEFAULT: 'hide_groupchat_occupants_list': False, 'chat_merge_consecutive_nickname': False, 'ctrl_tab_go_to_next_composing': True, - 'metacontacts_enabled': True, + 'metacontacts_enabled': False, 'confirm_metacontacts': '', 'confirm_block': '', 'enable_negative_priority': False, @@ -385,9 +382,6 @@ class _ACCOUNT_DEFAULT: 'use_kib_mib': _('IEC standard says KiB = 1024 bytes, KB = 1000 bytes.'), 'notify_on_all_muc_messages': '', 'trayicon_notification_on_events': _('Notify of events in the notification area.'), - 'tabs_always_visible': _('Show tab when only one conversation?'), - 'tabs_border': _('Show tabbed notebook border in chat windows?'), - 'tabs_close_button': _('Show close button in tab?'), 'notification_preview_message': _('Preview new messages in notification popup?'), 'muc_highlight_words': _('A list of words (semicolon separated) that will be highlighted in group chats.'), 'hide_on_main_window_x_button': _('If enabled, Gajim hides the main window when pressing the X button instead of minimizing into the notification area.'), ===================================== gajim/gtk/preferences.py ===================================== @@ -195,23 +195,12 @@ def __init__(self, *args): # TODO: Evaluate settings (and connect them) settings = [ - Setting(SettingKind.SWITCH, - _('Enable Metacontacts'), - SettingType.CONFIG, - 'metacontacts_enabled'), - Setting(SettingKind.SWITCH, _('Show Avatars'), SettingType.CONFIG, 'show_avatars_in_roster', callback=self._on_show_avatar_in_roster_changed), - Setting(SettingKind.SWITCH, - _('Show Status Message'), - SettingType.CONFIG, - 'show_status_msgs_in_roster', - callback=self._on_show_status_in_roster), - Setting(SettingKind.SWITCH, _('Sort Contacts by Status'), SettingType.CONFIG, @@ -245,14 +234,6 @@ def __init__(self, *args): def _on_show_avatar_in_roster_changed(*args): app.interface.roster.setup_and_draw_roster() - @staticmethod - def _on_show_status_in_roster(*args): - app.interface.roster.setup_and_draw_roster() - - for ctrl in app.window.get_controls(): - if ctrl.is_groupchat: - ctrl.roster.draw_contacts() - @staticmethod def _on_sort_by_show_in_roster(*args): app.interface.roster.setup_and_draw_roster() @@ -293,9 +274,10 @@ def __init__(self, *args): 'show_send_message_button'), Setting(SettingKind.SWITCH, - _('Show Status Message'), + _('Show Status Changes'), SettingType.CONFIG, - 'print_status_in_chats'), + 'print_status_in_chats', + desc=_('For example: "Julia is now online"')), Setting(SettingKind.SWITCH, _('Show Chat State In Tabs'), @@ -336,30 +318,35 @@ class GroupChats(PreferenceBox): def __init__(self, *args): settings = [ + Setting(SettingKind.POPOVER, + _('Default Sync Threshold'), + SettingType.CONFIG, + 'gc_sync_threshold_public_default', + desc=_('Default for new public group chats'), + props={'entries': THRESHOLD_OPTIONS}), Setting(SettingKind.SWITCH, - _('Show Subject'), + _('Direct Messages'), SettingType.CONFIG, - 'show_subject_on_join'), + 'muc_prefer_direct_msg', + desc=_('Prefer direct messages in private group chats ')), Setting(SettingKind.SWITCH, - _('Sort Contacts by Status'), + _('Sort Participant List by Status'), SettingType.CONFIG, 'sort_by_show_in_muc', callback=self._on_sort_by_show_in_muc), - Setting(SettingKind.POPOVER, - _('Default Sync Threshold'), + Setting(SettingKind.SWITCH, + _('Status Messages in Participants List'), SettingType.CONFIG, - 'gc_sync_threshold_public_default', - desc=_('Default for new public group chats'), - props={'entries': THRESHOLD_OPTIONS}), + 'show_status_msgs_in_roster', + callback=self._on_show_status_in_roster), Setting(SettingKind.SWITCH, - _('Direct Messages'), + _('Show Subject'), SettingType.CONFIG, - 'muc_prefer_direct_msg', - desc=_('Prefer direct messages in private group chats ')), + 'show_subject_on_join'), Setting(SettingKind.SWITCH, _('Show Joined / Left'), @@ -382,7 +369,6 @@ def __init__(self, *args): 'current default value'), 'button-style': 'destructive-action', 'button-callback': self._reset_print_status}), - ] PreferenceBox.__init__(self, settings) @@ -393,6 +379,12 @@ def _on_sort_by_show_in_muc(*args): if ctrl.is_groupchat: ctrl.roster.invalidate_sort() + @staticmethod + def _on_show_status_in_roster(*args): + for ctrl in app.window.get_controls(): + if ctrl.is_groupchat: + ctrl.roster.draw_contacts() + @staticmethod def _reset_join_left(button): button.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/21ad28cca70fbb18a06215f7a22d1cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/21ad28cca70fbb18a06215f7a22d1cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add back X button and taskbar behavior
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 21ad28cc by wurstsalat at 2021-09-05T17:17:50+02:00 Add back X button and taskbar behavior - - - - - 4 changed files: - gajim/common/setting_values.py - gajim/gtk/main.py - gajim/gtk/preferences.py - gajim/gtk/status_icon.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -53,6 +53,9 @@ class _ACCOUNT_DEFAULT: 'save_main_window_position': True, 'show_main_window_on_startup': 'always', 'last_main_window_visible': True, + 'quit_on_main_window_x_button': False, + 'hide_on_main_window_x_button': False, + 'main_window_skip_taskbar': False, 'roster_on_the_right': False, 'latest_disco_addresses': '', 'time_stamp': '%x | %X ', @@ -85,8 +88,6 @@ class _ACCOUNT_DEFAULT: 'notification_position_y': -1, 'muc_highlight_words': '', 'muc_prefer_direct_msg': True, - 'quit_on_roster_x_button': False, - 'hide_on_roster_x_button': False, 'show_status_msgs_in_roster': True, 'show_avatars_in_roster': True, 'show_mood_in_roster': True, @@ -96,7 +97,6 @@ class _ACCOUNT_DEFAULT: 'avatar_position_in_roster': 'right', 'print_status_in_chats': False, 'log_contact_status_changes': False, - 'roster_window_skip_taskbar': False, 'use_urgency_hint': True, 'notification_timeout': 5, 'escape_key_closes': False, @@ -390,13 +390,13 @@ class _ACCOUNT_DEFAULT: 'tabs_close_button': _('Show close button in tab?'), 'notification_preview_message': _('Preview new messages in notification popup?'), 'muc_highlight_words': _('A list of words (semicolon separated) that will be highlighted in group chats.'), - 'hide_on_roster_x_button': _('If enabled, Gajim hides the contact list window when pressing the X button instead of minimizing into the notification area.'), + 'hide_on_main_window_x_button': _('If enabled, Gajim hides the main window when pressing the X button instead of minimizing into the notification area.'), + 'main_window_skip_taskbar': _('Don’t show main window in the system taskbar.'), 'show_mood_in_roster': '', 'show_activity_in_roster': '', 'show_tunes_in_roster': '', 'show_location_in_roster': '', 'avatar_position_in_roster': _('Define the position of avatars in the contact list. Can be \'left\' or \'right\'.'), - 'roster_window_skip_taskbar': _('Don\'t show contact list window in the system taskbar.'), 'use_urgency_hint': _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.'), 'notification_timeout': '', 'escape_key_closes': _('If enabled, pressing Esc closes a tab/window.'), ===================================== gajim/gtk/main.py ===================================== @@ -1,4 +1,5 @@ import logging +import os from gi.repository import Gtk from gi.repository import Gdk @@ -18,6 +19,7 @@ from .main_stack import MainStack from .dialogs import DialogButton from .dialogs import ConfirmationDialog +from .dialogs import ConfirmationCheckDialog from .util import get_builder from .util import resize_window from .util import restore_main_window_position @@ -59,6 +61,7 @@ def __init__(self): self._ui.account_box.add(self._account_side_bar) self.connect('motion-notify-event', self._on_window_motion_notify) + self.connect('delete-event', self._on_window_delete) self._ui.connect_signals(self) @@ -90,6 +93,12 @@ def __init__(self): self._add_actions() self._add_actions2() + self._prepare_window() + + def _prepare_window(self): + if app.settings.get('main_window_skip_taskbar'): + self.set_property('skip-taskbar-hint', True) + restore_main_window_position() window_width = app.settings.get('mainwin_width') window_height = app.settings.get('mainwin_height') @@ -263,6 +272,36 @@ def _on_window_motion_notify(self, _widget, _event): client.get_module('Chatstate').set_mouse_activity( control.contact, control.msg_textview.has_text()) + def _on_window_delete(self, _widget, _event): + # Main window X button was clicked + if (not app.settings.get('quit_on_main_window_x_button') and + ((app.interface.systray_enabled and + app.settings.get('trayicon') != 'on_event') or + app.settings.get('allow_hide_roster'))): + save_main_window_position() + if (os.name == 'nt' or + app.settings.get('hide_on_main_window_x_button')): + self.hide() + else: + self.iconify() + elif app.settings.get('quit_on_main_window_x_button'): + self.quit() + else: + def _on_ok(is_checked): + if is_checked: + app.settings.set('quit_on_main_window_x_button', True) + self.quit() + ConfirmationCheckDialog( + _('Quit Gajim'), + _('You are about to quit Gajim'), + _('Are you sure you want to quit Gajim?'), + _('_Always quit when closing Gajim'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=_on_ok)]).show() + return True + def _set_startup_finished(self): self._startup_finished = True self._chat_page.set_startup_finished() ===================================== gajim/gtk/preferences.py ===================================== @@ -180,10 +180,10 @@ def __init__(self, *args): desc=_('Show window when starting Gajim')), Setting(SettingKind.SWITCH, - _('Quit on Close'), + _('Quit Gajim on Close'), SettingType.CONFIG, - 'quit_on_roster_x_button', - desc=_('Quit when closing contact list')), + 'quit_on_main_window_x_button', + desc=_('Quit when closing Gajim’s window')), ] PreferenceBox.__init__(self, settings) ===================================== gajim/gtk/status_icon.py ===================================== @@ -258,7 +258,7 @@ def _on_activate(self, *args): # Window was minimized restore_main_window_position() - if not app.settings.get('roster_window_skip_taskbar'): + if not app.settings.get('main_window_skip_taskbar'): app.window.set_property('skip-taskbar-hint', False) app.window.present_with_time(Gtk.get_current_event_time()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/21ad28cca70fbb18a06215f7a22d1cb1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/21ad28cca70fbb18a06215f7a22d1cb1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add back restoring window position, size, visibility
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ba694316 by wurstsalat at 2021-09-05T16:45:28+02:00 Add back restoring window position, size, visibility - - - - - 5 changed files: - gajim/common/setting_values.py - gajim/gtk/main.py - gajim/gtk/preferences.py - gajim/gtk/status_icon.py - gajim/gtk/util.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -46,23 +46,19 @@ class _ACCOUNT_DEFAULT: 'show_ascii_formatting_chars': True, 'sounds_on': True, 'gc_refer_to_nick_char': ',', - 'msgwin-max-state': False, - 'msgwin-x-position': -1, - 'msgwin-y-position': -1, - 'msgwin-width': 500, - 'msgwin-height': 440, - 'save-roster-position': True, - 'roster_x-position': 0, - 'roster_y-position': 0, - 'roster_width': 200, - 'roster_height': 400, + 'mainwin_x_position': 0, + 'mainwin_y_position': 0, + 'mainwin_width': 1000, + 'mainwin_height': 500, + 'save_main_window_position': True, + 'show_main_window_on_startup': 'always', + 'last_main_window_visible': True, 'roster_on_the_right': False, 'latest_disco_addresses': '', 'time_stamp': '%x | %X ', 'change_roster_title': True, 'restore_timeout': -1, 'send_on_ctrl_enter': False, - 'last_roster_visible': True, 'key_up_lines': 25, 'search_engine': 'https://duckduckgo.com/?q=%s', 'dictionary_url': 'WIKTIONARY', @@ -103,7 +99,6 @@ class _ACCOUNT_DEFAULT: 'roster_window_skip_taskbar': False, 'use_urgency_hint': True, 'notification_timeout': 5, - 'show_roster_on_startup': 'always', 'escape_key_closes': False, 'hide_groupchat_banner': False, 'hide_chat_banner': False, @@ -205,10 +200,6 @@ class _ACCOUNT_DEFAULT: 'file_transfer_proxies': '', 'use_ft_proxies': False, 'test_ft_proxies_on_startup': False, - 'msgwin-x-position': -1, - 'msgwin-y-position': -1, - 'msgwin-width': 480, - 'msgwin-height': 440, 'is_zeroconf': False, 'last_status': 'online', 'last_status_msg': '', @@ -373,7 +364,7 @@ class _ACCOUNT_DEFAULT: '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-roster-position': _('If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.'), + 'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'), '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', ===================================== gajim/gtk/main.py ===================================== @@ -11,15 +11,17 @@ from gajim.common.i18n import _ from gajim.common.nec import EventHelper -from gajim.gui.adhoc import AdHocCommand -from gajim.gui.account_side_bar import AccountSideBar -from gajim.gui.app_side_bar import AppSideBar -from gajim.gui.workspace_side_bar import WorkspaceSideBar -from gajim.gui.main_stack import MainStack -from gajim.gui.dialogs import DialogButton -from gajim.gui.dialogs import ConfirmationDialog -from gajim.gui.util import get_builder - +from .adhoc import AdHocCommand +from .account_side_bar import AccountSideBar +from .app_side_bar import AppSideBar +from .workspace_side_bar import WorkspaceSideBar +from .main_stack import MainStack +from .dialogs import DialogButton +from .dialogs import ConfirmationDialog +from .util import get_builder +from .util import resize_window +from .util import restore_main_window_position +from .util import save_main_window_position from .util import open_window log = logging.getLogger('gajim.gui.main') @@ -30,10 +32,8 @@ def __init__(self): Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) self.set_title('Gajim') self.set_default_icon_name('org.gajim.Gajim') - self.set_default_size(1000, 500) app.window = self @@ -89,7 +89,23 @@ def __init__(self): self._load_chats() self._add_actions() self._add_actions2() - self.show_all() + + restore_main_window_position() + window_width = app.settings.get('mainwin_width') + window_height = app.settings.get('mainwin_height') + resize_window(self, window_width, window_height) + + if app.settings.get('show_main_window_on_startup') == 'always': + self.show_all() + elif app.settings.get('show_main_window_on_startup') == 'never': + if app.settings.get('trayicon') != 'always': + # Without trayicon, we have to show the main window + self.show_all() + app.settings.set('last_main_window_visible', True) + else: + if (app.settings.get('last_main_window_visible') or + app.settings.get('trayicon') != 'always'): + self.show_all() def _on_account_enabled(self, event): self._account_side_bar.add_account(event.account) @@ -495,6 +511,14 @@ def quit(self): get_msg = True break + save_main_window_position() + window_width, window_height = self.get_size() + app.settings.set('mainwin_width', window_width) + app.settings.set('mainwin_height', window_height) + app.settings.set( + 'last_main_window_visible', self.get_property('visible')) + app.settings.save() + def on_continue2(message): if 'file_transfers' not in app.interface.instances: app.app.start_shutdown(message=message) ===================================== gajim/gtk/preferences.py ===================================== @@ -165,7 +165,7 @@ def __init__(self, settings): class WindowBehaviour(PreferenceBox): def __init__(self, *args): - roster_on_startup_items = { + main_window_on_startup_items = { 'always': _('Always'), 'never': _('Never'), 'last_state': _('Restore last state'), @@ -173,11 +173,11 @@ def __init__(self, *args): settings = [ Setting(SettingKind.POPOVER, - _('Contact List on Startup'), + _('Show Gajim on Startup'), SettingType.CONFIG, - 'show_roster_on_startup', - props={'entries': roster_on_startup_items}, - desc=_('Show contact list when starting Gajim')), + 'show_main_window_on_startup', + props={'entries': main_window_on_startup_items}, + desc=_('Show window when starting Gajim')), Setting(SettingKind.SWITCH, _('Quit on Close'), ===================================== gajim/gtk/status_icon.py ===================================== @@ -34,8 +34,8 @@ from .util import get_builder from .util import get_icon_name -from .util import save_roster_position -from .util import restore_roster_position +from .util import save_main_window_position +from .util import restore_main_window_position from .util import open_window HAS_INDICATOR = False @@ -249,14 +249,14 @@ def _on_activate(self, *args): return if app.window.get_property('has-toplevel-focus'): - save_roster_position(app.window) + save_main_window_position() app.window.hide() return app.window.show_all() if not app.window.get_property('visible'): # Window was minimized - restore_roster_position(app.window) + restore_main_window_position() if not app.settings.get('roster_window_skip_taskbar'): app.window.set_property('skip-taskbar-hint', False) @@ -268,7 +268,7 @@ def _handle_first_event(): if not event: return if not app.window.get_property('visible'): - restore_roster_position(app.window) + restore_main_window_position() app.interface.handle_event(account, jid, event.type_) @staticmethod ===================================== gajim/gtk/util.py ===================================== @@ -312,10 +312,9 @@ def resize_window(window: Gtk.Window, width: int, height: int) -> None: screen_w, screen_h = get_total_screen_geometry() if not width or not height: return - if width > screen_w: - width = screen_w - if height > screen_h: - height = screen_h + + width = min(width, screen_w) + height = min(height, screen_h) window.resize(abs(width), abs(height)) @@ -324,10 +323,9 @@ def move_window(window: Gtk.Window, pos_x: int, pos_y: int) -> None: Move the window, but also check if out of screen """ screen_w, screen_h = get_total_screen_geometry() - if pos_x < 0: - pos_x = 0 - if pos_y < 0: - pos_y = 0 + pos_x = max(pos_x, 0) + pos_y = max(pos_y, 0) + width, height = window.get_size() if pos_x + width > screen_w: pos_x = screen_w - width @@ -336,25 +334,25 @@ def move_window(window: Gtk.Window, pos_x: int, pos_y: int) -> None: window.move(pos_x, pos_y) -def save_roster_position(window): - if not app.settings.get('save-roster-position'): +def save_main_window_position() -> None: + if not app.settings.get('save_main_window_position'): return if app.is_display(Display.WAYLAND): return - x_pos, y_pos = window.get_position() - log.debug('Save roster position: %s %s', x_pos, y_pos) - app.settings.set('roster_x-position', x_pos) - app.settings.set('roster_y-position', y_pos) + x_pos, y_pos = app.window.get_position() + log.debug('Saving main window position: %s %s', x_pos, y_pos) + app.settings.set('mainwin_x_position', x_pos) + app.settings.set('mainwin_y_position', y_pos) -def restore_roster_position(window): - if not app.settings.get('save-roster-position'): +def restore_main_window_position() -> None: + if not app.settings.get('save_main_window_position'): return if app.is_display(Display.WAYLAND): return - move_window(window, - app.settings.get('roster_x-position'), - app.settings.get('roster_y-position')) + move_window(app.window, + app.settings.get('mainwin_x_position'), + app.settings.get('mainwin_y_position')) def get_completion_liststore(entry: Gtk.Entry) -> Gtk.ListStore: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ba6943163974af896c703ffc16f320f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ba6943163974af896c703ffc16f320f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Fix sending chatstates for window motion-notify-event
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 023ec7f5 by wurstsalat at 2021-09-05T13:20:59+02:00 Fix sending chatstates for window motion-notify-event - - - - - d64890fc by wurstsalat at 2021-09-05T13:46:47+02:00 Main: Fix chat window actions (close/switch tab) - - - - - 3 changed files: - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -181,7 +181,7 @@ def select_chat(self, account, jid): row = self._chats[(account, jid)] self.select_row(row) - def select_next_chat(self, forwards): + def select_next_chat(self, forwards, unread_first=False): # Selects the next chat, but prioritizes chats with unread messages. # Direction is forwards (True) or backwards (False) row = self.get_selected_chat() @@ -191,26 +191,28 @@ def select_next_chat(self, forwards): self.select_chat(row.account, row.jid) return - index = row.get_index() - current = index unread_found = False - # Loop until finding a chat with unread count or completing a cycle - while True: - if forwards: - index += 1 - if index >= len(self.get_children()): - index = 0 - else: - index -= 1 - if index < 0: - index = len(self.get_children()) - 1 + if unread_first: + index = row.get_index() + current = index + + # Loop until finding a chat with unread count or completing a cycle + while True: + if forwards: + index += 1 + if index >= len(self.get_children()): + index = 0 + else: + index -= 1 + if index < 0: + index = len(self.get_children()) - 1 - row = self.get_row_at_index(index) - if row.unread_count > 0: - unread_found = True - break - if index == current: - break + row = self.get_row_at_index(index) + if row.unread_count > 0: + unread_found = True + break + if index == current: + break if unread_found: self.select_chat(row.account, row.jid) @@ -232,6 +234,11 @@ def select_next_chat(self, forwards): self.select_chat(next_row.account, next_row.jid) + def select_chat_number(self, number): + row = self.get_row_at_index(number) + if row is not None: + self.select_chat(row.account, row.jid) + def toggle_chat_pinned(self, account, jid): row = self._chats[(account, jid)] row.toggle_pinned() ===================================== gajim/gtk/controls/base.py ===================================== @@ -54,7 +54,6 @@ from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.dialogs import DialogButton -from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import PastePreviewDialog from gajim.gui.message_input import MessageInputTextView from gajim.gui.util import get_hardware_key_codes @@ -242,11 +241,6 @@ def __init__(self, widget_name, account, jid): self._client.get_module('Chatstate').set_active(self.contact) - # TODO - # id_ = app.window.connect('motion-notify-event', - # self._on_window_motion_notify) - # self.handlers[id_] = app.window - self.encryption = self.get_encryption_state() self.conversation_view.encryption_enabled = self.encryption is not None @@ -831,7 +825,7 @@ def _on_message_textview_key_press_event(self, textview, event): if event.get_state() & Gdk.ModifierType.SHIFT_MASK: if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == Gdk.KEY_ISO_Left_Tab): - app.window.select_next_chat(False) + app.window.select_next_chat(False, unread_first=True) return True if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): @@ -840,7 +834,7 @@ def _on_message_textview_key_press_event(self, textview, event): if event.get_state() & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: - app.window.select_next_chat(True) + app.window.select_next_chat(True, unread_first=True) return True message_buffer = self.msg_textview.get_buffer() @@ -1043,17 +1037,6 @@ def send_message(self, message_buffer = self.msg_textview.get_buffer() message_buffer.set_text('') # clear message buffer (and tv of course) - def _on_window_motion_notify(self, *args): - """ - It gets called no matter if it is the active window or not - """ - # TODO: - return - if self.parent_win.get_active_jid() == self.contact.jid: - # if window is the active one, set last interaction - self._client.get_module('Chatstate').set_mouse_activity( - self.contact, self.msg_textview.has_text()) - def _on_message_tv_buffer_changed(self, textbuffer): has_text = self.msg_textview.has_text() app.window.lookup_action( ===================================== gajim/gtk/main.py ===================================== @@ -58,6 +58,8 @@ def __init__(self): self._account_side_bar = AccountSideBar() self._ui.account_box.add(self._account_side_bar) + self.connect('motion-notify-event', self._on_window_motion_notify) + self._ui.connect_signals(self) self.register_events([ @@ -190,13 +192,13 @@ def _on_action(self, action, _param): if action == 'escape': self._chat_page.hide_search() - # if action == 'escape' and app.settings.get('escape_key_closes'): - # self.remove_tab(control, self.CLOSE_ESC) - # return + if action == 'escape' and app.settings.get('escape_key_closes'): + self._chat_page.remove_chat(control.account, control.contact.jid) + return - # if action == 'close-tab': - # self.remove_tab(control, self.CLOSE_CTRL_KEY) - # return + if action == 'close-tab': + self._chat_page.remove_chat(control.account, control.contact.jid) + return # if action == 'move-tab-up': # old_position = self.notebook.get_current_page() @@ -214,32 +216,36 @@ def _on_action(self, action, _param): # old_position + 1) # return - # if action == 'switch-next-tab': - # new = self.notebook.get_current_page() + 1 - # if new >= self.notebook.get_n_pages(): - # new = 0 - # self.notebook.set_current_page(new) - # return + if action == 'switch-next-tab': + self.select_next_chat(True) + return - # if action == 'switch-prev-tab': - # new = self.notebook.get_current_page() - 1 - # if new < 0: - # new = self.notebook.get_n_pages() - 1 - # self.notebook.set_current_page(new) - # return + if action == 'switch-prev-tab': + self.select_next_chat(False) + return - # if action == 'switch-next-unread-tab-right': - # self.move_to_next_unread_tab(True) - # return + if action == 'switch-next-unread-tab-right': + self.select_next_chat(True, unread_first=True) + return - # if action == 'switch-next-unread-tab-left': - # self.move_to_next_unread_tab(False) - # return + if action == 'switch-next-unread-tab-left': + self.select_next_chat(False, unread_first=True) + return - # if action.startswith('switch-tab-'): - # number = int(action[-1]) - # self.notebook.set_current_page(number - 1) - # return + if action.startswith('switch-tab-'): + number = int(action[-1]) - 1 + self.select_chat_number(number) + return + + def _on_window_motion_notify(self, _widget, _event): + control = self.get_active_control() + if control is None: + return + + if self.get_property('has-toplevel-focus'): + client = app.get_client(control.account) + client.get_module('Chatstate').set_mouse_activity( + control.contact, control.msg_textview.has_text()) def _set_startup_finished(self): self._startup_finished = True @@ -339,11 +345,17 @@ def select_chat(self, account, jid): self._main_stack.show_chat_page() self._chat_page.select_chat(account, jid) - def select_next_chat(self, forwards): + def select_next_chat(self, forwards, unread_first=False): + chat_list_stack = self._chat_page.get_chat_list_stack() + chat_list = chat_list_stack.get_current_chat_list() + if chat_list is not None: + chat_list.select_next_chat(forwards, unread_first) + + def select_chat_number(self, number): chat_list_stack = self._chat_page.get_chat_list_stack() chat_list = chat_list_stack.get_current_chat_list() if chat_list is not None: - chat_list.select_next_chat(forwards) + chat_list.select_chat_number(number) @staticmethod def _add_to_roster(_action, param): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/76ff8ab14c1cbc0feaa3495f2c35b9c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/76ff8ab14c1cbc0feaa3495f2c35b9c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add back chat selection via Ctrl(+Shft)+Tab
by Daniel Brötzmann (＠wurstsalat) 05 Sep '21

05 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 76ff8ab1 by wurstsalat at 2021-09-05T12:47:35+02:00 Add back chat selection via Ctrl(+Shft)+Tab - - - - - 4 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -181,6 +181,57 @@ def select_chat(self, account, jid): row = self._chats[(account, jid)] self.select_row(row) + def select_next_chat(self, forwards): + # Selects the next chat, but prioritizes chats with unread messages. + # Direction is forwards (True) or backwards (False) + row = self.get_selected_chat() + if row is None: + row = self.get_row_at_index(0) + if row is not None: + self.select_chat(row.account, row.jid) + return + + index = row.get_index() + current = index + unread_found = False + # Loop until finding a chat with unread count or completing a cycle + while True: + if forwards: + index += 1 + if index >= len(self.get_children()): + index = 0 + else: + index -= 1 + if index < 0: + index = len(self.get_children()) - 1 + + row = self.get_row_at_index(index) + if row.unread_count > 0: + unread_found = True + break + if index == current: + break + + if unread_found: + self.select_chat(row.account, row.jid) + return + + index = row.get_index() + if forwards: + next_row = self.get_row_at_index(index + 1) + else: + next_row = self.get_row_at_index(index - 1) + if next_row is None: + if forwards: + next_row = self.get_row_at_index(0) + else: + last = len(self.get_children()) - 1 + next_row = self.get_row_at_index(last) + self.select_chat(next_row.account, next_row.jid) + return + + self.select_chat(next_row.account, next_row.jid) + def toggle_chat_pinned(self, account, jid): row = self._chats[(account, jid)] row.toggle_pinned() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -14,6 +14,7 @@ import logging +from gi.repository import GLib from gi.repository import Gtk from gajim.common import ged @@ -94,6 +95,8 @@ def remove_chat(self, account, jid): def show_chat(self, account, jid): self.set_visible_child_name(f'{account}:{jid}') + control = self.get_control(account, jid) + GLib.idle_add(control.focus) def clear(self): self.set_visible_child_name('empty') ===================================== gajim/gtk/controls/base.py ===================================== @@ -831,8 +831,7 @@ def _on_message_textview_key_press_event(self, textview, event): if event.get_state() & Gdk.ModifierType.SHIFT_MASK: if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == Gdk.KEY_ISO_Left_Tab): - # TODO: - self.parent_win.move_to_next_unread_tab(False) + app.window.select_next_chat(False) return True if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): @@ -841,8 +840,7 @@ def _on_message_textview_key_press_event(self, textview, event): if event.get_state() & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: - # TODO - self.parent_win.move_to_next_unread_tab(True) + app.window.select_next_chat(True) return True message_buffer = self.msg_textview.get_buffer() ===================================== gajim/gtk/main.py ===================================== @@ -339,6 +339,12 @@ def select_chat(self, account, jid): self._main_stack.show_chat_page() self._chat_page.select_chat(account, jid) + def select_next_chat(self, forwards): + chat_list_stack = self._chat_page.get_chat_list_stack() + chat_list = chat_list_stack.get_current_chat_list() + if chat_list is not None: + chat_list.select_next_chat(forwards) + @staticmethod def _add_to_roster(_action, param): _workspace, account, jid = param.unpack() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/76ff8ab14c1cbc0feaa3495f2c35b9c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/76ff8ab14c1cbc0feaa3495f2c35b9c5… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits