Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: MessageActionsBox: Don’t fail if no contact is set while updating file actions
by Daniel Brötzmann (＠wurstsalat) 03 Oct '22

03 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4f57adce by wurstsalat at 2022-10-03T21:20:26+02:00 fix: MessageActionsBox: Don’t fail if no contact is set while updating file actions - - - - - 1 changed file: - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -447,7 +447,9 @@ def _update_send_file_button_tooltip(self): self._ui.sendfile_button.set_tooltip_text(tooltip_text) return - assert self._contact is not None + if self._contact is None: + return + client = app.get_client(self._contact.account) tooltip_text = _('Send File…') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f57adce1666a1599b420c02ce87eb43… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f57adce1666a1599b420c02ce87eb43… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: SourceView: Simplify getting style scheme
by Daniel Brötzmann (＠wurstsalat) 03 Oct '22

03 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cc11bce2 by wurstsalat at 2022-10-03T20:29:34+02:00 refactor: SourceView: Simplify getting style scheme - - - - - 44b9de35 by wurstsalat at 2022-10-03T20:34:56+02:00 cfix: PEPConfig: Change view style on theme change, fix finalize - - - - - 5 changed files: - gajim/gtk/conversation/code_widget.py - gajim/gtk/pep_config.py - gajim/gtk/util.py - gajim/gtk/xml_console.py - pyrightconfig.json Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -24,9 +24,10 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ - from gajim.common.styling import PreBlock +from ..util import get_source_view_style_scheme + log = logging.getLogger('gajim.gui.conversation.code_widget') @@ -102,27 +103,17 @@ def __init__(self) -> None: self.get_buffer().set_highlight_matching_brackets(False) self._source_manager = GtkSource.LanguageManager.get_default() - self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() app.ged.register_event_handler('style-changed', ged.GUI1, self._on_style_changed) - style_scheme = self._get_style_scheme() + style_scheme = get_source_view_style_scheme() if style_scheme is not None: self.get_buffer().set_style_scheme(style_scheme) - def _get_style_scheme(self) -> Optional[GtkSource.StyleScheme]: - if app.css_config.prefer_dark: - style_scheme = self._style_scheme_manager.get_scheme( - 'solarized-dark') - else: - style_scheme = self._style_scheme_manager.get_scheme( - 'solarized-light') - return style_scheme - def _on_style_changed(self, *args: Any) -> None: - style_scheme = self._get_style_scheme() + style_scheme = get_source_view_style_scheme() if style_scheme is not None: self.get_buffer().set_style_scheme(style_scheme) ===================================== gajim/gtk/pep_config.py ===================================== @@ -14,6 +14,7 @@ from __future__ import annotations +from typing import Any from typing import Optional import logging @@ -28,6 +29,7 @@ from nbxmpp.task import Task from gajim.common import app +from gajim.common import ged from gajim.common.i18n import _ from gajim.common.helpers import to_user_string @@ -35,13 +37,16 @@ from .dialogs import WarningDialog from .dataform import DataFormWidget from .builder import get_builder +from .util import EventHelper +from .util import get_source_view_style_scheme log = logging.getLogger('gajim.gui.pep_config') -class PEPConfig(Gtk.ApplicationWindow): +class PEPConfig(Gtk.ApplicationWindow, EventHelper): def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) + EventHelper.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) @@ -64,27 +69,34 @@ def __init__(self, account: str) -> None: lang = source_manager.get_language('xml') self._ui.items_view.get_buffer().set_language(lang) - self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() - style_scheme = self._get_style_scheme() + style_scheme = get_source_view_style_scheme() if style_scheme is not None: self._ui.items_view.get_buffer().set_style_scheme(style_scheme) self._init_services() - self._ui.services_treeview.get_selection().connect( + + selection = self._ui.services_treeview.get_selection() + self._changed_handler = selection.connect( 'changed', self._on_services_selection_changed) + self.register_events([ + ('style-changed', ged.GUI1, self._on_style_changed) + ]) + self.show_all() self.connect('key-press-event', self._on_key_press) + self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) - def _get_style_scheme(self) -> Optional[GtkSource.StyleScheme]: - if app.css_config.prefer_dark: - style_scheme = self._style_scheme_manager.get_scheme( - 'solarized-dark') - else: - style_scheme = self._style_scheme_manager.get_scheme( - 'solarized-light') - return style_scheme + def _on_destroy(self, *args: Any) -> None: + selection = self._ui.services_treeview.get_selection() + selection.disconnect(self._changed_handler) + app.check_finalize(self) + + def _on_style_changed(self, *args: Any) -> None: + style_scheme = get_source_view_style_scheme() + if style_scheme is not None: + self._ui.items_view.get_buffer().set_style_scheme(style_scheme) def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: @@ -190,7 +202,7 @@ def _on_pep_config_received(self, task: Task) -> None: self._result_node = result.node - form = dataforms.extend_form(node=result.form) + form = dataforms.extend_form(node=result.form) # pyright: ignore self._dataform_widget = DataFormWidget(form) self._dataform_widget.set_propagate_natural_height(True) self._dataform_widget.show_all() ===================================== gajim/gtk/util.py ===================================== @@ -36,6 +36,7 @@ from gi.repository import Gdk from gi.repository import Gio from gi.repository import Gtk +from gi.repository import GtkSource from gi.repository import GLib from gi.repository import Pango from gi.repository import GdkPixbuf @@ -224,6 +225,13 @@ def restore_main_window_position() -> None: app.settings.get('mainwin_y_position')) +def get_source_view_style_scheme() -> Optional[GtkSource.StyleScheme]: + style_scheme_manager = GtkSource.StyleSchemeManager.get_default() + if app.css_config.prefer_dark: + return style_scheme_manager.get_scheme('solarized-dark') + return style_scheme_manager.get_scheme('solarized-light') + + def get_completion_liststore(entry: Gtk.Entry) -> Gtk.ListStore: ''' Create a completion model for entry widget completion list consists of ===================================== gajim/gtk/xml_console.py ===================================== @@ -36,6 +36,7 @@ from .util import scroll_to_end from .util import MaxWidthComboBoxText from .util import EventHelper +from .util import get_source_view_style_scheme from .dialogs import ErrorDialog from .settings import SettingsDialog from .const import Setting @@ -92,8 +93,7 @@ def __init__(self) -> None: self._ui.sourceview.get_buffer().set_language(lang) self._ui.input_entry.get_buffer().set_language(lang) - self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() - style_scheme = self._get_style_scheme() + style_scheme = get_source_view_style_scheme() if style_scheme is not None: self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) self._ui.input_entry.get_buffer().set_style_scheme(style_scheme) @@ -114,17 +114,8 @@ def _on_destroy(self, *args: Any) -> None: self._ui.popover.destroy() app.check_finalize(self) - def _get_style_scheme(self) -> Optional[GtkSource.StyleScheme]: - if app.css_config.prefer_dark: - style_scheme = self._style_scheme_manager.get_scheme( - 'solarized-dark') - else: - style_scheme = self._style_scheme_manager.get_scheme( - 'solarized-light') - return style_scheme - def _on_style_changed(self, *args: Any) -> None: - style_scheme = self._get_style_scheme() + style_scheme = get_source_view_style_scheme() if style_scheme is not None: self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) self._ui.input_entry.get_buffer().set_style_scheme(style_scheme) ===================================== pyrightconfig.json ===================================== @@ -105,6 +105,7 @@ "gajim/gtk/notification.py", "gajim/gtk/notification_manager.py", "gajim/gtk/password_dialog.py", + "gajim/gtk/pep_config.py", "gajim/gtk/plugins.py", "gajim/gtk/preview.py", "gajim/gtk/preview_audio.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ab066084bbee45b782b55b71c5efdc0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ab066084bbee45b782b55b71c5efdc0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: ChatPage: Check selected chat instead of active
by Philipp Hörist (＠lovetox) 03 Oct '22

