Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Add History Export Wizard
by Daniel Brötzmann (＠wurstsalat) 19 Jan '22

19 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d25fb257 by wurstsalat at 2022-01-19T23:22:45+01:00 Add History Export Wizard - - - - - 8 changed files: - gajim/common/storage/archive.py - + gajim/data/gui/history_export.ui - gajim/gtk/accounts.py - gajim/gtk/application.py - gajim/gtk/assistant.py - gajim/gtk/builder.pyi - gajim/gtk/const.py - + gajim/gtk/history_export.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -140,6 +140,14 @@ class LastArchiveMessageRow(NamedTuple): last_muc_timestamp: str +class MessageExportRow(NamedTuple): + jid: str + contact_name: str + time: float + kind: int + message: str + + class MessageArchiveStorage(SqliteStorage): def __init__(self): SqliteStorage.__init__(self, @@ -790,7 +798,7 @@ def get_days_with_logs(self, days=days, hours=23, minutes=59, seconds=59, microseconds=999999) sql = """ - SELECT DISTINCT + SELECT DISTINCT CAST(strftime('%d', time, 'unixepoch', 'localtime') AS INTEGER) AS day FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND time BETWEEN ? AND ? @@ -1351,6 +1359,17 @@ def reset_archive_infos(self, jid: str) -> None: log.info('Reset message archive info: %s', jid) self._delayed_commit() + def get_messages_for_export(self, + account: str + ) -> list[MessageExportRow]: + account_id = self.get_account_id(account) + sql = '''SELECT jid, time, kind, message, contact_name + FROM logs + NATURAL JOIN jids jid_id + WHERE account_id = ? + ORDER BY jid_id, time''' + return self._con.execute(sql, (account_id, )).fetchall() + def remove_history(self, account: str, jid: JID) -> None: """ Remove history for a specific chat. ===================================== gajim/data/gui/history_export.ui ===================================== @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkListStore" id="account_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkBox" id="select_account_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Export Chat History</property> + <property name="wrap">True</property> + <property name="max-width-chars">40</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Please select one of your accounts. +Gajim will export all messages from the selected account to a directory of your choice.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">40</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> +  + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="row-spacing">18</property> + <property name="column-spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Account</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="account_combo"> + <property name="width-request">250</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="model">account_liststore</property> + <property name="id-column">0</property> + <property name="active-id">-1</property> + <signal name="changed" handler="_on_account_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Directory</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkFileChooserButton" id="file_chooser_button"> + <property name="width-request">250</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="action">select-folder</property> + <property name="preview-widget-active">False</property> + <property name="title" translatable="yes">Choose History Export Directory</property> + <signal name="file-set" handler="_on_file_set" swapped="no"/> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/accounts.py ===================================== @@ -832,6 +832,13 @@ def __init__(self, account: str) -> None: 'chat_history_max_age', props={'entries': history_max_age}, desc=_('How long Gajim should keep your chat history')), + + Setting(SettingKind.ACTION, + _('Export Chat History'), + SettingType.ACTION, + '-export-history', + props={'account': account}, + desc=_('Export your chat history from Gajim')) ] GenericSettingPage.__init__(self, account, settings) ===================================== gajim/gtk/application.py ===================================== @@ -445,6 +445,7 @@ def _get_account_actions(self, ('-open-event', self._on_open_event_action, 'always', 'a{sv}'), ('-mark-as-read', self._on_mark_as_read_action, 'always', 'a{sv}'), ('-import-contacts', self._on_import_contacts_action, 'online', 's'), + ('-export-history', self._on_export_history, 'always', 's'), ] # pylint: enable=line-too-long @@ -627,6 +628,11 @@ def _on_import_contacts_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: open_window('SynchronizeAccounts', account=param.get_string()) + @staticmethod + def _on_export_history(_action: Gio.SimpleAction, + param: GLib.Variant) -> None: + open_window('HistoryExport', account=param.get_string()) + @staticmethod def _on_pep_config_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: ===================================== gajim/gtk/assistant.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any from typing import Dict +from typing import Callable from typing import Optional from typing import Tuple @@ -118,7 +119,7 @@ def _set_buttons_visible(self) -> None: button, _ = self._buttons[button_name] button.show() - def set_button_visible_func(self, func): + def set_button_visible_func(self, func: Callable[..., list[str]]) -> None: self._button_visible_func = func def set_default_button(self, button_name: str) -> None: ===================================== gajim/gtk/builder.pyi ===================================== @@ -262,6 +262,7 @@ class PreferencesBuilder(Builder): video: Gtk.Grid miscellaneous: Gtk.Grid reset_button: Gtk.Button + purge_history_button: Gtk.Button advanced: Gtk.Grid ace_button: Gtk.Button @@ -816,6 +817,13 @@ 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 @@ -1085,6 +1093,8 @@ def get_builder(file_name: Literal['synchronize_accounts.ui'], widgets: list[str @overload def get_builder(file_name: Literal['search_view.ui'], widgets: list[str] = ...) -> SearchViewBuilder: ... @overload +def get_builder(file_name: Literal['history_export.ui'], widgets: list[str] = ...) -> HistoryExportBuilder: ... +@overload def get_builder(file_name: Literal['groups_post_window.ui'], widgets: list[str] = ...) -> GroupsPostWindowBuilder: ... @overload def get_builder(file_name: Literal['adhoc_muc.ui'], widgets: list[str] = ...) -> AdhocMucBuilder: ... ===================================== gajim/gtk/const.py ===================================== @@ -164,4 +164,5 @@ def __str__(self): 'SynchronizeAccounts': 'gajim.gui.synchronize_accounts', 'AdhocMUC': 'gajim.gui.adhoc_muc', 'PasswordDialog': 'gajim.gui.password_dialog', + 'HistoryExport': 'gajim.gui.history_export', } ===================================== gajim/gtk/history_export.py ===================================== @@ -0,0 +1,186 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import cast +from typing import Optional + +import logging +import time +from datetime import datetime +from pathlib import Path + +from gi.repository import Gtk + +from gajim.common import app +from gajim.common import configpaths +from gajim.common.const import KindConstant +from gajim.common.i18n import _ + +from .assistant import Assistant +from .assistant import Page +from .assistant import ErrorPage +from .assistant import SuccessPage +from .assistant import ProgressPage +from .builder import get_builder + +log = logging.getLogger('gajim.gui.history_export') + + +class HistoryExport(Assistant): + def __init__(self, account: Optional[str] = None) -> None: + Assistant.__init__(self) + + self.account = account + + self.add_button('export', + _('Export'), + complete=True, + css_class='suggested-action') + self.add_button('close', _('Close')) + self.add_button('back', _('Back')) + self.set_button_visible_func(self._visible_func) + + self.add_pages({'start': SelectAccountDir(account)}) + + progress_page = cast(ProgressPage, self.add_default_page('progress')) + progress_page.set_title(_('Exporting History...')) + progress_page.set_text(_('Exporting your messages...')) + + success_page = cast(SuccessPage, self.add_default_page('success')) + success_page.set_title(_('Export Finished')) + success_page.set_text(_('Your messages have been exported successfully')) + + error_page = cast(ErrorPage, self.add_default_page('error')) + error_page.set_title(_('Error while Exporting')) + error_page.set_text(_('An error occurred while exporting your messages')) + + self.connect('button-clicked', self._on_button_clicked) + self.show_all() + + @staticmethod + def _visible_func(_assistant: Assistant, page_name: str) -> list[str]: + if page_name == 'start': + return ['close', 'export'] + + if page_name == 'progress': + return [] + + if page_name == 'success': + return ['back', 'close'] + + if page_name == 'error': + return ['back', 'close'] + raise ValueError(f'page {page_name} unknown') + + def _on_button_clicked(self, + _assistant: Assistant, + button_name: str + ) -> None: + if button_name == 'export': + self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) + self._on_export() + + elif button_name == 'back': + self.show_page('start', Gtk.StackTransitionType.SLIDE_RIGHT) + + elif button_name == 'close': + self.destroy() + + def _on_export(self) -> None: + start_page = cast(SelectAccountDir, self.get_page('start')) + account, directory = start_page.get_account_and_directory() + messages = app.storage.archive.get_messages_for_export(account) + + current_time = datetime.now() + time_str = current_time.strftime('%Y-%m-%d-%H-%M-%S') + filename = Path(directory) / f'export_{time_str}.txt' + + with open(filename, 'w', encoding='utf-8') as out_file: + conversation = '' + for message in messages: + if message.kind in (KindConstant.SINGLE_MSG_RECV, + KindConstant.CHAT_MSG_RECV): + name = message.jid + elif message.kind in (KindConstant.SINGLE_MSG_SENT, + KindConstant.CHAT_MSG_SENT): + name = _('You') + elif message.kind == KindConstant.GC_MSG: + name = message.contact_name + else: + continue + + timestamp = '' + try: + timestamp = time.strftime( + '%Y-%m-%d %H:%M:%S', time.localtime(message.time)) + except ValueError: + pass + + if conversation != message.jid: + # Different conversation + out_file.write(f'\n{"=" * 80}\n{message.jid}\n\n') + conversation = message.jid + out_file.write(f'{timestamp} {name}: {message.message}\n') + + self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) + + +class SelectAccountDir(Page): + def __init__(self, account: Optional[str]) -> None: + Page.__init__(self) + self._account = account + self._export_directory = str(configpaths.get('MY_DATA')) + + self.title = _('Export Chat History') + + self._ui = get_builder('history_export.ui') + self.add(self._ui.select_account_box) + self._ui.connect_signals(self) + + accounts = app.get_enabled_accounts_with_labels() + liststore = cast(Gtk.ListStore, self._ui.account_combo.get_model()) + for acc in accounts: + liststore.append(acc) + + if self._account is not None: + self._ui.account_combo.set_active_id(self._account) + else: + self._ui.account_combo.set_active(0) + + self._ui.file_chooser_button.set_current_folder(self._export_directory) + + self._set_complete() + + self.show_all() + + def _on_account_changed(self, combobox: Gtk.ComboBox) -> None: + account = combobox.get_active_id() + self._account = account + self._set_complete() + + def _set_complete(self) -> None: + self.complete = bool( + self._account is not None and + self._export_directory is not None) + self.update_page_complete() + + def _on_file_set(self, button: Gtk.FileChooserButton) -> None: + self._export_directory = button.get_current_folder() + + def get_account_and_directory(self) -> tuple[str, str]: + assert self._account is not None + assert self._export_directory is not None + return self._account, self._export_directory View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d25fb25719a0baea9d713408e81d8811… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d25fb25719a0baea9d713408e81d8811… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add Purge Chat History button
by Daniel Brötzmann (＠wurstsalat) 18 Jan '22

