Commits October 2022

commits@gajim.org

1 participants
208 discussions

[Git][gajim/python-nbxmpp][master] fix: MUC: Check correctly for muc subject
by Philipp Hörist (＠lovetox) 26 Oct '22

26 Oct '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e0ceb1d8 by Philipp Hörist at 2022-10-26T21:30:55+02:00 fix: MUC: Check correctly for muc subject The subject can be an empty string - - - - - 1 changed file: - nbxmpp/modules/muc/muc.py Changes: ===================================== nbxmpp/modules/muc/muc.py ===================================== @@ -228,7 +228,7 @@ class MUC(BaseModule): properties.muc_ofrom = JID.from_string(address.getAttr('jid')) def _process_message_after_decryption(self, _client, _stanza, properties): - if properties.body is None and properties.subject: + if properties.body is None and properties.subject is not None: properties.muc_subject = MucSubject( text=properties.subject, author=properties.muc_nickname, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e0ceb1d8ac6085666740a6dd… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e0ceb1d8ac6085666740a6dd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MUC: Allow changing subject if there is none
by Philipp Hörist (＠lovetox) 26 Oct '22

26 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 28df08b7 by Philipp Hörist at 2022-10-26T21:30:06+02:00 fix: MUC: Allow changing subject if there is none Fixes #11250 - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/gtk/groupchat_manage.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -810,20 +810,20 @@ def _on_subject_change(self, old_subject = muc_data.subject muc_subject = properties.muc_subject + assert muc_subject is not None muc_data.subject = muc_subject - if muc_subject is not None: - if muc_subject.timestamp is None: - muc_subject = muc_subject._replace(timestamp=time.time()) + if muc_subject.timestamp is None: + muc_subject = muc_subject._replace(timestamp=time.time()) - if old_subject is None: - muc_data.last_subject_timestamp = time.time() - room.notify('room-subject', muc_subject) - else: - # Check if we already showed that subject (rejoin) - if old_subject.text != muc_subject.text: - muc_data.last_subject_timestamp = time.time() - room.notify('room-subject', muc_subject) + if old_subject is None: + muc_data.last_subject_timestamp = time.time() + room.notify('room-subject', muc_subject) + + elif old_subject.text != muc_subject.text: + # Check if we already showed that subject (rejoin) + muc_data.last_subject_timestamp = time.time() + room.notify('room-subject', muc_subject) if muc_data.state == MUCJoinedState.JOINING: self._room_join_complete(muc_data) ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -120,13 +120,15 @@ def _on_subject_change_clicked(self, _button: Gtk.Button) -> None: def _on_room_subject(self, _contact: GroupchatContact, _signal_name: str, - subject: Optional[MucSubject] + subject: MucSubject ) -> None: - if subject is None: - return self._ui.subject_textview.get_buffer().set_text(subject.text) + assert self._contact.subject is not None + self._ui.subject_change_button.set_sensitive( + subject.text != self._contact.subject.text) + def _prepare_manage(self) -> None: joined = self._contact.is_joined vcard_support = False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/28df08b723a74e087e5bb424bdd19e22… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/28df08b723a74e087e5bb424bdd19e22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: PluginsWindow: Fix typo in plugin tooltip
by Daniel Brötzmann (＠wurstsalat) 26 Oct '22

