Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][unify-control] 2 commits: refactor: Remove not needed code
by Philipp Hörist (＠lovetox) 10 Aug '22

10 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 2d9df4dc by lovetox at 2022-08-11T00:00:47+02:00 refactor: Remove not needed code - - - - - 26cc455a by lovetox at 2022-08-11T00:41:42+02:00 refactor: Load messages on contact switch - - - - - 3 changed files: - gajim/gtk/control.py - gajim/gtk/conversation/scrolled.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -80,7 +80,7 @@ def __init__(self) -> None: self._scrolled_view.connect('autoscroll-changed', self._on_autoscroll_changed) self._scrolled_view.connect('request-history', - self.fetch_n_lines_history, 20) + self._fetch_n_lines_history, 20) self._ui.conv_view_overlay.add(self._scrolled_view) self.conversation_view = self._scrolled_view.get_view() @@ -96,9 +96,6 @@ def __init__(self) -> None: self._ui.conv_view_box.add(self._roster) - # Keeps track of whether the ConversationView is populated - self._chat_loaded: bool = False - # Used with encryption plugins self.sendmessage = False @@ -346,8 +343,7 @@ def get_our_nick(self) -> str: return app.nicks[self.contact.account] def _allow_add_message(self) -> bool: - # Only add messages if the view is already populated - return self._chat_loaded and self._scrolled_view.get_lower_complete() + return self._scrolled_view.get_lower_complete() def add_info_message(self, text: str) -> None: self.conversation_view.add_info_message(text) @@ -496,14 +492,7 @@ def _notify(self, text=text, sound=sound)) - def load_messages(self) -> None: - if self._chat_loaded: - return - - self.fetch_n_lines_history(self._scrolled_view, True, 20) - def reset_view(self) -> None: - self._chat_loaded = False self._scrolled_view.reset() def get_autoscroll(self) -> bool: @@ -513,7 +502,7 @@ def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: row = self.conversation_view.get_row_by_log_line_id(log_line_id) if row is None: # Clear view and reload conversation around timestamp - self.conversation_view.lock() + self._scrolled_view.block_request_signal(True) self.reset_view() before, at_after = app.storage.archive.get_conversation_around( self.contact.account, self.contact.jid, timestamp) @@ -523,22 +512,21 @@ def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: GLib.idle_add( self.conversation_view.scroll_to_message_and_highlight, log_line_id) - GLib.idle_add(self.conversation_view.unlock) + GLib.idle_add(self._scrolled_view.block_request_signal, False) - def fetch_n_lines_history(self, - _scrolled: Gtk.ScrolledWindow, - before: bool, - n_lines: int - ) -> None: + def _fetch_n_lines_history(self, + _scrolled: Gtk.ScrolledWindow, + before: bool, + n_lines: int + ) -> None: - if self.conversation_view.is_locked(): - return + self._scrolled_view.block_request_signal(True) - self.conversation_view.lock() if before: row = self.conversation_view.get_first_message_row() else: row = self.conversation_view.get_last_message_row() + if row is None: timestamp = time.time() else: @@ -551,11 +539,9 @@ def fetch_n_lines_history(self, timestamp, n_lines) - self._chat_loaded = True - if not messages: self._scrolled_view.set_history_complete(before, True) - self.conversation_view.unlock() + self._scrolled_view.block_request_signal(False) return self.add_messages(messages) @@ -567,7 +553,7 @@ def fetch_n_lines_history(self, # if self.conversation_view.reduce_message_count(before): # self._scrolled_view.set_history_complete(before, False) - self.conversation_view.unlock() + self._scrolled_view.block_request_signal(False) def add_messages(self, messages: list[ConversationRow]): for msg in messages: ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -66,6 +66,7 @@ def __init__(self) -> None: self._upper_complete: bool = False self._lower_complete: bool = False self._requesting: Optional[str] = None + self._block_request_signal = False vadjustment = self.get_vadjustment() vadjustment.connect('notify::upper', self._on_adj_upper_changed) @@ -76,11 +77,14 @@ def __init__(self) -> None: self.set_focus_vadjustment(Gtk.Adjustment()) def clear(self) -> None: + self._block_request_signal = True self._view.clear() def switch_contact(self, contact: ChatContactT) -> None: self.reset() self._view.switch_contact(contact) + self._block_request_signal = False + self.emit('request-history', True) def get_autoscroll(self) -> bool: return self._autoscroll @@ -88,6 +92,9 @@ def get_autoscroll(self) -> bool: def get_view(self) -> ConversationView: return self._view + def block_request_signal(self, value: bool) -> None: + self._block_request_signal = value + def reset(self) -> None: self._current_upper = 0 self._request_history_at_upper = None @@ -127,7 +134,8 @@ def _on_adj_upper_changed(self, if upper == adj.get_page_size(): # There is no scrollbar - self.emit('request-history', True) + if not self._block_request_signal: + self.emit('request-history', True) self._lower_complete = True self._autoscroll = True self.emit('autoscroll-changed', self._autoscroll) @@ -170,7 +178,8 @@ def _on_adj_value_changed(self, self._request_history_at_upper = adj.get_upper() # Workaround: https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 self.set_kinetic_scrolling(False) - self.emit('request-history', True) + if not self._block_request_signal: + self.emit('request-history', True) self._requesting = 'before' elif (adj.get_upper() - (adj.get_value() + adj.get_page_size()) < distance): @@ -179,5 +188,6 @@ def _on_adj_value_changed(self, return # Workaround: https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 self.set_kinetic_scrolling(False) - self.emit('request-history', False) + if not self._block_request_signal: + self.emit('request-history', False) self._requesting = 'after' ===================================== gajim/gtk/conversation/view.py ===================================== @@ -76,7 +76,6 @@ def __init__(self) -> None: self._client = None self.encryption_enabled: bool = False - self._locked: bool = False # Keeps track of the number of rows shown in ConversationView self._row_count: int = 0 @@ -131,20 +130,10 @@ def switch_contact(self, contact: ChatContactT) -> None: def get_row_at_index(self, index: int) -> BaseRow: return cast(BaseRow, Gtk.ListBox.get_row_at_index(self, index)) - def is_locked(self) -> bool: - return self._locked - - def lock(self) -> None: - self._locked = True - - def unlock(self) -> None: - self._locked = False - def reset(self) -> None: for row in self.get_children()[2:]: row.destroy() - self.unlock() self._row_count = 0 self._active_date_rows = set() self._message_id_row_map = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/af5ec8193b8589750134fe139e56f07… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/af5ec8193b8589750134fe139e56f07… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] fix: Fix file send action
by Philipp Hörist (＠lovetox) 10 Aug '22

