Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] cq: Group imports
by Philipp Hörist (＠lovetox) 16 Aug '22

16 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 348395b9 by lovetox at 2022-08-16T21:08:43+02:00 cq: Group imports - - - - - 2 changed files: - gajim/gtk/chat_page.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import Literal +from typing import TYPE_CHECKING import logging @@ -36,7 +37,6 @@ from .chat_stack import ChatStack from .search_view import SearchView -from typing import TYPE_CHECKING if TYPE_CHECKING: from .control import ChatControl ===================================== gajim/gtk/main.py ===================================== @@ -17,6 +17,7 @@ from typing import Any from typing import cast from typing import Optional +from typing import TYPE_CHECKING import logging @@ -63,7 +64,6 @@ from .structs import AddChatActionParams from .structs import actionmethod -from typing import TYPE_CHECKING if TYPE_CHECKING: from .control import ChatControl View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/348395b9bc3b0778be9b1c5ee3ab29ed… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/348395b9bc3b0778be9b1c5ee3ab29ed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cq: Fix some annotations to prevent import cycles
by Philipp Hörist (＠lovetox) 16 Aug '22

16 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 015b8548 by lovetox at 2022-08-16T20:53:26+02:00 cq: Fix some annotations to prevent import cycles - - - - - 3913515f by lovetox at 2022-08-16T20:58:52+02:00 refactor: Simplify QuoteWidget to prevent import cycles - - - - - 5 changed files: - gajim/gtk/chat_action_processor.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/quote_widget.py - gajim/gtk/groupchat_nick_completion.py - pyrightconfig.json Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -16,7 +16,6 @@ from typing import cast from typing import Optional -from typing import TYPE_CHECKING from gi.repository import Gdk from gi.repository import Gio @@ -31,14 +30,12 @@ from .emoji_data_gtk import get_emoji_data from .groupchat_nick_completion import GroupChatNickCompletion -if TYPE_CHECKING: - from .message_input import MessageInputTextView MAX_ENTRIES = 5 class ChatActionProcessor(Gtk.Popover): - def __init__(self, message_input: MessageInputTextView) -> None: + def __init__(self, message_input: Gtk.TextView) -> None: Gtk.Popover.__init__(self) self._menu = Gio.Menu() self.bind_model(self._menu) @@ -75,7 +72,7 @@ def _on_destroy(self, _popover: Gtk.Popover) -> None: app.check_finalize(self) def _on_key_press(self, - textview: MessageInputTextView, + textview: Gtk.TextView, event: Gdk.EventKey ) -> bool: if isinstance(self._contact, GroupchatContact): @@ -125,7 +122,7 @@ def _get_commands(self) -> list[tuple[str, str]]: assert self._contact is not None return app.commands.get_commands(self._contact.type_string) - def _on_changed(self, _textview: MessageInputTextView) -> None: + def _on_changed(self, _text_buffer: Gtk.TextBuffer) -> None: insert = self._buf.get_insert() self._current_iter = self._buf.get_iter_at_mark(insert) current_offset = self._current_iter.get_offset() ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -86,7 +86,7 @@ def add_content(self, content: ContentT) -> None: message_widget = MessageWidget(self._account, self._selectable) message_widget.add_content(block) widget = QuoteWidget(self._account) - widget.attach_message_widget(message_widget) + widget.add(message_widget) self.add(widget) continue ===================================== gajim/gtk/conversation/quote_widget.py ===================================== @@ -14,13 +14,8 @@ from __future__ import annotations -import typing - from gi.repository import Gtk -if typing.TYPE_CHECKING: - from .message_widget import MessageWidget - class QuoteWidget(Gtk.Box): def __init__(self, account: str) -> None: @@ -32,16 +27,3 @@ def __init__(self, account: str) -> None: quote_bar.set_margin_end(6) quote_bar.get_style_context().add_class('conversation-quote-bar') self.add(quote_bar) - - self._account = account - - self._message_widget = None - - def attach_message_widget(self, message_widget: MessageWidget) -> None: - - # Purpose of this method is to prevent circular imports - if self._message_widget is not None: - raise ValueError( - 'QuoteWidget already has a MessageWidget attached') - self._message_widget = message_widget - self.add(message_widget) ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -15,12 +15,12 @@ from __future__ import annotations from typing import Optional -from typing import TYPE_CHECKING import logging from nbxmpp.structs import PresenceProperties +from gi.repository import Gtk from gi.repository import Gdk from gajim.common import app @@ -31,8 +31,6 @@ from gajim.common.helpers import jid_is_blocked from gajim.common.helpers import message_needs_highlight -if TYPE_CHECKING: - from .message_input import MessageInputTextView log = logging.getLogger('gajim.gui.groupchat_nick_completion') @@ -186,7 +184,7 @@ def _nick_matching(nick: str) -> bool: return matches + other_nicks def process_key_press(self, - textview: MessageInputTextView, + textview: Gtk.TextView, event: Gdk.EventKey ) -> bool: if (event.get_state() & Gdk.ModifierType.SHIFT_MASK or ===================================== pyrightconfig.json ===================================== @@ -2,7 +2,6 @@ "pythonPlatform": "All", "pythonVersion": "3.9", "typeCheckingMode": "strict", - "reportImportCycles": "none", "reportUnnecessaryTypeIgnoreComment": "error", "reportPropertyTypeMismatch": "error", "reportMissingModuleSource": "none", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f7fecc737cb14a9f3a8dd61ba3a5255… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f7fecc737cb14a9f3a8dd61ba3a5255… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Update pylintrc
by Philipp Hörist (＠lovetox) 16 Aug '22