03 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17d05ee0 by Philipp Hörist at 2022-10-03T20:11:54+02:00 refactor: ChatPage: Check selected chat instead of active - - - - - ab066084 by Philipp Hörist at 2022-10-03T20:11:54+02:00 refactor: Main: Simplify active check - - - - - 3 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -133,13 +133,11 @@ def get_current_chat_list(self) -> Optional[ChatList]: return self._chat_lists[workspace_id] - def is_chat_active(self, account: str, jid: JID) -> bool: + def is_chat_selected(self, account: str, jid: JID) -> bool: chat = self.get_selected_chat() if chat is None: return False - if chat.account != account or chat.jid != jid: - return False - return chat.is_active + return chat.account == account and chat.jid == jid def _on_filter_changed(self, _filter: ChatFilter, name: str) -> None: chat_list = cast(ChatList, self.get_visible_child()) ===================================== gajim/gtk/chat_page.py ===================================== @@ -273,8 +273,8 @@ def load_workspace_chats(self, workspace_id: str) -> None: pinned=open_chat['pinned'], position=open_chat['position']) - def is_chat_active(self, account: str, jid: JID) -> bool: - return self._chat_list_stack.is_chat_active(account, jid) + def is_chat_selected(self, account: str, jid: JID) -> bool: + return self._chat_list_stack.is_chat_selected(account, jid) def restore_chat(self) -> None: if not self._closed_chat_memory: ===================================== gajim/gtk/main.py ===================================== @@ -563,9 +563,9 @@ def get_active_workspace(self) -> Optional[str]: return self._workspace_side_bar.get_active_workspace() def is_chat_active(self, account: str, jid: JID) -> bool: - if not self.get_property('has-toplevel-focus'): + if not self.has_toplevel_focus(): return False - return self._chat_page.is_chat_active(account, jid) + return self._chat_page.is_chat_selected(account, jid) def highlight_dnd_targets(self, drag_row: Any, highlight: bool) -> None: css_class = 'dnd-target' @@ -883,8 +883,8 @@ def _on_window_active(self, window: Gtk.ApplicationWindow, _param: Any ) -> None: - is_active = window.get_property('is-active') - if not is_active: + + if not window.is_active(): return set_urgency_hint(self, False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/25af863a278059c5abd02a0a67fb2ed… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/25af863a278059c5abd02a0a67fb2ed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: PEPConfig: Add PEP item view
by Daniel Brötzmann (＠wurstsalat) 03 Oct '22

03 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 25af863a by wurstsalat at 2022-10-03T20:09:06+02:00 feat: PEPConfig: Add PEP item view - - - - - 6 changed files: - gajim/common/modules/pubsub.py - − gajim/data/gui/manage_pep_services_window.ui - + gajim/data/gui/pep_config.ui - gajim/gtk/builder.pyi - gajim/gtk/pep_config.py - pyrightconfig.json Changes: ===================================== gajim/common/modules/pubsub.py ===================================== @@ -43,6 +43,7 @@ class PubSub(BaseModule): 'set_node_configuration', 'get_node_configuration', 'get_access_model', + 'request_items', ] def __init__(self, con: types.Client) -> None: ===================================== gajim/data/gui/manage_pep_services_window.ui deleted ===================================== @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkBox" id="manage_pep_services"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow"> - <property name="width_request">350</property> - <property name="height_request">250</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="services_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="spacing">12</property> - <child> - <object class="GtkButton" id="configure_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Configure</property> - <property name="halign">center</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_configure_button_clicked" swapped="no"/> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">preferences-system-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="delete_button"> - <property name="label">_Delete</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_delete_button_clicked" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/data/gui/pep_config.ui ===================================== @@ -0,0 +1,288 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <requires lib="gtksourceview" version="4.0"/> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">slide-left-right</property> + <child> + <object class="GtkBox" id="overview_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkScrolledWindow"> + <property name="width-request">350</property> + <property name="height-request">250</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTreeView" id="services_treeview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton" id="show_content_button"> + <property name="label" translatable="yes">Show Content</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">center</property> + <signal name="clicked" handler="_on_show_content_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="delete_button"> + <property name="label">_Delete</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_delete_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="configure_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Configure</property> + <property name="halign">center</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_configure_button_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">preferences-system-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="name">overview</property> + </packing> + </child> + <child> + <object class="GtkBox" id="items_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="items_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="wrap">True</property> + <property name="wrap-mode">word-char</property> + <property name="max-width-chars">40</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkSourceView" id="items_view"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="editable">False</property> + <property name="left-margin">3</property> + <property name="right-margin">3</property> + <property name="top-margin">3</property> + <property name="bottom-margin">3</property> + <property name="monospace">True</property> + <property name="show-line-numbers">True</property> + <property name="tab-width">4</property> + <property name="highlight-current-line">True</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Back</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_back_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="name">items</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="config_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="form_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="wrap">True</property> + <property name="wrap-mode">word-char</property> + <property name="max-width-chars">30</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Back</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_back_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Save</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">end</property> + <signal name="clicked" handler="_on_save_config_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="form_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="name">config</property> + <property name="position">2</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -550,15 +550,6 @@ class MamPreferencesBuilder(Builder): save_button: Gtk.Button -class ManagePepServicesWindowBuilder(Builder): - manage_pep_services: Gtk.Box - services_treeview: Gtk.TreeView - treeview_selection1: Gtk.TreeSelection - configure_button: Gtk.Button - image1: Gtk.Image - delete_button: Gtk.Button - - class ManageProxiesBuilder(Builder): liststore1: Gtk.ListStore box: Gtk.Box @@ -609,6 +600,21 @@ class PasswordDialogBuilder(Builder): keyring_hint: Gtk.Label +class PepConfigBuilder(Builder): + stack: Gtk.Stack + overview_box: Gtk.Box + services_treeview: Gtk.TreeView + show_content_button: Gtk.Button + delete_button: Gtk.Button + configure_button: Gtk.Button + items_box: Gtk.Box + items_label: Gtk.Label + items_view: GtkSource.View + config_box: Gtk.Box + form_label: Gtk.Label + form_box: Gtk.Box + + class PluginsBuilder(Builder): liststore: Gtk.ListStore plugins_box: Gtk.Box @@ -678,9 +684,9 @@ class PreviewBuilder(Builder): image_button: Gtk.Button link_button: Gtk.LinkButton button_box: Gtk.Box + download_button: Gtk.Button save_as_button: Gtk.Button open_folder_button: Gtk.Button - download_button: Gtk.Button file_name: Gtk.Label file_size: Gtk.Label info_message: Gtk.Label @@ -1004,8 +1010,6 @@ def get_builder(file_name: Literal['main.ui'], widgets: list[str] = ...) -> Main @overload def get_builder(file_name: Literal['mam_preferences.ui'], widgets: list[str] = ...) -> MamPreferencesBuilder: ... @overload -def get_builder(file_name: Literal['manage_pep_services_window.ui'], widgets: list[str] = ...) -> ManagePepServicesWindowBuilder: ... -@overload def get_builder(file_name: Literal['manage_proxies.ui'], widgets: list[str] = ...) -> ManageProxiesBuilder: ... @overload def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ...) -> ManageSoundsBuilder: ... @@ -1014,6 +1018,8 @@ def get_builder(file_name: Literal['message_actions_box.ui'], widgets: list[str] @overload def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... @overload +def get_builder(file_name: Literal['pep_config.ui'], widgets: list[str] = ...) -> PepConfigBuilder: ... +@overload def get_builder(file_name: Literal['plugins.ui'], widgets: list[str] = ...) -> PluginsBuilder: ... @overload def get_builder(file_name: Literal['popup_notification_window.ui'], widgets: list[str] = ...) -> PopupNotificationWindowBuilder: ... ===================================== gajim/gtk/pep_config.py ===================================== @@ -12,13 +12,18 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Optional + import logging from gi.repository import Gdk from gi.repository import Gtk +from gi.repository import GtkSource from nbxmpp.errors import StanzaError -from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.modules import dataforms from nbxmpp.simplexml import Node from nbxmpp.task import Task @@ -28,11 +33,10 @@ from .dialogs import ErrorDialog from .dialogs import WarningDialog -from .dataform import DataFormDialog +from .dataform import DataFormWidget from .builder import get_builder - -log = logging.getLogger('gajim.gui.pep') +log = logging.getLogger('gajim.gui.pep_config') class PEPConfig(Gtk.ApplicationWindow): @@ -42,17 +46,29 @@ def __init__(self, account: str) -> None: self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_name('PEPConfig') - self.set_default_size(500, 350) + self.set_default_size(700, 800) self.set_resizable(True) self.set_transient_for(app.window) - self._ui = get_builder('manage_pep_services_window.ui') - self.add(self._ui.manage_pep_services) + self._ui = get_builder('pep_config.ui') + self.add(self._ui.stack) self.account = account self.set_title(_('PEP Service Configuration (%s)') % self.account) self._client = app.get_client(account) + self._result_node: Optional[Node] = None + self._dataform_widget: Optional[DataFormWidget] = None + + source_manager = GtkSource.LanguageManager.get_default() + lang = source_manager.get_language('xml') + self._ui.items_view.get_buffer().set_language(lang) + + self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() + style_scheme = self._get_style_scheme() + if style_scheme is not None: + self._ui.items_view.get_buffer().set_style_scheme(style_scheme) + self._init_services() self._ui.services_treeview.get_selection().connect( 'changed', self._on_services_selection_changed) @@ -61,6 +77,15 @@ def __init__(self, account: str) -> None: self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) + def _get_style_scheme(self) -> Optional[GtkSource.StyleScheme]: + if app.css_config.prefer_dark: + style_scheme = self._style_scheme_manager.get_scheme( + 'solarized-dark') + else: + style_scheme = self._style_scheme_manager.get_scheme( + 'solarized-light') + return style_scheme + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() @@ -68,7 +93,9 @@ def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: def _on_services_selection_changed(self, _selection: Gtk.TreeSelection ) -> None: + self._ui.configure_button.set_sensitive(True) + self._ui.show_content_button.set_sensitive(True) self._ui.delete_button.set_sensitive(True) def _init_services(self): @@ -101,6 +128,20 @@ def _items_received(self, task: Task) -> None: if item.jid == jid and item.node is not None: self.treestore.append([item.node]) + def _on_delete_button_clicked(self, _widget: Gtk.Button) -> None: + selection = self._ui.services_treeview.get_selection() + if not selection: + return + model, iter_ = selection.get_selected() + assert isinstance(model, Gtk.ListStore) + assert iter_ + node = model[iter_][0] + + self._client.get_module('PubSub').delete( + node, + callback=self._on_node_delete, + user_data=node) + def _on_node_delete(self, task: Task) -> None: node = task.get_user_data() @@ -123,7 +164,7 @@ def _on_node_delete(self, task: Task) -> None: break iter_ = model.iter_next(iter_) - def _on_delete_button_clicked(self, _widget: Gtk.Button) -> None: + def _on_configure_button_clicked(self, _button: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return @@ -132,12 +173,44 @@ def _on_delete_button_clicked(self, _widget: Gtk.Button) -> None: assert iter_ node = model[iter_][0] - self._client.get_module('PubSub').delete( + self._client.get_module('PubSub').get_node_configuration( node, - callback=self._on_node_delete, - user_data=node) + callback=self._on_pep_config_received) - def _on_configure_button_clicked(self, _button: Gtk.Button) -> None: + def _on_pep_config_received(self, task: Task) -> None: + try: + result = task.finish() + except Exception: + log.exception('Failed to retrieve config') + return + + if self._dataform_widget is not None: + self._ui.form_box.remove(self._dataform_widget) + self._dataform_widget.destroy() + + self._result_node = result.node + + form = dataforms.extend_form(node=result.form) + self._dataform_widget = DataFormWidget(form) + self._dataform_widget.set_propagate_natural_height(True) + self._dataform_widget.show_all() + self._ui.form_box.add(self._dataform_widget) + self._ui.form_label.set_text(result.node) + + self._ui.stack.set_visible_child_name('config') + + def _on_save_config_clicked(self, _button: Gtk.Button) -> None: + assert self._dataform_widget is not None + form = self._dataform_widget.get_submit_form() + self._client.get_module('PubSub').set_node_configuration( + self._result_node, form) + + self._ui.stack.set_visible_child_name('overview') + + def _on_back_clicked(self, _button: Gtk.Button) -> None: + self._ui.stack.set_visible_child_name('overview') + + def _on_show_content_clicked(self, _button: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return @@ -146,25 +219,30 @@ def _on_configure_button_clicked(self, _button: Gtk.Button) -> None: assert iter_ node = model[iter_][0] - self._client.get_module('PubSub').get_node_configuration( + self._client.get_module('PubSub').request_items( node, - callback=self._nec_pep_config_received) - - def _on_config_submit(self, - form: SimpleDataForm, - node: Node - ) -> None: - self._client.get_module('PubSub').set_node_configuration(node, form) + callback=self._on_pep_items_received, + user_data=node) - def _nec_pep_config_received(self, task: Task) -> None: + def _on_pep_items_received(self, task: Task) -> None: try: result = task.finish() except Exception: - log.exception('Failed to retrieve config') + log.exception('Failed to retrieve items') return - DataFormDialog(_('Configure %s') % result.node, - self, - result.form, - result.node, - self._on_config_submit) + parent_node = task.get_user_data() + self._ui.items_label.set_text(str(parent_node)) + + buf = self._ui.items_view.get_buffer() + start, end = buf.get_bounds() + buf.delete(start, end) + + for node in result: + # pylint: disable=unnecessary-dunder-call + node = node.__str__(fancy=True) + + buf = self._ui.items_view.get_buffer() + buf.insert_at_cursor(str(node)) + + self._ui.stack.set_visible_child_name('items') ===================================== pyrightconfig.json ===================================== @@ -105,7 +105,6 @@ "gajim/gtk/notification.py", "gajim/gtk/notification_manager.py", "gajim/gtk/password_dialog.py", - "gajim/gtk/pep_config.py", "gajim/gtk/plugins.py", "gajim/gtk/preview.py", "gajim/gtk/preview_audio.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/25af863a278059c5abd02a0a67fb2ed4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/25af863a278059c5abd02a0a67fb2ed4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Drag and drop: Highlight target areas
by Daniel Brötzmann (＠wurstsalat) 03 Oct '22

