Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] GroupchatDetails: Styling
by Daniel Brötzmann (＠wurstsalat) 23 Jan '22

23 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7e95d2e3 by wurstsalat at 2022-01-23T14:17:49+01:00 GroupchatDetails: Styling - - - - - 3 changed files: - + gajim/data/gui/groupchat_details.ui - gajim/gtk/builder.pyi - gajim/gtk/groupchat_details.py Changes: ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> +  + <object class="GtkGrid" id="main_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox"> + <property name="width-request">570</property> + <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> + <object class="GtkRevealer" id="header_revealer"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-duration">200</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="header_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">missing-image</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="name_entry"> + <property name="name">ContactNameEntry</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="valign">center</property> + <property name="activates-default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="edit_name_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Edit Name…</property> + <property name="valign">center</property> + <signal name="toggled" handler="_on_edit_name_toggled" 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">2</property> + </packing> + </child> + <style> + <class name="stack-header"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkStack" id="main_stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">crossfade</property> + <child> + <object class="GtkBox" id="info_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + <packing> + <property name="name">information</property> + <property name="title" translatable="yes">Information</property> + <property name="icon-name">user-info-symbolic</property> + </packing> + </child> + <child> + <object class="GtkBox" id="settings_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + <packing> + <property name="name">settings</property> + <property name="title" translatable="yes">Settings</property> + <property name="icon-name">document-properties-symbolic</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="stack-border"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> +</interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -475,6 +475,17 @@ class GroupchatCreationBuilder(Builder): create_button: Gtk.Button +class GroupchatDetailsBuilder(Builder): + main_grid: Gtk.Grid + header_revealer: Gtk.Revealer + header_image: Gtk.Image + name_entry: Gtk.Entry + edit_name_button: Gtk.ToggleButton + main_stack: Gtk.Stack + info_box: Gtk.Box + settings_box: Gtk.Box + + class GroupchatInfoScrolledBuilder(Builder): info_grid: Gtk.Grid address_label: Gtk.Label @@ -983,6 +994,8 @@ def get_builder(file_name: Literal['groupchat_control.ui'], widgets: list[str] = @overload def get_builder(file_name: Literal['groupchat_creation.ui'], widgets: list[str] = ...) -> GroupchatCreationBuilder: ... @overload +def get_builder(file_name: Literal['groupchat_details.ui'], widgets: list[str] = ...) -> GroupchatDetailsBuilder: ... +@overload def get_builder(file_name: Literal['groupchat_info_scrolled.ui'], widgets: list[str] = ...) -> GroupchatInfoScrolledBuilder: ... @overload def get_builder(file_name: Literal['groupchat_inviter.ui'], widgets: list[str] = ...) -> GroupchatInviterBuilder: ... ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -14,20 +14,28 @@ from __future__ import annotations +from typing import Optional + from gi.repository import Gdk +from gi.repository import GObject from gi.repository import Gtk from gajim.common import app +from gajim.common.const import AvatarSize from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact +from .builder import get_builder from .groupchat_info import GroupChatInfoScrolled from .groupchat_settings import GroupChatSettings from .sidebar_switcher import SideBarSwitcher class GroupchatDetails(Gtk.ApplicationWindow): - def __init__(self, contact: GroupchatContact) -> None: + def __init__(self, + contact: GroupchatContact, + page: Optional[str] = None + ) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -38,27 +46,55 @@ def __init__(self, contact: GroupchatContact) -> None: self.set_title(_('Groupchat Details')) self.account = contact.account + self._client = app.get_client(contact.account) self._contact = contact - main_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) - self._stack = Gtk.Stack() - self._side_bar_switcher = SideBarSwitcher() + self._ui = get_builder('groupchat_details.ui') + self._ui.connect_signals(self) - main_box.add(self._side_bar_switcher) - main_box.add(self._stack) + self._switcher = SideBarSwitcher() + self._switcher.set_stack(self._ui.main_stack, rows_visible=False) + self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1) + self._ui.main_stack.connect('notify::visible-child-name', + self._on_stack_child_changed) + self.add(self._ui.main_grid) self._add_groupchat_info() self._add_groupchat_settings() - self._side_bar_switcher.set_stack(self._stack) + self._load_avatar() + self._ui.name_entry.set_text(contact.name) - self.add(main_box) + if page is not None: + self._switcher.set_row(page) self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) self.show_all() + def _on_stack_child_changed(self, + _widget: Gtk.Stack, + _pspec: GObject.ParamSpec) -> None: + + name = self._ui.main_stack.get_visible_child_name() + self._ui.header_revealer.set_reveal_child(name != 'information') + + def _on_edit_name_toggled(self, widget: Gtk.ToggleButton) -> None: + active = widget.get_active() + self._ui.name_entry.set_sensitive(active) + if active: + self._ui.name_entry.grab_focus() + + name = self._ui.name_entry.get_text() + self._client.get_module('Bookmarks').modify( + self._contact.jid, name=name) + + def _load_avatar(self) -> None: + scale = self.get_scale_factor() + surface = self._contact.get_avatar(AvatarSize.VCARD_HEADER, scale) + self._ui.header_image.set_from_surface(surface) + def _add_groupchat_info(self) -> None: groupchat_info = GroupChatInfoScrolled(self._contact.account, width=600) groupchat_info.set_halign(Gtk.Align.FILL) @@ -66,17 +102,19 @@ def _add_groupchat_info(self) -> None: 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')) + self._ui.info_box.add(groupchat_info) + self._switcher.set_row_visible('information', True) def _add_groupchat_settings(self) -> None: scrolled_window = Gtk.ScrolledWindow() + scrolled_window.set_vexpand(True) scrolled_window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) settings_box = GroupChatSettings(self.account, self._contact.jid) scrolled_window.add(settings_box) - self._stack.add_titled(scrolled_window, 'settings', _('Settings')) + self._ui.settings_box.add(scrolled_window) + self._switcher.set_row_visible('settings', True) def _on_key_press(self, _widget: GroupchatDetails, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e95d2e31b1fe0bf2866bdbfc22bcaf1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e95d2e31b1fe0bf2866bdbfc22bcaf1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove dead code
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 10e4f811 by lovetox at 2022-01-23T13:04:20+01:00 Remove dead code Code regarding blocking signed in notifications, because we don’t show these notifications anymore - - - - - c208c063 by lovetox at 2022-01-23T13:10:05+01:00 Interface: Handle muc-added event in MainWindow - - - - - 5 changed files: - gajim/common/app.py - gajim/common/events.py - gajim/common/modules/muc.py - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/common/app.py ===================================== @@ -104,13 +104,6 @@ def __init__(self): # list of our nick names in each account nicks: dict[str, str] = {} -# should we block 'contact signed in' notifications for this account? -# this is only for the first 30 seconds after we change our show -# to something else than offline -# can also contain account/transport_jid to block notifications for contacts -# from this transport -block_signed_in_notifications: dict[str, bool] = {} - proxy65_manager = None cert_store = cast('CertificateStore', None) ===================================== gajim/common/events.py ===================================== @@ -504,7 +504,7 @@ class JingleErrorReceived(JingleEvent): class MucAdded(ApplicationEvent): name: str = field(init=False, default='muc-added') account: str - jid: str + jid: JID @dataclass ===================================== gajim/common/modules/muc.py ===================================== @@ -24,6 +24,7 @@ from nbxmpp.const import InviteType from nbxmpp.const import PresenceType from nbxmpp.const import StatusCode +from nbxmpp.protocol import JID from nbxmpp.structs import StanzaHandler from nbxmpp.errors import StanzaError @@ -250,8 +251,9 @@ def create(self, jid, config): self._create(muc_data) self._push_muc_added_event(jid) - def _push_muc_added_event(self, jid): - app.ged.raise_event(MucAdded(account=self._account, jid=jid)) + def _push_muc_added_event(self, jid: str) -> None: + app.ged.raise_event(MucAdded(account=self._account, + jid=JID.from_string(jid))) def _on_disco_result(self, task): try: ===================================== gajim/gtk/main.py ===================================== @@ -32,6 +32,7 @@ from gajim.common import ged from gajim.common.const import Direction from gajim.common.events import ApplicationEvent +from gajim.common.events import MucAdded from gajim.common.events import HttpAuth from gajim.common.events import PasswordRequired from gajim.common.events import PlainConnection @@ -136,6 +137,7 @@ def __init__(self) -> None: ('plain-connection', ged.GUI1, self._on_plain_connection), ('password-required', ged.GUI1, self._on_password_required), ('http-auth', ged.GUI1, self._on_http_auth), + ('muc-added', ged.GUI1, self._on_muc_added), ]) self._check_for_account() @@ -265,6 +267,12 @@ def _response(answer: str) -> None: callback=_response, args=['yes'])]).show() + def _on_muc_added(self, event: MucAdded) -> None: + if self.chat_exists(event.account, event.jid): + return + + self.add_group_chat(event.account, event.jid) + def _add_actions(self) -> None: actions = [ ('add-workspace', 's', self._add_workspace), ===================================== gajim/gui_interface.py ===================================== @@ -67,7 +67,6 @@ from gajim.common.events import FileHashError from gajim.common.events import FileProgress from gajim.common.events import FileError -from gajim.common.events import MucAdded from gajim.common.helpers import ask_for_status_message from gajim.common.structs import OutgoingMessage from gajim.common.i18n import _ @@ -119,10 +118,6 @@ def __init__(self): self._create_core_handlers_list() self._register_core_handlers() - app.ged.register_event_handler('muc-added', - ged.CORE, - self._on_muc_added) - self.instances = {} for acc in app.connections: @@ -134,7 +129,6 @@ def __init__(self): app.newly_added[acc] = [] app.to_be_removed[acc] = [] app.nicks[acc] = app.settings.get_account_setting(acc, 'name') - app.block_signed_in_notifications[acc] = True def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long @@ -142,7 +136,6 @@ def _create_core_handlers_list(self) -> None: 'iq-error-received': [self.handle_event_iq_error], 'signed-in': [self.handle_event_signed_in], 'presence-received': [self.handle_event_presence], - 'our-show': [self.handle_event_status], 'message-sent': [self.handle_event_msgsent], 'message-not-sent': [self.handle_event_msgnotsent], 'read-state-sync': [self.handle_event_read_state_sync], @@ -183,7 +176,6 @@ def handle_event_signed_in(event): # Add our own JID into the DB app.storage.archive.insert_jid(event.conn.get_own_jid().bare) account = event.conn.name - app.block_signed_in_notifications[account] = True pep_supported = event.conn.get_module('PEP').supported @@ -200,48 +192,13 @@ def handle_event_signed_in(event): app.window.show_account_page(account) def handle_event_presence(self, event): - # TODO: - # 'NOTIFY' (account, (jid, status, status message, resource, - # priority, timestamp)) - # - # Contact changed show account = event.conn.name jid = event.jid - if app.jid_is_transport(jid): - # It must be an agent - - # transport just signed in/out, don't show - # popup notifications for 30s - account_jid = account + '/' + jid - app.block_signed_in_notifications[account_jid] = True - GLib.timeout_add_seconds(30, self._unblock_signed_in_notifications, - account_jid) - ctrl = app.window.get_control(account, jid) if ctrl and ctrl.session and len(event.contact_list) > 1: ctrl.remove_session(ctrl.session) - def handle_event_status(self, event): - if event.show in ('offline', 'error'): - # TODO: Close all account windows - pass - - if event.show == 'offline': - app.block_signed_in_notifications[event.account] = True - else: - # 30 seconds after we change our status to sth else than offline - # we stop blocking notifications of any kind - # this prevents from getting the roster items as 'just signed in' - # contacts. 30 seconds should be enough time - GLib.timeout_add_seconds(30, - self._unblock_signed_in_notifications, - event.account) - - @staticmethod - def _unblock_signed_in_notifications(account: str) -> None: - app.block_signed_in_notifications[account] = False - @staticmethod def handle_event_msgsent(event): if not event.play_sound: @@ -506,13 +463,6 @@ def start_chat_from_jid(account: str, # TODO: handle message arg in StartChat app.app.activate_action('start-chat', GLib.Variant('s', str(jid))) - @staticmethod - def _on_muc_added(event: MucAdded) -> None: - if app.window.chat_exists(event.account, JID.from_string(event.jid)): - return - - app.window.add_group_chat(event.account, JID.from_string(event.jid)) - @staticmethod def create_account(account: str, username: str, @@ -574,9 +524,6 @@ def enable_account(self, account: str) -> None: app.plugin_manager.register_modules_for_account( app.connections[account]) - app.ged.register_event_handler( - 'muc-added', ged.CORE, self._on_muc_added) - # update variables self.instances[account] = { 'infos': {}, @@ -586,10 +533,7 @@ def enable_account(self, account: str) -> None: app.automatic_rooms[account] = {} app.newly_added[account] = [] app.to_be_removed[account] = [] - app.nicks[account] = app.settings.get_account_setting(account, - 'name') - app.block_signed_in_notifications[account] = True - + app.nicks[account] = app.settings.get_account_setting(account, 'name') app.settings.set_account_setting(account, 'active', True) build_accounts_menu() app.app.update_app_actions_state() @@ -620,7 +564,6 @@ def disable_account(self, account: str) -> None: del app.connections[account] del self.instances[account] del app.nicks[account] - del app.block_signed_in_notifications[account] del app.automatic_rooms[account] del app.to_be_removed[account] del app.newly_added[account] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0ca879b48b5e5888242cd54405cdbe5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0ca879b48b5e5888242cd54405cdbe5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Client: Fix raising PasswordRequired Event
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: eb869c38 by lovetox at 2022-01-23T12:48:37+01:00 Client: Fix raising PasswordRequired Event - - - - - c80c9c38 by lovetox at 2022-01-23T12:50:48+01:00 Interface: Handle http-auth event in MainWindow - - - - - 0ca879b4 by lovetox at 2022-01-23T12:57:04+01:00 HTTPAuth: Simplify code - - - - - 5 changed files: - gajim/common/client.py - gajim/common/events.py - gajim/common/modules/http_auth.py - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/common/client.py ===================================== @@ -293,7 +293,7 @@ def _on_password(password: str) -> None: self._client.set_password(password) self._prepare_for_connect() - app.ged.raise_event(PasswordRequired(conn=self, + app.ged.raise_event(PasswordRequired(client=self, on_password=_on_password)) app.ged.raise_event( ===================================== gajim/common/events.py ===================================== @@ -24,6 +24,7 @@ from dataclasses import field from nbxmpp.protocol import JID +from nbxmpp.structs import HTTPAuthData from nbxmpp.structs import RosterItem from nbxmpp.structs import TuneData from nbxmpp.const import InviteType @@ -274,13 +275,10 @@ class IqErrorReceived(ApplicationEvent): @dataclass -class HttpAuthReceived(ApplicationEvent): - name: str = field(init=False, default='http-auth-received') - conn: 'Client' - iq_id: str - method: str - url: str - msg: str +class HttpAuth(ApplicationEvent): + name: str = field(init=False, default='http-auth') + client: 'Client' + data: HTTPAuthData stanza: Any ===================================== gajim/common/modules/http_auth.py ===================================== @@ -19,7 +19,7 @@ from nbxmpp.namespaces import Namespace from gajim.common import app -from gajim.common.events import HttpAuthReceived +from gajim.common.events import HttpAuth from gajim.common.modules.base import BaseModule @@ -51,12 +51,9 @@ def _http_auth(self, _con, stanza, properties): raise nbxmpp.NodeProcessed app.ged.raise_event( - HttpAuthReceived(conn=self._con, - iq_id=properties.http_auth.id, - method=properties.http_auth.method, - url=properties.http_auth.url, - msg=properties.http_auth.body, - stanza=stanza)) + HttpAuth(client=self._con, + data=properties.http_auth, + stanza=stanza)) raise nbxmpp.NodeProcessed def build_http_auth_answer(self, stanza, answer): ===================================== gajim/gtk/main.py ===================================== @@ -32,6 +32,7 @@ from gajim.common import ged from gajim.common.const import Direction from gajim.common.events import ApplicationEvent +from gajim.common.events import HttpAuth from gajim.common.events import PasswordRequired from gajim.common.events import PlainConnection from gajim.common.events import RosterItemExchangeEvent @@ -134,6 +135,7 @@ def __init__(self) -> None: ('roster-item-exchange', ged.GUI1, self._on_roster_item_exchange), ('plain-connection', ged.GUI1, self._on_plain_connection), ('password-required', ged.GUI1, self._on_password_required), + ('http-auth', ged.GUI1, self._on_http_auth), ]) self._check_for_account() @@ -232,6 +234,37 @@ def _on_plain_connection(event: PlainConnection) -> None: def _on_password_required(event: PasswordRequired) -> None: open_window('PasswordDialog', event=event) + @staticmethod + def _on_http_auth(event: HttpAuth) -> None: + def _response(answer: str) -> None: + event.client.get_module('HTTPAuth').build_http_auth_answer( + event.stanza, answer) + + account = event.client.account + message = _('HTTP (%(method)s) Authorization ' + 'for %(url)s (ID: %(id)s)') % { + 'method': event.data.method, + 'url': event.data.url, + 'id': event.data.id} + sec_msg = _('Do you accept this request?') + if app.get_number_of_connected_accounts() > 1: + sec_msg = _('Do you accept this request (account: %s)?') % account + if event.data.body: + sec_msg = event.data.body + '\n' + sec_msg + message = message + '\n' + sec_msg + + ConfirmationDialog( + _('Authorization Request'), + _('HTTP Authorization Request'), + message, + [DialogButton.make('Cancel', + text=_('_No'), + callback=_response, + args=['no']), + DialogButton.make('Accept', + callback=_response, + args=['yes'])]).show() + def _add_actions(self) -> None: actions = [ ('add-workspace', 's', self._add_workspace), ===================================== gajim/gui_interface.py ===================================== @@ -81,9 +81,7 @@ from gajim.common.modules.contacts import BareContact from gajim.common.modules.httpupload import HTTPFileTransfer -from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ErrorDialog -from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.filechoosers import FileChooserDialog from gajim.gui.filetransfer import FileTransfersWindow from gajim.gui.menus import build_accounts_menu @@ -142,7 +140,6 @@ def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long self.handlers = { 'iq-error-received': [self.handle_event_iq_error], - 'http-auth-received': [self.handle_event_http_auth], 'signed-in': [self.handle_event_signed_in], 'presence-received': [self.handle_event_presence], 'our-show': [self.handle_event_status], @@ -175,38 +172,6 @@ def handle_event_iq_error(event): if ctrl and ctrl.is_groupchat: ctrl.add_info_message(f'Error: {event.properties.error}') - @staticmethod - def handle_event_http_auth(event): - # ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) - def _response(answer: str) -> None: - event.conn.get_module('HTTPAuth').build_http_auth_answer( - event.stanza, answer) - - account = event.conn.name - message = _('HTTP (%(method)s) Authorization ' - 'for %(url)s (ID: %(id)s)') % { - 'method': event.method, - 'url': event.url, - 'id': event.iq_id} - sec_msg = _('Do you accept this request?') - if app.get_number_of_connected_accounts() > 1: - sec_msg = _('Do you accept this request (account: %s)?') % account - if event.msg: - sec_msg = event.msg + '\n' + sec_msg - message = message + '\n' + sec_msg - - ConfirmationDialog( - _('Authorization Request'), - _('HTTP Authorization Request'), - message, - [DialogButton.make('Cancel', - text=_('_No'), - callback=_response, - args=['no']), - DialogButton.make('Accept', - callback=_response, - args=['yes'])]).show() - @staticmethod def handle_event_signed_in(event): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4189cbc9ed1eccd459ae53701f82b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4189cbc9ed1eccd459ae53701f82b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Interface: Handle plain-connection event in MainWindow
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e6152d79 by lovetox at 2022-01-23T12:22:32+01:00 Interface: Handle plain-connection event in MainWindow - - - - - aa2f660e by lovetox at 2022-01-23T12:26:47+01:00 Interface: Handle password-required event in MainWindow - - - - - 64e7e766 by lovetox at 2022-01-23T12:32:18+01:00 Remove dead client-cert-passphrase event handling nbxmpp does not support client certificates anymore - - - - - e4189cbc by lovetox at 2022-01-23T12:32:29+01:00 Update pyrightconfig.json - - - - - 5 changed files: - gajim/common/events.py - gajim/gtk/main.py - gajim/gtk/password_dialog.py - gajim/gui_interface.py - pyrightconfig.json Changes: ===================================== gajim/common/events.py ===================================== @@ -81,7 +81,7 @@ class PlainConnection(ApplicationEvent): @dataclass class PasswordRequired(ApplicationEvent): name: str = field(init=False, default='password-required') - conn: 'Client' + client: 'Client' on_password: Callable[..., Any] ===================================== gajim/gtk/main.py ===================================== @@ -32,6 +32,8 @@ from gajim.common import ged from gajim.common.const import Direction from gajim.common.events import ApplicationEvent +from gajim.common.events import PasswordRequired +from gajim.common.events import PlainConnection from gajim.common.events import RosterItemExchangeEvent from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable @@ -130,6 +132,8 @@ def __init__(self) -> None: ('allow-gajim-update-check', ged.GUI1, self._on_allow_gajim_update), ('gajim-update-available', ged.GUI1, self._on_gajim_update_available), ('roster-item-exchange', ged.GUI1, self._on_roster_item_exchange), + ('plain-connection', ged.GUI1, self._on_plain_connection), + ('password-required', ged.GUI1, self._on_password_required), ]) self._check_for_account() @@ -206,6 +210,28 @@ def _on_roster_item_exchange(event: RosterItemExchangeEvent) -> None: exchange_list=event.exchange_items_list, jid_from=event.jid) + @staticmethod + def _on_plain_connection(event: PlainConnection) -> None: + ConfirmationDialog( + _('Insecure Connection'), + _('Insecure Connection'), + _('You are about to connect to the account %(account)s ' + '(%(server)s) using an insecure connection method. This means ' + 'conversations will not be encrypted. Connecting PLAIN is ' + 'strongly discouraged.') % { + 'account': event.account, + 'server': app.get_hostname_from_account(event.account)}, + [DialogButton.make('Cancel', + text=_('_Abort'), + callback=event.abort), + DialogButton.make('Remove', + text=_('_Connect Anyway'), + callback=event.connect)]).show() + + @staticmethod + def _on_password_required(event: PasswordRequired) -> None: + open_window('PasswordDialog', event=event) + def _add_actions(self) -> None: actions = [ ('add-workspace', 's', self._add_workspace), ===================================== gajim/gtk/password_dialog.py ===================================== @@ -29,7 +29,7 @@ class PasswordDialog(Gtk.ApplicationWindow): - def __init__(self, account: str, event: PasswordRequired) -> None: + def __init__(self, event: PasswordRequired) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) @@ -42,8 +42,8 @@ def __init__(self, account: str, event: PasswordRequired) -> None: self._ui = get_builder('password_dialog.ui') self.add(self._ui.pass_box) - self.account = account - self._client = app.get_client(account) + self.account = event.client.account + self._client = app.get_client(event.client.account) self._event = event self.connect('key-press-event', self._on_key_press) @@ -62,53 +62,28 @@ def _process_event(self) -> None: account_name = app.settings.get_account_setting( self.account, 'name') - if self._event.name == 'password-required': - self._ui.header.set_text(_('Password Required')) - self._ui.message_label.set_text( - _('Please enter your password for\n' - '%(jid)s\n(Account: %(account)s)') % { - 'jid': own_jid, - 'account': account_name}) - self._ui.save_pass_checkbutton.show() - self._ui.save_pass_checkbutton.set_sensitive( - not app.settings.get('use_keyring') or KEYRING_AVAILABLE) - if not KEYRING_AVAILABLE: - self._ui.keyring_hint.show() - - if self._event.name == 'client-cert-passphrase': - self._ui.header.set_text(_('Certificate Password Required')) - self._ui.message_label.set_text( - _('Please enter your certificate password for ' - '%(jid)s (%(account)s)') % { - 'jid': own_jid, - 'account': account_name}) + self._ui.header.set_text(_('Password Required')) + self._ui.message_label.set_text( + _('Please enter your password for\n' + '%(jid)s\n(Account: %(account)s)') % { + 'jid': own_jid, + 'account': account_name}) + self._ui.save_pass_checkbutton.show() + self._ui.save_pass_checkbutton.set_sensitive( + not app.settings.get('use_keyring') or KEYRING_AVAILABLE) + if not KEYRING_AVAILABLE: + self._ui.keyring_hint.show() def _on_ok(self, _button: Gtk.Button) -> None: password = self._ui.pass_entry.get_text() - if self._event.name == 'password-required': - app.settings.set_account_setting( - self.account, - 'savepass', - self._ui.save_pass_checkbutton.get_active()) - save_password(self.account, password) - self._event.on_password(password) - self.destroy() - - if self._event.name == 'client-cert-passphrase': - self._event.conn.on_client_cert_passphrase( - password, - self._event.con, - self._event.port, - self._event.secure_tuple) - self.destroy() + app.settings.set_account_setting( + self.account, + 'savepass', + self._ui.save_pass_checkbutton.get_active()) + save_password(self.account, password) + self._event.on_password(password) + self.destroy() def _on_cancel(self, _button: Gtk.Button) -> None: - if self._event.name == 'client-cert-passphrase': - self._event.conn.on_client_cert_passphrase( - '', - self._event.con, - self._event.port, - self._event.secure_tuple) - self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -68,7 +68,6 @@ from gajim.common.events import FileProgress from gajim.common.events import FileError from gajim.common.events import MucAdded -from gajim.common.events import PasswordRequired from gajim.common.helpers import ask_for_status_message from gajim.common.structs import OutgoingMessage from gajim.common.i18n import _ @@ -91,7 +90,6 @@ from gajim.gui.util import get_app_window from gajim.gui.util import get_app_windows from gajim.gui.util import get_color_for_account -from gajim.gui.util import open_window from gajim.gui.types import ControlT log = logging.getLogger('gajim.interface') @@ -144,10 +142,7 @@ def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long self.handlers = { 'iq-error-received': [self.handle_event_iq_error], - 'plain-connection': [self.handle_event_plain_connection], 'http-auth-received': [self.handle_event_http_auth], - 'password-required': [self.handle_event_password_required], - 'client-cert-passphrase': [self.handle_event_client_cert_passphrase], 'signed-in': [self.handle_event_signed_in], 'presence-received': [self.handle_event_presence], 'our-show': [self.handle_event_status], @@ -180,24 +175,6 @@ def handle_event_iq_error(event): if ctrl and ctrl.is_groupchat: ctrl.add_info_message(f'Error: {event.properties.error}') - @staticmethod - def handle_event_plain_connection(event): - ConfirmationDialog( - _('Insecure Connection'), - _('Insecure Connection'), - _('You are about to connect to the account %(account)s ' - '(%(server)s) using an insecure connection method. This means ' - 'conversations will not be encrypted. Connecting PLAIN is ' - 'strongly discouraged.') % { - 'account': event.account, - 'server': app.get_hostname_from_account(event.account)}, - [DialogButton.make('Cancel', - text=_('_Abort'), - callback=event.abort), - DialogButton.make('Remove', - text=_('_Connect Anyway'), - callback=event.connect)]).show() - @staticmethod def handle_event_http_auth(event): # ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) @@ -230,14 +207,6 @@ def _response(answer: str) -> None: callback=_response, args=['yes'])]).show() - @staticmethod - def handle_event_client_cert_passphrase(event): - open_window('PasswordDialog', account=event.conn.name, event=event) - - @staticmethod - def handle_event_password_required(event: PasswordRequired) -> None: - open_window('PasswordDialog', account=event.conn.name, event=event) - @staticmethod def handle_event_signed_in(event): """ ===================================== pyrightconfig.json ===================================== @@ -63,6 +63,7 @@ "gajim/gtk/main_stack.py", "gajim/gtk/manage_sounds.py", "gajim/gtk/notification.py", + "gajim/gtk/password_dialog.py", "gajim/gtk/preview_audio.py", "gajim/gtk/proxies.py", "gajim/gtk/remove_account.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cd5c2899651383d864c2bbe463ced4a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cd5c2899651383d864c2bbe463ced4a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Interface: Handle roster-item-exchange event in MainWindow
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 75b5ec5e by lovetox at 2022-01-23T12:10:34+01:00 Interface: Handle roster-item-exchange event in MainWindow - - - - - cd5c2899 by lovetox at 2022-01-23T12:11:19+01:00 Remove unused import - - - - - 5 changed files: - gajim/common/events.py - gajim/common/modules/roster_item_exchange.py - gajim/gtk/application.py - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/common/events.py ===================================== @@ -402,9 +402,9 @@ class MessageError(ApplicationEvent): @dataclass class RosterItemExchangeEvent(ApplicationEvent): - name: str = field(init=False, default='roster-item-exchange-received') - conn: 'Client' - fjid: str + name: str = field(init=False, default='roster-item-exchange') + client: 'Client' + jid: JID exchange_items_list: list[str] action: str ===================================== gajim/common/modules/roster_item_exchange.py ===================================== @@ -39,7 +39,7 @@ def __init__(self, con): ns=Namespace.ROSTERX), ] - def received_item(self, _con, stanza, _properties): + def received_item(self, _con, stanza, properties): # stanza can be a message or a iq self._log.info('Received roster items from %s', stanza.getFrom()) @@ -87,8 +87,8 @@ def received_item(self, _con, stanza, _properties): self._log.info('Items: %s', exchange_items_list) app.ged.raise_event(RosterItemExchangeEvent( - conn=self._con, - fjid=str(stanza.getFrom()), + client=self._con, + jid=properties.jid, exchange_items_list=exchange_items_list, action=action)) ===================================== gajim/gtk/application.py ===================================== @@ -62,7 +62,6 @@ from gajim.common.application import CoreApplication from gajim.common.const import GAJIM_FAQ_URI from gajim.common.const import GAJIM_WIKI_URI -from gajim.common.dbus import logind from gajim.common.dbus import music_track from gajim.common.events import ApplicationEvent from gajim.common.exceptions import GajimGeneralException ===================================== gajim/gtk/main.py ===================================== @@ -32,6 +32,7 @@ from gajim.common import ged from gajim.common.const import Direction from gajim.common.events import ApplicationEvent +from gajim.common.events import RosterItemExchangeEvent from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable from gajim.common.events import AccountEnabled @@ -128,6 +129,7 @@ def __init__(self) -> None: ('account-disabled', ged.GUI1, self._on_account_disabled), ('allow-gajim-update-check', ged.GUI1, self._on_allow_gajim_update), ('gajim-update-available', ged.GUI1, self._on_gajim_update_available), + ('roster-item-exchange', ged.GUI1, self._on_roster_item_exchange), ]) self._check_for_account() @@ -196,6 +198,14 @@ def _on_allow_gajim_update(self, event: AllowGajimUpdateCheck) -> None: def _on_gajim_update_available(self, event: GajimUpdateAvailable) -> None: self.add_app_message(event.name, event.version) + @staticmethod + def _on_roster_item_exchange(event: RosterItemExchangeEvent) -> None: + open_window('RosterItemExchange', + account=event.client.account, + action=event.action, + exchange_list=event.exchange_items_list, + jid_from=event.jid) + def _add_actions(self) -> None: actions = [ ('add-workspace', 's', self._add_workspace), ===================================== gajim/gui_interface.py ===================================== @@ -154,7 +154,6 @@ def _create_core_handlers_list(self) -> None: 'message-sent': [self.handle_event_msgsent], 'message-not-sent': [self.handle_event_msgnotsent], 'read-state-sync': [self.handle_event_read_state_sync], - 'roster-item-exchange-received': [self.handle_event_roster_item_exchange], } # pylint: enable=line-too-long @@ -356,15 +355,6 @@ def handle_event_read_state_sync(event): app.window.mark_as_read(event.account, jid, send_marker=False) - @staticmethod - def handle_event_roster_item_exchange(event): - # data = (action in [add, delete, modify], exchange_list, jid_from) - open_window('RosterItemExchange', - account=event.conn.name, - action=event.action, - exchange_list=event.exchange_items_list, - jid_from=event.fjid) - # Jingle File Transfer @staticmethod def handle_event_file_error(title: str, message: str) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/20d651f8c2cf2bd235d8145f07394d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/20d651f8c2cf2bd235d8145f07394d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Interface: Move more code into Application
by Philipp Hörist (＠lovetox) 23 Jan '22

