Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 4 commits: ConversationView: Destroy rows instead of removing them
by Philipp Hörist (＠lovetox) 22 Jan '22

22 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 37646ac6 by lovetox at 2022-01-22T19:39:52+01:00 ConversationView: Destroy rows instead of removing them - - - - - aed21314 by lovetox at 2022-01-22T19:39:52+01:00 Contacts: Add subject property - - - - - 8599d5ad by lovetox at 2022-01-22T19:39:52+01:00 Contacts: Add type annotations - - - - - 8d1c041f by lovetox at 2022-01-22T19:39:52+01:00 Add GroupchatDetails Dialog - Move GroupchatInfo Page into Dialog - Refactor handling muc subject - - - - - 11 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/data/gui/groupchat_control.ui - gajim/gtk/const.py - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/view.py - + gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_info.py - gajim/gtk/menus.py - pyrightconfig.json Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -27,6 +27,8 @@ from nbxmpp.const import Affiliation from nbxmpp.const import Role from nbxmpp.protocol import JID +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import MucSubject from gajim.common import app from gajim.common import types @@ -551,6 +553,13 @@ def occupant_jid(self): return None return muc_data.occupant_jid + @property + def subject(self) -> Optional[MucSubject]: + muc_data = self._module('MUC').get_muc_data(self._jid) + if muc_data is None: + return None + return muc_data.subject + @property def is_joined(self) -> bool: muc_data = self._module('MUC').get_muc_data(self._jid) @@ -576,11 +585,11 @@ def set_not_joined(self) -> None: for contact in self._resources.values(): contact.update_presence(UNKNOWN_MUC_PRESENCE, notify=False) - def get_user_nicknames(self): + def get_user_nicknames(self) -> list[str]: client = app.get_client(self._account) return client.get_module('MUC').get_joined_users(self._jid) - def get_disco(self, max_age=0): + def get_disco(self, max_age: int = 0) -> Optional[DiscoInfo]: return app.storage.cache.get_last_disco_info(self.jid, max_age=max_age) def can_notify(self) -> bool: ===================================== gajim/common/modules/muc.py ===================================== @@ -17,6 +17,7 @@ import logging from collections import defaultdict +import time import nbxmpp from nbxmpp.namespaces import Namespace @@ -655,9 +656,13 @@ def _on_subject_change(self, _con, _stanza, properties): self._log.warning('No MUCData found for %s', room_jid) return - muc_data.subject = properties.subject + muc_subject = properties.muc_subject + if muc_subject is not None and muc_subject.timestamp is None: + muc_subject = muc_subject._replace(timestamp=time.time()) + + muc_data.subject = muc_subject room = self._get_contact(room_jid) - room.notify('room-subject', properties) + room.notify('room-subject', muc_subject) if muc_data.state == MUCJoinedState.JOINING: self._room_join_complete(muc_data) ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1334,96 +1334,7 @@ </packing> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid" id="info_grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton" id="info_close_button"> - <property name="label" translatable="yes">_Close</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Information</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="info_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - <style> - <class name="margin-18"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <style> - <class name="margin-18"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">muc-info</property> - <property name="position">7</property> - </packing> + <placeholder/> </child> <child> <object class="GtkBox"> ===================================== gajim/gtk/const.py ===================================== @@ -145,6 +145,7 @@ def __str__(self): 'CreateGroupchatWindow': 'gajim.gui.groupchat_creation', 'Features': 'gajim.gui.features', 'GroupchatConfig': 'gajim.gui.groupchat_config', + 'GroupchatDetails': 'gajim.gui.groupchat_details', 'GroupChatInvitation': 'gajim.gui.groupchat_invitation', 'GroupchatJoin': 'gajim.gui.groupchat_join', 'HistoryExport': 'gajim.gui.history_export', ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -27,7 +27,6 @@ from typing import Any from typing import Optional -import time import logging from nbxmpp import JID @@ -41,6 +40,7 @@ from nbxmpp.modules.vcard_temp import VCard from nbxmpp.structs import PresenceProperties from nbxmpp.structs import MessageProperties +from nbxmpp.structs import MucSubject from nbxmpp.task import Task from gi.repository import Gtk @@ -77,7 +77,6 @@ from gajim.gui.groupchat_config import GroupchatConfig from gajim.gui.avatar_selector import AvatarSelector from gajim.gui.dataform import DataFormWidget -from gajim.gui.groupchat_info import GroupChatInfoScrolled from gajim.gui.groupchat_inviter import GroupChatInviter from gajim.gui.groupchat_settings import GroupChatSettings from gajim.gui.groupchat_roster import GroupchatRoster @@ -171,10 +170,7 @@ def __init__(self, account: str, jid: JID) -> None: # Holds CaptchaRequest widget self._captcha_request: Optional[DataFormWidget] = None - # MUC Info - self._subject_data = None - self._muc_info_box = GroupChatInfoScrolled(self.account) - self.xml.info_box.add(self._muc_info_box) + self._subject_text = '' # Groupchat settings self._groupchat_settings_box: Optional[GroupChatSettings] = None @@ -286,12 +282,6 @@ def _nick_completion(self) -> NickCompletionGenerator: self.contact.nickname) return self.__nick_completion - @property - def subject(self) -> str: - if self._subject_data is None: - return '' - return self._subject_data.subject - @property def disco_info(self): return app.storage.cache.get_last_disco_info(self.contact.jid) @@ -306,7 +296,7 @@ def add_actions(self) -> None: ('destroy-', None, self._on_destroy_room), ('configure-', None, self._on_configure_room), ('request-voice-', None, self._on_request_voice), - ('information-', None, self._on_information), + ('groupchat-details-', None, self._on_details), ('invite-', None, self._on_invite), ('contact-information-', 's', self._on_contact_information), ('execute-command-', 's', self._on_execute_command), @@ -406,7 +396,7 @@ def remove_actions(self) -> None: 'destroy-', 'configure-', 'request-voice-', - 'information-', + 'groupchat-details-', 'invite-', 'contact-information-', 'execute-command-', @@ -441,11 +431,6 @@ def _show_page(self, name: str) -> None: if name == 'groupchat': transition = Gtk.StackTransitionType.SLIDE_UP self.msg_textview.grab_focus() - if name == 'muc-info': - # Set focus on the close button, otherwise one of - # the selectable labels of the GroupchatInfo box gets focus, - # which means it is fully selected - self.xml.info_close_button.grab_focus() self.xml.stack.set_visible_child_full(name, transition) def _get_current_page(self) -> str: @@ -456,16 +441,11 @@ def _on_muc_disco_update(self, _event: events.MucDiscoUpdate) -> None: self.draw_banner_text() # Actions - def _on_information(self, - _action: Gio.SimpleAction, - _param: Optional[GLib.Variant] - ) -> None: - self._muc_info_box.set_from_disco_info(self.disco_info) - if self._subject_data is not None: - self._muc_info_box.set_subject(self._subject_data.subject) - self._muc_info_box.set_author(self._subject_data.muc_nickname, - self._subject_data.user_timestamp) - self._show_page('muc-info') + def _on_details(self, + _action: Gio.SimpleAction, + _param: Optional[GLib.Variant] + ) -> None: + open_window('GroupchatDetails', contact=self.contact) def _on_groupchat_settings(self, _action: Gio.SimpleAction, @@ -872,23 +852,21 @@ def add_message(self, def _on_room_subject(self, _contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + subject: Optional[MucSubject] ) -> None: - if self.subject == properties.subject: - # Probably a rejoin, we already showed that subject + + if subject is None: return - self._subject_data = properties + if self._subject_text == subject.text: + # Probably a rejoin, we already showed that subject + return - date = '' - if properties.user_timestamp: - date = time.strftime('%c', - time.localtime(properties.user_timestamp)) + self._subject_text = subject.text if (app.settings.get('show_subject_on_join') or not self.contact.is_joining): - self.conversation_view.add_muc_subject( - properties.subject, properties.muc_nickname, date) + self.conversation_view.add_muc_subject(subject) def _on_room_config_changed(self, _contact: GroupchatContact, @@ -1594,8 +1572,6 @@ def delegate_action(self, action: str) -> int: self._on_password_cancel_clicked() elif self._get_current_page() == 'captcha': self._on_captcha_cancel_clicked() - elif self._get_current_page() == 'muc-info': - self._on_page_cancel_clicked() elif self._get_current_page() in ('error', 'captcha-error'): self._on_page_close_clicked() else: @@ -1609,7 +1585,7 @@ def delegate_action(self, action: str) -> int: if action == 'show-contact-info': app.window.lookup_action( - f'information-{self.control_id}').activate() + f'groupchat-details-{self.control_id}').activate() return Gdk.EVENT_STOP return Gdk.EVENT_PROPAGATE @@ -1650,8 +1626,6 @@ def _on_page_change(self, stack: Gtk.Stack, _param: Any) -> None: page_name = stack.get_visible_child_name() if page_name == 'groupchat': pass - elif page_name == 'muc-info': - self.xml.info_close_button.grab_default() elif page_name == 'password': self.xml.password_entry.set_text('') self.xml.password_entry.grab_focus() @@ -1730,7 +1704,7 @@ def _on_manage_save_clicked(self, _button: Gtk.Button) -> None: def _on_change_subject(self, _button: Gtk.Button) -> None: if self._get_current_page() not in ('groupchat', 'muc-manage'): return - self.xml.subject_textview.get_buffer().set_text(self.subject) + self.xml.subject_textview.get_buffer().set_text(self._subject_text) self.xml.subject_textview.grab_focus() self._show_page('subject') ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -16,6 +16,7 @@ from datetime import datetime from gi.repository import Gtk +from nbxmpp.structs import MucSubject from gajim.common.const import AvatarSize from gajim.common.i18n import _ @@ -28,7 +29,7 @@ class MUCSubject(BaseRow): type = 'muc-subject' - def __init__(self, account: str, text: str, nick: str, date: str) -> None: + def __init__(self, account: str, subject: MucSubject) -> None: BaseRow.__init__(self, account) timestamp = time.time() @@ -48,16 +49,21 @@ def __init__(self, account: str, text: str, nick: str, date: str) -> None: title.get_style_context().add_class('bold') subject_box.add(title) - meta_str = _('Changed by %s') % nick - if date is not None: - meta_str = f'{meta_str} ({date})' + author = _('Changed by %s') % (subject.author or _('Unknown')) + + date = '' + if subject.timestamp is not None: + time_str = time.strftime("%c", time.localtime(subject.timestamp)) + date = f' ({time_str})' + + meta_str = f'{author}{date}' meta = Gtk.Label(label=meta_str) meta.set_halign(Gtk.Align.START) meta.get_style_context().add_class('small-label') subject_box.add(meta) message_widget = MessageWidget(account) - message_widget.add_with_styling(text) + message_widget.add_with_styling(subject.text) subject_box.add(message_widget) self.grid.attach(subject_box, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -32,6 +32,7 @@ from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking +from nbxmpp.structs import MucSubject from gajim.common import app from gajim.common.client import Client @@ -155,7 +156,6 @@ def clear(self) -> None: for row in self.get_children()[2:]: if isinstance(row, ReadMarkerRow): continue - self.remove(row) row.destroy() self._reset_conversation_view() @@ -199,9 +199,9 @@ def _filter_func(self, row: BaseRow) -> bool: return True - def add_muc_subject(self, text: str, nick: str, date: str) -> None: - subject = MUCSubject(self._account, text, nick, date) - self._insert_message(subject) + def add_muc_subject(self, subject: MucSubject) -> None: + muc_subject = MUCSubject(self._account, subject) + self._insert_message(muc_subject) def add_muc_user_left(self, nick: str, @@ -418,25 +418,25 @@ def _reduce_messages_before(self) -> bool: if row1.type == row2.type == 'date': # First two rows are date rows, # it’s safe to remove the fist row - self.remove(row1) + row1.destroy() success = True if row1.type == 'date' and row2.type != 'date': # First one is a date row, keep it and # remove the second row instead - self.remove(row2) + row2.destroy() success = True if row1.type != 'date': # Not a date row, safe to remove - self.remove(row1) + row1.destroy() success = True return success def _reduce_messages_after(self) -> None: row = self.get_row_at_index(len(self.get_children()) - 1) - self.remove(row) + row.destroy() def scroll_to_message_and_highlight(self, log_line_id: str) -> None: highlight_row = None ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -0,0 +1,77 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from gi.repository import Gdk +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.i18n import _ +from gajim.common.modules.contacts import GroupchatContact + +from .groupchat_info import GroupChatInfoScrolled +from .sidebar_switcher import SideBarSwitcher + + +class GroupchatDetails(Gtk.ApplicationWindow): + def __init__(self, contact: GroupchatContact) -> None: + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_resizable(True) + self.set_default_size(-1, 600) + self.set_title(_('Groupchat Details')) + + self.account = contact.account + self._contact = contact + + main_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + self._stack = Gtk.Stack() + self._side_bar_switcher = SideBarSwitcher() + + main_box.add(self._side_bar_switcher) + main_box.add(self._stack) + + self._add_groupchat_info() + + self._side_bar_switcher.set_stack(self._stack) + + self.add(main_box) + + self.connect('key-press-event', self._on_key_press) + self.connect('destroy', self._on_destroy) + + self.show_all() + + def _add_groupchat_info(self) -> None: + groupchat_info = GroupChatInfoScrolled(self._contact.account, width=600) + groupchat_info.set_halign(Gtk.Align.FILL) + disco_info = self._contact.get_disco() + assert disco_info is not None + groupchat_info.set_from_disco_info(disco_info) + groupchat_info.set_subject(self._contact.subject) + + self._stack.add_titled(groupchat_info, 'info', _('Information')) + + def _on_key_press(self, + _widget: GroupchatDetails, + event: Gdk.EventKey) -> None: + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _on_destroy(self, _widget: GroupchatDetails) -> None: + app.check_finalize(self) ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -23,6 +23,7 @@ from nbxmpp import JID from nbxmpp.namespaces import Namespace from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import MucSubject from gajim.common import app from gajim.common.i18n import _ @@ -139,22 +140,22 @@ def set_account(self, account: str) -> None: def get_jid(self) -> Optional[JID]: return self._info.jid - def set_author(self, - author: Optional[str], - epoch_timestamp: Optional[float] = None - ) -> None: + def set_subject(self, muc_subject: Optional[MucSubject]) -> None: + if muc_subject is None: + return + + author = muc_subject.author has_author = bool(author) - if has_author and epoch_timestamp is not None: - time_ = time.strftime('%c', time.localtime(epoch_timestamp)) - author = f'{author} - {time_}' + if has_author and muc_subject.timestamp is not None: + time_ = time.strftime('%c', time.localtime(muc_subject.timestamp)) + author = f'{muc_subject.author} - {time_}' self._ui.author.set_text(author or '') self._ui.author.set_visible(has_author) self._ui.author_label.set_visible(has_author) - def set_subject(self, subject: str) -> None: - has_subject = bool(subject) - subject = GLib.markup_escape_text(subject or '') + has_subject = bool(muc_subject.text) + subject = GLib.markup_escape_text(muc_subject.text) self._ui.subject.set_markup(make_href_markup(subject)) self._ui.subject.set_visible(has_subject) self._ui.subject_label.set_visible(has_subject) ===================================== gajim/gtk/menus.py ===================================== @@ -150,7 +150,7 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: params = RemoveHistoryActionParams(account=account, jid=jid) menulist: MenuItemListT = [ - (_('Information'), f'win.information-{control_id}', None), + (_('Details'), f'win.groupchat-details-{control_id}', None), (_('Settings…'), f'win.groupchat-settings-{control_id}', None), (_('Manage…'), f'win.groupchat-manage-{control_id}', None), (_('Rename Chat…'), f'win.rename-groupchat-{control_id}', None), ===================================== pyrightconfig.json ===================================== @@ -54,6 +54,7 @@ "gajim/gtk/conversation/view.py", "gajim/gtk/features.py", "gajim/gtk/file_transfer_send.py", + "gajim/gtk/groupchat_details.py", "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", "gajim/gtk/groupchat_nick.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a4880100643e69ae2b037014e2d6838… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a4880100643e69ae2b037014e2d6838… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AdHocCommands: Use window const, typing
by Daniel Brötzmann (＠wurstsalat) 22 Jan '22

