Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: AvatarBox: Only react to clicks for GroupchatContacts
by Daniel Brötzmann (＠wurstsalat) 30 Oct '22

30 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a3cd8882 by wurstsalat at 2022-10-30T15:02:41+01:00 fix: AvatarBox: Only react to clicks for GroupchatContacts - - - - - 1 changed file: - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -293,6 +293,9 @@ def _on_avatar_clicked(self, ) -> int: if event.type == Gdk.EventType.BUTTON_PRESS: + if not isinstance(self._contact, GroupchatContact): + return Gdk.EVENT_STOP + if event.button == 1: app.window.activate_action('mention', GLib.Variant('s', name)) elif event.button == 3: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3cd8882d0e20703be69d87adc369db1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3cd8882d0e20703be69d87adc369db1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-selection] feat: Add action to copy multiple messages
by Daniel Brötzmann (＠wurstsalat) 30 Oct '22

30 Oct '22

Daniel Brötzmann pushed to branch message-selection at gajim / gajim Commits: 5a1c168d by wurstsalat at 2022-10-30T14:54:25+01:00 feat: Add action to copy multiple messages Fixes #10975 - - - - - 8 changed files: - gajim/data/style/gajim.css - gajim/gtk/const.py - gajim/gtk/control.py - + gajim/gtk/conversation/message_selection.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, False), ('input-clear', None, False), ('show-emoji-chooser', None, False), + ('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_message_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_message_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/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') ===================================== 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 @@ -299,17 +301,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,34 @@ 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_message_selection() + + def enable_message_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) + + def disable_message_selection(self) -> None: + self._list_box.unselect_all() + self._list_box.set_selection_mode(Gtk.SelectionMode.NONE) + def _on_scroll_view(self, action: Gio.SimpleAction, _param: Literal[None]) -> None: @@ -187,6 +217,8 @@ def switch_contact(self, contact: ChatContactT) -> None: self._block_signals = True self._reset() + self.disable_message_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/5a1c168d44b44ba4eec3ac0bed7a4da2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a1c168d44b44ba4eec3ac0bed7a4da2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-selection] feat: Add action to copy multiple messages
by Daniel Brötzmann (＠wurstsalat) 30 Oct '22

30 Oct '22

Daniel Brötzmann pushed to branch message-selection at gajim / gajim Commits: 0b821f74 by wurstsalat at 2022-10-30T14:34:20+01:00 feat: Add action to copy multiple messages Fixes #10975 - - - - - 7 changed files: - gajim/data/style/gajim.css - gajim/gtk/const.py - gajim/gtk/control.py - + gajim/gtk/conversation/message_selection.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, False), ('input-clear', None, False), ('show-emoji-chooser', None, False), + ('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_message_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_message_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/rows/message.py ===================================== @@ -299,17 +299,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,34 @@ 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_message_selection() + + def enable_message_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) + + def disable_message_selection(self) -> None: + self._list_box.unselect_all() + self._list_box.set_selection_mode(Gtk.SelectionMode.NONE) + def _on_scroll_view(self, action: Gio.SimpleAction, _param: Literal[None]) -> None: @@ -187,6 +217,8 @@ def switch_contact(self, contact: ChatContactT) -> None: self._block_signals = True self._reset() + self.disable_message_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/0b821f74d9a9136af76f6a2de936a092… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0b821f74d9a9136af76f6a2de936a092… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-selection] feat: Add action to copy multiple messages
by Daniel Brötzmann (＠wurstsalat) 30 Oct '22

30 Oct '22