23 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: da4e245a by lovetox at 2022-01-23T09:24:32+01:00 Interface: Move more code into Application - - - - - 20d651f8 by lovetox at 2022-01-23T11:58:20+01:00 Update README.md - - - - - 5 changed files: - README.md - gajim/common/application.py - gajim/common/dbus/logind.py - gajim/gtk/application.py - gajim/gui_interface.py Changes: ===================================== README.md ===================================== @@ -34,6 +34,10 @@ ### Compile-time Requirements - python3-setuptools - gettext +### Running Tests + +`python -m unittest discover -s test` + ### Installation Procedure #### Packages ===================================== gajim/common/application.py ===================================== @@ -74,6 +74,9 @@ def _init_core(self) -> None: if sys.platform in ('win32', 'darwin'): GLib.timeout_add_seconds(20, self._check_for_updates) + for account in app.settings.get_active_accounts(): + app.connections[account] = Client(account) + @property def _log(self) -> logging.Logger: return app.log('gajim.application') ===================================== gajim/common/dbus/logind.py ===================================== @@ -145,5 +145,10 @@ def _on_vanish_logind(self, _connection, name, *_user_data): def enable(): + # Module should be rewritten + # Its not useful to know when the computer goes to sleep. + # Because of stream management we don’t need to do anything in that case. + # It would be useful to know when the computer powers off, in this case + # Gajim is shutdown and we should correctly disconnect. return # LogindListener.get() ===================================== gajim/gtk/application.py ===================================== @@ -62,6 +62,8 @@ from gajim.common.application import CoreApplication from gajim.common.const import GAJIM_FAQ_URI from gajim.common.const import GAJIM_WIKI_URI +from gajim.common.dbus import logind +from gajim.common.dbus import music_track from gajim.common.events import ApplicationEvent from gajim.common.exceptions import GajimGeneralException from gajim.common.helpers import load_json @@ -235,6 +237,9 @@ def _startup(self, _application: GajimApplication) -> None: from gajim.gui.status_icon import StatusIcon self.systray = StatusIcon() + if sys.platform not in ('win32', 'darwin'): + music_track.enable() + self.add_actions() self._load_shortcuts() menus.build_accounts_menu() ===================================== gajim/gui_interface.py ===================================== @@ -61,8 +61,6 @@ from gajim.common import helpers from gajim.common import passwords -from gajim.common.dbus import logind -from gajim.common.dbus import music_track from gajim.common.events import AccountEnabled from gajim.common.events import AccountDisabled from gajim.common.events import FileCompleted @@ -125,12 +123,9 @@ def __init__(self): self._create_core_handlers_list() self._register_core_handlers() - for account in app.settings.get_accounts(): - if app.settings.get_account_setting(account, 'active'): - client = Client(account) - app.connections[account] = client - app.ged.register_event_handler( - 'muc-added', ged.CORE, self._on_muc_added) + app.ged.register_event_handler('muc-added', + ged.CORE, + self._on_muc_added) self.instances = {} @@ -145,10 +140,6 @@ def __init__(self): app.nicks[acc] = app.settings.get_account_setting(acc, 'name') app.block_signed_in_notifications[acc] = True - if sys.platform not in ('win32', 'darwin'): - logind.enable() - music_track.enable() - def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long self.handlers = { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5ff99a655c405606ddba6a6ef7c4e38… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5ff99a655c405606ddba6a6ef7c4e38… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor UserTune/UserLocation
by Philipp Hörist (＠lovetox) 22 Jan '22