03 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 757ddea1 by wurstsalat at 2022-10-03T17:19:45+02:00 imprv: Drag and drop: Highlight target areas Adds highlighting for workspace and chat list drag and drop Fixes #11173 - - - - - 5 changed files: - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/chat_list_row.py - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -813,6 +813,14 @@ .badge { font-weight: bold; } +.dnd-target { + animation-name: pulse-opacity; + animation-duration: 2.0s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; + border: 2px dashed @theme_selected_bg_color; +} + @keyframes pulse-opacity { 0% { opacity: 1.0; } 20% { opacity: 0.5; } ===================================== gajim/gtk/chat_list.py ===================================== @@ -279,6 +279,9 @@ def select_chat_number(self, number: int) -> None: assert isinstance(row, ChatListRow) self.select_chat(row.account, row.jid) + def get_chat_list_rows(self) -> list[ChatListRow]: + return cast(list[ChatListRow], self.get_children()) + def remove_chat(self, account: str, jid: JID, ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -114,6 +114,7 @@ def __init__(self, entries, Gdk.DragAction.MOVE) self.connect('drag-begin', self._on_drag_begin) + self.connect('drag-end', self._on_drag_end) self.connect('drag-data-get', self._on_drag_data_get) if self.type == 'groupchat': @@ -428,6 +429,15 @@ def _on_drag_begin(self, self.draw(context) Gtk.drag_set_icon_surface(drag_context, surface) + app.window.highlight_dnd_targets(row, True) + + def _on_drag_end(self, + row: ChatListRow, + _drag_context: Gdk.DragContext + ) -> None: + + app.window.highlight_dnd_targets(row, False) + def _on_drag_data_get(self, _widget: Gtk.Widget, _drag_context: Gdk.DragContext, ===================================== gajim/gtk/main.py ===================================== @@ -46,6 +46,7 @@ from .main_stack import MainStack from .call_window import CallWindow from .chat_list import ChatList +from .chat_list_row import ChatListRow from .chat_stack import ChatStack from .const import MAIN_WIN_ACTIONS from .dialogs import DialogButton @@ -566,6 +567,32 @@ def is_chat_active(self, account: str, jid: JID) -> bool: return False return self._chat_page.is_chat_active(account, jid) + def highlight_dnd_targets(self, drag_row: Any, highlight: bool) -> None: + css_class = 'dnd-target' + + if isinstance(drag_row, ChatListRow): + chat_list_stack = self._chat_page.get_chat_list_stack() + workspace = self.get_active_workspace() + if workspace is None: + return + + if drag_row.is_pinned: + chat_list = chat_list_stack.get_chatlist(workspace) + for row in chat_list.get_chat_list_rows(): + if not row.is_pinned: + continue + + if highlight: + row.get_style_context().add_class(css_class) + else: + row.get_style_context().remove_class(css_class) + + if highlight: + self._workspace_side_bar.get_style_context().add_class(css_class) + else: + self._workspace_side_bar.get_style_context().remove_class( + css_class) + def _add_workspace(self, _action: Gio.SimpleAction, param: GLib.Variant) -> None: ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -322,6 +322,7 @@ def __init__(self, workspace_id: str) -> None: entries, Gdk.DragAction.MOVE) eventbox.connect('drag-begin', self._on_drag_begin) + eventbox.connect('drag-end', self._on_drag_end) eventbox.connect('drag-data-get', self._on_drag_data_get) eventbox.connect('button-press-event', self._popup_menu) eventbox.add(overlay) @@ -348,9 +349,10 @@ def set_unread_count(self, count: int) -> None: self._unread_label.set_visible(bool(count)) def _on_drag_begin(self, - _widget: Gtk.Widget, + row: Workspace, drag_context: Gdk.DragContext ) -> None: + scale = self.get_scale_factor() surface = app.app.avatar_storage.get_workspace_surface( self.workspace_id, AvatarSize.WORKSPACE, scale) @@ -360,6 +362,15 @@ def _on_drag_begin(self, listbox = cast(WorkspaceSideBar, self.get_parent()) listbox.set_drag_row(self) + app.window.highlight_dnd_targets(row, True) + + def _on_drag_end(self, + row: Workspace, + drag_context: Gdk.DragContext + ) -> None: + + app.window.highlight_dnd_targets(row, False) + def _on_drag_data_get(self, _widget: Gtk.Widget, _drag_context: Gdk.DragContext, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/757ddea13b188b1511c2196ce8471041… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/757ddea13b188b1511c2196ce8471041… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Fix GroupChatNickCompletion test
by Daniel Brötzmann (＠wurstsalat) 03 Oct '22

03 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c265de03 by wurstsalat at 2022-10-03T12:11:38+02:00 cfix: Fix GroupChatNickCompletion test - - - - - 1 changed file: - test/no_gui/test_nick_completion.py Changes: ===================================== test/no_gui/test_nick_completion.py ===================================== @@ -4,43 +4,46 @@ from gajim import gui gui.init('gtk') +from gajim.common import app from gajim.gui.groupchat_nick_completion import GroupChatNickCompletion class Test(unittest.TestCase): def test_generate_suggestions(self): + participant_names = [ + 'aaaa', + 'xaaaz', + 'xxx', + 'xxxxz' + ] + + participants: list[MagicMock] = [] + for name in participant_names: + participant = MagicMock() + participant.name = name + participants.append(participant) + + app.connections = MagicMock() + + app.storage.archive = MagicMock() + app.storage.archive.get_recent_muc_nicks = MagicMock( + return_value=['fooo']) + gen = GroupChatNickCompletion() contact = MagicMock() - contact.jid = 'test' + contact.get_participants = MagicMock(return_value=participants) + gen.switch_contact(contact) - list_1 = ['aaaa', 'fooo', 'xxxxz', 'xaaaz'] - for name in list_1: - gen._process_message(name, False, contact.jid) - list_2 = list_1 + ['xxx'] - r = gen._generate_suggestions(nicks=list_2, beginning='x') + r = gen._generate_suggestions(prefix='x') self.assertEqual(r, ['xaaaz', 'xxx', 'xxxxz']) - r = gen._generate_suggestions( - nicks=list_2, - beginning='m' - ) - self.assertEqual(r, []) - - for name in ['xaaaz', 'xxxxz']: - gen._process_message(name, True, contact.jid) + r = gen._generate_suggestions(prefix='') + self.assertEqual(r, ['fooo', 'aaaa', 'xaaaz', 'xxx', 'xxxxz']) - r = gen._generate_suggestions( - nicks=list_2, - beginning='x' - ) - self.assertEqual(r, ['xaaaz', 'xxx', 'xxxxz']) - r = gen._generate_suggestions( - nicks=list_2, - beginning='' - ) - self.assertEqual(r, ['aaaa', 'fooo', 'xaaaz', 'xxx', 'xxxxz']) + r = gen._generate_suggestions(prefix='m') + self.assertEqual(r, []) if __name__ == '__main__': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c265de03c21cca4a781a85d15e89c61c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c265de03c21cca4a781a85d15e89c61c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: GroupChatNickCompletion: Simplify suggestions
by Daniel Brötzmann (＠wurstsalat) 03 Oct '22

