Commits October 2022

commits@gajim.org

1 participants
208 discussions

[Git][gajim/python-nbxmpp] Pushed new tag 3.2.5
by Philipp Hörist (＠lovetox) 31 Oct '22

31 Oct '22

Philipp Hörist pushed new tag 3.2.5 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/3.2.5 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] release: 3.2.5
by Philipp Hörist (＠lovetox) 31 Oct '22

31 Oct '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6f310728 by Philipp Hörist at 2022-10-31T11:49:38+01:00 release: 3.2.5 - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,14 @@ +nbxmpp 3.2.5 (26 Oct 2022) + + New + + * Add support for XEP-0421 + + Bug Fixes + + * MUC: Check correctly for muc subject + * Client: Don’t override modified certification errors + nbxmpp 3.2.4 (05 Oct 2022) Improvements ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__: str = '3.2.4' +__version__: str = '3.2.5' ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 3.2.4 +version = 3.2.5 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6f31072892ff530322f06c7d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6f31072892ff530322f06c7d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Disable loading of GUPnPIgd library
by Philipp Hörist (＠lovetox) 31 Oct '22

31 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b497df5 by Philipp Hörist at 2022-10-31T11:38:53+01:00 fix: Disable loading of GUPnPIgd library GUPnPIgd uses libsoup3 which is incompatible with Gajims usage of libsoup2. This disables loading until Gajim switches to libsoup3. Fixes #11183 - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -222,14 +222,17 @@ def detect_dependencies() -> None: pass # UPNP - try: - gi.require_version('GUPnPIgd', '1.0') - from gi.repository import GUPnPIgd - global gupnp_igd # pylint: disable=global-statement - gupnp_igd = GUPnPIgd.SimpleIgd() - _dependencies['UPNP'] = True - except ValueError: - pass + # GUPnPidg uses libsoup3 which is incompatible with Gajim. + # Don’t load until Gajim is ported to libsoup3 + # + # try: + # gi.require_version('GUPnPIgd', '1.0') + # from gi.repository import GUPnPIgd + # global gupnp_igd # pylint: disable=global-statement + # gupnp_igd = GUPnPIgd.SimpleIgd() + # _dependencies['UPNP'] = True + # except ValueError: + # pass # IDLE try: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b497df5d065af3b3bc95f7c26096e77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b497df5d065af3b3bc95f7c26096e77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Remote: Make get_status() return correct status when offline
by Philipp Hörist (＠lovetox) 31 Oct '22

31 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6e459182 by Philipp Hörist at 2022-10-31T11:07:14+01:00 fix: Remote: Make get_status() return correct status when offline - - - - - 1 changed file: - gajim/common/dbus/remote_control.py Changes: ===================================== gajim/common/dbus/remote_control.py ===================================== @@ -248,7 +248,7 @@ def raise_signal(self, event_name: str, data: Any) -> None: def get_status(account: str) -> str: if not account: return helpers.get_global_show() - return app.get_client(account).status + return helpers.get_client_status(account) @staticmethod def get_status_message(account: str) -> str: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e459182e7e8ed4831e5cd972f5eda9e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e459182e7e8ed4831e5cd972f5eda9e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Archive: Remove unnecessary doc string
by Philipp Hörist (＠lovetox) 31 Oct '22