16 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f7fecc73 by lovetox at 2022-08-16T18:20:39+02:00 cq: Update pylintrc - - - - - 1 changed file: - pylintrc Changes: ===================================== pylintrc ===================================== @@ -101,6 +101,7 @@ confidence= # C0111 missing-docstring # C0209 use-f-string # C0302 too-many-lines +# C0411 wrong-import-order # C0413 wrong-import-position # R0801 duplicat-code # R0904 too-many-public-methods @@ -114,7 +115,7 @@ confidence= # W1404 implicit-str-concat # W1406 redundant-u-string-prefix -disable=E0401,E1101,E1102,E1111,E1120,E1121,E1123,E1124,E1125,E1126,E1127,E1128,E1129,E1130,E1131,E1132,E1133,E1134,E1135,E1136,E1137,E1138,E1139,E1140,E1141,E1142,I1101,W0212,W1113,W1114,W1115,W1116,C0301,C0303,C0304,C0321,C0413,W0301,W0311,W0611,C0111,C0209,C0302,R0801,R0904,R0913,R0915,R1725,R1732,W0237,W0311,W0511,W0707,W1404,W1406 +disable=E0401,E1101,E1102,E1111,E1120,E1121,E1123,E1124,E1125,E1126,E1127,E1128,E1129,E1130,E1131,E1132,E1133,E1134,E1135,E1136,E1137,E1138,E1139,E1140,E1141,E1142,I1101,W0212,W1113,W1114,W1115,W1116,C0301,C0303,C0304,C0321,C0411,C0413,W0301,W0311,W0611,C0111,C0209,C0302,R0801,R0904,R0913,R0915,R1725,R1732,W0237,W0311,W0511,W0707,W1404,W1406 # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f7fecc737cb14a9f3a8dd61ba3a5255a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f7fecc737cb14a9f3a8dd61ba3a5255a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Add type annotations
by Philipp Hörist (＠lovetox) 16 Aug '22