22 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a4880100 by wurstsalat at 2022-01-22T19:25:15+01:00 AdHocCommands: Use window const, typing - - - - - 6 changed files: - gajim/gtk/add_contact.py - gajim/gtk/adhoc.py - gajim/gtk/const.py - gajim/gtk/controls/groupchat.py - gajim/gtk/discovery.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -36,7 +36,6 @@ from gajim.common.i18n import _ from gajim.common.modules.util import as_task -from .adhoc import AdHocCommand from .assistant import Assistant from .assistant import Page from .assistant import ErrorPage @@ -475,7 +474,9 @@ def _on_register_clicked(self, _button: Gtk.Button) -> None: address=self._result.jid) def _on_command_clicked(self, _button: Gtk.Button) -> None: - AdHocCommand(self._account, self._result.jid) + assert self._result is not None + open_window( + 'AdHocCommand', account=self._account, jid=str(self._result.jid)) class GroupChat(Page): ===================================== gajim/gtk/adhoc.py ===================================== @@ -12,6 +12,13 @@ # 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 cast +from typing import Any +from typing import Optional +from typing import Union + import logging from gi.repository import Gtk @@ -21,6 +28,12 @@ from nbxmpp.modules import dataforms from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError +from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.modules.dataforms import MultipleDataForm +from nbxmpp.simplexml import Node +from nbxmpp.structs import AdHocCommand +from nbxmpp.structs import AdHocCommandNote +from nbxmpp.task import Task from gajim.common import app from gajim.common.i18n import _ @@ -38,15 +51,15 @@ log = logging.getLogger('gajim.gui.adhoc') -class AdHocCommand(Assistant): - def __init__(self, account, jid=None): +class AdHocCommands(Assistant): + def __init__(self, account: str, jid: Optional[str] = None) -> None: Assistant.__init__(self, width=600, height=500) + self.account = account + self.jid = jid self._destroyed = False self._client = app.get_client(account) - self._account = account - self._jid = jid self.add_button('complete', _('Complete'), complete=True, css_class='suggested-action') @@ -78,9 +91,9 @@ def __init__(self, account, jid=None): self.show_all() @ensure_not_destroyed - def _received_command_list(self, task): + def _received_command_list(self, task: Task) -> None: try: - commands = task.finish() + commands = cast(Optional[list[AdHocCommand]], task.finish()) except (StanzaError, MalformedStanzaError) as error: self._set_error(to_user_string(error), False) return @@ -89,13 +102,14 @@ def _received_command_list(self, task): self._set_error(_('No commands available'), False) return - self.get_page('commands').add_commands(commands) + commands_page = cast(Commands, self.get_page('commands')) + commands_page.add_commands(commands) self.show_page('commands') @ensure_not_destroyed - def _received_stage(self, task): + def _received_stage(self, task: Task) -> None: try: - stage = task.finish() + stage = cast(AdHocCommand, task.finish()) except (StanzaError, MalformedStanzaError) as error: self._set_error(to_user_string(error), True) return @@ -104,19 +118,23 @@ def _received_stage(self, task): if stage.is_completed: page_name = 'completed' - page = self.get_page(page_name) + page = cast(Union[Stage, Completed], self.get_page(page_name)) page.process_stage(stage) self.show_page(page_name) - def _set_error(self, text, show_command_button): - self.get_page('error').set_show_commands_button(show_command_button) - self.get_page('error').set_text(text) + def _set_error(self, text: str, show_command_button: bool) -> None: + error_page = cast(Error, self.get_page('error')) + error_page.set_show_commands_button(show_command_button) + error_page.set_text(text) self.show_page('error') - def _on_destroy(self, *args): + def _on_destroy(self, _widget: Gtk.Widget) -> None: self._destroyed = True - def _on_button_clicked(self, _assistant, button_name): + def _on_button_clicked(self, + _assistant: AdHocCommands, + button_name: str + ) -> None: if button_name == 'commands': self.show_page('commands') @@ -132,8 +150,9 @@ def _on_button_clicked(self, _assistant, button_name): else: raise ValueError('Invalid button name: %s' % button_name) - def _on_stage_action(self, action): - command, dataform = self.get_page('stage').stage_data + def _on_stage_action(self, action: AdHocAction) -> None: + stage_page = cast(Stage, self.get_page('stage')) + command, dataform = stage_page.stage_data if action == AdHocAction.PREV: dataform = None @@ -144,10 +163,12 @@ def _on_stage_action(self, action): callback=self._received_stage) self.show_page('executing') - self.get_page('stage').clear() + stage_page = cast(Stage, self.get_page('stage')) + stage_page.clear() - def _on_execute(self, *args): - command = self.get_page('commands').get_selected_command() + def _on_execute(self, *args: Any) -> None: + commands_page = cast(Commands, self.get_page('commands')) + command = commands_page.get_selected_command() if command is None: return @@ -158,8 +179,9 @@ def _on_execute(self, *args): self.show_page('executing') - def _on_cancel(self): - command, _ = self.get_page('stage').stage_data + def _on_cancel(self) -> None: + stage_page = cast(Stage, self.get_page('stage')) + command, _ = stage_page.stage_data self._client.get_module('AdHocCommands').execute_command( command, AdHocAction.CANCEL) self.show_page('commands') @@ -171,14 +193,14 @@ class Commands(Page): 'execute': (GObject.SignalFlags.RUN_LAST, None, ()), } - def __init__(self): + def __init__(self) -> None: Page.__init__(self) self.set_valign(Gtk.Align.FILL) self.complete = True self.title = _('Command List') - self._commands = {} + self._commands: dict[str, AdHocCommand] = {} self._scrolled = Gtk.ScrolledWindow() self._scrolled.get_style_context().add_class('adhoc-scrolled') self._scrolled.set_max_content_height(400) @@ -204,33 +226,41 @@ def __init__(self): self.show_all() @staticmethod - def _search_func(model, _column, search_text, iter_): + def _search_func(model: Gtk.TreeModel, + _column: int, + search_text: str, + iter_: Gtk.TreeIter + ) -> bool: return search_text.lower() not in model[iter_][0].lower() - def _on_row_activate(self, _tree_view, _path, _column): + def _on_row_activate(self, + _tree_view: Gtk.TreeView, + _path: Gtk.TreePath, + _column: Gtk.TreeViewColumn + ) -> None: self.emit('execute') - def add_commands(self, commands): + def add_commands(self, commands: list[AdHocCommand]) -> None: self._store.clear() self._commands = {} for command in commands: - key = '%s:%s' % (command.jid, command.node) + key = f'{command.jid}:{command.node}' self._commands[key] = command self._store.append((command.name, key)) - def get_selected_command(self): + def get_selected_command(self) -> Optional[AdHocCommand]: model, treeiter = self._treeview.get_selection().get_selected() if treeiter is None: return None key = model[treeiter][1] return self._commands[key] - def get_visible_buttons(self): + def get_visible_buttons(self) -> list[str]: return ['execute'] class Stage(Page): - def __init__(self): + def __init__(self) -> None: Page.__init__(self) self.set_valign(Gtk.Align.FILL) @@ -238,31 +268,35 @@ def __init__(self): self.title = _('Stage') self._dataform_widget = None - self._notes = [] - self._last_stage_data = None + self._notes: list[Gtk.Label] = [] + self._last_stage_data: Optional[AdHocCommand] = None self.default = None self.show_all() @property - def stage_data(self): + def stage_data(self) -> tuple[AdHocCommand, + Union[SimpleDataForm, MultipleDataForm]]: + assert self._last_stage_data is not None + assert self._dataform_widget is not None return self._last_stage_data, self._dataform_widget.get_submit_form() @property - def actions(self): + def actions(self) -> Optional[set[AdHocAction]]: + assert self._last_stage_data is not None return self._last_stage_data.actions - def clear(self): + def clear(self) -> None: self._show_form(None) self._show_notes(None) self._last_stage_data = None - def process_stage(self, stage_data): + def process_stage(self, stage_data: AdHocCommand) -> None: self._last_stage_data = stage_data self._show_notes(stage_data.notes) self._show_form(stage_data.data) self.default = stage_data.default - def _show_form(self, form): + def _show_form(self, form: Optional[Node]) -> None: if self._dataform_widget is not None: self.remove(self._dataform_widget) self._dataform_widget.destroy() @@ -276,7 +310,7 @@ def _show_form(self, form): self._dataform_widget.show_all() self.add(self._dataform_widget) - def _show_notes(self, notes): + def _show_notes(self, notes: Optional[list[AdHocCommandNote]]): for note in self._notes: self.remove(note) self._notes = [] @@ -290,28 +324,28 @@ def _show_notes(self, notes): self._notes.append(label) self.add(label) - def _on_is_valid(self, _widget, is_valid): + def _on_is_valid(self, _widget: DataFormWidget, is_valid: bool) -> None: self.complete = is_valid self.update_page_complete() - def get_visible_buttons(self): + def get_visible_buttons(self) -> list[str]: actions = list(map(lambda action: action.value, self._last_stage_data.actions)) return actions - def get_default_button(self): + def get_default_button(self) -> str: return self._last_stage_data.default.value class Completed(Page): - def __init__(self): + def __init__(self) -> None: Page.__init__(self) self.set_valign(Gtk.Align.FILL) self.complete = True self.title = _('Completed') - self._notes = [] + self._notes: list[MultiLineLabel] = [] self._dataform_widget = None icon = Gtk.Image.new_from_icon_name('object-select-symbolic', @@ -331,12 +365,12 @@ def __init__(self): self.show_all() - def process_stage(self, stage_data): + def process_stage(self, stage_data: AdHocCommand) -> None: self._show_notes(stage_data.notes) self._show_form(stage_data.data) self._show_icon_text(stage_data.data is None) - def _show_icon_text(self, show): + def _show_icon_text(self, show: bool) -> None: if show: self.set_valign(Gtk.Align.CENTER) self._icon_text.show_all() @@ -344,7 +378,7 @@ def _show_icon_text(self, show): self.set_valign(Gtk.Align.FILL) self._icon_text.hide() - def _show_form(self, form): + def _show_form(self, form: Optional[Node]) -> None: if self._dataform_widget is not None: self.remove(self._dataform_widget) self._dataform_widget.destroy() @@ -358,7 +392,7 @@ def _show_form(self, form): self._dataform_widget.show_all() self.add(self._dataform_widget) - def _show_notes(self, notes): + def _show_notes(self, notes: list[AdHocCommandNote]): for note in self._notes: self.remove(note) self._notes = [] @@ -370,35 +404,35 @@ def _show_notes(self, notes): self._notes.append(label) self.add(label) - def get_visible_buttons(self): + def get_visible_buttons(self) -> list[str]: return ['commands'] class Error(ErrorPage): - def __init__(self): + def __init__(self) -> None: ErrorPage.__init__(self) self._show_commands_button = False self.set_heading(_('An error occurred')) - def set_show_commands_button(self, value): + def set_show_commands_button(self, value: bool) -> None: self._show_commands_button = value - def get_visible_buttons(self): + def get_visible_buttons(self) -> list[str]: if self._show_commands_button: return ['commands'] - return None + return [] class Executing(ProgressPage): - def __init__(self): + def __init__(self) -> None: ProgressPage.__init__(self) self.set_title(_('Executing…')) self.set_text(_('Executing…')) class RequestCommandList(ProgressPage): - def __init__(self): + def __init__(self) -> None: ProgressPage.__init__(self) self.set_title(_('Requesting Command List')) self.set_text(_('Requesting Command List')) ===================================== gajim/gtk/const.py ===================================== @@ -134,6 +134,7 @@ def __str__(self): 'AccountsWindow': 'gajim.gui.accounts', 'AccountWizard': 'gajim.gui.account_wizard', 'AddContact': 'gajim.gui.add_contact', + 'AdHocCommands': 'gajim.gui.adhoc', 'AdhocMUC': 'gajim.gui.adhoc_muc', 'AdvancedConfig': 'gajim.gui.advanced_config', 'BlockingList': 'gajim.gui.blocking', ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -75,7 +75,6 @@ from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.filechoosers import AvatarChooserDialog from gajim.gui.groupchat_config import GroupchatConfig -from gajim.gui.adhoc import AdHocCommand from gajim.gui.avatar_selector import AvatarSelector from gajim.gui.dataform import DataFormWidget from gajim.gui.groupchat_info import GroupChatInfoScrolled @@ -618,7 +617,7 @@ def _on_execute_command(self, nick = param.get_string() if nick: jid += '/' + nick - AdHocCommand(self.account, jid) + open_window('AdHocCommands', account=self.account, jid=jid) def _on_change_avatar(self, _button: Gtk.Button) -> None: def _on_accept(path: str) -> None: ===================================== gajim/gtk/discovery.py ===================================== @@ -58,7 +58,6 @@ from gajim.common.i18n import _ from gajim.common.const import StyleAttr -from .adhoc import AdHocCommand from .dialogs import ErrorDialog from .search import Search from .util import icon_exists @@ -1332,7 +1331,7 @@ def _on_execute_button_clicked(self, widget=None): if not iter_: return service = model[iter_][0] - AdHocCommand(self.account, service) + open_window('AdHocCommands', account=self.account, jid=service) def _on_register_button_clicked(self, widget=None): """ ===================================== gajim/gtk/main.py ===================================== @@ -43,7 +43,6 @@ from gajim.common.ged import EventHelper from gajim.common.modules.bytestream import is_transfer_active -from .adhoc import AdHocCommand from .account_side_bar import AccountSideBar from .app_side_bar import AppSideBar from .workspace_side_bar import WorkspaceSideBar @@ -609,7 +608,7 @@ def contact_info(account: str, jid: str) -> None: @staticmethod def execute_command(account: str, jid: str) -> None: # TODO: Resource? - AdHocCommand(account, jid) + open_window('AdHocCommands', account=account, jid=jid) def block_contact(self, account: str, jid: str) -> None: client = app.get_client(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4880100643e69ae2b037014e2d68383… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4880100643e69ae2b037014e2d68383… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Correct type annotations for MucSubject
by Philipp Hörist (＠lovetox) 22 Jan '22