03 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9b2922a3 by wurstsalat at 2022-10-03T09:43:57+02:00 imprv: GroupChatNickCompletion: Simplify suggestions - remove shell_like_completion - query nicks from DB (no state needed) Fixes #11155 - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/common/storage/archive.py - gajim/gtk/groupchat_nick_completion.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -79,7 +79,6 @@ class _ACCOUNT_DEFAULT: 'remote_control', 'save_main_window_position', 'send_on_ctrl_enter', - 'shell_like_completion', 'show_chatstate_in_banner', 'show_help_start_chat', 'show_in_taskbar', @@ -253,7 +252,6 @@ class _ACCOUNT_DEFAULT: 'save_main_window_position': True, 'search_engine': 'https://duckduckgo.com/?q=%s', 'send_on_ctrl_enter': False, - 'shell_like_completion': False, 'show_chatstate_in_banner': True, 'show_help_start_chat': True, 'show_in_taskbar': True, @@ -696,9 +694,6 @@ class WorkspaceSettings(TypedDict): 'search_engine': '', 'send_on_ctrl_enter': _( 'Send message on Ctrl+Enter and make a new line with Enter.'), - 'shell_like_completion': _( - 'If enabled, completion in group chats will be like a shell ' - 'auto-completion.'), 'stun_server': _('STUN server to use when using Jingle'), 'trayicon_notification_on_events': _( 'Notify of events in the notification area.'), ===================================== gajim/common/storage/archive.py ===================================== @@ -45,6 +45,7 @@ from gajim.common.const import MAX_MESSAGE_CORRECTION_DELAY from gajim.common.const import KindConstant from gajim.common.const import JIDConstant +from gajim.common.modules.contacts import GroupchatContact from gajim.common.storage.base import SqliteStorage from gajim.common.storage.base import timeit @@ -831,6 +832,38 @@ def get_first_message_meta_for_date(self, sql, tuple(jids) + (date_ts, delta_ts)).fetchone() + @timeit + def get_recent_muc_nicks(self, contact: GroupchatContact) -> list[str]: + ''' + Queries the last 50 message rows and gathers nicknames in a list + ''' + jids = [contact.jid] + account_id = self.get_account_id(contact.account) + kinds = map(str, [KindConstant.STATUS, + KindConstant.GCSTATUS, + KindConstant.ERROR]) + + sql = ''' + SELECT contact_name + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND kind NOT IN ({kinds}) + ORDER BY time DESC + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id, + kinds=', '.join(kinds)) + + result = self._con.execute( + sql, + tuple(jids)).fetchmany(50) + + nicknames: list[str] = [] + for row in result: + if row.contact_name not in nicknames: + nicknames.append(row.contact_name) + + return nicknames + @timeit def deduplicate_muc_message(self, account: str, ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -18,19 +18,15 @@ import logging - from gi.repository import Gtk from gi.repository import Gdk from gajim.common import app from gajim.common import ged -from gajim.common import types from gajim.common.events import GcMessageReceived -from gajim.common.events import MUCNicknameChanged from gajim.common.ged import EventHelper from gajim.common.helpers import jid_is_blocked -from gajim.common.helpers import message_needs_highlight - +from gajim.common.modules.contacts import GroupchatContact log = logging.getLogger('gajim.gui.groupchat_nick_completion') @@ -39,154 +35,24 @@ class GroupChatNickCompletion(EventHelper): def __init__(self) -> None: EventHelper.__init__(self) - self._account: Optional[str] = None - self._contact: Optional[types.GroupchatContactT] = None + self._contact: Optional[GroupchatContact] = None - self._sender_list: list[str] = [] - self._highlight_list: list[str] = [] - self._nick_hits: list[str] = [] + self._suggestions: list[str] = [] self._last_key_tab = False - self._nick_data: dict[str, tuple[list[str], list[str]]] = {} - self.register_event( - 'gc-message-received', ged.GUI1, self._on_gc_message_received) + 'gc-message-received', ged.GUI2, self._on_gc_message_received) - def switch_contact(self, contact: types.GroupchatContactT) -> None: - self._nick_hits.clear() + def switch_contact(self, contact: GroupchatContact) -> None: + self._suggestions.clear() self._last_key_tab = False - - if self._contact is not None: - self._contact.disconnect_all_from_obj(self) - self._nick_data[str(self._contact.jid)] = ( - self._sender_list, self._highlight_list) - - nick_data = self._nick_data.get(str(contact.jid)) - if nick_data is None: - self._sender_list.clear() - self._highlight_list.clear() - else: - self._sender_list, self._highlight_list = nick_data - - self._account = contact.account self._contact = contact - self._contact.connect( - 'user-nickname-changed', self._on_user_nickname_changed) - - def _on_user_nickname_changed(self, - _contact: types.GroupchatContact, - _signal_name: str, - event: MUCNicknameChanged, - old_contact: types.GroupchatParticipant, - new_contact: types.GroupchatParticipant - ) -> None: - - if event.is_self: - return - - old_name = old_contact.name - new_name = new_contact.name - - log.debug('Contact %s renamed to %s', old_name, new_name) - for lst in (self._highlight_list, self._sender_list): - for idx, contact in enumerate(lst): - if contact == old_name: - lst[idx] = new_name - - def _on_gc_message_received(self, event: GcMessageReceived) -> None: - if event.properties.muc_nickname is None: - # Message from server - return - - client = app.get_client(event.account) - gc_contact = client.get_module('Contacts').get_contact( - event.room_jid) - - participant_nick = event.properties.muc_nickname - if participant_nick == gc_contact.nickname: - return - - highlight = message_needs_highlight( - event.msgtxt, gc_contact.nickname, client.get_own_jid().bare) - self._process_message(participant_nick, highlight, event.room_jid) - - def _process_message(self, - participant_nick: str, - highlight: bool, - room_jid: str - ) -> None: - nick_data = self._nick_data.get(room_jid) - if nick_data is None: - return - - sender_list, highlight_list = nick_data - if highlight: - try: - highlight_list.remove(participant_nick) - except ValueError: - pass - if len(highlight_list) > 6: - highlight_list.pop(0) # remove older - highlight_list.append(participant_nick) - - # TODO implement it in a more efficient way - # Currently it's O(n*m + n*s), where n is the number of participants and - # m is the number of messages processed, s - the number of times the - # suggestions are requested - # - # A better way to do it would be to keep a dict: contact -> timestamp - # with expected O(1) insert, and sort it by timestamps in O(n log n) - # for each suggestion (currently generating the suggestions is O(n)) - # this would give the expected complexity of O(m + s * n log n) - try: - sender_list.remove(participant_nick) - except ValueError: - pass - sender_list.append(participant_nick) - - def _generate_suggestions(self, - nicks: list[str], - beginning: str - ) -> list[str]: - ''' - Generate the order of suggested MUC autocompletions - - `nicks` is the list of contacts currently participating in a MUC - `beginning` is the text already typed by the user - ''' - def _nick_matching(nick: str) -> bool: - assert self._contact - return (nick != self._contact.nickname and - nick.lower().startswith(beginning.lower())) - - if beginning == '': - # empty message, so just suggest recent mentions - potential_matches = self._highlight_list - else: - # nick partially typed, try completing it - potential_matches = self._sender_list - - potential_matches_set = set(potential_matches) - log.debug('Priority matches: %s', potential_matches_set) - - matches = [n for n in potential_matches if _nick_matching(n)] - # the most recent nick is the last one on the list - matches.reverse() - - # handle people who have not posted/mentioned us - other_nicks = [ - n for n in nicks - if _nick_matching(n) and n not in potential_matches_set - ] - other_nicks.sort(key=str.lower) - log.debug('Other matches: %s', other_nicks) - - return matches + other_nicks def process_key_press(self, textview: Gtk.TextView, event: Gdk.EventKey ) -> bool: + if (event.get_state() & Gdk.ModifierType.SHIFT_MASK or event.get_state() & Gdk.ModifierType.CONTROL_MASK or event.keyval not in (Gdk.KEY_ISO_Left_Tab, Gdk.KEY_Tab)): @@ -199,111 +65,108 @@ def process_key_press(self, end_iter = message_buffer.get_iter_at_mark(cursor_position) text = message_buffer.get_text(start_iter, end_iter, False) - text_split = text.split() + if text.split(): + # Store last word for autocompletion + prefix = text.split()[-1] + else: + prefix = '' + + # Configurable string to be displayed after the nick: + # e.g. "user," or "user:" + ref_ext = app.settings.get('gc_refer_to_nick_char') + has_ref_ext = False + + # Default suffix to 1: space printed after completion + suffix_len = 1 + + if ref_ext and text.endswith(ref_ext + ' '): + has_ref_ext = True + suffix_len = len(ref_ext + ' ') + + if not self._last_key_tab or not self._suggestions: + self._suggestions = self._generate_suggestions(prefix) - # check if tab is pressed with empty message - if text_split: # if there are any words - begin = text_split[-1] # last word we typed + if not self._suggestions: + self._last_key_tab = True + return False + + if (self._last_key_tab and + text[:-suffix_len].endswith(self._suggestions[0])): + # Cycle suggestions list + self._suggestions.append(self._suggestions[0]) + prefix = self._suggestions.pop(0) + + if len(text.split()) < 2 or has_ref_ext: + suffix = ref_ext + ' ' else: - begin = '' - - gc_refer_to_nick_char = app.settings.get('gc_refer_to_nick_char') - with_refer_to_nick_char = False - after_nick_len = 1 # the space that is printed after we type [Tab] - - # first part of this if : works fine even if refer_to_nick_char - if (gc_refer_to_nick_char and - text.endswith(gc_refer_to_nick_char + ' ')): - with_refer_to_nick_char = True - after_nick_len = len(gc_refer_to_nick_char + ' ') - if (self._nick_hits and self._last_key_tab and - text[:-after_nick_len].endswith(self._nick_hits[0])): - # we should cycle - # Previous nick in list may had a space inside, so we check text - # and not text_split and store it into 'begin' var - self._nick_hits.append(self._nick_hits[0]) - begin = self._nick_hits.pop(0) + suffix = ' ' + + start_iter = end_iter.copy() + if (self._last_key_tab and has_ref_ext or (text and text[-1] == ' ')): + # Mind the added space from last completion; + # ref_ext may also consist of more than one char + start_iter.backward_chars(len(prefix) + len(suffix)) else: - assert self._contact - list_nick = self._contact.get_user_nicknames() - list_nick = list(filter(self._jid_not_blocked, list_nick)) - - log.debug('Nicks to be considered for autosuggestions: %s', - list_nick) - self._nick_hits = self._generate_suggestions( - nicks=list_nick, beginning=begin) - log.debug('Nicks filtered for autosuggestions: %s', - self._nick_hits) - if not self._nick_hits: - self._last_key_tab = True - return False + start_iter.backward_chars(len(prefix)) + + assert self._contact is not None + client = app.get_client(self._contact.account) + client.get_module('Chatstate').block_chatstates(self._contact, True) - if self._nick_hits: - shell_like_completion = app.settings.get('shell_like_completion') - - if len(text_split) < 2 or with_refer_to_nick_char: - # This is the 1st word of the line or no word or we are - # cycling at the beginning, possibly with a space in one nick - add = gc_refer_to_nick_char + ' ' - else: - add = ' ' - start_iter = end_iter.copy() - if (self._last_key_tab and - with_refer_to_nick_char or (text and text[-1] == ' ')): - # have to accommodate for the added space from last completion - # gc_refer_to_nick_char may be more than one char! - start_iter.backward_chars(len(begin) + len(add)) - elif self._last_key_tab and not shell_like_completion: - # have to accommodate for the added space from last - # completion - start_iter.backward_chars( - len(begin) + len(gc_refer_to_nick_char)) - else: - start_iter.backward_chars(len(begin)) - - assert self._account - client = app.get_client(self._account) - client.get_module('Chatstate').block_chatstates( - self._contact, True) - - message_buffer.delete(start_iter, end_iter) - # get a shell-like completion - # if there's more than one nick for this completion, complete - # only the part that all these nicks have in common - if shell_like_completion and len(self._nick_hits) > 1: - end = False - completion = '' - add = '' # if nick is not complete, don't add anything - while not end and len(completion) < len(self._nick_hits[0]): - completion = self._nick_hits[0][:len(completion) + 1] - for nick in self._nick_hits: - if completion.lower() not in nick.lower(): - end = True - completion = completion[:-1] - break - # if the current nick matches a COMPLETE existing nick, - # and if the user tab TWICE, complete that nick (with the - # "add") - if self._last_key_tab: - for nick in self._nick_hits: - if nick == completion: - # The user seems to want this nick, so - # complete it as if it were the only nick - # available - add = gc_refer_to_nick_char + ' ' - else: - completion = self._nick_hits[0] - message_buffer.insert_at_cursor(completion + add) - - client.get_module('Chatstate').block_chatstates( - self._contact, False) + message_buffer.delete(start_iter, end_iter) + completion = self._suggestions[0] + message_buffer.insert_at_cursor(completion + suffix) + + client.get_module('Chatstate').block_chatstates(self._contact, False) self._last_key_tab = True + return True - def _jid_not_blocked(self, resource: str) -> bool: - assert self._account - assert self._contact - resource_contact = self._contact.get_resource(resource) - return not jid_is_blocked( - self._account, str(resource_contact.jid)) + def _generate_suggestions(self, prefix: str) -> list[str]: + def _nick_matching(nick: str) -> bool: + assert self._contact is not None + if nick == self._contact.nickname: + return False + + participant = self._contact.get_resource(nick) + if jid_is_blocked(self._contact.account, str(participant.jid)): + return False + + if prefix == '': + return True + + return nick.lower().startswith(prefix.lower()) + + assert self._contact is not None + # Get recent nicknames from DB. This enables us to suggest + # nicknames even if no message arrived since Gajim was started. + recent_nicknames = app.storage.archive.get_recent_muc_nicks( + self._contact) + + matches: list[str] = [] + for nick in recent_nicknames: + if _nick_matching(nick): + matches.append(nick) + + # Add all other MUC participants + other_nicks: list[str] = [] + for contact in self._contact.get_participants(): + if _nick_matching(contact.name): + if contact.name not in matches: + other_nicks.append(contact.name) + other_nicks.sort(key=str.lower) + + return matches + other_nicks + + def _on_gc_message_received(self, event: GcMessageReceived) -> None: + if self._contact is None: + return + + if event.room_jid != self._contact.jid: + return + + if not self._last_key_tab: + # Clear suggestions if not actively using them + # (new messages may have new nicks) + self._suggestions.clear() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9b2922a3594d22da2de39c4c95a0a5f3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9b2922a3594d22da2de39c4c95a0a5f3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 11 commits: refactor: ChatListRow: Remove unused code
by Philipp Hörist (＠lovetox) 02 Oct '22