18 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8d7e37b6 by wurstsalat at 2022-01-18T21:08:14+01:00 Preferences: Add Purge Chat History button - - - - - 3 changed files: - gajim/common/storage/archive.py - gajim/data/gui/preferences.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -1375,6 +1375,18 @@ def forget_jid_data(self, account: str, jid: JID) -> None: self._delayed_commit() log.info('Forgot data for: %s', jid) + def remove_all_history(self) -> None: + """ + Remove all messages for all accounts + """ + statements = [ + 'DELETE FROM logs', + 'DELETE FROM jids', + 'DELETE FROM last_archive_message' + ] + self._execute_multiple(statements) + log.info('Removed all chat history') + def _cleanup_chat_history(self) -> None: """ Remove messages from account where messages are older than max_age ===================================== gajim/data/gui/preferences.ui ===================================== @@ -1,42 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> +  <object class="GtkGrid" id="grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkStack" id="stack"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> + <property name="can-focus">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> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> +  <object class="GtkGrid" id="window_behaviour"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Behaviour of Windows & Tabs</property> <property name="xalign">0</property> <style> @@ -44,10 +46,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -66,36 +92,37 @@ <packing> <property name="name">general</property> <property name="title" translatable="yes">General</property> - <property name="icon_name">computer-symbolic</property> + <property name="icon-name">computer-symbolic</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> + <property name="can-focus">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> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> +  <object class="GtkGrid" id="chats"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Chats</property> <property name="xalign">0</property> <style> @@ -103,10 +130,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -115,15 +166,16 @@ </packing> </child> <child> +  <object class="GtkGrid" id="group_chats"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Group Chats</property> <property name="xalign">0</property> <style> @@ -131,10 +183,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -143,15 +219,16 @@ </packing> </child> <child> +  <object class="GtkGrid" id="file_preview"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">File Preview</property> <property name="xalign">0</property> <style> @@ -159,10 +236,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -181,37 +282,38 @@ <packing> <property name="name">chats</property> <property name="title" translatable="yes">Chats</property> - <property name="icon_name">user-available-symbolic</property> + <property name="icon-name">user-available-symbolic</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> + <property name="can-focus">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> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> +  <object class="GtkGrid" id="visual_notifications"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Visual Notifications</property> <property name="xalign">0</property> <style> @@ -219,10 +321,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -231,15 +357,16 @@ </packing> </child> <child> +  <object class="GtkGrid" id="sounds"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Sounds</property> <property name="xalign">0</property> <style> @@ -247,10 +374,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -269,37 +420,38 @@ <packing> <property name="name">notifications</property> <property name="title" translatable="yes">Notifications</property> - <property name="icon_name">mail-unread-symbolic</property> + <property name="icon-name">mail-unread-symbolic</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> + <property name="can-focus">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> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> +  <object class="GtkGrid" id="status_message"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Ask For Status Message on…</property> <property name="xalign">0</property> <style> @@ -307,10 +459,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -319,15 +495,16 @@ </packing> </child> <child> +  <object class="GtkGrid" id="automatic_status"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Automatic Status Change</property> <property name="xalign">0</property> <style> @@ -335,10 +512,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -357,37 +558,38 @@ <packing> <property name="name">status</property> <property name="title" translatable="yes">Status</property> - <property name="icon_name">user-status-pending-symbolic</property> + <property name="icon-name">user-status-pending-symbolic</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> + <property name="can-focus">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> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> +  <object class="GtkGrid" id="themes"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Themes</property> <property name="xalign">0</property> <style> @@ -395,10 +597,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -407,15 +633,16 @@ </packing> </child> <child> +  <object class="GtkGrid" id="emoji"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Emoji</property> <property name="xalign">0</property> <style> @@ -423,10 +650,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -442,49 +693,49 @@ <packing> <property name="name">style</property> <property name="title" translatable="yes">Style</property> - <property name="icon_name">applications-graphics-symbolic</property> + <property name="icon-name">applications-graphics-symbolic</property> <property name="position">4</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> + <property name="can-focus">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> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkInfoBar" id="audio_video_info_bar"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="message_type">warning</property> + <property name="can-focus">False</property> + <property name="message-type">warning</property> <signal name="response" handler="_on_features_clicked" swapped="no"/> <child internal-child="action_area"> <object class="GtkButtonBox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">6</property> - <property name="layout_style">end</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="button1"> <property name="label" translatable="yes">Show _Features</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">True</property> @@ -507,7 +758,7 @@ </child> <child internal-child="content_area"> <object class="GtkBox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">16</property> <child> <placeholder/> @@ -515,7 +766,7 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Missing dependencies for Audio/Video</property> </object> <packing> @@ -560,19 +811,20 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> +  <object class="GtkGrid" id="server"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Server</property> <property name="xalign">0</property> <style> @@ -580,10 +832,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -592,15 +868,16 @@ </packing> </child> <child> +  <object class="GtkGrid" id="audio"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Audio</property> <property name="xalign">0</property> <style> @@ -608,10 +885,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -620,15 +921,16 @@ </packing> </child> <child> +  <object class="GtkGrid" id="video"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Video</property> <property name="xalign">0</property> <style> @@ -636,10 +938,34 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -668,42 +994,44 @@ <packing> <property name="name">audio_video</property> <property name="title" translatable="yes">Audio/Video</property> - <property name="icon_name">audio-input-microphone-symbolic</property> + <property name="icon-name">audio-input-microphone-symbolic</property> <property name="position">5</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> + <property name="can-focus">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> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">12</property> + <property name="can-focus">False</property> + <property name="row-spacing">12</property> <child> +  <object class="GtkGrid" id="miscellaneous"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Miscellaneous</property> <property name="xalign">0</property> <style> @@ -711,27 +1039,77 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkButton" id="reset_button"> <property name="label" translatable="yes">Reset Hints</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">This will reset all introduction hints</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">This will reset all introduction hints</property> + </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">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkButton" id="purge_history_button"> + <property name="label" translatable="yes">Purge Chat History…</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <style> + <class name="destructive-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -741,10 +1119,28 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -753,20 +1149,22 @@ </packing> </child> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">12</property> + <property name="can-focus">False</property> + <property name="row-spacing">12</property> <child> +  <object class="GtkGrid" id="advanced"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Advanced Settings</property> <property name="xalign">0</property> <style> @@ -774,27 +1172,51 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkButton" id="ace_button"> <property name="label" translatable="yes">Advanced Configuration Editor… </property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Please use these settings with caution!</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Please use these settings with caution!</property> </object> <packing> <property name="expand">False</property> @@ -804,10 +1226,31 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -823,7 +1266,7 @@ <packing> <property name="name">advanced</property> <property name="title" translatable="yes">Advanced</property> - <property name="icon_name">preferences-system-symbolic</property> + <property name="icon-name">preferences-system-symbolic</property> <property name="position">6</property> </packing> </child> @@ -832,12 +1275,33 @@ </style> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </interface> ===================================== gajim/gtk/preferences.py ===================================== @@ -41,6 +41,8 @@ from .const import SettingKind from .const import SettingType from .controls.groupchat import GroupchatControl +from .dialogs import DialogButton +from .dialogs import ConfirmationDialog from .emoji_chooser import emoji_chooser from .settings import PopoverSetting from .settings import SettingsBox @@ -920,6 +922,9 @@ def __init__(self, pref_window: Preferences) -> None: reset_button.connect('clicked', self._on_reset_hints) reset_button.set_sensitive(self._check_hints_reset) + purge_history_button = pref_window.get_ui().purge_history_button + purge_history_button.connect('clicked', self._on_purge_history_clicked) + @staticmethod def _get_proxies() -> dict[str, str]: return {proxy: proxy for proxy in app.settings.get_proxies()} @@ -943,6 +948,23 @@ def _on_reset_hints(self, button: Gtk.Button) -> None: app.settings.set(hint, True) button.set_sensitive(False) + @staticmethod + def _on_purge_history_clicked(button: Gtk.Button) -> None: + def _purge() -> None: + button.set_sensitive(False) + app.storage.archive.remove_all_history() + app.window.quit() + + ConfirmationDialog( + _('Purge all Chat History'), + _('Purge all Chat History'), + _('Do you really want to remove all chat messages from Gajim?\n' + 'Warning: This can’t be undone!\n' + 'Gajim will quit afterwards.'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Purge'), + callback=_purge)]).show() class Advanced(PreferenceBox): def __init__(self, pref_window: Preferences) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8d7e37b6b147c0eabc03c14d64f684ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8d7e37b6b147c0eabc03c14d64f684ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ManageProxies: Typing
by Daniel Brötzmann (＠wurstsalat) 18 Jan '22

18 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3e38c18f by wurstsalat at 2022-01-18T18:05:16+01:00 ManageProxies: Typing - - - - - b3686347 by wurstsalat at 2022-01-18T18:05:16+01:00 Update pyrightconfig - - - - - 2 changed files: - gajim/gtk/proxies.py - pyrightconfig.json Changes: ===================================== gajim/gtk/proxies.py ===================================== @@ -20,7 +20,10 @@ from gajim.common import app from gajim.common.i18n import _ +from .accounts import AccountsWindow +from .account_wizard import AccountWizard from .builder import get_builder +from .preferences import Preferences from .util import get_app_window @@ -58,18 +61,22 @@ def _on_destroy(*args: Any) -> None: window_accounts = get_app_window('AccountsWindow') window_account_wizard = get_app_window('AccountWizard') if window_pref is not None: + assert isinstance(window_pref, Preferences) window_pref.update_proxy_list() if window_accounts is not None: + assert isinstance(window_accounts, AccountsWindow) window_accounts.update_proxy_list() if window_account_wizard is not None: + assert isinstance(window_account_wizard, AccountWizard) window_account_wizard.update_proxy_list() def _fill_proxies_treeview(self) -> None: model = self._ui.proxies_treeview.get_model() + assert isinstance(model, Gtk.ListStore) model.clear() for proxy in app.settings.get_proxies(): iter_ = model.append() - model.set(iter_, 0, proxy) + model.set_value(iter_, 0, proxy) def _init_list(self) -> None: self._ui.remove_proxy_button.set_sensitive(False) @@ -86,6 +93,7 @@ def _init_list(self) -> None: def _on_add_proxy_button_clicked(self, _button: Gtk.Button) -> None: model = self._ui.proxies_treeview.get_model() + assert isinstance(model, Gtk.ListStore) proxies = app.settings.get_proxies() i = 1 while 'proxy' + str(i) in proxies: @@ -94,7 +102,7 @@ def _on_add_proxy_button_clicked(self, _button: Gtk.Button) -> None: proxy_name = 'proxy' + str(i) app.settings.add_proxy(proxy_name) iter_ = model.append() - model.set(iter_, 0, proxy_name) + model.set_value(iter_, 0, proxy_name) self._ui.proxies_treeview.set_cursor(model.get_path(iter_)) def _on_remove_proxy_button_clicked(self, _button: Gtk.Button) -> None: @@ -104,6 +112,8 @@ def _on_remove_proxy_button_clicked(self, _button: Gtk.Button) -> None: (model, iter_) = sel.get_selected() if not iter_: return + + assert isinstance(model, Gtk.ListStore) proxy = model[iter_][0] model.remove(iter_) app.settings.remove_proxy(proxy) @@ -131,16 +141,16 @@ def _on_proxies_treeview_cursor_changed(self, self._ui.proxypass_entry.set_text('') sel = treeview.get_selection() - if sel: - (model, iter_) = sel.get_selected() - else: - iter_ = None - if not iter_: + if not sel: self._ui.proxyname_entry.set_text('') self._ui.settings_grid.set_sensitive(False) self._block_signal = False return + (model, iter_) = sel.get_selected() + if iter_ is None: + return + proxy = model[iter_][0] self._ui.proxyname_entry.set_text(proxy) @@ -151,15 +161,16 @@ def _on_proxies_treeview_cursor_changed(self, settings = app.settings.get_proxy_settings(proxy) - self._ui.proxyhost_entry.set_text(settings['host']) + self._ui.proxyhost_entry.set_text(str(settings['host'])) self._ui.proxyport_entry.set_text(str(settings['port'])) - self._ui.proxyuser_entry.set_text(settings['user']) - self._ui.proxypass_entry.set_text(settings['pass']) + self._ui.proxyuser_entry.set_text(str(settings['user'])) + self._ui.proxypass_entry.set_text(str(settings['pass'])) types = ['http', 'socks5'] - self._ui.proxytype_combobox.set_active(types.index(settings['type'])) + self._ui.proxytype_combobox.set_active( + types.index(str(settings['type']))) - self._ui.useauth_checkbutton.set_active(settings['useauth']) + self._ui.useauth_checkbutton.set_active(bool(settings['useauth'])) act = self._ui.useauth_checkbutton.get_active() self._ui.proxyuser_entry.set_sensitive(act) self._ui.proxypass_entry.set_sensitive(act) @@ -167,11 +178,11 @@ def _on_proxies_treeview_cursor_changed(self, self._block_signal = False def _on_proxies_treeview_key_press_event(self, - widget: Gtk.Widget, + button: Gtk.Button, event: Gdk.EventKey ) -> None: if event.keyval == Gdk.KEY_Delete: - self._on_remove_proxy_button_clicked(widget) + self._on_remove_proxy_button_clicked(button) def _on_proxyname_entry_changed(self, entry: Gtk.Entry) -> None: if self._block_signal: @@ -183,6 +194,7 @@ def _on_proxyname_entry_changed(self, entry: Gtk.Entry) -> None: if not iter_: return old_name = model.get_value(iter_, 0) + assert isinstance(old_name, str) new_name = entry.get_text() if new_name == '': return @@ -190,6 +202,7 @@ def _on_proxyname_entry_changed(self, entry: Gtk.Entry) -> None: return app.settings.rename_proxy(old_name, new_name) + assert isinstance(model, Gtk.ListStore) model.set_value(iter_, 0, new_name) def _on_proxytype_combobox_changed(self, _combobox: Gtk.ComboBox) -> None: ===================================== pyrightconfig.json ===================================== @@ -60,6 +60,7 @@ "gajim/gtk/manage_sounds.py", "gajim/gtk/notification.py", "gajim/gtk/preview_audio.py", + "gajim/gtk/proxies.py", "gajim/gtk/resource_selector.py", "gajim/gtk/search_view.py", "gajim/gtk/sidebar_switcher.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7239d8e17dce7a441aa16ba574a860c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7239d8e17dce7a441aa16ba574a860c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move update check logic into CoreApplication
by Philipp Hörist (＠lovetox) 18 Jan '22

18 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7239d8e1 by lovetox at 2022-01-18T15:12:23+01:00 Move update check logic into CoreApplication - - - - - 5 changed files: - gajim/common/application.py - gajim/common/events.py - gajim/gtk/app_page.py - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/common/application.py ===================================== @@ -20,13 +20,21 @@ import os import sys +import json +import logging +from datetime import datetime +from packaging.version import Version as V from gi.repository import Gio +from gi.repository import GLib +from gi.repository import Soup from gajim.common import app from gajim.common import ged from gajim.common import configpaths from gajim.common.events import AccountDisonnected +from gajim.common.events import AllowGajimUpdateCheck +from gajim.common.events import GajimUpdateAvailable from gajim.common.client import Client from gajim.common.task_manager import TaskManager from gajim.common.settings import Settings @@ -63,6 +71,13 @@ def _init_core(self) -> None: self._network_status_changed) self._network_state = self._network_monitor.get_network_available() + if sys.platform in ('win32', 'darwin'): + GLib.timeout_add_seconds(20, self._check_for_updates) + + @property + def _log(self) -> logging.Logger: + return app.log('gajim.application') + def start_shutdown(self, *args: Any, **kwargs: Any) -> None: accounts_to_disconnect: dict[str, Client] = {} @@ -125,10 +140,55 @@ def _network_status_changed(self, self._network_state = connected if connected: - app.log('gajim.application').info('Network connection available') + self._log.info('Network connection available') else: - app.log('gajim.application').info('Network connection lost') + self._log.info('Network connection lost') for connection in app.connections.values(): if (connection.state.is_connected or connection.state.is_available): connection.disconnect(gracefully=False, reconnect=True) + + def _check_for_updates(self) -> None: + if not app.settings.get('check_for_update'): + return + + now = datetime.now() + last_check = app.settings.get('last_update_check') + if not last_check: + app.ged.raise_event(AllowGajimUpdateCheck()) + return + + last_check_time = datetime.strptime(last_check, '%Y-%m-%d %H:%M') + if (now - last_check_time).days < 7: + return + + self.check_for_gajim_updates() + + def check_for_gajim_updates(self) -> None: + self._log.info('Checking for Gajim updates') + session = Soup.Session() + 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_response) + + def _on_update_response(self, + _session: Soup.Session, + message: Soup.Message) -> None: + + now = datetime.now() + app.settings.set('last_update_check', now.strftime('%Y-%m-%d %H:%M')) + + response_body = message.props.response_body + if response_body is None or not response_body.data: + self._log.warning('Could not reach gajim.org for update check') + return + + data = json.loads(response_body.data) + latest_version = data['current_version'] + + if V(latest_version) > V(app.version): + app.ged.raise_event(GajimUpdateAvailable(version=latest_version)) + return + + self._log.info('Gajim is up to date') ===================================== gajim/common/events.py ===================================== @@ -652,3 +652,14 @@ class FileRequestReceivedEvent(ApplicationEvent): account: str jid: str file_props: FileProp + + +@dataclass +class AllowGajimUpdateCheck(ApplicationEvent): + name: str = field(init=False, default='allow-gajim-update-check') + + +@dataclass +class GajimUpdateAvailable(ApplicationEvent): + name: str = field(init=False, default='gajim-update-available') + version: str ===================================== gajim/gtk/app_page.py ===================================== @@ -115,10 +115,10 @@ def __init__(self, category: str, message: Optional[str] = None) -> None: Gtk.ListBoxRow.__init__(self) self._ui = get_builder('app_page.ui') - if category == 'gajim-update-check': + if category == 'allow-gajim-update-check': self.add(self._ui.gajim_update_check) - if category == 'gajim-update': + if category == 'gajim-update-available': self.add(self._ui.gajim_update) text = _('Version %s is available') % message self._ui.update_message.set_text(text) @@ -127,7 +127,7 @@ def __init__(self, category: str, message: Optional[str] = None) -> None: self.show_all() def _on_check_clicked(self, _button: Gtk.Button) -> None: - app.interface.get_latest_release() + app.app.check_for_gajim_updates() list_box = cast(AppMessageListBox, self.get_parent()) list_box.remove_app_message(self) ===================================== gajim/gtk/main.py ===================================== @@ -33,6 +33,8 @@ from gajim.common.const import Display from gajim.common.const import Direction from gajim.common.events import ApplicationEvent +from gajim.common.events import AllowGajimUpdateCheck +from gajim.common.events import GajimUpdateAvailable from gajim.common.events import AccountEnabled from gajim.common.events import AccountDisabled from gajim.common.events import ShowChanged @@ -126,6 +128,8 @@ def __init__(self) -> None: ('signed-in', ged.GUI1, self._on_signed_in), ('account-enabled', ged.GUI1, self._on_account_enabled), ('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), ]) self._check_for_account() @@ -188,6 +192,12 @@ def _on_signed_in(event: SignedIn) -> None: app.app.set_account_actions_state(event.account, True) app.app.update_app_actions_state() + def _on_allow_gajim_update(self, event: AllowGajimUpdateCheck) -> None: + self.add_app_message(event.name) + + def _on_gajim_update_available(self, event: GajimUpdateAvailable) -> None: + self.add_app_message(event.name, event.version) + def _add_actions(self) -> None: actions = [ ('add-workspace', 's', self._add_workspace), @@ -529,7 +539,8 @@ def show_app_page(self) -> None: self._workspace_side_bar.unselect_all() self._main_stack.show_app_page() - def add_app_message(self, category: str, + def add_app_message(self, + category: str, message: Optional[str] = None) -> None: self._app_page.add_app_message(category, message) ===================================== gajim/gui_interface.py ===================================== @@ -41,17 +41,13 @@ import os import sys import time -import json import logging from functools import partial from threading import Thread -from datetime import datetime from importlib.util import find_spec -from packaging.version import Version as V from gi.repository import Gtk from gi.repository import GLib -from gi.repository import Soup from nbxmpp import idlequeue from nbxmpp import Hashes2 @@ -166,8 +162,6 @@ def __init__(self): if sys.platform not in ('win32', 'darwin'): logind.enable() music_track.enable() - else: - GLib.timeout_add_seconds(20, self.check_for_updates) self.systray_enabled: bool = False @@ -994,47 +988,6 @@ def create_zeroconf_default_config(self) -> None: 'active', False) - def check_for_updates(self) -> None: - if not app.settings.get('check_for_update'): - return - - now = datetime.now() - last_check = app.settings.get('last_update_check') - if not last_check: - app.window.add_app_message('gajim-update-check') - return - - last_check_time = datetime.strptime(last_check, '%Y-%m-%d %H:%M') - if (now - last_check_time).days < 7: - return - - self.get_latest_release() - - def get_latest_release(self) -> None: - log.info('Checking for Gajim updates') - session = Soup.Session() - 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) - - def _on_update_checked(self, _session, message): - now = datetime.now() - app.settings.set('last_update_check', now.strftime('%Y-%m-%d %H:%M')) - - body = message.props.response_body.data - if not body: - log.warning('Could not reach gajim.org for update check') - return - - data = json.loads(body) - latest_version = data['current_version'] - - if V(latest_version) > V(app.version): - app.window.add_app_message('gajim-update', latest_version) - else: - log.info('Gajim is up to date') - def run(self, _application: Gtk.Application) -> None: if app.settings.get('trayicon') != 'never': self.show_systray() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7239d8e17dce7a441aa16ba574a860c6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7239d8e17dce7a441aa16ba574a860c6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Revert behavior of write_file_async()
by Philipp Hörist (＠lovetox) 18 Jan '22

18 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4dff3a2d by lovetox at 2022-01-18T13:40:21+01:00 Revert behavior of write_file_async() Seems Python collects variables as soon as they are not needed anymore, even if the function has not ended. This means we have to someway use `data` even with nested function callbacks. - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1280,7 +1280,8 @@ def write_file_async( user_data: Optional[Any] = None): def _on_write_finished(outputstream: Gio.OutputStream, - result: Gio.AsyncResult) -> None: + result: Gio.AsyncResult, + _data: bytes) -> None: try: successful, _bytes_written = outputstream.write_all_finish(result) except GLib.Error as error: @@ -1295,10 +1296,14 @@ def _on_file_created(file: Gio.File, result: Gio.AsyncResult) -> None: callback(False, error, user_data) return + # Pass data as user_data to the callback, because + # write_all_async() takes no reference to the data + # and python gc collects it before the data is written outputstream.write_all_async(data, GLib.PRIORITY_DEFAULT, None, - _on_write_finished) + _on_write_finished, + data) file = Gio.File.new_for_path(str(path)) file.create_async(Gio.FileCreateFlags.PRIVATE, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4dff3a2dd4e95e9de3eba9c69398bef9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4dff3a2dd4e95e9de3eba9c69398bef9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Application: Move NetworkMonitor into CoreApplication
by Philipp Hörist (＠lovetox) 18 Jan '22

18 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12e07454 by lovetox at 2022-01-18T09:38:57+01:00 Application: Move NetworkMonitor into CoreApplication - - - - - 4c282ab9 by lovetox at 2022-01-18T09:38:57+01:00 Interface: Move AvatarStorage init into Application module - - - - - ef45bd37 by lovetox at 2022-01-18T09:38:57+01:00 Interface: Move css init into Application module - - - - - d0e8c482 by lovetox at 2022-01-18T09:38:57+01:00 Interface: Move more init code into Application module - - - - - 10 changed files: - gajim/common/application.py - gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/gtk/application.py - gajim/gtk/controls/groupchat.py - gajim/gtk/profile.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py - gajim/gui_interface.py - pyrightconfig.json Changes: ===================================== gajim/common/application.py ===================================== @@ -21,6 +21,8 @@ import os import sys +from gi.repository import Gio + from gajim.common import app from gajim.common import ged from gajim.common import configpaths @@ -35,7 +37,6 @@ class CoreApplication: - def _init_core(self) -> None: # Create and initialize Application Paths & Databases app.app = self @@ -46,7 +47,7 @@ def _init_core(self) -> None: app.settings = Settings() app.settings.init() - app.config = LegacyConfig() # type: ignore + app.config = LegacyConfig() app.storage.cache = CacheStorage() app.storage.cache.init() @@ -57,6 +58,11 @@ def _init_core(self) -> None: app.cert_store = CertificateStore() app.task_manager = TaskManager() + 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() + def start_shutdown(self, *args: Any, **kwargs: Any) -> None: accounts_to_disconnect: dict[str, Client] = {} @@ -108,3 +114,21 @@ def warn_with_traceback(message: Union[Warning, str], warnings.showwarning = warn_with_traceback warnings.filterwarnings(action="always") + + def _network_status_changed(self, + monitor: Gio.NetworkMonitor, + _network_available: bool + ) -> None: + connected = monitor.get_network_available() + if connected == self._network_state: + return + + self._network_state = connected + if connected: + app.log('gajim.application').info('Network connection available') + else: + app.log('gajim.application').info('Network connection lost') + for connection in app.connections.values(): + if (connection.state.is_connected or + connection.state.is_available): + connection.disconnect(gracefully=False, reconnect=True) ===================================== gajim/common/modules/contacts.py ===================================== @@ -328,7 +328,7 @@ def get_avatar(self, break if pixbuf: - return app.interface.avatar_storage.get_pixbuf( + return app.app.avatar_storage.get_pixbuf( self, size, scale, @@ -336,7 +336,7 @@ def get_avatar(self, default=default, transport_icon=transport_icon, style=style) - return app.interface.avatar_storage.get_surface( + return app.app.avatar_storage.get_surface( self, size, scale, @@ -357,7 +357,7 @@ def update_avatar(self, sha: str) -> None: self._avatar_sha = sha app.storage.cache.set_contact(self._jid, 'avatar', sha) - app.interface.avatar_storage.invalidate_cache(self._jid) + app.app.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') def _get_roster_attr(self, attr: str): @@ -515,7 +515,7 @@ def get_avatar(self, size: int, scale: int) -> Optional[cairo.ImageSurface]: if identity.type == 'irc': transport_icon = 'gajim-agent-irc' break - return app.interface.avatar_storage.get_muc_surface( + return app.app.avatar_storage.get_muc_surface( self._account, self._jid, size, @@ -528,7 +528,7 @@ def _on_user_signal(self, self.notify(signal_name, contact, *args) def update_avatar(self, *args) -> None: - app.interface.avatar_storage.invalidate_cache(self._jid) + app.app.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') def get_self(self) -> Optional[GroupchatParticipant]: @@ -685,7 +685,7 @@ def get_avatar(self, style: str = 'circle') -> cairo.ImageSurface: show = self.show if add_show else None - return app.interface.avatar_storage.get_surface( + return app.app.avatar_storage.get_surface( self, size, scale, show, style=style) def update_presence(self, @@ -726,5 +726,5 @@ def set_state(self, state, presence: MUCPresenceData) -> None: self.notify(state) def update_avatar(self, *args) -> None: - app.interface.avatar_storage.invalidate_cache(self._jid) + app.app.avatar_storage.invalidate_cache(self._jid) self.notify('user-avatar-update') ===================================== gajim/common/modules/discovery.py ===================================== @@ -226,7 +226,7 @@ def disco_muc(self, app.interface.save_avatar(avatar) app.storage.cache.set_muc(result.info.jid, 'avatar', avatar_sha) - app.interface.avatar_storage.invalidate_cache(result.info.jid) + app.app.avatar_storage.invalidate_cache(result.info.jid) self._con.get_module('VCardAvatars').muc_disco_info_update(result.info) app.ged.raise_event(MucDiscoUpdate( ===================================== gajim/gtk/application.py ===================================== @@ -41,6 +41,7 @@ from typing import cast import os +import sys from urllib.parse import unquote @@ -54,28 +55,29 @@ import gajim from gajim.common import app -from gajim.common import ged from gajim.common import configpaths +from gajim.common import ged +from gajim.common import idle from gajim.common import logging_helpers - +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.i18n import _ from gajim.common.events import ApplicationEvent -from gajim.common.helpers import open_uri -from gajim.common.helpers import load_json from gajim.common.exceptions import GajimGeneralException -from gajim.common.application import CoreApplication +from gajim.common.helpers import load_json +from gajim.common.helpers import open_uri +from gajim.common.i18n import _ from gajim.gui import menus +from gajim.gui import structs +from gajim.gui.about import AboutDialog +from gajim.gui.avatar import AvatarStorage from gajim.gui.builder import get_builder -from gajim.gui.util import load_user_iconsets -from gajim.gui.util import open_window -from gajim.gui.util import get_app_window from gajim.gui.dialogs import ShortcutsWindow -from gajim.gui.about import AboutDialog from gajim.gui.discovery import ServiceDiscoveryWindow -from gajim.gui import structs +from gajim.gui.util import get_app_window +from gajim.gui.util import load_user_iconsets +from gajim.gui.util import open_window ActionListT = list[tuple[str, @@ -214,6 +216,17 @@ def _startup(self, _application: GajimApplication) -> None: from gajim.gui import notification notification.init() + self.avatar_storage = AvatarStorage() + + app.load_css_config() + + idle.Monitor.set_interval(app.settings.get('autoawaytime') * 60, + app.settings.get('autoxatime') * 60) + + if sys.platform in ('win32', 'darwin'): + from gajim.gui.emoji_chooser import emoji_chooser + emoji_chooser.load() + from gajim.gui_interface import Interface self.interface = Interface() @@ -227,6 +240,9 @@ def _startup(self, _application: GajimApplication) -> None: ged.CORE, self._on_feature_discovered) + from gajim.gui.main import MainWindow + MainWindow() + def _open_uris(self, uris: list[str]) -> None: accounts = list(app.connections.keys()) if not accounts: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -486,7 +486,7 @@ def _on_groupchat_manage(self, _action: Gio.SimpleAction, _param: Optional[GLib.Variant] ) -> None: - surface = app.interface.avatar_storage.get_muc_surface( + surface = app.app.avatar_storage.get_muc_surface( self.account, self.contact.jid, AvatarSize.GROUP_INFO, @@ -657,7 +657,7 @@ def _on_avatar_update_clicked(self, _button: Gtk.Button) -> None: self.add_info_message(_('Loading avatar failed')) return - sha = app.interface.avatar_storage.save_avatar(data) + sha = app.app.avatar_storage.save_avatar(data) if sha is None: self.add_info_message(_('Loading avatar failed')) return ===================================== gajim/gtk/profile.py ===================================== @@ -314,7 +314,7 @@ def _on_update_avatar(self, _button): _('Failed to generate avatar.')) return - sha = app.interface.avatar_storage.save_avatar(data) + sha = app.app.avatar_storage.save_avatar(data) if sha is None: self._ui.profile_stack.set_visible_child_name('profile') ErrorDialog(_('Error while processing image'), @@ -325,7 +325,7 @@ def _on_update_avatar(self, _button): self._new_avatar.add_image_source(data, 'image/png', height, width) scale = self.get_scale_factor() - surface = app.interface.avatar_storage.surface_from_filename( + surface = app.app.avatar_storage.surface_from_filename( sha, AvatarSize.VCARD, scale) self._ui.avatar_image.set_from_surface(clip_circle(surface)) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -137,7 +137,7 @@ def _update_avatar(self) -> None: scale = self.get_scale_factor() if self._avatar_sha is not None: assert self._workspace_id is not None - surface = app.interface.avatar_storage.get_workspace_surface( + surface = app.app.avatar_storage.get_workspace_surface( self._workspace_id, AvatarSize.WORKSPACE_EDIT, scale) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -357,7 +357,7 @@ def _on_drag_begin(self, drag_context: Gdk.DragContext ) -> None: scale = self.get_scale_factor() - surface = app.interface.avatar_storage.get_workspace_surface( + surface = app.app.avatar_storage.get_workspace_surface( self.workspace_id, AvatarSize.WORKSPACE, scale) if surface is not None: Gtk.drag_set_icon_surface(drag_context, surface) @@ -401,9 +401,9 @@ def __init__(self, workspace_id: str) -> None: self.update() def update(self) -> None: - app.interface.avatar_storage.invalidate_cache(self._workspace_id) + app.app.avatar_storage.invalidate_cache(self._workspace_id) scale = self.get_scale_factor() - surface = app.interface.avatar_storage.get_workspace_surface( + surface = app.app.avatar_storage.get_workspace_surface( self._workspace_id, AvatarSize.WORKSPACE, scale) self.set_from_surface(surface) name = app.settings.get_workspace_setting(self._workspace_id, 'name') ===================================== gajim/gui_interface.py ===================================== @@ -51,7 +51,6 @@ from gi.repository import Gtk from gi.repository import GLib -from gi.repository import Gio from gi.repository import Soup from nbxmpp import idlequeue @@ -61,7 +60,6 @@ from gajim.common import app from gajim.common import ged from gajim.common import exceptions -from gajim.common import idle from gajim.common import proxy65_manager from gajim.common import socks5 from gajim.common import helpers @@ -91,14 +89,12 @@ from gajim.common.modules.contacts import BareContact from gajim.common.modules.httpupload import HTTPFileTransfer -from gajim.gui.avatar import AvatarStorage from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ErrorDialog from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import InputDialog from gajim.gui.filechoosers import FileChooserDialog from gajim.gui.filetransfer import FileTransfersWindow -from gajim.gui.main import MainWindow from gajim.gui.menus import build_accounts_menu from gajim.gui.util import get_app_window from gajim.gui.util import get_app_windows @@ -118,12 +114,8 @@ def __init__(self): self.handlers = {} - self.avatar_storage = AvatarStorage() self.preview_manager = PreviewManager() - # Load CSS files - app.load_css_config() - for account in app.settings.get_accounts(): if app.settings.get_account_setting(account, 'is_zeroconf'): app.ZEROCONF_ACC_NAME = account @@ -177,24 +169,12 @@ def __init__(self): else: GLib.timeout_add_seconds(20, self.check_for_updates) - idle.Monitor.set_interval(app.settings.get('autoawaytime') * 60, - app.settings.get('autoxatime') * 60) - self.systray_enabled: bool = False if not app.is_display(Display.WAYLAND): from gajim.gui.status_icon import StatusIcon self.systray = StatusIcon() - if sys.platform in ('win32', 'darwin'): - from gajim.gui.emoji_chooser import emoji_chooser - emoji_chooser.load() - - self._network_monitor = Gio.NetworkMonitor.get_default() - self._network_monitor.connect('notify::network-available', - self._network_status_changed) - self._network_state: bool = self._network_monitor.get_network_available() - def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long self.handlers = { @@ -925,7 +905,7 @@ def save_config() -> None: app.settings.save() def save_avatar(self, data: bytes) -> Optional[str]: - return self.avatar_storage.save_avatar(data) + return app.app.avatar_storage.save_avatar(data) def get_avatar(self, contact: ContactT, @@ -935,13 +915,13 @@ def get_avatar(self, pixbuf: bool = False, style: str = 'circle') -> Any: if pixbuf: - return self.avatar_storage.get_pixbuf( + return app.app.avatar_storage.get_pixbuf( contact, size, scale, show, style=style) - return self.avatar_storage.get_surface( + return app.app.avatar_storage.get_surface( contact, size, scale, show, style=style) def avatar_exists(self, filename: str) -> bool: - return self.avatar_storage.get_avatar_path(filename) is not None + return app.app.avatar_storage.get_avatar_path(filename) is not None @staticmethod def create_ipython_window() -> None: @@ -984,24 +964,6 @@ def _on_delete(win, _event): view.updateNamespace({'gajim': app}) app.ipython_window = window - def _network_status_changed(self, - monitor: Gio.NetworkMonitor, - _network_available: bool - ) -> None: - connected = monitor.get_network_available() - if connected == self._network_state: - return - - self._network_state = connected - if connected: - log.info('Network connection available') - else: - log.info('Network connection lost') - for connection in app.connections.values(): - if (connection.state.is_connected or - connection.state.is_available): - connection.disconnect(gracefully=False, reconnect=True) - def create_zeroconf_default_config(self) -> None: if app.settings.get_account_setting(app.ZEROCONF_ACC_NAME, 'name'): return @@ -1107,7 +1069,6 @@ def remote_init(): except Exception: pass GLib.timeout_add_seconds(5, remote_init) - MainWindow() class ThreadInterface: ===================================== pyrightconfig.json ===================================== @@ -3,6 +3,7 @@ "pythonVersion": "3.9", "typeCheckingMode": "strict", "include": [ + "gajim/common/application.py", "gajim/common/cert_store.py", "gajim/common/configpaths.py", "gajim/common/const.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6195533f67394f5b1cfd2aa3ced69c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6195533f67394f5b1cfd2aa3ced69c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Fix whitespace
by Daniel Brötzmann (＠wurstsalat) 17 Jan '22

17 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6195533f by wurstsalat at 2022-01-17T23:21:40+01:00 Settings: Fix whitespace - - - - - 1 changed file: - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -375,7 +375,7 @@ def update_activatable(self) -> None: self.set_activatable(enabled_func_value) self.set_sensitive(enabled_func_value) - def _add_action_button(self, + def _add_action_button(self, kwargs: dict[str, Union[str, Callable[..., None], None]] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6195533f67394f5b1cfd2aa3ced69c78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6195533f67394f5b1cfd2aa3ced69c78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 9 commits: ContactInfo: Typing
by Daniel Brötzmann (＠wurstsalat) 17 Jan '22

17 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d3cbee3d by wurstsalat at 2022-01-17T23:10:03+01:00 ContactInfo: Typing - - - - - 8a234780 by wurstsalat at 2022-01-17T23:10:03+01:00 ChatList: Typing - - - - - fc9c10e8 by wurstsalat at 2022-01-17T23:10:03+01:00 Builder: Typing - - - - - bf46e905 by wurstsalat at 2022-01-17T23:10:03+01:00 BlockingList: Typing - - - - - 33ebe5ad by wurstsalat at 2022-01-17T23:10:03+01:00 Update pyrightconfig - - - - - a707c654 by wurstsalat at 2022-01-17T23:10:03+01:00 Settings: Typing - - - - - f491b665 by wurstsalat at 2022-01-17T23:10:03+01:00 Preferences: Typing - - - - - 9b77c047 by wurstsalat at 2022-01-17T23:10:03+01:00 Accounts: Typing - - - - - 03795a07 by wurstsalat at 2022-01-17T23:11:52+01:00 SearchView: Rename 'Search Everywhere' to 'Search all Chats' - - - - - 11 changed files: - gajim/common/zeroconf/connection_zeroconf.py - gajim/data/gui/search_view.ui - gajim/gtk/accounts.py - gajim/gtk/blocking.py - gajim/gtk/builder.py - gajim/gtk/chat_list.py - gajim/gtk/const.py - gajim/gtk/contact_info.py - gajim/gtk/preferences.py - gajim/gtk/settings.py - pyrightconfig.json Changes: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -465,7 +465,7 @@ def reannounce(self): app.ZEROCONF_ACC_NAME, 'zeroconf_email') self.connection.reannounce(txt) - def update_details(self): + def update_details(self) -> None: if self.connection: port = app.settings.get_account_setting(app.ZEROCONF_ACC_NAME, 'custom_port') ===================================== gajim/data/gui/search_view.ui ===================================== @@ -192,7 +192,7 @@ </child> <child> <object class="GtkCheckButton" id="search_checkbutton"> - <property name="label" translatable="yes">Search everywhere</property> + <property name="label" translatable="yes">Search all Chats</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> ===================================== gajim/gtk/accounts.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any +from typing import cast import sys import locale @@ -29,16 +30,20 @@ from gajim.common import app from gajim.common import ged from gajim.common import passwords +from gajim.common.events import AccountDisonnected from gajim.common.i18n import _ from gajim.common.i18n import Q_ +from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from .dialogs import DialogButton from .dialogs import ConfirmationDialog from .const import Setting from .const import SettingKind from .const import SettingType +from .controls.base import BaseControl from .settings import SettingsDialog from .settings import SettingsBox +from .settings import PopoverSetting from .util import open_window @@ -55,8 +60,8 @@ def __init__(self) -> None: self.set_default_size(700, 550) self.set_resizable(True) self.set_title(_('Accounts')) - self._need_relogin = {} - self._accounts = {} + self._need_relogin: dict[str, list[str]] = {} + self._accounts: dict[str, Account] = {} self._menu = AccountMenu() self._settings = Settings() @@ -121,7 +126,9 @@ def _relog(self, account: str) -> None: return if account == app.ZEROCONF_ACC_NAME: - app.connections[app.ZEROCONF_ACC_NAME].update_details() + zeroconf_conn = cast( + ConnectionZeroconf, app.connections[app.ZEROCONF_ACC_NAME]) + zeroconf_conn.update_details() return def relog(): @@ -141,13 +148,23 @@ def relog(): transient_for=self).show() @staticmethod - def _get_relogin_settings(account: str) -> list[Any]: + def _get_relogin_settings(account: str) -> list[str]: if account == app.ZEROCONF_ACC_NAME: - settings = ['zeroconf_first_name', 'zeroconf_last_name', - 'zeroconf_jabber_id', 'zeroconf_email'] + settings = [ + 'zeroconf_first_name', + 'zeroconf_last_name', + 'zeroconf_jabber_id', + 'zeroconf_email' + ] else: - settings = ['client_cert', 'proxy', 'resource', - 'use_custom_host', 'custom_host', 'custom_port'] + settings = [ + 'client_cert', + 'proxy', + 'resource', + 'use_custom_host', + 'custom_host', + 'custom_port' + ] values: list[Any] = [] for setting in settings: @@ -195,18 +212,18 @@ def __init__(self): self.get_style_context().add_class('accounts-settings') self.add(self._stack) - self._page_signal_ids = {} - self._pages = defaultdict(list) + self._page_signal_ids: dict[GenericSettingPage, int] = {} + self._pages: dict[str, list[GenericSettingPage]] = defaultdict(list) - def add_page(self, page): + def add_page(self, page: GenericSettingPage) -> None: self._pages[page.account].append(page) - self._stack.add_named(page, '%s-%s' % (page.account, page.name)) + self._stack.add_named(page, f'{page.account}-{page.name}') self._page_signal_ids[page] = page.connect_signal(self._stack) - def set_page(self, name): + def set_page(self, name: str) -> None: self._stack.set_visible_child_name(name) - def remove_account(self, account): + def remove_account(self, account: str) -> None: for page in self._pages[account]: signal_id = self._page_signal_ids[page] del self._page_signal_ids[page] @@ -215,10 +232,11 @@ def remove_account(self, account): page.destroy() del self._pages[account] - def update_proxy_list(self, account): + def update_proxy_list(self, account: str) -> None: for page in self._pages[account]: if page.name != 'connection': continue + assert isinstance(page, ConnectionPage) page.update_proxy_entries() @@ -228,7 +246,7 @@ class AccountMenu(Gtk.Box): 'menu-activated': (GObject.SignalFlags.RUN_FIRST, None, (str, str)), } - def __init__(self): + def __init__(self) -> None: Gtk.Box.__init__(self) self.set_hexpand(False) self.set_size_request(160, -1) @@ -251,33 +269,42 @@ def __init__(self): self.add(self._stack) @staticmethod - def _sort_func(row1, row2): + def _sort_func(row1: AccountRow, row2: AccountRow) -> int: if row1.label == 'Local': return -1 return locale.strcoll(row1.label.lower(), row2.label.lower()) - def add_account(self, row): + def add_account(self, row: AccountRow) -> None: self._accounts_listbox.add(row) sub_menu = AccountSubMenu(row.account) - self._stack.add_named(sub_menu, '%s-menu' % row.account) + self._stack.add_named(sub_menu, f'{row.account}-menu') sub_menu.connect('row-activated', self._on_sub_menu_row_activated) - def remove_account(self, row): + def remove_account(self, row: AccountRow) -> None: if self._stack.get_visible_child_name() != 'accounts': # activate 'back' button - self._stack.get_visible_child().get_row_at_index(1).emit('activate') + listbox = cast(Gtk.ListBox, self._stack.get_visible_child()) + back_row = cast(Gtk.ListBoxRow, listbox.get_row_at_index(1)) + back_row.emit('activate') self._accounts_listbox.remove(row) sub_menu = self._stack.get_child_by_name('%s-menu' % row.account) self._stack.remove(sub_menu) row.destroy() sub_menu.destroy() - def _on_account_row_activated(self, _listbox, row): + def _on_account_row_activated(self, + _listbox: Gtk.ListBox, + row: AccountRow + ) -> None: self._stack.set_visible_child_name('%s-menu' % row.account) - self._stack.get_visible_child().get_row_at_index(2).emit('activate') + listbox = cast(Gtk.ListBox, self._stack.get_visible_child()) + listbox_row = cast(Gtk.ListBoxRow, listbox.get_row_at_index(2)) + listbox_row.emit('activate') - def _on_sub_menu_row_activated(self, listbox, row): + def _on_sub_menu_row_activated(self, + listbox: AccountSubMenu, + row: MenuItem) -> None: if row.name == 'back': self._stack.set_visible_child_full( 'accounts', Gtk.StackTransitionType.OVER_RIGHT) @@ -288,11 +315,12 @@ def _on_sub_menu_row_activated(self, listbox, row): else: self.emit('menu-activated', listbox.account, - '%s-%s' % (listbox.account, row.name)) + f'{listbox.account}-{row.name}') - def update_account_label(self, account): + def update_account_label(self, account: str) -> None: self._accounts_listbox.invalidate_sort() - sub_menu = self._stack.get_child_by_name('%s-menu' % account) + sub_menu = cast( + AccountSubMenu, self._stack.get_child_by_name(f'{account}-menu')) sub_menu.update() @@ -302,7 +330,7 @@ class AccountSubMenu(Gtk.ListBox): 'update': (GObject.SignalFlags.RUN_FIRST, None, (str,)) } - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ListBox.__init__(self) self.set_vexpand(True) self.set_hexpand(True) @@ -320,15 +348,15 @@ def __init__(self, account): self.add(RemoveMenuItem()) @property - def account(self): + def account(self) -> str: return self._account - def update(self): + def update(self) -> None: self.emit('update', self._account) class MenuItem(Gtk.ListBoxRow): - def __init__(self, name): + def __init__(self, name: str) -> None: Gtk.ListBoxRow.__init__(self) self._name = name self._box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, @@ -338,12 +366,12 @@ def __init__(self, name): self.add(self._box) @property - def name(self): + def name(self) -> str: return self._name class RemoveMenuItem(MenuItem): - def __init__(self): + def __init__(self) -> None: super().__init__('remove') self._label.set_text(_('Remove')) image = Gtk.Image.new_from_icon_name('user-trash-symbolic', @@ -357,7 +385,7 @@ def __init__(self): class AccountLabelMenuItem(MenuItem): - def __init__(self, parent, account): + def __init__(self, parent: AccountSubMenu, account: str) -> None: super().__init__('account-label') self._update_account_label(parent, account) @@ -378,13 +406,16 @@ def __init__(self, parent, account): parent.connect('update', self._update_account_label) - def _update_account_label(self, _listbox, account): + def _update_account_label(self, + _listbox: Gtk.ListBox, + account: str + ) -> None: account_label = app.get_account_label(account) self._label.set_text(account_label) class BackMenuItem(MenuItem): - def __init__(self): + def __init__(self) -> None: super().__init__('back') self.set_selectable(False) @@ -399,7 +430,7 @@ def __init__(self): class PageMenuItem(MenuItem): - def __init__(self, name, label): + def __init__(self, name: str, label: str) -> None: super().__init__(name) if name == 'general': @@ -421,7 +452,11 @@ def __init__(self, name, label): class Account: - def __init__(self, account, menu, settings): + def __init__(self, + account: str, + menu: AccountMenu, + settings: Settings + ) -> None: self._account = account self._menu = menu self._settings = settings @@ -437,40 +472,40 @@ def __init__(self, account, menu, settings): self._account_row = AccountRow(account) self._menu.add_account(self._account_row) - def select(self): + def select(self) -> None: self._account_row.emit('activate') - def show(self): + def show(self) -> None: self._menu.show_all() self._settings.show_all() self.select() - def remove(self): + def remove(self) -> None: self._menu.remove_account(self._account_row) self._settings.remove_account(self._account) - def update_account_label(self): + def update_account_label(self) -> None: self._account_row.update_account_label() self._menu.update_account_label(self._account) - def enable_account(self, state): + def enable_account(self, state: bool) -> None: self._account_row.enable_account(state) @property - def menu(self): + def menu(self) -> AccountMenu: return self._menu @property - def account(self): + def account(self) -> str: return self._account @property - def settings(self): + def settings(self) -> str: return self._account class AccountRow(Gtk.ListBoxRow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ListBoxRow.__init__(self) self.set_selectable(False) @@ -522,26 +557,30 @@ def __init__(self, account): self.add(box) @property - def account(self): + def account(self) -> str: return self._account @property - def label(self): + def label(self) -> str: return self._label.get_text() - def update_account_label(self): + def update_account_label(self) -> None: self._label.set_text(app.get_account_label(self._account)) - def enable_account(self, state): + def enable_account(self, state: bool) -> None: self._switch.set_state(state) self._set_label(state) - def _set_label(self, active): + def _set_label(self, active: bool) -> None: text = Q_('?switch:On') if active else Q_('?switch:Off') self._switch_state_label.set_text(text) - def _on_enable_switch(self, switch, state, account): - def _on_disconnect(event): + def _on_enable_switch(self, + switch: Gtk.Switch, + state: bool, + account: str + ) -> int: + def _on_disconnect(event: AccountDisonnected) -> None: if event.account != account: return app.ged.remove_event_handler('account-disconnected', @@ -549,7 +588,7 @@ def _on_disconnect(event): _on_disconnect) app.interface.disable_account(account) - def _disable(): + def _disable() -> None: app.ged.register_event_handler('account-disconnected', ged.CORE, _on_disconnect) @@ -564,6 +603,7 @@ def _disable(): if (account in app.connections and not app.connections[account].state.is_disconnected): # Connecting or connected + window = cast(Gtk.Window, self.get_toplevel()) ConfirmationDialog( _('Disable Account'), _('Account %s is still connected') % account, @@ -573,7 +613,7 @@ def _disable(): DialogButton.make('Remove', text=_('_Disable Account'), callback=_disable)], - transient_for=self.get_toplevel()).show() + transient_for=window).show() return Gdk.EVENT_STOP if state: @@ -585,7 +625,7 @@ def _disable(): class AddNewAccountPage(Gtk.Box): - def __init__(self): + def __init__(self) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=18) @@ -597,7 +637,7 @@ def __init__(self): 'org.gajim.Gajim-symbolic', 100, self.get_scale_factor(), - 0) + Gtk.IconLookupFlags.FORCE_SIZE) self.add(Gtk.Image.new_from_pixbuf(pixbuf)) button = Gtk.Button(label=_('Add Account')) @@ -608,7 +648,10 @@ def __init__(self): class GenericSettingPage(Gtk.Box): - def __init__(self, account, settings): + + name = '' + + def __init__(self, account: str, settings: list[Setting]) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) self.set_valign(Gtk.Align.START) self.set_vexpand(True) @@ -626,11 +669,11 @@ def __init__(self, account, settings): self.pack_end(self.listbox, True, True, 0) - def connect_signal(self, stack): + def connect_signal(self, stack: Gtk.Stack) -> int: return stack.connect('notify::visible-child', self._on_visible_child_changed) - def _on_visible_child_changed(self, stack, _param): + def _on_visible_child_changed(self, stack: Gtk.Stack, _param: Any) -> None: if self == stack.get_visible_child(): self.listbox.update_states() @@ -639,7 +682,7 @@ class GeneralPage(GenericSettingPage): name = 'general' - def __init__(self, account): + def __init__(self, account: str) -> None: settings = [ Setting(SettingKind.ENTRY, _('Label'), @@ -689,15 +732,16 @@ def __init__(self, account): ] GenericSettingPage.__init__(self, account, settings) - def _on_account_name_change(self, *args): - self.get_toplevel().update_account_label(self.account) + def _on_account_name_change(self, *args: Any) -> None: + window = cast(AccountsWindow, self.get_toplevel()) + window.update_account_label(self.account) class PrivacyPage(GenericSettingPage): name = 'privacy' - def __init__(self, account): + def __init__(self, account: str) -> None: self._account = account history_max_age = { @@ -792,27 +836,28 @@ def __init__(self, account): GenericSettingPage.__init__(self, account, settings) @staticmethod - def _reset_send_chatstate(button): + def _reset_send_chatstate(button: Gtk.Button) -> None: button.set_sensitive(False) app.settings.set_contact_settings('send_chatstate', None) @staticmethod - def _reset_gc_send_chatstate(button): + def _reset_gc_send_chatstate(button: Gtk.Button) -> None: button.set_sensitive(False) app.settings.set_group_chat_settings('send_chatstate', None) - def _send_read_marker(self, state, _data): + def _send_read_marker(self, state: bool, _data: Any) -> None: app.settings.set_account_setting( self._account, 'send_marker_default', state) app.settings.set_account_setting( self._account, 'gc_send_marker_private_default', state) - def _reset_send_read_marker(self, button): + def _reset_send_read_marker(self, button: Gtk.Button) -> None: button.set_sensitive(False) app.settings.set_contact_settings('send_marker', None) app.settings.set_group_chat_settings( 'send_marker', None, context='private') for ctrl in app.window.get_controls(account=self._account): + assert not isinstance(ctrl, BaseControl) ctrl.update_actions() @@ -820,7 +865,7 @@ class ConnectionPage(GenericSettingPage): name = 'connection' - def __init__(self, account): + def __init__(self, account: str) -> None: settings = [ Setting(SettingKind.POPOVER, _('Proxy'), @@ -853,22 +898,23 @@ def __init__(self, account): GenericSettingPage.__init__(self, account, settings) @staticmethod - def _get_proxies(): + def _get_proxies() -> dict[str, str]: return {proxy: proxy for proxy in app.settings.get_proxies()} @staticmethod - def _on_proxy_edit(*args): + def _on_proxy_edit(*args: Any) -> None: open_window('ManageProxies') - def update_proxy_entries(self): - self.listbox.get_setting('proxy').update_entries(self._get_proxies()) + def update_proxy_entries(self) -> None: + popover_row = cast(PopoverSetting, self.listbox.get_setting('proxy')) + popover_row.update_entries(self._get_proxies()) class AdvancedPage(GenericSettingPage): name = 'advanced' - def __init__(self, account): + def __init__(self, account: str) -> None: settings = [ Setting(SettingKind.SWITCH, _('Contact Information'), @@ -897,7 +943,7 @@ class ZeroConfPage(GenericSettingPage): name = 'general' - def __init__(self, account): + def __init__(self, account: str) -> None: settings = [ Setting(SettingKind.DIALOG, _('Profile'), @@ -922,7 +968,7 @@ def __init__(self, account): class ZeroconfProfileDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Gtk.Window) -> None: settings = [ Setting(SettingKind.ENTRY, _('First Name'), @@ -943,7 +989,7 @@ def __init__(self, account, parent): class PriorityDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Gtk.Window) -> None: neg_priority = app.settings.get('enable_negative_priority') if neg_priority: @@ -969,7 +1015,7 @@ def __init__(self, account, parent): self.connect('destroy', self.on_destroy) - def on_destroy(self, *args): + def on_destroy(self, *args: Any) -> None: # Update priority if self.account not in app.connections: return @@ -979,7 +1025,7 @@ def on_destroy(self, *args): class CutstomHostnameDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Gtk.Window) -> None: type_values = ('START TLS', 'DIRECT TLS', 'PLAIN') @@ -1008,7 +1054,7 @@ def __init__(self, account, parent): class CertificateDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Gtk.Window) -> None: settings = [ Setting(SettingKind.FILECHOOSER, _('Client Certificate'), @@ -1024,7 +1070,7 @@ def __init__(self, account, parent): class LoginDialog(SettingsDialog): - def __init__(self, account, parent): + def __init__(self, account: str, parent: Gtk.Window) -> None: settings = [ Setting(SettingKind.ENTRY, _('Password'), @@ -1033,7 +1079,8 @@ def __init__(self, account, parent): Setting(SettingKind.SWITCH, _('Save Password'), SettingType.ACCOUNT_CONFIG, 'savepass', - enabled_func=lambda: not app.settings.get('use_keyring') or passwords.KEYRING_AVAILABLE), + enabled_func=(lambda: not app.settings.get('use_keyring') + or passwords.KEYRING_AVAILABLE)), Setting(SettingKind.CHANGEPASSWORD, _('Change Password'), SettingType.DIALOG, callback=self.on_password_change, @@ -1048,10 +1095,10 @@ def __init__(self, account, parent): self.connect('destroy', self.on_destroy) - def on_password_change(self, new_password, _data): + def on_password_change(self, new_password: str, _data: Any) -> None: passwords.save_password(self.account, new_password) - def on_destroy(self, *args): + def on_destroy(self, *args: Any) -> None: savepass = app.settings.get_account_setting(self.account, 'savepass') if not savepass: passwords.delete_password(self.account) ===================================== gajim/gtk/blocking.py ===================================== @@ -12,13 +12,18 @@ # 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 cast + import logging -from nbxmpp.errors import StanzaError from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib +from nbxmpp.errors import StanzaError +from nbxmpp.protocol import JID +from nbxmpp.task import Task + from gajim.common import app from gajim.common.i18n import _ from gajim.common.helpers import to_user_string @@ -30,7 +35,7 @@ class BlockingList(Gtk.ApplicationWindow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -40,8 +45,8 @@ def __init__(self, account): self.connect_after('key-press-event', self._on_key_press) self.account = account - self._con = app.connections[account] - self._prev_blocked_jids = set() + self._client = app.get_client(account) + self._prev_blocked_jids: set[JID] = set() self._ui = get_builder('blocking_list.ui') self.add(self._ui.blocking_grid) @@ -55,36 +60,36 @@ def __init__(self, account): self._activate_spinner() - self._con.get_module('Blocking').request_blocking_list( + self._client.get_module('Blocking').request_blocking_list( callback=self._on_blocking_list_received) - def _show_error(self, error): + def _show_error(self, error: str) -> None: dialog = HigDialog( self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, _('Error!'), GLib.markup_escape_text(error)) dialog.popup() - def _on_blocking_list_received(self, task): + def _on_blocking_list_received(self, task: Task) -> None: try: - blocking_list = task.finish() + blocking_list = cast(set[JID], task.finish()) except StanzaError as error: self._set_grid_state(False) self._show_error(to_user_string(error)) return - self._prev_blocked_jids = set(blocking_list) + self._prev_blocked_jids = blocking_list self._ui.blocking_store.clear() for jid in blocking_list: - self._ui.blocking_store.append((str(jid),)) + self._ui.blocking_store.append([str(jid)]) self._set_grid_state(True) self._disable_spinner() - def _on_save_result(self, task): + def _on_save_result(self, task: Task): try: - _successful = task.finish() + _successful = cast(bool, task.finish()) except StanzaError as error: self._show_error(to_user_string(error)) self._disable_spinner() @@ -93,44 +98,51 @@ def _on_save_result(self, task): self.destroy() - def _set_grid_state(self, state): + def _set_grid_state(self, state: bool) -> None: self._ui.blocking_grid.set_sensitive(state) - def _jid_edited(self, _renderer, path, new_text): + def _jid_edited(self, + _renderer: Gtk.CellRendererText, + path: str, + new_text: str + ) -> None: iter_ = self._ui.blocking_store.get_iter(path) self._ui.blocking_store.set_value(iter_, 0, new_text) - def _on_add(self, _button): + def _on_add(self, _button: Gtk.ToolButton) -> None: self._ui.blocking_store.append(['']) - def _on_remove(self, _button): - mod, paths = self._ui.block_view.get_selection().get_selected_rows() + def _on_remove(self, _button: Gtk.ToolButton) -> None: + selected_rows = self._ui.block_view.get_selection().get_selected_rows() + if selected_rows is None: + return + mod, paths = selected_rows for path in paths: iter_ = mod.get_iter(path) self._ui.blocking_store.remove(iter_) - def _on_save(self, _button): + def _on_save(self, _button: Gtk.Button) -> None: self._activate_spinner() self._set_grid_state(False) - blocked_jids = set() + blocked_jids: set[JID] = set() for item in self._ui.blocking_store: - blocked_jids.add(item[0].lower()) + blocked_jids.add(JID.from_string(item[0].lower())) unblock_jids = self._prev_blocked_jids - blocked_jids block_jids = blocked_jids - self._prev_blocked_jids - self._con.get_module('Blocking').update_blocking_list( + self._client.get_module('Blocking').update_blocking_list( block_jids, unblock_jids, callback=self._on_save_result) - def _activate_spinner(self): + def _activate_spinner(self) -> None: self._spinner.show() self._spinner.start() - def _disable_spinner(self): + def _disable_spinner(self) -> None: self._spinner.hide() self._spinner.stop() - def _on_key_press(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() ===================================== gajim/gtk/builder.py ===================================== @@ -86,5 +86,5 @@ def get(self, name: str) -> Any: return self._builder.get_object(name) -def get_builder(file_name, widgets=None): +def get_builder(file_name: str, widgets: Optional[list[str]] = None) -> Builder: return Builder(file_name, widgets) ===================================== gajim/gtk/chat_list.py ===================================== @@ -32,20 +32,11 @@ from gajim.common import app from gajim.common import ged +from gajim.common import events from gajim.common.const import AvatarSize from gajim.common.const import Direction from gajim.common.const import KindConstant from gajim.common.const import RowHeaderType -from gajim.common.events import ApplicationEvent -from gajim.common.events import BookmarksReceived -from gajim.common.events import FileRequestReceivedEvent -from gajim.common.events import JingleRequestReceived -from gajim.common.events import MessageUpdated -from gajim.common.events import MessageSent -from gajim.common.events import MessageReceived -from gajim.common.events import MamMessageReceived -from gajim.common.events import GcMessageReceived -from gajim.common.events import PresenceReceived from gajim.common.i18n import _ from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import get_group_chat_nick @@ -63,7 +54,9 @@ log = logging.getLogger('gajim.gui.chatlist') -MessageEventT = Union[MessageReceived, GcMessageReceived, MamMessageReceived] +MessageEventT = Union[events.MessageReceived, + events.GcMessageReceived, + events.MamMessageReceived] class ChatList(Gtk.ListBox, EventHelper): @@ -375,20 +368,20 @@ def update_time(self) -> None: for _key, row in self._chats.items(): row.update_time() - def process_event(self, event: ApplicationEvent) -> None: - if event.name in ('message-received', - 'mam-message-received', - 'gc-message-received'): + def process_event(self, event: events.ApplicationEvent) -> None: + if isinstance(event, (events.MessageReceived, + events.MamMessageReceived, + events.GcMessageReceived)): self._on_message_received(event) - elif event.name == 'message-updated': + elif isinstance(event, events.MessageUpdated): self._on_message_updated(event) - elif event.name == 'presence-received': + elif isinstance(event, events.PresenceReceived): self._on_presence_received(event) - elif event.name == 'message-sent': + elif isinstance(event, events.MessageSent): self._on_message_sent(event) - elif event.name == 'jingle-request-received': + elif isinstance(event, events.JingleRequestReceived): self._on_jingle_request_received(event) - elif event.name == 'file-request-received': + elif isinstance(event, events.FileRequestReceivedEvent): self._on_file_request_received(event) else: log.warning('Unhandled Event: %s', event.name) @@ -434,7 +427,7 @@ def _get_nick_for_received_message(event: MessageEventT) -> str: nick = '' return nick - def _on_message_updated(self, event: MessageUpdated) -> None: + def _on_message_updated(self, event: events.MessageUpdated) -> None: row = self._chats.get((event.account, JID.from_string(event.jid))) if row is None: return @@ -451,7 +444,7 @@ def _on_message_updated(self, event: MessageUpdated) -> None: event.properties.moderation.reason) row.set_message_text(text) - def _on_message_sent(self, event: MessageSent) -> None: + def _on_message_sent(self, event: events.MessageSent) -> None: msgtext = event.message if not msgtext: return @@ -477,14 +470,14 @@ def _on_message_sent(self, event: MessageSent) -> None: additional_data=event.additional_data) self.invalidate_sort() - def _on_presence_received(self, event: PresenceReceived) -> None: + def _on_presence_received(self, event: events.PresenceReceived) -> None: row = self._chats.get((event.account, JID.from_string(event.jid))) if row is None: return row.update_avatar() def _on_jingle_request_received(self, - event: JingleRequestReceived + event: events.JingleRequestReceived ) -> None: content_types: list[str] = [] for item in event.contents: @@ -500,7 +493,7 @@ def _on_jingle_request_received(self, _('Call'), icon_name='call-start-symbolic') def _on_file_request_received(self, - event: FileRequestReceivedEvent + event: events.FileRequestReceivedEvent ) -> None: row = self._chats.get((event.account, JID.from_string(event.jid))) if row is None: @@ -534,7 +527,7 @@ def _on_account_changed(self, *args: Any) -> None: for row in rows: row.update_account_identifier() - def _on_bookmarks_received(self, _event: BookmarksReceived) -> None: + def _on_bookmarks_received(self, _event: events.BookmarksReceived) -> None: rows = cast(list[ChatRow], self.get_children()) for row in rows: row.update_name() @@ -674,7 +667,7 @@ def header(self) -> Optional[RowHeaderType]: return header.type @header.setter - def header(self, type_: RowHeaderType) -> None: + def header(self, type_: Optional[RowHeaderType]) -> None: if type_ == self.header: return if type_ is None: @@ -822,7 +815,7 @@ def _get_unread_string(count: int) -> str: def add_unread(self, text: str) -> None: control = app.window.get_control(self.account, self.jid) - if self.is_active and control.get_autoscroll(): + if self.is_active and control is not None and control.get_autoscroll(): return self._unread_count += 1 ===================================== gajim/gtk/const.py ===================================== @@ -14,16 +14,36 @@ # Constants for the gtk module +from __future__ import annotations + +from typing import Any +from typing import Callable +from typing import NamedTuple +from typing import Optional + from collections import namedtuple from enum import Enum from enum import IntEnum from enum import unique +from gajim.common.setting_values import AllSettingsT + Filter = namedtuple('Filter', 'name pattern default') -Setting = namedtuple('Setting', 'kind label type value name callback data desc ' - 'bind inverted enabled_func props') -Setting.__new__.__defaults__ = (None,) * len(Setting._fields) # type: ignore + +class Setting(NamedTuple): + kind: SettingKind + label: str + type: SettingType + value: Optional[AllSettingsT] = None + name: Optional[str] = None + callback: Optional[Callable[..., None]] = None + data: Optional[Any] = None + desc: Optional[str] = None + bind: Optional[str] = None + inverted: Optional[bool] = None + enabled_func: Optional[Callable[..., bool]] = None + props: Optional[dict[str, Any]] = None DEFAULT_WORKSPACE_COLOR = 'rgb(191,15,167)' ===================================== gajim/gtk/contact_info.py ===================================== @@ -16,12 +16,14 @@ from typing import Optional from typing import Union +from typing import cast import logging from enum import IntEnum from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GdkPixbuf from gi.repository import GObject from nbxmpp.task import Task @@ -210,6 +212,7 @@ def _fill_groups_page(self, contact: BareContact) -> None: return model = self._ui.groups_treeview.get_model() + assert isinstance(model, Gtk.ListStore) model.set_sort_column_id(Column.GROUP_NAME, Gtk.SortType.ASCENDING) groups = self._client.get_module('Roster').get_groups() for group in groups: @@ -247,7 +250,7 @@ def _query_device(self, contact: ResourceContact) -> None: def _on_vcard_received(self, task: Task) -> None: try: - vcard = task.finish() + vcard = cast(VCard, task.finish()) except StanzaError as err: log.info('Error loading VCard: %s', err) vcard = VCard() @@ -262,6 +265,8 @@ def _load_avatar(self) -> None: surface_2 = self.contact.get_avatar(AvatarSize.VCARD_HEADER, scale, add_show=False) + assert not isinstance(surface_1, GdkPixbuf.Pixbuf) + assert not isinstance(surface_2, GdkPixbuf.Pixbuf) self._ui.avatar_image.set_from_surface(surface_1) self._ui.header_image.set_from_surface(surface_2) @@ -269,7 +274,7 @@ def _set_os_info(self, task: Task) -> None: self._tasks.remove(task) try: - result = task.finish() + result = cast(SoftwareVersionResult, task.finish()) except Exception as err: log.warning('Could not retrieve software version: %s', err) result = None @@ -282,7 +287,7 @@ def _set_entity_time(self, task: Task) -> None: self._tasks.remove(task) try: - entity_time = task.finish() + entity_time = cast(str, task.finish()) except Exception as err: log.warning('Could not retrieve entity time: %s', err) entity_time = None @@ -373,13 +378,15 @@ def _on_group_name_edited(self, model = self._ui.groups_treeview.get_model() assert model is not None + assert isinstance(model, Gtk.ListStore) selected_iter_ = model.get_iter(path) old_name = model[selected_iter_][Column.GROUP_NAME] # Check if group already exists iter_ = model.get_iter_first() while iter_: - if model.get_value(iter_, Column.GROUP_NAME) == new_name: + group_name = model.get_value(iter_, Column.GROUP_NAME).get_string() + if group_name == new_name: return iter_ = model.iter_next(iter_) @@ -418,7 +425,9 @@ def _on_group_toggled(self, iter_ = model.get_iter_first() while iter_: if model.get_value(iter_, Column.IN_GROUP): - groups.add(model.get_value(iter_, Column.GROUP_NAME)) + group_name = model.get_value( + iter_, Column.GROUP_NAME).get_string() + groups.add(group_name) iter_ = model.iter_next(iter_) self._client.get_module('Roster').set_groups(self.contact.jid, groups) @@ -427,11 +436,13 @@ def _on_group_add_button_clicked(self, _widget: Gtk.Button) -> None: default_name = _('New Group') model = self._ui.groups_treeview.get_model() assert model is not None + assert isinstance(model, Gtk.ListStore) # Check if default_name group already exists iter_ = model.get_iter_first() while iter_: - if model.get_value(iter_, Column.GROUP_NAME) == default_name: + group_name = model.get_value(iter_, Column.GROUP_NAME).get_string() + if group_name == default_name: default_name += '_' iter_ = model.iter_next(iter_) ===================================== gajim/gtk/preferences.py ===================================== @@ -35,11 +35,14 @@ from gajim.common.multimedia_helpers import VideoInputManager from gajim.common.events import StyleChanged from gajim.common.events import ThemeUpdate +from gajim.common.setting_values import AllSettings from .const import Setting from .const import SettingKind from .const import SettingType +from .controls.groupchat import GroupchatControl from .emoji_chooser import emoji_chooser +from .settings import PopoverSetting from .settings import SettingsBox from .settings import SettingsDialog from .sidebar_switcher import SideBarSwitcher @@ -68,7 +71,7 @@ def __init__(self) -> None: self._ui = get_builder('preferences.ui') self._video_preview: Optional[VideoPreview] = None - self._prefs = {} + self._prefs: dict[str, PreferenceBox] = {} side_bar_switcher = SideBarSwitcher() side_bar_switcher.set_stack(self._ui.stack) @@ -142,10 +145,12 @@ def _on_features_clicked(_widget: Gtk.InfoBar, open_window('Features') def update_theme_list(self) -> None: - self._prefs['themes'].update_theme_list() + themes = cast(Themes, self._prefs['themes']) + themes.update_theme_list() def update_proxy_list(self) -> None: - self._prefs['miscellaneous'].update_proxy_list() + miscellaneous = cast(Miscellaneous, self._prefs['miscellaneous']) + miscellaneous.update_proxy_list() @staticmethod def _check_emoji_theme() -> None: @@ -333,13 +338,17 @@ def __init__(self, *args: Any) -> None: def _on_sort_by_show_in_muc(_value: bool, *args: Any) -> None: for ctrl in app.window.get_controls(): if ctrl.is_groupchat: - ctrl.roster.invalidate_sort() + assert isinstance(ctrl, GroupchatControl) + if ctrl.roster is not None: + ctrl.roster.invalidate_sort() @staticmethod def _on_show_status_in_roster(_value: bool, *args: Any) -> None: for ctrl in app.window.get_controls(): if ctrl.is_groupchat: - ctrl.roster.draw_contacts() + assert isinstance(ctrl, GroupchatControl) + if ctrl.roster is not None: + ctrl.roster.draw_contacts() @staticmethod def _reset_join_left(button: Gtk.Button) -> None: @@ -648,7 +657,8 @@ def _get_theme_items() -> list[str]: return theme_items def update_theme_list(self) -> None: - self.get_setting('roster_theme').update_entries(self._get_theme_items()) + popover_row = cast(PopoverSetting, self.get_setting('roster_theme')) + popover_row.update_entries(self._get_theme_items()) def _on_edit_themes(self, _button: Gtk.Button) -> None: open_window('Themes', transient=self.get_toplevel()) @@ -874,8 +884,8 @@ def _create_av_combo_items(items_dict: dict[str, str]) -> dict[str, str]: class Miscellaneous(PreferenceBox): def __init__(self, pref_window: Preferences) -> None: - self._hints_list = [ - 'start_chat', + self._hints_list: list[AllSettings] = [ + 'show_help_start_chat', ] settings = [ @@ -919,17 +929,18 @@ def _on_proxy_edit(*args: Any) -> None: open_window('ManageProxies') def update_proxy_list(self) -> None: - self.get_setting('global_proxy').update_entries(self._get_proxies()) + popover_row = cast(PopoverSetting, self.get_setting('global_proxy')) + popover_row.update_entries(self._get_proxies()) def _check_hints_reset(self) -> bool: for hint in self._hints_list: - if app.settings.get(f'show_help_{hint}') is False: + if app.settings.get(hint) is False: return True return False def _on_reset_hints(self, button: Gtk.Button) -> None: for hint in self._hints_list: - app.settings.set(f'show_help_{hint}', True) + app.settings.set(hint, True) button.set_sensitive(False) ===================================== gajim/gtk/settings.py ===================================== @@ -14,26 +14,48 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import Callable +from typing import Optional +from typing import Union +from typing import cast + +import logging + from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gdk from gi.repository import Pango +from nbxmpp.protocol import JID + from gajim.common import app from gajim.common import passwords from gajim.common.i18n import _ from gajim.common.i18n import Q_ +from gajim.common.setting_values import AllSettingsT from .util import get_image_button from .util import MaxWidthComboBoxText from .util import open_window +from .const import Setting from .const import SettingKind from .const import SettingType +log = logging.getLogger('gajim.gui.settings') + class SettingsDialog(Gtk.ApplicationWindow): - def __init__(self, parent, title, flags, settings, account, - extend=None): + def __init__(self, + parent: Gtk.Window, + title: str, + flags: Gtk.DialogFlags, + settings: list[Setting], + account: str, + extend: Optional[dict[SettingKind, GenericSetting]] = None + ) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_show_menubar(False) @@ -62,23 +84,27 @@ def __init__(self, parent, title, flags, settings, account, self.show_all() self.connect_after('key-press-event', self.on_key_press) - def on_key_press(self, _widget, event): + def on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def get_setting(self, name): + def get_setting(self, name: str): return self.listbox.get_setting(name) class SettingsBox(Gtk.ListBox): - def __init__(self, account=None, jid=None, extend=None): + def __init__(self, + account: Optional[str] = None, + jid: Optional[str] = None, + extend: Optional[dict[SettingKind, GenericSetting]] = None + ) -> None: Gtk.ListBox.__init__(self) self.get_style_context().add_class('settings-box') self.account = account self.jid = jid - self.named_settings = {} + self.named_settings: dict[str, GenericSetting] = {} - self.map = { + self.map: dict[SettingKind, GenericSetting] = { SettingKind.SWITCH: SwitchSetting, SettingKind.SPIN: SpinSetting, SettingKind.DIALOG: DialogSetting, @@ -107,16 +133,16 @@ def __init__(self, account=None, jid=None, extend=None): self.connect('destroy', self.__on_destroy) @staticmethod - def __on_destroy(widget): + def __on_destroy(widget: SettingsBox) -> None: app.check_finalize(widget) for row in widget.get_children(): app.check_finalize(row) @staticmethod - def on_row_activated(_listbox, row): + def on_row_activated(_listbox: SettingsBox, row: GenericSetting) -> None: row.on_row_activated() - def add_setting(self, setting): + def add_setting(self, setting: Setting) -> None: if not isinstance(setting, Gtk.ListBoxRow): if setting.props is not None: listitem = self.map[setting.kind](self.account, @@ -132,28 +158,29 @@ def add_setting(self, setting): self.named_settings[setting.name] = listitem self.add(listitem) - def get_setting(self, name): + def get_setting(self, name: str) -> GenericSetting: return self.named_settings[name] - def update_states(self): - for row in self.get_children(): + def update_states(self) -> None: + for row in cast(list[GenericSetting], self.get_children()): row.update_activatable() class GenericSetting(Gtk.ListBoxRow): def __init__(self, - account, - jid, - label, - type_, - value, - name, - callback, - data, - desc, - bind, - inverted, - enabled_func): + account: str, + jid: JID, + label: str, + type_: SettingType, + value: AllSettingsT, + name: Optional[str], + callback: Optional[Callable[..., None]] = None, + data: Optional[Any] = None, + desc: Optional[str] = None, + bind: Optional[str] = None, + inverted: bool = False, + enabled_func: Optional[Callable[..., bool]] = None + ) -> None: Gtk.ListBoxRow.__init__(self) self._grid = Gtk.Grid() @@ -207,7 +234,7 @@ def __init__(self, self._bind_sensitive_state() - def _bind_sensitive_state(self): + def _bind_sensitive_state(self) -> None: if self.bind is None: return @@ -236,7 +263,11 @@ def _bind_sensitive_state(self): value = not value self.set_sensitive(value) - def _parse_bind(self): + def _parse_bind(self) -> tuple[SettingType, + str, + Optional[str], + Optional[JID]]: + assert self.bind is not None if '::' not in self.bind: return SettingType.CONFIG, self.bind, None, None @@ -258,7 +289,11 @@ def get_value(self): self.jid) @staticmethod - def __get_value(type_, value, account, jid): + def __get_value(type_: SettingType, + value: AllSettingsT, + account: str, + jid: JID + ) -> Optional[AllSettingsT]: if value is None: return None if type_ == SettingType.VALUE: @@ -284,20 +319,23 @@ def __get_value(type_, value, account, jid): return app.settings.get_account_setting(account, value) if type_ == SettingType.ACTION: + assert isinstance(value, str) if value.startswith('-'): return account + value return value raise ValueError('Wrong SettingType?') - def set_value(self, state): + def set_value(self, state: AllSettingsT) -> None: if self.type_ == SettingType.CONFIG: app.settings.set(self.value, state) elif self.type_ == SettingType.ACCOUNT_CONFIG: if self.value == 'password': + assert isinstance(state, str) passwords.save_password(self.account, state) if self.value == 'no_log_for': + assert isinstance(state, bool) self.set_no_log_for(self.account, state) else: app.settings.set_account_setting(self.account, @@ -316,7 +354,7 @@ def set_value(self, state): self.callback(state, self.data) @staticmethod - def set_no_log_for(account, state): + def set_no_log_for(account: str, state: bool) -> None: no_log = app.settings.get_account_setting(account, 'no_log_for').split() if state and account in no_log: no_log.remove(account) @@ -326,10 +364,10 @@ def set_no_log_for(account, state): 'no_log_for', ' '.join(no_log)) - def on_row_activated(self): + def on_row_activated(self) -> None: raise NotImplementedError - def update_activatable(self): + def update_activatable(self) -> None: if self.enabled_func is None: return @@ -337,11 +375,15 @@ def update_activatable(self): self.set_activatable(enabled_func_value) self.set_sensitive(enabled_func_value) - def _add_action_button(self, kwargs): - icon_name = kwargs.get('button-icon-name') - button_text = kwargs.get('button-text') - tooltip_text = kwargs.get('button-tooltip') or '' - style = kwargs.get('button-style') + def _add_action_button(self, + kwargs: dict[str, Union[str, + Callable[..., None], + None]] + ) -> None: + icon_name = cast(str, kwargs.get('button-icon-name')) + button_text = cast(str, kwargs.get('button-text')) + tooltip_text = cast(str, kwargs.get('button-tooltip') or '') + style = cast(str, kwargs.get('button-style')) if icon_name is not None: button = Gtk.Button.new_from_icon_name(icon_name, Gtk.IconSize.MENU) @@ -356,18 +398,21 @@ def _add_action_button(self, kwargs): for css_class in style.split(' '): button.get_style_context().add_class(css_class) - button.connect('clicked', kwargs['button-callback']) + callback = kwargs['button-callback'] + assert isinstance(callback, Callable) + button.connect('clicked', callback) button.set_tooltip_text(tooltip_text) self.setting_box.add(button) class SwitchSetting(GenericSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: GenericSetting.__init__(self, *args) self.switch = Gtk.Switch() if self.type_ == SettingType.ACTION: - self.switch.set_action_name('app.%s' % self.setting_value) + self.switch.set_action_name(f'app.{self.setting_value}') + assert isinstance(self.setting_value, str) state = app.app.get_action_state(self.setting_value) self.switch.set_active(state.get_boolean()) else: @@ -392,22 +437,22 @@ def __init__(self, *args, **kwargs): self.show_all() - def on_row_activated(self): + def on_row_activated(self) -> None: state = self.switch.get_active() self.switch.set_active(not state) - def on_switch(self, switch, *args): + def on_switch(self, switch: Gtk.Switch, *args: Any) -> None: value = switch.get_active() self.set_value(value) self._set_label(value) - def _set_label(self, active): + def _set_label(self, active: bool) -> None: text = Q_('?switch:On') if active else Q_('?switch:Off') self._switch_state_label.set_text(text) class EntrySetting(GenericSetting): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: GenericSetting.__init__(self, *args) self.entry = Gtk.Entry() @@ -422,6 +467,7 @@ def __init__(self, *args): self.setting_box.pack_end(self.entry, True, True, 0) + assert isinstance(self.value, str) app.settings.connect_signal(self.value, self._on_setting_changed, account=self.account, @@ -431,25 +477,26 @@ def __init__(self, *args): self.show_all() - def _on_setting_changed(self, value, *args): + def _on_setting_changed(self, value: str, *args: Any) -> None: self.entry.set_text(value) - def _on_destroy(self, *args): + def _on_destroy(self, *args: Any) -> None: app.settings.disconnect_signals(self) - def on_text_change(self, *args): + def on_text_change(self, *args: Any) -> None: text = self.entry.get_text() self.set_value(text) - def on_row_activated(self): + def on_row_activated(self) -> None: self.entry.grab_focus() class ColorSetting(GenericSetting): - def __init__(self, *args): + def __init__(self, *args: Any) -> None: GenericSetting.__init__(self, *args) rgba = Gdk.RGBA() + assert isinstance(self.setting_value, str) rgba.parse(self.setting_value) self.color_button = Gtk.ColorButton() self.color_button.set_rgba(rgba) @@ -459,6 +506,7 @@ def __init__(self, *args): self.setting_box.pack_end(self.color_button, True, True, 0) + assert isinstance(self.value, str) app.settings.connect_signal(self.value, self._on_setting_changed, account=self.account, @@ -468,25 +516,25 @@ def __init__(self, *args): self.show_all() - def _on_setting_changed(self, value, *args): + def _on_setting_changed(self, value: str, *args: Any) -> None: rgba = Gdk.RGBA() rgba.parse(value) self.color_button.set_rgba(rgba) - def _on_destroy(self, *args): + def _on_destroy(self, *args: Any) -> None: app.settings.disconnect_signals(self) - def on_color_set(self, button): + def on_color_set(self, button: Gtk.ColorButton) -> None: rgba = button.get_rgba() self.set_value(rgba.to_string()) app.css_config.refresh() - def on_row_activated(self): + def on_row_activated(self) -> None: self.color_button.grab_focus() class DialogSetting(GenericSetting): - def __init__(self, *args, dialog): + def __init__(self, *args: Any, dialog: SettingsDialog) -> None: GenericSetting.__init__(self, *args) self.dialog = dialog @@ -497,24 +545,26 @@ def __init__(self, *args, dialog): self.show_all() - def show_dialog(self, parent): + def show_dialog(self, parent: Gtk.Window) -> None: if self.dialog: dialog = self.dialog(self.account, parent) dialog.connect('destroy', self.on_destroy) - def on_destroy(self, *args): + def on_destroy(self, *args: Any) -> None: self.setting_value.set_text(self.get_setting_value()) - def get_setting_value(self): + def get_setting_value(self) -> str: self.setting_value.hide() return '' - def on_row_activated(self): - self.show_dialog(self.get_toplevel()) + def on_row_activated(self) -> None: + window = self.get_toplevel() + assert isinstance(window, Gtk.Window) + self.show_dialog(window) class SpinSetting(GenericSetting): - def __init__(self, *args, range_): + def __init__(self, *args: Any, range_: tuple[float, float]) -> None: GenericSetting.__init__(self, *args) lower, upper = range_ @@ -529,7 +579,9 @@ def __init__(self, *args, range_): self.spin.set_adjustment(adjustment) self.spin.set_numeric(True) self.spin.set_update_policy(Gtk.SpinButtonUpdatePolicy.IF_VALID) - self.spin.set_value(self.setting_value) + + assert self.setting_value is not None + self.spin.set_value(float(self.setting_value)) self.spin.set_halign(Gtk.Align.FILL) self.spin.set_valign(Gtk.Align.CENTER) self.spin.connect('notify::value', self.on_value_change) @@ -538,16 +590,16 @@ def __init__(self, *args, range_): self.show_all() - def on_row_activated(self): + def on_row_activated(self) -> None: self.spin.grab_focus() - def on_value_change(self, spin, *args): + def on_value_change(self, spin: Gtk.SpinButton, *args: Any) -> None: value = spin.get_value_as_int() self.set_value(value) class FileChooserSetting(GenericSetting): - def __init__(self, *args, filefilter): + def __init__(self, *args: Any, filefilter: tuple[str, str]) -> None: GenericSetting.__init__(self, *args) button = Gtk.FileChooserButton(title=self.label, @@ -556,8 +608,10 @@ def __init__(self, *args, filefilter): # GTK Bug: The FileChooserButton expands without limit # get the label and use set_max_wide_chars() - label = button.get_children()[0].get_children()[0].get_children()[1] - label.set_max_width_chars(20) + inner_button = cast(Gtk.Button, button.get_children()[0]) + inner_box = cast(Gtk.Box, inner_button.get_children()[0]) + inner_label = cast(Gtk.Label, inner_box.get_children()[1]) + inner_label.set_max_width_chars(20) if filefilter: name, pattern = filefilter @@ -573,6 +627,7 @@ def __init__(self, *args, filefilter): button.add_filter(filter_) if self.setting_value: + assert isinstance(self.setting_value, str) button.set_filename(self.setting_value) button.connect('selection-changed', self.on_select) @@ -584,28 +639,31 @@ def __init__(self, *args, filefilter): self.show_all() - def on_select(self, filechooser): + def on_select(self, filechooser: Gtk.FileChooser) -> None: self.set_value(filechooser.get_filename() or '') - def on_row_activated(self): + def on_row_activated(self) -> None: pass class CallbackSetting(GenericSetting): - def __init__(self, *args, callback): + def __init__(self, *args: Any, callback: Callable[..., Any]) -> None: GenericSetting.__init__(self, *args) self.callback = callback self.show_all() - def on_row_activated(self): + def on_row_activated(self) -> None: self.callback() class ActionSetting(GenericSetting): - def __init__(self, *args, account): + def __init__(self, *args: Any, account: str) -> None: GenericSetting.__init__(self, *args) - action_name = '%s%s' % (account, self.value) + action_name = f'{account}{self.value}' self.action = app.app.lookup_action(action_name) + if self.action is None: + log.error('Action not found: %s', action_name) + return self.variant = GLib.Variant.new_string(account) self.on_enable() @@ -614,27 +672,34 @@ def __init__(self, *args, account): 'notify::enabled', self.on_enable) self.connect('destroy', self._on_destroy) - def _on_destroy(self, *args): - self.action.disconnect(self._handler_id) + def _on_destroy(self, *args: Any) -> None: + if self.action is not None: + self.action.disconnect(self._handler_id) - def on_enable(self, *args): - self.set_sensitive(self.action.get_enabled()) + def on_enable(self, *args: Any) -> None: + if self.action is not None: + self.set_sensitive(self.action.get_enabled()) - def on_row_activated(self): - self.action.activate(self.variant) + def on_row_activated(self) -> None: + if self.action is not None: + self.action.activate(self.variant) class LoginSetting(DialogSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: DialogSetting.__init__(self, *args, **kwargs) - def get_setting_value(self): + def get_setting_value(self) -> str: jid = app.get_jid_from_account(self.account) return jid class PopoverSetting(GenericSetting): - def __init__(self, *args, entries, **kwargs): + def __init__(self, + *args: Any, + entries: Union[list[str], dict[str, str]], + **kwargs: Any + ) -> None: GenericSetting.__init__(self, *args) self._entries = self._convert_to_dict(entries) @@ -644,7 +709,7 @@ def __init__(self, *args, entries, **kwargs): box.set_halign(Gtk.Align.END) box.set_hexpand(True) - self._default_text = kwargs.get('default-text') + self._default_text = cast(str, kwargs.get('default-text')) self._current_label = Gtk.Label() self._current_label.set_valign(Gtk.Align.CENTER) @@ -683,6 +748,7 @@ def __init__(self, *args, entries, **kwargs): text = self._entries.get(self.setting_value, self._default_text or '') self._current_label.set_text(text) + assert isinstance(self.value, str) app.settings.connect_signal(self.value, self._on_setting_changed, account=self.account, @@ -693,19 +759,20 @@ def __init__(self, *args, entries, **kwargs): self.show_all() @staticmethod - def _convert_to_dict(entries): + def _convert_to_dict(entries: Union[list[Any], dict[Any, Any]] + ) -> dict[Any, Any]: if isinstance(entries, list): entries = {key: key for key in entries} return entries - def _on_setting_changed(self, value, *args): + def _on_setting_changed(self, value: str, *args: Any) -> None: text = self._entries.get(value) if text is None: text = self._default_text or '' self._current_label.set_text(text) - def _add_menu_entries(self): + def _add_menu_entries(self) -> None: if self._default_text is not None: self._menu_listbox.add(PopoverRow(self._default_text, '')) @@ -714,38 +781,44 @@ def _add_menu_entries(self): self._menu_listbox.show_all() - def _on_menu_row_activated(self, listbox, row): + def _on_menu_row_activated(self, + listbox: Gtk.ListBox, + row: PopoverRow + ) -> None: listbox.unselect_all() self._popover.popdown() self.set_value(row.value) - def on_row_activated(self): + def on_row_activated(self) -> None: self._popover.popup() - def update_entries(self, entries): + def update_entries(self, entries: Union[list[str], dict[str, str]]) -> None: self._entries = self._convert_to_dict(entries) self._menu_listbox.foreach(self._menu_listbox.remove) self._add_menu_entries() - def _on_destroy(self, *args): + def _on_destroy(self, *args: Any) -> None: self._popover.destroy() app.settings.disconnect_signals(self) class PopoverRow(Gtk.ListBoxRow): - def __init__(self, label, value): + def __init__(self, label: str, value: str) -> None: Gtk.ListBoxRow.__init__(self) self.label = label self.value = value - label = Gtk.Label(label=label) - label.set_xalign(0) - self.add(label) + row_label = Gtk.Label(label=label) + row_label.set_xalign(0) + self.add(row_label) class ComboSetting(GenericSetting): - def __init__(self, *args, combo_items): + def __init__(self, + *args: Any, + combo_items: list[Union[str, tuple[str, str]]] + ) -> None: GenericSetting.__init__(self, *args) self.combo = MaxWidthComboBoxText() @@ -765,18 +838,20 @@ def __init__(self, *args, combo_items): self.setting_box.pack_start(self.combo, True, True, 0) self.show_all() - def on_value_change(self, combo): - self.set_value(combo.get_active_id()) + def on_value_change(self, combo: Gtk.ComboBox) -> None: + active_id = combo.get_active_id() + if active_id is not None: + self.set_value(active_id) - def on_row_activated(self): + def on_row_activated(self) -> None: pass class PrioritySetting(DialogSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: DialogSetting.__init__(self, *args, **kwargs) - def get_setting_value(self): + def get_setting_value(self) -> str: adjust = app.settings.get_account_setting( self.account, 'adjust_priority_with_status') if adjust: @@ -787,24 +862,24 @@ def get_setting_value(self): class CutstomHostnameSetting(DialogSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: DialogSetting.__init__(self, *args, **kwargs) - def get_setting_value(self): + def get_setting_value(self) -> str: custom = app.settings.get_account_setting(self.account, 'use_custom_host') return Q_('?switch:On') if custom else Q_('?switch:Off') class ChangePasswordSetting(DialogSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: DialogSetting.__init__(self, *args, **kwargs) - def show_dialog(self, parent): + def show_dialog(self, parent: Gtk.Window) -> None: parent.destroy() open_window('ChangePassword', account=self.account) - def update_activatable(self): + def update_activatable(self) -> None: activatable = False if self.account in app.connections: con = app.connections[self.account] @@ -814,36 +889,36 @@ def update_activatable(self): class CutstomAutoAwaySetting(DialogSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: DialogSetting.__init__(self, *args, **kwargs) - def get_setting_value(self): + def get_setting_value(self) -> str: value = app.settings.get('autoaway') return Q_('?switch:On') if value else Q_('?switch:Off') class CutstomAutoExtendedAwaySetting(DialogSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: DialogSetting.__init__(self, *args, **kwargs) - def get_setting_value(self): + def get_setting_value(self) -> str: value = app.settings.get('autoxa') return Q_('?switch:On') if value else Q_('?switch:Off') class CustomStunServerSetting(DialogSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: DialogSetting.__init__(self, *args, **kwargs) - def get_setting_value(self): + def get_setting_value(self) -> str: value = app.settings.get('use_stun_server') return Q_('?switch:On') if value else Q_('?switch:Off') class NotificationsSetting(DialogSetting): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: DialogSetting.__init__(self, *args, **kwargs) - def get_setting_value(self): + def get_setting_value(self) -> str: value = app.settings.get('show_notifications') return Q_('?switch:On') if value else Q_('?switch:Off') ===================================== pyrightconfig.json ===================================== @@ -22,7 +22,9 @@ "gajim/gtk/account_side_bar.py", "gajim/gtk/app_page.py", "gajim/gtk/app_side_bar.py", + "gajim/gtk/blocking.py", "gajim/gtk/bookmarks.py", + "gajim/gtk/builder.py", "gajim/gtk/call_widget.py", "gajim/gtk/chat_filter.py", "gajim/gtk/chat_list_stack.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/82f5e93fe1f9e1be548320bcb45a7bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/82f5e93fe1f9e1be548320bcb45a7bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Remove unused module
by Philipp Hörist (＠lovetox) 17 Jan '22

17 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: fae812bc by lovetox at 2022-01-17T17:02:17+01:00 Remove unused module - - - - - 025777b3 by lovetox at 2022-01-17T17:02:17+01:00 FileTransfersWindow: Simplify code - - - - - 48f0c1a3 by lovetox at 2022-01-17T17:02:17+01:00 JingleContent: Add type annotations - - - - - 82f5e93f by lovetox at 2022-01-17T17:02:17+01:00 Events: Move logic from FileRequestReceivedEvent to JingleFT module - - - - - 6 changed files: - − gajim/common/dh.py - gajim/common/events.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/gtk/filetransfer.py - pyrightconfig.json Changes: ===================================== gajim/common/dh.py deleted ===================================== @@ -1,229 +0,0 @@ -# Copyright (C) 2007-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# -# 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/>. - -""" -This module defines a number of constants; specifically, large primes suitable -for use with the Diffie-Hellman key exchange - -These constants have been obtained from RFC2409 and RFC3526. -""" - -import string - -generators = [ - None, # one to get the right offset - 2, - 2, - None, - None, - 2, - None, - None, - None, - None, - None, - None, - None, - None, - 2, # group 14 - 2, - 2, - 2, - 2 -] - -_HEX_PRIMES = [ - None, - - # group 1 - '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 - 29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD - EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 - E485B576 625E7EC6 F44C42E9 A63A3620 FFFFFFFF FFFFFFFF''', - - # group 2 - '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 - 29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD - EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 - E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED - EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 - FFFFFFFF FFFFFFFF''', - - # XXX how do I obtain these? - None, - None, - - # group 5 - '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 - 29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD - EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 - E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED - EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D - C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F - 83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D - 670C354E 4ABC9804 F1746C08 CA237327 FFFFFFFF FFFFFFFF''', - - None, - None, - None, - None, - None, - None, - None, - None, - - # group 14 - '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 - 29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD - EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 - E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED - EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D - C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F - 83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D - 670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B - E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 - DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510 - 15728E5A 8AACAA68 FFFFFFFF FFFFFFFF''', - - # group 15 - '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 - 29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD - EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 - E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED - EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D - C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F - 83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D - 670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B - E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 - DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510 - 15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64 - ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7 - ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B - F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C - BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31 - 43DB5BFC E0FD108E 4B82D120 A93AD2CA FFFFFFFF FFFFFFFF''', - - # group 16 - '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 - 29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD - EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 - E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED - EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D - C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F - 83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D - 670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B - E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 - DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510 - 15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64 - ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7 - ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B - F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C - BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31 - 43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7 - 88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA - 2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6 - 287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED - 1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9 - 93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199 - FFFFFFFF FFFFFFFF''', - - # group 17 - '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 29024E08 - 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD EF9519B3 CD3A431B - 302B0A6D F25F1437 4FE1356D 6D51C245 E485B576 625E7EC6 F44C42E9 - A637ED6B 0BFF5CB6 F406B7ED EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 - 49286651 ECE45B3D C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 - FD24CF5F 83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D - 670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B E39E772C - 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 DE2BCBF6 95581718 - 3995497C EA956AE5 15D22618 98FA0510 15728E5A 8AAAC42D AD33170D - 04507A33 A85521AB DF1CBA64 ECFB8504 58DBEF0A 8AEA7157 5D060C7D - B3970F85 A6E1E4C7 ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 - 1AD2EE6B F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C - BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31 43DB5BFC - E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7 88719A10 BDBA5B26 - 99C32718 6AF4E23C 1A946834 B6150BDA 2583E9CA 2AD44CE8 DBBBC2DB - 04DE8EF9 2E8EFC14 1FBECAA6 287C5947 4E6BC05D 99B2964F A090C3A2 - 233BA186 515BE7ED 1F612970 CEE2D7AF B81BDD76 2170481C D0069127 - D5B05AA9 93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492 - 36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD F8FF9406 - AD9E530E E5DB382F 413001AE B06A53ED 9027D831 179727B0 865A8918 - DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B DB7F1447 E6CC254B 33205151 - 2BD7AF42 6FB8F401 378CD2BF 5983CA01 C64B92EC F032EA15 D1721D03 - F482D7CE 6E74FEF6 D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F - BEC7E8F3 23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA - CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328 06A1D58B - B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C DA56C9EC 2EF29632 - 387FE8D7 6E3C0468 043E8F66 3F4860EE 12BF2D5B 0B7474D6 E694F91E - 6DCC4024 FFFFFFFF FFFFFFFF''', - - # group 18 - '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 - 29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD - EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 - E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED - EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D - C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F - 83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D - 670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B - E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 - DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510 - 15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64 - ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7 - ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B - F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C - BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31 - 43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7 - 88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA - 2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6 - 287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED - 1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9 - 93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492 - 36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD - F8FF9406 AD9E530E E5DB382F 413001AE B06A53ED 9027D831 - 179727B0 865A8918 DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B - DB7F1447 E6CC254B 33205151 2BD7AF42 6FB8F401 378CD2BF - 5983CA01 C64B92EC F032EA15 D1721D03 F482D7CE 6E74FEF6 - D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F BEC7E8F3 - 23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA - CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328 - 06A1D58B B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C - DA56C9EC 2EF29632 387FE8D7 6E3C0468 043E8F66 3F4860EE - 12BF2D5B 0B7474D6 E694F91E 6DBE1159 74A3926F 12FEE5E4 - 38777CB6 A932DF8C D8BEC4D0 73B931BA 3BC832B6 8D9DD300 - 741FA7BF 8AFC47ED 2576F693 6BA42466 3AAB639C 5AE4F568 - 3423B474 2BF1C978 238F16CB E39D652D E3FDB8BE FC848AD9 - 22222E04 A4037C07 13EB57A8 1A23F0C7 3473FC64 6CEA306B - 4BCBC886 2F8385DD FA9D4B7F A2C087E8 79683303 ED5BDD3A - 062B3CF5 B3A278A6 6D2A13F8 3F44F82D DF310EE0 74AB6A36 - 4597E899 A0255DC1 64F31CC5 0846851D F9AB4819 5DED7EA1 - B1D510BD 7EE74D73 FAF36BC3 1ECFA268 359046F4 EB879F92 - 4009438B 481C6CD7 889A002E D5EE382B C9190DA6 FC026E47 - 9558E447 5677E9AA 9E3050E2 765694DF C81F56E8 80B96E71 - 60C980DD 98EDD3DF FFFFFFFF FFFFFFFF''' -] - -_ALL_ASCII = ''.join(map(chr, range(256))) - -def hex_to_decimal(stripee): - if not stripee: - return None - - return int(stripee.translate(_ALL_ASCII).translate( - str.maketrans("", "", string.whitespace)), 16) - -primes = list(map(hex_to_decimal, _HEX_PRIMES)) ===================================== gajim/common/events.py ===================================== @@ -23,21 +23,18 @@ from dataclasses import dataclass from dataclasses import field -from nbxmpp.namespaces import Namespace 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 -from gajim.common import app from gajim.common.file_props import FileProp +from gajim.common.const import KindConstant +from gajim.common.helpers import AdditionalDataDict if typing.TYPE_CHECKING: - from gajim.common.helpers import AdditionalDataDict - from gajim.common.const import KindConstant from gajim.common.client import Client - from gajim.common.jingle_session import JingleSession @dataclass @@ -138,7 +135,7 @@ class MessageSent(ApplicationEvent): message_id: str chatstate: Optional[str] timestamp: float - additional_data: 'AdditionalDataDict' + additional_data: AdditionalDataDict label: Optional[str] correct_id: Optional[str] play_sound: bool @@ -361,11 +358,11 @@ class MamMessageReceived(ApplicationEvent): jid: str msgtxt: str properties: Any - additional_data: 'AdditionalDataDict' + additional_data: AdditionalDataDict unique_id: str stanza_id: str archive_jid: str - kind: 'KindConstant' + kind: KindConstant @dataclass @@ -377,7 +374,7 @@ class MessageReceived(ApplicationEvent): jid: str msgtxt: str properties: Any - additional_data: 'AdditionalDataDict' + additional_data: AdditionalDataDict unique_id: str stanza_id: str fjid: str @@ -489,7 +486,7 @@ class JingleEvent(ApplicationEvent): jid: str sid: str resource: str - jingle_session: JingleSession + jingle_session: Any @dataclass @@ -650,83 +647,8 @@ class FileRequestReceivedEvent(ApplicationEvent): name: str = field(init=False, default='file-request-received') conn: 'Client' stanza: Any - jingle_content: Any - FT_content: Any - id_: str = field(init=False) - fjid: str = field(init=False) - account: str = field(init=False) - jid: str = field(init=False) - file_props: FileProp = field(init=False) - - def __post_init__(self): - from gajim.common.jingle_transport import JingleTransportSocks5 - from gajim.common.file_props import FilesProp - self.id_ = self.stanza.getID() - self.fjid = self.conn.get_module('Bytestream')._ft_get_from( - self.stanza) - self.account = self.conn.name - self.jid = app.get_jid_without_resource(self.fjid) - if not self.jingle_content: - return - secu = self.jingle_content.getTag('security') - self.FT_content.use_security = bool(secu) - if secu: - fingerprint = secu.getTag('fingerprint') - if fingerprint: - self.FT_content.x509_fingerprint = fingerprint.getData() - if not self.FT_content.transport: - self.FT_content.transport = JingleTransportSocks5() - self.FT_content.transport.set_our_jid( - self.FT_content.session.ourjid) - self.FT_content.transport.set_connection( - self.FT_content.session.connection) - sid = self.stanza.getTag('jingle').getAttr('sid') - self.file_props = FilesProp.getNewFileProp(self.conn.name, sid) - self.file_props.transport_sid = self.FT_content.transport.sid - self.FT_content.file_props = self.file_props - self.FT_content.transport.set_file_props(self.file_props) - self.file_props.streamhosts.extend( - self.FT_content.transport.remote_candidates) - for host in self.file_props.streamhosts: - host['initiator'] = self.FT_content.session.initiator - host['target'] = self.FT_content.session.responder - self.file_props.session_type = 'jingle' - self.file_props.stream_methods = Namespace.BYTESTREAM - desc = self.jingle_content.getTag('description') - if self.jingle_content.getAttr('creator') == 'initiator': - file_tag = desc.getTag('file') - self.file_props.sender = self.fjid - self.file_props.receiver = self.conn.get_own_jid() - else: - file_tag = desc.getTag('file') - hash_ = file_tag.getTag('hash') - hash_ = hash_.getData() if hash_ else None - file_name = file_tag.getTag('name') - file_name = file_name.getData() if file_name else None - pjid = app.get_jid_without_resource(self.fjid) - file_info = self.conn.get_module('Jingle').get_file_info( - pjid, hash_=hash_, name=file_name, account=self.conn.name) - self.file_props.file_name = file_info['file-name'] - self.file_props.sender = self.conn.get_own_jid() - self.file_props.receiver = self.fjid - self.file_props.type_ = 's' - for child in file_tag.getChildren(): - name = child.getName() - val = child.getData() - if val is None: - continue - if name == 'name': - self.file_props.name = val - if name == 'size': - self.file_props.size = int(val) - if name == 'hash': - self.file_props.algo = child.getAttr('algo') - self.file_props.hash_ = val - if name == 'date': - self.file_props.date = val - - self.file_props.request_id = self.id_ - file_desc_tag = file_tag.getTag('desc') - if file_desc_tag is not None: - self.file_props.desc = file_desc_tag.getData() - self.file_props.transfered_size = [] + id_: str + fjid: str + account: str + jid: str + file_props: FileProp ===================================== gajim/common/jingle_content.py ===================================== @@ -16,8 +16,11 @@ Handles Jingle contents (XEP 0166) """ -from typing import Any # pylint: disable=unused-import -from typing import Dict # pylint: disable=unused-import +from __future__ import annotations + +import typing +from typing import Any +from typing import Optional import nbxmpp from nbxmpp.namespaces import Namespace @@ -27,7 +30,13 @@ from gajim.common.jingle_xtls import SELF_SIGNED_CERTIFICATE from gajim.common.jingle_xtls import load_cert_file -contents = {} # type: Dict[str, Any] +if typing.TYPE_CHECKING: + from gajim.common.jingle_transport import JingleTransport + from gajim.common.jingle_session import JingleSession + + +contents: dict[str, Any] = {} + def get_jingle_content(node): namespace = node.getNamespace() @@ -46,7 +55,11 @@ class JingleContent: An abstraction of content in Jingle sessions """ - def __init__(self, session, transport, senders): + def __init__(self, + session: JingleSession, + transport: Optional[JingleTransport], + senders: Optional[str]) -> None: + self.session = session self.transport = transport # will be filled by JingleSession.add_content() @@ -68,7 +81,7 @@ def __init__(self, session, transport, senders): # These were found by the Politie self.file_props = None - self.use_security = None + self.use_security: Optional[bool] = None self.callbacks = { # these are called when *we* get stanzas ===================================== gajim/common/jingle_ft.py ===================================== @@ -16,6 +16,11 @@ Handles Jingle File Transfer (XEP 0234) """ +from __future__ import annotations + +import typing +from typing import Optional + import logging import threading import time @@ -27,16 +32,27 @@ from gajim.common import app from gajim.common import configpaths -from gajim.common.const import KindConstant from gajim.common import jingle_xtls -from gajim.common.jingle_content import contents, JingleContent -from gajim.common.jingle_transport import JingleTransportSocks5, TransportType from gajim.common import helpers +from gajim.common.const import KindConstant from gajim.common.helpers import AdditionalDataDict from gajim.common.events import FileRequestReceivedEvent -from gajim.common.jingle_ftstates import ( - StateInitialized, StateCandSent, StateCandReceived, StateTransfering, - StateCandSentAndRecv, StateTransportReplace) +from gajim.common.file_props import FileProp +from gajim.common.file_props import FilesProp +from gajim.common.jingle_content import contents +from gajim.common.jingle_content import JingleContent +from gajim.common.jingle_transport import JingleTransportSocks5 +from gajim.common.jingle_transport import TransportType +from gajim.common.jingle_ftstates import StateInitialized +from gajim.common.jingle_ftstates import StateCandSent +from gajim.common.jingle_ftstates import StateCandReceived +from gajim.common.jingle_ftstates import StateTransfering +from gajim.common.jingle_ftstates import StateCandSentAndRecv +from gajim.common.jingle_ftstates import StateTransportReplace + +if typing.TYPE_CHECKING: + from gajim.common.jingle_session import JingleSession + from gajim.common.jingle_transport import JingleTransport log = logging.getLogger('gajim.c.jingle_ft') @@ -59,8 +75,13 @@ class State(IntEnum): class JingleFileTransfer(JingleContent): - def __init__(self, session, transport=None, file_props=None, - use_security=False, senders=None): + def __init__(self, + session: JingleSession, + transport: Optional[JingleTransport] = None, + file_props: Optional[FileProp] = None, + use_security: bool = False, + senders: Optional[str] = None): + JingleContent.__init__(self, session, transport, senders) log.info("transport value: %s", transport) # events we might be interested in @@ -131,11 +152,7 @@ def __state_changed(self, nextstate, args=None): def __on_session_initiate(self, stanza, content, error, action): log.debug("Jingle FT request received") - app.ged.raise_event( - FileRequestReceivedEvent(conn=self.session.connection, - stanza=stanza, - jingle_content=content, - FT_content=self)) + self._raise_event(stanza, content) account = self.session.connection.name jid = self.session.connection.get_module('Bytestream')._ft_get_from( @@ -158,6 +175,89 @@ def __on_session_initiate(self, stanza, content, error, action): self.session.approve_content(self.media, self.name) self.session.accept_session() + def _raise_event(self, stanza, content): + con = self.session.connection + id_ = stanza.getID() + fjid = con.get_module('Bytestream')._ft_get_from(stanza) + account = con.name + jid = app.get_jid_without_resource(fjid) + + if not content: + return + + secu = content.getTag('security') + self.use_security = bool(secu) + if secu: + fingerprint = secu.getTag('fingerprint') + if fingerprint: + self.x509_fingerprint = fingerprint.getData() + + if not self.transport: + self.transport = JingleTransportSocks5() + self.transport.set_our_jid(self.session.ourjid) + self.transport.set_connection(con) + + sid = stanza.getTag('jingle').getAttr('sid') + file_props = FilesProp.getNewFileProp(account, sid) + file_props.transport_sid = self.transport.sid + + self.transport.set_file_props(file_props) + file_props.streamhosts.extend(self.transport.remote_candidates) + + for host in file_props.streamhosts: + host['initiator'] = self.session.initiator + host['target'] = self.session.responder + + file_props.session_type = 'jingle' + desc = content.getTag('description') + if content.getAttr('creator') == 'initiator': + file_tag = desc.getTag('file') + file_props.sender = fjid + file_props.receiver = str(con.get_own_jid()) + else: + file_tag = desc.getTag('file') + hash_ = file_tag.getTag('hash') + hash_ = hash_.getData() if hash_ else None + file_name = file_tag.getTag('name') + file_name = file_name.getData() if file_name else None + pjid = app.get_jid_without_resource(fjid) + file_info = con.get_module('Jingle').get_file_info( + pjid, hash_=hash_, name=file_name, account=account) + file_props.file_name = file_info['file-name'] + file_props.sender = str(con.get_own_jid()) + file_props.receiver = fjid + file_props.type_ = 's' + + for child in file_tag.getChildren(): + name = child.getName() + val = child.getData() + if val is None: + continue + if name == 'name': + file_props.name = val + if name == 'size': + file_props.size = int(val) + if name == 'hash': + file_props.algo = child.getAttr('algo') + file_props.hash_ = val + if name == 'date': + file_props.date = val + + file_props.request_id = id_ + file_desc_tag = file_tag.getTag('desc') + if file_desc_tag is not None: + file_props.desc = file_desc_tag.getData() + file_props.transfered_size = [] + + app.ged.raise_event(FileRequestReceivedEvent( + conn=con, + stanza=stanza, + id_=id_, + fjid=fjid, + account=account, + jid=jid, + file_props=file_props)) + def __on_session_initiate_sent(self, stanza, content, error, action): pass ===================================== gajim/gtk/filetransfer.py ===================================== @@ -247,8 +247,7 @@ def _file_request_error(self, event): text=text)) def _file_request_received(self, event): - account = event.conn.name - client = app.get_client(account) + client = app.get_client(event.account) contact = client.get_module('Contacts').get_contact(event.jid) if event.file_props.session_type == 'jingle': @@ -258,7 +257,7 @@ def _file_request_received(self, event): request = description.getTag('request') if request: # If we get a request instead - self.add_transfer(account, contact, event.file_props) + self.add_transfer(event.account, contact, event.file_props) return if app.window.is_chat_active(event.account, event.jid): @@ -266,7 +265,7 @@ def _file_request_received(self, event): text = _('%s wants to send you a file') % contact.name app.ged.raise_event( - Notification(account=account, + Notification(account=event.account, jid=event.jid, type='file-transfer', sub_type='file-request-received', ===================================== pyrightconfig.json ===================================== @@ -6,6 +6,7 @@ "gajim/common/cert_store.py", "gajim/common/configpaths.py", "gajim/common/const.py", + "gajim/common/events.py", "gajim/common/exceptions.py", "gajim/common/filetransfer.py", "gajim/common/ged.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e6624be91179f21a70686c20b2c3ee0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e6624be91179f21a70686c20b2c3ee0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] VCardGrid: Typing
by Daniel Brötzmann (＠wurstsalat) 15 Jan '22