22 Jan '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f79f9df6 by lovetox at 2022-01-22T17:22:12+01:00 MUC: Correct type annotations for MucSubject - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -132,8 +132,8 @@ class MucConfigResult(NamedTuple): class MucSubject(NamedTuple): text: str - author: str - timestamp: float + author: Optional[str] + timestamp: Optional[float] class AffiliationResult(NamedTuple): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f79f9df663b7661b602e462f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f79f9df663b7661b602e462f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Add MucSubject struct
by Philipp Hörist (＠lovetox) 22 Jan '22

22 Jan '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e4343205 by lovetox at 2022-01-22T17:06:11+01:00 MUC: Add MucSubject struct - - - - - 2 changed files: - nbxmpp/modules/muc/muc.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/muc/muc.py ===================================== @@ -25,6 +25,7 @@ from nbxmpp.protocol import DataForm from nbxmpp.protocol import DataField from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import StanzaMalformed +from nbxmpp.structs import MucSubject from nbxmpp.structs import StanzaHandler from nbxmpp.const import InviteType from nbxmpp.const import MessageType @@ -79,9 +80,13 @@ class MUC(BaseModule): ns=Namespace.MUC_USER, priority=11), StanzaHandler(name='message', - callback=self._process_groupchat_message, + callback=self._process_message_before_decryption, typ='groupchat', priority=6), + StanzaHandler(name='message', + callback=self._process_message_after_decryption, + typ='groupchat', + priority=16), StanzaHandler(name='message', callback=self._process_mediated_invite, typ='normal', @@ -182,7 +187,7 @@ class MUC(BaseModule): self._log.warning(stanza) raise NodeProcessed - def _process_groupchat_message(self, _client, stanza, properties): + def _process_message_before_decryption(self, _client, stanza, properties): properties.from_muc = True properties.muc_jid = properties.jid.new_as_bare() properties.muc_nickname = properties.jid.resource @@ -203,6 +208,13 @@ class MUC(BaseModule): if address is not None: 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: + properties.muc_subject = MucSubject( + text=properties.subject, + author=properties.muc_nickname, + timestamp=properties.user_timestamp) + def _process_message(self, _client, stanza, properties): muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER) if muc_user is None: ===================================== nbxmpp/structs.py ===================================== @@ -130,6 +130,12 @@ class MucConfigResult(NamedTuple): form: Optional[Any] = None +class MucSubject(NamedTuple): + text: str + author: str + timestamp: float + + class AffiliationResult(NamedTuple): jid: JID users: dict[JID, dict[str, str]] @@ -957,6 +963,7 @@ class MessageProperties: muc_decline = None muc_user = None muc_ofrom = None + muc_subject: Optional[MucSubject] = None captcha: Optional[CaptchaData] = None voice_request: Optional[VoiceRequest] = None self_message: bool = False View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e4343205805566cb67b2f804… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e4343205805566cb67b2f804… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ContactInfo: Don't make VCardGrid columns homogeneous
by Daniel Brötzmann (＠wurstsalat) 22 Jan '22