02 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c63aa71b by Philipp Hörist at 2022-10-02T19:53:22+02:00 refactor: ChatListRow: Remove unused code - - - - - 66a6d633 by Philipp Hörist at 2022-10-02T19:59:30+02:00 refactor: ChatListRow: Make row headers private attributes - - - - - e17cb70d by Philipp Hörist at 2022-10-02T20:06:54+02:00 refactor: ChatListRow: Define signal handlers in builder xml - - - - - 0f44c5d4 by Philipp Hörist at 2022-10-02T20:09:23+02:00 refactor: ChatListRow: Use Gdk button enums - - - - - 9019cf24 by Philipp Hörist at 2022-10-02T20:31:59+02:00 refactor: ChatListRow: Move connecting contact signals into own method - - - - - 84008836 by Philipp Hörist at 2022-10-02T20:38:13+02:00 refactor: ChatListRow: Simplify setting timestamp - - - - - 447c9d51 by Philipp Hörist at 2022-10-02T20:57:36+02:00 refactor: ChatList: Simplify update time callback - - - - - 81dbde35 by Philipp Hörist at 2022-10-02T21:03:27+02:00 refactor: ChatList: Sort methods - - - - - 3c1323e6 by Philipp Hörist at 2022-10-02T21:07:23+02:00 refactor: ChatListRow: Remove unused code - - - - - 0453e014 by Philipp Hörist at 2022-10-02T21:22:27+02:00 refactor: ChatListRow: Add setter/getter methods for header type - - - - - 1f2dbcad by Philipp Hörist at 2022-10-02T21:31:46+02:00 refactor: ChatListRow: Simplify row header - - - - - 4 changed files: - gajim/common/const.py - gajim/data/gui/chat_list_row.ui - gajim/gtk/chat_list.py - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/common/const.py ===================================== @@ -51,9 +51,8 @@ class Entity(NamedTuple): class RowHeaderType(IntEnum): - ACTIVE = 0 - CONVERSATIONS = 1 - PINNED = 2 + CONVERSATIONS = 0 + PINNED = 1 class AvatarSize(IntEnum): ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkEventBox" id="eventbox"> <property name="visible">True</property> <property name="can-focus">False</property> + <signal name="button-press-event" handler="_on_row_button_press_event" swapped="no"/> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -231,6 +232,7 @@ <property name="receives-default">True</property> <property name="valign">center</property> <property name="margin-end">6</property> + <signal name="clicked" handler="_on_close_button_clicked" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> ===================================== gajim/gtk/chat_list.py ===================================== @@ -99,7 +99,7 @@ def __init__(self, workspace_id: str) -> None: self.connect('drag-data-received', self._on_drag_data_received) self.connect('destroy', self._on_destroy) - self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) + self._timer_id = GLib.timeout_add_seconds(60, self._update_time) self.show_all() @@ -131,11 +131,207 @@ def set_chat_unread_count(self, if chat is not None: chat.unread_count = count + def set_filter(self, name: str) -> None: + self._current_filter = name + self.invalidate_filter() + + def set_filter_text(self, text: str) -> None: + self._current_filter_text = text + self.invalidate_filter() + + def get_chat_type(self, account: str, jid: JID) -> Optional[str]: + row = self._chats.get((account, jid)) + if row is not None: + return row.type + return None + + def get_selected_chat(self) -> Optional[ChatListRow]: + row = cast(ChatListRow, self.get_selected_row()) + if row is None: + return None + return row + + def get_open_chats(self) -> OpenChatsSettingT: + open_chats: OpenChatsSettingT = [] + for key, row in self._chats.items(): + account, jid = key + open_chats.append({'account': account, + 'jid': jid, + 'type': row.type, + 'pinned': row.is_pinned, + 'position': row.position}) + return open_chats + def mark_as_read(self, account: str, jid: JID) -> None: chat = self._chats.get((account, jid)) if chat is not None: chat.reset_unread() + def toggle_chat_pinned(self, account: str, jid: JID) -> None: + row = self._chats[(account, jid)] + + if row.is_pinned: + self._chat_order.remove(row) + row.position = -1 + else: + self._chat_order.append(row) + row.position = self._chat_order.index(row) + + row.toggle_pinned() + self.invalidate_sort() + + def add_chat(self, + account: str, + jid: JID, + type_: str, + pinned: bool, + position: int + ) -> None: + + key = (account, jid) + if self._chats.get(key) is not None: + # Chat is already in the List + return + + row = ChatListRow(self._workspace_id, + account, + jid, + type_, + pinned, + position) + + self._chats[key] = row + if pinned: + self._chat_order.insert(position, row) + + row.connect('drag-begin', self._on_row_drag_begin) + row.connect('unread-changed', self._on_row_unread_changed) + + self.add(row) + + def select_chat(self, account: str, jid: JID) -> None: + row = self._chats[(account, jid)] + self.select_row(row) + + def select_next_chat(self, direction: Direction, + unread_first: bool = False) -> None: + # Selects the next chat, but prioritizes chats with unread messages. + row = self.get_selected_chat() + if row is None: + row = self.get_row_at_index(0) + if row is None: + return + assert isinstance(row, ChatListRow) + self.select_chat(row.account, row.jid) + return + + unread_found = False + if unread_first: + index = row.get_index() + current = index + + # Loop until finding a chat with unread count or completing a cycle + while True: + if direction == Direction.NEXT: + 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 is None: + return + assert isinstance(row, ChatListRow) + 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 direction == Direction.NEXT: + 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 direction == Direction.NEXT: + next_row = self.get_row_at_index(0) + else: + last = len(self.get_children()) - 1 + next_row = self.get_row_at_index(last) + assert isinstance(next_row, ChatListRow) + self.select_chat(next_row.account, next_row.jid) + return + + assert isinstance(next_row, ChatListRow) + self.select_chat(next_row.account, next_row.jid) + + def select_chat_number(self, number: int) -> None: + row = self.get_row_at_index(number) + if row is not None: + assert isinstance(row, ChatListRow) + self.select_chat(row.account, row.jid) + + def remove_chat(self, + account: str, + jid: JID, + emit_unread: bool = True + ) -> None: + + row = self._chats.pop((account, jid)) + if row.is_pinned: + self._chat_order.remove(row) + self.remove(row) + row.destroy() + if emit_unread: + self._emit_unread_changed() + + def remove_chats_for_account(self, account: str) -> None: + for row_account, jid in list(self._chats.keys()): + if row_account != account: + continue + self.remove_chat(account, jid) + self._emit_unread_changed() + + def contains_chat(self, account: str, jid: JID) -> bool: + return self._chats.get((account, jid)) is not None + + def process_event(self, event: events.ChatListEventT) -> None: + if isinstance(event, (events.MessageReceived, + events.MamMessageReceived, + events.GcMessageReceived)): + self._on_message_received(event) + elif isinstance(event, events.MessageUpdated): + self._on_message_updated(event) + elif isinstance(event, events.MessageModerated): + self._on_message_moderated(event) + elif isinstance(event, events.PresenceReceived): + self._on_presence_received(event) + elif isinstance(event, events.MessageSent): + self._on_message_sent(event) + elif isinstance(event, events.JingleRequestReceived): + self._on_jingle_request_received(event) + elif isinstance(event, events.FileRequestReceivedEvent): # pyright: ignore [reportUnnecessaryIsInstance] # noqa + self._on_file_request_received(event) + else: + log.warning('Unhandled Event: %s', event.name) + + def _set_placeholder(self) -> None: + button = Gtk.Button.new_with_label(_('Start Chat')) + button.get_style_context().add_class('suggested-action') + button.set_halign(Gtk.Align.CENTER) + button.set_valign(Gtk.Align.CENTER) + button.connect('clicked', self._on_start_chat_clicked) + button.show() + self.set_placeholder(button) + def _emit_unread_changed(self) -> None: count = self.get_unread_count() chat_list = self.get_parent() @@ -239,11 +435,9 @@ def _change_pinned_order(self, row_before: Optional[ChatListRow]) -> None: self.emit('chat-order-changed') self.invalidate_sort() - def _on_destroy(self, _widget: Gtk.Widget) -> None: - GLib.source_remove(self._timer_id) - - def _update_timer(self) -> bool: - self.update_time() + def _update_time(self) -> bool: + for _key, row in self._chats.items(): + row.update_time() return True def _filter_func(self, row: ChatListRow) -> bool: @@ -263,28 +457,20 @@ def _filter_func(self, row: ChatListRow) -> bool: def _header_func(row: ChatListRow, before: ChatListRow) -> None: if before is None: if row.is_pinned: - row.header = RowHeaderType.PINNED - # elif row.is_active(): - # row.header = RowHeaderType.ACTIVE + row.set_header_type(RowHeaderType.PINNED) else: - row.header = None + row.set_header_type(None) else: if row.is_pinned: if before.is_pinned: - row.header = None + row.set_header_type(None) else: - row.header = RowHeaderType.PINNED - # elif row.is_active(): - # if before.is_active() and not before.is_pinned: - # row.header = None - # else: - # row.header = RowHeaderType.ACTIVE + row.set_header_type(RowHeaderType.PINNED) else: - # if before.is_active() or before.is_pinned: if before.is_pinned: - row.header = RowHeaderType.CONVERSATIONS + row.set_header_type(RowHeaderType.CONVERSATIONS) else: - row.header = None + row.set_header_type(None) def _sort_func(self, row1: ChatListRow, row2: ChatListRow) -> int: if self._mouseover: @@ -319,209 +505,43 @@ def _on_mouse_focus_changed(self, # Not hovering a Gtk.ListBoxRow (row is INFERIOR) self._mouseover = False - def _set_placeholder(self) -> None: - button = Gtk.Button.new_with_label(_('Start Chat')) - button.get_style_context().add_class('suggested-action') - button.set_halign(Gtk.Align.CENTER) - button.set_valign(Gtk.Align.CENTER) - button.connect('clicked', self._on_start_chat_clicked) - button.show() - self.set_placeholder(button) - @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) - def set_filter(self, name: str) -> None: - self._current_filter = name - self.invalidate_filter() - - def set_filter_text(self, text: str) -> None: - self._current_filter_text = text - self.invalidate_filter() - - def get_chat_type(self, account: str, jid: JID) -> Optional[str]: - row = self._chats.get((account, jid)) - if row is not None: - return row.type - return None - - def add_chat(self, - account: str, - jid: JID, - type_: str, - pinned: bool, - position: int - ) -> None: - - key = (account, jid) - if self._chats.get(key) is not None: - # Chat is already in the List - return - - row = ChatListRow(self._workspace_id, - account, - jid, - type_, - pinned, - position) - - self._chats[key] = row - if pinned: - self._chat_order.insert(position, row) - - row.connect('drag-begin', self._on_row_drag_begin) - row.connect('unread-changed', self._on_row_unread_changed) - - self.add(row) - - def select_chat(self, account: str, jid: JID) -> None: - row = self._chats[(account, jid)] - self.select_row(row) + @staticmethod + def _get_nick_for_received_message(event: MessageEventT) -> str: + nick = _('Me') + if event.properties.type.is_groupchat: + event_nick = event.properties.muc_nickname + our_nick = get_group_chat_nick(event.account, event.jid) + if event_nick != our_nick: + nick = event_nick + else: + con = app.get_client(event.account) + own_jid = con.get_own_jid() + if not own_jid.bare_match(event.properties.from_): + nick = '' + return nick - def select_next_chat(self, direction: Direction, - unread_first: bool = False) -> None: - # Selects the next chat, but prioritizes chats with unread messages. - row = self.get_selected_chat() - if row is None: - row = self.get_row_at_index(0) - if row is None: + @staticmethod + def _add_unread(row: ChatListRow, event: MessageEventT) -> None: + if event.properties.is_carbon_message: + if event.properties.carbon.is_sent: return - assert isinstance(row, ChatListRow) - self.select_chat(row.account, row.jid) - return - - unread_found = False - if unread_first: - index = row.get_index() - current = index - - # Loop until finding a chat with unread count or completing a cycle - while True: - if direction == Direction.NEXT: - 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 is None: - return - assert isinstance(row, ChatListRow) - if row.unread_count > 0: - unread_found = True - break - if index == current: - break - - if unread_found: - self.select_chat(row.account, row.jid) + if event.properties.is_from_us(): + # Last message was from us (1:1), reset counter + row.reset_unread() return - index = row.get_index() - if direction == Direction.NEXT: - 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 direction == Direction.NEXT: - next_row = self.get_row_at_index(0) - else: - last = len(self.get_children()) - 1 - next_row = self.get_row_at_index(last) - assert isinstance(next_row, ChatListRow) - self.select_chat(next_row.account, next_row.jid) + our_nick = get_group_chat_nick(event.account, event.jid) + if event.properties.muc_nickname == our_nick: + # Last message was from us (MUC), reset counter + row.reset_unread() return - assert isinstance(next_row, ChatListRow) - self.select_chat(next_row.account, next_row.jid) - - def select_chat_number(self, number: int) -> None: - row = self.get_row_at_index(number) - if row is not None: - assert isinstance(row, ChatListRow) - self.select_chat(row.account, row.jid) - - def toggle_chat_pinned(self, account: str, jid: JID) -> None: - row = self._chats[(account, jid)] - - if row.is_pinned: - self._chat_order.remove(row) - row.position = -1 - else: - self._chat_order.append(row) - row.position = self._chat_order.index(row) - - row.toggle_pinned() - self.invalidate_sort() - - def remove_chat(self, - account: str, - jid: JID, - emit_unread: bool = True - ) -> None: - - row = self._chats.pop((account, jid)) - if row.is_pinned: - self._chat_order.remove(row) - self.remove(row) - row.destroy() - if emit_unread: - self._emit_unread_changed() - - def remove_chats_for_account(self, account: str) -> None: - for row_account, jid in list(self._chats.keys()): - if row_account != account: - continue - self.remove_chat(account, jid) - self._emit_unread_changed() - - def get_selected_chat(self) -> Optional[ChatListRow]: - row = cast(ChatListRow, self.get_selected_row()) - if row is None: - return None - return row - - def contains_chat(self, account: str, jid: JID) -> bool: - return self._chats.get((account, jid)) is not None - - def get_open_chats(self) -> OpenChatsSettingT: - open_chats: OpenChatsSettingT = [] - for key, row in self._chats.items(): - account, jid = key - open_chats.append({'account': account, - 'jid': jid, - 'type': row.type, - 'pinned': row.is_pinned, - 'position': row.position}) - return open_chats - - def update_time(self) -> None: - for _key, row in self._chats.items(): - row.update_time() - - def process_event(self, event: events.ChatListEventT) -> None: - if isinstance(event, (events.MessageReceived, - events.MamMessageReceived, - events.GcMessageReceived)): - self._on_message_received(event) - elif isinstance(event, events.MessageUpdated): - self._on_message_updated(event) - elif isinstance(event, events.MessageModerated): - self._on_message_moderated(event) - elif isinstance(event, events.PresenceReceived): - self._on_presence_received(event) - elif isinstance(event, events.MessageSent): - self._on_message_sent(event) - elif isinstance(event, events.JingleRequestReceived): - self._on_jingle_request_received(event) - elif isinstance(event, events.FileRequestReceivedEvent): # pyright: ignore [reportUnnecessaryIsInstance] # noqa - self._on_file_request_received(event) - else: - log.warning('Unhandled Event: %s', event.name) + row.add_unread(event.msgtxt) def _on_message_received(self, event: MessageEventT) -> None: if not event.msgtxt: @@ -546,21 +566,6 @@ def _on_message_received(self, event: MessageEventT) -> None: self._add_unread(row, event) row.changed() - @staticmethod - def _get_nick_for_received_message(event: MessageEventT) -> str: - nick = _('Me') - if event.properties.type.is_groupchat: - event_nick = event.properties.muc_nickname - our_nick = get_group_chat_nick(event.account, event.jid) - if event_nick != our_nick: - nick = event_nick - else: - con = app.get_client(event.account) - own_jid = con.get_own_jid() - if not own_jid.bare_match(event.properties.from_): - nick = '' - return nick - def _on_message_updated(self, event: events.MessageUpdated) -> None: row = self._chats.get((event.account, JID.from_string(event.jid))) if row is None: @@ -640,25 +645,6 @@ def _on_file_request_received(self, row.set_message_text( _('File'), icon_name='text-x-generic-symbolic') - @staticmethod - def _add_unread(row: ChatListRow, event: MessageEventT) -> None: - if event.properties.is_carbon_message: - if event.properties.carbon.is_sent: - return - - if event.properties.is_from_us(): - # Last message was from us (1:1), reset counter - row.reset_unread() - return - - our_nick = get_group_chat_nick(event.account, event.jid) - if event.properties.muc_nickname == our_nick: - # Last message was from us (MUC), reset counter - row.reset_unread() - return - - row.add_unread(event.msgtxt) - def _on_account_changed(self, *args: Any) -> None: rows = cast(list[ChatListRow], self.get_children()) for row in rows: @@ -668,3 +654,6 @@ def _on_bookmarks_received(self, _event: events.BookmarksReceived) -> None: rows = cast(list[ChatListRow], self.get_children()) for row in rows: row.update_name() + + def _on_destroy(self, _widget: Gtk.Widget) -> None: + GLib.source_remove(self._timer_id) ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -78,39 +78,19 @@ def __init__(self, self.type = type_ self.position = position - self.active_label = ActiveHeader() - self.conversations_label = ConversationsHeader() - self.pinned_label = PinnedHeader() + self._conversations_header = RowHeader(RowHeaderType.CONVERSATIONS) + self._pinned_header = RowHeader(RowHeaderType.PINNED) self._client = app.get_client(account) - self.contact = self._client.get_module('Contacts').get_contact(jid) - - if isinstance(self.contact, BareContact): - self.contact.connect('presence-update', self._on_presence_update) - self.contact.connect('chatstate-update', self._on_chatstate_update) - self.contact.connect('nickname-update', self._on_nickname_update) - self.contact.connect('caps-update', self._on_avatar_update) - self.contact.connect('avatar-update', self._on_avatar_update) - - elif isinstance(self.contact, GroupchatContact): - self.contact.connect('avatar-update', self._on_avatar_update) - elif isinstance(self.contact, GroupchatParticipant): - self.contact.connect('chatstate-update', self._on_chatstate_update) - self.contact.connect('user-joined', self._on_muc_user_update) - self.contact.connect('user-left', self._on_muc_user_update) - self.contact.connect('user-avatar-update', self._on_muc_user_update) - self.contact.connect('user-status-show-changed', - self._on_muc_user_update) - - self.contact.room.connect('room-left', self._on_muc_update) - self.contact.room.connect('room-destroyed', self._on_muc_update) - self.contact.room.connect('room-kicked', self._on_muc_update) + self.contact = self._client.get_module('Contacts').get_contact(jid) + self._connect_contact_signals() self.contact_name: str = self.contact.name self.timestamp: float = 0 self.stanza_id: Optional[str] = None self.message_id: Optional[str] = None + self._unread_count: int = 0 self._needs_muc_highlight: bool = False self._pinned: bool = pinned @@ -118,12 +98,11 @@ def __init__(self, self.get_style_context().add_class('chatlist-row') self._ui = get_builder('chat_list_row.ui') + self._ui.connect_signals(self) self.add(self._ui.eventbox) self.connect('state-flags-changed', self._on_state_flags_changed) self.connect('destroy', self._on_destroy) - self._ui.eventbox.connect('button-press-event', self._on_button_press) - self._ui.close_button.connect('clicked', self._on_close_button_clicked) # Drag and Drop entries = [Gtk.TargetEntry.new( @@ -188,9 +167,7 @@ def __init__(self, nickname=me_nickname, additional_data=line.additional_data) - self.timestamp = line.time - uf_timestamp = get_uf_relative_time(line.time) - self._ui.timestamp_label.set_text(uf_timestamp) + self.set_timestamp(line.time) self.stanza_id = line.stanza_id self.message_id = line.message_id @@ -199,41 +176,16 @@ def __init__(self, KindConstant.FILE_TRANSFER_OUTGOING): self.set_message_text( _('File'), icon_name='text-x-generic-symbolic') - self.timestamp = line.time - uf_timestamp = get_uf_relative_time(line.time) - self._ui.timestamp_label.set_text(uf_timestamp) + self.set_timestamp(line.time) if line.kind in (KindConstant.CALL_INCOMING, KindConstant.CALL_OUTGOING): self.set_message_text( _('Call'), icon_name='call-start-symbolic') - self.timestamp = line.time - uf_timestamp = get_uf_relative_time(line.time) - self._ui.timestamp_label.set_text(uf_timestamp) + self.set_timestamp(line.time) self.show_all() - @property - def header(self) -> Optional[RowHeaderType]: - header = self.get_header() - if header is None: - return None - assert isinstance(header, BaseHeader) - return header.type - - @header.setter - def header(self, type_: Optional[RowHeaderType]) -> None: - if type_ == self.header: - return - if type_ is None: - self.set_header(None) - elif type_ is RowHeaderType.PINNED: - self.set_header(self.pinned_label) - elif type_ == RowHeaderType.ACTIVE: - self.set_header(self.active_label) - else: - self.set_header(self.conversations_label) - @property def is_pinned(self) -> bool: return self._pinned @@ -243,12 +195,6 @@ def is_active(self) -> bool: return (self.is_selected() and self.get_toplevel().get_property('is-active')) - @property - def is_recent(self) -> bool: - if self._unread_count: - return True - return False - @property def unread_count(self) -> int: if (self.contact.is_groupchat and not self.contact.can_notify() and @@ -262,6 +208,26 @@ def unread_count(self, value: int) -> None: self._update_unread() self.emit('unread-changed') + def get_header_type(self) -> Optional[RowHeaderType]: + header = self.get_header() + if header is None: + return None + assert isinstance(header, RowHeader) + return header.type + + def set_header_type(self, header_type: Optional[RowHeaderType]) -> None: + if header_type == self.get_header_type(): + return + + if header_type is None: + self.set_header(None) + + elif header_type == RowHeaderType.PINNED: + self.set_header(self._pinned_header) + + else: + self.set_header(self._conversations_header) + def set_message_id(self, message_id: str) -> None: self.message_id = message_id @@ -308,7 +274,7 @@ def get_real_unread_count(self) -> int: def set_stanza_id(self, stanza_id: str) -> None: self.stanza_id = stanza_id - def set_timestamp(self, timestamp: int) -> None: + def set_timestamp(self, timestamp: float) -> None: self.timestamp = timestamp self.update_time() @@ -418,13 +384,15 @@ def _on_close_button_clicked(self, _button: Gtk.Button) -> None: 'remove-chat', GLib.Variant('as', [self.account, str(self.jid)])) - def _on_button_press(self, - _widget: Gtk.Widget, - event: Gdk.EventButton - ) -> None: - if event.button == 3: # right click + def _on_row_button_press_event(self, + _widget: Gtk.EventBox, + event: Gdk.EventButton + ) -> None: + + if event.button == Gdk.BUTTON_SECONDARY: self._popup_menu(event) - elif event.button == 2: # middle click + + elif event.button == Gdk.BUTTON_MIDDLE: app.window.activate_action( 'remove-chat', GLib.Variant('as', [self.account, str(self.jid)])) @@ -472,6 +440,32 @@ def _on_drag_data_get(self, byte_data = pickle.dumps((self.account, self.jid)) selection_data.set(drop_type, 8, byte_data) + def _connect_contact_signals(self) -> None: + if isinstance(self.contact, BareContact): + self.contact.connect('presence-update', self._on_presence_update) + self.contact.connect('chatstate-update', self._on_chatstate_update) + self.contact.connect('nickname-update', self._on_nickname_update) + self.contact.connect('caps-update', self._on_avatar_update) + self.contact.connect('avatar-update', self._on_avatar_update) + + elif isinstance(self.contact, GroupchatContact): + self.contact.connect('avatar-update', self._on_avatar_update) + + elif isinstance(self.contact, GroupchatParticipant): + self.contact.connect('chatstate-update', self._on_chatstate_update) + self.contact.connect('user-joined', self._on_muc_user_update) + self.contact.connect('user-left', self._on_muc_user_update) + self.contact.connect('user-avatar-update', self._on_muc_user_update) + self.contact.connect('user-status-show-changed', + self._on_muc_user_update) + + self.contact.room.connect('room-left', self._on_muc_update) + self.contact.room.connect('room-destroyed', self._on_muc_update) + self.contact.room.connect('room-kicked', self._on_muc_update) + + else: + raise TypeError('Unkown contact type: %s' % type(self.contact)) + def _on_presence_update(self, _contact: ChatContactT, _signal_name: str @@ -514,37 +508,23 @@ def _on_nickname_update(self, self.update_name() -class BaseHeader(Gtk.Box): - def __init__(self, row_type: RowHeaderType, text: str) -> None: +class RowHeader(Gtk.Box): + def __init__(self, header_type: RowHeaderType) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) - self.type = row_type - label = Gtk.Label(label=text) - label.set_halign(Gtk.Align.START) - self.add(label) - self.get_style_context().add_class('header-box') - self.show_all() - - -class ActiveHeader(BaseHeader): + self.type = header_type - def __init__(self): - BaseHeader.__init__(self, - RowHeaderType.ACTIVE, - _('Active')) - - -class ConversationsHeader(BaseHeader): + if header_type == RowHeaderType.CONVERSATIONS: + text = _('Conversations') + else: + text = _('Pinned') - def __init__(self): - BaseHeader.__init__(self, - RowHeaderType.CONVERSATIONS, - _('Conversations')) + label = Gtk.Label(label=text) + label.set_halign(Gtk.Align.START) + self.add(label) -class PinnedHeader(BaseHeader): + self.get_style_context().add_class('header-box') + if header_type == RowHeaderType.PINNED: + self.get_style_context().add_class('header-box-first') - def __init__(self): - BaseHeader.__init__(self, - RowHeaderType.PINNED, - _('Pinned')) - self.get_style_context().add_class('header-box-first') + self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0b999e0e65d980576b3bf5b45829ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0b999e0e65d980576b3bf5b45829ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: ChatListRow: Sort methods
by Philipp Hörist (＠lovetox) 02 Oct '22