16 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6060900d by lovetox at 2022-08-16T18:13:15+02:00 cq: Add type annotations - - - - - 2 changed files: - gajim/gtk/chat_page.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -12,6 +12,8 @@ # 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 Any from typing import Literal @@ -33,7 +35,10 @@ from .chat_list_stack import ChatListStack from .chat_stack import ChatStack from .search_view import SearchView -from .types import ControlT + +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from .control import ChatControl log = logging.getLogger('gajim.gui.chat_page') @@ -293,7 +298,7 @@ def remove_chats_for_account(self, account: str) -> None: if self._chat_control.contact.account == account: self._chat_control.clear() - def get_control(self) -> ControlT: + def get_control(self) -> ChatControl: return self._chat_control def hide_search(self) -> bool: ===================================== gajim/gtk/main.py ===================================== @@ -63,6 +63,10 @@ from .structs import AddChatActionParams from .structs import actionmethod +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from .control import ChatControl + log = logging.getLogger('gajim.gui.main') @@ -749,7 +753,7 @@ def add_app_message(self, message: Optional[str] = None) -> None: self._app_page.add_app_message(category, message) - def get_control(self) -> Any: + def get_control(self) -> ChatControl: return self._chat_page.get_control() def chat_exists(self, account: str, jid: JID) -> bool: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6060900de2d9a3c66a37a246687dd730… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6060900de2d9a3c66a37a246687dd730… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Don’t fail if thumb file already exists
by Daniel Brötzmann (＠wurstsalat) 16 Aug '22

16 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9483a7c3 by wurstsalat at 2022-08-16T17:06:06+02:00 fix: Preview: Don’t fail if thumb file already exists Fixes #11091 - - - - - 1 changed file: - gajim/common/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -531,7 +531,10 @@ def _on_thumb_write_finished(_result: bool, if error is not None: log.error('%s: %s', preview.thumb_path.name, error) - return + if not preview.thumb_exists: + # Generating a preview can fail if the file already exists + # Only abort if thumbnail has not been stored in preview + return log.info('Thumbnail stored: %s ', preview.thumb_path.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9483a7c33c319ab1ccff9ba589f7c3b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9483a7c33c319ab1ccff9ba589f7c3b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: AccountPage: Use common string for ad-hoc commands
by Daniel Brötzmann (＠wurstsalat) 16 Aug '22

16 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ab34cf78 by wurstsalat at 2022-08-16T16:39:19+02:00 cfix: AccountPage: Use common string for ad-hoc commands - - - - - 1 changed file: - gajim/data/gui/account_page.ui Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -233,7 +233,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Ad-Hoc Commands…</property> + <property name="tooltip-text" translatable="yes">Execute Command…</property> <signal name="clicked" handler="_on_adhoc_commands" swapped="no"/> <child> <object class="GtkImage"> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab34cf78070ab9ebb10d0979b84e214f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab34cf78070ab9ebb10d0979b84e214f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Don’t re-use ReadMarkerRow and ScrollHintRow when switching contacts
by Daniel Brötzmann (＠wurstsalat) 16 Aug '22

16 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: fc4f9c43 by wurstsalat at 2022-08-16T09:22:05+02:00 cfix: Don’t re-use ReadMarkerRow and ScrollHintRow when switching contacts - - - - - 3 changed files: - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -26,8 +26,8 @@ class ReadMarkerRow(BaseRow): - def __init__(self, account: str, contact: ChatContactT) -> None: - BaseRow.__init__(self, account, widget='label') + def __init__(self, contact: ChatContactT) -> None: + BaseRow.__init__(self, contact.account, widget='label') self.set_activatable(False) self.type = 'read_marker' self.timestamp = datetime.fromtimestamp(0) ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -39,6 +39,7 @@ def __init__(self, account: str) -> None: self.grid.attach(self.label, 0, 1, 1, 1) self.set_history_complete(False) + self.show_all() def set_history_complete(self, complete: bool) -> None: if complete: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -119,24 +119,27 @@ def switch_contact(self, contact: ChatContactT) -> None: account=contact.account, jid=contact.jid) - self._read_marker_row = ReadMarkerRow(contact.account, contact) - self.add(self._read_marker_row) - - self._scroll_hint_row = ScrollHintRow(contact.account) - self.add(self._scroll_hint_row) - def get_row_at_index(self, index: int) -> BaseRow: return cast(BaseRow, Gtk.ListBox.get_row_at_index(self, index)) def reset(self) -> None: - for row in self.get_children()[2:]: - if isinstance(row, ReadMarkerRow): - continue + for row in self.get_children(): row.destroy() self._row_count = 0 self._active_date_rows = set() self._message_id_row_map = {} + self._read_marker_row = None + self._scroll_hint_row = None + + if self._contact is not None: + # These need to be present if ConversationView is reset + # without switch_contact being invoked + self._read_marker_row = ReadMarkerRow(self._contact) + self.add(self._read_marker_row) + + self._scroll_hint_row = ScrollHintRow(self._contact.account) + self.add(self._scroll_hint_row) def get_first_message_row(self) -> Optional[MessageRow]: for row in self.get_children(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc4f9c43d6224f966de9ade9a68b6cad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc4f9c43d6224f966de9ade9a68b6cad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: SpellChecker: Move code into MessageInput and simplify
by Philipp Hörist (＠lovetox) 15 Aug '22

