Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] imprv: ChatList: Clear row content when removing history
by Daniel Brötzmann (＠wurstsalat) 22 May '23

22 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 84fbaa87 by wurstsalat at 2023-05-22T21:41:45+02:00 imprv: ChatList: Clear row content when removing history Fixes #11420 - - - - - 4 changed files: - gajim/gtk/application.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_row.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -851,8 +851,9 @@ def _on_remove_history_action(_action: Gio.SimpleAction, ) -> None: def _remove() -> None: app.storage.archive.remove_history(params.account, params.jid) - control = app.window.get_control() + app.window.clear_chat_list_row(params.account, params.jid) + control = app.window.get_control() if not control.is_loaded(params.account, params.jid): return ===================================== gajim/gtk/chat_list.py ===================================== @@ -307,6 +307,11 @@ def remove_chats_for_account(self, account: str) -> None: self.remove_chat(account, jid) self._emit_unread_changed() + def clear_chat_list_row(self, account: str, jid: JID) -> None: + chat = self._chats.get((account, jid)) + if chat is not None: + chat.clear() + def contains_chat(self, account: str, jid: JID) -> bool: return self._chats.get((account, jid)) is not None ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -248,6 +248,13 @@ def set_header_type(self, header_type: Optional[RowHeaderType]) -> None: else: self.set_header(self._conversations_header) + def clear(self) -> None: + self.timestamp = 0 + self.stanza_id = None + self.message_id = None + self.set_message_text('') + self.set_nick('') + def set_message_id(self, message_id: str) -> None: self.message_id = message_id ===================================== gajim/gtk/main.py ===================================== @@ -993,6 +993,12 @@ def add_private_chat(self, 'pm', select=select) + def clear_chat_list_row(self, account: str, jid: JID) -> None: + chat_list_stack = self._chat_page.get_chat_list_stack() + chat_list = chat_list_stack.find_chat(account, jid) + if chat_list is not None: + chat_list.clear_chat_list_row(account, jid) + def select_chat(self, account: str, jid: JID) -> None: self._app_side_bar.unselect_all() self._account_side_bar.unselect_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84fbaa870523f21516846a6282658a3c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84fbaa870523f21516846a6282658a3c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: AvatarSelector: Fix that images don't display after repeated loading
by Daniel Brötzmann (＠wurstsalat) 22 May '23

22 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2b0e615e by wurstsalat at 2023-05-22T20:48:50+02:00 fix: AvatarSelector: Fix that images don't display after repeated loading - - - - - e0a207a9 by wurstsalat at 2023-05-22T20:49:55+02:00 fix: UI: Update avatar on muc-disco-update - - - - - 5 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/chat_banner.py - gajim/gtk/chat_list_row.py - gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_manage.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -121,6 +121,7 @@ def reset(self) -> None: self._load_button.show() self._helper_label.show() self._crop_area.hide() + self._crop_area.set_pixbuf(None) def prepare_crop_area(self, path: str) -> None: pixbuf = self._get_pixbuf_from_path(path) @@ -278,6 +279,8 @@ def set_pixbuf(self, pixbuf: Optional[GdkPixbuf.Pixbuf]) -> None: self._image.width = 0 self._image.height = 0 + self._update_pixbufs() + self.queue_draw() def get_pixbuf(self) -> Optional[GdkPixbuf.Pixbuf]: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -221,6 +221,7 @@ def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if event.jid != self._contact.jid: return + self._update_avatar() self._update_name_label() self._update_description_label() ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -30,9 +30,11 @@ from nbxmpp import JID from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.const import RowHeaderType +from gajim.common.events import MucDiscoUpdate from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_groupchat_name @@ -133,6 +135,8 @@ def __init__(self, self.connect('drag-data-get', self._on_drag_data_get) if self.type == 'groupchat': + app.ged.register_event_handler( + 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) self._ui.group_chat_indicator.show() self.update_avatar() @@ -422,12 +426,21 @@ def _on_state_flags_changed(self, else: self._ui.revealer.set_reveal_child(False) + def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: + if event.jid != self.contact.jid: + return + + self.update_avatar() + def _on_destroy(self, _row: ChatListRow) -> None: app.settings.disconnect_signals(self) self.contact.disconnect_all_from_obj(self) if isinstance(self.contact, GroupchatParticipant): self.contact.room.disconnect_all_from_obj(self) + app.ged.remove_event_handler('muc-disco-update', + ged.GUI1, + self._on_muc_disco_update) app.check_finalize(self) def _on_close_button_clicked(self, _button: Gtk.Button) -> None: ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -114,6 +114,8 @@ def _on_client_state_changed(self, def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if event.jid != self._contact.jid: return + + self._load_avatar() self._ui.name_entry.set_text(self._contact.name) disco_info = self._contact.get_disco() assert disco_info is not None ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -25,7 +25,9 @@ from nbxmpp.task import Task from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.events import MucDiscoUpdate from gajim.common.helpers import validate_jid from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact @@ -49,6 +51,9 @@ def __init__(self, self._contact = contact self._contact.connect('room-subject', self._on_room_subject) + app.ged.register_event_handler( + 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) + self._room_config_form = None self._ui = get_builder('groupchat_manage.ui') @@ -70,12 +75,21 @@ def __init__(self, def _on_destroy(self, *args: Any) -> None: del self._avatar_selector + app.ged.remove_event_handler('muc-disco-update', + ged.GUI1, + self._on_muc_disco_update) app.check_finalize(self) @property def disco_info(self): return app.storage.cache.get_last_disco_info(self._contact.jid) + def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: + if event.jid != self._contact.jid: + return + + self.update_avatar() + def _prepare_subject(self) -> None: text = '' if self._contact.subject is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3bece8a37345cd3da122b9db67cf605… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3bece8a37345cd3da122b9db67cf605… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Logging: Use separate handler for console log
by Philipp Hörist (＠lovetox) 21 May '23