10 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: af5ec819 by lovetox at 2022-08-10T22:16:28+02:00 fix: Fix file send action - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -398,13 +398,14 @@ def start_file_transfer(self, path: Optional[str] = None, method: Optional[str] = None ) -> None: + if method is None: method = self._get_pref_ft_method(contact) if method is None: return control = app.window.get_control() - if control.has_active_chat(): + if not control.has_active_chat(): return if path is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af5ec8193b8589750134fe139e56f07c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af5ec8193b8589750134fe139e56f07c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] fix: More backwards compatibility
by Philipp Hörist (＠lovetox) 10 Aug '22

10 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: d4d4526e by lovetox at 2022-08-10T20:23:22+02:00 fix: More backwards compatibility - - - - - 2 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/control.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -578,11 +578,11 @@ def _on_send_message(self) -> None: encryption = contact.settings.get('encryption') if encryption: - self.sendmessage = True + self._chat_control.sendmessage = True app.plugin_manager.extension_point( 'send_message' + encryption, self._chat_control) - if not self.sendmessage: + if not self._chat_control.sendmessage: return client = app.get_client(contact.account) ===================================== gajim/gtk/control.py ===================================== @@ -99,6 +99,9 @@ def __init__(self) -> None: # Keeps track of whether the ConversationView is populated self._chat_loaded: bool = False + # Used with encryption plugins + self.sendmessage = False + # XEP-0333 Chat Markers self.last_msg_id: Optional[str] = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4d4526ea2d5bccfb8ee1dd51a103031… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4d4526ea2d5bccfb8ee1dd51a103031… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: ChatStack: Add back separator margins
by Daniel Brötzmann (＠wurstsalat) 10 Aug '22