Daniel Brötzmann pushed to branch message-selection at gajim / gajim Commits: cdb976dc by wurstsalat at 2022-10-30T14:27:07+01:00 feat: Add action to copy multiple messages Fixes #10975 - - - - - 7 changed files: - gajim/data/style/gajim.css - gajim/gtk/const.py - gajim/gtk/control.py - + gajim/gtk/conversation/message_selection.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, False), ('input-clear', None, False), ('show-emoji-chooser', None, False), + ('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() @@ -452,6 +462,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_message_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_message_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/rows/message.py ===================================== @@ -299,17 +299,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,33 @@ 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_message_selection() + + def enable_message_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) + + def disable_message_selection(self) -> None: + self._list_box.unselect_all() + self._list_box.set_selection_mode(Gtk.SelectionMode.NONE) + def _on_scroll_view(self, action: Gio.SimpleAction, _param: Literal[None]) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cdb976dc654515bda4be52926b1fb35d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cdb976dc654515bda4be52926b1fb35d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-selection] feat: Add action to copy multiple messages
by Daniel Brötzmann (＠wurstsalat) 30 Oct '22

30 Oct '22

Daniel Brötzmann pushed to branch message-selection at gajim / gajim Commits: 9c744e5e by wurstsalat at 2022-10-30T14:05:03+01:00 feat: Add action to copy multiple messages Fixes #10975 - - - - - 7 changed files: - gajim/data/style/gajim.css - gajim/gtk/const.py - gajim/gtk/control.py - + gajim/gtk/conversation/message_selection.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, False), ('input-clear', None, False), ('show-emoji-chooser', None, False), + ('toggle-message-selection', 'u', True), ('correct-message', None, False), ('quote', 's', False), ('mention', 's', False), ===================================== gajim/gtk/control.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any +from typing import Literal from typing import Optional from typing import Union from typing import cast @@ -23,6 +24,7 @@ import logging import time +from gi.repository import Gio from gi.repository import Gtk from gi.repository import GLib @@ -48,8 +50,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 +82,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 +98,9 @@ def __init__(self) -> None: # Used with encryption plugins self.sendmessage = False + app.window.get_action('toggle-message-selection').connect( + 'activate', self._on_toggle_message_selection) + self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -452,6 +463,29 @@ 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_toggle_message_selection(self, + action: Gio.SimpleAction, + param: GLib.Variant + ) -> None: + + log_line_id = param.get_uint32() + if self._scrolled_view.toggle_message_selection(log_line_id): + self._message_selection.set_no_show_all(False) + self._message_selection.show_all() + else: + self._message_selection.set_no_show_all(True) + self._message_selection.hide() + + def _on_copy_selection(self, _widget: MessageSelection) -> None: + self._scrolled_view.copy_selected_messages() + self._message_selection.set_no_show_all(True) + self._message_selection.hide() + + def _on_cancel_selection(self, _widget: MessageSelection) -> None: + self._scrolled_view.toggle_message_selection() + self._message_selection.set_no_show_all(True) + self._message_selection.hide() + def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() ===================================== gajim/gtk/conversation/message_selection.py ===================================== @@ -0,0 +1,54 @@ +# 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.emit('copy') + + def _on_cancel_clicked(self, _button: Gtk.Button) -> None: + self.emit('cancel') ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -299,17 +299,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_toggle_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_toggle_message_selection(self, _button: Gtk.ModelButton) -> None: + app.window.activate_action( + 'toggle-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,36 @@ 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.toggle_message_selection() + + def toggle_message_selection(self, + log_line_id: Optional[int] = None + ) -> bool: + + mode = self._list_box.get_selection_mode() + if mode == Gtk.SelectionMode.MULTIPLE: + self._list_box.unselect_all() + self._list_box.set_selection_mode(Gtk.SelectionMode.NONE) + return False + + 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) + return True + def _on_scroll_view(self, action: Gio.SimpleAction, _param: Literal[None]) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c744e5e6b41bf11ec03f5ad27e423b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c744e5e6b41bf11ec03f5ad27e423b9… You're receiving this email because of your account on dev.gajim.org.

1 0

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

30 Oct '22

Daniel Brötzmann pushed new branch message-selection at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/message-selection You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Remote: Return True for change_status
by Philipp Hörist (＠lovetox) 29 Oct '22