22 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e3a18449 by wurstsalat at 2022-01-22T13:29:19+01:00 ContactInfo: Don't make VCardGrid columns homogeneous - - - - - b4cbb26d by wurstsalat at 2022-01-22T13:44:01+01:00 ContactInfo: Typing - - - - - 6e3046cd by wurstsalat at 2022-01-22T13:45:05+01:00 Update pyrightconfig - - - - - 3 changed files: - gajim/common/structs.py - gajim/gtk/contact_info.py - pyrightconfig.json Changes: ===================================== gajim/common/structs.py ===================================== @@ -200,7 +200,7 @@ def msg_iq(self, value: Any) -> None: @dataclass(frozen=True) class PresenceData: - show: str + show: PresenceShow status: str priority: int idle_time: Optional[float] ===================================== gajim/gtk/contact_info.py ===================================== @@ -137,7 +137,7 @@ def _on_key_press(self, _widget: ContactInfo, event: Gdk.EventKey) -> None: def _on_stack_child_changed(self, _widget: Gtk.Stack, - pspec: GObject.ParamSpec) -> None: + _pspec: GObject.ParamSpec) -> None: name = self._ui.main_stack.get_visible_child_name() self._ui.header_revealer.set_reveal_child(name != 'information') @@ -158,7 +158,6 @@ def _on_destroy(self, _widget: ContactInfo) -> None: def _fill_information_page(self, contact: ContactT) -> None: self._vcard_grid = VCardGrid(self.account) - self._vcard_grid.set_column_homogeneous(True) self._ui.vcard_box.add(self._vcard_grid) self._client.get_module('VCard4').request_vcard( jid=self.contact.jid, @@ -236,7 +235,8 @@ def _fill_device_info(self, contact: BareContact) -> None: self._switcher.set_row_visible('devices', True) def _query_device(self, contact: ResourceContact) -> None: - task = self._client.get_module('SoftwareVersion').request_software_version( + software_module = self._client.get_module('SoftwareVersion') + task = software_module.request_software_version( contact.jid, callback=self._set_os_info, user_data=contact.resource) @@ -485,7 +485,7 @@ def set_entity_time(self, entity_time: Optional[str]) -> None: def set_software(self, software: Optional[SoftwareVersionResult]) -> None: if software is not None: - software_string = '%s %s' % (software.name, software.version) + software_string = f'{software.name} {software.version}' self._ui.software_value.set_text(software_string) self._ui.software_value.show() self._ui.software_label.show() ===================================== pyrightconfig.json ===================================== @@ -31,6 +31,7 @@ "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_page.py", "gajim/gtk/const.py", + "gajim/gtk/contact_info.py", "gajim/gtk/contacts_flowbox.py", "gajim/gtk/conversation/code_widget.py", "gajim/gtk/conversation/jump_to_end_button.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/15db1cb264fc4b05607fb1ba363791c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/15db1cb264fc4b05607fb1ba363791c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusIcon: Fix regression on left-click
by Philipp Hörist (＠lovetox) 21 Jan '22