15 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 97d06fc0 by lovetox at 2022-08-15T23:56:47+02:00 refactor: SpellChecker: Move code into MessageInput and simplify - - - - - 3 changed files: - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -36,7 +36,6 @@ from gajim.common import app from gajim.common import events -from gajim.common import i18n from gajim.common import ged from gajim.common.commands import ArgumentParserError from gajim.common.commands import CommandError @@ -63,8 +62,6 @@ 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') @@ -122,9 +119,6 @@ def __init__(self) -> None: self._ui.quick_invite_button.set_action_name('win.muc-invite') self._init_emoticon_popover() - # TODO init spellchecker uses a contact on callback, contact might - # be None - self._language_handler_id = self._init_spell_checker() self.show_all() self._ui.connect_signals(self) @@ -237,7 +231,6 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_encryption_state(encryption) self._set_encryption_details(encryption) - self._set_spell_checker_language(contact) self._set_chatstate(True) self.msg_textview.switch_contact(contact) @@ -427,69 +420,6 @@ def _on_show_emoji_chooser(self) -> None: else: self.msg_textview.emit('insert-emoji') - def _init_spell_checker(self) -> int: - if not app.is_installed('GSPELL'): - return 0 - - checker = Gspell.Checker.new(Gspell.language_get_default()) - - buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( - self.msg_textview.get_buffer()) - buffer.set_spell_checker(checker) - - use_spell_check = app.settings.get('use_speller') - view = Gspell.TextView.get_from_gtk_text_view(self.msg_textview) - view.set_inline_spell_checking(use_spell_check) - view.set_enable_language_menu(True) - - return checker.connect('notify::language', self._on_language_changed) - - def toggle_spell_checker(self) -> None: - if not app.is_installed('GSPELL'): - return - use_spell_check = app.settings.get('use_speller') - view = Gspell.TextView.get_from_gtk_text_view(self.msg_textview) - view.set_inline_spell_checking(use_spell_check) - - def _set_spell_checker_language(self, contact: ChatContactT) -> None: - if not app.is_installed('GSPELL'): - return - - buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( - self.msg_textview.get_buffer()) - checker = buffer.get_spell_checker() - assert checker is not None - lang = self._get_spell_checker_language(contact) - - with checker.handler_block(self._language_handler_id): - checker.set_language(lang) - - def _get_spell_checker_language(self, - contact: ChatContactT - ) -> Optional[Gspell.Language]: - - lang = contact.settings.get('speller_language') - if not lang: - # use the default one - lang = app.settings.get('speller_language') - if not lang: - lang = i18n.LANG - - assert isinstance(lang, str) - lang = Gspell.language_lookup(lang) - if lang is None: - lang = Gspell.language_get_default() - return lang - - def _on_language_changed(self, - checker: Gspell.Checker, - _param: Any) -> None: - - gspell_lang = checker.get_language() - if gspell_lang is not None: - contact = self.get_current_contact() - contact.settings.set('speller_language', gspell_lang.get_code()) - def _on_send_file_enabled_changed(self, action: Gio.SimpleAction, _param: GObject.ParamSpec) -> None: ===================================== gajim/gtk/message_input.py ===================================== @@ -33,6 +33,7 @@ from nbxmpp.protocol import JID from gajim.common import app +from gajim.common.i18n import LANG from gajim.common.i18n import _ from gajim.common.styling import process from gajim.common.styling import PlainBlock @@ -93,8 +94,66 @@ def __init__(self) -> None: self.connect('destroy', self._on_destroy) self.connect('populate-popup', self._on_populate_popup) + 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) + def _init_spell_checker(self) -> int: + if not app.is_installed('GSPELL'): + return 0 + + checker = Gspell.Checker.new(Gspell.language_get_default()) + + buffer = Gspell.TextBuffer.get_from_gtk_text_buffer(self.get_buffer()) + buffer.set_spell_checker(checker) + + view = Gspell.TextView.get_from_gtk_text_view(self) + view.set_enable_language_menu(True) + + self._on_toggle_spell_check() + + return checker.connect('notify::language', self._on_language_changed) + + def _set_spell_checker_language(self, contact: ChatContactT) -> None: + if not app.is_installed('GSPELL'): + return + + buffer = Gspell.TextBuffer.get_from_gtk_text_buffer(self.get_buffer()) + checker = buffer.get_spell_checker() + assert checker is not None + lang = self._get_spell_checker_language(contact) + + with checker.handler_block(self._language_handler_id): + checker.set_language(lang) + + def _get_spell_checker_language(self, + contact: ChatContactT + ) -> Optional[Gspell.Language]: + + lang = contact.settings.get('speller_language') + if not lang: + # use the default one + lang = app.settings.get('speller_language') + if not lang: + lang = LANG + + assert isinstance(lang, str) + lang = Gspell.language_lookup(lang) + if lang is None: + lang = Gspell.language_get_default() + return lang + + def _on_language_changed(self, + checker: Gspell.Checker, + _param: Any) -> None: + + gspell_lang = checker.get_language() + if gspell_lang is not None: + assert self._contact is not None + self._contact.settings.set('speller_language', + gspell_lang.get_code()) + def switch_contact(self, contact: ChatContactT) -> None: if self._contact is not None: account = self._contact.account @@ -111,6 +170,7 @@ def switch_contact(self, contact: ChatContactT) -> None: self._contact = contact self._chat_action_processor.switch_contact(contact) + self._set_spell_checker_language(contact) def _on_destroy(self, _widget: Gtk.Widget) -> None: # We restore the TextView’s drag destination to avoid a GTK warning @@ -129,7 +189,7 @@ def _on_focus_in(self, _widget: Gtk.Widget, _event: Gdk.EventFocus ) -> bool: - self.toggle_speller(True) + scrolled = self.get_parent() assert scrolled scrolled.get_style_context().add_class('message-input-focus') @@ -139,11 +199,10 @@ def _on_focus_out(self, _widget: Gtk.Widget, _event: Gdk.EventFocus ) -> bool: + scrolled = self.get_parent() assert scrolled scrolled.get_style_context().remove_class('message-input-focus') - if not self.has_text: - self.toggle_speller(False) return False def _clear_tags(self) -> None: @@ -210,10 +269,13 @@ def get_text(self) -> str: def get_draft(self, account: str, jid: JID) -> Optional[str]: return self._drafts.get((account, jid)) - def toggle_speller(self, activate: bool) -> None: - if app.is_installed('GSPELL') and app.settings.get('use_speller'): - spell_view = Gspell.TextView.get_from_gtk_text_view(self) - spell_view.set_inline_spell_checking(activate) + def _on_toggle_spell_check(self, *args: Any) -> None: + if not app.is_installed('GSPELL'): + return + + use_spell_check = app.settings.get('use_speller') + spell_view = Gspell.TextView.get_from_gtk_text_view(self) + spell_view.set_inline_spell_checking(use_spell_check) @staticmethod def _after_paste_clipboard(textview: Gtk.TextView) -> None: ===================================== gajim/gtk/preferences.py ===================================== @@ -271,8 +271,7 @@ def __init__(self, *args: Any) -> None: SettingType.CONFIG, 'use_speller', desc=speller_desc, - enabled_func=self._speller_available, - callback=self._on_use_speller), + enabled_func=self._speller_available), Setting(SettingKind.SWITCH, _('Message Receipts (✔)'), @@ -317,23 +316,6 @@ def __init__(self, *args: Any) -> None: def _speller_available() -> bool: return app.is_installed('GSPELL') - @staticmethod - def _on_use_speller(value: bool, *args: Any) -> None: - # TODO - # if not value: - # return - - # lang = app.settings.get('speller_language') - # gspell_lang = Gspell.language_lookup(lang) - # if gspell_lang is None: - # gspell_lang = Gspell.language_get_default() - # if gspell_lang is None: - # return - # app.settings.set('speller_language', gspell_lang.get_code()) - # for ctrl in app.window.get_controls(): - # ctrl.set_speller() - pass - @staticmethod def _on_show_send_message_button(show_button: bool, *args: Any) -> None: # Bind to send_on_ctrl_enter to make this setting user-friendly View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97d06fc036c4ec554cf5ed8746f4e26a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97d06fc036c4ec554cf5ed8746f4e26a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Replace chat control plugin extension points
by Philipp Hörist (＠lovetox) 15 Aug '22