29 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ea42cf0f by Philipp Hörist at 2022-10-29T20:28:53+02:00 fix: Remote: Return True for change_status - - - - - 1 changed file: - gajim/common/dbus/remote_control.py Changes: ===================================== gajim/common/dbus/remote_control.py ===================================== @@ -305,6 +305,7 @@ def change_status(status: str, message: str, account: str) -> bool: ''' if status not in ('offline', 'online', 'chat', 'away', 'xa', 'dnd'): status = '' + if account: if not status: if account not in app.settings.get_active_accounts(): @@ -327,7 +328,7 @@ def change_status(status: str, message: str, account: str) -> bool: GLib.idle_add(app.get_client(acc).change_status, status, message) # pyright: ignore - return False + return True @staticmethod def list_accounts() -> list[str]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ea42cf0f92d1b06f26cfbe47ea7bb42d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ea42cf0f92d1b06f26cfbe47ea7bb42d… You're receiving this email because of your account on dev.gajim.org.

1 0

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

29 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d1a7c99 by Philipp Hörist at 2022-10-29T14:36:01+02:00 refactor: Remove unused code - - - - - 1095fb32 by Philipp Hörist at 2022-10-29T14:40:06+02:00 refactor: Move init code into application - - - - - f275c18e by Philipp Hörist at 2022-10-29T14:46:11+02:00 refactor: Remove unused code - - - - - 5 changed files: - gajim/common/app.py - gajim/common/application.py - gajim/common/modules/muc.py - gajim/common/setting_values.py - gajim/gui_interface.py Changes: ===================================== gajim/common/app.py ===================================== @@ -28,7 +28,6 @@ import typing from typing import Any -from typing import NamedTuple from typing import Optional from typing import cast @@ -40,7 +39,6 @@ import pprint from collections import defaultdict -import nbxmpp from nbxmpp.idlequeue import IdleQueue from gi.repository import Gdk from gi.repository import GLib @@ -100,11 +98,6 @@ def __init__(self): transport_type: dict[str, str] = {} -# dict of rooms that must be automatically configured -# and for which we have a list of invities -# {account: {room_jid: {'invities': []}}} -automatic_rooms: dict[str, dict[str, dict[str, list[str]]]] = {} - # list of contacts that has just signed out to_be_removed: dict[str, list[str]] = {} @@ -148,12 +141,6 @@ def __init__(self): _tasks: dict[int, list[Any]] = defaultdict(list) -class RecentGroupchat(NamedTuple): - room: str - server: str - nickname: str - - def print_version() -> None: log('gajim').info('Gajim Version: %s', gajim.__version__) @@ -433,10 +420,6 @@ def account_is_available(account: str) -> bool: return connections[account].state.is_available -def account_is_disconnected(account: str) -> bool: - return not account_is_connected(account) - - def get_transport_name_from_jid( jid: str, use_config_setting: bool = True) -> Optional[str]: @@ -492,12 +475,6 @@ def get_jid_from_account(account_name: str) -> str: return jid -def get_account_from_jid(jid: str) -> Optional[str]: - for account in settings.get_accounts(): - if jid == get_jid_from_account(account): - return account - - def get_hostname_from_account(account_name: str, use_srv: bool = False) -> str: ''' Returns hostname (if custom hostname is used, that is returned) @@ -509,43 +486,6 @@ def get_hostname_from_account(account_name: str, use_srv: bool = False) -> str: return settings.get_account_setting(account_name, 'hostname') -def get_notification_image_prefix(jid: str) -> str: - ''' - Returns the prefix for the notification images - ''' - transport_name = get_transport_name_from_jid(jid) - if transport_name in ['icq', 'facebook']: - prefix = transport_name - else: - prefix = 'jabber' - return prefix - - -def get_recent_groupchats(account: str) -> list[RecentGroupchat]: - recent_groupchats = settings.get_account_setting( - account, 'recent_groupchats').split() - - recent_list: list[RecentGroupchat] = [] - for groupchat in recent_groupchats: - jid = nbxmpp.JID.from_string(groupchat) - recent = RecentGroupchat(jid.localpart, jid.domain, jid.resource) - recent_list.append(recent) - return recent_list - - -def add_recent_groupchat(account: str, room_jid: str, nickname: str) -> None: - recent = settings.get_account_setting( - account, 'recent_groupchats').split() - full_jid = room_jid + '/' + nickname - if full_jid in recent: - recent.remove(full_jid) - recent.insert(0, full_jid) - if len(recent) > 10: - recent = recent[0:9] - config_value = ' '.join(recent) - settings.set_account_setting(account, 'recent_groupchats', config_value) - - def get_priority(account: str, show: str) -> int: ''' Return the priority an account must have @@ -572,14 +512,6 @@ def log(domain: str) -> logging.Logger: return logging.getLogger(domain) -def prefers_app_menu() -> bool: - if sys.platform == 'darwin': - return True - if sys.platform == 'win32': - return False - return app.prefers_app_menu() - - def load_css_config() -> None: global css_config # pylint: disable=global-statement from gajim.gui.css_config import CSSConfig ===================================== gajim/common/application.py ===================================== @@ -117,6 +117,9 @@ def _init_core(self) -> None: for account in app.settings.get_active_accounts(): app.connections[account] = Client(account) + app.to_be_removed[account] = [] + app.nicks[account] = app.settings.get_account_setting(account, + 'name') app.plugin_manager = PluginManager() app.plugin_manager.init_plugins() @@ -378,7 +381,6 @@ def enable_account(self, account: str) -> None: app.plugin_manager.register_modules_for_account( app.connections[account]) - app.automatic_rooms[account] = {} app.to_be_removed[account] = [] app.nicks[account] = app.settings.get_account_setting(account, 'name') app.settings.set_account_setting(account, 'active', True) @@ -399,7 +401,6 @@ def disable_account(self, account: str) -> None: if account in app.interface.instances: del app.interface.instances[account] del app.nicks[account] - del app.automatic_rooms[account] del app.to_be_removed[account] def remove_account(self, account: str) -> None: ===================================== gajim/common/modules/muc.py ===================================== @@ -424,20 +424,6 @@ def _on_config_result(self, task: Task) -> None: self._con.get_module('Discovery').disco_muc( result.jid, callback=self._on_disco_result_after_config) - # If this is an automatic room creation - try: - invites = app.automatic_rooms[self._account][result.jid]['invities'] - except KeyError: - return - - user_list = {} - for jid in invites: - user_list[jid] = {'affiliation': 'member'} - self.set_affiliation(result.jid, user_list) - - for jid in invites: - self.invite(result.jid, JID.from_string(jid)) - def _on_disco_result_after_config(self, task: Task) -> None: try: result = task.finish() ===================================== gajim/common/setting_values.py ===================================== @@ -334,7 +334,6 @@ class _ACCOUNT_DEFAULT: 'name', 'password', 'proxy', - 'recent_groupchats', 'resource', 'roster_version', 'send_chatstate_default', @@ -450,7 +449,6 @@ class _ACCOUNT_DEFAULT: 'proxy': '', 'publish_location': False, 'publish_tune': False, - 'recent_groupchats': '', 'request_user_data': True, 'resource': 'gajim.$rand', 'restore_last_status': False, ===================================== gajim/gui_interface.py ===================================== @@ -97,11 +97,6 @@ def __init__(self): self.instances: dict[str, Any] = {} - for acc in app.settings.get_active_accounts(): - app.automatic_rooms[acc] = {} - app.to_be_removed[acc] = [] - app.nicks[acc] = app.settings.get_account_setting(acc, 'name') - # Jingle File Transfer @staticmethod def handle_event_file_error(title: str, message: str) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/57cb288802be7969ae00d73e16ba911… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/57cb288802be7969ae00d73e16ba911… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: refactor: Move show_add_join_groupchat() to main
by Philipp Hörist (＠lovetox) 29 Oct '22

29 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5dd99a3f by Philipp Hörist at 2022-10-29T12:46:04+02:00 refactor: Move show_add_join_groupchat() to main - - - - - 59ff9cfa by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Config: Disable saving legacy config - - - - - 30e4ac5f by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Move start_chat_from_jid() to main - - - - - ead3290f by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Move change_status() to application - - - - - 7e3ce334 by Philipp Hörist at 2022-10-29T13:49:23+02:00 refactor: Move autoconnect() to application - - - - - 57cb2888 by Philipp Hörist at 2022-10-29T14:30:17+02:00 refactor: Move more init code into application - - - - - 12 changed files: - gajim/common/application.py - gajim/common/config.py - gajim/common/helpers.py - gajim/gtk/application.py - gajim/gtk/discovery.py - gajim/gtk/groupchat_invitation.py - gajim/gtk/groupchat_join.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/status_icon.py - gajim/gtk/status_selector.py - gajim/gui_interface.py Changes: ===================================== gajim/common/application.py ===================================== @@ -50,6 +50,8 @@ from gajim.common.client import Client from gajim.common.helpers import make_http_request from gajim.common.helpers import get_random_string +from gajim.common.helpers import get_global_show +from gajim.common.helpers import from_one_line from gajim.common.storage.events import EventStorage from gajim.common.task_manager import TaskManager from gajim.common.settings import Settings @@ -59,6 +61,9 @@ from gajim.common.storage.draft import DraftStorage from gajim.common.storage.archive import MessageArchiveStorage +from gajim.plugins import PluginManager +from gajim.plugins.repository import PluginRepository + class CoreApplication(ged.EventHelper): def __init__(self) -> None: @@ -113,6 +118,15 @@ def _init_core(self) -> None: for account in app.settings.get_active_accounts(): app.connections[account] = Client(account) + app.plugin_manager = PluginManager() + app.plugin_manager.init_plugins() + app.plugin_repository = PluginRepository() + + for client in app.get_clients(): + client.get_module('Roster').load_roster() + + GLib.timeout_add_seconds(5, self._remote_init) + self.register_events([ ('signed-in', ged.CORE, self._on_signed_in), ]) @@ -153,6 +167,35 @@ def _core_command_line(self, options: GLib.VariantDict) -> None: if options.contains('warnings'): self._show_warnings() + def _auto_connect(self) -> None: + for client in app.get_clients(): + account = client.account + if not app.settings.get_account_setting(account, + 'autoconnect'): + continue + + status = 'online' + status_message = '' + + if app.settings.get_account_setting(account, 'restore_last_status'): + status = app.settings.get_account_setting( + account, 'last_status') + status_message = app.settings.get_account_setting( + account, 'last_status_msg') + status_message = from_one_line(status_message) + + client.change_status(status, status_message) + + def _remote_init(self) -> None: + if not app.settings.get('remote_control'): + return + + try: + from gajim.common.dbus import remote_control + remote_control.GajimRemote() + except Exception: + self._log.exception('Failed to init remote control') + def start_profiling(self) -> None: self._log.info('Start profiling') self._profiling_session = cProfile.Profile() @@ -376,3 +419,34 @@ def _on_signed_in(self, event: SignedIn) -> None: if client.get_module('MAM').available: client.get_module('MAM').request_archive_on_signin() + + def change_status(self, + status: str, + account: Optional[str] = None + ) -> None: + + if status is None: + status = get_global_show() + + if account is not None: + self._change_status(account, status) + return + + for client in app.get_clients(): + if not app.settings.get_account_setting(client.account, + 'sync_with_global_status'): + continue + + self._change_status(client.account, status) + + @staticmethod + def _change_status(account: str, status: str) -> None: + client = app.get_client(account) + message = client.status_message + + if status == 'offline': + # TODO delete pep + # self.delete_pep(app.get_jid_from_account(account), account) + pass + + client.change_status(status, message) ===================================== gajim/common/config.py ===================================== @@ -415,7 +415,6 @@ def set(self, optname, value): return self.__options[1][optname] = value - self._timeout_save() def get(self, optname=None): if not optname: @@ -457,7 +456,6 @@ def add_per(self, typename, name): # per_group_of_option opt[1][name] = {} for o in opt[0]: opt[1][name][o] = opt[0][o][Option.VAL] - self._timeout_save() def del_per(self, typename, name, subname=None): # per_group_of_option if typename not in self.__options_per_key: @@ -469,7 +467,6 @@ def del_per(self, typename, name, subname=None): # per_group_of_option # if subname is specified, delete the item in the group. elif subname in opt[1][name]: del opt[1][name][subname] - self._timeout_save() def del_all_per(self, typename, subname): # Deletes all settings per typename @@ -483,7 +480,6 @@ def del_all_per(self, typename, subname): del opt[1][name][subname] except KeyError: pass - self._timeout_save() def set_per(self, optname, key, subname, value): # per_group_of_option if optname not in self.__options_per_key: @@ -501,7 +497,6 @@ def set_per(self, optname, key, subname, value): # per_group_of_option if value is None: return obj[subname] = value - self._timeout_save() def get_per(self, optname, key=None, subname=None, default=None): # per_group_of_option if optname not in self.__options_per_key: @@ -591,11 +586,6 @@ def _really_save(self): self.save_timeout_id = None return False - def _timeout_save(self): - if self.save_timeout_id: - return - self.save_timeout_id = GLib.timeout_add(1000, self._really_save) - def __init__(self): #init default values self._init_options() ===================================== gajim/common/helpers.py ===================================== @@ -1033,7 +1033,7 @@ def open_uri(uri: Union[URI, str], account: Optional[str] = None) -> None: Gio.AppInfo.launch_default_for_uri(uri.data) elif uri.type == URIType.AT: - app.interface.start_chat_from_jid(account, uri.data) + app.window.start_chat_from_jid(account, uri.data) elif uri.type == URIType.XMPP: if account is None: @@ -1052,7 +1052,7 @@ def open_uri(uri: Union[URI, str], account: Optional[str] = None) -> None: 'groupchat-join', GLib.Variant('as', [account, jid])) elif uri.action == URIAction.MESSAGE: - app.interface.start_chat_from_jid(account, jid, message=message) + app.window.start_chat_from_jid(account, jid, message=message) else: log.warning('Cant open URI: %s', uri) ===================================== gajim/gtk/application.py ===================================== @@ -274,6 +274,8 @@ def _startup(self) -> None: from gajim.gui.main import MainWindow MainWindow() + GLib.timeout_add(100, self._auto_connect) + def _open_uris(self, uris: list[str]) -> None: accounts = app.settings.get_active_accounts() if not accounts: @@ -326,7 +328,7 @@ def _open_uris(self, uris: list[str]) -> None: except Exception: app.log('uri_handler').error('Invalid URI: %s', cmd) - app.interface.start_chat_from_jid(accounts[0], jid, message) + app.window.start_chat_from_jid(accounts[0], jid, message) def _shutdown(self, _application: GajimApplication) -> None: self._shutdown_core() @@ -737,7 +739,7 @@ def _on_join_support_chat(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: accounts = app.settings.get_active_accounts() if len(accounts) == 1: - app.interface.show_add_join_groupchat( + app.window.show_add_join_groupchat( accounts[0], GAJIM_SUPPORT_JID) return open_window('StartChatDialog', initial_jid=GAJIM_SUPPORT_JID) @@ -827,7 +829,7 @@ def _on_copy_text_action(_action: Gio.SimpleAction, def _on_open_chat_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: account, jid = param.get_strv() - app.interface.start_chat_from_jid(account, jid) + app.window.start_chat_from_jid(account, jid) @staticmethod @structs.actionfunction ===================================== gajim/gtk/discovery.py ===================================== @@ -1358,7 +1358,7 @@ def _on_join_button_clicked(self, widget): if not iter_: return service = model[iter_][0] - app.interface.show_add_join_groupchat(self.account, service) + app.window.show_add_join_groupchat(self.account, service) def update_actions(self): if self.execute_button: @@ -1720,7 +1720,7 @@ def _on_join_button_clicked(self, *args): if not iter_: return service = model[iter_][0] - app.interface.show_add_join_groupchat(self.account, service) + app.window.show_add_join_groupchat(self.account, service) def update_actions(self): sens = \ ===================================== gajim/gtk/groupchat_invitation.py ===================================== @@ -116,7 +116,7 @@ def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: def _on_join(self, _button: Gtk.Button) -> None: nickname = self._nick_chooser.get_text() - app.interface.show_add_join_groupchat( + app.window.show_add_join_groupchat( self.account, self._room_jid, nickname=nickname) self.destroy() ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -150,7 +150,7 @@ def _set_error_from_code(self, error_code: str) -> None: def _on_join(self, _button: Gtk.Button) -> None: nickname = self._nick_chooser.get_text() - app.interface.show_add_join_groupchat( + app.window.show_add_join_groupchat( self.account, self.jid, nickname=nickname) self.destroy() ===================================== gajim/gtk/main.py ===================================== @@ -947,6 +947,37 @@ def _on_window_active(self, if control.get_autoscroll(): self.mark_as_read(control.contact.account, control.contact.jid) + def show_add_join_groupchat(self, + account: str, + jid: str, + nickname: Optional[str] = None, + password: Optional[str] = None + ) -> None: + + if not self.chat_exists(account, JID.from_string(jid)): + client = app.get_client(account) + client.get_module('MUC').join( + jid, nick=nickname, password=password) + + self.add_group_chat(account, JID.from_string(jid), select=True) + + def start_chat_from_jid(self, + account: str, + jid: str, + message: Optional[str] = None + ) -> None: + + jid_ = JID.from_string(jid) + if self.chat_exists(account, jid_): + self.select_chat(account, jid_) + if message is not None: + message_input = self.get_chat_stack().get_message_input() + message_input.insert_text(message) + return + + app.app.activate_action( + 'start-chat', GLib.Variant('as', [str(jid), message or ''])) + @staticmethod def contact_info(account: str, jid: str) -> None: client = app.get_client(account) ===================================== gajim/gtk/start_chat.py ===================================== @@ -478,7 +478,7 @@ def _on_join_clicked(self, *args: Any) -> None: jid = self._muc_info_box.get_jid() nickname = self._nick_chooser.get_text() assert account - app.interface.show_add_join_groupchat( + app.window.show_add_join_groupchat( account, str(jid), nickname=nickname) self.ready_to_destroy = True ===================================== gajim/gtk/status_icon.py ===================================== @@ -203,7 +203,7 @@ def _on_quit(_widget: Gtk.MenuItem) -> None: @staticmethod def _on_show(_widget: Gtk.MenuItem, show: str) -> None: - app.interface.change_status(status=show) + app.app.change_status(status=show) class GtkStatusIcon(GtkMenuBackend): ===================================== gajim/gtk/status_selector.py ===================================== @@ -132,7 +132,7 @@ def _create_popover(self) -> None: def _on_change_status(self, button: Gtk.Button) -> None: self._status_popover.popdown() new_status = button.get_name() - app.interface.change_status(status=new_status, account=self._account) + app.app.change_status(status=new_status, account=self._account) def update(self) -> None: if self._account is None: ===================================== gajim/gui_interface.py ===================================== @@ -53,7 +53,6 @@ from gajim.common import exceptions from gajim.common import proxy65_manager from gajim.common import socks5 -from gajim.common import helpers from gajim.common.events import FileCompleted from gajim.common.events import FileHashError @@ -74,7 +73,7 @@ from gajim.gui.file_transfer_send import SendFileDialog from gajim.gui.filetransfer import FileTransfersWindow from gajim.gui.control import ChatControl -from gajim.plugins.repository import PluginRepository + log = logging.getLogger('gajim.interface') @@ -332,90 +331,6 @@ def start_file_transfer(self, contact) SendFileDialog(contact, send_callback, app.window, [path]) - @staticmethod - def show_add_join_groupchat(account: str, - jid: str, - nickname: Optional[str] = None, - password: Optional[str] = None - ) -> None: - if not app.window.chat_exists(account, JID.from_string(jid)): - client = app.get_client(account) - client.get_module('MUC').join( - jid, nick=nickname, password=password) - - app.window.add_group_chat(account, JID.from_string(jid), select=True) - - @staticmethod - def start_chat_from_jid(account: str, - jid: str, - message: Optional[str] = None - ) -> None: - - jid_ = JID.from_string(jid) - if app.window.chat_exists(account, jid_): - app.window.select_chat(account, jid_) - if message is not None: - message_input = app.window.get_chat_stack().get_message_input() - message_input.insert_text(message) - return - - app.app.activate_action( - 'start-chat', GLib.Variant('as', [str(jid), message or ''])) - - def autoconnect(self) -> None: - ''' - Auto connect at startup - ''' - - for client in app.get_clients(): - account = client.account - if not app.settings.get_account_setting(account, - 'autoconnect'): - continue - - status = 'online' - status_message = '' - - if app.settings.get_account_setting(account, 'restore_last_status'): - status = app.settings.get_account_setting( - account, 'last_status') - status_message = app.settings.get_account_setting( - account, 'last_status_msg') - status_message = helpers.from_one_line(status_message) - - client.change_status(status, status_message) - - def change_status(self, - status: str, - account: Optional[str] = None - ) -> None: - - if status is None: - status = helpers.get_global_show() - - if account is not None: - self._change_status(account, status) - return - - for client in app.get_clients(): - if not app.settings.get_account_setting(client.account, - 'sync_with_global_status'): - continue - - self._change_status(client.account, status) - - @staticmethod - def _change_status(account: str, status: str) -> None: - client = app.get_client(account) - message = client.status_message - - if status == 'offline': - # TODO delete pep - # self.delete_pep(app.get_jid_from_account(account), account) - pass - - client.change_status(status, message) - def process_connections(self) -> bool: ''' Called each foo (200) milliseconds. Check for idlequeue timeouts @@ -443,10 +358,6 @@ def process_connections(self) -> bool: raise return True # renew timeout (loop for ever) - @staticmethod - def save_config() -> None: - app.settings.save() - def save_avatar(self, data: bytes) -> Optional[str]: return app.app.avatar_storage.save_avatar(data) @@ -454,20 +365,9 @@ def avatar_exists(self, filename: str) -> bool: return app.app.avatar_storage.get_avatar_path(filename) is not None def run(self, _application: Gtk.Application) -> None: - # Creating plugin manager - from gajim import plugins - app.plugin_manager = plugins.PluginManager() - app.plugin_manager.init_plugins() - - app.plugin_repository = PluginRepository() - - for client in app.get_clients(): - client.get_module('Roster').load_roster() - # get instances for windows/dialogs that will show_all()/hide() self.instances['file_transfers'] = FileTransfersWindow() - GLib.timeout_add(100, self.autoconnect) if sys.platform == 'win32': timeout, in_seconds = 20, None else: @@ -478,16 +378,6 @@ def run(self, _application: Gtk.Application) -> None: else: GLib.timeout_add(timeout, self.process_connections) - def remote_init(): - if app.settings.get('remote_control'): - try: - from gajim.common.dbus import remote_control - remote_control.GajimRemote() - except Exception: - log.exception('Failed to init remote control') - - GLib.timeout_add_seconds(5, remote_init) - class ThreadInterface: def __init__(self, func, func_args=(), callback=None, callback_args=()): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9fa15859f623598141ebff4db3791bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9fa15859f623598141ebff4db3791bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Remove space
by Philipp Hörist (＠lovetox) 29 Oct '22

29 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9fa15859 by Philipp Hörist at 2022-10-29T11:56:48+02:00 cq: Remove space - - - - - 1 changed file: - gajim/gtk/groupchat_creation.py Changes: ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -23,7 +23,7 @@ from nbxmpp.errors import StanzaError from nbxmpp.task import Task -from nbxmpp.protocol import JID +from nbxmpp.protocol import JID from gajim.common import app from gajim.common import ged View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fa15859f623598141ebff4db3791bb8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fa15859f623598141ebff4db3791bb8… 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