02 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c0b999e0 by Philipp Hörist at 2022-10-02T19:11:24+02:00 refactor: ChatListRow: Sort methods - - - - - 1 changed file: - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -238,88 +238,85 @@ def header(self, type_: Optional[RowHeaderType]) -> None: def is_pinned(self) -> bool: return self._pinned - def _on_button_press(self, - _widget: Gtk.Widget, - event: Gdk.EventButton - ) -> None: - if event.button == 3: # right click - self._popup_menu(event) - elif event.button == 2: # middle click - app.window.activate_action( - 'remove-chat', - GLib.Variant('as', [self.account, str(self.jid)])) + @property + def is_active(self) -> bool: + return (self.is_selected() and + self.get_toplevel().get_property('is-active')) - def _popup_menu(self, event: Gdk.EventButton): - menu = get_chat_list_row_menu( - self.workspace_id, self.account, self.jid, self._pinned) + @property + def is_recent(self) -> bool: + if self._unread_count: + return True + return False - event_widget = Gtk.get_event_widget(event) - x = event.x - if isinstance(event_widget, Gtk.Button): - # When the event is triggered by pressing the close button we get - # a x coordinate relative to the window of the close button, which - # would be a very low x integer as the close button is small, this - # leads to opening the menu far away from the mouse. We overwrite - # the x coordinate with an approx. position of the close button. - x = self.get_allocated_width() - 10 + @property + def unread_count(self) -> int: + if (self.contact.is_groupchat and not self.contact.can_notify() and + not self._needs_muc_highlight): + return 0 + return self._unread_count - popover = GajimPopover(menu, relative_to=self) - popover.set_pointing_to_coord(x=x, y=event.y) - popover.popup() + @unread_count.setter + def unread_count(self, value: int) -> None: + self._unread_count = value + self._update_unread() + self.emit('unread-changed') - def _on_drag_begin(self, - row: ChatListRow, - drag_context: Gdk.DragContext - ) -> None: + def set_message_id(self, message_id: str) -> None: + self.message_id = message_id - # Use rendered ChatListRow as drag icon - alloc = self.get_allocation() - surface = cairo.ImageSurface( - cairo.Format.ARGB32, alloc.width, alloc.height) - context = cairo.Context(surface) - self.draw(context) - Gtk.drag_set_icon_surface(drag_context, surface) + def set_message_text(self, + text: str, + nickname: Optional[str] = None, + icon_name: Optional[str] = None, + additional_data: Optional[AdditionalDataDict] = None + ) -> None: + icon = None + if icon_name is not None: + icon = Gio.Icon.new_for_string(icon_name) + if additional_data is not None: + if app.preview_manager.is_previewable(text, additional_data): + file_name = filename_from_uri(text) + icon, file_type = guess_simple_file_type(text) + text = f'{file_type} ({file_name})' - def _on_drag_data_get(self, - _widget: Gtk.Widget, - _drag_context: Gdk.DragContext, - selection_data: Gtk.SelectionData, - _info: int, - _time: int - ) -> None: + text = GLib.markup_escape_text(text) + if text.startswith('/me') and nickname is not None: + nickname = GLib.markup_escape_text(nickname) + text = text.replace('/me', f'* {nickname}', 1) + text = f'<i>{text}</i>' - drop_type = Gdk.Atom.intern_static_string('CHAT_LIST_ITEM') - byte_data = pickle.dumps((self.account, self.jid)) - selection_data.set(drop_type, 8, byte_data) + # Split by newline and display last line (or first, if last is newline) + lines = text.split('\n') + text = lines[-1] or lines[0] + self._ui.message_label.set_markup(text) - def toggle_pinned(self) -> None: - self._pinned = not self._pinned + if icon is None: + self._ui.message_icon.hide() + else: + self._ui.message_icon.set_from_gicon(icon, Gtk.IconSize.MENU) + self._ui.message_icon.show() - def _on_presence_update(self, - _contact: ChatContactT, - _signal_name: str - ) -> None: - self.update_avatar() + def set_nick(self, nickname: str) -> None: + self._ui.nick_label.set_visible(bool(nickname)) + self._ui.nick_label.set_text( + _('%(nickname)s:') % {'nickname': nickname}) - def _on_avatar_update(self, - _contact: ChatContactT, - _signal_name: str - ) -> None: - self.update_avatar() + def get_real_unread_count(self) -> int: + return self._unread_count - def _on_muc_user_update(self, - _contact: GroupchatParticipant, - _signal_name: str, - *args: Any - ) -> None: - self.update_avatar() + def set_stanza_id(self, stanza_id: str) -> None: + self.stanza_id = stanza_id - def _on_muc_update(self, - _contact: GroupchatContact, - _signal_name: str, - *args: Any - ) -> None: - self.update_avatar() + def set_timestamp(self, timestamp: int) -> None: + self.timestamp = timestamp + self.update_time() + + def update_account_identifier(self) -> None: + account_class = app.css_config.get_dynamic_class(self.account) + self._ui.account_identifier.get_style_context().add_class(account_class) + show = len(app.settings.get_active_accounts()) > 1 + self._ui.account_identifier.set_visible(show) def update_avatar(self) -> None: scale = self.get_scale_factor() @@ -338,53 +335,11 @@ def update_name(self) -> None: self.contact_name = _('Note to myself') self._ui.name_label.set_text(self.contact_name) - def update_account_identifier(self) -> None: - account_class = app.css_config.get_dynamic_class(self.account) - self._ui.account_identifier.get_style_context().add_class(account_class) - show = len(app.settings.get_active_accounts()) > 1 - self._ui.account_identifier.set_visible(show) - - def _on_chatstate_update(self, - contact: OneOnOneContactT, - _signal_name: str - ) -> None: - if contact.chatstate is None: - self._ui.chatstate_image.hide() - else: - self._ui.chatstate_image.set_visible(contact.chatstate.is_composing) - - def _on_nickname_update(self, - _contact: ChatContactT, - _signal_name: str - ) -> None: - self.update_name() - - def get_real_unread_count(self) -> int: - return self._unread_count - - @property - def unread_count(self) -> int: - if (self.contact.is_groupchat and not self.contact.can_notify() and - not self._needs_muc_highlight): - return 0 - return self._unread_count - - @unread_count.setter - def unread_count(self, value: int) -> None: - self._unread_count = value - self._update_unread() - self.emit('unread-changed') - - def _update_unread(self) -> None: - unread_count = self._get_unread_string(self._unread_count) - self._ui.unread_label.set_text(unread_count) - self._ui.unread_label.set_visible(bool(self._unread_count)) - - @staticmethod - def _get_unread_string(count: int) -> str: - if count < 1000: - return str(count) - return '999+' + def update_time(self) -> None: + if self.timestamp == 0: + return + self._ui.timestamp_label.set_text( + get_uf_relative_time(self.timestamp)) def add_unread(self, text: str) -> None: control = app.window.get_control() @@ -427,16 +382,19 @@ def reset_unread(self) -> None: self._ui.unread_label.get_style_context().add_class( 'unread-counter-silent') - @property - def is_active(self) -> bool: - return (self.is_selected() and - self.get_toplevel().get_property('is-active')) + def toggle_pinned(self) -> None: + self._pinned = not self._pinned - @property - def is_recent(self) -> bool: - if self._unread_count: - return True - return False + def _update_unread(self) -> None: + unread_count = self._get_unread_string(self._unread_count) + self._ui.unread_label.set_text(unread_count) + self._ui.unread_label.set_visible(bool(self._unread_count)) + + @staticmethod + def _get_unread_string(count: int) -> str: + if count < 1000: + return str(count) + return '999+' def _on_state_flags_changed(self, _row: ChatListRow, @@ -460,58 +418,100 @@ def _on_close_button_clicked(self, _button: Gtk.Button) -> None: 'remove-chat', GLib.Variant('as', [self.account, str(self.jid)])) - def set_timestamp(self, timestamp: int) -> None: - self.timestamp = timestamp - self.update_time() + def _on_button_press(self, + _widget: Gtk.Widget, + event: Gdk.EventButton + ) -> None: + if event.button == 3: # right click + self._popup_menu(event) + elif event.button == 2: # middle click + app.window.activate_action( + 'remove-chat', + GLib.Variant('as', [self.account, str(self.jid)])) - def set_stanza_id(self, stanza_id: str) -> None: - self.stanza_id = stanza_id + def _popup_menu(self, event: Gdk.EventButton): + menu = get_chat_list_row_menu( + self.workspace_id, self.account, self.jid, self._pinned) - def set_message_id(self, message_id: str) -> None: - self.message_id = message_id + event_widget = Gtk.get_event_widget(event) + x = event.x + if isinstance(event_widget, Gtk.Button): + # When the event is triggered by pressing the close button we get + # a x coordinate relative to the window of the close button, which + # would be a very low x integer as the close button is small, this + # leads to opening the menu far away from the mouse. We overwrite + # the x coordinate with an approx. position of the close button. + x = self.get_allocated_width() - 10 - def update_time(self) -> None: - if self.timestamp == 0: - return - self._ui.timestamp_label.set_text( - get_uf_relative_time(self.timestamp)) + popover = GajimPopover(menu, relative_to=self) + popover.set_pointing_to_coord(x=x, y=event.y) + popover.popup() - def set_nick(self, nickname: str) -> None: - self._ui.nick_label.set_visible(bool(nickname)) - self._ui.nick_label.set_text( - _('%(nickname)s:') % {'nickname': nickname}) + def _on_drag_begin(self, + row: ChatListRow, + drag_context: Gdk.DragContext + ) -> None: - def set_message_text(self, - text: str, - nickname: Optional[str] = None, - icon_name: Optional[str] = None, - additional_data: Optional[AdditionalDataDict] = None - ) -> None: - icon = None - if icon_name is not None: - icon = Gio.Icon.new_for_string(icon_name) - if additional_data is not None: - if app.preview_manager.is_previewable(text, additional_data): - file_name = filename_from_uri(text) - icon, file_type = guess_simple_file_type(text) - text = f'{file_type} ({file_name})' + # Use rendered ChatListRow as drag icon + alloc = self.get_allocation() + surface = cairo.ImageSurface( + cairo.Format.ARGB32, alloc.width, alloc.height) + context = cairo.Context(surface) + self.draw(context) + Gtk.drag_set_icon_surface(drag_context, surface) - text = GLib.markup_escape_text(text) - if text.startswith('/me') and nickname is not None: - nickname = GLib.markup_escape_text(nickname) - text = text.replace('/me', f'* {nickname}', 1) - text = f'<i>{text}</i>' + def _on_drag_data_get(self, + _widget: Gtk.Widget, + _drag_context: Gdk.DragContext, + selection_data: Gtk.SelectionData, + _info: int, + _time: int + ) -> None: - # Split by newline and display last line (or first, if last is newline) - lines = text.split('\n') - text = lines[-1] or lines[0] - self._ui.message_label.set_markup(text) + drop_type = Gdk.Atom.intern_static_string('CHAT_LIST_ITEM') + byte_data = pickle.dumps((self.account, self.jid)) + selection_data.set(drop_type, 8, byte_data) - if icon is None: - self._ui.message_icon.hide() + def _on_presence_update(self, + _contact: ChatContactT, + _signal_name: str + ) -> None: + self.update_avatar() + + def _on_avatar_update(self, + _contact: ChatContactT, + _signal_name: str + ) -> None: + self.update_avatar() + + def _on_muc_user_update(self, + _contact: GroupchatParticipant, + _signal_name: str, + *args: Any + ) -> None: + self.update_avatar() + + def _on_muc_update(self, + _contact: GroupchatContact, + _signal_name: str, + *args: Any + ) -> None: + self.update_avatar() + + def _on_chatstate_update(self, + contact: OneOnOneContactT, + _signal_name: str + ) -> None: + if contact.chatstate is None: + self._ui.chatstate_image.hide() else: - self._ui.message_icon.set_from_gicon(icon, Gtk.IconSize.MENU) - self._ui.message_icon.show() + self._ui.chatstate_image.set_visible(contact.chatstate.is_composing) + + def _on_nickname_update(self, + _contact: ChatContactT, + _signal_name: str + ) -> None: + self.update_name() class BaseHeader(Gtk.Box): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0b999e0e65d980576b3bf5b45829ad7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0b999e0e65d980576b3bf5b45829ad7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: ChatListRow: Remove not needed code
by Philipp Hörist (＠lovetox) 02 Oct '22

02 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 75bfb459 by Philipp Hörist at 2022-10-02T17:08:57+02:00 refactor: ChatListRow: Remove not needed code row is self, there is no need to translate anything - - - - - 1 changed file: - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -278,11 +278,6 @@ def _on_drag_begin(self, cairo.Format.ARGB32, alloc.width, alloc.height) context = cairo.Context(surface) self.draw(context) - coords = row.translate_coordinates(self, 0, 0) - if coords is None: - return - dest_x, dest_y = coords - surface.set_device_offset(-dest_x, -dest_y) Gtk.drag_set_icon_surface(drag_context, surface) def _on_drag_data_get(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75bfb459a8ddfc5997199b76bd3f5b32… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75bfb459a8ddfc5997199b76bd3f5b32… 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