15 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e6624be9 by wurstsalat at 2022-01-16T00:19:39+01:00 VCardGrid: Typing - - - - - 1 changed file: - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -12,6 +12,9 @@ # 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 Any +from typing import Optional + import datetime from gi.repository import Gdk @@ -19,6 +22,8 @@ from gi.repository import Gtk from gi.repository import GObject +from nbxmpp.modules.vcard4 import VCard + from gajim.common.i18n import _ from gajim.common.i18n import Q_ from gajim.common.const import URIType @@ -66,7 +71,7 @@ } -DEFAULT_KWARGS = { +DEFAULT_KWARGS: dict[str, Any] = { 'fn': {'value': ''}, 'bday': {'value': '', 'value_type': 'date'}, 'gender': {'sex': '', 'identity': ''}, @@ -126,7 +131,7 @@ class VCardGrid(Gtk.Grid): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.Grid.__init__(self) self._callbacks = { @@ -152,15 +157,15 @@ def __init__(self, account): self.set_halign(Gtk.Align.CENTER) self._account = account - self._row_count = 0 - self._vcard = None + self._row_count: int = 0 + self._vcard: Optional[VCard] = None self._props = [] - def set_editable(self, enabled): + def set_editable(self, enabled: bool) -> None: for prop in self._props: prop.set_editable(enabled) - def set_vcard(self, vcard): + def set_vcard(self, vcard: VCard) -> None: self.clear() self._vcard = vcard @@ -171,16 +176,16 @@ def set_vcard(self, vcard): self.add_property(prop) - def get_vcard(self): + def get_vcard(self) -> Optional[VCard]: return self._vcard - def validate(self): + def validate(self) -> None: for prop in list(self._props): base_prop = prop.get_base_property() if base_prop.is_empty: self.remove_property(prop) - def add_new_property(self, name): + def add_new_property(self, name: str) -> None: kwargs = DEFAULT_KWARGS[name] prop = self._vcard.add_property(name, **kwargs) self.add_property(prop, editable=True) @@ -201,7 +206,7 @@ def remove_property(self, prop): self._props.remove(prop) self._vcard.remove_property(prop.get_base_property()) - def clear(self): + def clear(self) -> None: self._vcard = None self._row_count = 0 for prop in list(self._props): @@ -209,12 +214,12 @@ def clear(self): self._props = [] - def sort(self): + def sort(self) -> None: self.set_vcard(self._vcard) class DescriptionLabel(Gtk.Label): - def __init__(self, value): + def __init__(self, value: str) -> None: Gtk.Label.__init__(self, label=LABEL_DICT[value]) if value == 'adr': self.set_valign(Gtk.Align.START) @@ -231,7 +236,7 @@ class ValueLabel(Gtk.Label): def __init__(self, prop, account): Gtk.Label.__init__(self) self._prop = prop - self._uri = None + self._uri: Optional[str] = None self._account = account self.set_selectable(True) self.set_xalign(0) @@ -245,7 +250,7 @@ def __init__(self, prop, account): else: self.set_value(prop.value) - def set_value(self, value): + def set_value(self, value: str) -> None: if self._prop.name == 'email': self._uri = URI(type=URIType.MAIL, data=value) self.set_markup(value) @@ -257,7 +262,7 @@ def set_value(self, value): else: self.set_text(value) - def set_markup(self, text): + def set_markup(self, text: str) -> None: if not text: self.set_text('') return @@ -265,7 +270,7 @@ def set_markup(self, text): GLib.markup_escape_text(text), GLib.markup_escape_text(text))) - def _on_activate_link(self, _label, _value): + def _on_activate_link(self, _label: Gtk.Label, _value: str) -> int: open_uri(self._uri, self._account) return Gdk.EVENT_STOP @@ -283,7 +288,7 @@ def __init__(self, prop): self.set_text(prop.sex) - def set_text(self, value): + def set_text(self, value: str) -> None: if not value or value == '-': super().set_text('') else: @@ -303,7 +308,7 @@ def __init__(self, prop): self.set_text(prop.identity) - def set_text(self, value): + def set_text(self, value: str) -> None: super().set_text('' if not value else value) @@ -359,7 +364,11 @@ def __init__(self, prop): self.show_all() - def _on_text_changed(self, entry, _param, field): + def _on_text_changed(self, + entry: Gtk.Entry, + _param: Any, + field: str + ) -> None: self.emit('field-changed', field, entry.get_text()) @@ -378,7 +387,7 @@ def __init__(self, prop, type_): value = values[0] self.set_text(value) - def set_text(self, value): + def set_text(self, value: str) -> None: self.set_visible(bool(value)) super().set_text(value) @@ -387,14 +396,14 @@ class AdrBoxReadOnly(Gtk.Box): def __init__(self, prop): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=6) - self._labels = {} + self._labels: dict[str, AdrLabel] = {} for field in ADR_FIELDS: label = AdrLabel(prop, field) self._labels[field] = label self.add(label) - def set_field(self, field, value): + def set_field(self, field: str, value: str) -> None: self._labels[field].set_text(value) @@ -414,11 +423,11 @@ def __init__(self, prop): self.get_buffer().set_text(prop.value) self.get_buffer().connect('notify::text', self._on_text_changed) - def get_text(self): + def get_text(self) -> str: start_iter, end_iter = self.get_buffer().get_bounds() return self.get_buffer().get_text(start_iter, end_iter, False) - def _on_text_changed(self, _buffer, _param): + def _on_text_changed(self, _buffer: Gtk.TextBuffer, _param: Any) -> None: self._prop.value = self.get_text() @@ -443,7 +452,10 @@ def __init__(self, parameters): self.connect('notify::active-id', self._on_active_id_changed) - def _on_active_id_changed(self, _combobox, _param): + def _on_active_id_changed(self, + _combobox: Gtk.ComboBox, + _param: Any + ) -> None: type_ = self.get_active_id() if type_ == '-': self._parameters.remove_types(['work', 'home']) @@ -456,7 +468,7 @@ def _on_active_id_changed(self, _combobox, _param): self._parameters.add_types(['home']) self._parameters.remove_types(['work']) - def get_text(self): + def get_text(self) -> str: type_value = self.get_active_id() if type_value == '-': return '' @@ -496,15 +508,15 @@ class VCardProperty: def __init__(self, prop): self._prop = prop - self._second_column = [] - self._third_column = [] + self._second_column: list[Gtk.Widget] = [] + self._third_column: list[Gtk.Widget] = [] self._desc_label = DescriptionLabel(prop.name) self._remove_button = RemoveButton() self._remove_button.connect('clicked', self._on_remove_clicked) - self._edit_widgets = [self._remove_button] - self._read_widgets = [] + self._edit_widgets: list[Gtk.Widget] = [self._remove_button] + self._read_widgets: list[Gtk.Widget] = [] if prop.name in PROPERTIES_WITH_TYPE: self._type_combobox = TypeComboBox(prop.parameters) @@ -525,38 +537,38 @@ def __init__(self, prop): self._second_column.extend([self._type_combobox, self._type_image]) @staticmethod - def _get_icon_name(type_): + def _get_icon_name(type_: str) -> Optional[str]: if type_ == 'home': return 'feather-home' if type_ == 'work': return 'feather-briefcase' return None - def _on_type_changed(self, _combobox, _param): + def _on_type_changed(self, _combobox: Gtk.ComboBox, _param: Any) -> None: type_ = self._type_combobox.get_active_id() icon_name = self._get_icon_name(type_) self._type_image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) self._type_image.set_tooltip_text(TYPE_VALUES[type_]) - def _on_remove_clicked(self, button): + def _on_remove_clicked(self, button: Gtk.Button) -> None: button.get_parent().remove_property(self) @property - def row_number(self): + def row_number(self) -> int: grid = self._desc_label.get_parent() return grid.child_get_property(self._desc_label, 'top-attach') def get_base_property(self): return self._prop - def set_editable(self, enabled): + def set_editable(self, enabled: bool) -> None: for widget in self._edit_widgets: widget.set_visible(enabled) for widget in self._read_widgets: widget.set_visible(not enabled) - def add_to_grid(self, grid, row_number): + def add_to_grid(self, grid: Gtk.Grid, row_number: int) -> None: # child, left, top, width, height grid.attach(self._desc_label, 0, row_number, 1, 1) @@ -583,7 +595,7 @@ def __init__(self, prop, account): self._third_column = [self._value_entry, self._value_label] - def _on_text_changed(self, entry, _param): + def _on_text_changed(self, entry: Gtk.Entry, _param: Any) -> None: text = entry.get_text() if self._prop.name == 'org': self._prop.values = [text] @@ -662,12 +674,12 @@ def __init__(self, prop, account): self._third_column = [self._box, self._value_label] - def _on_text_changed(self, entry, _param): + def _on_text_changed(self, entry: Gtk.Entry, _param: Any) -> None: text = entry.get_text() self._prop.value = text self._value_label.set_value(text) - def _on_calendar_button_clicked(self, _widget): + def _on_calendar_button_clicked(self, _button: Gtk.Button) -> None: birthday = self._value_entry.get_text() if not birthday: return @@ -679,8 +691,8 @@ def _on_calendar_button_clicked(self, _widget): self.calendar.select_month(month, date.year) self.calendar.select_day(date.day) - def _on_calendar_day_selected(self, _widget): - year, month, day = self.calendar.get_date() # Integers + def _on_calendar_day_selected(self, _calendar: Gtk.Calendar) -> None: + year, month, day = self.calendar.get_date() month = python_month(month) date_str = datetime.date(year, month, day).strftime('%Y-%m-%d') self._value_entry.set_text(date_str) @@ -712,7 +724,7 @@ def __init__(self, prop, _account): self._third_column = [self._scrolled_window, self._copy_button] - def _on_copy_clicked(self, _button): + def _on_copy_clicked(self, _button: Gtk.Button) -> None: clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) clipboard.set_text(self._value_text_view.get_text(), -1) @@ -748,14 +760,18 @@ def __init__(self, prop, _account): self._third_column = [value_box, label_box] - def _on_text_changed(self, entry, _param): + def _on_text_changed(self, entry: Gtk.Entry, _param: Any) -> None: text = entry.get_text() self._prop.identity = text self._identity_label.set_text(text) - def _on_active_id_changed(self, combobox, _param): + def _on_active_id_changed(self, + combobox: Gtk.ComboBox, + _param: Any + ) -> None: sex = combobox.get_active_id() self._prop.sex = None if sex == '-' else sex + assert sex is not None self._sex_label.set_text(sex) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e6624be91179f21a70686c20b2c3ee09… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e6624be91179f21a70686c20b2c3ee09… 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