31 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 13c4e456 by Philipp Hörist at 2022-10-31T10:22:45+01:00 refactor: Archive: Remove unnecessary doc string - - - - - 4982798c by Philipp Hörist at 2022-10-31T10:22:45+01:00 refactor: Contacts: Remove pixbuf option from get_avatar() This is only needed once, for notifications. - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/common/storage/archive.py - gajim/gtk/notification.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -456,7 +456,6 @@ def get_avatar(self, size: int, scale: int, add_show: bool = True, - pixbuf: bool = False, default: bool = False, style: str = 'circle'): @@ -479,15 +478,6 @@ def get_avatar(self, if self.avatar_sha is not None: transport_icon = None - if pixbuf: - return app.app.avatar_storage.get_pixbuf( - self, - size, - scale, - show, - default=default, - transport_icon=transport_icon, - style=style) return app.app.avatar_storage.get_surface( self, size, ===================================== gajim/common/storage/archive.py ===================================== @@ -22,6 +22,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any +from typing import Literal from typing import Iterator from typing import KeysView from typing import NamedTuple @@ -1238,20 +1239,12 @@ def set_marker(self, account_jid: str, jid: str, message_id: str, - state: str + state: Literal['received', 'displayed'] ) -> None: ''' Update the marker state of the corresponding message - - :param account_jid: The jid of the account - - :param jid: The jid that belongs to the avatar - - :param message_id: The id of the message - - :param state: The state, 'received' or 'displayed' - ''' + if state not in ('received', 'displayed'): raise ValueError('Invalid marker state') ===================================== gajim/gtk/notification.py ===================================== @@ -413,7 +413,12 @@ def _get_avatar_for_notification(account: str, size = AvatarSize.NOTIFICATION client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) - pixbuf = contact.get_avatar(size, scale, pixbuf=True) + surface = contact.get_avatar(size, scale) + pixbuf = Gdk.pixbuf_get_from_surface(surface, + 0, + 0, + size * scale, + size * scale) assert pixbuf is not None return pixbuf View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cd159c4df8d9a67772e507fa93be5eb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cd159c4df8d9a67772e507fa93be5eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Add action to copy multiple messages
by Philipp Hörist (＠lovetox) 30 Oct '22

30 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: cd159c4d by Daniel Brötzmann at 2022-10-30T21:47:22+00:00 feat: Add action to copy multiple messages - - - - - 10 changed files: - gajim/data/style/gajim.css - gajim/gtk/const.py - gajim/gtk/control.py - + gajim/gtk/conversation/message_selection.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -686,6 +686,15 @@ #GroupchatConfig stacksidebar > scrolledwindow { } #GroupchatConfig treeview { padding: 5px; } +.message-selection-box { + background-color: alpha(rgb(70, 70, 70), 0.9); + padding: 12px; + border-radius: 6px; +} +.message-selection-box > label { + color: rgb(230, 230, 230); +} + .groupchat-state box { background-color: alpha(rgb(70, 70, 70), 0.9); padding: 12px; ===================================== gajim/gtk/const.py ===================================== @@ -192,6 +192,7 @@ def __str__(self): ('input-strike', None, True), ('input-clear', None, True), ('show-emoji-chooser', None, True), + ('activate-message-selection', 'u', True), ('correct-message', None, False), ('quote', 's', False), ('mention', 's', False), ===================================== gajim/gtk/control.py ===================================== @@ -23,6 +23,7 @@ import logging import time +from gi.repository import Gio from gi.repository import Gtk from gi.repository import GLib @@ -48,8 +49,9 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow -from gajim.gtk.conversation.view import ConversationView +from gajim.gui.conversation.message_selection import MessageSelection +from gajim.gui.conversation.view import ConversationView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.builder import get_builder from gajim.gui.groupchat_roster import GroupchatRoster @@ -79,6 +81,11 @@ def __init__(self) -> None: self._groupchat_state = GroupchatState() self._ui.conv_view_overlay.add_overlay(self._groupchat_state) + self._message_selection = MessageSelection() + self._message_selection.connect('copy', self._on_copy_selection) + self._message_selection.connect('cancel', self._on_cancel_selection) + self._ui.conv_view_overlay.add_overlay(self._message_selection) + self._jump_to_end_button = JumpToEndButton() self._jump_to_end_button.connect('clicked', self._on_jump_to_end) self._ui.conv_view_overlay.add_overlay(self._jump_to_end_button) @@ -90,6 +97,9 @@ def __init__(self) -> None: # Used with encryption plugins self.sendmessage = False + app.window.get_action('activate-message-selection').connect( + 'activate', self._on_activate_message_selection) + self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -156,6 +166,9 @@ def switch_contact(self, contact: Union[BareContact, self._groupchat_state.switch_contact(contact) self._roster.switch_contact(contact) + self._message_selection.set_no_show_all(True) + self._message_selection.hide() + self._register_events() if isinstance(contact, GroupchatParticipant): @@ -452,6 +465,22 @@ def _on_autoscroll_changed(self, if app.window.is_chat_active(self.contact.account, self.contact.jid): app.window.mark_as_read(self.contact.account, self.contact.jid) + def _on_activate_message_selection(self, + _action: Gio.SimpleAction, + param: GLib.Variant + ) -> None: + + log_line_id = param.get_uint32() + self._scrolled_view.enable_row_selection(log_line_id) + self._message_selection.set_no_show_all(False) + self._message_selection.show_all() + + def _on_copy_selection(self, _widget: MessageSelection) -> None: + self._scrolled_view.copy_selected_messages() + + def _on_cancel_selection(self, _widget: MessageSelection) -> None: + self._scrolled_view.disable_row_selection() + def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() ===================================== gajim/gtk/conversation/message_selection.py ===================================== @@ -0,0 +1,58 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 gi.repository import GObject +from gi.repository import Gtk + +from gajim.common.i18n import _ + + +class MessageSelection(Gtk.Grid): + + __gsignals__ = { + 'copy': (GObject.SignalFlags.RUN_LAST, None, ()), + 'cancel': (GObject.SignalFlags.RUN_LAST, None, ()), + } + + def __init__(self) -> None: + Gtk.Grid.__init__(self, row_spacing=18, column_spacing=6) + self.set_no_show_all(True) + self.set_halign(Gtk.Align.CENTER) + self.set_valign(Gtk.Align.END) + + self.get_style_context().add_class('message-selection-box') + + label = Gtk.Label(label=_('Click messages to select them')) + self.attach(label, 0, 0, 2, 1) + + copy_button = Gtk.Button(label=_('Copy Text')) + copy_button.get_style_context().add_class('suggested-action') + copy_button.connect('clicked', self._on_copy_clicked) + self.attach(copy_button, 0, 1, 1, 1) + + cancel_button = Gtk.Button(label=_('Cancel')) + cancel_button.connect('clicked', self._on_cancel_clicked) + self.attach(cancel_button, 1, 1, 1, 1) + + def _on_copy_clicked(self, _button: Gtk.Button) -> None: + self.set_no_show_all(True) + self.hide() + self.emit('copy') + + def _on_cancel_clicked(self, _button: Gtk.Button) -> None: + self.set_no_show_all(True) + self.hide() + self.emit('cancel') ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -51,6 +51,11 @@ def get_text(self) -> str: return self._content.text return self._action_phrase_text + def set_selectable(self, selectable: bool) -> None: + for widget in self.get_children(): + if isinstance(widget, PlainWidget): + widget.set_selectable(selectable) + def add_with_styling(self, text: str, nickname: Optional[str] = None) -> None: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -68,6 +68,10 @@ def __init__(self, account: str, selectable: bool) -> None: self._text_widget = MessageLabel(self._account, selectable) self.add(self._text_widget) + def set_selectable(self, selectable: bool) -> None: + if isinstance(self._text_widget, MessageLabel): + self._text_widget.set_selectable(selectable) + def add_content(self, block: PlainBlock) -> None: self._text_widget.print_text_with_styling(block) ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -39,6 +39,7 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: self.text: str = '' self._merged: bool = False + self.set_selectable(False) self.set_can_focus(False) self.get_style_context().add_class('conversation-row') @@ -54,6 +55,12 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: self.connect('destroy', self.__destroy) + def enable_selection_mode(self) -> None: + return + + def disable_selection_mode(self) -> None: + return + @property def is_merged(self) -> bool: return self._merged ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -92,6 +92,8 @@ def __init__(self, self.additional_data = additional_data self.display_marking = display_marking + self.set_selectable(True) + self._account = account self._contact = contact @@ -198,6 +200,14 @@ def __init__(self, self.show_all() + def enable_selection_mode(self) -> None: + if isinstance(self._message_widget, MessageWidget): + self._message_widget.set_selectable(False) + + def disable_selection_mode(self) -> None: + if isinstance(self._message_widget, MessageWidget): + self._message_widget.set_selectable(True) + def _add_security_label(self, display_marking: Optional[Displaymarking] ) -> None: @@ -299,17 +309,20 @@ def is_mergeable(self, message: MessageRow) -> bool: return False return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME + def get_text(self) -> str: + return self._message_widget.get_text() + def on_copy_message(self, _widget: Gtk.Widget) -> None: time_format = from_one_line(app.settings.get('chat_timestamp_format')) timestamp_formatted = self.timestamp.strftime(time_format) clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - text = self._message_widget.get_text() + text = self.get_text() clip.set_text(f'{timestamp_formatted} - {self.name}: {text}', -1) def on_quote_message(self, _widget: Gtk.Widget) -> None: app.window.activate_action( - 'quote', GLib.Variant('s', self._message_widget.get_text())) + 'quote', GLib.Variant('s', self.get_text())) def on_correct_message(self, _widget: Gtk.Widget) -> None: app.window.activate_action('correct-message', None) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -79,7 +79,7 @@ def _on_click(self, _button: Gtk.Button) -> None: show_retract = False if isinstance(self._contact, GroupchatContact): if not self._contact.is_joined: - self._create_popover(show_retract=False) + self._create_popover() return contact = self._contact.get_resource(self._name) @@ -99,13 +99,14 @@ def _on_click(self, _button: Gtk.Button) -> None: show_correction = app.window.is_message_correctable( self._contact, self._row.message_id) - self._create_popover(show_retract=show_retract, - show_correction=show_correction) + self._create_popover(show_retract, + show_correction) def _create_popover(self, show_retract: bool = False, show_correction: bool = False ) -> None: + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) menu_box.get_style_context().add_class('padding-6') @@ -135,6 +136,14 @@ def _create_popover(self, 'edit-copy-symbolic', Gtk.IconSize.MENU)) menu_box.add(copy_button) + select_button = Gtk.ModelButton() + select_button.set_halign(Gtk.Align.START) + select_button.connect('clicked', self._on_activate_message_selection) + select_button.set_label(Q_('?Message row action:Select Messages…')) + select_button.set_image(Gtk.Image.new_from_icon_name( + 'edit-select-symbolic', Gtk.IconSize.MENU)) + menu_box.add(select_button) + if show_correction: correct_button = Gtk.ModelButton() correct_button.set_halign(Gtk.Align.START) @@ -164,6 +173,11 @@ def _create_popover(self, popover.connect('closed', self._on_closed) popover.popup() + def _on_activate_message_selection(self, _button: Gtk.ModelButton) -> None: + app.window.activate_action( + 'activate-message-selection', + GLib.Variant('u', self._row.log_line_id)) + @staticmethod def _on_closed(popover: Gtk.Popover) -> None: GLib.idle_add(popover.destroy) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -27,6 +27,7 @@ from datetime import datetime from datetime import timedelta +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GObject from gi.repository import Gio @@ -41,6 +42,7 @@ from gajim.common import types from gajim.common import events from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import from_one_line from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day from gajim.common.modules.contacts import GroupchatContact @@ -141,6 +143,40 @@ def __init__(self) -> None: app.window.get_action('scroll-view-down').connect( 'activate', self._on_scroll_view) + def copy_selected_messages(self) -> None: + time_format = from_one_line(app.settings.get('chat_timestamp_format')) + selection_text = '' + for row in cast(list[BaseRow], self._list_box.get_selected_rows()): + if isinstance(row, MessageRow): + timestamp_formatted = row.timestamp.strftime(time_format) + selection_text += (f'{timestamp_formatted} - {row.name}: ' + f'{row.get_text()}\n') + + clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clip.set_text(selection_text, -1) + + self.disable_row_selection() + + def enable_row_selection(self, + log_line_id: Optional[int] + ) -> None: + + self._list_box.set_selection_mode(Gtk.SelectionMode.MULTIPLE) + + if log_line_id is not None: + row = self.get_row_by_log_line_id(log_line_id) + self._list_box.select_row(row) + + for row in self.iter_rows(): + row.enable_selection_mode() + + def disable_row_selection(self) -> None: + self._list_box.unselect_all() + self._list_box.set_selection_mode(Gtk.SelectionMode.NONE) + + for row in self.iter_rows(): + row.disable_selection_mode() + def _on_scroll_view(self, action: Gio.SimpleAction, _param: Literal[None]) -> None: @@ -187,6 +223,8 @@ def switch_contact(self, contact: ChatContactT) -> None: self._block_signals = True self._reset() + self.disable_row_selection() + self._read_marker_row = ReadMarkerRow(self._contact) self._list_box.add(self._read_marker_row) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd159c4df8d9a67772e507fa93be5ebd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd159c4df8d9a67772e507fa93be5ebd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch message-selection
by Daniel Brötzmann (＠wurstsalat) 30 Oct '22

30 Oct '22

Daniel Brötzmann deleted branch message-selection at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-selection] 8 commits: fix: Make strings translatable
by Philipp Hörist (＠lovetox) 30 Oct '22

30 Oct '22

Philipp Hörist pushed to branch message-selection at gajim / gajim Commits: 3664f77b by Philipp Hörist at 2022-10-30T17:15:04+01:00 fix: Make strings translatable - Remove not useful placeholder text in treeview rows - - - - - 7ecb474f by Philipp Hörist at 2022-10-30T17:17:15+01:00 fix: Make string translatable - - - - - 1e9537dc by Philipp Hörist at 2022-10-30T17:25:49+01:00 cfix: Fix typo - - - - - f76bde26 by Philipp Hörist at 2022-10-30T19:30:41+01:00 fix: Plugins: Use correct gettext import - - - - - 48e80218 by Philipp Hörist at 2022-10-30T19:34:29+01:00 cfix: Don’t translate xmpp address not translatable - - - - - 0b661303 by wurstsalat at 2022-10-30T21:43:58+00:00 feat: Add action to copy multiple messages Fixes #10975 - - - - - 28301b2e by Philipp Hörist at 2022-10-30T21:43:58+00:00 refactor: Rename methods - - - - - 5209892c by Philipp Hörist at 2022-10-30T21:43:58+00:00 refactor: Add selection mode methods to BaseRow - - - - - 17 changed files: - gajim/data/gui/account_wizard.ui - gajim/data/gui/groupchat_affiliation.ui - gajim/data/gui/groupchat_outcast.ui - gajim/data/gui/synchronize_accounts.ui - gajim/data/style/gajim.css - gajim/gtk/const.py - gajim/gtk/control.py - + gajim/gtk/conversation/message_selection.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_creation.py - gajim/gtk/notification_manager.py - gajim/gtk/plugins.py Changes: ===================================== gajim/data/gui/account_wizard.ui ===================================== @@ -330,7 +330,7 @@ <property name="can-focus">True</property> <property name="tooltip-text" translatable="yes">Your XMPP address (e.g. user(a)example.org)</property> <property name="activates-default">True</property> - <property name="placeholder-text" translatable="yes">user(a)example.org</property> + <property name="placeholder-text">user(a)example.org</property> <property name="completion">entrycompletion1</property> </object> <packing> ===================================== gajim/data/gui/groupchat_affiliation.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkListStore" id="affiliation_store"> @@ -70,7 +70,7 @@ <property name="resizable">True</property> <property name="sizing">fixed</property> <property name="min-width">150</property> - <property name="title">XMPP Address</property> + <property name="title" translatable="yes">XMPP Address</property> <property name="expand">True</property> <property name="clickable">True</property> <property name="sort-indicator">True</property> @@ -98,7 +98,6 @@ <property name="sort-column-id">1</property> <child> <object class="GtkCellRendererText"> - <property name="placeholder-text">Name</property> <signal name="edited" handler="_on_nick_edited" swapped="no"/> </object> <attributes> ===================================== gajim/data/gui/groupchat_outcast.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkPopover" id="info_popover"> @@ -61,7 +61,7 @@ <property name="resizable">True</property> <property name="sizing">fixed</property> <property name="min-width">150</property> - <property name="title">XMPP Address</property> + <property name="title" translatable="yes">XMPP Address</property> <property name="expand">True</property> <property name="clickable">True</property> <property name="sort-indicator">True</property> @@ -90,7 +90,6 @@ <property name="sort-column-id">1</property> <child> <object class="GtkCellRendererText"> - <property name="placeholder-text">Spam</property> <signal name="edited" handler="_on_reason_edited" swapped="no"/> </object> <attributes> ===================================== gajim/data/gui/synchronize_accounts.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkStack" id="stack"> @@ -34,6 +34,9 @@ <object class="GtkTreeView" id="accounts_treeview"> <property name="visible">True</property> <property name="can-focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> </object> </child> </object> @@ -45,7 +48,7 @@ </child> <child> <object class="GtkButton"> - <property name="label">Selects Contacts</property> + <property name="label" translatable="yes">Select Contacts</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="receives-default">False</property> @@ -113,7 +116,7 @@ <property name="can-focus">False</property> <child> <object class="GtkButton"> - <property name="label">Synchronize</property> + <property name="label" translatable="yes">Synchronize</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -686,6 +686,15 @@ #GroupchatConfig stacksidebar > scrolledwindow { } #GroupchatConfig treeview { padding: 5px; } +.message-selection-box { + background-color: alpha(rgb(70, 70, 70), 0.9); + padding: 12px; + border-radius: 6px; +} +.message-selection-box > label { + color: rgb(230, 230, 230); +} + .groupchat-state box { background-color: alpha(rgb(70, 70, 70), 0.9); padding: 12px; ===================================== gajim/gtk/const.py ===================================== @@ -192,6 +192,7 @@ def __str__(self): ('input-strike', None, True), ('input-clear', None, True), ('show-emoji-chooser', None, True), + ('activate-message-selection', 'u', True), ('correct-message', None, False), ('quote', 's', False), ('mention', 's', False), ===================================== gajim/gtk/control.py ===================================== @@ -23,6 +23,7 @@ import logging import time +from gi.repository import Gio from gi.repository import Gtk from gi.repository import GLib @@ -48,8 +49,9 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow -from gajim.gtk.conversation.view import ConversationView +from gajim.gui.conversation.message_selection import MessageSelection +from gajim.gui.conversation.view import ConversationView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.builder import get_builder from gajim.gui.groupchat_roster import GroupchatRoster @@ -79,6 +81,11 @@ def __init__(self) -> None: self._groupchat_state = GroupchatState() self._ui.conv_view_overlay.add_overlay(self._groupchat_state) + self._message_selection = MessageSelection() + self._message_selection.connect('copy', self._on_copy_selection) + self._message_selection.connect('cancel', self._on_cancel_selection) + self._ui.conv_view_overlay.add_overlay(self._message_selection) + self._jump_to_end_button = JumpToEndButton() self._jump_to_end_button.connect('clicked', self._on_jump_to_end) self._ui.conv_view_overlay.add_overlay(self._jump_to_end_button) @@ -90,6 +97,9 @@ def __init__(self) -> None: # Used with encryption plugins self.sendmessage = False + app.window.get_action('activate-message-selection').connect( + 'activate', self._on_activate_message_selection) + self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -156,6 +166,9 @@ def switch_contact(self, contact: Union[BareContact, self._groupchat_state.switch_contact(contact) self._roster.switch_contact(contact) + self._message_selection.set_no_show_all(True) + self._message_selection.hide() + self._register_events() if isinstance(contact, GroupchatParticipant): @@ -452,6 +465,22 @@ def _on_autoscroll_changed(self, if app.window.is_chat_active(self.contact.account, self.contact.jid): app.window.mark_as_read(self.contact.account, self.contact.jid) + def _on_activate_message_selection(self, + _action: Gio.SimpleAction, + param: GLib.Variant + ) -> None: + + log_line_id = param.get_uint32() + self._scrolled_view.enable_row_selection(log_line_id) + self._message_selection.set_no_show_all(False) + self._message_selection.show_all() + + def _on_copy_selection(self, _widget: MessageSelection) -> None: + self._scrolled_view.copy_selected_messages() + + def _on_cancel_selection(self, _widget: MessageSelection) -> None: + self._scrolled_view.disable_row_selection() + def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() ===================================== gajim/gtk/conversation/message_selection.py ===================================== @@ -0,0 +1,58 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 gi.repository import GObject +from gi.repository import Gtk + +from gajim.common.i18n import _ + + +class MessageSelection(Gtk.Grid): + + __gsignals__ = { + 'copy': (GObject.SignalFlags.RUN_LAST, None, ()), + 'cancel': (GObject.SignalFlags.RUN_LAST, None, ()), + } + + def __init__(self) -> None: + Gtk.Grid.__init__(self, row_spacing=18, column_spacing=6) + self.set_no_show_all(True) + self.set_halign(Gtk.Align.CENTER) + self.set_valign(Gtk.Align.END) + + self.get_style_context().add_class('message-selection-box') + + label = Gtk.Label(label=_('Click messages to select them')) + self.attach(label, 0, 0, 2, 1) + + copy_button = Gtk.Button(label=_('Copy Text')) + copy_button.get_style_context().add_class('suggested-action') + copy_button.connect('clicked', self._on_copy_clicked) + self.attach(copy_button, 0, 1, 1, 1) + + cancel_button = Gtk.Button(label=_('Cancel')) + cancel_button.connect('clicked', self._on_cancel_clicked) + self.attach(cancel_button, 1, 1, 1, 1) + + def _on_copy_clicked(self, _button: Gtk.Button) -> None: + self.set_no_show_all(True) + self.hide() + self.emit('copy') + + def _on_cancel_clicked(self, _button: Gtk.Button) -> None: + self.set_no_show_all(True) + self.hide() + self.emit('cancel') ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -51,6 +51,11 @@ def get_text(self) -> str: return self._content.text return self._action_phrase_text + def set_selectable(self, selectable: bool) -> None: + for widget in self.get_children(): + if isinstance(widget, PlainWidget): + widget.set_selectable(selectable) + def add_with_styling(self, text: str, nickname: Optional[str] = None) -> None: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -68,6 +68,10 @@ def __init__(self, account: str, selectable: bool) -> None: self._text_widget = MessageLabel(self._account, selectable) self.add(self._text_widget) + def set_selectable(self, selectable: bool) -> None: + if isinstance(self._text_widget, MessageLabel): + self._text_widget.set_selectable(selectable) + def add_content(self, block: PlainBlock) -> None: self._text_widget.print_text_with_styling(block) ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -39,6 +39,7 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: self.text: str = '' self._merged: bool = False + self.set_selectable(False) self.set_can_focus(False) self.get_style_context().add_class('conversation-row') @@ -54,6 +55,12 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: self.connect('destroy', self.__destroy) + def enable_selection_mode(self) -> None: + return + + def disable_selection_mode(self) -> None: + return + @property def is_merged(self) -> bool: return self._merged ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -92,6 +92,8 @@ def __init__(self, self.additional_data = additional_data self.display_marking = display_marking + self.set_selectable(True) + self._account = account self._contact = contact @@ -198,6 +200,14 @@ def __init__(self, self.show_all() + def enable_selection_mode(self) -> None: + if isinstance(self._message_widget, MessageWidget): + self._message_widget.set_selectable(False) + + def disable_selection_mode(self) -> None: + if isinstance(self._message_widget, MessageWidget): + self._message_widget.set_selectable(True) + def _add_security_label(self, display_marking: Optional[Displaymarking] ) -> None: @@ -299,17 +309,20 @@ def is_mergeable(self, message: MessageRow) -> bool: return False return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME + def get_text(self) -> str: + return self._message_widget.get_text() + def on_copy_message(self, _widget: Gtk.Widget) -> None: time_format = from_one_line(app.settings.get('chat_timestamp_format')) timestamp_formatted = self.timestamp.strftime(time_format) clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - text = self._message_widget.get_text() + text = self.get_text() clip.set_text(f'{timestamp_formatted} - {self.name}: {text}', -1) def on_quote_message(self, _widget: Gtk.Widget) -> None: app.window.activate_action( - 'quote', GLib.Variant('s', self._message_widget.get_text())) + 'quote', GLib.Variant('s', self.get_text())) def on_correct_message(self, _widget: Gtk.Widget) -> None: app.window.activate_action('correct-message', None) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -79,7 +79,7 @@ def _on_click(self, _button: Gtk.Button) -> None: show_retract = False if isinstance(self._contact, GroupchatContact): if not self._contact.is_joined: - self._create_popover(show_retract=False) + self._create_popover() return contact = self._contact.get_resource(self._name) @@ -99,13 +99,14 @@ def _on_click(self, _button: Gtk.Button) -> None: show_correction = app.window.is_message_correctable( self._contact, self._row.message_id) - self._create_popover(show_retract=show_retract, - show_correction=show_correction) + self._create_popover(show_retract, + show_correction) def _create_popover(self, show_retract: bool = False, show_correction: bool = False ) -> None: + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) menu_box.get_style_context().add_class('padding-6') @@ -135,6 +136,14 @@ def _create_popover(self, 'edit-copy-symbolic', Gtk.IconSize.MENU)) menu_box.add(copy_button) + select_button = Gtk.ModelButton() + select_button.set_halign(Gtk.Align.START) + select_button.connect('clicked', self._on_activate_message_selection) + select_button.set_label(Q_('?Message row action:Select Messages…')) + select_button.set_image(Gtk.Image.new_from_icon_name( + 'edit-select-symbolic', Gtk.IconSize.MENU)) + menu_box.add(select_button) + if show_correction: correct_button = Gtk.ModelButton() correct_button.set_halign(Gtk.Align.START) @@ -164,6 +173,11 @@ def _create_popover(self, popover.connect('closed', self._on_closed) popover.popup() + def _on_activate_message_selection(self, _button: Gtk.ModelButton) -> None: + app.window.activate_action( + 'activate-message-selection', + GLib.Variant('u', self._row.log_line_id)) + @staticmethod def _on_closed(popover: Gtk.Popover) -> None: GLib.idle_add(popover.destroy) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -27,6 +27,7 @@ from datetime import datetime from datetime import timedelta +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GObject from gi.repository import Gio @@ -41,6 +42,7 @@ from gajim.common import types from gajim.common import events from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import from_one_line from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day from gajim.common.modules.contacts import GroupchatContact @@ -141,6 +143,40 @@ def __init__(self) -> None: app.window.get_action('scroll-view-down').connect( 'activate', self._on_scroll_view) + def copy_selected_messages(self) -> None: + time_format = from_one_line(app.settings.get('chat_timestamp_format')) + selection_text = '' + for row in cast(list[BaseRow], self._list_box.get_selected_rows()): + if isinstance(row, MessageRow): + timestamp_formatted = row.timestamp.strftime(time_format) + selection_text += (f'{timestamp_formatted} - {row.name}: ' + f'{row.get_text()}\n') + + clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clip.set_text(selection_text, -1) + + self.disable_row_selection() + + def enable_row_selection(self, + log_line_id: Optional[int] + ) -> None: + + self._list_box.set_selection_mode(Gtk.SelectionMode.MULTIPLE) + + if log_line_id is not None: + row = self.get_row_by_log_line_id(log_line_id) + self._list_box.select_row(row) + + for row in self.iter_rows(): + row.enable_selection_mode() + + def disable_row_selection(self) -> None: + self._list_box.unselect_all() + self._list_box.set_selection_mode(Gtk.SelectionMode.NONE) + + for row in self.iter_rows(): + row.disable_selection_mode() + def _on_scroll_view(self, action: Gio.SimpleAction, _param: Literal[None]) -> None: @@ -187,6 +223,8 @@ def switch_contact(self, contact: ChatContactT) -> None: self._block_signals = True self._reset() + self.disable_row_selection() + self._read_marker_row = ReadMarkerRow(self._contact) self._list_box.add(self._read_marker_row) ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -132,7 +132,7 @@ def _fill_placeholders(self) -> None: self._ui.name_entry.set_placeholder_text( _('e.g. %s') % placeholder[0]) self._ui.description_entry.set_placeholder_text( - _('e.g. %s' % placeholder[1])) + _('e.g. %s') % placeholder[1]) self._ui.address_entry.set_placeholder_text( f'{placeholder[2]}@{server}') ===================================== gajim/gtk/notification_manager.py ===================================== @@ -376,7 +376,7 @@ def __init__(self, account: str, jid: str) -> None: remove_button = Gtk.Button.new_with_label(label=_('Remove')) remove_button.set_valign(Gtk.Align.CENTER) - remove_button.set_tooltip_text('Remove from contact list') + remove_button.set_tooltip_text(_('Remove from contact list')) remove_button.set_action_name( f'win.{self._account}-remove-contact') remove_button.set_action_target_value(GLib.Variant('s', str(self.jid))) @@ -431,13 +431,13 @@ def __init__(self, account: str, event: MucInvitation) -> None: show_button = Gtk.Button.new_with_label(label=_('Show')) show_button.set_valign(Gtk.Align.CENTER) show_button.set_halign(Gtk.Align.END) - show_button.set_tooltip_text('Show Invitation') + show_button.set_tooltip_text(_('Show Invitation')) show_button.connect('clicked', self._on_show_invitation) self.grid.attach(show_button, 3, 1, 1, 2) decline_button = Gtk.Button.new_with_label(label=_('Decline')) decline_button.set_valign(Gtk.Align.CENTER) - decline_button.set_tooltip_text('Decline Invitation') + decline_button.set_tooltip_text(_('Decline Invitation')) decline_button.connect('clicked', self._on_decline_invitation) self.grid.attach(decline_button, 4, 1, 1, 2) ===================================== gajim/gtk/plugins.py ===================================== @@ -27,8 +27,10 @@ from gi.repository import GdkPixbuf from gi.repository import Gdk -from gajim.common import app, configpaths +from gajim.common import app +from gajim.common import configpaths from gajim.common import ged +from gajim.common.i18n import _ from gajim.common.events import PluginAdded from gajim.common.events import PluginRemoved from gajim.common.exceptions import PluginsystemError @@ -37,7 +39,6 @@ from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.pluginmanager import PluginManifest -from gajim.plugins.plugins_i18n import _ from gajim.gui.dialogs import WarningDialog from gajim.gui.dialogs import DialogButton View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1a7399276fd8ef21ca0e1ea33bc34c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1a7399276fd8ef21ca0e1ea33bc34c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-selection] refactor: Add selection mode methods to BaseRow
by Philipp Hörist (＠lovetox) 30 Oct '22

30 Oct '22

Philipp Hörist pushed to branch message-selection at gajim / gajim Commits: 1a739927 by Philipp Hörist at 2022-10-30T22:23:33+01:00 refactor: Add selection mode methods to BaseRow - - - - - 2 changed files: - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -55,6 +55,12 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: self.connect('destroy', self.__destroy) + def enable_selection_mode(self) -> None: + return + + def disable_selection_mode(self) -> None: + return + @property def is_merged(self) -> bool: return self._merged ===================================== gajim/gtk/conversation/view.py ===================================== @@ -168,16 +168,14 @@ def enable_row_selection(self, self._list_box.select_row(row) for row in self.iter_rows(): - if isinstance(row, MessageRow): - row.enable_selection_mode() + row.enable_selection_mode() def disable_row_selection(self) -> None: self._list_box.unselect_all() self._list_box.set_selection_mode(Gtk.SelectionMode.NONE) for row in self.iter_rows(): - if isinstance(row, MessageRow): - row.disable_selection_mode() + row.disable_selection_mode() def _on_scroll_view(self, action: Gio.SimpleAction, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a7399276fd8ef21ca0e1ea33bc34c0e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1a7399276fd8ef21ca0e1ea33bc34c0e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-selection] refactor: Rename methods
by Philipp Hörist (＠lovetox) 30 Oct '22

30 Oct '22

Philipp Hörist pushed to branch message-selection at gajim / gajim Commits: 22c8227b by Philipp Hörist at 2022-10-30T22:16:44+01:00 refactor: Rename methods - - - - - 2 changed files: - gajim/gtk/control.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -471,7 +471,7 @@ def _on_activate_message_selection(self, ) -> None: log_line_id = param.get_uint32() - self._scrolled_view.enable_message_selection(log_line_id) + self._scrolled_view.enable_row_selection(log_line_id) self._message_selection.set_no_show_all(False) self._message_selection.show_all() @@ -479,7 +479,7 @@ def _on_copy_selection(self, _widget: MessageSelection) -> None: self._scrolled_view.copy_selected_messages() def _on_cancel_selection(self, _widget: MessageSelection) -> None: - self._scrolled_view.disable_message_selection() + self._scrolled_view.disable_row_selection() def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -155,11 +155,11 @@ def copy_selected_messages(self) -> None: clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) clip.set_text(selection_text, -1) - self.disable_message_selection() + self.disable_row_selection() - def enable_message_selection(self, - log_line_id: Optional[int] - ) -> None: + def enable_row_selection(self, + log_line_id: Optional[int] + ) -> None: self._list_box.set_selection_mode(Gtk.SelectionMode.MULTIPLE) @@ -171,7 +171,7 @@ def enable_message_selection(self, if isinstance(row, MessageRow): row.enable_selection_mode() - def disable_message_selection(self) -> None: + def disable_row_selection(self) -> None: self._list_box.unselect_all() self._list_box.set_selection_mode(Gtk.SelectionMode.NONE) @@ -225,7 +225,7 @@ def switch_contact(self, contact: ChatContactT) -> None: self._block_signals = True self._reset() - self.disable_message_selection() + self.disable_row_selection() self._read_marker_row = ReadMarkerRow(self._contact) self._list_box.add(self._read_marker_row) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/22c8227b41e457e77d3bada21c50305b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/22c8227b41e457e77d3bada21c50305b… 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 October 2022