22 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5ff99a65 by lovetox at 2022-01-23T00:42:05+01:00 Refactor UserTune/UserLocation - Add info back to tooltips - Remove info from ChatControls - Issue events via contacts - - - - - 13 changed files: - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/base.py - gajim/common/modules/contacts.py - gajim/common/modules/user_location.py - gajim/common/modules/user_tune.py - gajim/common/types.py - gajim/data/gui/chat_control.ui - gajim/gtk/builder.pyi - gajim/gtk/controls/chat.py - gajim/gtk/tooltips.py - gajim/gtk/util.py Changes: ===================================== gajim/common/client.py ===================================== @@ -81,7 +81,6 @@ def __init__(self, account: str) -> None: self._connect_machine_calls = 0 self.addressing_supported = False - self.pep = {} self.roster_supported = True self._state = ClientState.DISCONNECTED ===================================== gajim/common/const.py ===================================== @@ -14,7 +14,8 @@ from __future__ import annotations -from typing import Any, Union +from typing import Any +from typing import Union from typing import NamedTuple from enum import IntEnum @@ -178,19 +179,6 @@ class IdleState(Enum): AWAKE = 'online' -@unique -class PEPEventType(IntEnum): - ABSTRACT = 0 - ACTIVITY = 1 - TUNE = 2 - MOOD = 3 - LOCATION = 4 - NICKNAME = 5 - AVATAR = 6 - ATOM = 7 - BOOKMARKS = 8 - - class SyncThreshold(IntEnum): NO_SYNC = -1 NO_THRESHOLD = 0 ===================================== gajim/common/events.py ===================================== @@ -24,7 +24,6 @@ from dataclasses import field from nbxmpp.protocol import JID -from nbxmpp.structs import LocationData from nbxmpp.structs import RosterItem from nbxmpp.structs import TuneData from nbxmpp.const import InviteType @@ -435,24 +434,6 @@ class PluginRemoved(ApplicationEvent): plugin: Any -@dataclass -class TuneReceived(ApplicationEvent): - name: str = field(init=False, default='tune-received') - account: str - jid: str - tune: TuneData - is_self_message: bool - - -@dataclass -class LocationReceived(ApplicationEvent): - name: str = field(init=False, default='location-received') - account: str - jid: str - location: LocationData - is_self_message: bool - - @dataclass class SearchFormReceivedEvent(ApplicationEvent): name: str = field(init=False, default='search-form-received') ===================================== gajim/common/modules/base.py ===================================== @@ -22,6 +22,7 @@ from unittest.mock import Mock from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID from nbxmpp.structs import StanzaHandler from gajim.common import types @@ -39,7 +40,7 @@ def __init__(self, con: types.Client, *args: Any, plugin: bool = False, - **kwargs: Any): + **kwargs: Any) -> None: EventHelper.__init__(self) self._con = con @@ -89,7 +90,7 @@ def _nbxmpp(self, module_name: Optional[str] = None): return self._con.connection return self._con.connection.get_module(module_name) - def _register_callback(self, method, callback): + def _register_callback(self, method, callback) -> None: self._nbxmpp_callbacks[method] = callback def _register_pubsub_handler(self, callback: types.AnyCallableT): @@ -105,7 +106,9 @@ def send_stored_publish(self) -> None: self._log.info('Send stored publish') self._stored_publish() # pylint: disable=not-callable - def _get_contact(self, jid, groupchat: bool = False): + def _get_contact(self, + jid: JID, + groupchat: bool = False) -> types.ContactT: return self._con.get_module('Contacts').get_contact( jid, groupchat=groupchat) ===================================== gajim/common/modules/contacts.py ===================================== @@ -28,6 +28,8 @@ from nbxmpp.const import Role from nbxmpp.protocol import JID from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import LocationData +from nbxmpp.structs import TuneData from nbxmpp.structs import MucSubject from gajim.common import app @@ -119,10 +121,7 @@ def add_contact(self, def get_contact(self, jid: Union[str, JID], - groupchat: bool = False) -> Union[BareContact, - ResourceContact, - GroupchatContact, - GroupchatParticipant]: + groupchat: bool = False) -> types.ContactT: if isinstance(jid, str): jid = JID.from_string(jid) @@ -301,6 +300,12 @@ def name(self) -> str: return self._jid.domain return self._jid.localpart + def get_tune(self) -> Optional[TuneData]: + return self._module('UserTune').get_contact_tune(self._jid) + + def get_location(self) -> Optional[LocationData]: + return self._module('UserLocation').get_contact_location(self._jid) + @property def avatar_sha(self) -> Optional[str]: return app.storage.cache.get_contact(self._jid, 'avatar') ===================================== gajim/common/modules/user_location.py ===================================== @@ -14,10 +14,14 @@ # XEP-0080: User Location +from __future__ import annotations + +from typing import Optional + from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID +from nbxmpp.structs import LocationData -from gajim.common import app -from gajim.common.events import LocationReceived from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node from gajim.common.modules.util import store_publish @@ -30,16 +34,19 @@ class UserLocation(BaseModule): 'set_location', ] - def __init__(self, con): + def __init__(self, con) -> None: BaseModule.__init__(self, con) self._register_pubsub_handler(self._location_received) - self._current_location = None - self._locations = {} + self._current_location: Optional[LocationData] = None + self._contact_locations: dict[JID, LocationData] = {} - def get_current_location(self): + def get_current_location(self) -> Optional[LocationData]: return self._current_location + def get_contact_location(self, jid: JID) -> Optional[LocationData]: + return self._contact_locations.get(jid) + @event_node(Namespace.LOCATION) def _location_received(self, _con, _stanza, properties): if properties.pubsub_event.retracted: @@ -48,15 +55,11 @@ def _location_received(self, _con, _stanza, properties): data = properties.pubsub_event.data if properties.is_self_message: self._current_location = data - else: - self._locations[properties.jid] = data - - app.ged.raise_event( - LocationReceived( - account=self._account, - jid=properties.jid.bare, - location=data, - is_self_message=properties.is_self_message)) + + self._contact_locations[properties.jid] = data + + contact = self._get_contact(properties.jid) + contact.notify('location-update', data) @store_publish def set_location(self, location): ===================================== gajim/common/modules/user_tune.py ===================================== @@ -14,11 +14,16 @@ # XEP-0118: User Tune +from __future__ import annotations + +from typing import Optional + from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID +from nbxmpp.structs import TuneData from gajim.common import app from gajim.common import ged -from gajim.common.events import TuneReceived from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node from gajim.common.modules.util import store_publish @@ -36,16 +41,19 @@ class UserTune(BaseModule): def __init__(self, con): BaseModule.__init__(self, con) self._register_pubsub_handler(self._tune_received) - self._tune_data = None - self._tunes = {} + self._current_tune: Optional[TuneData] = None + self._contact_tunes: dict[JID, TuneData] = {} self.register_events([ ('music-track-changed', ged.CORE, self._on_music_track_changed), ('signed-in', ged.CORE, self._on_signed_in), ]) - def get_current_tune(self): - return self._tune_data + def get_current_tune(self) -> Optional[TuneData]: + return self._current_tune + + def get_contact_tune(self, jid: JID) -> Optional[TuneData]: + return self._contact_tunes.get(jid) @event_node(Namespace.TUNE) def _tune_received(self, _con, _stanza, properties): @@ -54,15 +62,12 @@ def _tune_received(self, _con, _stanza, properties): data = properties.pubsub_event.data if properties.is_self_message: - self._tune_data = data - else: - self._tunes[properties.jid] = data + self._current_tune = data + + self._contact_tunes[properties.jid] = data - app.ged.raise_event(TuneReceived( - account=self._account, - jid=properties.jid.bare, - tune=data, - is_self_message=properties.is_self_message)) + contact = self._get_contact(properties.jid) + contact.notify('tune-update', data) @store_publish def set_tune(self, tune): @@ -72,10 +77,10 @@ def set_tune(self, tune): if not app.settings.get_account_setting(self._account, 'publish_tune'): return - if tune == self._tune_data: + if tune == self._current_tune: return - self._tune_data = tune + self._current_tune = tune self._log.info('Send %s', tune) self._nbxmpp('Tune').set_tune(tune) @@ -101,7 +106,7 @@ def _on_signed_in(self, _event): self._publish_current_tune() def _on_music_track_changed(self, event): - if self._tune_data == event.info: + if self._current_tune == event.info: return self.set_tune(event.info) ===================================== gajim/common/types.py ===================================== @@ -45,6 +45,11 @@ from gajim.common.settings import Settings from gajim.gtk.css_config import CSSConfig + ContactT = Union[BareContact, + ResourceContact, + GroupchatContact, + GroupchatParticipant] + InterfaceT = Union['Interface'] ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -224,47 +224,7 @@ </packing> </child> <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">4</property> - <child> - <object class="GtkImage" id="tune_image"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEventBox" id="location_eventbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="visible-window">False</property> - <child> - <object class="GtkImage" id="location_image"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> </object> </child> ===================================== gajim/gtk/builder.pyi ===================================== @@ -210,10 +210,6 @@ class ChatControlBuilder(Builder): banner_label: Gtk.Label phone_image: Gtk.Image account_badge_box: Gtk.Box - hbox2: Gtk.Box - tune_image: Gtk.Image - location_eventbox: Gtk.EventBox - location_image: Gtk.Image conv_view_overlay: Gtk.Overlay hbox: Gtk.Box emoticons_button: Gtk.MenuButton ===================================== gajim/gtk/controls/chat.py ===================================== @@ -52,7 +52,6 @@ from gajim.common.const import AvatarSize from gajim.common.const import SimpleClientState from gajim.common.const import KindConstant -from gajim.common.const import PEPEventType from gajim.common.jingle_session import JingleSession from gajim.common.modules.contacts import BareContact @@ -63,7 +62,6 @@ from gajim.gui.const import ControlType from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog -from gajim.gui.util import get_cursor from gajim.gui.util import open_window from gajim.command_system.implementation.hosts import ChatCommands @@ -125,21 +123,8 @@ def __init__(self, account: str, jid: JID) -> None: self.xml.settings_menu.set_menu_model(self.control_menu) self.update_toolbar() - self.update_all_pep_types() self._update_avatar() - # Hook up signals - widget = self.xml.location_eventbox - id_ = widget.connect('button-release-event', - self.on_location_eventbox_button_release_event) - self.handlers[id_] = widget - id_ = widget.connect('enter-notify-event', - self.on_location_eventbox_enter_notify_event) - self.handlers[id_] = widget - id_ = widget.connect('leave-notify-event', - self.on_location_eventbox_leave_notify_event) - self.handlers[id_] = widget - self.setup_seclabel() self.add_actions() self.update_ui() @@ -333,43 +318,6 @@ def _on_send_marker(self, action.set_state(param) self.contact.settings.set('send_marker', param.get_boolean()) - def update_all_pep_types(self) -> None: - self._update_pep(PEPEventType.LOCATION) - self._update_pep(PEPEventType.TUNE) - - def _update_pep(self, type_: PEPEventType) -> None: - return - # TODO - # image = self._get_pep_widget(type_) - # data = self.contact.pep.get(type_) - # if data is None: - # image.hide() - # return - - # if type_ == PEPEventType.TUNE: - # icon = 'audio-x-generic' - # formated_text = format_tune(*data) - # elif type_ == PEPEventType.LOCATION: - # icon = 'applications-internet' - # formated_text = format_location(data) - - # image.set_from_icon_name(icon, Gtk.IconSize.MENU) - # image.set_tooltip_markup(formated_text) - # image.show() - - def _get_pep_widget(self, type_: PEPEventType) -> Optional[Gtk.Image]: - if type_ == PEPEventType.TUNE: - return self.xml.tune_image - if type_ == PEPEventType.LOCATION: - return self.xml.location_image - return None - - def _on_tune_received(self, _event: events.TuneReceived) -> None: - self._update_pep(PEPEventType.TUNE) - - def _on_location_received(self, _event: events.LocationReceived) -> None: - self._update_pep(PEPEventType.LOCATION) - def _on_nickname_received(self, _event): self.update_ui() @@ -529,27 +477,6 @@ def _add_incoming_call(self, ) -> None: self.add_call_message(event) - def on_location_eventbox_button_release_event(self, _widget, _event): - return - # TODO - # if 'geoloc' in self.contact.pep: - # location = self.contact.pep['geoloc'].data - # if 'lat' in location and 'lon' in location: - # uri = geo_provider_from_location(location['lat'], - # location['lon']) - # open_uri(uri) - - def on_location_eventbox_leave_notify_event(self, _widget, _event): - """ - Just moved the mouse so show the cursor - """ - cursor = get_cursor('default') - app.window.get_window().set_cursor(cursor) - - def on_location_eventbox_enter_notify_event(self, _widget, _event): - cursor = get_cursor('pointer') - app.window.get_window().set_cursor(cursor) - def update_ui(self) -> None: BaseControl.update_ui(self) self.update_toolbar() ===================================== gajim/gtk/tooltips.py ===================================== @@ -41,7 +41,6 @@ from gajim.common import types from gajim.common import helpers from gajim.common.const import AvatarSize -from gajim.common.const import PEPEventType from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.file_props import FileProp @@ -174,9 +173,7 @@ def _populate_grid(self, contact: types.BareContact) -> None: self._ui.sub.show() self._ui.sub_label.show() - # PEP info - # TODO - # self._append_pep_info(contact) + self._append_pep_info(contact) app.plugin_manager.gui_extension_point( 'roster_tooltip_populate', self, contact) @@ -251,15 +248,17 @@ def _add_resources(self, contact: types.BareContact) -> None: self._ui.resources_box.show_all() def _append_pep_info(self, contact: types.BareContact) -> None: - if PEPEventType.TUNE in contact.pep: - tune = format_tune(*contact.pep[PEPEventType.TUNE]) - self._ui.tune.set_markup(tune) + tune = contact.get_tune() + if tune is not None: + tune_str = format_tune(tune) + self._ui.tune.set_markup(tune_str) self._ui.tune.show() self._ui.tune_label.show() - if PEPEventType.LOCATION in contact.pep: - location = format_location(contact.pep[PEPEventType.LOCATION]) - self._ui.location.set_markup(location) + location = contact.get_location() + if location is not None: + location_str = format_location(location) + self._ui.location.set_markup(location_str) self._ui.location.show() self._ui.location_label.show() ===================================== gajim/gtk/util.py ===================================== @@ -46,6 +46,7 @@ import nbxmpp from nbxmpp import JID from nbxmpp.structs import LocationData +from nbxmpp.structs import TuneData from gajim.common import app from gajim.common import configpaths @@ -493,11 +494,10 @@ def func_wrapper(self, *args, **kwargs): return func_wrapper -def format_tune(artist: str, _length: str, _rating: str, source: str, - title: str, _track: str, _uri: str) -> str: - artist = GLib.markup_escape_text(artist or _('Unknown Artist')) - title = GLib.markup_escape_text(title or _('Unknown Title')) - source = GLib.markup_escape_text(source or _('Unknown Source')) +def format_tune(data: TuneData) -> str: + artist = GLib.markup_escape_text(data.artist or _('Unknown Artist')) + title = GLib.markup_escape_text(data.title or _('Unknown Title')) + source = GLib.markup_escape_text(data.source or _('Unknown Source')) tune_string = _('<b>"%(title)s"</b> by <i>%(artist)s</i>\n' 'from <i>%(source)s</i>') % {'title': title, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ff99a655c405606ddba6a6ef7c4e387… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ff99a655c405606ddba6a6ef7c4e387… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Scripts: Sort paths before generating ui types
by Philipp Hörist (＠lovetox) 22 Jan '22