21 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 15db1cb2 by lovetox at 2022-01-21T23:05:46+01:00 StatusIcon: Fix regression on left-click This restores the window correctly again - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -183,8 +183,7 @@ def _on_activate(self, *args: Any) -> None: if not app.settings.get('main_window_skip_taskbar'): app.window.set_property('skip-taskbar-hint', False) - # app.window.present_with_time(Gtk.get_current_event_time()) - app.app.activate() + app.window.present_with_time(Gtk.get_current_event_time()) @staticmethod def _on_preferences(_widget: Gtk.MenuItem) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/15db1cb264fc4b05607fb1ba363791cd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/15db1cb264fc4b05607fb1ba363791cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConversationView: Improve displaying of user status in single chats
by Philipp Hörist (＠lovetox) 21 Jan '22

21 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: dc61b224 by lovetox at 2022-01-21T22:48:24+01:00 ConversationView: Improve displaying of user status in single chats - Don’t load user status history - Use UserStatus row for displaying - - - - - 8 changed files: - gajim/common/storage/archive.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/muc_user_status.py → gajim/gtk/conversation/rows/user_status.py - gajim/gtk/conversation/view.py - gajim/gtk/types.py - pyrightconfig.json Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -386,7 +386,8 @@ def get_conversation_before_after(self, """ jids = [jid] account_id = self.get_account_id(account) - kinds = map(str, [KindConstant.ERROR]) + kinds = map(str, [KindConstant.ERROR, + KindConstant.STATUS]) if before: time_order = 'AND time < ? ORDER BY time DESC, log_line_id DESC' ===================================== gajim/gtk/controls/base.py ===================================== @@ -1486,11 +1486,6 @@ def add_messages(self, messages: list[ConversationRow]): if not msg.message: continue - if msg.kind in (KindConstant.STATUS, - KindConstant.GCSTATUS): - self.conversation_view.add_info_message(msg.message) - continue - message_text = msg.message contact_name = msg.contact_name ===================================== gajim/gtk/controls/chat.py ===================================== @@ -740,15 +740,12 @@ def _on_client_state_changed(self, self.update_actions() def _on_presence_received(self, event: events.PresenceReceived) -> None: - uf_show = helpers.get_uf_show(event.show) - name = self.contact.name - self.update_ui() if not app.settings.get('print_status_in_chats'): return - status = f'- {event.status}' if event.status else '' - status_line = _('%(name)s is now %(show)s %(status)s') % { - 'name': name, 'show': uf_show, 'status': status} - self.add_info_message(status_line) + contact = self._client.get_module('Contacts').get_contact(event.fjid) + self.conversation_view.add_user_status(self.contact.name, + contact.show.value, + contact.status) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -1064,9 +1064,9 @@ def _on_user_status_show_changed(self, properties: MessageProperties ) -> None: - self.conversation_view.add_muc_user_status( - user_contact, - properties.is_muc_self_presence) + self.conversation_view.add_user_status(user_contact.name, + user_contact.show.value, + user_contact.status) def _on_user_affiliation_changed(self, _contact: GroupchatContact, ===================================== gajim/gtk/conversation/rows/muc_user_status.py → gajim/gtk/conversation/rows/user_status.py ===================================== @@ -12,27 +12,32 @@ # 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 + import time from datetime import datetime from gi.repository import Gtk -from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.helpers import get_uf_show from .widgets import SimpleLabel from .base import BaseRow - from ..message_widget import MessageWidget - from ...avatar import get_show_circle -class MUCUserStatus(BaseRow): - def __init__(self, account: str, user_contact: GroupchatParticipant, - is_self: bool) -> None: +class UserStatus(BaseRow): + def __init__(self, + account: str, + name: str, + show: str, + status: Optional[str]) -> None: + BaseRow.__init__(self, account) self.type = 'muc-user-status' @@ -46,22 +51,23 @@ def __init__(self, account: str, user_contact: GroupchatParticipant, show_icon = Gtk.Image() show_icon.set_opacity(0.6) - surface = get_show_circle( - user_contact.show.value, - 16, - self.get_scale_factor()) + surface = get_show_circle(show, 16, self.get_scale_factor()) show_icon.set_from_surface(surface) self.grid.attach(show_icon, 1, 0, 1, 1) + show = get_uf_show(show) + + message = _('{nick} is now {show}').format(nick=name, show=show) + self._label = SimpleLabel() - self._label.set_text(self._make_show_text(user_contact, is_self)) + self._label.set_text(message) self._label.get_style_context().add_class('gajim-status-message') self.grid.attach(self._label, 2, 0, 1, 1) - if user_contact.status is not None: + if status is not None: message_widget = MessageWidget(account) message_widget.get_style_context().add_class('gajim-status-message') - message_widget.add_with_styling(user_contact.status) + message_widget.add_with_styling(status) self.grid.attach(message_widget, 2, 1, 1, 1) timestamp_widget = self.create_timestamp_widget(self.timestamp) @@ -71,17 +77,3 @@ def __init__(self, account: str, user_contact: GroupchatParticipant, self.grid.attach(timestamp_widget, 3, 0, 1, 1) self.show_all() - - @staticmethod - def _make_show_text(user_contact: GroupchatParticipant, - is_self: bool) -> str: - nick = user_contact.name - show = get_uf_show(user_contact.show.value) - - if is_self: - message = _('You are now {show}').format(show=show) - - else: - message = _('{nick} is now {show}').format(nick=nick, - show=show) - return message ===================================== gajim/gtk/conversation/view.py ===================================== @@ -46,7 +46,6 @@ from gajim.common.storage.archive import ConversationRow from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact -from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT from .rows.base import BaseRow @@ -61,7 +60,7 @@ from .rows.file_transfer_jingle import FileTransferJingleRow from .rows.muc_subject import MUCSubject from .rows.muc_join_left import MUCJoinLeft -from .rows.muc_user_status import MUCUserStatus +from .rows.user_status import UserStatus log = logging.getLogger('gajim.gui.conversation_view') @@ -222,9 +221,8 @@ def add_muc_user_joined(self, nick: str) -> None: nick) self._insert_message(join_left) - def add_muc_user_status(self, user_contact: GroupchatParticipant, - is_self: bool) -> None: - user_status = MUCUserStatus(self._account, user_contact, is_self) + def add_user_status(self, name: str, show: str, status: str) -> None: + user_status = UserStatus(self._account, name, show, status) self._insert_message(user_status) def add_info_message(self, text: str) -> None: ===================================== gajim/gtk/types.py ===================================== @@ -33,7 +33,7 @@ from .conversation.rows.message import MessageRow from .conversation.rows.muc_join_left import MUCJoinLeft from .conversation.rows.muc_subject import MUCSubject - from .conversation.rows.muc_user_status import MUCUserStatus + from .conversation.rows.user_status import UserStatus from .conversation.rows.read_marker import ReadMarkerRow from .conversation.rows.scroll_hint import ScrollHintRow ===================================== pyrightconfig.json ===================================== @@ -45,7 +45,7 @@ "gajim/gtk/conversation/rows/message.py", "gajim/gtk/conversation/rows/muc_join_left.py", "gajim/gtk/conversation/rows/muc_subject.py", - "gajim/gtk/conversation/rows/muc_user_status.py", + "gajim/gtk/conversation/rows/user_status.py", "gajim/gtk/conversation/rows/read_marker.py", "gajim/gtk/conversation/rows/scroll_hint.py", "gajim/gtk/conversation/rows/widgets.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dc61b224448cdfc003a5332eff32db41… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dc61b224448cdfc003a5332eff32db41… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ACE: Make log_contact_status_changes available
by Philipp Hörist (＠lovetox) 21 Jan '22

21 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 782388b6 by lovetox at 2022-01-21T07:48:03+01:00 ACE: Make log_contact_status_changes available - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -649,6 +649,7 @@ class WorkspaceSettings(TypedDict): 'gc_notify_on_all_messages_public_default': '', 'developer_modus': '', 'use_libappindicator': _('Enables libappindicator, an alternative tray icon provider'), + 'log_contact_status_changes': '', }, } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/782388b624dbcd13f505b42d3cd2b6f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/782388b624dbcd13f505b42d3cd2b6f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add type annotation
by Philipp Hörist (＠lovetox) 21 Jan '22

21 Jan '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 548e9895 by lovetox at 2022-01-21T01:19:27+01:00 Add type annotation - - - - - 1 changed file: - nbxmpp/__init__.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "3.0.0-dev1" +__version__: str = "3.0.0-dev1" View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/548e989573b9de690e62ebc9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/548e989573b9de690e62ebc9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Drop Zeroconf support
by Philipp Hörist (＠lovetox) 21 Jan '22

21 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: fb8a394e by lovetox at 2022-01-21T01:04:55+01:00 Drop Zeroconf support - Feature is broken since mid 2020 - No demand since then to fix it - - - - - 30 changed files: - README.md - data/org.gajim.Gajim.appdata.xml.in - data/org.gajim.Gajim.desktop.in - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/client.py - gajim/common/events.py - gajim/common/modules/bytestream.py - gajim/common/modules/presence.py - gajim/common/settings.py - gajim/common/types.py - − gajim/common/zeroconf/__init__.py - − gajim/common/zeroconf/client_zeroconf.py - − gajim/common/zeroconf/connection_handlers_zeroconf.py - − gajim/common/zeroconf/connection_zeroconf.py - − gajim/common/zeroconf/roster_zeroconf.py - − gajim/common/zeroconf/zeroconf.py - − gajim/common/zeroconf/zeroconf_avahi.py - − gajim/common/zeroconf/zeroconf_avahi_const.py - − gajim/common/zeroconf/zeroconf_bonjour.py - − gajim/data/gui/zeroconf_information_window.ui - gajim/gtk/accounts.py - gajim/gtk/adhoc_muc.py - gajim/gtk/application.py - gajim/gtk/builder.pyi - gajim/gtk/controls/chat.py - gajim/gtk/features.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/status_icon.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fb8a394e79839c75e0b065ccbf904730… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fb8a394e79839c75e0b065ccbf904730… 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