26 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6786feb7 by Daniel Brötzmann at 2022-10-26T11:59:03+00:00 fix: PluginsWindow: Fix typo in plugin tooltip - - - - - 1 changed file: - gajim/gtk/plugins.py Changes: ===================================== gajim/gtk/plugins.py ===================================== @@ -152,7 +152,7 @@ def _on_query_tooltip(self, return True if row[Column.RESTART]: - tooltip.set_text(_('Restart Gajim for changes to take affect')) + tooltip.set_text(_('Restart Gajim for changes to take effect')) return True if row[Column.HAS_ERROR]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6786feb77189d384eeac159e63b33522… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6786feb77189d384eeac159e63b33522… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: PluginManager: Block plugins which have been integrated into Gajim
by Daniel Brötzmann (＠wurstsalat) 25 Oct '22

25 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3148bb80 by wurstsalat at 2022-10-25T23:52:32+02:00 fix: PluginManager: Block plugins which have been integrated into Gajim Fixes #11244 - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -52,7 +52,12 @@ log = logging.getLogger('gajim.p.manager') -BLOCKED_PLUGINS = [] +BLOCKED_PLUGINS = [ + 'appindicator_integration', + 'plugin_installer', + 'syntax_highlight', + 'url_image_preview' +] FIELDS = ('name', 'short_name', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3148bb8049453b36cb5628feab2ec428… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3148bb8049453b36cb5628feab2ec428… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: MessageInputTextView: Remove 'correcting' setter
by Daniel Brötzmann (＠wurstsalat) 25 Oct '22

25 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 014ee8f9 by wurstsalat at 2022-10-25T23:05:15+02:00 refactor: MessageInputTextView: Remove 'correcting' setter - - - - - 2 changed files: - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -229,7 +229,7 @@ def clear(self) -> None: @property def is_correcting(self) -> bool: - return self.msg_textview.correcting + return self.msg_textview.is_correcting def toggle_message_correction(self) -> None: self.msg_textview.toggle_message_correction() ===================================== gajim/gtk/message_input.py ===================================== @@ -115,15 +115,10 @@ def __init__(self) -> None: app.plugin_manager.gui_extension_point('message_input', self) @property - def correcting(self) -> bool: + def is_correcting(self) -> bool: assert self._contact is not None return self._correcting[self._contact] - @correcting.setter - def correcting(self, state: bool) -> None: - assert self._contact is not None - self._correcting[self._contact] = state - def get_last_message_id(self, contact: ChatContactT) -> Optional[str]: return self._last_message_id.get(contact) @@ -131,8 +126,8 @@ def toggle_message_correction(self) -> None: self.clear() self.grab_focus() - if self.correcting: - self.correcting = False + if self.is_correcting: + self._set_correcting(False) self.get_style_context().remove_class('gajim-msg-correcting') return @@ -146,13 +141,13 @@ def toggle_message_correction(self) -> None: if message_row is None: return - self.correcting = True + self._set_correcting(True) self.get_style_context().add_class('gajim-msg-correcting') self.insert_text(message_row.message) def try_message_correction(self, message: str) -> Optional[str]: assert self._contact is not None - if not self.correcting: + if not self.is_correcting: return None self.toggle_message_correction() @@ -170,6 +165,10 @@ def try_message_correction(self, message: str) -> Optional[str]: return correct_id + def _set_correcting(self, state: bool) -> None: + assert self._contact is not None + self._correcting[self._contact] = state + def _on_message_sent(self, event: MessageSent) -> None: if not event.message: return @@ -249,7 +248,7 @@ def switch_contact(self, contact: ChatContactT) -> None: self.insert_text(draft) self._contact = contact - if self.correcting: + if self.is_correcting: self.get_style_context().add_class('gajim-msg-correcting') else: self.get_style_context().remove_class('gajim-msg-correcting') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/014ee8f902dcb20d2d2770807a2d88b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/014ee8f902dcb20d2d2770807a2d88b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatList: Show drafts
by Daniel Brötzmann (＠wurstsalat) 25 Oct '22

25 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: af66c322 by wurstsalat at 2022-10-25T22:56:36+02:00 imprv: ChatList: Show drafts - - - - - 3 changed files: - gajim/data/style/gajim.css - gajim/gtk/chat_list_row.py - gajim/gtk/chat_stack.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -768,6 +768,11 @@ .large-header { } .insensitive-fg-color {color: @insensitive_fg_color;} +.draft { + font-style: italic; + color: @warning_color; +} + /* Padding/Margins */ .margin-right18 { margin-right: 18px; } .margin-top6 { margin-top: 6px; } ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -46,6 +46,7 @@ from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.storage.draft import DraftStorage from .menus import get_chat_list_row_menu from .builder import get_builder @@ -124,14 +125,18 @@ def __init__(self, self.update_name() self.update_account_identifier() + app.storage.drafts.connect('draft-update', self._on_draft_update) + if (isinstance(self.contact, GroupchatContact) and not self.contact.can_notify()): self._ui.unread_label.get_style_context().add_class( 'unread-counter-silent') - # Get last chat message from archive - line = app.storage.archive.get_last_conversation_line(account, jid) + self._display_last_conversation_line() + def _display_last_conversation_line(self) -> None: + line = app.storage.archive.get_last_conversation_line( + self.contact.account, self.contact.jid) if line is None: self.show_all() return @@ -152,10 +157,11 @@ def __init__(self, if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): self.set_nick(_('Me')) - me_nickname = app.nicks[account] + me_nickname = app.nicks[self.contact.account] if line.kind == KindConstant.GC_MSG: - our_nick = get_group_chat_nick(account, jid) + our_nick = get_group_chat_nick( + self.contact.account, self.contact.jid) if line.contact_name == our_nick: self.set_nick(_('Me')) me_nickname = our_nick @@ -233,6 +239,14 @@ def set_message_text(self, icon_name: Optional[str] = None, additional_data: Optional[AdditionalDataDict] = None ) -> None: + + draft = app.storage.drafts.get(self.contact) + if draft is not None: + self._show_draft(draft) + return + + self._ui.message_label.get_style_context().remove_class('draft') + icon = None if icon_name is not None: icon = Gio.Icon.new_for_string(icon_name) @@ -352,6 +366,28 @@ def _get_unread_string(count: int) -> str: return str(count) return '999+' + def _on_draft_update(self, + _draft_storage: DraftStorage, + _signal_name: str, + contact: ChatContactT, + draft: str + ) -> None: + + if contact != self.contact: + return + + self._show_draft(draft) + + def _show_draft(self, draft: str) -> None: + if not draft: + self._ui.message_label.get_style_context().remove_class('draft') + self._display_last_conversation_line() + return + + self.set_nick('') + self._ui.message_label.set_text(_('Draft: %s') % draft) + self._ui.message_label.get_style_context().add_class('draft') + def _on_state_flags_changed(self, _row: ChatListRow, _flags: Gtk.StateFlags ===================================== gajim/gtk/chat_stack.py ===================================== @@ -765,6 +765,7 @@ def _on_send_message(self) -> None: client.send_message(message_) self._message_action_box.msg_textview.clear() + app.storage.drafts.set(contact, '') def get_last_message_id(self, contact: ChatContactT) -> Optional[str]: return self._message_action_box.get_last_message_id(contact) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af66c322e83f373792f968c8361f4754… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af66c322e83f373792f968c8361f4754… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: StartChat: Recognize input of xmpp uris
by Philipp Hörist (＠lovetox) 25 Oct '22

25 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8cd29729 by Philipp Hörist at 2022-10-25T22:37:55+02:00 imprv: StartChat: Recognize input of xmpp uris - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -549,6 +549,12 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: return search_text = search_entry.get_text() + if search_text.startswith('xmpp:'): + search_text = search_text.removeprefix('xmpp:') + search_text = search_text.removesuffix('?join') + search_entry.set_text(search_text) + return + if '@' in search_text: try: validate_jid(search_text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8cd2972934d8af3cd65061cddf0012b1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8cd2972934d8af3cd65061cddf0012b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Move message correction handling to MessageInputTextView
by Daniel Brötzmann (＠wurstsalat) 25 Oct '22

25 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: de912f6c by wurstsalat at 2022-10-25T22:03:15+02:00 refactor: Move message correction handling to MessageInputTextView - - - - - 266b16da by wurstsalat at 2022-10-25T22:14:08+02:00 fix: MessageInputTextView: Fix correction mode when switching chats Fixes #11213 - - - - - 5 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/main.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -741,22 +741,9 @@ def _on_send_message(self) -> None: correct_id = None if self._message_action_box.is_correcting: - self._message_action_box.is_correcting = False - context = self._message_action_box.msg_textview.get_style_context() - context.remove_class('gajim-msg-correcting') - - correct_id = self._message_action_box.last_message_id.get( - (contact.account, contact.jid)) - message_row = app.storage.archive.get_last_correctable_message( - contact.account, contact.jid, correct_id) - if message_row is None: - self._message_action_box.msg_textview.clear() - log.info('Trying to correct message older than threshold') - return - - if message_row.message == message: - self._message_action_box.msg_textview.clear() - log.info('Trying to correct message with original text') + correct_id = self._message_action_box.try_message_correction( + message) + if correct_id is None: return chatstate = client.get_module('Chatstate').get_active_chatstate( @@ -779,8 +766,8 @@ def _on_send_message(self) -> None: self._message_action_box.msg_textview.clear() - def get_last_message_id(self, account: str, jid: JID) -> Optional[str]: - return self._message_action_box.last_message_id.get((account, jid)) + def get_last_message_id(self, contact: ChatContactT) -> Optional[str]: + return self._message_action_box.get_last_message_id(contact) def _close_control(self) -> None: assert self._current_contact is not None ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -97,7 +97,7 @@ def _on_click(self, _button: Gtk.Button) -> None: show_correction = False if self._row.message_id is not None: show_correction = app.window.is_message_correctable( - self._contact.account, self._contact.jid, self._row.message_id) + self._contact, self._row.message_id) self._create_popover(show_retract=show_retract, show_correction=show_correction) ===================================== gajim/gtk/main.py ===================================== @@ -30,6 +30,7 @@ from gajim.common import app from gajim.common import events from gajim.common import ged +from gajim.common import types from gajim.common.client import Client from gajim.common.const import Direction from gajim.common.const import Display @@ -855,17 +856,17 @@ def chat_exists(self, account: str, jid: JID) -> bool: return self._chat_page.chat_exists(account, jid) def is_message_correctable(self, - account: str, - jid: JID, + contact: types.ChatContactT, message_id: str ) -> bool: + chat_stack = self._chat_page.get_chat_stack() - last_message_id = chat_stack.get_last_message_id(account, jid) + last_message_id = chat_stack.get_last_message_id(contact) if last_message_id is None or last_message_id != message_id: return False message_row = app.storage.archive.get_last_correctable_message( - account, jid, last_message_id) + contact.account, contact.jid, last_message_id) return message_row is not None def get_total_unread_count(self) -> int: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -32,11 +32,8 @@ from nbxmpp.const import Chatstate from nbxmpp.modules.security_labels import SecurityLabel -from nbxmpp.protocol import JID from gajim.common import app -from gajim.common import events -from gajim.common import ged from gajim.common.commands import CommandFailed from gajim.common.i18n import _ from gajim.common.client import Client @@ -60,14 +57,12 @@ from .menus import get_singlechat_menu from .message_input import MessageInputTextView - log = logging.getLogger('gajim.gui.messageactionsbox') -class MessageActionsBox(Gtk.Grid, ged.EventHelper): +class MessageActionsBox(Gtk.Grid): def __init__(self) -> None: Gtk.Grid.__init__(self) - ged.EventHelper.__init__(self) self._client: Optional[Client] = None self._contact: Optional[ChatContactT] = None @@ -80,10 +75,6 @@ def __init__(self) -> None: # For undo self.space_pressed = False - # XEP-0308 Message Correction - self.is_correcting = False - self.last_message_id: dict[tuple[str, JID], Optional[str]] = {} - self._ui.send_message_button.set_visible( app.settings.get('show_send_message_button')) app.settings.bind_signal('show_send_message_button', @@ -117,10 +108,6 @@ def __init__(self) -> None: self._connect_actions() - self.register_events([ - ('message-sent', ged.GUI2, self._on_message_sent) - ]) - app.plugin_manager.gui_extension_point( 'message_actions_box', self, self._ui.box) @@ -240,6 +227,19 @@ def clear(self) -> None: self._contact = None self._client = None + @property + def is_correcting(self) -> bool: + return self.msg_textview.correcting + + def toggle_message_correction(self) -> None: + self.msg_textview.toggle_message_correction() + + def try_message_correction(self, message: str) -> Optional[str]: + return self.msg_textview.try_message_correction(message) + + def get_last_message_id(self, contact: ChatContactT) -> Optional[str]: + return self.msg_textview.get_last_message_id(contact) + def _on_client_state_changed(self, _client: Client, _signal_name: str, @@ -606,45 +606,3 @@ def _paste_event_confirmed(self, assert self._contact is not None app.interface.start_file_transfer(self._contact, path) - - def toggle_message_correction(self) -> None: - if self.is_correcting: - self.is_correcting = False - self.msg_textview.clear() - self.msg_textview.get_style_context().remove_class( - 'gajim-msg-correcting') - self.msg_textview.grab_focus() - return - - assert self._contact is not None - last_message_id = self.last_message_id.get( - (self._contact.account, self._contact.jid)) - if last_message_id is None: - return - - message_row = app.storage.archive.get_last_correctable_message( - self._contact.account, self._contact.jid, last_message_id) - if message_row is None: - return - - self.is_correcting = True - self.msg_textview.clear() - self.msg_textview.insert_text(message_row.message) - self.msg_textview.get_style_context().add_class('gajim-msg-correcting') - self.msg_textview.grab_focus() - - def _on_message_sent(self, event: events.MessageSent) -> None: - if not event.message: - return - - if event.correct_id is None: - # This wasn't a corrected message - assert self._contact is not None - oob_url = event.additional_data.get_value('gajim', 'oob_url') - account = self._contact.account - jid = self._contact.jid - if oob_url == event.message: - # Don't allow to correct HTTP Upload file transfer URLs - self.last_message_id[(account, jid)] = None - else: - self.last_message_id[(account, jid)] = event.message_id ===================================== gajim/gtk/message_input.py ===================================== @@ -22,6 +22,9 @@ from typing import Any from typing import Optional +from collections import defaultdict + +import logging import sys from gi.repository import Gtk @@ -31,6 +34,9 @@ from gi.repository import Pango from gajim.common import app +from gajim.common import ged +from gajim.common.events import MessageSent +from gajim.common.ged import EventHelper from gajim.common.i18n import LANG from gajim.common.i18n import _ from gajim.common.styling import process @@ -52,13 +58,17 @@ 'pre': '`', } +log = logging.getLogger('gajim.gui.message_input') + -class MessageInputTextView(Gtk.TextView): +class MessageInputTextView(Gtk.TextView, EventHelper): ''' A Gtk.Textview for chat message input ''' def __init__(self) -> None: Gtk.TextView.__init__(self) + EventHelper.__init__(self) + self.set_border_width(3) self.set_accepts_tab(True) self.set_editable(True) @@ -77,6 +87,10 @@ def __init__(self) -> None: self._contact: Optional[ChatContactT] = None + # XEP-0308 Message Correction + self._correcting: dict[ChatContactT, bool] = defaultdict(lambda: False) + self._last_message_id: dict[ChatContactT, Optional[str]] = {} + self._chat_action_processor = ChatActionProcessor(self) self.get_buffer().create_tag('strong', weight=Pango.Weight.BOLD) @@ -91,11 +105,85 @@ def __init__(self) -> None: self.connect('destroy', self._on_destroy) self.connect('populate-popup', self._on_populate_popup) + self.register_events([ + ('message-sent', ged.GUI2, self._on_message_sent) + ]) + self._language_handler_id = self._init_spell_checker() app.settings.connect_signal('use_speller', self._on_toggle_spell_check) app.plugin_manager.gui_extension_point('message_input', self) + @property + def correcting(self) -> bool: + assert self._contact is not None + return self._correcting[self._contact] + + @correcting.setter + def correcting(self, state: bool) -> None: + assert self._contact is not None + self._correcting[self._contact] = state + + def get_last_message_id(self, contact: ChatContactT) -> Optional[str]: + return self._last_message_id.get(contact) + + def toggle_message_correction(self) -> None: + self.clear() + self.grab_focus() + + if self.correcting: + self.correcting = False + self.get_style_context().remove_class('gajim-msg-correcting') + return + + assert self._contact is not None + last_message_id = self._last_message_id.get(self._contact) + if last_message_id is None: + return + + message_row = app.storage.archive.get_last_correctable_message( + self._contact.account, self._contact.jid, last_message_id) + if message_row is None: + return + + self.correcting = True + self.get_style_context().add_class('gajim-msg-correcting') + self.insert_text(message_row.message) + + def try_message_correction(self, message: str) -> Optional[str]: + assert self._contact is not None + if not self.correcting: + return None + + self.toggle_message_correction() + + correct_id = self._last_message_id.get(self._contact) + message_row = app.storage.archive.get_last_correctable_message( + self._contact.account, self._contact.jid, correct_id) + if message_row is None: + log.info('Trying to correct message older than threshold') + return None + + if message_row.message == message: + log.info('Trying to correct message with original text') + return None + + return correct_id + + def _on_message_sent(self, event: MessageSent) -> None: + if not event.message: + return + + if event.correct_id is None: + # This wasn't a corrected message + assert self._contact is not None + oob_url = event.additional_data.get_value('gajim', 'oob_url') + if oob_url == event.message: + # Don't allow to correct HTTP Upload file transfer URLs + self._last_message_id.pop(self._contact) + else: + self._last_message_id[self._contact] = event.message_id + def _init_spell_checker(self) -> int: if not app.is_installed('GSPELL'): return 0 @@ -161,6 +249,11 @@ def switch_contact(self, contact: ChatContactT) -> None: self.insert_text(draft) self._contact = contact + if self.correcting: + self.get_style_context().add_class('gajim-msg-correcting') + else: + self.get_style_context().remove_class('gajim-msg-correcting') + self._chat_action_processor.switch_contact(contact) self._set_spell_checker_language(contact) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/920f55b8946b8973540aec715f97f8e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/920f55b8946b8973540aec715f97f8e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: Add global draft storage
by Philipp Hörist (＠lovetox) 24 Oct '22

24 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 920f55b8 by Philipp Hörist at 2022-10-24T23:54:12+02:00 new: Add global draft storage - - - - - 4 changed files: - gajim/common/app.py - gajim/common/application.py - + gajim/common/storage/draft.py - gajim/gtk/message_input.py Changes: ===================================== gajim/common/app.py ===================================== @@ -60,6 +60,7 @@ from gajim.common.storage.cache import CacheStorage from gajim.common.storage.archive import MessageArchiveStorage from gajim.common.storage.events import EventStorage + from gajim.common.storage.draft import DraftStorage from gajim.common.cert_store import CertificateStore from gajim.common.call_manager import CallManager from gajim.common.preview import PreviewManager @@ -90,6 +91,7 @@ def __init__(self): self.cache: CacheStorage = None self.archive: MessageArchiveStorage = None self.events: EventStorage = None + self.drafts: DraftStorage = None storage = Storage() ===================================== gajim/common/application.py ===================================== @@ -55,6 +55,7 @@ from gajim.common.settings import LegacyConfig from gajim.common.cert_store import CertificateStore from gajim.common.storage.cache import CacheStorage +from gajim.common.storage.draft import DraftStorage from gajim.common.storage.archive import MessageArchiveStorage @@ -86,6 +87,8 @@ def _init_core(self) -> None: app.storage.archive = MessageArchiveStorage() app.storage.archive.init() + app.storage.drafts = DraftStorage() + app.cert_store = CertificateStore() app.task_manager = TaskManager() ===================================== gajim/common/storage/draft.py ===================================== @@ -0,0 +1,42 @@ +# 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 typing import Optional + +from gajim.common import types +from gajim.common.helpers import Observable + + +class DraftStorage(Observable): + def __init__(self) -> None: + Observable.__init__(self) + + self._drafts: dict[types.ChatContactT, str] = {} + + def set(self, contact: types.ChatContactT, text: str) -> None: + if not text: + self.remove(contact) + return + + self._drafts[contact] = text + self.notify('draft-update', contact, text) + + def get(self, contact: types.ChatContactT) -> Optional[str]: + return self._drafts.get(contact) + + def remove(self, contact: types.ChatContactT) -> None: + self._drafts.pop(contact, None) + self.notify('draft-update', contact, None) ===================================== gajim/gtk/message_input.py ===================================== @@ -30,8 +30,6 @@ from gi.repository import GLib from gi.repository import Pango -from nbxmpp.protocol import JID - from gajim.common import app from gajim.common.i18n import LANG from gajim.common.i18n import _ @@ -78,7 +76,6 @@ def __init__(self) -> None: self.undo_pressed: bool = False self._contact: Optional[ChatContactT] = None - self._drafts: dict[tuple[str, JID], str] = {} self._chat_action_processor = ChatActionProcessor(self) @@ -156,15 +153,10 @@ def _on_language_changed(self, def switch_contact(self, contact: ChatContactT) -> None: if self._contact is not None: - account = self._contact.account - jid = self._contact.jid - if self.has_text: - self._drafts[(account, jid)] = self.get_text() - else: - self._drafts.pop((account, jid), None) + app.storage.drafts.set(self._contact, self.get_text()) self.clear() - draft = self._drafts.get((contact.account, contact.jid)) + draft = app.storage.drafts.get(contact) if draft is not None: self.insert_text(draft) @@ -266,9 +258,6 @@ def get_text(self) -> str: text = self.get_buffer().get_text(start, end, True) return text - def get_draft(self, account: str, jid: JID) -> Optional[str]: - return self._drafts.get((account, jid)) - def _on_toggle_spell_check(self, *args: Any) -> None: if not app.is_installed('GSPELL'): return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/920f55b8946b8973540aec715f97f8e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/920f55b8946b8973540aec715f97f8e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AdHoc: Make MultiLineLabel selectable
by Daniel Brötzmann (＠wurstsalat) 24 Oct '22

24 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f9658e0f by wurstsalat at 2022-10-24T22:33:08+02:00 fix: AdHoc: Make MultiLineLabel selectable This enables selecting/copying results from AdHoc commands - - - - - 2 changed files: - gajim/gtk/dataform.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -725,7 +725,6 @@ def __init__(self, if self.read_only: self._textview = MultiLineLabel(label=field.value) - self._textview.set_selectable(True) self._textview.set_xalign(0) self._textview.set_yalign(0) else: ===================================== gajim/gtk/util.py ===================================== @@ -478,6 +478,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: self.set_line_wrap(True) self.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) self.set_single_line_mode(False) + self.set_selectable(True) class MaxWidthComboBoxText(Gtk.ComboBoxText): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f9658e0f6628cc5a1f25c95ae7b3c919… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f9658e0f6628cc5a1f25c95ae7b3c919… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2022