15 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 02cf35e7 by wurstsalat at 2022-08-15T21:13:53+00:00 refactor: Replace chat control plugin extension points - - - - - 3 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -229,6 +229,9 @@ def show_chat(self, account: str, jid: JID) -> None: self.set_transition_type(Gtk.StackTransitionType.NONE) self.set_visible_child_name('controls') + app.plugin_manager.extension_point( + 'switch_contact', self._current_contact) + if old_primary_clipboard is not None: GLib.idle_add(clipboard.set_text, # pyright: ignore old_primary_clipboard, ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -135,6 +135,9 @@ def __init__(self) -> None: ('message-sent', ged.GUI2, self._on_message_sent) ]) + app.plugin_manager.gui_extension_point( + 'message_actions_box', self, self._ui.box) + def get_current_contact(self) -> ChatContactT: assert self._contact is not None return self._contact ===================================== gajim/gtk/message_input.py ===================================== @@ -93,6 +93,8 @@ def __init__(self) -> None: self.connect('destroy', self._on_destroy) self.connect('populate-popup', self._on_populate_popup) + app.plugin_manager.gui_extension_point('message_input', self) + def switch_contact(self, contact: ChatContactT) -> None: if self._contact is not None: account = self._contact.account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02cf35e7bc163b6b3fc63bced2ea8dc0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02cf35e7bc163b6b3fc63bced2ea8dc0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Use CommandOutputRow for chat command errors
by Philipp Hörist (＠lovetox) 15 Aug '22

15 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c9fda87f by lovetox at 2022-08-15T23:04:20+02:00 cfix: Use CommandOutputRow for chat command errors - - - - - 2 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/control.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -742,14 +742,14 @@ def _on_command_error(self, message_actions_box: MessageActionsBox, error: str) -> None: - self._chat_control.add_info_message(error) + self._chat_control.add_command_output(error, True) def _on_command_not_found(self, message_actions_box: MessageActionsBox, error: str ) -> None: - self._chat_control.add_info_message(error) + self._chat_control.add_command_output(error, True) class ChatPlaceholderBox(Gtk.Box): ===================================== gajim/gtk/control.py ===================================== @@ -507,6 +507,9 @@ def get_our_nick(self) -> str: def _allow_add_message(self) -> bool: return self._scrolled_view.get_lower_complete() + def add_command_output(self, text: str, is_error: bool) -> None: + self.conversation_view.add_command_output(text, is_error) + def add_info_message(self, text: str, timestamp: Optional[float] = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c9fda87faa2b7a34b0717bc46b8bda02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c9fda87faa2b7a34b0717bc46b8bda02… 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