21 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3bece8a3 by Philipp Hörist at 2023-05-22T00:24:30+02:00 refactor: Logging: Use separate handler for console log - - - - - 3 changed files: - gajim/common/app.py - gajim/common/logging_helpers.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/common/app.py ===================================== @@ -77,7 +77,7 @@ app = None # type: GajimApplication window = None # type: MainWindow commands = None # type: ChatCommands -logging_records: list[logging.LogRecord] = [] +logging_records: list[str] = [] ged = ged_module.GlobalEventsDispatcher() # Global Events Dispatcher plugin_manager = cast(types.PluginManagerT, None) # Plugins Manager ===================================== gajim/common/logging_helpers.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import configpaths from gajim.common.i18n import _ -LogCallback = Callable[[logging.LogRecord], None] +LogCallback = Callable[[str], None] def parseLogLevel(arg: str) -> int: @@ -109,18 +109,19 @@ def colorize(text: str, color: str) -> str: return color + text + Colors.NONE -class CustomStreamHandler(logging.StreamHandler): # pyright: ignore +class LogConsoleHandler(logging.StreamHandler): # pyright: ignore def __init__(self) -> None: super().__init__() # pyright: ignore self._callback: LogCallback | None = None def emit(self, record: logging.LogRecord) -> None: - super().emit(record) + if record.levelno < logging.WARNING: + return - if record.levelno >= logging.WARNING: - app.logging_records.append(record) - if self._callback is not None: - self._callback(record) + msg = self.format(record) + app.logging_records.append(msg) + if self._callback is not None: + self._callback(msg) def set_callback(self, func: LogCallback | None @@ -174,7 +175,8 @@ def init() -> None: if os.name != 'nt': use_color = sys.stderr.isatty() - _custom_stream_handler.setFormatter( + stream_handler = logging.StreamHandler() + stream_handler.setFormatter( FancyFormatter( '%(asctime)s %(levelname)s %(name)-35s %(message)s', '%x %H:%M:%S', @@ -184,22 +186,26 @@ def init() -> None: root_log = logging.getLogger('gajim') root_log.setLevel(logging.WARNING) - root_log.addHandler(_custom_stream_handler) + root_log.addHandler(_log_console_handler) + root_log.addHandler(stream_handler) root_log.propagate = False root_log = logging.getLogger('nbxmpp') root_log.setLevel(logging.ERROR) - root_log.addHandler(_custom_stream_handler) + root_log.addHandler(_log_console_handler) + root_log.addHandler(stream_handler) root_log.propagate = False root_log = logging.getLogger('gnupg') root_log.setLevel(logging.WARNING) - root_log.addHandler(_custom_stream_handler) + root_log.addHandler(_log_console_handler) + root_log.addHandler(stream_handler) root_log.propagate = False root_log = logging.getLogger('omemo_dr') root_log.setLevel(logging.WARNING) - root_log.addHandler(_custom_stream_handler) + root_log.addHandler(_log_console_handler) + root_log.addHandler(stream_handler) root_log.propagate = False # GAJIM_DEBUG is set only on Windows when using Gajim-Debug.exe @@ -225,8 +231,8 @@ def set_quiet() -> None: parseAndSetLogLevels('.omemo_dr=CRITICAL') -def get_stream_handler() -> CustomStreamHandler: - return _custom_stream_handler +def get_log_console_handler() -> LogConsoleHandler: + return _log_console_handler def _redirect_output() -> None: @@ -247,7 +253,13 @@ def _cleanup_debug_logs() -> None: file.unlink() -_custom_stream_handler = CustomStreamHandler() +_log_console_handler = LogConsoleHandler() +_log_console_handler.setFormatter( + logging.Formatter( + '%(asctime)s (%(levelname).1s) %(name)-35s | %(message)s\n', + '%x %H:%M:%S' + ) +) if __name__ == '__main__': ===================================== gajim/gtk/xml_console.py ===================================== @@ -16,7 +16,6 @@ from typing import Optional from typing import Union -import logging import time import nbxmpp @@ -34,7 +33,7 @@ from gajim.common.events import StanzaReceived from gajim.common.events import StanzaSent from gajim.common.i18n import _ -from gajim.common.logging_helpers import get_stream_handler +from gajim.common.logging_helpers import get_log_console_handler from gajim.gtk.builder import get_builder from gajim.gtk.const import Setting @@ -112,7 +111,7 @@ def __init__(self) -> None: for record in app.logging_records: self._add_log_record(record) - log_handler = get_stream_handler() + log_handler = get_log_console_handler() log_handler.set_callback(self._add_log_record) self._ui.stack.connect('notify::visible-child-name', @@ -132,7 +131,7 @@ def __init__(self) -> None: ]) def _on_destroy(self, *args: Any) -> None: - get_stream_handler().set_callback(None) + get_log_console_handler().set_callback(None) self._ui.popover.destroy() app.check_finalize(self) @@ -185,12 +184,10 @@ def _create_tags(self) -> None: for tag_name in tags: self._ui.protocol_view.get_buffer().create_tag(tag_name) - def _add_log_record(self, record: logging.LogRecord) -> None: + def _add_log_record(self, message: str) -> None: buf = self._ui.log_view.get_buffer() - msg = (f'{record.asctime} {record.levelname} {record.name} ' - f'{record.getMessage()}\n') end_iter = buf.get_end_iter() - buf.insert(end_iter, msg) + buf.insert(end_iter, message) def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bece8a37345cd3da122b9db67cf6054… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3bece8a37345cd3da122b9db67cf6054… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cfix: XMLConsole: Fix typo in log formatting
by Daniel Brötzmann (＠wurstsalat) 21 May '23

