Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][new_xml_parser] 2 commits: Add XEP-0425: Message Moderation
by Philipp Hörist (＠lovetox) 27 Nov '21

27 Nov '21

Philipp Hörist pushed to branch new_xml_parser at gajim / python-nbxmpp Commits: 22aaefb2 by wurstsalat at 2021-11-10T21:54:31+01:00 Add XEP-0425: Message Moderation - - - - - 112c06bc by lovetox at 2021-11-28T00:57:08+01:00 Inital - - - - - 20 changed files: - ChangeLog - nbxmpp/__init__.py - nbxmpp/addresses.py - nbxmpp/auth.py - + nbxmpp/builder.py - − nbxmpp/c14n.py - nbxmpp/client.py - nbxmpp/connection.py - nbxmpp/const.py - nbxmpp/dispatcher.py - + nbxmpp/elements.py - nbxmpp/errors.py - nbxmpp/examples/client.py - nbxmpp/examples/client.ui - nbxmpp/exceptions.py - − nbxmpp/idlequeue.py - + nbxmpp/jid.py - + nbxmpp/lookups.py - nbxmpp/modules/activity.py - nbxmpp/modules/adhoc.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/1732199d3c7ff7da99dd7c2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/1732199d3c7ff7da99dd7c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new branch new_xml_parser
by Philipp Hörist (＠lovetox) 27 Nov '21

27 Nov '21