10 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 621b017c by wurstsalat at 2022-08-10T17:17:40+02:00 chore: ChatStack: Add back separator margins - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -75,9 +75,15 @@ def __init__(self): box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) box.add(self._chat_banner) - box.add(Gtk.Separator()) + separator1 = Gtk.Separator() + separator1.set_margin_start(6) + separator1.set_margin_end(6) + box.add(separator1) box.add(self._control_stack) - box.add(Gtk.Separator()) + separator2 = Gtk.Separator() + separator2.set_margin_start(6) + separator2.set_margin_end(6) + box.add(separator2) box.add(self._message_action_box) dnd_icon = Gtk.Image.new_from_icon_name( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/621b017c0ae29a8101d9b7a41ac3f875… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/621b017c0ae29a8101d9b7a41ac3f875… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] fix: Stay backwards compatible
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: f404bf75 by lovetox at 2022-08-09T23:29:57+02:00 fix: Stay backwards compatible - - - - - 1 changed file: - gajim/gtk/control.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -114,6 +114,18 @@ def contact(self) -> types.ChatContactT: assert self._contact is not None return self._contact + @property + def account(self) -> str: + # Compatibility with Plugins for Gajim < 1.5 + assert self._contact is not None + return self._contact.account + + @property + def room_jid(self) -> str: + # Compatibility with Plugins for Gajim < 1.5 + assert self._contact is not None + return str(self._contact.jid) + @property def client(self) -> types.Client: assert self._client is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f404bf75bbfb1483eaba7ce3b2eaf0e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f404bf75bbfb1483eaba7ce3b2eaf0e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 2 commits: refactor: ConversationView: Make locked attr private
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: f5de4028 by lovetox at 2022-08-09T21:51:14+02:00 refactor: ConversationView: Make locked attr private - - - - - 51781544 by lovetox at 2022-08-09T22:36:48+02:00 refactor: Move ConversationsView into ScrolledView - - - - - 3 changed files: - gajim/gtk/control.py - gajim/gtk/conversation/scrolled.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -53,7 +53,6 @@ from gajim.common.preview_helpers import guess_simple_file_type from gajim.common.storage.archive import ConversationRow -from gajim.gui.conversation.view import ConversationView from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.builder import get_builder @@ -77,14 +76,15 @@ def __init__(self) -> None: self._ui = get_builder('chat_control.ui') - self.conversation_view = ConversationView() - self._scrolled_view = ScrolledView() - self._scrolled_view.add(self.conversation_view) - self._scrolled_view.set_focus_vadjustment(Gtk.Adjustment()) - + self._scrolled_view.connect('autoscroll-changed', + self._on_autoscroll_changed) + self._scrolled_view.connect('request-history', + self.fetch_n_lines_history, 20) self._ui.conv_view_overlay.add(self._scrolled_view) + self.conversation_view = self._scrolled_view.get_view() + self._groupchat_state = GroupchatState() self._ui.conv_view_overlay.add_overlay(self._groupchat_state) @@ -92,11 +92,6 @@ def __init__(self) -> None: self._jump_to_end_button.connect('clicked', self._on_jump_to_end) self._ui.conv_view_overlay.add_overlay(self._jump_to_end_button) - self._scrolled_view.connect('autoscroll-changed', - self._on_autoscroll_changed) - self._scrolled_view.connect('request-history', - self.fetch_n_lines_history, 20) - self._roster = GroupchatRoster() self._ui.conv_view_box.add(self._roster) @@ -146,6 +141,7 @@ def clear(self) -> None: self.encryption = None self.last_msg_id = None self.reset_view() + self._scrolled_view.clear() self._groupchat_state.clear() self._roster.clear() @@ -162,7 +158,7 @@ def switch_contact(self, contact: Union[BareContact, self._client = app.get_client(contact.account) self._jump_to_end_button.switch_contact(contact) - self.conversation_view.switch_contact(contact) + self._scrolled_view.switch_contact(contact) self._groupchat_state.switch_contact(contact) self._roster.switch_contact(contact) @@ -493,7 +489,6 @@ def load_messages(self) -> None: def reset_view(self) -> None: self._chat_loaded = False - self.conversation_view.reset() self._scrolled_view.reset() def get_autoscroll(self) -> bool: @@ -520,7 +515,8 @@ def fetch_n_lines_history(self, before: bool, n_lines: int ) -> None: - if self.conversation_view.locked: + + if self.conversation_view.is_locked(): return self.conversation_view.lock() ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -19,7 +19,9 @@ from gi.repository import Gtk from gi.repository import GObject -from ..types import ConversationViewT +from gajim.common.types import ChatContactT + +from .view import ConversationView class ScrolledView(Gtk.ScrolledWindow): @@ -69,11 +71,22 @@ def __init__(self) -> None: vadjustment.connect('notify::upper', self._on_adj_upper_changed) vadjustment.connect('notify::value', self._on_adj_value_changed) + self._view = ConversationView() + self.add(self._view) + self.set_focus_vadjustment(Gtk.Adjustment()) + + def clear(self) -> None: + self._view.clear() + + def switch_contact(self, contact: ChatContactT) -> None: + self.reset() + self._view.switch_contact(contact) + def get_autoscroll(self) -> bool: return self._autoscroll - def get_view(self) -> ConversationViewT: - return self.get_child().get_child() + def get_view(self) -> ConversationView: + return self._view def reset(self) -> None: self._current_upper = 0 @@ -81,12 +94,13 @@ def reset(self) -> None: self._upper_complete = False self._lower_complete = False self._requesting = None + self._view.reset() self.set_history_complete(True, False) def set_history_complete(self, before: bool, complete: bool) -> None: if before: self._upper_complete = complete - self.get_view().set_history_complete(complete) + self._view.set_history_complete(complete) else: self._lower_complete = complete ===================================== gajim/gtk/conversation/view.py ===================================== @@ -76,7 +76,7 @@ def __init__(self) -> None: self._client = None self.encryption_enabled: bool = False - self.locked: bool = False + self._locked: bool = False # Keeps track of the number of rows shown in ConversationView self._row_count: int = 0 @@ -88,6 +88,9 @@ def __init__(self) -> None: # message_id -> row mapping self._message_id_row_map: dict[str, MessageRow] = {} + self._read_marker_row = None + self._scroll_hint_row = None + @property def contact(self) -> types.ChatContactT: assert self._contact is not None @@ -128,17 +131,20 @@ def switch_contact(self, contact: ChatContactT) -> None: def get_row_at_index(self, index: int) -> BaseRow: return cast(BaseRow, Gtk.ListBox.get_row_at_index(self, index)) + def is_locked(self) -> bool: + return self._locked + def lock(self) -> None: - self.locked = True + self._locked = True def unlock(self) -> None: - self.locked = False + self._locked = False def reset(self) -> None: for row in self.get_children()[2:]: row.destroy() - self.locked = False + self.unlock() self._row_count = 0 self._active_date_rows = set() self._message_id_row_map = {} @@ -158,6 +164,8 @@ def get_last_message_row(self) -> Optional[MessageRow]: return None def set_history_complete(self, complete: bool) -> None: + if self._scroll_hint_row is None: + return self._scroll_hint_row.set_history_complete(complete) @staticmethod @@ -275,6 +283,7 @@ def add_message(self, self._message_id_row_map[message_id] = message_row if kind == 'incoming': + assert self._read_marker_row is not None self._read_marker_row.set_last_incoming_timestamp( message_row.timestamp) if (marker is not None and marker == 'displayed' and @@ -287,6 +296,7 @@ def _insert_message(self, message: BaseRow) -> None: self.add(message) self._add_date_row(message.timestamp) self._check_for_merge(message) + assert self._read_marker_row is not None if message.kind == 'incoming': if message.timestamp > self._read_marker_row.timestamp: @@ -471,7 +481,7 @@ def set_read_marker(self, id_: str) -> None: return row.set_displayed() - + assert self._read_marker_row is not None timestamp = row.timestamp + timedelta(microseconds=1) if self._read_marker_row.timestamp > timestamp: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/085dfb1d8b94fb1108402206623bbd3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/085dfb1d8b94fb1108402206623bbd3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] fix: ChatControl: Reset view correctly
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 085dfb1d by lovetox at 2022-08-09T21:03:54+02:00 fix: ChatControl: Reset view correctly - - - - - 2 changed files: - gajim/gtk/control.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -493,7 +493,7 @@ def load_messages(self) -> None: def reset_view(self) -> None: self._chat_loaded = False - self.conversation_view.clear() + self.conversation_view.reset() self._scrolled_view.reset() def get_autoscroll(self) -> bool: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -99,13 +99,13 @@ def clear(self) -> None: app.settings.disconnect_signals(self) - self._reset_conversation_view() + self.reset() def switch_contact(self, contact: ChatContactT) -> None: self._contact = contact self._client = app.get_client(contact.account) - self._reset_conversation_view() + self.reset() app.settings.disconnect_signals(self) @@ -134,7 +134,7 @@ def lock(self) -> None: def unlock(self) -> None: self.locked = False - def _reset_conversation_view(self) -> None: + def reset(self) -> None: for row in self.get_children()[2:]: row.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/085dfb1d8b94fb1108402206623bbd3f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/085dfb1d8b94fb1108402206623bbd3f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 2 commits: refactor: GajimPlugin: Add activate_encryption method
by Daniel Brötzmann (＠wurstsalat) 09 Aug '22

09 Aug '22

Daniel Brötzmann pushed to branch unify-control at gajim / gajim Commits: cf78c52c by wurstsalat at 2022-08-09T21:01:28+02:00 refactor: GajimPlugin: Add activate_encryption method - - - - - 77dbba62 by wurstsalat at 2022-08-09T21:02:28+02:00 chore: Update pyrightconfig - - - - - 2 changed files: - gajim/plugins/gajimplugin.py - pyrightconfig.json Changes: ===================================== gajim/plugins/gajimplugin.py ===================================== @@ -115,6 +115,9 @@ def activate(self) -> None: def deactivate(self) -> None: pass + def activate_encryption(self, chat_control: Any) -> None: + pass + class GajimPluginConfig: def __init__(self, plugin: GajimPlugin) -> None: ===================================== pyrightconfig.json ===================================== @@ -95,6 +95,7 @@ "gajim/gtk/mam_preferences.py", "gajim/gtk/manage_sounds.py", "gajim/gtk/menus.py", + "gajim/gtk/message_action_box.py", "gajim/gtk/message_input.py", "gajim/gtk/notification_manager.py", "gajim/gtk/notification.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0efd98453ff5349cdf090a95b11464… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0efd98453ff5349cdf090a95b11464… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] fix: Pass control for GUI extension point
by Philipp Hörist (＠lovetox) 09 Aug '22

09 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: c0efd984 by lovetox at 2022-08-09T20:44:26+02:00 fix: Pass control for GUI extension point - - - - - 1 changed file: - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -335,7 +335,9 @@ def _set_encryption_details(self, state: str) -> None: if state: app.plugin_manager.extension_point( - f'encryption_state{state}', self, encryption_state) + f'encryption_state{state}', + app.window.get_control(), + encryption_state) visible, enc_type, authenticated = encryption_state.values() assert isinstance(visible, bool) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0efd98453ff5349cdf090a95b114641… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0efd98453ff5349cdf090a95b114641… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 2 commits: fix: GroupchatRoster: Fix displaying roster on first contact switch
by Daniel Brötzmann (＠wurstsalat) 09 Aug '22

09 Aug '22

Daniel Brötzmann pushed to branch unify-control at gajim / gajim Commits: 8102160e by wurstsalat at 2022-08-09T20:27:05+02:00 fix: GroupchatRoster: Fix displaying roster on first contact switch - - - - - d8132238 by wurstsalat at 2022-08-09T20:33:48+02:00 imprv: GroupchatRoster: Remove scrolled shadow - - - - - 2 changed files: - gajim/data/gui/groupchat_roster.ui - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/data/gui/groupchat_roster.ui ===================================== @@ -18,7 +18,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="roster_treeview"> <property name="visible">True</property> ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -110,7 +110,6 @@ def __init__(self) -> None: ('theme-update', ged.GUI2, self._on_theme_update), ]) - self.set_no_show_all(True) self.set_reveal_child( not app.settings.get('hide_groupchat_occupants_list')) @@ -136,7 +135,8 @@ def switch_contact(self, contact: types.ChatContactT) -> None: self.clear() is_groupchat = isinstance(contact, GroupchatContact) - self.set_visible(is_groupchat) + hide_roster = app.settings.get('hide_groupchat_occupants_list') + self.set_visible(is_groupchat and not hide_roster) if not is_groupchat: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7066d32baa6256987c0d14787307700… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7066d32baa6256987c0d14787307700… 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