22 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2619eded by lovetox at 2022-01-22T21:00:07+01:00 Scripts: Sort paths before generating ui types - - - - - 65098517 by lovetox at 2022-01-22T21:00:35+01:00 Update builder.pyi - - - - - 2 changed files: - gajim/gtk/builder.pyi - scripts/dev/generate_ui_types.py Changes: ===================================== gajim/gtk/builder.pyi ===================================== @@ -9,6 +9,132 @@ from gi.repository import GtkSource class Builder(Gtk.Builder): ... +class AccountPageBuilder(Builder): + paned: Gtk.Paned + roster_box: Gtk.Box + roster_menu_button: Gtk.MenuButton + roster_search_entry: Gtk.SearchEntry + account_box: Gtk.Box + avatar_image: Gtk.Image + account_label: Gtk.Label + account_action_box: Gtk.Box + account_settings: Gtk.Button + status_message_box: Gtk.Box + + +class AccountWizardBuilder(Builder): + account_label_box: Gtk.Box + account_name_entry: Gtk.Entry + account_color_button: Gtk.ColorButton + badge_preview: Gtk.Label + advanced_grid: Gtk.Grid + custom_port_entry: Gtk.Entry + custom_host_entry: Gtk.Entry + proxies_combobox: Gtk.ComboBox + manage_proxies_button: Gtk.Button + con_type_combo: Gtk.ComboBoxText + entrycompletion1: Gtk.EntryCompletion + login_box: Gtk.Box + log_in_address_entry: Gtk.Entry + log_in_password_entry: Gtk.Entry + login_advanced_checkbutton: Gtk.CheckButton + log_in_button: Gtk.Button + sign_up_button: Gtk.Button + entrycompletion2: Gtk.EntryCompletion + redirect_box: Gtk.Box + instructions: Gtk.Label + link_button: Gtk.Button + security_warning_box: Gtk.Box + error_list: Gtk.ListBox + view_cert_button: Gtk.Button + trust_cert_checkbutton: Gtk.CheckButton + server_recommendations: Gtk.Popover + visit_server_button: Gtk.Button + recommendation_link1: Gtk.Label + recommendation_link2: Gtk.Label + signup_grid: Gtk.Grid + server_comboboxtext_sign_up: Gtk.ComboBoxText + server_comboboxtext_sign_up_entry: Gtk.Entry + sign_up_anonymously: Gtk.CheckButton + sign_up_advanced_checkbutton: Gtk.CheckButton + + +class AddContactBuilder(Builder): + account_liststore: Gtk.ListStore + address_box: Gtk.Box + account_box: Gtk.Box + account_combo: Gtk.ComboBox + cellrenderertext3: Gtk.CellRendererText + address_entry: Gtk.Entry + contact_grid: Gtk.Grid + status_switch: Gtk.Switch + group_combo: Gtk.ComboBoxText + message_entry: Gtk.Entry + contact_info_button: Gtk.Button + gateway_box: Gtk.Box + gateway_image: Gtk.Image + gateway_label: Gtk.Label + register_button: Gtk.Button + commands_button: Gtk.Button + + +class AdhocMucBuilder(Builder): + guests_store: Gtk.ListStore + server_store: Gtk.ListStore + adhoc_box: Gtk.Box + description_label: Gtk.Label + guests_treeview: Gtk.TreeView + server_combobox: Gtk.ComboBox + server_entry: Gtk.Entry + invite_button: Gtk.Button + + +class AdvancedConfigurationBuilder(Builder): + box: Gtk.Box + search_entry: Gtk.SearchEntry + advanced_treeview: Gtk.TreeView + description: Gtk.Label + reset_button: Gtk.Button + + +class AppPageBuilder(Builder): + gajim_update: Gtk.Box + update_message: Gtk.Label + gajim_update_check: Gtk.Box + + +class ApplicationMenuBuilder(Builder): + pass + + +class AssistantBuilder(Builder): + main_grid: Gtk.Grid + content_area: Gtk.Box + stack: Gtk.Stack + action_area: Gtk.Box + + +class BlockingListBuilder(Builder): + blocking_store: Gtk.ListStore + blocking_grid: Gtk.Grid + overlay: Gtk.Overlay + block_view: Gtk.TreeView + add_button: Gtk.ToolButton + remove_button: Gtk.ToolButton + save_button: Gtk.Button + + +class BookmarksBuilder(Builder): + bookmarks_store: Gtk.ListStore + bookmarks_grid: Gtk.Grid + bookmarks_view: Gtk.TreeView + jid: Gtk.CellRendererText + name: Gtk.CellRendererText + nick: Gtk.CellRendererText + password: Gtk.CellRendererText + autojoin: Gtk.CellRendererToggle + + class CallWidgetBuilder(Builder): adjustment1: Gtk.Adjustment adjustment2: Gtk.Adjustment @@ -49,22 +175,56 @@ class CallWidgetBuilder(Builder): av_cam_image: Gtk.Image -class ServiceDiscoveryWindowBuilder(Builder): - liststore1: Gtk.ListStore - service_discovery_window: Gtk.Window - service_discovery: Gtk.Box - banner_agent_icon: Gtk.Image - banner_agent_header: Gtk.Label - banner_agent_subheader: Gtk.Label - address_box: Gtk.Box - address_comboboxtext: Gtk.ComboBoxText - address_comboboxtext_entry: Gtk.Entry - browse_button: Gtk.Button - services_progressbar: Gtk.ProgressBar - services_scrollwin: Gtk.ScrolledWindow - services_treeview: Gtk.TreeView - treeview_selection1: Gtk.TreeSelection - action_buttonbox: Gtk.Box +class CertificateDialogBuilder(Builder): + certificate_box: Gtk.Box + label_cert_for_account: Gtk.Label + data_it_common_name: Gtk.Label + data_it_organization: Gtk.Label + data_it_organizational_unit: Gtk.Label + data_it_serial_number: Gtk.Label + data_ib_common_name: Gtk.Label + data_ib_organization: Gtk.Label + data_ib_organizational_unit: Gtk.Label + data_issued_on: Gtk.Label + data_expires_on: Gtk.Label + data_sha1: Gtk.Label + data_sha256: Gtk.Label + copy_cert_info_button: Gtk.Button + image1: Gtk.Image + + +class ChatControlBuilder(Builder): + drop_area: Gtk.Box + formattings_menu: Gtk.Menu + bold: Gtk.MenuItem + italic: Gtk.MenuItem + strike: Gtk.MenuItem + chat_control_hbox: Gtk.Box + overlay: Gtk.Overlay + paned1: Gtk.Paned + textview_box: Gtk.Box + banner_eventbox: Gtk.EventBox + avatar_eventbox: Gtk.EventBox + avatar_image: Gtk.Image + banner_name_label: Gtk.Label + banner_label: Gtk.Label + phone_image: Gtk.Image + account_badge_box: Gtk.Box + hbox2: Gtk.Box + tune_image: Gtk.Image + location_eventbox: Gtk.EventBox + location_image: Gtk.Image + conv_view_overlay: Gtk.Overlay + hbox: Gtk.Box + emoticons_button: Gtk.MenuButton + formattings_button: Gtk.MenuButton + label_selector: Gtk.ComboBox + settings_menu: Gtk.MenuButton + authentication_button: Gtk.Button + lock_image: Gtk.Image + encryption_menu: Gtk.MenuButton + sendfile_button: Gtk.Button + send_message_button: Gtk.Button class ChatListRowBuilder(Builder): @@ -84,51 +244,67 @@ class ChatListRowBuilder(Builder): close_button: Gtk.Button -class WorkspaceDialogBuilder(Builder): - box: Gtk.Box - preview: Gtk.Image - entry: Gtk.Entry - remove_workspace_button: Gtk.Button - image_switch: Gtk.Switch - style_stack: Gtk.Stack - color_chooser: Gtk.ColorButton - image_box: Gtk.Box - save_button: Gtk.Button +class ChatPanedBuilder(Builder): + paned: Gtk.Paned + middle_grid: Gtk.Grid + header_bar: Gtk.Grid + workspace_label: Gtk.Label + filter_bar_toggle: Gtk.ToggleButton + search_entry: Gtk.SearchEntry + start_chat_button: Gtk.Button + filter_bar_revealer: Gtk.Revealer + filter_bar: Gtk.Box + chat_list_scrolled: Gtk.ScrolledWindow + right_grid: Gtk.Grid + right_grid_overlay: Gtk.Overlay -class ProfileBuilder(Builder): - privacy_popover: Gtk.Popover - avatar_nick_access: Gtk.Switch - vcard_access: Gtk.Switch - avatar_nick_access_label: Gtk.Label - vcard_access_label: Gtk.Label - profile_stack: Gtk.Stack - spinner: Gtk.Spinner - scrolled: Gtk.ScrolledWindow - profile_box: Gtk.Box - avatar_overlay: Gtk.Overlay +class ContactInfoBuilder(Builder): + devices_grid: Gtk.Grid + priority_label: Gtk.Label + software_label: Gtk.Label + system_label: Gtk.Label + time_label: Gtk.Label + status_value: Gtk.Label + priority_value: Gtk.Label + software_value: Gtk.Label + system_value: Gtk.Label + time_value: Gtk.Label + resource_box: Gtk.Box + resource_label: Gtk.Label + groups_model: Gtk.ListStore + main_grid: Gtk.Grid + header_revealer: Gtk.Revealer + header_image: Gtk.Image + name_entry: Gtk.Entry + edit_name_button: Gtk.ToggleButton + main_stack: Gtk.Stack + vcard_scrolled: Gtk.ScrolledWindow + vcard_box: Gtk.Box avatar_image: Gtk.Image - remove_avatar_button: Gtk.Button - edit_avatar_button: Gtk.Button - nickname_entry: Gtk.Entry - cancel_button: Gtk.Button - add_entry_button: Gtk.MenuButton - privacy_button: Gtk.MenuButton - save_button: Gtk.Button - edit_button: Gtk.Button - avatar_selector_box: Gtk.Box - avatar_update_button: Gtk.Button - - -class BookmarksBuilder(Builder): - bookmarks_store: Gtk.ListStore - bookmarks_grid: Gtk.Grid - bookmarks_view: Gtk.TreeView - jid: Gtk.CellRendererText - name: Gtk.CellRendererText - nick: Gtk.CellRendererText - password: Gtk.CellRendererText - autojoin: Gtk.CellRendererToggle + contact_name_label: Gtk.Label + contact_jid_label: Gtk.Label + group_chat_grid: Gtk.Grid + role_label: Gtk.Label + affiliation_label: Gtk.Label + settings_box: Gtk.Box + subscription_listbox: Gtk.ListBox + from_subscription_switch: Gtk.Switch + to_subscription_stack: Gtk.Stack + request_stack: Gtk.Stack + to_subscription_button: Gtk.Button + groups_page_box: Gtk.Box + groups_treeview: Gtk.TreeView + tree_selection: Gtk.TreeSelection + toggle_renderer: Gtk.CellRendererToggle + text_renderer: Gtk.CellRendererText + group_add_button: Gtk.ToolButton + group_remove_button: Gtk.ToolButton + notes_page_box: Gtk.Box + scrolledwindow_annotation: Gtk.ScrolledWindow + textview_annotation: Gtk.TextView + devices_stack: Gtk.Stack + devices_box: Gtk.Box class EmojiChooserBuilder(Builder): @@ -138,36 +314,20 @@ class EmojiChooserBuilder(Builder): section_box: Gtk.Box -class ManagePepServicesWindowBuilder(Builder): - manage_pep_services: Gtk.Box - services_treeview: Gtk.TreeView - treeview_selection1: Gtk.TreeSelection - configure_button: Gtk.Button - image1: Gtk.Image - delete_button: Gtk.Button - - -class ThemesWindowBuilder(Builder): - option_popover: Gtk.Popover - choose_option_listbox: Gtk.ListBox - placeholder: Gtk.Box - theme_store: Gtk.ListStore - theme_grid: Gtk.Grid - theme_treeview: Gtk.TreeView - option_listbox: Gtk.ListBox - add_option_button: Gtk.MenuButton - add_theme_button: Gtk.ToolButton - remove_theme_button: Gtk.ToolButton +class ExceptionDialogBuilder(Builder): + exception_dialog: Gtk.ApplicationWindow + close_btn: Gtk.Button + report_btn: Gtk.Button + exception_view: Gtk.TextView -class FileTransferSendBuilder(Builder): - send_stack: Gtk.Stack - listbox: Gtk.ListBox - description: Gtk.TextView - files_send: Gtk.Button - resource_box: Gtk.Box - resource_send: Gtk.Button - resource_instructions: Gtk.Label +class FileTransferBuilder(Builder): + transfer_box: Gtk.Box + transfer_description: Gtk.Label + file_name: Gtk.Label + file_size: Gtk.Label + progress_bar: Gtk.ProgressBar + transfer_progress: Gtk.Label class FileTransferJingleBuilder(Builder): @@ -182,55 +342,126 @@ class FileTransferJingleBuilder(Builder): progress_bar: Gtk.ProgressBar -class GroupchatNickChooserBuilder(Builder): - button_content: Gtk.Box - label: Gtk.Label - popover: Gtk.Popover - entry: Gtk.Entry - apply_button: Gtk.Button +class FileTransferSendBuilder(Builder): + send_stack: Gtk.Stack + listbox: Gtk.ListBox + description: Gtk.TextView + files_send: Gtk.Button + resource_box: Gtk.Box + resource_send: Gtk.Button + resource_instructions: Gtk.Label -class CertificateDialogBuilder(Builder): - certificate_box: Gtk.Box - label_cert_for_account: Gtk.Label - data_it_common_name: Gtk.Label - data_it_organization: Gtk.Label - data_it_organizational_unit: Gtk.Label - data_it_serial_number: Gtk.Label - data_ib_common_name: Gtk.Label - data_ib_organization: Gtk.Label - data_ib_organizational_unit: Gtk.Label - data_issued_on: Gtk.Label - data_expires_on: Gtk.Label - data_sha1: Gtk.Label - data_sha256: Gtk.Label - copy_cert_info_button: Gtk.Button - image1: Gtk.Image +class FiletransfersBuilder(Builder): + accelgroup1: Gtk.AccelGroup + file_transfers_menu: Gtk.Menu + remove_menuitem: Gtk.MenuItem + pause_resume_menuitem: Gtk.MenuItem + cancel_menuitem: Gtk.MenuItem + open_folder_menuitem: Gtk.MenuItem + file_transfers_window: Gtk.Window + notify_ft_complete: Gtk.Switch + transfers_scrolledwindow: Gtk.ScrolledWindow + transfers_list: Gtk.TreeView + transfers_list_atkobject: Atk.Object + cleanup_button: Gtk.ToolButton + pause_resume_button: Gtk.ToolButton + cancel_button: Gtk.ToolButton + file_transfers_window_atkobject: Atk.Object -class PreferencesBuilder(Builder): +class GroupchatConfigBuilder(Builder): + affiliation_store: Gtk.ListStore + combo_store: Gtk.ListStore + info_popover: Gtk.Popover + outcast_store: Gtk.ListStore grid: Gtk.Grid + treeview_buttonbox: Gtk.Box + info_button: Gtk.MenuButton + add_button: Gtk.Button + remove_button: Gtk.Button + ok_button: Gtk.Button stack: Gtk.Stack - window_behaviour: Gtk.Grid - chats: Gtk.Grid - group_chats: Gtk.Grid - file_preview: Gtk.Grid - visual_notifications: Gtk.Grid - sounds: Gtk.Grid - status_message: Gtk.Grid - automatic_status: Gtk.Grid - themes: Gtk.Grid - emoji: Gtk.Grid - audio_video_info_bar: Gtk.InfoBar - button1: Gtk.Button - server: Gtk.Grid - audio: Gtk.Grid - video: Gtk.Grid - miscellaneous: Gtk.Grid - reset_button: Gtk.Button - purge_history_button: Gtk.Button - advanced: Gtk.Grid - ace_button: Gtk.Button + config_grid: Gtk.Grid + affiliation_treeview: Gtk.TreeView + reserved_name_column: Gtk.TreeViewColumn + role_column: Gtk.TreeViewColumn + outcast_treeview: Gtk.TreeView + + +class GroupchatControlBuilder(Builder): + drop_area: Gtk.Box + formattings_menu: Gtk.Menu + bold: Gtk.MenuItem + italic: Gtk.MenuItem + strike: Gtk.MenuItem + manage_popover: Gtk.Popover + manage_change_subject_button: Gtk.Button + manage_advanced_button: Gtk.Button + manage_destroy_button: Gtk.Button + groupchat_control_hbox: Gtk.Box + overlay: Gtk.Overlay + stack: Gtk.Stack + groupchat_control_vbox: Gtk.Box + textview_box: Gtk.Box + banner_eventbox: Gtk.EventBox + avatar_image: Gtk.Image + banner_name_label: Gtk.Label + visitor_box: Gtk.Box + visitor_menu_button: Gtk.MenuButton + account_badge_box: Gtk.Box + toggle_roster_button: Gtk.Button + toggle_roster_image: Gtk.Image + conv_view_overlay: Gtk.Overlay + hbox: Gtk.Box + quick_invite_button: Gtk.Button + settings_menu: Gtk.MenuButton + authentication_button: Gtk.Button + lock_image: Gtk.Image + encryption_menu: Gtk.MenuButton + sendfile_button: Gtk.Button + emoticons_button: Gtk.MenuButton + send_message_button: Gtk.Button + formattings_button: Gtk.MenuButton + label_selector: Gtk.ComboBox + roster_revealer: Gtk.Revealer + nickname_entry: Gtk.Entry + nickname_change_button: Gtk.Button + subject_change_button: Gtk.Button + subject_textview: Gtk.TextView + password_set_button: Gtk.Button + password_entry: Gtk.Entry + captcha_set_button: Gtk.Button + captcha_box: Gtk.Box + remove_bookmark_button: Gtk.Button + retry_button: Gtk.Button + close_button: Gtk.Button + error_label: Gtk.Label + error_heading: Gtk.Label + captcha_close_button: Gtk.Button + captcha_try_again_button: Gtk.Button + captcha_error_label: Gtk.Label + kick_label: Gtk.Label + kick_participant_button: Gtk.Button + kick_reason_entry: Gtk.Entry + ban_label: Gtk.Label + ban_participant_button: Gtk.Button + ban_reason_entry: Gtk.Entry + destroy_button: Gtk.Button + destroy_alternate_entry: Gtk.Entry + destroy_reason_entry: Gtk.Entry + name_entry: Gtk.Entry + rename_button: Gtk.Button + invite_grid: Gtk.Grid + invite_button: Gtk.Button + avatar_button_image: Gtk.Image + avatar_select_button: Gtk.Button + muc_description_entry: Gtk.Entry + muc_name_entry: Gtk.Entry + manage_save_button: Gtk.Button + avatar_selector_grid: Gtk.Grid + avatar_update_button: Gtk.Button + visitor_popover: Gtk.Popover class GroupchatCreationBuilder(Builder): @@ -248,52 +479,55 @@ class GroupchatCreationBuilder(Builder): create_button: Gtk.Button -class AppPageBuilder(Builder): - gajim_update: Gtk.Box - update_message: Gtk.Label - gajim_update_check: Gtk.Box - - -class SystrayContextMenuBuilder(Builder): - accelgroup1: Gtk.AccelGroup - systray_context_menu: Gtk.Menu - status_menu: Gtk.MenuItem - start_chat_menuitem: Gtk.MenuItem - sounds_mute_menuitem: Gtk.CheckMenuItem - toggle_window_menuitem: Gtk.MenuItem - preferences_menuitem: Gtk.MenuItem - separator: Gtk.SeparatorMenuItem - quit_menuitem: Gtk.MenuItem - - -class AccountPageBuilder(Builder): - paned: Gtk.Paned - roster_box: Gtk.Box - roster_menu_button: Gtk.MenuButton - roster_search_entry: Gtk.SearchEntry - account_box: Gtk.Box +class GroupchatInfoScrolledBuilder(Builder): + info_grid: Gtk.Grid + address_label: Gtk.Label + description_label: Gtk.Label + subject_label: Gtk.Label + author_label: Gtk.Label + description: Gtk.Label + author: Gtk.Label + users: Gtk.Label + contact_label: Gtk.Label + logs_label: Gtk.Label + lang: Gtk.Label + logs: Gtk.LinkButton + users_image: Gtk.Image + lang_image: Gtk.Image + contact_box: Gtk.Box + subject: Gtk.Label + name: Gtk.Label avatar_image: Gtk.Image - account_label: Gtk.Label - account_action_box: Gtk.Box - account_settings: Gtk.Button - status_message_box: Gtk.Box + address: Gtk.Label -class PluginsWindowBuilder(Builder): - plugins_notebook: Gtk.Notebook - installed_plugins_treeview: Gtk.TreeView - treeview_selection: Gtk.TreeSelection - install_plugin_button: Gtk.ToolButton - uninstall_plugin_button: Gtk.ToolButton - plugin_name_label: Gtk.Label - configure_plugin_button: Gtk.Button - available_text: Gtk.InfoBar - available_text_label: Gtk.Label - description: Gtk.Label - plugin_version_label: Gtk.Label - plugin_authors_label: Gtk.Label - plugin_homepage_linkbutton: Gtk.Label - textbuffer1: Gtk.TextBuffer +class GroupchatInviterBuilder(Builder): + account_store: Gtk.ListStore + invite_box: Gtk.Box + search_entry: Gtk.SearchEntry + scrolledwindow: Gtk.ScrolledWindow + contacts_listbox: Gtk.ListBox + contacts_placeholder: Gtk.Box + invitees_scrolled: Gtk.ScrolledWindow + + +class GroupchatNickChooserBuilder(Builder): + button_content: Gtk.Box + label: Gtk.Label + popover: Gtk.Popover + entry: Gtk.Entry + apply_button: Gtk.Button + + +class GroupchatRosterBuilder(Builder): + participant_store: Gtk.TreeStore + roster_treeview: Gtk.TreeView + contact_column: Gtk.TreeViewColumn + avatar_renderer: Gtk.CellRendererPixbuf + text_renderer: Gtk.CellRendererText + event_column: Gtk.TreeViewColumn + icon: Gtk.CellRendererPixbuf + expander: Gtk.TreeViewColumn class GroupchatRosterTooltipBuilder(Builder): @@ -306,21 +540,32 @@ class GroupchatRosterTooltipBuilder(Builder): affiliation: Gtk.Label -class AssistantBuilder(Builder): - main_grid: Gtk.Grid - content_area: Gtk.Box - stack: Gtk.Stack - action_area: Gtk.Box +class GroupchatStateBuilder(Builder): + groupchat_state: Gtk.Stack -class GroupchatInviterBuilder(Builder): - account_store: Gtk.ListStore - invite_box: Gtk.Box - search_entry: Gtk.SearchEntry - scrolledwindow: Gtk.ScrolledWindow - contacts_listbox: Gtk.ListBox - contacts_placeholder: Gtk.Box - invitees_scrolled: Gtk.ScrolledWindow +class GroupsPostWindowBuilder(Builder): + textbuffer1: Gtk.TextBuffer + groups_post_window: Gtk.Window + from_entry: Gtk.Entry + subject_entry: Gtk.Entry + contents_textview: Gtk.TextView + send_button: Gtk.Button + + +class HistoryExportBuilder(Builder): + account_liststore: Gtk.ListStore + select_account_box: Gtk.Box + account_combo: Gtk.ComboBox + file_chooser_button: Gtk.FileChooserButton + + +class MainBuilder(Builder): + main_grid: Gtk.Grid + left_grid: Gtk.Grid + account_box: Gtk.Box + workspace_scrolled: Gtk.ScrolledWindow + app_box: Gtk.Box class MamPreferencesBuilder(Builder): @@ -335,29 +580,30 @@ class MamPreferencesBuilder(Builder): save_button: Gtk.Button -class FiletransfersBuilder(Builder): - accelgroup1: Gtk.AccelGroup - file_transfers_menu: Gtk.Menu - remove_menuitem: Gtk.MenuItem - pause_resume_menuitem: Gtk.MenuItem - cancel_menuitem: Gtk.MenuItem - open_folder_menuitem: Gtk.MenuItem - file_transfers_window: Gtk.Window - notify_ft_complete: Gtk.Switch - transfers_scrolledwindow: Gtk.ScrolledWindow - transfers_list: Gtk.TreeView - transfers_list_atkobject: Atk.Object - cleanup_button: Gtk.ToolButton - pause_resume_button: Gtk.ToolButton - cancel_button: Gtk.ToolButton - file_transfers_window_atkobject: Atk.Object +class ManagePepServicesWindowBuilder(Builder): + manage_pep_services: Gtk.Box + services_treeview: Gtk.TreeView + treeview_selection1: Gtk.TreeSelection + configure_button: Gtk.Button + image1: Gtk.Image + delete_button: Gtk.Button -class ExceptionDialogBuilder(Builder): - exception_dialog: Gtk.ApplicationWindow - close_btn: Gtk.Button - report_btn: Gtk.Button - exception_view: Gtk.TextView +class ManageProxiesBuilder(Builder): + liststore1: Gtk.ListStore + box: Gtk.Box + proxies_treeview: Gtk.TreeView + treeview_selection1: Gtk.TreeSelection + add_proxy_button: Gtk.ToolButton + remove_proxy_button: Gtk.ToolButton + settings_grid: Gtk.Grid + proxypass_entry: Gtk.Entry + proxyuser_entry: Gtk.Entry + useauth_checkbutton: Gtk.CheckButton + proxyport_entry: Gtk.Entry + proxyhost_entry: Gtk.Entry + proxytype_combobox: Gtk.ComboBox + proxyname_entry: Gtk.Entry class ManageSoundsBuilder(Builder): @@ -367,216 +613,117 @@ class ManageSoundsBuilder(Builder): filechooser: Gtk.FileChooserButton -class ServerInfoBuilder(Builder): - server_info_notebook: Gtk.Notebook - server: Gtk.Grid - server_hostname: Gtk.Label - server_software: Gtk.Label - server_uptime: Gtk.Label - no_addresses_label: Gtk.Label - connection_type: Gtk.Label - proxy_type: Gtk.Label - cert_button: Gtk.Button - proxy_host: Gtk.Label - domain_label: Gtk.Label - dns_label: Gtk.Label - ip_port_label: Gtk.Label - websocket_label: Gtk.Label - domain: Gtk.Label - dns: Gtk.Label - ip_port: Gtk.Label - websocket: Gtk.Label - features: Gtk.Box - features_scrolled: Gtk.ScrolledWindow - clipboard_button: Gtk.Button +class PasswordDialogBuilder(Builder): + pass_box: Gtk.Box + header: Gtk.Label + message_label: Gtk.Label + pass_entry: Gtk.Entry + save_pass_checkbutton: Gtk.CheckButton + cancel_button: Gtk.Button + ok_button: Gtk.Button + keyring_hint: Gtk.Label -class MainBuilder(Builder): - main_grid: Gtk.Grid - left_grid: Gtk.Grid - account_box: Gtk.Box - workspace_scrolled: Gtk.ScrolledWindow - app_box: Gtk.Box +class PluginsWindowBuilder(Builder): + plugins_notebook: Gtk.Notebook + installed_plugins_treeview: Gtk.TreeView + treeview_selection: Gtk.TreeSelection + install_plugin_button: Gtk.ToolButton + uninstall_plugin_button: Gtk.ToolButton + plugin_name_label: Gtk.Label + configure_plugin_button: Gtk.Button + available_text: Gtk.InfoBar + available_text_label: Gtk.Label + description: Gtk.Label + plugin_version_label: Gtk.Label + plugin_authors_label: Gtk.Label + plugin_homepage_linkbutton: Gtk.Label + textbuffer1: Gtk.TextBuffer -class GroupchatControlBuilder(Builder): - drop_area: Gtk.Box - formattings_menu: Gtk.Menu - bold: Gtk.MenuItem - italic: Gtk.MenuItem - strike: Gtk.MenuItem - manage_popover: Gtk.Popover - manage_change_subject_button: Gtk.Button - manage_advanced_button: Gtk.Button - manage_destroy_button: Gtk.Button - groupchat_control_hbox: Gtk.Box - overlay: Gtk.Overlay - stack: Gtk.Stack - groupchat_control_vbox: Gtk.Box - textview_box: Gtk.Box - banner_eventbox: Gtk.EventBox - avatar_image: Gtk.Image - banner_name_label: Gtk.Label - visitor_box: Gtk.Box - visitor_menu_button: Gtk.MenuButton - account_badge_box: Gtk.Box - toggle_roster_button: Gtk.Button - toggle_roster_image: Gtk.Image - conv_view_overlay: Gtk.Overlay - hbox: Gtk.Box - quick_invite_button: Gtk.Button - settings_menu: Gtk.MenuButton - authentication_button: Gtk.Button - lock_image: Gtk.Image - encryption_menu: Gtk.MenuButton - sendfile_button: Gtk.Button - emoticons_button: Gtk.MenuButton - send_message_button: Gtk.Button - formattings_button: Gtk.MenuButton - label_selector: Gtk.ComboBox - roster_revealer: Gtk.Revealer - nickname_entry: Gtk.Entry - nickname_change_button: Gtk.Button - subject_change_button: Gtk.Button - subject_textview: Gtk.TextView - password_set_button: Gtk.Button - password_entry: Gtk.Entry - captcha_set_button: Gtk.Button - captcha_box: Gtk.Box - remove_bookmark_button: Gtk.Button - retry_button: Gtk.Button +class PopupNotificationWindowBuilder(Builder): + eventbox: Gtk.EventBox + color_bar: Gtk.Box + image: Gtk.Image + event_type_label: Gtk.Label close_button: Gtk.Button - error_label: Gtk.Label - error_heading: Gtk.Label - captcha_close_button: Gtk.Button - captcha_try_again_button: Gtk.Button - captcha_error_label: Gtk.Label - info_grid: Gtk.Grid - info_close_button: Gtk.Button - info_box: Gtk.Box - kick_label: Gtk.Label - kick_participant_button: Gtk.Button - kick_reason_entry: Gtk.Entry - ban_label: Gtk.Label - ban_participant_button: Gtk.Button - ban_reason_entry: Gtk.Entry - destroy_button: Gtk.Button - destroy_alternate_entry: Gtk.Entry - destroy_reason_entry: Gtk.Entry - name_entry: Gtk.Entry - rename_button: Gtk.Button - invite_grid: Gtk.Grid - invite_button: Gtk.Button - settings_grid: Gtk.Grid - settings_scrolled_box: Gtk.Box - avatar_button_image: Gtk.Image - avatar_select_button: Gtk.Button - muc_description_entry: Gtk.Entry - muc_name_entry: Gtk.Entry - manage_save_button: Gtk.Button - avatar_selector_grid: Gtk.Grid - avatar_update_button: Gtk.Button - visitor_popover: Gtk.Popover - - -class XmlConsoleBuilder(Builder): - headerbar: Gtk.HeaderBar - search_toggle: Gtk.ToggleButton - popover: Gtk.Popover - box: Gtk.Box - 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 - scrolled_input: Gtk.ScrolledWindow - input_entry: Gtk.TextView - actionbar: Gtk.ActionBar - paste: Gtk.Button - menubutton: Gtk.MenuButton - send: Gtk.Button - - -class SslErrorDialogBuilder(Builder): - ssl_error_box: Gtk.Box - intro_text: Gtk.Label - ssl_error: Gtk.Label - add_certificate_checkbutton: Gtk.CheckButton - view_cert_button: Gtk.Button - connect_button: Gtk.Button + event_description_label: Gtk.Label -class ShortcutsWindowBuilder(Builder): - shortcuts_window: Gtk.ShortcutsWindow +class PreferencesBuilder(Builder): + grid: Gtk.Grid + stack: Gtk.Stack + window_behaviour: Gtk.Grid + chats: Gtk.Grid + group_chats: Gtk.Grid + file_preview: Gtk.Grid + visual_notifications: Gtk.Grid + sounds: Gtk.Grid + status_message: Gtk.Grid + automatic_status: Gtk.Grid + themes: Gtk.Grid + emoji: Gtk.Grid + audio_video_info_bar: Gtk.InfoBar + button1: Gtk.Button + server: Gtk.Grid + audio: Gtk.Grid + video: Gtk.Grid + miscellaneous: Gtk.Grid + reset_button: Gtk.Button + purge_history_button: Gtk.Button + advanced: Gtk.Grid + ace_button: Gtk.Button -class AddContactBuilder(Builder): - account_liststore: Gtk.ListStore - address_box: Gtk.Box - account_box: Gtk.Box - account_combo: Gtk.ComboBox - cellrenderertext3: Gtk.CellRendererText - address_entry: Gtk.Entry - contact_grid: Gtk.Grid - status_switch: Gtk.Switch - group_combo: Gtk.ComboBoxText - message_entry: Gtk.Entry - contact_info_button: Gtk.Button - gateway_box: Gtk.Box - gateway_image: Gtk.Image - gateway_label: Gtk.Label - register_button: Gtk.Button - commands_button: Gtk.Button +class PreviewBuilder(Builder): + preview_box: Gtk.Box + icon_event_box: Gtk.EventBox + icon_button: Gtk.Button + right_box: Gtk.Box + image_event_box: Gtk.EventBox + image_button: Gtk.Button + progressbar: Gtk.ProgressBar + button_box: Gtk.Box + download_button: Gtk.Button + save_as_button: Gtk.Button + open_folder_button: Gtk.Button + file_name: Gtk.Label + file_size: Gtk.Label -class RosterTooltipBuilder(Builder): - tooltip_grid: Gtk.Grid - jid: Gtk.Label - tune_label: Gtk.Label - location_label: Gtk.Label - tune: Gtk.Label - location: Gtk.Label - name: Gtk.Label - avatar: Gtk.Image - sub_label: Gtk.Label - sub: Gtk.Label - resources_box: Gtk.Box +class PreviewContextMenuBuilder(Builder): + context_menu: Gtk.Menu + download: Gtk.MenuItem + open: Gtk.MenuItem + save_as: Gtk.MenuItem + open_folder: Gtk.MenuItem + encryption_separator: Gtk.SeparatorMenuItem + copy_link_location: Gtk.MenuItem + open_link_in_browser: Gtk.MenuItem -class ChatControlBuilder(Builder): - drop_area: Gtk.Box - formattings_menu: Gtk.Menu - bold: Gtk.MenuItem - italic: Gtk.MenuItem - strike: Gtk.MenuItem - chat_control_hbox: Gtk.Box - overlay: Gtk.Overlay - paned1: Gtk.Paned - textview_box: Gtk.Box - banner_eventbox: Gtk.EventBox - avatar_eventbox: Gtk.EventBox +class ProfileBuilder(Builder): + privacy_popover: Gtk.Popover + avatar_nick_access: Gtk.Switch + vcard_access: Gtk.Switch + avatar_nick_access_label: Gtk.Label + vcard_access_label: Gtk.Label + profile_stack: Gtk.Stack + spinner: Gtk.Spinner + scrolled: Gtk.ScrolledWindow + profile_box: Gtk.Box + avatar_overlay: Gtk.Overlay avatar_image: Gtk.Image - banner_name_label: Gtk.Label - banner_label: Gtk.Label - phone_image: Gtk.Image - account_badge_box: Gtk.Box - hbox2: Gtk.Box - tune_image: Gtk.Image - location_eventbox: Gtk.EventBox - location_image: Gtk.Image - conv_view_overlay: Gtk.Overlay - hbox: Gtk.Box - emoticons_button: Gtk.MenuButton - formattings_button: Gtk.MenuButton - label_selector: Gtk.ComboBox - settings_menu: Gtk.MenuButton - authentication_button: Gtk.Button - lock_image: Gtk.Image - encryption_menu: Gtk.MenuButton - sendfile_button: Gtk.Button - send_message_button: Gtk.Button + remove_avatar_button: Gtk.Button + edit_avatar_button: Gtk.Button + nickname_entry: Gtk.Entry + cancel_button: Gtk.Button + add_entry_button: Gtk.MenuButton + privacy_button: Gtk.MenuButton + save_button: Gtk.Button + edit_button: Gtk.Button + avatar_selector_box: Gtk.Box + avatar_update_button: Gtk.Button class RosterBuilder(Builder): @@ -588,85 +735,6 @@ class RosterBuilder(Builder): expander: Gtk.TreeViewColumn -class AccountWizardBuilder(Builder): - account_label_box: Gtk.Box - account_name_entry: Gtk.Entry - account_color_button: Gtk.ColorButton - badge_preview: Gtk.Label - advanced_grid: Gtk.Grid - custom_port_entry: Gtk.Entry - custom_host_entry: Gtk.Entry - proxies_combobox: Gtk.ComboBox - manage_proxies_button: Gtk.Button - con_type_combo: Gtk.ComboBoxText - entrycompletion1: Gtk.EntryCompletion - login_box: Gtk.Box - log_in_address_entry: Gtk.Entry - log_in_password_entry: Gtk.Entry - login_advanced_checkbutton: Gtk.CheckButton - log_in_button: Gtk.Button - sign_up_button: Gtk.Button - entrycompletion2: Gtk.EntryCompletion - redirect_box: Gtk.Box - instructions: Gtk.Label - link_button: Gtk.Button - security_warning_box: Gtk.Box - error_list: Gtk.ListBox - view_cert_button: Gtk.Button - trust_cert_checkbutton: Gtk.CheckButton - server_recommendations: Gtk.Popover - visit_server_button: Gtk.Button - recommendation_link1: Gtk.Label - recommendation_link2: Gtk.Label - signup_grid: Gtk.Grid - server_comboboxtext_sign_up: Gtk.ComboBoxText - server_comboboxtext_sign_up_entry: Gtk.Entry - sign_up_anonymously: Gtk.CheckButton - sign_up_advanced_checkbutton: Gtk.CheckButton - - -class AdvancedConfigurationBuilder(Builder): - box: Gtk.Box - search_entry: Gtk.SearchEntry - advanced_treeview: Gtk.TreeView - description: Gtk.Label - reset_button: Gtk.Button - - -class ManageProxiesBuilder(Builder): - liststore1: Gtk.ListStore - box: Gtk.Box - proxies_treeview: Gtk.TreeView - treeview_selection1: Gtk.TreeSelection - add_proxy_button: Gtk.ToolButton - remove_proxy_button: Gtk.ToolButton - settings_grid: Gtk.Grid - proxypass_entry: Gtk.Entry - proxyuser_entry: Gtk.Entry - useauth_checkbutton: Gtk.CheckButton - proxyport_entry: Gtk.Entry - proxyhost_entry: Gtk.Entry - proxytype_combobox: Gtk.ComboBox - proxyname_entry: Gtk.Entry - - -class PasswordDialogBuilder(Builder): - pass_box: Gtk.Box - header: Gtk.Label - message_label: Gtk.Label - pass_entry: Gtk.Entry - save_pass_checkbutton: Gtk.CheckButton - cancel_button: Gtk.Button - ok_button: Gtk.Button - keyring_hint: Gtk.Label - - -class VideoPreviewBuilder(Builder): - video_preview_box: Gtk.Box - video_source_label: Gtk.Label - video_preview_placeholder: Gtk.Box - - class RosterItemExchangeBuilder(Builder): textbuffer1: Gtk.TextBuffer roster_item_exchange: Gtk.Box @@ -679,73 +747,18 @@ class RosterItemExchangeBuilder(Builder): accept_button: Gtk.Button -class ContactInfoBuilder(Builder): - devices_grid: Gtk.Grid - priority_label: Gtk.Label - software_label: Gtk.Label - system_label: Gtk.Label - time_label: Gtk.Label - status_value: Gtk.Label - priority_value: Gtk.Label - software_value: Gtk.Label - system_value: Gtk.Label - time_value: Gtk.Label - resource_box: Gtk.Box - resource_label: Gtk.Label - groups_model: Gtk.ListStore - main_grid: Gtk.Grid - header_revealer: Gtk.Revealer - header_image: Gtk.Image - name_entry: Gtk.Entry - edit_name_button: Gtk.ToggleButton - main_stack: Gtk.Stack - vcard_scrolled: Gtk.ScrolledWindow - vcard_box: Gtk.Box - avatar_image: Gtk.Image - contact_name_label: Gtk.Label - contact_jid_label: Gtk.Label - group_chat_grid: Gtk.Grid - role_label: Gtk.Label - affiliation_label: Gtk.Label - settings_box: Gtk.Box - subscription_listbox: Gtk.ListBox - from_subscription_switch: Gtk.Switch - to_subscription_stack: Gtk.Stack - request_stack: Gtk.Stack - to_subscription_button: Gtk.Button - groups_page_box: Gtk.Box - groups_treeview: Gtk.TreeView - tree_selection: Gtk.TreeSelection - toggle_renderer: Gtk.CellRendererToggle - text_renderer: Gtk.CellRendererText - group_add_button: Gtk.ToolButton - group_remove_button: Gtk.ToolButton - notes_page_box: Gtk.Box - scrolledwindow_annotation: Gtk.ScrolledWindow - textview_annotation: Gtk.TextView - devices_stack: Gtk.Stack - devices_box: Gtk.Box - - -class ApplicationMenuBuilder(Builder): - pass - - -class PopupNotificationWindowBuilder(Builder): - eventbox: Gtk.EventBox - color_bar: Gtk.Box - image: Gtk.Image - event_type_label: Gtk.Label - close_button: Gtk.Button - event_description_label: Gtk.Label - - -class SynchronizeAccountsBuilder(Builder): - stack: Gtk.Stack - sync_accounts_box: Gtk.Box - accounts_treeview: Gtk.TreeView - sync_contacts_box: Gtk.Box - contacts_treeview: Gtk.TreeView +class RosterTooltipBuilder(Builder): + tooltip_grid: Gtk.Grid + jid: Gtk.Label + tune_label: Gtk.Label + location_label: Gtk.Label + tune: Gtk.Label + location: Gtk.Label + name: Gtk.Label + avatar: Gtk.Image + sub_label: Gtk.Label + sub: Gtk.Label + resources_box: Gtk.Box class SearchViewBuilder(Builder): @@ -764,113 +777,50 @@ class SearchViewBuilder(Builder): placeholder: Gtk.Box -class HistoryExportBuilder(Builder): - account_liststore: Gtk.ListStore - select_account_box: Gtk.Box - account_combo: Gtk.ComboBox - file_chooser_button: Gtk.FileChooserButton - - -class GroupsPostWindowBuilder(Builder): - textbuffer1: Gtk.TextBuffer - groups_post_window: Gtk.Window - from_entry: Gtk.Entry - subject_entry: Gtk.Entry - contents_textview: Gtk.TextView - send_button: Gtk.Button - - -class AdhocMucBuilder(Builder): - guests_store: Gtk.ListStore - server_store: Gtk.ListStore - adhoc_box: Gtk.Box - description_label: Gtk.Label - guests_treeview: Gtk.TreeView - server_combobox: Gtk.ComboBox - server_entry: Gtk.Entry - invite_button: Gtk.Button - - -class PreviewBuilder(Builder): - preview_box: Gtk.Box - icon_event_box: Gtk.EventBox - icon_button: Gtk.Button - right_box: Gtk.Box - image_event_box: Gtk.EventBox - image_button: Gtk.Button - progressbar: Gtk.ProgressBar - button_box: Gtk.Box - download_button: Gtk.Button - save_as_button: Gtk.Button - open_folder_button: Gtk.Button - file_name: Gtk.Label - file_size: Gtk.Label - - -class GroupchatInfoScrolledBuilder(Builder): - info_grid: Gtk.Grid - address_label: Gtk.Label - description_label: Gtk.Label - subject_label: Gtk.Label - author_label: Gtk.Label - description: Gtk.Label - author: Gtk.Label - users: Gtk.Label - contact_label: Gtk.Label - logs_label: Gtk.Label - lang: Gtk.Label - logs: Gtk.LinkButton - users_image: Gtk.Image - lang_image: Gtk.Image - contact_box: Gtk.Box - subject: Gtk.Label - name: Gtk.Label - avatar_image: Gtk.Image - address: Gtk.Label - - -class GroupchatStateBuilder(Builder): - groupchat_state: Gtk.Stack - - -class BlockingListBuilder(Builder): - blocking_store: Gtk.ListStore - blocking_grid: Gtk.Grid - overlay: Gtk.Overlay - block_view: Gtk.TreeView - add_button: Gtk.ToolButton - remove_button: Gtk.ToolButton - save_button: Gtk.Button - - -class GroupchatConfigBuilder(Builder): - affiliation_store: Gtk.ListStore - combo_store: Gtk.ListStore - info_popover: Gtk.Popover - outcast_store: Gtk.ListStore - grid: Gtk.Grid - treeview_buttonbox: Gtk.Box - info_button: Gtk.MenuButton - add_button: Gtk.Button - remove_button: Gtk.Button - ok_button: Gtk.Button - stack: Gtk.Stack - config_grid: Gtk.Grid - affiliation_treeview: Gtk.TreeView - reserved_name_column: Gtk.TreeViewColumn - role_column: Gtk.TreeViewColumn - outcast_treeview: Gtk.TreeView +class ServerInfoBuilder(Builder): + server_info_notebook: Gtk.Notebook + server: Gtk.Grid + server_hostname: Gtk.Label + server_software: Gtk.Label + server_uptime: Gtk.Label + no_addresses_label: Gtk.Label + connection_type: Gtk.Label + proxy_type: Gtk.Label + cert_button: Gtk.Button + proxy_host: Gtk.Label + domain_label: Gtk.Label + dns_label: Gtk.Label + ip_port_label: Gtk.Label + websocket_label: Gtk.Label + domain: Gtk.Label + dns: Gtk.Label + ip_port: Gtk.Label + websocket: Gtk.Label + features: Gtk.Box + features_scrolled: Gtk.ScrolledWindow + clipboard_button: Gtk.Button -class PreviewContextMenuBuilder(Builder): - context_menu: Gtk.Menu - download: Gtk.MenuItem - open: Gtk.MenuItem - save_as: Gtk.MenuItem - open_folder: Gtk.MenuItem - encryption_separator: Gtk.SeparatorMenuItem - copy_link_location: Gtk.MenuItem - open_link_in_browser: Gtk.MenuItem +class ServiceDiscoveryWindowBuilder(Builder): + liststore1: Gtk.ListStore + service_discovery_window: Gtk.Window + service_discovery: Gtk.Box + banner_agent_icon: Gtk.Image + banner_agent_header: Gtk.Label + banner_agent_subheader: Gtk.Label + address_box: Gtk.Box + address_comboboxtext: Gtk.ComboBoxText + address_comboboxtext_entry: Gtk.Entry + browse_button: Gtk.Button + services_progressbar: Gtk.ProgressBar + services_scrollwin: Gtk.ScrolledWindow + services_treeview: Gtk.TreeView + treeview_selection1: Gtk.TreeSelection + action_buttonbox: Gtk.Box + + +class ShortcutsWindowBuilder(Builder): + shortcuts_window: Gtk.ShortcutsWindow class SingleMessageWindowBuilder(Builder): @@ -884,24 +834,13 @@ class SingleMessageWindowBuilder(Builder): send_button: Gtk.Button -class GroupchatRosterBuilder(Builder): - participant_store: Gtk.TreeStore - roster_treeview: Gtk.TreeView - contact_column: Gtk.TreeViewColumn - avatar_renderer: Gtk.CellRendererPixbuf - text_renderer: Gtk.CellRendererText - event_column: Gtk.TreeViewColumn - icon: Gtk.CellRendererPixbuf - expander: Gtk.TreeViewColumn - - -class FileTransferBuilder(Builder): - transfer_box: Gtk.Box - transfer_description: Gtk.Label - file_name: Gtk.Label - file_size: Gtk.Label - progress_bar: Gtk.ProgressBar - transfer_progress: Gtk.Label +class SslErrorDialogBuilder(Builder): + ssl_error_box: Gtk.Box + intro_text: Gtk.Label + ssl_error: Gtk.Label + add_certificate_checkbutton: Gtk.CheckButton + view_cert_button: Gtk.Button + connect_button: Gtk.Button class StartChatDialogBuilder(Builder): @@ -926,141 +865,197 @@ class StartChatDialogBuilder(Builder): placeholder: Gtk.Box -class ChatPanedBuilder(Builder): +class SynchronizeAccountsBuilder(Builder): + stack: Gtk.Stack + sync_accounts_box: Gtk.Box + accounts_treeview: Gtk.TreeView + sync_contacts_box: Gtk.Box + contacts_treeview: Gtk.TreeView + + +class SystrayContextMenuBuilder(Builder): + accelgroup1: Gtk.AccelGroup + systray_context_menu: Gtk.Menu + status_menu: Gtk.MenuItem + start_chat_menuitem: Gtk.MenuItem + sounds_mute_menuitem: Gtk.CheckMenuItem + toggle_window_menuitem: Gtk.MenuItem + preferences_menuitem: Gtk.MenuItem + separator: Gtk.SeparatorMenuItem + quit_menuitem: Gtk.MenuItem + + +class ThemesWindowBuilder(Builder): + option_popover: Gtk.Popover + choose_option_listbox: Gtk.ListBox + placeholder: Gtk.Box + theme_store: Gtk.ListStore + theme_grid: Gtk.Grid + theme_treeview: Gtk.TreeView + option_listbox: Gtk.ListBox + add_option_button: Gtk.MenuButton + add_theme_button: Gtk.ToolButton + remove_theme_button: Gtk.ToolButton + + +class VideoPreviewBuilder(Builder): + video_preview_box: Gtk.Box + video_source_label: Gtk.Label + video_preview_placeholder: Gtk.Box + + +class WorkspaceDialogBuilder(Builder): + box: Gtk.Box + preview: Gtk.Image + entry: Gtk.Entry + remove_workspace_button: Gtk.Button + image_switch: Gtk.Switch + style_stack: Gtk.Stack + color_chooser: Gtk.ColorButton + image_box: Gtk.Box + save_button: Gtk.Button + + +class XmlConsoleBuilder(Builder): + headerbar: Gtk.HeaderBar + search_toggle: Gtk.ToggleButton + popover: Gtk.Popover + box: Gtk.Box paned: Gtk.Paned - middle_grid: Gtk.Grid - header_bar: Gtk.Grid - workspace_label: Gtk.Label - filter_bar_toggle: Gtk.ToggleButton + search_revealer: Gtk.Revealer search_entry: Gtk.SearchEntry - start_chat_button: Gtk.Button - filter_bar_revealer: Gtk.Revealer - filter_bar: Gtk.Box - chat_list_scrolled: Gtk.ScrolledWindow - right_grid: Gtk.Grid - right_grid_overlay: Gtk.Overlay + search_forward: Gtk.ToolButton + search_backward: Gtk.ToolButton + scrolled: Gtk.ScrolledWindow + sourceview: GtkSource.View + scrolled_input: Gtk.ScrolledWindow + input_entry: Gtk.TextView + actionbar: Gtk.ActionBar + paste: Gtk.Button + menubutton: Gtk.MenuButton + send: Gtk.Button @overload -def get_builder(file_name: Literal['call_widget.ui'], widgets: list[str] = ...) -> CallWidgetBuilder: ... -@overload -def get_builder(file_name: Literal['service_discovery_window.ui'], widgets: list[str] = ...) -> ServiceDiscoveryWindowBuilder: ... +def get_builder(file_name: Literal['account_page.ui'], widgets: list[str] = ...) -> AccountPageBuilder: ... @overload -def get_builder(file_name: Literal['chat_list_row.ui'], widgets: list[str] = ...) -> ChatListRowBuilder: ... +def get_builder(file_name: Literal['account_wizard.ui'], widgets: list[str] = ...) -> AccountWizardBuilder: ... @overload -def get_builder(file_name: Literal['workspace_dialog.ui'], widgets: list[str] = ...) -> WorkspaceDialogBuilder: ... +def get_builder(file_name: Literal['add_contact.ui'], widgets: list[str] = ...) -> AddContactBuilder: ... @overload -def get_builder(file_name: Literal['profile.ui'], widgets: list[str] = ...) -> ProfileBuilder: ... +def get_builder(file_name: Literal['adhoc_muc.ui'], widgets: list[str] = ...) -> AdhocMucBuilder: ... @overload -def get_builder(file_name: Literal['bookmarks.ui'], widgets: list[str] = ...) -> BookmarksBuilder: ... +def get_builder(file_name: Literal['advanced_configuration.ui'], widgets: list[str] = ...) -> AdvancedConfigurationBuilder: ... @overload -def get_builder(file_name: Literal['emoji_chooser.ui'], widgets: list[str] = ...) -> EmojiChooserBuilder: ... +def get_builder(file_name: Literal['app_page.ui'], widgets: list[str] = ...) -> AppPageBuilder: ... @overload -def get_builder(file_name: Literal['manage_pep_services_window.ui'], widgets: list[str] = ...) -> ManagePepServicesWindowBuilder: ... +def get_builder(file_name: Literal['application_menu.ui'], widgets: list[str] = ...) -> ApplicationMenuBuilder: ... @overload -def get_builder(file_name: Literal['themes_window.ui'], widgets: list[str] = ...) -> ThemesWindowBuilder: ... +def get_builder(file_name: Literal['assistant.ui'], widgets: list[str] = ...) -> AssistantBuilder: ... @overload -def get_builder(file_name: Literal['file_transfer_send.ui'], widgets: list[str] = ...) -> FileTransferSendBuilder: ... +def get_builder(file_name: Literal['blocking_list.ui'], widgets: list[str] = ...) -> BlockingListBuilder: ... @overload -def get_builder(file_name: Literal['file_transfer_jingle.ui'], widgets: list[str] = ...) -> FileTransferJingleBuilder: ... +def get_builder(file_name: Literal['bookmarks.ui'], widgets: list[str] = ...) -> BookmarksBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_nick_chooser.ui'], widgets: list[str] = ...) -> GroupchatNickChooserBuilder: ... +def get_builder(file_name: Literal['call_widget.ui'], widgets: list[str] = ...) -> CallWidgetBuilder: ... @overload def get_builder(file_name: Literal['certificate_dialog.ui'], widgets: list[str] = ...) -> CertificateDialogBuilder: ... @overload -def get_builder(file_name: Literal['preferences.ui'], widgets: list[str] = ...) -> PreferencesBuilder: ... -@overload -def get_builder(file_name: Literal['groupchat_creation.ui'], widgets: list[str] = ...) -> GroupchatCreationBuilder: ... +def get_builder(file_name: Literal['chat_control.ui'], widgets: list[str] = ...) -> ChatControlBuilder: ... @overload -def get_builder(file_name: Literal['app_page.ui'], widgets: list[str] = ...) -> AppPageBuilder: ... +def get_builder(file_name: Literal['chat_list_row.ui'], widgets: list[str] = ...) -> ChatListRowBuilder: ... @overload -def get_builder(file_name: Literal['systray_context_menu.ui'], widgets: list[str] = ...) -> SystrayContextMenuBuilder: ... +def get_builder(file_name: Literal['chat_paned.ui'], widgets: list[str] = ...) -> ChatPanedBuilder: ... @overload -def get_builder(file_name: Literal['account_page.ui'], widgets: list[str] = ...) -> AccountPageBuilder: ... +def get_builder(file_name: Literal['contact_info.ui'], widgets: list[str] = ...) -> ContactInfoBuilder: ... @overload -def get_builder(file_name: Literal['plugins_window.ui'], widgets: list[str] = ...) -> PluginsWindowBuilder: ... +def get_builder(file_name: Literal['emoji_chooser.ui'], widgets: list[str] = ...) -> EmojiChooserBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_roster_tooltip.ui'], widgets: list[str] = ...) -> GroupchatRosterTooltipBuilder: ... +def get_builder(file_name: Literal['exception_dialog.ui'], widgets: list[str] = ...) -> ExceptionDialogBuilder: ... @overload -def get_builder(file_name: Literal['assistant.ui'], widgets: list[str] = ...) -> AssistantBuilder: ... +def get_builder(file_name: Literal['file_transfer.ui'], widgets: list[str] = ...) -> FileTransferBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_inviter.ui'], widgets: list[str] = ...) -> GroupchatInviterBuilder: ... +def get_builder(file_name: Literal['file_transfer_jingle.ui'], widgets: list[str] = ...) -> FileTransferJingleBuilder: ... @overload -def get_builder(file_name: Literal['mam_preferences.ui'], widgets: list[str] = ...) -> MamPreferencesBuilder: ... +def get_builder(file_name: Literal['file_transfer_send.ui'], widgets: list[str] = ...) -> FileTransferSendBuilder: ... @overload def get_builder(file_name: Literal['filetransfers.ui'], widgets: list[str] = ...) -> FiletransfersBuilder: ... @overload -def get_builder(file_name: Literal['exception_dialog.ui'], widgets: list[str] = ...) -> ExceptionDialogBuilder: ... +def get_builder(file_name: Literal['groupchat_config.ui'], widgets: list[str] = ...) -> GroupchatConfigBuilder: ... @overload -def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ...) -> ManageSoundsBuilder: ... +def get_builder(file_name: Literal['groupchat_control.ui'], widgets: list[str] = ...) -> GroupchatControlBuilder: ... @overload -def get_builder(file_name: Literal['server_info.ui'], widgets: list[str] = ...) -> ServerInfoBuilder: ... +def get_builder(file_name: Literal['groupchat_creation.ui'], widgets: list[str] = ...) -> GroupchatCreationBuilder: ... @overload -def get_builder(file_name: Literal['main.ui'], widgets: list[str] = ...) -> MainBuilder: ... +def get_builder(file_name: Literal['groupchat_info_scrolled.ui'], widgets: list[str] = ...) -> GroupchatInfoScrolledBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_control.ui'], widgets: list[str] = ...) -> GroupchatControlBuilder: ... +def get_builder(file_name: Literal['groupchat_inviter.ui'], widgets: list[str] = ...) -> GroupchatInviterBuilder: ... @overload -def get_builder(file_name: Literal['xml_console.ui'], widgets: list[str] = ...) -> XmlConsoleBuilder: ... +def get_builder(file_name: Literal['groupchat_nick_chooser.ui'], widgets: list[str] = ...) -> GroupchatNickChooserBuilder: ... @overload -def get_builder(file_name: Literal['ssl_error_dialog.ui'], widgets: list[str] = ...) -> SslErrorDialogBuilder: ... +def get_builder(file_name: Literal['groupchat_roster.ui'], widgets: list[str] = ...) -> GroupchatRosterBuilder: ... @overload -def get_builder(file_name: Literal['shortcuts_window.ui'], widgets: list[str] = ...) -> ShortcutsWindowBuilder: ... +def get_builder(file_name: Literal['groupchat_roster_tooltip.ui'], widgets: list[str] = ...) -> GroupchatRosterTooltipBuilder: ... @overload -def get_builder(file_name: Literal['add_contact.ui'], widgets: list[str] = ...) -> AddContactBuilder: ... +def get_builder(file_name: Literal['groupchat_state.ui'], widgets: list[str] = ...) -> GroupchatStateBuilder: ... @overload -def get_builder(file_name: Literal['roster_tooltip.ui'], widgets: list[str] = ...) -> RosterTooltipBuilder: ... +def get_builder(file_name: Literal['groups_post_window.ui'], widgets: list[str] = ...) -> GroupsPostWindowBuilder: ... @overload -def get_builder(file_name: Literal['chat_control.ui'], widgets: list[str] = ...) -> ChatControlBuilder: ... +def get_builder(file_name: Literal['history_export.ui'], widgets: list[str] = ...) -> HistoryExportBuilder: ... @overload -def get_builder(file_name: Literal['roster.ui'], widgets: list[str] = ...) -> RosterBuilder: ... +def get_builder(file_name: Literal['main.ui'], widgets: list[str] = ...) -> MainBuilder: ... @overload -def get_builder(file_name: Literal['account_wizard.ui'], widgets: list[str] = ...) -> AccountWizardBuilder: ... +def get_builder(file_name: Literal['mam_preferences.ui'], widgets: list[str] = ...) -> MamPreferencesBuilder: ... @overload -def get_builder(file_name: Literal['advanced_configuration.ui'], widgets: list[str] = ...) -> AdvancedConfigurationBuilder: ... +def get_builder(file_name: Literal['manage_pep_services_window.ui'], widgets: list[str] = ...) -> ManagePepServicesWindowBuilder: ... @overload def get_builder(file_name: Literal['manage_proxies.ui'], widgets: list[str] = ...) -> ManageProxiesBuilder: ... @overload +def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ...) -> ManageSoundsBuilder: ... +@overload def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... @overload -def get_builder(file_name: Literal['video_preview.ui'], widgets: list[str] = ...) -> VideoPreviewBuilder: ... +def get_builder(file_name: Literal['plugins_window.ui'], widgets: list[str] = ...) -> PluginsWindowBuilder: ... @overload -def get_builder(file_name: Literal['roster_item_exchange.ui'], widgets: list[str] = ...) -> RosterItemExchangeBuilder: ... +def get_builder(file_name: Literal['popup_notification_window.ui'], widgets: list[str] = ...) -> PopupNotificationWindowBuilder: ... @overload -def get_builder(file_name: Literal['contact_info.ui'], widgets: list[str] = ...) -> ContactInfoBuilder: ... +def get_builder(file_name: Literal['preferences.ui'], widgets: list[str] = ...) -> PreferencesBuilder: ... @overload -def get_builder(file_name: Literal['application_menu.ui'], widgets: list[str] = ...) -> ApplicationMenuBuilder: ... +def get_builder(file_name: Literal['preview.ui'], widgets: list[str] = ...) -> PreviewBuilder: ... @overload -def get_builder(file_name: Literal['popup_notification_window.ui'], widgets: list[str] = ...) -> PopupNotificationWindowBuilder: ... +def get_builder(file_name: Literal['preview_context_menu.ui'], widgets: list[str] = ...) -> PreviewContextMenuBuilder: ... @overload -def get_builder(file_name: Literal['synchronize_accounts.ui'], widgets: list[str] = ...) -> SynchronizeAccountsBuilder: ... +def get_builder(file_name: Literal['profile.ui'], widgets: list[str] = ...) -> ProfileBuilder: ... @overload -def get_builder(file_name: Literal['search_view.ui'], widgets: list[str] = ...) -> SearchViewBuilder: ... +def get_builder(file_name: Literal['roster.ui'], widgets: list[str] = ...) -> RosterBuilder: ... @overload -def get_builder(file_name: Literal['history_export.ui'], widgets: list[str] = ...) -> HistoryExportBuilder: ... +def get_builder(file_name: Literal['roster_item_exchange.ui'], widgets: list[str] = ...) -> RosterItemExchangeBuilder: ... @overload -def get_builder(file_name: Literal['groups_post_window.ui'], widgets: list[str] = ...) -> GroupsPostWindowBuilder: ... +def get_builder(file_name: Literal['roster_tooltip.ui'], widgets: list[str] = ...) -> RosterTooltipBuilder: ... @overload -def get_builder(file_name: Literal['adhoc_muc.ui'], widgets: list[str] = ...) -> AdhocMucBuilder: ... +def get_builder(file_name: Literal['search_view.ui'], widgets: list[str] = ...) -> SearchViewBuilder: ... @overload -def get_builder(file_name: Literal['preview.ui'], widgets: list[str] = ...) -> PreviewBuilder: ... +def get_builder(file_name: Literal['server_info.ui'], widgets: list[str] = ...) -> ServerInfoBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_info_scrolled.ui'], widgets: list[str] = ...) -> GroupchatInfoScrolledBuilder: ... +def get_builder(file_name: Literal['service_discovery_window.ui'], widgets: list[str] = ...) -> ServiceDiscoveryWindowBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_state.ui'], widgets: list[str] = ...) -> GroupchatStateBuilder: ... +def get_builder(file_name: Literal['shortcuts_window.ui'], widgets: list[str] = ...) -> ShortcutsWindowBuilder: ... @overload -def get_builder(file_name: Literal['blocking_list.ui'], widgets: list[str] = ...) -> BlockingListBuilder: ... +def get_builder(file_name: Literal['single_message_window.ui'], widgets: list[str] = ...) -> SingleMessageWindowBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_config.ui'], widgets: list[str] = ...) -> GroupchatConfigBuilder: ... +def get_builder(file_name: Literal['ssl_error_dialog.ui'], widgets: list[str] = ...) -> SslErrorDialogBuilder: ... @overload -def get_builder(file_name: Literal['preview_context_menu.ui'], widgets: list[str] = ...) -> PreviewContextMenuBuilder: ... +def get_builder(file_name: Literal['start_chat_dialog.ui'], widgets: list[str] = ...) -> StartChatDialogBuilder: ... @overload -def get_builder(file_name: Literal['single_message_window.ui'], widgets: list[str] = ...) -> SingleMessageWindowBuilder: ... +def get_builder(file_name: Literal['synchronize_accounts.ui'], widgets: list[str] = ...) -> SynchronizeAccountsBuilder: ... @overload -def get_builder(file_name: Literal['groupchat_roster.ui'], widgets: list[str] = ...) -> GroupchatRosterBuilder: ... +def get_builder(file_name: Literal['systray_context_menu.ui'], widgets: list[str] = ...) -> SystrayContextMenuBuilder: ... @overload -def get_builder(file_name: Literal['file_transfer.ui'], widgets: list[str] = ...) -> FileTransferBuilder: ... +def get_builder(file_name: Literal['themes_window.ui'], widgets: list[str] = ...) -> ThemesWindowBuilder: ... @overload -def get_builder(file_name: Literal['start_chat_dialog.ui'], widgets: list[str] = ...) -> StartChatDialogBuilder: ... +def get_builder(file_name: Literal['video_preview.ui'], widgets: list[str] = ...) -> VideoPreviewBuilder: ... @overload -def get_builder(file_name: Literal['chat_paned.ui'], widgets: list[str] = ...) -> ChatPanedBuilder: ... +def get_builder(file_name: Literal['workspace_dialog.ui'], widgets: list[str] = ...) -> WorkspaceDialogBuilder: ... +@overload +def get_builder(file_name: Literal['xml_console.ui'], widgets: list[str] = ...) -> XmlConsoleBuilder: ... def get_builder(file_name: str, widgets: list[str] = ...) -> Builder: ... ===================================== scripts/dev/generate_ui_types.py ===================================== @@ -16,6 +16,7 @@ out_path = cwd / 'gajim' / 'gtk' / 'builder.pyi' paths = list(in_path.iterdir()) +paths.sort() IMPORTS = ''' from typing import Literal View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a16cc047c460ceefebed16080a6cde4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a16cc047c460ceefebed16080a6cde4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Move Settings into GroupchatDetails
by Philipp Hörist (＠lovetox) 22 Jan '22

