Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][newcontrol] Add and update more Groupchat actions
by Daniel Brötzmann (＠wurstsalat) 09 Jul '22

09 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 6365d0a0 by wurstsalat at 2022-07-09T16:59:29+02:00 Add and update more Groupchat actions - - - - - 4 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/groupchat.py - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -86,14 +86,14 @@ def switch_contact(self, self._update_account_badge() if self._client is not None: - self._client.disconnect_signals() + self._client.disconnect_all_from_obj(self) self._client = app.get_client(account) self._client.connect_signal('state-changed', self._on_client_state_changed) if self._contact is not None: - self._contact.disconnect_signals() + self._contact.disconnect_all_from_obj(self) self._contact = self._client.get_module('Contacts').get_contact(jid) self._contact.multi_connect({ @@ -272,8 +272,6 @@ def _update_content(self) -> None: self_contact = self._contact.get_self() if self_contact: self._ui.visitor_box.set_visible(self_contact.role.is_visitor) - app.window.get_action('request-voice').set_enabled( - self_contact.role.is_visitor) def _update_account_badge(self) -> None: if self._account_badge is not None: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -23,7 +23,9 @@ from gi.repository import GLib from gi.repository import Gio from gi.repository import Gtk + from nbxmpp.protocol import JID +from nbxmpp.structs import PresenceProperties from gajim.common import app, helpers from gajim.common.i18n import _ @@ -63,7 +65,7 @@ def __init__(self): box.add(Gtk.Separator()) box.add(self._message_action_box) - self._current_contact = None + self._current_contact: Optional[ChatContactT] = None self.add_named(box, 'controls') self._connect_actions() @@ -77,6 +79,9 @@ def get_control_stack(self) -> ControlStack: return self._control_stack def show_chat(self, account: str, jid: JID) -> None: + if self._current_contact is not None: + self._current_contact.disconnect_all_from_obj(self) + client = app.get_client(account) self._current_contact = client.get_module('Contacts').get_contact(jid) @@ -86,12 +91,30 @@ def show_chat(self, account: str, jid: JID) -> None: self._update_base_actions(self._current_contact) if isinstance(self._current_contact, GroupchatContact): + self._current_contact.multi_connect({ + 'user-role-changed': self._on_user_role_changed, + 'state-changed': self._on_muc_state_changed + }) self._update_group_chat_actions(self._current_contact) else: self._update_chat_actions(self._current_contact) self.set_visible_child_name('controls') + def _on_muc_state_changed(self, + contact: GroupchatContact, + _signal_name: str + ) -> None: + self._update_group_chat_actions(contact) + + def _on_user_role_changed(self, + contact: GroupchatContact, + _signal_name: str, + _user_contact: GroupchatParticipant, + _properties: PresenceProperties + ) -> None: + self._update_group_chat_actions(contact) + def _connect_actions(self) -> None: actions = [ 'add-to-roster', @@ -171,15 +194,19 @@ def _update_chat_actions(self, contact: BareContact) -> None: app.window.get_action('mention').set_enabled(online) def _update_group_chat_actions(self, contact: GroupchatContact) -> None: + joined = contact.is_joined is_visitor = False - if contact.is_joined: + if joined: self_contact = contact.get_self() assert self_contact is_visitor = self_contact.role.is_visitor + app.window.get_action('request-voice').set_enabled(is_visitor) - app.window.get_action('quote').set_enabled(contact.is_joined) - app.window.get_action('mention').set_enabled(contact.is_joined) + app.window.get_action('show-contact-info').set_enabled(joined) + + app.window.get_action('quote').set_enabled(joined) + app.window.get_action('mention').set_enabled(joined) def _update_participant_actions(self, contact: GroupchatParticipant) -> None: @@ -243,7 +270,8 @@ def _on_action(self, if isinstance(contact, GroupchatContact): open_window('GroupchatDetails', contact=contact) else: - app.window.contact_info(account, jid) + app.window.contact_info(account, str(jid)) + elif action_name == 'request-voice': client.get_module('MUC').request_voice(contact.jid) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -216,7 +216,6 @@ def add_actions(self) -> None: actions = [ ('change-nickname-', None, self._on_change_nick), ('destroy-', None, self._on_destroy_room), - # ('groupchat-details-', None, self._on_details), ('invite-', None, self._on_invite), ('contact-information-', 's', self._on_contact_information), ('execute-command-', 's', self._on_execute_command), @@ -237,42 +236,13 @@ def add_actions(self) -> None: def update_actions(self, *args: Any) -> None: joined = self.contact.is_joined - # Change Nick self._get_action('change-nickname-').set_enabled( joined and not self.is_irc()) - # Execute command self._get_action('execute-command-').set_enabled(joined) - # # Send message - # has_text = self.msg_textview.has_text() - # self._get_action('send-message-').set_enabled( - # joined and has_text) - - # # Send file (HTTP File Upload) - # httpupload = self._get_action( - # 'send-file-httpupload-') - # httpupload.set_enabled(joined and - # self._client.get_module('HTTPUpload').available) - # self._get_action('send-file-').set_enabled(httpupload.get_enabled()) - - # if joined and httpupload.get_enabled(): - # tooltip_text = _('Send File…') - # max_file_size = self._client.get_module('HTTPUpload').max_file_size - # if max_file_size is not None: - # max_file_size = GLib.format_size_full(max_file_size, - # self._units) - # tooltip_text = _('Send File (max. %s)…') % max_file_size - # else: - # tooltip_text = _('No File Transfer available') - # self.xml.sendfile_button.set_tooltip_text(tooltip_text) - self._get_action('contact-information-').set_enabled(joined) - # self._get_action('groupchat-details-').set_enabled(joined) - - self._get_action('execute-command-').set_enabled(joined) - self._get_action('ban-').set_enabled(joined) self._get_action('kick-').set_enabled(joined) @@ -284,7 +254,6 @@ def remove_actions(self) -> None: 'change-nickname-', 'destroy-', 'configure-', - 'groupchat-details-', 'invite-', 'contact-information-', 'execute-command-', ===================================== gajim/gtk/menus.py ===================================== @@ -41,7 +41,6 @@ from gajim.common.const import URIAction from gajim.common.structs import URI from gajim.common.structs import VariantMixin -from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import can_add_to_roster @@ -117,7 +116,7 @@ def get_send_file_submenu() -> GajimMenu: def get_groupchat_menu(contact: GroupchatContact) -> GajimMenu: menuitems: MenuItemListT = [ - (_('Details'), 'win.groupchat-details', None), + (_('Details'), 'win.show-contact-info', None), (_('Change Nickname…'), 'win.change-nickname', None), (_('Request Voice'), 'win.request-voice', None), (_('Execute Command…'), 'win.execute-command', '""'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6365d0a09c9d6ecbf465885ed126e3ff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6365d0a09c9d6ecbf465885ed126e3ff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 3 commits: Menus: Add 'Search…' back to single chat menu
by Daniel Brötzmann (＠wurstsalat) 09 Jul '22

09 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 63822d4d by wurstsalat at 2022-07-09T12:51:55+02:00 Menus: Add 'Search…' back to single chat menu - - - - - 1231e186 by wurstsalat at 2022-07-09T14:55:06+02:00 MessageActionsBox: Formatting, linting - - - - - 22e95542 by wurstsalat at 2022-07-09T15:24:34+02:00 Fix quoting and mentioning - - - - - 8 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -167,6 +167,9 @@ def _update_chat_actions(self, contact: BareContact) -> None: online and contact.supports_video() and sys.platform != 'win32') + app.window.get_action('quote').set_enabled(online) + app.window.get_action('mention').set_enabled(online) + def _update_group_chat_actions(self, contact: GroupchatContact) -> None: is_visitor = False if contact.is_joined: @@ -175,6 +178,9 @@ def _update_group_chat_actions(self, contact: GroupchatContact) -> None: is_visitor = self_contact.role.is_visitor app.window.get_action('request-voice').set_enabled(is_visitor) + app.window.get_action('quote').set_enabled(contact.is_joined) + app.window.get_action('mention').set_enabled(contact.is_joined) + def _update_participant_actions(self, contact: GroupchatParticipant) -> None: pass ===================================== gajim/gtk/const.py ===================================== @@ -194,6 +194,8 @@ def __str__(self): ('input-strike', None, False), ('input-clear', None, False), ('show-emoji-chooser', None, False), + ('quote', 's', False), + ('mention', 's', False), ('send-file-httpupload', None, False), ('send-file-jingle', None, False), ('send-file', None, False), ===================================== gajim/gtk/controls/base.py ===================================== @@ -58,7 +58,6 @@ from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import guess_simple_file_type from gajim.common.storage.archive import ConversationRow -from gajim.common.structs import OutgoingMessage from gajim.gui.conversation.view import ConversationView from gajim.gui.conversation.scrolled import ScrolledView @@ -166,8 +165,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: # Create ConversationView and connect signals self.conversation_view = ConversationView(self.account, self.contact) - self.conversation_view.connect('quote', self._on_quote) - self.conversation_view.connect('mention', self._on_mention) self.conversation_view.connect('scroll-to-end', self._on_scroll_to_end) id_ = self.conversation_view.connect( @@ -409,22 +406,6 @@ def shutdown(self) -> None: self.unregister_events() - def insert_as_quote(self, text: str) -> None: - text = '> ' + text.replace('\n', '\n> ') + '\n' - message_buffer = self.msg_textview.get_buffer() - message_buffer.insert_at_cursor(text) - self.msg_textview.grab_focus() - - def _on_quote(self, _view: ConversationView, text: str) -> None: - self.insert_as_quote(text) - - def _on_mention(self, _view: ConversationView, name: str) -> None: - gc_refer_to_nick_char = app.settings.get('gc_refer_to_nick_char') - text = f'{name}{gc_refer_to_nick_char} ' - message_buffer = self.msg_textview.get_buffer() - message_buffer.insert_at_cursor(text) - GLib.idle_add(self.msg_textview.grab_focus) - def _on_scroll_to_end(self, _view: ConversationView) -> None: scroll_to_end(self._scrolled_view) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -24,7 +24,6 @@ from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gtk -from gi.repository import GObject from gi.repository import Pango import cairo @@ -60,20 +59,6 @@ class MessageRow(BaseRow): - - __gsignals__ = { - 'mention': ( - GObject.SignalFlags.RUN_LAST, - None, - (str,) - ), - 'quote': ( - GObject.SignalFlags.RUN_LAST, - None, - (str,) - ), - } - def __init__(self, account: str, contact: ChatContactT, @@ -269,7 +254,7 @@ def _on_avatar_clicked(self, name: str ) -> int: if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 1: - self.emit('mention', name) + app.window.activate_action('mention', GLib.Variant('s', name)) return Gdk.EVENT_STOP @staticmethod @@ -331,7 +316,8 @@ def on_copy_message(self, _widget: Gtk.Widget) -> None: clip.set_text(f'{timestamp_formatted} - {self.name}: {text}', -1) def on_quote_message(self, _widget: Gtk.Widget) -> None: - self.emit('quote', self._message_widget.get_text()) + app.window.activate_action( + 'quote', GLib.Variant('s', self._message_widget.get_text())) def on_retract_message(self, _widget: Gtk.Widget) -> None: def _on_retract(reason: str) -> None: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -68,16 +68,6 @@ class ConversationView(Gtk.ListBox): __gsignals__ = { - 'quote': ( - GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, - None, - (str, ) - ), - 'mention': ( - GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, - None, - (str, ) - ), 'scroll-to-end': ( GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, None, @@ -268,8 +258,6 @@ def add_message(self, error=error, encryption_enabled=self.encryption_enabled, log_line_id=log_line_id) - message_row.connect('mention', self._on_mention) - message_row.connect('quote', self._on_quote) if message_id is not None: self._message_id_row_map[message_id] = message_row @@ -513,12 +501,6 @@ def show_error(self, id_: str, error: StanzaError) -> None: message_row.set_error(to_user_string(error)) message_row.set_merged(False) - def _on_quote(self, _message_row: MessageRow, text: str) -> None: - self.emit('quote', text) - - def _on_mention(self, _message_row: MessageRow, name: str) -> None: - self.emit('mention', name) - def _on_contact_setting_changed(self, value: Any, setting: str, ===================================== gajim/gtk/menus.py ===================================== @@ -85,6 +85,8 @@ def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: menu.add_item(_('Start Voice Call…'), 'win.start-voice-call') menu.add_item(_('Start Video Call…'), 'win.start-video-call') + menu.add_item(_('Search…'), 'win.search-history', None) + if can_add_to_roster(contact): params = AccountJidParam(account=account, jid=contact.jid) menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -37,7 +37,8 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.const import Direction -from gajim.common.modules.contacts import GroupchatContact, GroupchatParticipant +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT from gajim.gui.security_label_selector import SecurityLabelSelector @@ -46,16 +47,17 @@ from .dialogs import ErrorDialog from .dialogs import PastePreviewDialog from .emoji_chooser import emoji_chooser -from .menus import get_encryption_menu, get_private_chat_menu, get_self_contact_menu +from .menus import get_encryption_menu from .menus import get_format_menu from .menus import get_groupchat_menu +from .menus import get_private_chat_menu +from .menus import get_self_contact_menu from .menus import get_singlechat_menu from .message_input import MessageInputTextView if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports - log = logging.getLogger('gajim.gui.messageactionsbox') @@ -124,6 +126,8 @@ def _connect_actions(self) -> None: 'input-strike', 'input-clear', 'show-emoji-chooser', + 'quote', + 'mention', ] for action in actions: @@ -145,7 +149,7 @@ def _connect_actions(self) -> None: def _on_action(self, action: Gio.SimpleAction, - _param: Optional[GLib.Variant]) -> Optional[int]: + param: Optional[GLib.Variant]) -> Optional[int]: if self._contact is None: return @@ -162,6 +166,14 @@ def _on_action(self, elif action_name == 'show-emoji-chooser': self._on_show_emoji_chooser() + elif action_name == 'quote': + assert param + self.msg_textview.insert_as_quote(param.get_string()) + + elif action_name == 'mention': + assert param + self.msg_textview.mention_participant(param.get_string()) + def switch_contact(self, contact: ChatContactT) -> None: self._contact = contact self._set_settings_menu(contact) @@ -305,9 +317,10 @@ def _on_clear(self) -> None: self.msg_textview.clear() def _on_show_emoji_chooser(self) -> None: - if sys.platform == 'darwin': - self._ui.emoticons_button.get_popover().show() + popover = self._ui.emoticons_button.get_popover() + assert popover + popover.show() else: self.msg_textview.emit('insert-emoji') @@ -359,6 +372,7 @@ def _get_spell_checker_language(self, if not lang: lang = i18n.LANG + assert isinstance(lang, str) lang = Gspell.language_lookup(lang) if lang is None: lang = Gspell.language_get_default() ===================================== gajim/gtk/message_input.py ===================================== @@ -367,10 +367,15 @@ def _on_populate_popup(self, menu.show_all() + def mention_participant(self, name: str) -> None: + gc_refer_to_nick_char = app.settings.get('gc_refer_to_nick_char') + text = f'{name}{gc_refer_to_nick_char} ' + self.insert_text(text) + self.grab_focus() + def insert_as_quote(self, text: str) -> None: text = '> ' + text.replace('\n', '\n> ') + '\n' - message_buffer = self.get_buffer() - message_buffer.insert_at_cursor(text) + self.insert_text(text) self.grab_focus() def _paste_clipboard_as_quote(self, _item: Gtk.MenuItem) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/25088a135b0299352e33d625808ebce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/25088a135b0299352e33d625808ebce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Hide download hint if we sent the file
by Daniel Brötzmann (＠wurstsalat) 08 Jul '22

08 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9c252dd0 by wurstsalat at 2022-07-08T22:45:28+02:00 fix: Preview: Hide download hint if we sent the file Fixes #11036 - - - - - 4 changed files: - gajim/common/preview.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -61,12 +61,14 @@ def __init__(self, thumb_path: Optional[Path], size: int, widget: Any, + from_us: bool = False, context: Optional[str] = None ) -> None: self._uri = uri self._urlparts = urlparts self._filename = filename_from_uri(uri) self._widget = widget + self._from_us = from_us self._context = context self.account = widget.account @@ -109,6 +111,10 @@ def is_audio(self) -> bool: def uri(self) -> str: return self._uri + @property + def from_us(self) -> bool: + return self._from_us + @property def context(self) -> Optional[str]: return self._context @@ -275,7 +281,7 @@ def is_previewable(self, def create_preview(self, uri: str, widget: Any, - is_self: bool, + from_us: bool, context: Optional[str] = None ) -> None: if uri.startswith('geo:'): @@ -283,10 +289,10 @@ def create_preview(self, preview.update_widget() return - preview = self._process_web_uri(uri, widget, context) + preview = self._process_web_uri(uri, widget, from_us, context) if not preview.orig_exists(): - if context is not None and not is_self: + if context is not None and not from_us: allow_in_public = app.settings.get('preview_anonymous_muc') if context == 'public' and not allow_in_public: preview.update_widget() @@ -307,6 +313,7 @@ def create_preview(self, def _process_web_uri(self, uri: str, widget: Any, + from_us: bool, context: Optional[str] = None ) -> Preview: urlparts = urlparse(uri) @@ -322,6 +329,7 @@ def _process_web_uri(self, thumb_path, size, widget, + from_us, context=context) def _on_orig_load_finished(self, ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -78,7 +78,7 @@ def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: return label @staticmethod - def create_name_widget(name: str, is_self: bool) -> Gtk.Label: + def create_name_widget(name: str, from_us: bool) -> Gtk.Label: label = Gtk.Label() label.set_selectable(True) label.set_ellipsize(Pango.EllipsizeMode.END) @@ -86,7 +86,7 @@ def create_name_widget(name: str, is_self: bool) -> Gtk.Label: label.get_style_context().add_class('conversation-nickname') label.set_markup(GLib.markup_escape_text(name)) - if is_self: + if from_us: label.get_style_context().add_class('gajim-outgoing-nickname') else: label.get_style_context().add_class('gajim-incoming-nickname') ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -118,9 +118,9 @@ def __init__(self, if self._is_groupchat: our_nick = get_group_chat_nick(self._account, self._contact.jid) - is_self = name == our_nick + from_us = name == our_nick else: - is_self = kind == 'outgoing' + from_us = kind == 'outgoing' is_previewable = False if additional_data is not None: @@ -132,7 +132,7 @@ def __init__(self, context = get_muc_context(self._contact.jid) self._message_widget = PreviewWidget(account) app.preview_manager.create_preview( - text, self._message_widget, is_self, context) + text, self._message_widget, from_us, context) else: self._message_widget = MessageWidget(account) self._message_widget.add_with_styling(text, nickname=name) @@ -145,7 +145,7 @@ def __init__(self, if self._contact.jid == self._client.get_own_jid().bare: name = _('Me') - name_widget = self.create_name_widget(name, is_self) + name_widget = self.create_name_widget(name, from_us) self._meta_box = Gtk.Box(spacing=6) self._meta_box.set_hexpand(True) ===================================== gajim/gtk/preview.py ===================================== @@ -168,7 +168,8 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.save_as_button.hide() self._ui.open_folder_button.hide() allow_in_public = app.settings.get('preview_anonymous_muc') - if preview.context == 'public' and not allow_in_public: + if (preview.context == 'public' and not + allow_in_public and not preview.from_us): image = Gtk.Image.new_from_icon_name( 'dialog-question', Gtk.IconSize.DIALOG) self._ui.icon_button.set_image(image) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c252dd0b36a33fa52dbcf73dacd9ee7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c252dd0b36a33fa52dbcf73dacd9ee7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Move Separators to ChatStack
by Daniel Brötzmann (＠wurstsalat) 08 Jul '22

08 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 25088a13 by wurstsalat at 2022-07-08T19:03:35+02:00 Move Separators to ChatStack - - - - - 4 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim.css - gajim/gtk/chat_stack.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -16,12 +16,6 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkOverlay" id="conv_view_overlay"> <property name="visible">True</property> @@ -36,23 +30,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="index">-1</property> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -71,12 +71,6 @@ <property name="margin-end">4</property> <property name="hexpand">True</property> <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkOverlay" id="conv_view_overlay"> <property name="visible">True</property> @@ -91,23 +85,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -6,7 +6,7 @@ .chatcontrol-actionbar-button { border: none; } -.message-action-box { margin: 0px 13px 8px 8px } +.message-action-box { margin: 8px 13px 8px 8px } .no-border { border: none; } .scrolled-no-border { border: none; } ===================================== gajim/gtk/chat_stack.py ===================================== @@ -60,6 +60,7 @@ def __init__(self): box.add(self._chat_banner) box.add(Gtk.Separator()) box.add(self._control_stack) + box.add(Gtk.Separator()) box.add(self._message_action_box) self._current_contact = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/25088a135b0299352e33d625808ebced… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/25088a135b0299352e33d625808ebced… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] MessageInputTextView: Add draft support
by Daniel Brötzmann (＠wurstsalat) 08 Jul '22

08 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 68181443 by wurstsalat at 2022-07-08T18:48:34+02:00 MessageInputTextView: Add draft support - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -20,6 +20,7 @@ from __future__ import annotations from typing import Any +from typing import Optional import sys @@ -73,6 +74,9 @@ def __init__(self) -> None: self._undo_list: list[str] = [] self.undo_pressed: bool = False + self._contact: Optional[ChatContactT] = None + self._drafts: dict[str, str] = {} + self._chat_action_processor = ChatActionProcessor(self) self.get_buffer().create_tag('strong', weight=Pango.Weight.BOLD) @@ -88,6 +92,18 @@ def __init__(self) -> None: self.connect('populate-popup', self._on_populate_popup) def switch_contact(self, contact: ChatContactT) -> None: + if self._contact is not None: + if self.has_text(): + self._drafts[str(self._contact.jid)] = self.get_text() + else: + self._drafts.pop(str(self._contact.jid), None) + + self.clear() + draft = self._drafts.get(str(contact.jid)) + if draft is not None: + self.insert_text(draft) + + self._contact = contact self._chat_action_processor.switch_contact(contact) def _on_destroy(self, _widget: Gtk.Widget) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/68181443efd0314102e794da0fe841a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/68181443efd0314102e794da0fe841a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Adapt ChatActionProcessor and GroupChatNickCompletion
by Daniel Brötzmann (＠wurstsalat) 08 Jul '22

08 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: bcb64411 by wurstsalat at 2022-07-08T18:24:17+02:00 Adapt ChatActionProcessor and GroupChatNickCompletion - - - - - 5 changed files: - gajim/gtk/chat_action_processor.py - gajim/gtk/groupchat_nick_completion.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py - test/no_gui/test_nick_completion.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -38,11 +38,7 @@ class ChatActionProcessor(Gtk.Popover): - def __init__(self, - account: str, - contact: types.ChatContactT, - message_input: MessageInputTextView - ) -> None: + def __init__(self, message_input: MessageInputTextView) -> None: Gtk.Popover.__init__(self) self._menu = Gio.Menu() self.bind_model(self._menu) @@ -53,23 +49,28 @@ def __init__(self, self.connect('closed', self._on_popover_closed) self.connect('destroy', self._on_destroy) + self._account: Optional[str] = None + self._contact: Optional[types.ChatContactT] = None + self._message_input = message_input self._message_input.connect('key-press-event', self._on_key_press) self._buf = message_input.get_buffer() self._buf.connect('changed', self._on_changed) - self._nick_completion: Optional[GroupChatNickCompletion] = None - if contact.is_groupchat: - assert isinstance(contact, GroupchatContact) - self._nick_completion = GroupChatNickCompletion( - account, contact, message_input) + self._nick_completion = GroupChatNickCompletion() self._start_mark: Optional[Gtk.TextMark] = None self._current_iter: Optional[Gtk.TextIter] = None self._active = False + def switch_contact(self, contact: types.ChatContactT) -> None: + self._account = contact.account + self._contact = contact + if isinstance(contact, GroupchatContact): + self._nick_completion.switch_contact(contact) + def _on_destroy(self, _popover: Gtk.Popover) -> None: app.check_finalize(self) @@ -77,7 +78,7 @@ def _on_key_press(self, textview: MessageInputTextView, event: Gdk.EventKey ) -> bool: - if self._nick_completion is not None: + if isinstance(self._contact, GroupchatContact): res = self._nick_completion.process_key_press(textview, event) if res: return True @@ -122,8 +123,9 @@ def _replace_text(self, selected_action: str) -> None: def _get_commands(self) -> list[str]: commands: list[str] = [] - control = app.window.get_control( - self._message_input.account, self._message_input.contact.jid) + assert self._account + assert self._contact + control = app.window.get_control(self._account, self._contact.jid) assert control is not None for command in control.list_commands(): for name in command.names: @@ -325,6 +327,9 @@ def _item_has_focus(item: Gtk.ModelButton) -> bool: flags = item.get_state_flags() return 'GTK_STATE_FLAG_FOCUSED' in str(flags) - def process_outgoing_message(self, contact: str, highlight: bool) -> None: - if self._nick_completion is not None: - self._nick_completion.record_message(contact, highlight) + def process_outgoing_message(self, + contact_name: str, + highlight: bool + ) -> None: + if isinstance(self._contact, GroupchatContact): + self._nick_completion.process_message(contact_name, highlight) ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -14,6 +14,7 @@ from __future__ import annotations +from typing import Optional from typing import TYPE_CHECKING import logging @@ -33,22 +34,38 @@ class GroupChatNickCompletion: - def __init__(self, - account: str, - contact: types.GroupchatContactT, - message_input: MessageInputTextView - ) -> None: - self._account = account - - self._contact = contact - self._contact.connect( - 'user-nickname-changed', self._on_user_nickname_changed) + def __init__(self) -> None: + self._account: Optional[str] = None + self._contact: Optional[types.GroupchatContactT] = None self._sender_list: list[str] = [] - self._attention_list: list[str] = [] + self._highlight_list: list[str] = [] self._nick_hits: list[str] = [] self._last_key_tab = False + self._nick_data: dict[str, tuple[list[str], list[str]]] = {} + + def switch_contact(self, contact: types.GroupchatContactT) -> None: + self._nick_hits.clear() + self._last_key_tab = False + + if self._contact is not None: + self._contact.disconnect_all_from_obj(self) + self._nick_data[str(self._contact.jid)] = ( + self._sender_list, self._highlight_list) + + nick_data = self._nick_data.get(str(contact.jid)) + if nick_data is None: + self._sender_list.clear() + self._highlight_list.clear() + else: + self._sender_list, self._highlight_list = nick_data + + self._account = contact.account + self._contact = contact + self._contact.connect( + 'user-nickname-changed', self._on_user_nickname_changed) + def _on_user_nickname_changed(self, _contact: types.GroupchatContact, _signal_name: str, @@ -63,12 +80,13 @@ def _on_user_nickname_changed(self, new_name = properties.muc_user.nick assert new_name is not None log.debug('Contact %s renamed to %s', old_name, new_name) - for lst in (self._attention_list, self._sender_list): + for lst in (self._highlight_list, self._sender_list): for idx, contact in enumerate(lst): if contact == old_name: lst[idx] = new_name - def record_message(self, contact_name: str, highlight: bool) -> None: + def process_message(self, contact_name: str, highlight: bool) -> None: + assert self._contact if contact_name == self._contact.nickname: return @@ -78,12 +96,12 @@ def record_message(self, contact_name: str, highlight: bool) -> None: if highlight: try: - self._attention_list.remove(contact_name) + self._highlight_list.remove(contact_name) except ValueError: pass - if len(self._attention_list) > 6: - self._attention_list.pop(0) # remove older - self._attention_list.append(contact_name) + if len(self._highlight_list) > 6: + self._highlight_list.pop(0) # remove older + self._highlight_list.append(contact_name) # TODO implement it in a more efficient way # Currently it's O(n*m + n*s), where n is the number of participants and @@ -111,12 +129,13 @@ def _generate_suggestions(self, `beginning` is the text already typed by the user """ def _nick_matching(nick: str) -> bool: + assert self._contact return (nick != self._contact.nickname and nick.lower().startswith(beginning.lower())) if beginning == '': # empty message, so just suggest recent mentions - potential_matches = self._attention_list + potential_matches = self._highlight_list else: # nick partially typed, try completing it potential_matches = self._sender_list @@ -179,6 +198,7 @@ def process_key_press(self, self._nick_hits.append(self._nick_hits[0]) begin = self._nick_hits.pop(0) else: + assert self._contact list_nick = self._contact.get_user_nicknames() list_nick = list(filter(self._jid_not_blocked, list_nick)) @@ -215,6 +235,7 @@ def process_key_press(self, else: start_iter.backward_chars(len(begin)) + assert self._account client = app.get_client(self._account) client.get_module('Chatstate').block_chatstates( self._contact, True) @@ -255,6 +276,8 @@ def process_key_press(self, return True def _jid_not_blocked(self, resource: str) -> bool: + assert self._account + assert self._contact resource_contact = self._contact.get_resource(resource) return not jid_is_blocked( self._account, str(resource_contact.jid)) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -173,6 +173,7 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_spell_checker_language(contact) self._set_chatstate() + self.msg_textview.switch_contact(contact) self._security_label_selector.switch_contact(contact) def _set_chatstate(self) -> None: ===================================== gajim/gtk/message_input.py ===================================== @@ -57,9 +57,6 @@ class MessageInputTextView(Gtk.TextView): """ def __init__(self) -> None: Gtk.TextView.__init__(self) - # self.account = account - # self.contact = contact - self.set_border_width(3) self.set_accepts_tab(True) self.set_editable(True) @@ -76,8 +73,7 @@ def __init__(self) -> None: self._undo_list: list[str] = [] self.undo_pressed: bool = False - # self._chat_action_processor = ChatActionProcessor( - # account, contact, self) + self._chat_action_processor = ChatActionProcessor(self) self.get_buffer().create_tag('strong', weight=Pango.Weight.BOLD) self.get_buffer().create_tag('emphasis', style=Pango.Style.ITALIC) @@ -91,6 +87,9 @@ def __init__(self) -> None: self.connect('destroy', self._on_destroy) self.connect('populate-popup', self._on_populate_popup) + def switch_contact(self, contact: ChatContactT) -> None: + self._chat_action_processor.switch_contact(contact) + def _on_destroy(self, _widget: Gtk.Widget) -> None: # We restore the TextView’s drag destination to avoid a GTK warning # when closing the control. BaseControl.shutdown() calls destroy() @@ -323,9 +322,8 @@ def process_outgoing_message(self, contact_name: str, highlight: bool ) -> None: - # self._chat_action_processor.process_outgoing_message( - # contact_name, highlight) - pass + self._chat_action_processor.process_outgoing_message( + contact_name, highlight) def _on_populate_popup(self, _textview: MessageInputTextView, ===================================== test/no_gui/test_nick_completion.py ===================================== @@ -10,13 +10,12 @@ class Test(unittest.TestCase): def test_generate_suggestions(self): - contact = MagicMock() message_input = MagicMock() - gen = GroupChatNickCompletion('testacc', contact, message_input) + gen = GroupChatNickCompletion(message_input) l = ['aaaa', 'fooo', 'xxxxz', 'xaaaz'] for n in l: - gen.record_message(n, False) + gen.process_message(n, False) l2 = ['xxx'] + l r = gen._generate_suggestions(nicks=l2, beginning='x') self.assertEqual(r, ['xaaaz', 'xxxxz', 'xxx']) @@ -28,7 +27,7 @@ def test_generate_suggestions(self): self.assertEqual(r, []) for n in ['xaaaz', 'xxxxz']: - gen.record_message(n, True) + gen.process_message(n, True) r = gen._generate_suggestions( nicks=l2, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bcb6441175405bf4b71b05326946ff6f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bcb6441175405bf4b71b05326946ff6f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Use ssh to clone flatpak repository
by Philipp Hörist (＠lovetox) 07 Jul '22

07 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 318c1eaf by lovetox at 2022-07-07T21:04:11+02:00 ci: Use ssh to clone flatpak repository - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -136,7 +136,7 @@ deploy-flatpak: script: - git config --global user.email "$CI_GIT_USER_EMAIL" - git config --global user.name "$CI_GIT_USER_USERNAME" - - git clone https://github.com/flathub/org.gajim.Gajim.git + - git clone git@github.com:flathub/org.gajim.Gajim.git - cd org.gajim.Gajim - mv ../flatpak/org.gajim.Gajim.yaml org.gajim.Gajim.yaml - mv ../flatpak/app-overrides.json app-overrides.json View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/318c1eaf4d6aac57fdcdc9cc907cafa2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/318c1eaf4d6aac57fdcdc9cc907cafa2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag 1.4.6
by Philipp Hörist (＠lovetox) 07 Jul '22

07 Jul '22

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

1 0

[Git][gajim/gajim][master] release: 1.4.6
by Philipp Hörist (＠lovetox) 07 Jul '22

07 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 41433499 by lovetox at 2022-07-07T20:49:59+02:00 release: 1.4.6 - - - - - 4 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,24 @@ +Gajim 1.4.6 (07 Jul 2022) + + Improvements + + * Roster: Display show value in tooltip (#11010) + * ChatActionProcessor: Improve detection of emoji shortcode start + + Bug Fixes + + * Flatpak: Fix display of tray icon using libappindicator (#10869) + * Remote: Console scripts need a method as entry point (#11034) + * CodeWidget: Don’t default to python for highlighting (#11012) + * ContactInfo: Preserve groups when changing contact name (#11028) + * CodeWidget: Don't highlight matching brackets (#11026) + * StatusIcon: Don’t lose new message icon on state change (#11013) + * GtkStatusIcon: Always show when Gajim has not toplevel focus + * GroupChatNickCompletion: Only process Tab press + * Notifications: Change Gdk window hints on Windows (#11008) + * Row name: Align label correctly + * StatusIcon: Logic error on activate + Gajim 1.4.5 (21 Jun 2022) New ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,6 +74,7 @@ <control>pointing</control> </recommends> <releases> + <release version="1.4.6" date="2022-07-07" /> <release version="1.4.5" date="2022-06-21" /> <release version="1.4.4" date="2022-06-18" /> <release version="1.4.3" date="2022-06-01" /> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -317,7 +317,7 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: 1.4.5 + tag: 1.4.6 - type: file path: app-overrides.json post-install: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = '1.4.5' +__version__ = '1.4.6' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41433499c4e73b3b9ff8cc273f80a964… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41433499c4e73b3b9ff8cc273f80a964… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 07 Jul '22

07 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: dc773376 by Weblate at 2022-07-07T20:47:03+02:00 chore: Update translations - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gajim.pot - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ro.po - po/ru.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dc773376ca838c2d17060bc5375ae2fd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dc773376ca838c2d17060bc5375ae2fd… 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