Philipp Hörist pushed new branch new_xml_parser at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/new_xml_parser You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Main: Add header
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: fe77a7df by wurstsalat at 2021-11-27T18:59:17+01:00 Main: Add header - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -1,3 +1,17 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + from typing import Optional from typing import Generator View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fe77a7df9dab372acce1147d2a4839b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fe77a7df9dab372acce1147d2a4839b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Avatar: Add convert_to_greyscale
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b24215a0 by wurstsalat at 2021-11-27T18:49:26+01:00 Avatar: Add convert_to_greyscale - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -308,6 +308,19 @@ def round_corners(surface): return context.get_target() +def convert_to_greyscale(surface): + context = cairo.Context(surface) + context.set_operator(cairo.Operator.HSL_COLOR) + context.set_source_rgb(1, 1, 1) + context.rectangle(0, 0, surface.get_width(), surface.get_height()) + context.fill() + context.set_operator(cairo.Operator.ATOP) + context.set_source_rgba(1, 1, 1, 0.5) + context.rectangle(0, 0, surface.get_width(), surface.get_height()) + context.fill() + return context.get_target() + + class AvatarStorage(metaclass=Singleton): def __init__(self): self._cache = defaultdict(dict) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b24215a0c7336eee22621a5bdb73d30b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b24215a0c7336eee22621a5bdb73d30b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 5 commits: Main: Linting
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c1516f8e by wurstsalat at 2021-11-27T17:03:00+01:00 Main: Linting - - - - - d50ccbb4 by wurstsalat at 2021-11-27T18:38:41+01:00 AccountWizard: Typing - - - - - 20ca9875 by wurstsalat at 2021-11-27T18:38:53+01:00 SSLErrorDialog: Typing - - - - - a74e581b by wurstsalat at 2021-11-27T18:39:13+01:00 CreateGroupchatWindow: Typing - - - - - bfa221a9 by wurstsalat at 2021-11-27T18:39:30+01:00 Interface: Typing - - - - - 5 changed files: - gajim/gtk/account_wizard.py - gajim/gtk/groupchat_creation.py - gajim/gtk/main.py - gajim/gtk/ssl_error_dialog.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -12,6 +12,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Optional +from typing import List +from typing import Tuple +from typing import Union + import logging from gi.repository import Gdk @@ -54,10 +59,10 @@ class AccountWizard(Assistant): - def __init__(self): + def __init__(self) -> None: Assistant.__init__(self, height=500) - self._destroyed = False + self._destroyed: bool = False self.add_button('signup', _('Sign Up'), complete=True, css_class='suggested-action') @@ -88,10 +93,10 @@ def __init__(self): self.update_proxy_list() - self._client = None - self._method = 'login' + self._client: Optional[Client] = None + self._method: str = 'login' - def get_currenct_method(self): + def get_currenct_method(self) -> str: return self._method def _on_button_clicked(self, _page, button_name): @@ -190,15 +195,16 @@ def _on_page_changed(self, _assistant, page_name): elif page_name == 'form': self.get_page('form').focus() - def update_proxy_list(self): + def update_proxy_list(self) -> None: self.get_page('advanced').update_proxy_list() def _get_base_client(self, - domain, - username, - mode, - advanced, - ignore_all_errors): + domain: str, + username: str, + mode: Mode, + advanced: bool, + ignore_all_errors: bool + ) -> Client: client = Client(log_context='Account Wizard') client.set_domain(domain) @@ -224,7 +230,7 @@ def _get_base_client(self, client.subscribe('stanza-received', self._on_stanza_received) return client - def _disconnect(self): + def _disconnect(self) -> None: if self._client is None: return self._client.remove_subscriptions() @@ -243,7 +249,7 @@ def _on_stanza_received(_client, _signal_name, stanza): account='AccountWizard', stanza=stanza)) - def _test_credentials(self, ignore_all_errors=False): + def _test_credentials(self, ignore_all_errors: bool = False) -> None: self._show_progress_page(_('Connecting...'), _('Connecting to server...')) address, password = self.get_page('login').get_credentials() @@ -262,7 +268,7 @@ def _test_credentials(self, ignore_all_errors=False): self._client.connect() - def _test_anonymous_server(self, ignore_all_errors=False): + def _test_anonymous_server(self, ignore_all_errors: bool = False) -> None: self._show_progress_page(_('Connecting...'), _('Connecting to server...')) domain = self.get_page('signup').get_server() @@ -279,7 +285,7 @@ def _test_anonymous_server(self, ignore_all_errors=False): self._on_anonymous_supported) self._client.connect() - def _register_with_server(self, ignore_all_errors=False): + def _register_with_server(self, ignore_all_errors: bool = False) -> None: self._show_progress_page(_('Connecting...'), _('Connecting to server...')) domain = self.get_page('signup').get_server() @@ -380,19 +386,19 @@ def _on_connection_failed(self, _client, _signal_name): self._client.destroy() self._client = None - def _show_error_page(self, title, heading, text): + def _show_error_page(self, title: str, heading: str, text: str) -> None: self.get_page('error').set_title(title) self.get_page('error').set_heading(heading) self.get_page('error').set_text(text or '') self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) - def _show_progress_page(self, title, text): + def _show_progress_page(self, title: str, text: str) -> None: self._progress.set_title(title) self._progress.set_text(text) self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) @staticmethod - def _generate_account_name(domain): + def _generate_account_name(domain: str) -> str: i = 1 while domain in app.settings.get_accounts(): domain = domain + str(i) @@ -429,7 +435,7 @@ def _on_register_form(self, task): self.show_page('form', Gtk.StackTransitionType.SLIDE_LEFT) - def _submit_form(self): + def _submit_form(self) -> None: self.get_page('progress').set_text(_('Account is being created')) self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) @@ -486,7 +492,11 @@ def _on_register_result(self, task): self.get_page('form').remove_form() self._disconnect() - def _set_error_text(self, error): + def _set_error_text(self, + error: Union[StanzaError, + RegisterStanzaError, + MalformedStanzaError] + ) -> None: error_text = error.get_text() if not error_text: error_text = _('The server rejected the registration ' @@ -504,7 +514,7 @@ class Login(Page): 'clicked': (GObject.SignalFlags.RUN_LAST, None, (str,)), } - def __init__(self): + def __init__(self) -> None: Page.__init__(self) self.title = _('Add Account') @@ -525,7 +535,7 @@ def __init__(self): self.pack_start(self._ui.login_box, True, True, 0) self.show_all() - def focus(self): + def focus(self) -> None: self._ui.log_in_address_entry.grab_focus() def _on_login(self, *args): @@ -534,7 +544,7 @@ def _on_login(self, *args): def _on_signup(self, *args): self.emit('clicked', 'signup') - def _create_server_completion(self): + def _create_server_completion(self) -> None: # Parse servers.json file_path = configpaths.get('DATA') / 'other' / 'servers.json' self._servers = helpers.load_json(file_path, default=[]) @@ -561,9 +571,9 @@ def _update_completion(self, entry): model.clear() for server in self._servers: - model.append(['%s@%s' % (text, server)]) + model.append([f'{text}@{server}']) - def _show_icon(self, show): + def _show_icon(self, show: bool) -> None: icon = 'dialog-warning-symbolic' if show else None self._ui.log_in_address_entry.set_icon_from_icon_name( Gtk.EntryIconPosition.SECONDARY, icon) @@ -575,7 +585,7 @@ def _on_password_entry_activate(self, _widget): if self._ui.log_in_button.get_sensitive(): self._ui.log_in_button.activate() - def _validate_jid(self, address): + def _validate_jid(self, address: str) -> bool: if not address: self._show_icon(False) return False @@ -598,10 +608,10 @@ def _set_complete(self, *args): password = self._ui.log_in_password_entry.get_text() self._ui.log_in_button.set_sensitive(address and password) - def is_advanced(self): + def is_advanced(self) -> bool: return self._ui.login_advanced_checkbutton.get_active() - def get_credentials(self): + def get_credentials(self) -> Tuple[str, str]: data = (self._ui.log_in_address_entry.get_text(), self._ui.log_in_password_entry.get_text()) return data @@ -610,8 +620,8 @@ def get_credentials(self): class Signup(Page): def __init__(self): Page.__init__(self) - self.complete = False - self.title = _('Create New Account') + self.complete: bool = False + self.title: str = _('Create New Account') self._ui = get_builder('account_wizard.ui') self._ui.server_comboboxtext_sign_up_entry.set_activates_default(True) @@ -630,10 +640,10 @@ def __init__(self): self.show_all() - def focus(self): + def focus(self) -> None: self._ui.server_comboboxtext_sign_up_entry.grab_focus() - def _create_server_completion(self): + def _create_server_completion(self) -> None: # Parse servers.json file_path = configpaths.get('DATA') / 'other' / 'servers.json' servers = helpers.load_json(file_path, default=[]) @@ -650,7 +660,7 @@ def _create_server_completion(self): def _on_visit_server(self, _widget): server = self._ui.server_comboboxtext_sign_up_entry.get_text().strip() - server = 'https://' + server + server = f'https://{server}' open_uri(server) return Gdk.EVENT_STOP @@ -666,13 +676,13 @@ def _set_complete(self, *args): self.update_page_complete() - def is_anonymous(self): + def is_anonymous(self) -> bool: return self._ui.sign_up_anonymously.get_active() - def is_advanced(self): + def is_advanced(self) -> bool: return self._ui.sign_up_advanced_checkbutton.get_active() - def get_server(self): + def get_server(self) -> str: return validate_domainpart( self._ui.server_comboboxtext_sign_up_entry.get_text()) @@ -683,18 +693,18 @@ def _on_activate_link(_label, uri): open_uri(uri) return Gdk.EVENT_STOP - def get_visible_buttons(self): + def get_visible_buttons(self) -> List[str]: return ['back', 'signup'] - def get_default_button(self): + def get_default_button(self) -> str: return 'signup' class AdvancedSettings(Page): def __init__(self): Page.__init__(self) - self.title = _('Advanced settings') - self.complete = False + self.title: str = _('Advanced settings') + self.complete: bool = False self._ui = get_builder('account_wizard.ui') self._ui.manage_proxies_button.connect('clicked', @@ -710,7 +720,7 @@ def __init__(self): def _on_proxy_manager(_widget): app.app.activate_action('manage-proxies') - def update_proxy_list(self): + def update_proxy_list(self) -> None: model = Gtk.ListStore(str) self._ui.proxies_combobox.set_model(model) proxies = app.settings.get_proxies() @@ -719,11 +729,13 @@ def update_proxy_list(self): model.append([proxy]) self._ui.proxies_combobox.set_active(0) - def get_proxy(self): + def get_proxy(self) -> str: active = self._ui.proxies_combobox.get_active() return self._ui.proxies_combobox.get_model()[active][0] - def get_custom_host(self): + def get_custom_host(self) -> Optional[Tuple[str, + ConnectionProtocol, + ConnectionType]]: host = self._ui.custom_host_entry.get_text() port = self._ui.custom_port_entry.get_text() if not host or not port: @@ -735,21 +747,19 @@ def get_custom_host(self): if host.startswith('ws://') or host.startswith('wss://'): protocol = ConnectionProtocol.WEBSOCKET - return ('%s:%s' % (host, port), - protocol, - ConnectionType(con_type)) + return (f'{host}:{port}', protocol, ConnectionType(con_type)) - def _show_host_icon(self, show): + def _show_host_icon(self, show: bool) -> None: icon = 'dialog-warning-symbolic' if show else None self._ui.custom_host_entry.set_icon_from_icon_name( Gtk.EntryIconPosition.SECONDARY, icon) - def _show_port_icon(self, show): + def _show_port_icon(self, show: bool) -> None: icon = 'dialog-warning-symbolic' if show else None self._ui.custom_port_entry.set_icon_from_icon_name( Gtk.EntryIconPosition.SECONDARY, icon) - def _validate_host(self): + def _validate_host(self) -> bool: host = self._ui.custom_host_entry.get_text() if host.startswith('ws://') or host.startswith('wss://'): # We have no method for validating websocket URIs @@ -767,7 +777,7 @@ def _validate_host(self): self._show_host_icon(False) return True - def _validate_port(self): + def _validate_port(self) -> bool: port = self._ui.custom_port_entry.get_text() if not port: self._show_port_icon(False) @@ -791,12 +801,12 @@ def _validate_port(self): self._show_port_icon(False) return True - def _is_custom_host_set(self): + def _is_custom_host_set(self) -> bool: host = bool(self._ui.custom_host_entry.get_text()) port = bool(self._ui.custom_port_entry.get_text()) return host or port - def _is_proxy_set(self): + def _is_proxy_set(self) -> bool: return self._ui.proxies_combobox.get_active() != 0 def _set_complete(self, *args): @@ -811,19 +821,19 @@ def _set_complete(self, *args): self.update_page_complete() - def get_visible_buttons(self): + def get_visible_buttons(self) -> List[str]: return ['back', self.get_toplevel().get_currenct_method()] - def get_default_button(self): + def get_default_button(self) -> str: return self.get_toplevel().get_currenct_method() class SecurityWarning(Page): - def __init__(self): + def __init__(self) -> None: Page.__init__(self) - self.title = _('Security Warning') - self._cert = None - self._domain = None + self.title: str = _('Security Warning') + self._cert: Optional[Gio.TlsCertificate] = None + self._domain: Optional[str] = None self._ui = get_builder('account_wizard.ui') self.pack_start(self._ui.security_warning_box, True, True, 0) @@ -831,10 +841,14 @@ def __init__(self): self.show_all() @property - def cert(self): + def cert(self) -> Optional[Gio.TlsCertificate]: return self._cert - def set_warning(self, domain, cert, errors): + def set_warning(self, + domain: str, + cert: Gio.TlsCertificate, + errors: List[Gio.TlsCertificateFlags] + ) -> None: # Clear list self._cert = cert self._domain = domain @@ -866,22 +880,22 @@ def _on_view_cert(self, _button): cert=self._cert) @property - def trust_certificate(self): + def trust_certificate(self) -> bool: return self._ui.trust_cert_checkbutton.get_active() - def get_visible_buttons(self): + def get_visible_buttons(self) -> List[str]: return ['back', self.get_toplevel().get_currenct_method()] - def get_default_button(self): + def get_default_button(self) -> str: return 'back' class Form(Page): - def __init__(self): + def __init__(self) -> None: Page.__init__(self) self.set_valign(Gtk.Align.FILL) self.complete = False - self.title = _('Create Account') + self.title: str = _('Create Account') self._current_form = None heading = Gtk.Label(label=_('Create Account')) @@ -895,7 +909,7 @@ def __init__(self): self.show_all() @property - def has_form(self): + def has_form(self) -> bool: return self._current_form is not None def _on_is_valid(self, _widget, is_valid): @@ -913,14 +927,14 @@ def add_form(self, form): self.pack_start(self._current_form, True, True, 0) self._current_form.show_all() - def get_credentials(self): + def get_credentials(self) -> Tuple[str, str]: return (self._current_form.get_form()['username'].value, self._current_form.get_form()['password'].value) def get_submit_form(self): return self._current_form.get_submit_form() - def remove_form(self): + def remove_form(self) -> None: if self._current_form is None: return @@ -928,28 +942,28 @@ def remove_form(self): self._current_form.destroy() self._current_form = None - def focus(self): + def focus(self) -> None: self._current_form.focus_first_entry() - def get_visible_buttons(self): + def get_visible_buttons(self) -> List[str]: return ['back', 'signup'] - def get_default_button(self): + def get_default_button(self) -> str: return 'signup' class Redirect(Page): - def __init__(self): + def __init__(self) -> None: Page.__init__(self) - self.title = _('Redirect') - self._link = None + self.title: str = _('Redirect') + self._link: Optional[str] = None self._ui = get_builder('account_wizard.ui') self.pack_start(self._ui.redirect_box, True, True, 0) self._ui.link_button.connect('clicked', self._on_link_button) self.show_all() - def set_redirect(self, link, instructions): + def set_redirect(self, link: str, instructions: str) -> None: if instructions is None: instructions = _('Register on the Website') self._ui.instructions.set_text(instructions) @@ -958,33 +972,33 @@ def set_redirect(self, link, instructions): def _on_link_button(self, _button): open_uri(self._link) - def get_visible_buttons(self): + def get_visible_buttons(self) -> List[str]: return ['back'] class Success(SuccessPage): - def __init__(self): + def __init__(self) -> None: SuccessPage.__init__(self) self.set_title(_('Account Added')) self.set_heading(_('Account has been added successfully')) - self._account = None + self._account: Optional[str] = None - def set_account(self, account): + def set_account(self, account: str) -> None: self._account = account @property - def account(self): + def account(self) -> Optional[str]: return self._account - def get_visible_buttons(self): + def get_visible_buttons(self) -> List[str]: return ['connect'] class Error(ErrorPage): - def __init__(self): + def __init__(self) -> None: ErrorPage.__init__(self) self.set_heading(_('An error occurred during account creation')) - def get_visible_buttons(self): + def get_visible_buttons(self) -> List[str]: return ['back'] ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -35,7 +35,7 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_name('CreateGroupchat') self.set_application(app.app) @@ -49,7 +49,7 @@ def __init__(self, account): self._ui = get_builder('groupchat_creation.ui') self.add(self._ui.create_group_chat) - self._destroyed = False + self._destroyed: bool = False self._account = self._fill_account_combo(account) @@ -63,11 +63,11 @@ def __init__(self, account): self.show_all() self.set_focus(self._ui.address_entry) - def _get_muc_service_jid(self): + def _get_muc_service_jid(self) -> str: con = app.connections[self._account] return str(con.get_module('MUC').service_jid or 'muc.example.com') - def _fill_account_combo(self, account): + def _fill_account_combo(self, account: str) -> str: accounts = app.get_enabled_accounts_with_labels(connected_only=True) account_liststore = self._ui.account_combo.get_model() for acc in accounts: @@ -84,7 +84,7 @@ def _fill_account_combo(self, account): self._ui.account_combo.set_active_id(account) return account - def _create_entry_completion(self): + def _create_entry_completion(self) -> None: entry_completion = Gtk.EntryCompletion() model = Gtk.ListStore(str) entry_completion.set_model(model) @@ -95,7 +95,7 @@ def _create_entry_completion(self): self._ui.address_entry.set_completion(entry_completion) - def _fill_placeholders(self): + def _fill_placeholders(self) -> None: placeholder = random.choice(MUC_CREATION_EXAMPLES) server = self._get_muc_service_jid() @@ -104,7 +104,7 @@ def _fill_placeholders(self): self._ui.description_entry.set_placeholder_text( placeholder[1] + _(' (optional)...')) self._ui.address_entry.set_placeholder_text( - '%s@%s' % (placeholder[2], server)) + f'{placeholder[2]}@{server}') def _on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: @@ -123,9 +123,9 @@ def _update_entry_completion(self, entry, text): model.clear() server = self._get_muc_service_jid() - model.append(['%s@%s' % (text, server)]) + model.append([f'{text}@{server}']) - def _validate_jid(self, text): + def _validate_jid(self, text: str) -> None: if not text: self._set_warning_icon(False) self._ui.create_button.set_sensitive(False) @@ -142,7 +142,7 @@ def _validate_jid(self, text): self._set_warning_icon(False) self._ui.create_button.set_sensitive(True) - def _set_processing_state(self, enabled): + def _set_processing_state(self, enabled: bool) -> None: if enabled: self._ui.spinner.start() self._ui.create_button.set_sensitive(False) @@ -150,28 +150,28 @@ def _set_processing_state(self, enabled): self._ui.spinner.stop() self._ui.grid.set_sensitive(not enabled) - def _set_warning_icon(self, enabled): + def _set_warning_icon(self, enabled: bool) -> None: icon = 'dialog-warning-symbolic' if enabled else None self._ui.address_entry.set_icon_from_icon_name( Gtk.EntryIconPosition.SECONDARY, icon) - def _set_warning_tooltip(self, text): + def _set_warning_tooltip(self, text: str) -> None: self._ui.address_entry.set_icon_tooltip_text( Gtk.EntryIconPosition.SECONDARY, text) - def _set_warning(self, text): + def _set_warning(self, text: str) -> None: self._set_warning_icon(True) self._set_warning_tooltip(text) self._ui.create_button.set_sensitive(False) - def _set_warning_from_error(self, error): + def _set_warning_from_error(self, error: StanzaError) -> None: condition = error.condition if condition == 'gone': condition = 'already-exists' text = MUC_DISCO_ERRORS.get(condition, to_user_string(error)) self._set_warning(text) - def _set_warning_from_error_code(self, error_code): + def _set_warning_from_error_code(self, error_code: str) -> None: self._set_warning(MUC_DISCO_ERRORS[error_code]) def _on_address_entry_changed(self, entry): @@ -212,7 +212,7 @@ def _disco_info_received(self, task): self._set_processing_state(False) - def _create_muc(self, room_jid): + def _create_muc(self, room_jid: str) -> None: name = self._ui.name_entry.get_text() description = self._ui.description_entry.get_text() is_public = self._ui.public_switch.get_active() ===================================== gajim/gtk/main.py ===================================== @@ -222,7 +222,6 @@ def _on_action(self, action, _param): control = self.get_active_control() if control is None: return None - log.info('Activate action: %s, active control: %s', action.get_name(), control.contact.jid) @@ -281,6 +280,8 @@ def _on_action(self, action, _param): self.select_chat_number(number) return None + return None + def _on_window_motion_notify(self, _widget, _event): control = self.get_active_control() if control is None: ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -12,11 +12,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from gi.repository import Gtk from gi.repository import Gio +from gi.repository import Gtk from gajim.common import app +from gajim.common.client import Client from gajim.common.const import GIO_TLS_ERRORS from gajim.common.i18n import _ @@ -26,7 +26,12 @@ class SSLErrorDialog(Gtk.ApplicationWindow): - def __init__(self, account, client, cert, error): + def __init__(self, + account: str, + client: Client, + cert: Gio.TlsCertificate, + error: Gio.TlsCertificateFlags + ) -> None: Gtk.ApplicationWindow.__init__(self) self.set_name('SSLErrorDialog') self.set_application(app.app) @@ -50,7 +55,7 @@ def __init__(self, account, client, cert, error): self._ui.connect_signals(self) self.show_all() - def _process_error(self): + def _process_error(self) -> None: self._ui.intro_text.set_text( _('There was an error while attempting to verify the SSL ' 'certificate of your XMPP server (%s).') % self._server) ===================================== gajim/gui_interface.py ===================================== @@ -31,6 +31,10 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Dict +from typing import Optional +from typing import Union + import os import sys import time @@ -72,6 +76,7 @@ from gajim.common.client import Client from gajim.common.preview import PreviewManager from gajim.common.const import Display +from gajim.common.file_props import FileProp from gajim.common.connection_handlers_events import InformationEvent @@ -123,7 +128,7 @@ def __init__(self): self.handle_event_file_progress, self.handle_event_file_error) - self._last_ft_progress_update = 0 + self._last_ft_progress_update: float = 0 app.proxy65_manager = proxy65_manager.Proxy65Manager(app.idlequeue) @@ -149,19 +154,19 @@ def __init__(self): self.instances = {} - for a in app.connections: - self.instances[a] = { + for acc in app.connections: + self.instances[acc] = { 'infos': {}, 'disco': {} } - app.contacts.add_account(a) - app.groups[a] = {} - app.gc_connected[a] = {} - app.automatic_rooms[a] = {} - app.newly_added[a] = [] - app.to_be_removed[a] = [] - app.nicks[a] = app.settings.get_account_setting(a, 'name') - app.block_signed_in_notifications[a] = True + app.contacts.add_account(acc) + app.groups[acc] = {} + app.gc_connected[acc] = {} + app.automatic_rooms[acc] = {} + 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 if sys.platform not in ('win32', 'darwin'): logind.enable() @@ -172,7 +177,7 @@ def __init__(self): idle.Monitor.set_interval(app.settings.get('autoawaytime') * 60, app.settings.get('autoxatime') * 60) - self.systray_enabled = False + self.systray_enabled: bool = False if not app.is_display(Display.WAYLAND): from gajim.gui.status_icon import StatusIcon @@ -185,10 +190,10 @@ def __init__(self): self._network_monitor = Gio.NetworkMonitor.get_default() self._network_monitor.connect('notify::network-available', self._network_status_changed) - self._network_state = self._network_monitor.get_network_available() + self._network_state: bool = self._network_monitor.get_network_available() def _create_core_handlers_list(self): - # pyline: disable=line-too-long + # pylint: disable=line-too-long self.handlers = { 'information': [self.handle_event_information], 'iq-error-received': [self.handle_event_iq_error], @@ -225,7 +230,7 @@ def _register_core_handlers(self): prio, event_handler) - def handle_event(self, account, jid, notif_detail): + def handle_event(self, account: str, jid: str, notif_detail: str) -> None: jid = JID.from_string(jid) if notif_detail in ('connection-lost', 'connection-failed'): @@ -423,7 +428,7 @@ def handle_event_status(self, event): event.account) @staticmethod - def _unblock_signed_in_notifications(account): + def _unblock_signed_in_notifications(account: str) -> None: app.block_signed_in_notifications[account] = False @staticmethod @@ -489,11 +494,14 @@ def handle_event_roster_item_exchange(event): # Jingle File Transfer @staticmethod - def handle_event_file_error(title, message): + def handle_event_file_error(title: str, message: str) -> None: # TODO: integrate this better ErrorDialog(title, message) - def handle_event_file_progress(self, _account, file_props): + def handle_event_file_progress(self, + _account: str, + file_props: FileProp + ) -> None: if time.time() - self._last_ft_progress_update < 0.5: # Update progress every 500ms only return @@ -502,7 +510,10 @@ def handle_event_file_progress(self, _account, file_props): app.nec.push_incoming_event( NetworkEvent('file-progress', file_props=file_props)) - def handle_event_file_rcv_completed(self, account, file_props): + def handle_event_file_rcv_completed(self, + account: str, + file_props: FileProp + ) -> None: jid = JID.from_string(file_props.receiver) if file_props.error != 0: self.instances['file_transfers'].set_status(file_props, 'stop') @@ -560,7 +571,8 @@ def handle_event_file_rcv_completed(self, account, file_props): account=account, jid=jid.bare)) - def __compare_hashes(self, account, file_props): + @staticmethod + def __compare_hashes(account: str, file_props: FileProp) -> None: hashes = Hashes2() try: file_ = open(file_props.file_name, 'rb') @@ -651,7 +663,11 @@ def _on_cancel_upload(self, transfer, _signal_name): client = app.get_client(transfer.account) client.get_module('HTTPUpload').cancel_transfer(transfer) - def create_groupchat(self, account, room_jid, config): + @staticmethod + def create_groupchat(account: str, + room_jid: str, + config: Dict[str, Union[str, bool]] + ) -> None: if app.window.chat_exists(account, room_jid): log.error('Trying to create groupchat ' 'which is already added as chat') @@ -660,18 +676,27 @@ def create_groupchat(self, account, room_jid, config): client = app.get_client(account) client.get_module('MUC').create(room_jid, config) - def show_add_join_groupchat(self, account, jid, nickname=None, - password=None): - if not app.window.chat_exists(account, jid): + @staticmethod + def show_add_join_groupchat(account: str, + jid: str, + nickname: Optional[str] = None, + password: Optional[str] = None + ) -> None: + if not app.window.chat_exists(account, JID.from_string(jid)): client = app.get_client(account) client.get_module('MUC').join( jid, nick=nickname, password=password) app.window.add_group_chat(account, jid, select=True) - def start_chat_from_jid(self, account, jid, message=None): + @staticmethod + def start_chat_from_jid(account: str, + jid: str, + message: Optional[str] = None + ) -> None: + jid = JID.from_string(jid) if app.window.chat_exists(account, jid): - app.window.select_chat(account, JID.from_string(jid)) + app.window.select_chat(account, jid) if message is not None: control = app.window.get_control(account, jid) if control is None: @@ -680,7 +705,7 @@ def start_chat_from_jid(self, account, jid, message=None): return # TODO: handle message arg in StartChat - app.app.activate_action('start-chat', GLib.Variant('s', jid)) + app.app.activate_action('start-chat', GLib.Variant('s', str(jid))) @staticmethod def _on_muc_added(event): @@ -690,13 +715,14 @@ def _on_muc_added(event): app.window.add_group_chat(event.account, event.jid) @staticmethod - def create_account(account, - username, - domain, - password, - proxy_name, - custom_host, - anonymous=False): + def create_account(account: str, + username: str, + domain: str, + password: str, + proxy_name: str, + custom_host: str, + anonymous:bool = False + ) -> None: account_label = f'{username}@{domain}' if anonymous: @@ -706,10 +732,9 @@ def create_account(account, config = {} config['active'] = False config['name'] = username - config['resource'] = 'gajim.%s' % helpers.get_random_string(8) + config['resource'] = f'gajim.{helpers.get_random_string(8)}' config['account_label'] = account_label - config['account_color'] = get_color_for_account( - '%s@%s' % (username, domain)) + config['account_color'] = get_color_for_account(f'{username}@{domain}') config['hostname'] = domain config['savepass'] = True config['anonymous_auth'] = anonymous @@ -744,7 +769,7 @@ def create_account(account, if window is not None: window.add_account(account) - def enable_account(self, account): + def enable_account(self, account: str) -> None: if account == app.ZEROCONF_ACC_NAME: app.connections[account] = connection_zeroconf.ConnectionZeroconf( account) @@ -789,7 +814,7 @@ def enable_account(self, account): if window is not None: GLib.idle_add(window.enable_account, account, True) - def disable_account(self, account): + def disable_account(self, account: str) -> None: for win in get_app_windows(account): # Close all account specific windows, except the RemoveAccount # dialog. It shows if the removal was successful. @@ -820,7 +845,7 @@ def disable_account(self, account): del app.to_be_removed[account] del app.newly_added[account] - def remove_account(self, account): + def remove_account(self, account: str) -> None: if app.settings.get_account_setting(account, 'active'): self.disable_account(account) @@ -835,7 +860,7 @@ def remove_account(self, account): if window is not None: window.remove_account(account) - def autoconnect(self): + def autoconnect(self) -> None: """ Auto connect at startup """ @@ -856,7 +881,10 @@ def autoconnect(self): app.connections[account].change_status(status, status_message) - def change_status(self, status, account=None): + def change_status(self, + status: str, + account: Optional[str] = None + ) -> None: ask = ask_for_status_message(status) if status is None: @@ -880,7 +908,7 @@ def change_status(self, status, account=None): self._change_status(acc, status) - def change_account_status(self, account, status): + def change_account_status(self, account: str, status: str) -> None: ask = ask_for_status_message(status) client = app.get_client(account) @@ -894,7 +922,7 @@ def change_account_status(self, account, status): self._change_status(account, status) @staticmethod - def _change_status(account, status): + def _change_status(account: str, status: str) -> None: client = app.get_client(account) message = client.status_message if status != 'offline': @@ -911,17 +939,17 @@ def _change_status(account, status): client.change_status(status, message) - def show_systray(self): + def show_systray(self) -> None: if not app.is_display(Display.WAYLAND): self.systray_enabled = True self.systray.show_icon() - def hide_systray(self): + def hide_systray(self) -> None: if not app.is_display(Display.WAYLAND): self.systray_enabled = False self.systray.hide_icon() - def process_connections(self): + def process_connections(self) -> bool: """ Called each foo (200) milliseconds. Check for idlequeue timeouts """ @@ -949,10 +977,10 @@ def process_connections(self): return True # renew timeout (loop for ever) @staticmethod - def save_config(): + def save_config() -> None: app.settings.save() - def save_avatar(self, data): + def save_avatar(self, data: bytes) -> Optional[str]: return self.avatar_storage.save_avatar(data) def get_avatar(self, @@ -968,11 +996,11 @@ def get_avatar(self, return self.avatar_storage.get_surface( contact, size, scale, show, style=style) - def avatar_exists(self, filename): + def avatar_exists(self, filename: str) -> bool: return self.avatar_storage.get_avatar_path(filename) is not None @staticmethod - def create_ipython_window(): + def create_ipython_window() -> None: # Check if IPython is installed ipython = find_spec('IPython') is_installed = ipython is not None @@ -1027,7 +1055,7 @@ def _network_status_changed(self, monitor, _param): connection.state.is_available): connection.disconnect(gracefully=False, reconnect=True) - def create_zeroconf_default_config(self): + def create_zeroconf_default_config(self) -> None: if app.settings.get_account_setting(app.ZEROCONF_ACC_NAME, 'name'): return log.info('Creating zeroconf account') @@ -1057,7 +1085,7 @@ def create_zeroconf_default_config(self): 'active', False) - def check_for_updates(self): + def check_for_updates(self) -> None: if not app.settings.get('check_for_update'): return @@ -1073,10 +1101,10 @@ def check_for_updates(self): self.get_latest_release() - def get_latest_release(self): + def get_latest_release(self) -> None: log.info('Checking for Gajim updates') session = Soup.Session() - session.props.user_agent = 'Gajim %s' % app.version + session.props.user_agent = f'Gajim {app.version}' message = Soup.Message.new( 'GET', 'https://gajim.org/current-version.json') session.queue_message(message, self._on_update_checked) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/09b4b7e9cccc082dd883fea9490bc0f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/09b4b7e9cccc082dd883fea9490bc0f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Windows Build: Remove obsolete URL Image Preview plugin
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 09b4b7e9 by wurstsalat at 2021-11-27T10:49:30+01:00 Windows Build: Remove obsolete URL Image Preview plugin - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -150,10 +150,6 @@ function install_gajim { mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip - # Install preview plugin - curl -o "${BUILD_ROOT}"/url_image_preview.zip https://ftp.gajim.org/plugins_master_zip/url_image_preview.zip - 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/url_image_preview.zip - # Install omemo plugin curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins_master_zip/omemo.zip 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/omemo.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/09b4b7e9cccc082dd883fea9490bc0fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/09b4b7e9cccc082dd883fea9490bc0fe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Readme: Update dependencies
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6ea1fb71 by wurstsalat at 2021-11-27T01:14:19+01:00 Readme: Update dependencies - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -15,6 +15,7 @@ ### Runtime Requirements - python3-packaging - python3-setuptools - gir1.2-soup-2.4 +- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0, gstreamer1.0-plugins-ugly, gstreamer1.0-libav, and gstreamer1.0-gtk3 for audio and video calls - GLib (>=2.60.0) ### Optional Runtime Requirements @@ -24,7 +25,6 @@ ### Optional Runtime Requirements - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working -- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0, gstreamer1.0-plugins-ugly, gstreamer1.0-libav, and gstreamer1.0-gtk3 for audio and video calls - gir1.2-gupnpigd-1.0 for better NAT traversing - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ea1fb71f5e23e1b66fb62d08a840d42… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ea1fb71f5e23e1b66fb62d08a840d42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Dialogs: Typing
by Daniel Brötzmann (＠wurstsalat) 27 Nov '21

27 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6c6146b2 by wurstsalat at 2021-11-27T00:55:34+01:00 Dialogs: Typing - - - - - 5b94336a by wurstsalat at 2021-11-27T01:07:22+01:00 Move CertificateDialog - - - - - 3 changed files: - + gajim/gtk/certificate_dialog.py - gajim/gtk/const.py - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -0,0 +1,120 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from datetime import datetime + +from gi.repository import Gdk +from gi.repository import Gio +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.helpers import convert_gio_to_openssl_cert +from gajim.common.i18n import _ + +from .util import get_builder + + +class CertificateDialog(Gtk.ApplicationWindow): + def __init__(self, + transient_for: Gtk.Window, + account: str, + cert: Gio.TlsCertificate + ) -> None: + Gtk.ApplicationWindow.__init__(self) + self.account = account + self.set_name('CertificateDialog') + self.set_application(app.app) + self.set_show_menubar(False) + self.set_resizable(False) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_title(_('Certificate')) + + self._ui = get_builder('certificate_dialog.ui') + self.add(self._ui.certificate_box) + + self.connect('key-press-event', self._on_key_press) + + self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + + cert = convert_gio_to_openssl_cert(cert) + # Get data for labels and copy button + issuer = cert.get_issuer() + subject = cert.get_subject() + + self._headline = _('Certificate for \n%s') % self.account + self._it_common_name = subject.commonName or '' + self._it_organization = subject.organizationName or '' + self._it_org_unit = subject.organizationalUnitName or '' + it_serial_no = str(cert.get_serial_number()) + it_serial_no_half = int(len(it_serial_no) / 2) + self._it_serial_number = '%s\n%s' % ( + it_serial_no[:it_serial_no_half], + it_serial_no[it_serial_no_half:]) + self._ib_common_name = issuer.commonName or '' + self._ib_organization = issuer.organizationName or '' + self._ib_org_unit = issuer.organizationalUnitName or '' + issued = datetime.strptime(cert.get_notBefore().decode('ascii'), + '%Y%m%d%H%M%SZ') + self._issued = issued.strftime('%c %Z') + expires = datetime.strptime(cert.get_notAfter().decode('ascii'), + '%Y%m%d%H%M%SZ') + self._expires = expires.strftime('%c %Z') + sha1 = cert.digest('sha1').decode('utf-8') + self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) + sha256 = cert.digest('sha256').decode('utf-8') + self._sha256 = '%s\n%s\n%s\n%s' % ( + sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) + + # Set labels + self._ui.label_cert_for_account.set_text(self._headline) + self._ui.data_it_common_name.set_text(self._it_common_name) + self._ui.data_it_organization.set_text(self._it_organization) + self._ui.data_it_organizational_unit.set_text(self._it_org_unit) + self._ui.data_it_serial_number.set_text(self._it_serial_number) + self._ui.data_ib_common_name.set_text(self._ib_common_name) + self._ui.data_ib_organization.set_text(self._ib_organization) + self._ui.data_ib_organizational_unit.set_text(self._ib_org_unit) + self._ui.data_issued_on.set_text(self._issued) + self._ui.data_expires_on.set_text(self._expires) + self._ui.data_sha1.set_text(self._sha1) + self._ui.data_sha256.set_text(self._sha256) + + self.set_transient_for(transient_for) + self._ui.connect_signals(self) + self.show_all() + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _on_copy_cert_info_button_clicked(self, _widget): + clipboard_text = \ + self._headline + '\n\n' + \ + _('Issued to\n') + \ + _('Common Name (CN): ') + self._it_common_name + '\n' + \ + _('Organization (O): ') + self._it_organization + '\n' + \ + _('Organizational Unit (OU): ') + self._it_org_unit + '\n' + \ + _('Serial Number: ') + self._it_serial_number + '\n\n' + \ + _('Issued by\n') + \ + _('Common Name (CN): ') + self._ib_common_name + '\n' + \ + _('Organization (O): ') + self._ib_organization + '\n' + \ + _('Organizational Unit (OU): ') + self._ib_org_unit + '\n\n' + \ + _('Validity\n') + \ + _('Issued on: ') + self._issued + '\n' + \ + _('Expires on: ') + self._expires + '\n\n' + \ + _('SHA-1:') + '\n' + \ + self._sha1 + '\n' + \ + _('SHA-256:') + '\n' + \ + self._sha256 + '\n' + self._clipboard.set_text(clipboard_text, -1) ===================================== gajim/gtk/const.py ===================================== @@ -129,7 +129,7 @@ def __str__(self): 'SSLErrorDialog': 'gajim.gui.ssl_error_dialog', 'Themes': 'gajim.gui.themes', 'AdvancedConfig': 'gajim.gui.advanced_config', - 'CertificateDialog': 'gajim.gui.dialogs', + 'CertificateDialog': 'gajim.gui.certificate_dialog', 'RemoveAccount': 'gajim.gui.remove_account', 'ChangePassword': 'gajim.gui.change_password', 'PluginsWindow': 'gajim.plugins.gui', ===================================== gajim/gtk/dialogs.py ===================================== @@ -12,18 +12,19 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from datetime import datetime +from typing import Dict +from typing import List +from typing import Optional + from collections import namedtuple from gi.repository import Gtk -from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import Pango from gajim.common import app from gajim.common.i18n import _ from gajim.common.const import ButtonAction -from gajim.common.helpers import convert_gio_to_openssl_cert from .util import get_builder from .util import get_thumbnail_size @@ -203,100 +204,15 @@ def __init__(self, self.popup() -class CertificateDialog(Gtk.ApplicationWindow): - def __init__(self, transient_for, account, cert): - Gtk.ApplicationWindow.__init__(self) - self.account = account - self.set_name('CertificateDialog') - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(False) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_title(_('Certificate')) - - self._ui = get_builder('certificate_dialog.ui') - self.add(self._ui.certificate_box) - - self.connect('key-press-event', self._on_key_press) - - self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - - cert = convert_gio_to_openssl_cert(cert) - # Get data for labels and copy button - issuer = cert.get_issuer() - subject = cert.get_subject() - - self._headline = _('Certificate for \n%s') % self.account - self._it_common_name = subject.commonName or '' - self._it_organization = subject.organizationName or '' - self._it_org_unit = subject.organizationalUnitName or '' - it_serial_no = str(cert.get_serial_number()) - it_serial_no_half = int(len(it_serial_no) / 2) - self._it_serial_number = '%s\n%s' % ( - it_serial_no[:it_serial_no_half], - it_serial_no[it_serial_no_half:]) - self._ib_common_name = issuer.commonName or '' - self._ib_organization = issuer.organizationName or '' - self._ib_org_unit = issuer.organizationalUnitName or '' - issued = datetime.strptime(cert.get_notBefore().decode('ascii'), - '%Y%m%d%H%M%SZ') - self._issued = issued.strftime('%c %Z') - expires = datetime.strptime(cert.get_notAfter().decode('ascii'), - '%Y%m%d%H%M%SZ') - self._expires = expires.strftime('%c %Z') - sha1 = cert.digest('sha1').decode('utf-8') - self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) - sha256 = cert.digest('sha256').decode('utf-8') - self._sha256 = '%s\n%s\n%s\n%s' % ( - sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) - - # Set labels - self._ui.label_cert_for_account.set_text(self._headline) - self._ui.data_it_common_name.set_text(self._it_common_name) - self._ui.data_it_organization.set_text(self._it_organization) - self._ui.data_it_organizational_unit.set_text(self._it_org_unit) - self._ui.data_it_serial_number.set_text(self._it_serial_number) - self._ui.data_ib_common_name.set_text(self._ib_common_name) - self._ui.data_ib_organization.set_text(self._ib_organization) - self._ui.data_ib_organizational_unit.set_text(self._ib_org_unit) - self._ui.data_issued_on.set_text(self._issued) - self._ui.data_expires_on.set_text(self._expires) - self._ui.data_sha1.set_text(self._sha1) - self._ui.data_sha256.set_text(self._sha256) - - self.set_transient_for(transient_for) - self._ui.connect_signals(self) - self.show_all() - - def _on_key_press(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - def _on_copy_cert_info_button_clicked(self, _widget): - clipboard_text = \ - self._headline + '\n\n' + \ - _('Issued to\n') + \ - _('Common Name (CN): ') + self._it_common_name + '\n' + \ - _('Organization (O): ') + self._it_organization + '\n' + \ - _('Organizational Unit (OU): ') + self._it_org_unit + '\n' + \ - _('Serial Number: ') + self._it_serial_number + '\n\n' + \ - _('Issued by\n') + \ - _('Common Name (CN): ') + self._ib_common_name + '\n' + \ - _('Organization (O): ') + self._ib_organization + '\n' + \ - _('Organizational Unit (OU): ') + self._ib_org_unit + '\n\n' + \ - _('Validity\n') + \ - _('Issued on: ') + self._issued + '\n' + \ - _('Expires on: ') + self._expires + '\n\n' + \ - _('SHA-1:') + '\n' + \ - self._sha1 + '\n' + \ - _('SHA-256:') + '\n' + \ - self._sha256 + '\n' - self._clipboard.set_text(clipboard_text, -1) - - class ConfirmationDialog(Gtk.MessageDialog): - def __init__(self, title, text, sec_text, buttons, - modal=True, transient_for=None): + def __init__(self, + title: str, + text: str, + sec_text: str, + buttons: List[DialogButton], + modal: bool = True, + transient_for: Optional[Gtk.Window] = None + ) -> None: if transient_for is None: transient_for = app.app.get_active_window() Gtk.MessageDialog.__init__(self, @@ -308,7 +224,7 @@ def __init__(self, title, text, sec_text, buttons, self.get_style_context().add_class('confirmation-dialog') - self._buttons = {} + self._buttons: Dict[Gtk.ResponseType, DialogButton] = {} for button in buttons: self._buttons[button.response] = button @@ -323,7 +239,10 @@ def __init__(self, title, text, sec_text, buttons, self.connect('response', self._on_response) - def _on_response(self, _dialog, response): + def _on_response(self, + _dialog: Gtk.MessageDialog, + response: Gtk.ResponseType + ) -> None: if response == Gtk.ResponseType.DELETE_EVENT: # Look if DELETE_EVENT is mapped to another response response = self._buttons.get(response, None) @@ -340,7 +259,7 @@ def _on_response(self, _dialog, response): button.callback(*button.args, **button.kwargs) self.destroy() - def show(self): + def show(self) -> None: self.show_all() @@ -348,8 +267,15 @@ def show(self): class ConfirmationCheckDialog(ConfirmationDialog): - def __init__(self, title, text, sec_text, check_text, - buttons, modal=True, transient_for=None): + def __init__(self, + title: str, + text: str, + sec_text: str, + check_text: str, + buttons: List[DialogButton], + modal: bool = True, + transient_for: Optional[Gtk.Window] = None + ) -> None: ConfirmationDialog.__init__(self, title, text, @@ -371,7 +297,10 @@ def __init__(self, title, text, sec_text, check_text, self.get_content_area().add(self._checkbutton) - def _on_response(self, _dialog, response): + def _on_response(self, + _dialog: Gtk.MessageDialog, + response: Gtk.ResponseType + ) -> None: button = self._buttons.get(response) if button is not None: button.args.insert(0, self._checkbutton.get_active()) @@ -382,8 +311,16 @@ def _on_response(self, _dialog, response): class PastePreviewDialog(ConfirmationCheckDialog): - def __init__(self, title, text, sec_text, check_text, image, - buttons, modal=True, transient_for=None): + def __init__(self, + title: str, + text: str, + sec_text: str, + check_text: str, + image: GdkPixbuf.Pixbuf, + buttons: List[DialogButton], + modal: bool = True, + transient_for: Optional[Gtk.Window] = None + ) -> None: ConfirmationCheckDialog.__init__(self, title, text, @@ -414,8 +351,15 @@ def __init__(self, title, text, sec_text, check_text, image, class InputDialog(ConfirmationDialog): - def __init__(self, title, text, sec_text, buttons, input_str=None, - transient_for=None, modal=True): + def __init__(self, + title: str, + text: str, + sec_text: str, + buttons: List[DialogButton], + input_str: Optional[str] = None, + modal: bool = True, + transient_for: Optional[Gtk.Window] = None, + ) -> None: ConfirmationDialog.__init__(self, title, text, @@ -435,7 +379,10 @@ def __init__(self, title, text, sec_text, buttons, input_str=None, self.get_content_area().add(self._entry) - def _on_response(self, _dialog, response): + def _on_response(self, + _dialog: Gtk.MessageDialog, + response: Gtk.ResponseType + ) -> None: button = self._buttons.get(response) if button is not None: button.args.insert(0, self._entry.get_text()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/770a387d04bd97358bd6b30143f835d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/770a387d04bd97358bd6b30143f835d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MessageInputTextView: Typing
by Daniel Brötzmann (＠wurstsalat) 26 Nov '21

26 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 770a387d by wurstsalat at 2021-11-27T00:39:03+01:00 MessageInputTextView: Typing - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -17,6 +17,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Optional +from typing import Dict +from typing import List +from typing import Tuple + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib @@ -27,23 +32,22 @@ from gajim.common import app from gajim.common.regex import LINK_REGEX +from .util import convert_rgba_to_hex from .util import scroll_to_end if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports +UNDO_LIMIT: int = 20 + class MessageInputTextView(Gtk.TextView): """ - Class for the message textview (where user writes new messages) for - chat/groupchat windows + A Gtk.Textview for chat message input """ - UNDO_LIMIT = 20 - def __init__(self): Gtk.TextView.__init__(self) - # set properties self.set_border_width(3) self.set_accepts_tab(True) self.set_editable(True) @@ -57,18 +61,14 @@ def __init__(self): self.drag_dest_unset() - # set undo list - self.undo_list = [] - # needed to know if we undid something - self.undo_pressed = False - - self._last_text = '' + self.undo_list: List[str] = [] + self.undo_pressed: bool = False - self.begin_tags = {} - self.end_tags = {} - self.color_tags = [] - self.fonts_tags = [] - self.other_tags = {} + self.begin_tags: Dict[str, str] = {} + self.end_tags: Dict[str, str] = {} + self.color_tags: List[str] = [] + self.fonts_tags: List[str] = [] + self.other_tags: Dict[str, Gtk.TextTag] = {} buffer_ = self.get_buffer() self.other_tags['bold'] = buffer_.create_tag('bold') @@ -80,8 +80,8 @@ def __init__(self): self.begin_tags['italic'] = '' self.end_tags['italic'] = '' self.other_tags['underline'] = buffer_.create_tag('underline') - self.other_tags['underline'].set_property('underline', - Pango.Underline.SINGLE) + self.other_tags['underline'].set_property( + 'underline', Pango.Underline.SINGLE) underline = '' self.begin_tags['underline'] = underline self.end_tags['underline'] = '' @@ -120,10 +120,10 @@ def _on_focus_out(self, _widget, _event): self.toggle_speller(False) return False - def insert_text(self, text): + def insert_text(self, text: str) -> None: self.get_buffer().insert_at_cursor(text) - def insert_newline(self): + def insert_newline(self) -> None: buffer_ = self.get_buffer() buffer_.insert_at_cursor('\n') mark = buffer_.get_insert() @@ -131,19 +131,19 @@ def insert_newline(self): if buffer_.get_end_iter().equal(iter_): GLib.idle_add(scroll_to_end, self.get_parent()) - def has_text(self): + def has_text(self) -> bool: buf = self.get_buffer() start, end = buf.get_bounds() text = buf.get_text(start, end, True) return text != '' - def get_text(self): + def get_text(self) -> str: buf = self.get_buffer() start, end = buf.get_bounds() text = self.get_buffer().get_text(start, end, True) return text - def toggle_speller(self, activate): + def toggle_speller(self, activate: bool) -> None: if app.is_installed('GSPELL') and app.settings.get('use_speller'): spell_view = Gspell.TextView.get_from_gtk_text_view(self) spell_view.set_inline_spell_checking(activate) @@ -156,7 +156,7 @@ def _after_paste_clipboard(textview): if iter_.get_offset() == buffer_.get_end_iter().get_offset(): GLib.idle_add(scroll_to_end, textview.get_parent()) - def make_clickable_urls(self, text): + def make_clickable_urls(self, text: str) -> str: _buffer = self.get_buffer() start = 0 @@ -173,24 +173,22 @@ def make_clickable_urls(self, text): else: text_before_special_text = '' # we insert normal text - new_text += text_before_special_text + \ - '<a href="'+ url +'">' + url + '</a>' - - index = end # update index + new_text += f'{text_before_special_text}<a href="{url}">{url}</a>' + index = end # update index if end < len(text): new_text += text[end:] - return new_text # the position after *last* special text + return new_text # the position after *last* special text - def get_active_tags(self): + def get_active_tags(self) -> List[str]: start = self.get_active_iters()[0] active_tags = [] for tag in start.get_tags(): active_tags.append(tag.get_property('name')) return active_tags - def get_active_iters(self): + def get_active_iters(self) -> Tuple[Gtk.TextIter, Gtk.TextIter]: _buffer = self.get_buffer() return_val = _buffer.get_selection_bounds() if return_val: # if sth was selected @@ -199,7 +197,7 @@ def get_active_iters(self): start, finish = _buffer.get_bounds() return (start, finish) - def set_tag(self, tag): + def set_tag(self, tag: str) -> None: _buffer = self.get_buffer() start, finish = self.get_active_iters() if start.has_tag(self.other_tags[tag]): @@ -211,7 +209,7 @@ def set_tag(self, tag): _buffer.remove_tag_by_name('underline', start, finish) _buffer.apply_tag_by_name(tag, start, finish) - def clear_tags(self): + def clear_tags(self) -> None: _buffer = self.get_buffer() start, finish = self.get_active_iters() _buffer.remove_all_tags(start, finish) @@ -224,16 +222,13 @@ def color_set(self, widget, response): color = widget.get_property('rgba') widget.destroy() _buffer = self.get_buffer() - # Create #aabbcc color string from rgba color - color_string = '#%02X%02X%02X' % (round(color.red*255), - round(color.green*255), - round(color.blue*255)) + color_string = convert_rgba_to_hex(color) tag_name = 'color' + color_string if not tag_name in self.color_tags: tag_color = _buffer.create_tag(tag_name) tag_color.set_property('foreground', color_string) - begin = '' % color_string + begin = f'' self.begin_tags[tag_name] = begin self.end_tags[tag_name] = '' self.color_tags.append(tag_name) @@ -265,10 +260,9 @@ def font_set(self, widget, response, start, finish): tag_name = 'font' + font if not tag_name in self.fonts_tags: tag_font = _buffer.create_tag(tag_name) - tag_font.set_property('font', family + ' ' + str(size)) - self.begin_tags[tag_name] = \ - '' + tag_font.set_property('font', f'{family} {size}') + beg = f'' + self.begin_tags[tag_name] = beg self.end_tags[tag_name] = '' self.fonts_tags.append(tag_name) @@ -287,7 +281,7 @@ def font_set(self, widget, response, start, finish): else: _buffer.remove_tag_by_name('italic', start, finish) - def get_xhtml(self): + def get_xhtml(self) -> Optional[str]: _buffer = self.get_buffer() old = _buffer.get_start_iter() tags = {} @@ -353,11 +347,11 @@ def xhtml_special(text): text += self.end_tags[tag_name] if modified: - wrapped_text = '%s' % self.make_clickable_urls(text) + wrapped_text = f'{self.make_clickable_urls(text)}' return build_xhtml_body(wrapped_text) return None - def replace_emojis(self): + def replace_emojis(self) -> None: theme = app.settings.get('emoticons_theme') if not theme or theme == 'font': return @@ -403,7 +397,7 @@ def insert_emoji(self, codepoint, pixbuf): self.add_child_at_anchor(image, anchor) buffer_.insert_at_cursor(' ') - def clear(self, _widget=None): + def clear(self, *args): """ Clear text in the textview """ @@ -411,13 +405,13 @@ def clear(self, _widget=None): start, end = _buffer.get_bounds() _buffer.delete(start, end) - def save_undo(self, text): + def save_undo(self, text: str) -> None: self.undo_list.append(text) - if len(self.undo_list) > self.UNDO_LIMIT: + if len(self.undo_list) > UNDO_LIMIT: del self.undo_list[0] self.undo_pressed = False - def undo(self, _widget=None): + def undo(self, *args): """ Undo text in the textview """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/770a387d04bd97358bd6b30143f835dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/770a387d04bd97358bd6b30143f835dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Base: Remove type checking for Gspell for now
by Daniel Brötzmann (＠wurstsalat) 26 Nov '21

26 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9c82c440 by wurstsalat at 2021-11-27T00:10:21+01:00 Base: Remove type checking for Gspell for now - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -664,7 +664,7 @@ def set_speller(self) -> None: spell_checker.connect('notify::language', self.on_language_changed) - def get_speller_language(self) -> Optional[Gspell.Language]: + def get_speller_language(self): lang = self.contact.settings.get('speller_language') if not lang: # use the default one View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c82c44073fcf1de74324ed344839419… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c82c44073fcf1de74324ed344839419… 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