22 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a16cc047 by lovetox at 2022-01-22T20:27:57+01:00 Groupchat: Move Settings into GroupchatDetails - - - - - 6 changed files: - gajim/data/gui/groupchat_control.ui - gajim/gtk/controls/groupchat.py - gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_settings.py - gajim/gtk/menus.py - pyrightconfig.json Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1333,9 +1333,6 @@ <property name="position">6</property> </packing> </child> - <child> - <placeholder/> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -1460,7 +1457,7 @@ </object> <packing> <property name="name">kick</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> <child> @@ -1587,7 +1584,7 @@ </object> <packing> <property name="name">ban</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> @@ -1747,7 +1744,7 @@ </object> <packing> <property name="name">destroy</property> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> <child> @@ -1855,7 +1852,7 @@ </object> <packing> <property name="name">rename</property> - <property name="position">11</property> + <property name="position">10</property> </packing> </child> <child> @@ -1934,119 +1931,11 @@ </object> <packing> <property name="name">invite</property> - <property name="position">12</property> + <property name="position">11</property> </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="settings_grid"> - <property name="name">settings_grid</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="margin-top">6</property> - <property name="spacing">12</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Close</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</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">Settings for This Chat</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="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <property name="overlay-scrolling">False</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkBox" id="settings_scrolled_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> - </child> - </object> - </child> - <style> - <class name="scrolled-no-border"/> - </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-settings</property> - <property name="position">13</property> - </packing> + <placeholder/> </child> <child> <object class="GtkBox"> @@ -2259,7 +2148,7 @@ </object> <packing> <property name="name">muc-manage</property> - <property name="position">14</property> + <property name="position">13</property> </packing> </child> <child> @@ -2368,7 +2257,7 @@ </object> <packing> <property name="name">avatar-selector</property> - <property name="position">15</property> + <property name="position">14</property> </packing> </child> </object> ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -78,7 +78,6 @@ from gajim.gui.avatar_selector import AvatarSelector from gajim.gui.dataform import DataFormWidget from gajim.gui.groupchat_inviter import GroupChatInviter -from gajim.gui.groupchat_settings import GroupChatSettings from gajim.gui.groupchat_roster import GroupchatRoster from gajim.gui.groupchat_state import GroupchatState from gajim.gui.message_input import MessageInputTextView @@ -172,9 +171,6 @@ def __init__(self, account: str, jid: JID) -> None: self._subject_text = '' - # Groupchat settings - self._groupchat_settings_box: Optional[GroupChatSettings] = None - # Holds the room’s config form, which is requested when managing # the room self._room_config_form = None @@ -289,7 +285,6 @@ def disco_info(self): def add_actions(self) -> None: super().add_actions() actions = [ - ('groupchat-settings-', None, self._on_groupchat_settings), ('groupchat-manage-', None, self._on_groupchat_manage), ('rename-groupchat-', None, self._on_rename_groupchat), ('change-nickname-', None, self._on_change_nick), @@ -389,7 +384,6 @@ def update_actions(self, *args: Any) -> None: def remove_actions(self) -> None: super().remove_actions() actions = [ - 'groupchat-settings-', 'groupchat-manage-', 'rename-groupchat-', 'change-nickname-', @@ -447,20 +441,6 @@ def _on_details(self, ) -> None: open_window('GroupchatDetails', contact=self.contact) - def _on_groupchat_settings(self, - _action: Gio.SimpleAction, - _param: Optional[GLib.Variant] - ) -> None: - if self._groupchat_settings_box is not None: - self.xml.settings_scrolled_box.remove(self._groupchat_settings_box) - self._groupchat_settings_box.destroy() - - self._groupchat_settings_box = GroupChatSettings( - self.account, self.contact.jid) - self._groupchat_settings_box.show_all() - self.xml.settings_scrolled_box.add(self._groupchat_settings_box) - self._show_page('muc-settings') - def _on_groupchat_manage(self, _action: Gio.SimpleAction, _param: Optional[GLib.Variant] ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -22,6 +22,7 @@ from gajim.common.modules.contacts import GroupchatContact from .groupchat_info import GroupChatInfoScrolled +from .groupchat_settings import GroupChatSettings from .sidebar_switcher import SideBarSwitcher @@ -47,6 +48,7 @@ def __init__(self, contact: GroupchatContact) -> None: main_box.add(self._stack) self._add_groupchat_info() + self._add_groupchat_settings() self._side_bar_switcher.set_stack(self._stack) @@ -67,6 +69,15 @@ def _add_groupchat_info(self) -> None: self._stack.add_titled(groupchat_info, 'info', _('Information')) + def _add_groupchat_settings(self) -> None: + scrolled_window = Gtk.ScrolledWindow() + scrolled_window.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) + + settings_box = GroupChatSettings(self.account, self._contact.jid) + scrolled_window.add(settings_box) + self._stack.add_titled(scrolled_window, 'settings', _('Settings')) + def _on_key_press(self, _widget: GroupchatDetails, event: Gdk.EventKey) -> None: ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -26,7 +26,7 @@ class GroupChatSettings(SettingsBox): def __init__(self, account: str, jid: JID) -> None: - SettingsBox.__init__(self, account, jid) + SettingsBox.__init__(self, account, str(jid)) self.get_style_context().add_class('settings-border') self.set_selection_mode(Gtk.SelectionMode.NONE) ===================================== gajim/gtk/menus.py ===================================== @@ -151,7 +151,6 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: menulist: MenuItemListT = [ (_('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), (_('Change Nickname…'), f'win.change-nickname-{control_id}', None), ===================================== pyrightconfig.json ===================================== @@ -58,6 +58,7 @@ "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", "gajim/gtk/groupchat_nick.py", + "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", "gajim/gtk/main_stack.py", "gajim/gtk/manage_sounds.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a16cc047c460ceefebed16080a6cde42… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a16cc047c460ceefebed16080a6cde42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Chat: Handle presence from bare jids correctly
by Philipp Hörist (＠lovetox) 22 Jan '22

22 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8b1977e7 by lovetox at 2022-01-22T20:00:22+01:00 Chat: Handle presence from bare jids correctly - - - - - 1 changed file: - gajim/gtk/controls/chat.py Changes: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -54,6 +54,7 @@ from gajim.common.const import KindConstant from gajim.common.const import PEPEventType from gajim.common.jingle_session import JingleSession +from gajim.common.modules.contacts import BareContact from gajim.gui.call_widget import CallWidget from gajim.gui.controls.base import BaseControl @@ -746,6 +747,8 @@ def _on_presence_received(self, event: events.PresenceReceived) -> None: return contact = self._client.get_module('Contacts').get_contact(event.fjid) + if isinstance(contact, BareContact): + return self.conversation_view.add_user_status(self.contact.name, contact.show.value, contact.status) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b1977e76043f7e9942b0162a4c9ee18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b1977e76043f7e9942b0162a4c9ee18… 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