21 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 54e1e89e by wurstsalat at 2023-05-21T23:56:57+02:00 cfix: XMLConsole: Fix typo in log formatting - - - - - a7c7b9d3 by wurstsalat at 2023-05-21T23:56:57+02:00 cfix: XMLConsole: Set filtering attributes correctly - - - - - 1 changed file: - gajim/gtk/xml_console.py Changes: ===================================== gajim/gtk/xml_console.py ===================================== @@ -187,7 +187,7 @@ def _create_tags(self) -> None: def _add_log_record(self, record: logging.LogRecord) -> None: buf = self._ui.log_view.get_buffer() - msg = (f'{record.asctime} {record.levelname} {record.name}: ' + msg = (f'{record.asctime} {record.levelname} {record.name} ' f'{record.getMessage()}\n') end_iter = buf.get_end_iter() buf.insert(end_iter, msg) @@ -462,7 +462,7 @@ def _set_account(self, value: str, _data: Any) -> None: tag.set_property('invisible', account != value) def _on_setting(self, value: bool, data: str) -> None: - setattr(self, data, value) + setattr(self, f'_{data}', value) value = not value table = self._ui.protocol_view.get_buffer().get_tag_table() tag = table.lookup(data) @@ -515,13 +515,13 @@ def _print_stanza(self, elif stanza.startswith('<r') or stanza.startswith('<a'): type_ = 'stream' - stanza = '\n{stanza}\n\n'.format( + text = '\n{stanza}\n\n'.format( kind=kind.capitalize(), time=time.strftime('%c'), account=account_label, stanza=stanza) buffer_.insert_with_tags_by_name( - end_iter, stanza, type_, kind, event.account) + end_iter, text, type_, kind, event.account) if is_at_the_end: GLib.idle_add(scroll_to_end, self._ui.scrolled) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/62ad4d8f674632e2225612d04d7c95d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/62ad4d8f674632e2225612d04d7c95d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: other: Fix typo
by Philipp Hörist (＠lovetox) 21 May '23

21 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e6241ffd by Philipp Hörist at 2023-05-21T23:49:19+02:00 other: Fix typo - - - - - 62ad4d8f by Philipp Hörist at 2023-05-21T23:50:54+02:00 cfix: XMLConsole: Unset callback on destroy - - - - - 2 changed files: - gajim/common/logging_helpers.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/common/logging_helpers.py ===================================== @@ -163,7 +163,7 @@ def format(self, record: logging.LogRecord) -> str: def init() -> None: ''' - Iinitialize the logging system + Initialize the logging system ''' if app.get_debug_mode(): ===================================== gajim/gtk/xml_console.py ===================================== @@ -132,6 +132,7 @@ def __init__(self) -> None: ]) def _on_destroy(self, *args: Any) -> None: + get_stream_handler().set_callback(None) self._ui.popover.destroy() app.check_finalize(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/256331868d82a245dab85a867969511… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/256331868d82a245dab85a867969511… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: imprv: XMLConsole: Always use dark theme
by Daniel Brötzmann (＠wurstsalat) 21 May '23

21 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e7aa6d3a by wurstsalat at 2023-05-21T22:24:55+02:00 imprv: XMLConsole: Always use dark theme - - - - - 5bab2f22 by wurstsalat at 2023-05-21T22:24:55+02:00 refactor: XMLConsole: Make attributes private - - - - - a7067ddb by wurstsalat at 2023-05-21T23:16:39+02:00 feat: XMLConsole: Add logging view - - - - - 25633186 by wurstsalat at 2023-05-21T23:42:54+02:00 cfix: CustomStreamHandler: Call super for emit() before working with LogRecords - - - - - 4 changed files: - gajim/common/logging_helpers.py - gajim/data/gui/xml_console.ui - gajim/gtk/builder.pyi - gajim/gtk/xml_console.py Changes: ===================================== gajim/common/logging_helpers.py ===================================== @@ -115,13 +115,13 @@ def __init__(self) -> None: self._callback: LogCallback | None = None def emit(self, record: logging.LogRecord) -> None: + super().emit(record) + if record.levelno >= logging.WARNING: app.logging_records.append(record) if self._callback is not None: self._callback(record) - super().emit(record) - def set_callback(self, func: LogCallback | None ) -> None: ===================================== gajim/data/gui/xml_console.ui ===================================== @@ -3,38 +3,6 @@ <interface> <requires lib="gtk+" version="3.24"/> <requires lib="gtksourceview" version="4.0"/> - <object class="GtkHeaderBar" id="headerbar"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="title" translatable="yes">XML Console</property> - <property name="show-close-button">True</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">utilities-terminal-symbolic</property> - </object> - </child> - <child> - <object class="GtkToggleButton" id="search_toggle"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="margin-start">6</property> - <signal name="toggled" handler="_on_search_toggled" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">system-search-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> <object class="GtkPopover" id="popover"> <property name="can-focus">False</property> <property name="valign">start</property> @@ -102,300 +70,379 @@ <class name="PopoverButtonListbox"/> </style> </object> - <object class="GtkBox" id="box"> + <object class="GtkStack" id="stack"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <child> - <object class="GtkPaned" id="paned"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="vexpand">True</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox"> + <object class="GtkPaned" id="paned"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkRevealer" id="search_revealer"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="transition-type">none</property> - <property name="transition-duration">100</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolbar"> + <object class="GtkRevealer" id="search_revealer"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="show-arrow">False</property> - <property name="icon_size">2</property> + <property name="transition-type">none</property> + <property name="transition-duration">100</property> <child> - <object class="GtkToolItem"> + <object class="GtkToolbar"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-end">6</property> + <property name="halign">center</property> + <property name="show-arrow">False</property> + <property name="icon_size">2</property> <child> - <object class="GtkSearchEntry" id="search_entry"> + <object class="GtkToolItem"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="primary-icon-name">edit-find-symbolic</property> - <property name="primary-icon-activatable">False</property> - <property name="primary-icon-sensitive">False</property> - <property name="placeholder-text" translatable="yes">Start Search...</property> - <signal name="activate" handler="_on_search_activate" swapped="no"/> + <property name="can-focus">False</property> + <property name="margin-end">6</property> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <property name="placeholder-text" translatable="yes">Start Search...</property> + <signal name="activate" handler="_on_search_activate" swapped="no"/> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="search_forward"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> + <property name="icon-name">go-down-symbolic</property> + <signal name="clicked" handler="_on_search_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="search_backward"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> + <property name="icon-name">go-up-symbolic</property> + <signal name="clicked" handler="_on_search_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="search_forward"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="use-underline">True</property> - <property name="icon-name">go-down-symbolic</property> - <signal name="clicked" handler="_on_search_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolled"> + <property name="height-request">400</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> - <object class="GtkToolButton" id="search_backward"> + <object class="GtkSourceView" id="protocol_view"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="use-underline">True</property> - <property name="icon-name">go-up-symbolic</property> - <signal name="clicked" handler="_on_search_clicked" swapped="no"/> + <property name="can-focus">True</property> + <property name="editable">False</property> + <property name="left-margin">6</property> + <property name="right-margin">6</property> + <property name="top-margin">6</property> + <property name="bottom-margin">6</property> + <property name="monospace">True</property> </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="resize">True</property> + <property name="shrink">False</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolled"> - <property name="height-request">400</property> - <property name="visible">True</property> + <object class="GtkScrolledWindow" id="scrolled_input"> + <property name="height-request">150</property> <property name="can-focus">True</property> + <property name="no-show-all">True</property> <property name="shadow-type">in</property> <child> - <object class="GtkSourceView" id="sourceview"> + <object class="GtkSourceView" id="input_entry"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="editable">False</property> - <property name="left-margin">6</property> - <property name="right-margin">6</property> - <property name="top-margin">6</property> - <property name="bottom-margin">6</property> + <property name="left-margin">3</property> + <property name="right-margin">3</property> + <property name="top-margin">3</property> + <property name="bottom-margin">3</property> <property name="monospace">True</property> + <property name="tab-width">4</property> + <property name="highlight-current-line">True</property> </object> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="resize">False</property> + <property name="shrink">False</property> </packing> </child> </object> - <packing> - <property name="resize">True</property> - <property name="shrink">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolled_input"> - <property name="height-request">150</property> - <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkSourceView" id="input_entry"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="left-margin">3</property> - <property name="right-margin">3</property> - <property name="top-margin">3</property> - <property name="bottom-margin">3</property> - <property name="monospace">True</property> - <property name="tab-width">4</property> - <property name="highlight-current-line">True</property> - </object> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="actionbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton" id="send"> - <property name="label" translatable="yes">_Send</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send" swapped="no"/> - </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="account_label"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="label" translatable="yes">Account</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton"> + <object class="GtkBox" id="actionbox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Filter</property> - <signal name="clicked" handler="_on_filter_options" swapped="no"/> + <property name="can-focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkImage"> - <property name="visible">True</property> + <object class="GtkButton" id="send"> + <property name="label" translatable="yes">_Send</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_send" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="account_label"> <property name="can-focus">False</property> - <property name="icon-name">applications-system-symbolic</property> + <property name="no-show-all">True</property> + <property name="label" translatable="yes">Account</property> + <style> + <class name="dim-label"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Clear</property> - <signal name="clicked" handler="_on_clear" swapped="no"/> <child> - <object class="GtkImage"> + <object class="GtkButton"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">edit-clear-all-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Filter</property> + <signal name="clicked" handler="_on_filter_options" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">applications-system-symbolic</property> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkToggleButton"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="toggled" handler="_on_input" swapped="no"/> <child> - <object class="GtkImage"> + <object class="GtkButton"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-edit-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Clear</property> + <signal name="clicked" handler="_on_clear" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-clear-all-symbolic</property> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="paste"> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <signal name="clicked" handler="_on_paste_last" swapped="no"/> <child> - <object class="GtkImage"> + <object class="GtkToggleButton"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Paste Last Input</property> - <property name="icon-name">insert-text-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="toggled" handler="_on_input" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-edit-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="paste"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <signal name="clicked" handler="_on_paste_last" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Paste Last Input</property> + <property name="icon-name">insert-text-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="menubutton"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Presets</property> + <property name="popover">popover</property> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> </child> + <style> + <class name="padding-6"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkMenuButton" id="menubutton"> + <placeholder/> + </child> + </object> + <packing> + <property name="name">protocol</property> + <property name="title" translatable="yes">Protocol</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkSourceView" id="log_view"> + <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Presets</property> - <property name="popover">popover</property> - <child> - <placeholder/> - </child> + <property name="editable">False</property> + <property name="left-margin">6</property> + <property name="right-margin">6</property> + <property name="top-margin">6</property> + <property name="bottom-margin">6</property> + <property name="monospace">True</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> </child> - <style> - <class name="padding-6"/> - </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> + <property name="name">log</property> + <property name="title" translatable="yes">Log</property> <property name="position">1</property> </packing> </child> </object> + <object class="GtkHeaderBar" id="headerbar"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="title" translatable="yes">XML Console</property> + <property name="show-close-button">True</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">utilities-terminal-symbolic</property> + </object> + </child> + <child> + <object class="GtkToggleButton" id="search_toggle"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-start">6</property> + <signal name="toggled" handler="_on_search_toggled" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">system-search-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkStackSwitcher"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="stack">stack</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> </interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -949,17 +949,15 @@ class WorkspaceDialogBuilder(Builder): class XmlConsoleBuilder(Builder): - headerbar: Gtk.HeaderBar - search_toggle: Gtk.ToggleButton popover: Gtk.Popover - box: Gtk.Box + stack: Gtk.Stack paned: Gtk.Paned search_revealer: Gtk.Revealer search_entry: Gtk.SearchEntry search_forward: Gtk.ToolButton search_backward: Gtk.ToolButton scrolled: Gtk.ScrolledWindow - sourceview: GtkSource.View + protocol_view: GtkSource.View scrolled_input: Gtk.ScrolledWindow input_entry: GtkSource.View actionbox: Gtk.Box @@ -967,6 +965,9 @@ class XmlConsoleBuilder(Builder): account_label: Gtk.Label paste: Gtk.Button menubutton: Gtk.MenuButton + log_view: GtkSource.View + headerbar: Gtk.HeaderBar + search_toggle: Gtk.ToggleButton @overload ===================================== gajim/gtk/xml_console.py ===================================== @@ -16,11 +16,13 @@ from typing import Optional from typing import Union +import logging import time import nbxmpp from gi.repository import Gdk from gi.repository import GLib +from gi.repository import GObject from gi.repository import Gtk from gi.repository import GtkSource @@ -32,6 +34,7 @@ from gajim.common.events import StanzaReceived from gajim.common.events import StanzaSent from gajim.common.i18n import _ +from gajim.common.logging_helpers import get_stream_handler from gajim.gtk.builder import get_builder from gajim.gtk.const import Setting @@ -41,7 +44,6 @@ from gajim.gtk.settings import SettingsDialog from gajim.gtk.util import at_the_end from gajim.gtk.util import EventHelper -from gajim.gtk.util import get_source_view_style_scheme from gajim.gtk.util import MaxWidthComboBoxText from gajim.gtk.util import scroll_to_end @@ -59,20 +61,21 @@ def __init__(self) -> None: self._selected_account = 'AllAccounts' self._selected_send_account: Optional[str] = None - self.presence = True - self.message = True - self.iq = True - self.stream = True - self.incoming = True - self.outgoing = True - self.filter_dialog = None - self.last_stanza = None - self.last_search = '' + self._filter_dialog: Optional[SettingsDialog] = None + self._last_stanza: Optional[str] = None + self._last_search: str = '' + + self._presence = True + self._message = True + self._iq = True + self._stream = True + self._incoming = True + self._outgoing = True self._ui = get_builder('xml_console.ui') self.set_titlebar(self._ui.headerbar) self._set_titlebar() - self.add(self._ui.box) + self.add(self._ui.stack) self._ui.paned.set_position( self._ui.paned.get_property('max-position')) @@ -96,13 +99,24 @@ def __init__(self) -> None: source_manager = GtkSource.LanguageManager.get_default() lang = source_manager.get_language('xml') - self._ui.sourceview.get_buffer().set_language(lang) + self._ui.protocol_view.get_buffer().set_language(lang) self._ui.input_entry.get_buffer().set_language(lang) - style_scheme = get_source_view_style_scheme() + style_scheme_manager = GtkSource.StyleSchemeManager.get_default() + style_scheme = style_scheme_manager.get_scheme('solarized-dark') if style_scheme is not None: - self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) + self._ui.protocol_view.get_buffer().set_style_scheme(style_scheme) self._ui.input_entry.get_buffer().set_style_scheme(style_scheme) + self._ui.log_view.get_buffer().set_style_scheme(style_scheme) + + for record in app.logging_records: + self._add_log_record(record) + + log_handler = get_stream_handler() + log_handler.set_callback(self._add_log_record) + + self._ui.stack.connect('notify::visible-child-name', + self._on_stack_child_changed) self.show_all() @@ -113,7 +127,6 @@ def __init__(self) -> None: self.register_events([ ('stanza-received', ged.GUI1, self._on_stanza_received), ('stanza-sent', ged.GUI1, self._on_stanza_sent), - ('style-changed', ged.GUI1, self._on_style_changed), ('account-enabled', ged.GUI1, self._on_account_changed), ('account-disabled', ged.GUI1, self._on_account_changed) ]) @@ -122,12 +135,6 @@ def _on_destroy(self, *args: Any) -> None: self._ui.popover.destroy() app.check_finalize(self) - def _on_style_changed(self, *args: Any) -> None: - style_scheme = get_source_view_style_scheme() - if style_scheme is not None: - self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) - self._ui.input_entry.get_buffer().set_style_scheme(style_scheme) - def _on_value_change(self, combo: Gtk.ComboBox) -> None: self._selected_send_account = combo.get_active_id() @@ -143,7 +150,7 @@ def _set_titlebar(self) -> None: def _on_account_changed(self, event: Union[AccountEnabled, AccountDisabled] ) -> None: - buf = self._ui.sourceview.get_buffer() + buf = self._ui.protocol_view.get_buffer() if isinstance(event, AccountEnabled): buf.create_tag(event.account) @@ -151,6 +158,14 @@ def _on_account_changed(self, start, end = buf.get_bounds() buf.remove_tag_by_name(event.account, start, end) + def _on_stack_child_changed(self, + _widget: Gtk.Stack, + _pspec: GObject.ParamSpec + ) -> None: + + name = self._ui.stack.get_visible_child_name() + self._ui.search_toggle.set_sensitive(name == 'protocol') + def _create_tags(self) -> None: tags = [ 'incoming', @@ -167,7 +182,14 @@ def _create_tags(self) -> None: tags.append('AccountWizard') for tag_name in tags: - self._ui.sourceview.get_buffer().create_tag(tag_name) + self._ui.protocol_view.get_buffer().create_tag(tag_name) + + def _add_log_record(self, record: logging.LogRecord) -> None: + buf = self._ui.log_view.get_buffer() + msg = (f'{record.asctime} {record.levelname} {record.name}: ' + f'{record.getMessage()}\n') + end_iter = buf.get_end_iter() + buf.insert(end_iter, msg) def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: @@ -197,7 +219,6 @@ def _on_row_activated(self, assert isinstance(child, Gtk.Label) text = child.get_text() - # pylint: disable=line-too-long input_text = None if text == 'Presence': input_text = ( @@ -221,7 +242,6 @@ def _on_row_activated(self, '<iq to="" type="get" xmlns="jabber:client">\n' '<query xmlns="http://jabber.org/protocol/disco#info">' '</query>\n</iq>') - # pylint: enable=line-too-long if input_text is not None: buffer_ = self._ui.input_entry.get_buffer() @@ -258,13 +278,13 @@ def _on_send(self, *args: Any) -> None: client = app.get_client(self._selected_send_account) assert isinstance(node, nbxmpp.Protocol) client.connection.send_stanza(node) - self.last_stanza = stanza + self._last_stanza = stanza buffer_.set_text('') def _on_paste_last(self, *args: Any) -> None: buffer_ = self._ui.input_entry.get_buffer() - if self.last_stanza is not None: - buffer_.set_text(self.last_stanza) + if self._last_stanza is not None: + buffer_.set_text(self._last_stanza) self._ui.input_entry.grab_focus() def _on_input(self, button: Gtk.ToggleButton) -> None: @@ -302,7 +322,7 @@ def _on_search_clicked(self, button: Gtk.ToolButton) -> None: def _find(self, direction: Direction) -> None: search_str = self._ui.search_entry.get_text() - textbuffer = self._ui.sourceview.get_buffer() + textbuffer = self._ui.protocol_view.get_buffer() cursor_mark = textbuffer.get_insert() current_pos = textbuffer.get_iter_at_mark(cursor_mark) @@ -313,7 +333,7 @@ def _find(self, direction: Direction) -> None: if last_pos_mark is not None: current_pos = textbuffer.get_iter_at_mark(last_pos_mark) - if search_str != self.last_search: + if search_str != self._last_search: current_pos = textbuffer.get_start_iter() if direction == Direction.NEXT: @@ -334,8 +354,8 @@ def _find(self, direction: Direction) -> None: match_start, match_end = match textbuffer.select_range(match_start, match_end) mark = textbuffer.create_mark('last_pos', match_end, True) - self._ui.sourceview.scroll_to_mark(mark, 0, True, 0.5, 0.5) - self.last_search = search_str + self._ui.protocol_view.scroll_to_mark(mark, 0, True, 0.5, 0.5) + self._last_search = search_str @staticmethod def _get_accounts() -> list[tuple[Optional[str], str]]: @@ -348,54 +368,76 @@ def _get_accounts() -> list[tuple[Optional[str], str]]: return combo_accounts def _on_filter_options(self, _button: Gtk.Button) -> None: - if self.filter_dialog is not None: - self.filter_dialog.present() + if self._filter_dialog is not None: + self._filter_dialog.present() return combo_accounts = self._get_accounts() combo_accounts.insert(0, ('AllAccounts', _('All Accounts'))) settings = [ - Setting(SettingKind.COMBO, _('Account'), - SettingType.VALUE, self._selected_account, + Setting(SettingKind.COMBO, + _('Account'), + SettingType.VALUE, + self._selected_account, callback=self._set_account, props={'combo_items': combo_accounts}), - Setting(SettingKind.SWITCH, 'Presence', - SettingType.VALUE, self.presence, - callback=self._on_setting, data='presence'), - - Setting(SettingKind.SWITCH, 'Message', - SettingType.VALUE, self.message, - callback=self._on_setting, data='message'), - - Setting(SettingKind.SWITCH, 'IQ', SettingType.VALUE, self.iq, - callback=self._on_setting, data='iq'), - - Setting(SettingKind.SWITCH, 'Stream Management', - SettingType.VALUE, self.stream, - callback=self._on_setting, data='stream'), - - Setting(SettingKind.SWITCH, 'In', SettingType.VALUE, self.incoming, - callback=self._on_setting, data='incoming'), - - Setting(SettingKind.SWITCH, 'Out', SettingType.VALUE, self.outgoing, - callback=self._on_setting, data='outgoing'), + Setting(SettingKind.SWITCH, + 'Presence', + SettingType.VALUE, + self._presence, + callback=self._on_setting, + data='presence'), + + Setting(SettingKind.SWITCH, + 'Message', + SettingType.VALUE, + self._message, + callback=self._on_setting, + data='message'), + + Setting(SettingKind.SWITCH, + 'IQ', SettingType.VALUE, + self._iq, + callback=self._on_setting, + data='iq'), + + Setting(SettingKind.SWITCH, + 'Stream Management', + SettingType.VALUE, + self._stream, + callback=self._on_setting, + data='stream'), + + Setting(SettingKind.SWITCH, + 'In', + SettingType.VALUE, + self._incoming, + callback=self._on_setting, + data='incoming'), + + Setting(SettingKind.SWITCH, + 'Out', + SettingType.VALUE, + self._outgoing, + callback=self._on_setting, + data='outgoing'), ] - self.filter_dialog = SettingsDialog( + self._filter_dialog = SettingsDialog( self, _('Filter'), Gtk.DialogFlags.DESTROY_WITH_PARENT, settings, self._selected_account or 'AllAccounts') - self.filter_dialog.connect('destroy', self._on_filter_destroyed) + self._filter_dialog.connect('destroy', self._on_filter_destroyed) def _on_filter_destroyed(self, _widget: Gtk.Widget) -> None: - self.filter_dialog = None + self._filter_dialog = None def _on_clear(self, _button: Gtk.Button) -> None: - self._ui.sourceview.get_buffer().set_text('') + self._ui.protocol_view.get_buffer().set_text('') def _set_account(self, value: str, _data: Any) -> None: self._selected_account = value @@ -404,7 +446,7 @@ def _set_account(self, value: str, _data: Any) -> None: active_accounts = app.settings.get_active_accounts() active_accounts.append('AccountWizard') - table = self._ui.sourceview.get_buffer().get_tag_table() + table = self._ui.protocol_view.get_buffer().get_tag_table() if value == 'AllAccounts': for account in active_accounts: @@ -421,7 +463,7 @@ def _set_account(self, value: str, _data: Any) -> None: def _on_setting(self, value: bool, data: str) -> None: setattr(self, data, value) value = not value - table = self._ui.sourceview.get_buffer().get_tag_table() + table = self._ui.protocol_view.get_buffer().get_tag_table() tag = table.lookup(data) if tag is None: return @@ -459,7 +501,7 @@ def _print_stanza(self, is_at_the_end = at_the_end(self._ui.scrolled) - buffer_ = self._ui.sourceview.get_buffer() + buffer_ = self._ui.protocol_view.get_buffer() end_iter = buffer_.get_end_iter() type_ = kind View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2a338493f748bcfd8475bbbd32877cc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2a338493f748bcfd8475bbbd32877cc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: Logging: Add get_stream_handler()
by Philipp Hörist (＠lovetox) 21 May '23

21 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2a338493 by Philipp Hörist at 2023-05-21T22:23:55+02:00 new: Logging: Add get_stream_handler() - - - - - 1 changed file: - gajim/common/logging_helpers.py Changes: ===================================== gajim/common/logging_helpers.py ===================================== @@ -174,8 +174,7 @@ def init() -> None: if os.name != 'nt': use_color = sys.stderr.isatty() - consoleloghandler = CustomStreamHandler() - consoleloghandler.setFormatter( + _custom_stream_handler.setFormatter( FancyFormatter( '%(asctime)s %(levelname)s %(name)-35s %(message)s', '%x %H:%M:%S', @@ -185,22 +184,22 @@ def init() -> None: root_log = logging.getLogger('gajim') root_log.setLevel(logging.WARNING) - root_log.addHandler(consoleloghandler) + root_log.addHandler(_custom_stream_handler) root_log.propagate = False root_log = logging.getLogger('nbxmpp') root_log.setLevel(logging.ERROR) - root_log.addHandler(consoleloghandler) + root_log.addHandler(_custom_stream_handler) root_log.propagate = False root_log = logging.getLogger('gnupg') root_log.setLevel(logging.WARNING) - root_log.addHandler(consoleloghandler) + root_log.addHandler(_custom_stream_handler) root_log.propagate = False root_log = logging.getLogger('omemo_dr') root_log.setLevel(logging.WARNING) - root_log.addHandler(consoleloghandler) + root_log.addHandler(_custom_stream_handler) root_log.propagate = False # GAJIM_DEBUG is set only on Windows when using Gajim-Debug.exe @@ -226,6 +225,10 @@ def set_quiet() -> None: parseAndSetLogLevels('.omemo_dr=CRITICAL') +def get_stream_handler() -> CustomStreamHandler: + return _custom_stream_handler + + def _redirect_output() -> None: debug_folder = configpaths.get('DEBUG') date = datetime.today().strftime('%d%m%Y-%H%M%S') @@ -244,6 +247,9 @@ def _cleanup_debug_logs() -> None: file.unlink() +_custom_stream_handler = CustomStreamHandler() + + if __name__ == '__main__': init() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a338493f748bcfd8475bbbd32877ccd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a338493f748bcfd8475bbbd32877ccd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: Logging: Add callback for CustomStreamHandler
by Philipp Hörist (＠lovetox) 21 May '23

21 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 894938be by Philipp Hörist at 2023-05-21T22:14:47+02:00 new: Logging: Add callback for CustomStreamHandler - - - - - 1 changed file: - gajim/common/logging_helpers.py Changes: ===================================== gajim/common/logging_helpers.py ===================================== @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Callable from typing import Optional import logging @@ -26,6 +27,8 @@ from gajim.common import configpaths from gajim.common.i18n import _ +LogCallback = Callable[[logging.LogRecord], None] + def parseLogLevel(arg: str) -> int: ''' @@ -109,12 +112,21 @@ def colorize(text: str, color: str) -> str: class CustomStreamHandler(logging.StreamHandler): # pyright: ignore def __init__(self) -> None: super().__init__() # pyright: ignore + self._callback: LogCallback | None = None def emit(self, record: logging.LogRecord) -> None: if record.levelno >= logging.WARNING: app.logging_records.append(record) + if self._callback is not None: + self._callback(record) + super().emit(record) + def set_callback(self, + func: LogCallback | None + ) -> None: + self._callback = func + class FancyFormatter(logging.Formatter): ''' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/894938be73fc2db8ef4f8679da8aeb14… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/894938be73fc2db8ef4f8679da8aeb14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: SearchView: Don't change search context when switching chats
by Daniel Brötzmann (＠wurstsalat) 21 May '23

21 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0a922532 by wurstsalat at 2023-05-21T20:46:26+02:00 fix: SearchView: Don't change search context when switching chats - Simplify search context determination - Add fail-safe and improve GUI representation of context Fixes #11533 - - - - - 2 changed files: - gajim/data/gui/search_view.ui - gajim/gtk/search_view.py Changes: ===================================== gajim/data/gui/search_view.ui ===================================== @@ -235,7 +235,7 @@ after:yyyy-mm-dd</property> <property name="can-focus">True</property> <property name="receives-default">False</property> <property name="halign">center</property> - <property name="active">True</property> + <property name="active">False</property> <property name="draw-indicator">True</property> </object> <packing> ===================================== gajim/gtk/search_view.py ===================================== @@ -60,7 +60,6 @@ def __init__(self) -> None: self._account: Optional[str] = None self._jid: Optional[JID] = None self._results_iterator: Optional[Iterator[SearchLogRow]] = None - self._scope: str = 'everywhere' self._first_date: Optional[datetime] = None self._last_date: Optional[datetime] = None @@ -155,16 +154,17 @@ def _on_search(self, entry: Gtk.Entry) -> None: everywhere = self._ui.search_checkbutton.get_active() context = self._account is not None and self._jid is not None + if not context: + # Started search without context -> show in UI + self._ui.search_checkbutton.set_active(True) if not context or everywhere: - self._scope = 'everywhere' self._results_iterator = app.storage.archive.search_all_logs( text, from_users=from_filters, before=before_filters, after=after_filters) else: - self._scope = 'contact' self._results_iterator = app.storage.archive.search_log( self._account, self._jid, @@ -193,18 +193,13 @@ def _add_results(self) -> None: accounts = self._get_accounts() assert self._results_iterator is not None for msg in itertools.islice(self._results_iterator, 25): - if self._scope == 'everywhere': - archive_jid = app.storage.archive.get_jid_from_id(msg.jid_id) - if archive_jid is None: - continue - result_row = ResultRow( - msg, - accounts[msg.account_id], - JID.from_string(archive_jid.jid)) - else: - assert self._account is not None - assert self._jid is not None - result_row = ResultRow(msg, self._account, self._jid) + archive_jid = app.storage.archive.get_jid_from_id(msg.jid_id) + if archive_jid is None: + continue + result_row = ResultRow( + msg, + accounts[msg.account_id], + JID.from_string(archive_jid.jid)) self._ui.results_listbox.add(result_row) @@ -217,24 +212,24 @@ def _on_edge_reached(self, self._add_results() def _update_calendar(self) -> None: - if self._scope == 'everywhere': + if self._account is None and self._jid is None: self._ui.calendar_button.set_sensitive(False) - else: - self._ui.calendar_button.set_sensitive(True) + return - first_log = app.storage.archive.get_first_history_timestamp( - self._account, self._jid) - if first_log is None: - return - self._first_date = self._get_date_from_timestamp(first_log) - last_log = app.storage.archive.get_last_history_timestamp( - self._account, self._jid) - if last_log is None: - return - self._last_date = self._get_date_from_timestamp(last_log) + self._ui.calendar_button.set_sensitive(True) - month = gtk_month(self._last_date.month) - self._ui.calendar.select_month(month, self._last_date.year) + first_log = app.storage.archive.get_first_history_timestamp( + self._account, self._jid) + if first_log is None: + return + self._first_date = self._get_date_from_timestamp(first_log) + last_log = app.storage.archive.get_last_history_timestamp( + self._account, self._jid) + if last_log is None: + return + self._last_date = self._get_date_from_timestamp(last_log) + month = gtk_month(self._last_date.month) + self._ui.calendar.select_month(month, self._last_date.year) def _on_month_changed(self, calendar: Gtk.Calendar) -> None: # Mark days with history in calendar @@ -361,13 +356,6 @@ def set_focus(self) -> None: def set_context(self, account: Optional[str], jid: Optional[JID]) -> None: self._account = account self._jid = jid - everywhere = bool(jid is None) - self._ui.search_checkbutton.set_active(everywhere) - context = account is not None and jid is not None - if not context or everywhere: - self._scope = 'everywhere' - else: - self._scope = 'contact' self._update_calendar() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a922532f6f762e60cbd640ad74587ab… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a922532f6f762e60cbd640ad74587ab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: Don’t delete session object in cleanup()
by Philipp Hörist (＠lovetox) 21 May '23

21 May '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: a1a4af4a by Philipp Hörist at 2023-05-21T19:24:33+02:00 fix: Don’t delete session object in cleanup() This can cause a crash in libsoup if the session object is still in use. - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -539,7 +539,6 @@ class HTTPRequest(GObject.GObject): self._message.run_dispose() del self._cancellable - del self._session del self._user_data if self._timeout_id is not None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/a1a4af4a6365ec6bbdde7753… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/a1a4af4a6365ec6bbdde7753… 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