Commits January 2022

commits@gajim.org

1 participants
161 discussions

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

20 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 88d4fd4c by wurstsalat at 2022-01-20T18:40:02+01:00 Gajim: Typing - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from types import FrameType +from typing import Optional import os import sys @@ -35,13 +37,13 @@ _MIN_GLIB_VER = '2.60.0' -def check_version(dep_name, current_ver, min_ver): +def check_version(dep_name: str, current_ver: str, min_ver: str) -> None: if V(current_ver) < V(min_ver): sys.exit('Gajim needs %s >= %s (found %s) to run. ' 'Quitting...' % (dep_name, min_ver, current_ver)) -def _check_required_deps(): +def _check_required_deps() -> None: error_message = 'Gajim needs %s to run. Quitting… (Error: %s)' try: @@ -88,12 +90,12 @@ def _check_required_deps(): check_version('glib', glib_ver, _MIN_GLIB_VER) -def _init_gui(gui): +def _init_gui(gui: str) -> None: if gui == 'GTK': _init_gtk() -def _disable_csd(): +def _disable_csd() -> None: if sys.platform != 'win32': return @@ -104,7 +106,7 @@ def _disable_csd(): os.environ['GTK_CSD'] = '0' -def _init_gtk(): +def _init_gtk() -> None: gajim.gui.init('gtk') from gajim.gui import exception @@ -113,14 +115,14 @@ def _init_gtk(): i18n.initialize_direction_mark() -def _run_app(): +def _run_app() -> None: from gajim.gui.application import GajimApplication application = GajimApplication() _install_signal_handlers(application) application.run(sys.argv) -def _set_proc_title(): +def _set_proc_title() -> None: sysname = platform.system() if sysname in ('Linux', 'FreeBSD', 'OpenBSD', 'NetBSD'): libc = CDLL(find_library('c')) @@ -139,7 +141,7 @@ def _set_proc_title(): def _install_signal_handlers(application): - def sigint_cb(num, stack): + def sigint_cb(num: int, stack: Optional[FrameType]): print(' SIGINT/SIGTERM received') application.quit() # ^C exits the application normally @@ -149,7 +151,7 @@ def sigint_cb(num, stack): signal.signal(signal.SIGPIPE, signal.SIG_DFL) -def main(): +def main() -> None: if sys.platform != 'win32': if os.geteuid() == 0: sys.exit('You must not launch gajim as root, it is insecure.') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88d4fd4c826edbe3588da5a7ef01008c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88d4fd4c826edbe3588da5a7ef01008c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove History Manager
by Daniel Brötzmann (＠wurstsalat) 20 Jan '22

20 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: da5ade22 by wurstsalat at 2022-01-20T18:12:17+01:00 Remove History Manager - - - - - 10 changed files: - − data/gajim-history-manager.1 - gajim/data/gui/application_menu.ui - − gajim/data/gui/history_manager.ui - gajim/gtk/application.py - gajim/gtk/builder.pyi - gajim/gtk/const.py - − gajim/history_manager.py - − launch-history-manager.py - setup.py - win/_base.sh Changes: ===================================== data/gajim-history-manager.1 deleted ===================================== @@ -1,86 +0,0 @@ -.Dd January 21, 2018 -.Dt GAJIM-HISTORY-MANAGER 1 URM -.Os UNIX -.Sh NAME -.Nm gajim-history-manager -.Nd a tool to manage -.Xr gajim 1 -logs -.Sh SYNOPSIS -.Nm -.Fl h -.Nm -.Op Fl c Ar directory -.Sh DESCRIPTION -.Nm -is a tool to manage -.Po do some cleanup Pc log file of -.Xr gajim 1 . -Use this program to delete or export logs. -For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>. -.Sh OPTIONS -.Bl -tag -width Ds -.It Fl h Fl Fl help -Show help options -.It Fl c Fl Fl config-path Em directory -Where to look for logs file -.El -.Sh FILES -.Bl -tag -width Ds -.It $XDG_DATA_HOME/gajim/logs.db -The history database log file used when -.Op Fl c -is not specified. -.El -.Sh AUTHORS -.An -nosplit -.Nm -is written and maintained by -.An Yann Leboulanger , -and -.An Denis Fomin , -with contributions and patches merged from many individuals around the world. -See files -.Pa AUTHORS -and -.Pa THANKS , -for a complete list. -.Sh COPYRIGHT -Copyright (C) 2003-2022 Gajim Team -.Pp -.Nm -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. -.Pp -.Nm -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. -.Pp -You should have received a copy of the GNU General Public License along with -.Nm . -If not, see <https://www.gnu.org/licenses/>. -.Sh FEEDBACK -You can report bugs or feature requests in our bug tracker at -.Em https://dev.gajim.org/gajim/gajim/issues -or in the -.Em gajim-devel -mailing list; if you want to send us a patch, please do so in our bug tracker. -You can also find us in our chat room. -.Sh WWW -https://www.gajim.org/ -.Sh XMPP -You are welcome to join us at gajim(a)conference.gajim.org -.Sh MAILING LIST -Below are public mailing lists on lists.gajim.org -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo/gajim-devel -https://lists.gajim.org/cgi-bin/listinfo/translators -.Ed -.Pp -More mailing lists at -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo -.Ed -.Sh BUGS -Please submit bugs at https://dev.gajim.org/gajim/gajim/issues -.Sh SEE ALSO -.Xr gajim 1 -.Xr gajim-remote 1 ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -14,10 +14,6 @@ <attribute name="action">app.create-groupchat</attribute> <attribute name="target"></attribute> </item> - <item> - <attribute name="label" translatable="yes">_History Manager</attribute> - <attribute name="action">app.history-manager</attribute> - </item> <item> <attribute name="label" translatable="yes">Pl_ugins</attribute> <attribute name="action">app.plugins</attribute> ===================================== gajim/data/gui/history_manager.ui deleted ===================================== @@ -1,257 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkMenu" id="context_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="export_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Export</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_export_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="delete_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Delete</property> - <property name="use_underline">True</property> - </object> - </child> - </object> - <object class="GtkWindow" id="history_manager_window"> - <property name="width_request">1000</property> - <property name="height_request">500</property> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Gajim History Logs Manager</property> - <property name="window_position">center</property> - <property name="default_width">1000</property> - <property name="default_height">500</property> - <signal name="delete-event" handler="on_history_manager_window_delete_event" swapped="no"/> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkPaned"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="position">250</property> - <child> - <object class="GtkScrolledWindow" id="jids_scrolledwindow"> - <property name="width_request">250</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="jids_listview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/> - <signal name="key-press-event" handler="on_jids_listview_key_press_event" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox" id="welcome_box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - <property name="orientation">vertical</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Gajim History Logs Manager</property> - <property name="use_markup">True</property> - <property name="xalign">0.5</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">This history manager is not intended for viewing chat history. If you are looking for such functionality, please use the history window instead. - -You can use this program to delete or export history. Either select logs from the left or search the database.</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>WARNING:</b> -If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with.</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="logs_scrolledwindow"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="margin_start">6</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="logs_listview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="enable_search">False</property> - <signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/> - <signal name="key-press-event" handler="on_logs_listview_key_press_event" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection2"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="search_results_scrolledwindow"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="margin_start">6</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="search_results_listview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/> - <signal name="row-activated" handler="on_search_results_listview_row_activated" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection3"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkEntry" id="search_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="placeholder_text" translatable="yes">Search database...</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="search_db_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Search in database</property> - <property name="use_underline">True</property> - <property name="image_position">bottom</property> - <signal name="clicked" handler="on_search_db_button_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">edit-find-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child type="titlebar"> - <placeholder/> - </child> - </object> -</interface> ===================================== gajim/gtk/application.py ===================================== @@ -379,7 +379,6 @@ def add_actions(self) -> None: ('quit', None, self._on_quit_action), ('add-account', None, self._on_add_account_action), ('manage-proxies', None, self._on_manage_proxies_action), - ('history-manager', None, self._on_history_manager_action), ('preferences', None, self._on_preferences_action), ('plugins', None, self._on_plugins_action), ('xml-console', None, self._on_xml_console_action), @@ -545,11 +544,6 @@ def _on_accounts_action(_action: Gio.SimpleAction, if account: window.select_account(account) - @staticmethod - def _on_history_manager_action(_action: Gio.SimpleAction, - _param: Optional[GLib.Variant]) -> None: - open_window('HistoryManager') - @staticmethod def _on_bookmarks_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: ===================================== gajim/gtk/builder.pyi ===================================== @@ -513,25 +513,6 @@ class GroupchatControlBuilder(Builder): visitor_popover: Gtk.Popover -class HistoryManagerBuilder(Builder): - context_menu: Gtk.Menu - export_menuitem: Gtk.MenuItem - delete_menuitem: Gtk.MenuItem - history_manager_window: Gtk.Window - jids_scrolledwindow: Gtk.ScrolledWindow - jids_listview: Gtk.TreeView - treeview_selection1: Gtk.TreeSelection - welcome_box: Gtk.Box - logs_scrolledwindow: Gtk.ScrolledWindow - logs_listview: Gtk.TreeView - treeview_selection2: Gtk.TreeSelection - search_results_scrolledwindow: Gtk.ScrolledWindow - search_results_listview: Gtk.TreeView - treeview_selection3: Gtk.TreeSelection - search_entry: Gtk.Entry - search_db_button: Gtk.Button - - class XmlConsoleBuilder(Builder): headerbar: Gtk.HeaderBar search_toggle: Gtk.ToggleButton @@ -1055,8 +1036,6 @@ def get_builder(file_name: Literal['main.ui'], widgets: list[str] = ...) -> Main @overload def get_builder(file_name: Literal['groupchat_control.ui'], widgets: list[str] = ...) -> GroupchatControlBuilder: ... @overload -def get_builder(file_name: Literal['history_manager.ui'], widgets: list[str] = ...) -> HistoryManagerBuilder: ... -@overload def get_builder(file_name: Literal['xml_console.ui'], widgets: list[str] = ...) -> XmlConsoleBuilder: ... @overload def get_builder(file_name: Literal['ssl_error_dialog.ui'], widgets: list[str] = ...) -> SslErrorDialogBuilder: ... ===================================== gajim/gtk/const.py ===================================== @@ -145,7 +145,6 @@ def __str__(self): 'XMLConsoleWindow': 'gajim.gui.xml_console', 'GroupchatJoin': 'gajim.gui.groupchat_join', 'PEPConfig': 'gajim.gui.pep_config', - 'HistoryManager': 'gajim.history_manager', 'GroupchatConfig': 'gajim.gui.groupchat_config', 'ProfileWindow': 'gajim.gui.profile', 'SSLErrorDialog': 'gajim.gui.ssl_error_dialog', ===================================== gajim/history_manager.py deleted ===================================== @@ -1,716 +0,0 @@ -# Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> -# Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.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/>. - -# NOTE: some method names may match those of logger.py but that's it -# someday (TM) should have common class -# that abstracts db connections and helpers on it -# the same can be said for history.py - -from typing import List - -import os -import sys -import time -import getopt -import sqlite3 -from enum import IntEnum, unique - -import gi - -try: - gi.require_versions({'Gtk': '3.0'}) -except ValueError as error: - sys.exit('Missing dependency: %s' % error) - -# pylint: disable=C0413 -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib -from gi.repository import Gio -from gi.repository import Pango - -import gajim.gui -from gajim.common import app -from gajim.common import configpaths -from gajim.common.i18n import _ -from gajim.common.i18n import ngettext -from gajim.common.const import StyleAttr -from gajim.common.const import JIDConstant -from gajim.common.const import KindConstant -from gajim.common.const import ShowConstant - - -def is_standalone() -> bool: - # Determine if we are in standalone mode - if Gio.Application.get_default() is None: - return True - if __name__ == '__main__': - return True - return False - - -def init_gtk() -> None: - gajim.gui.init('gtk') - from gajim.gtk import exception - exception.init() - - -if is_standalone(): - init_gtk() - - from gajim.common.settings import Settings - - try: - shortargs = 'hvsc:l:p:' - longargs = 'help verbose separate config-path= loglevel= profile=' - opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] - except getopt.error as msg: - print(str(msg)) - print('for help use --help') - sys.exit(2) - for o, a in opts: - if o in ('-h', '--help'): - print(_('Usage:') + \ - '\n gajim-history-manager [options] filename\n\n' + \ - _('Options:') + \ - '\n -h, --help ' + \ - _('Show this help message and exit') + \ - '\n -c, --config-path ' + _('Choose folder for logfile') + \ - '\n') - sys.exit() - elif o in ('-c', '--config-path'): - configpaths.set_config_root(a) - - configpaths.init() - app.settings = Settings() - app.settings.init() - app.load_css_config() -else: - from gajim.common.settings import Settings - -from gajim.common import helpers -from gajim.gui.dialogs import ErrorDialog -from gajim.gui.dialogs import ConfirmationDialog -from gajim.gui.dialogs import DialogButton -from gajim.gui.filechoosers import FileSaveDialog -from gajim.gui.util import convert_rgb_to_hex -from gajim.gui.builder import get_builder -from gajim.gui.util import get_app_icon_list -# pylint: enable=C0413 - -@unique -class Column(IntEnum): - UNIXTIME = 2 - MESSAGE = 3 - SUBJECT = 4 - NICKNAME = 5 - - -class HistoryManager: - def __init__(self) -> None: - log_db_path = configpaths.get('LOG_DB') - if not log_db_path.exists(): - ErrorDialog(_('Cannot find history logs database'), - _('%s does not exist.') % log_db_path) - sys.exit() - - self._ui = get_builder('history_manager.ui') - Gtk.Window.set_default_icon_list(get_app_icon_list( - self._ui.history_manager_window)) - - # holds jids that we already have in DB - self.jids_already_in: List[str] = [] - self.AT_LEAST_ONE_DELETION_DONE = False - - self.con = sqlite3.connect( - log_db_path, timeout=20.0, isolation_level='IMMEDIATE') - self.con.execute("PRAGMA secure_delete=1") - self.cur = self.con.cursor() - - self._init_jids_listview() - self._init_logs_listview() - self._init_search_results_listview() - - self._fill_jids_listview() - - self._ui.search_entry.grab_focus() - - self._ui.history_manager_window.show_all() - - self._ui.connect_signals(self) - - def _init_jids_listview(self) -> None: - self.jids_liststore = Gtk.ListStore(str, str) # jid, jid_id - self._ui.jids_listview.set_model(self.jids_liststore) - self._ui.jids_listview.get_selection().set_mode( - Gtk.SelectionMode.MULTIPLE) - - renderer_text = Gtk.CellRendererText() # holds jid - col = Gtk.TreeViewColumn(_('XMPP Address'), renderer_text, text=0) - self._ui.jids_listview.append_column(col) - - self._ui.jids_listview.get_selection().connect('changed', - self.on_jids_listview_selection_changed) - - def _init_logs_listview(self) -> None: - # log_line_id(HIDDEN), jid_id(HIDDEN), time, message, subject, nickname - self.logs_liststore = Gtk.ListStore(str, str, str, str, str, str) - self._ui.logs_listview.set_model(self.logs_liststore) - self._ui.logs_listview.get_selection().set_mode( - Gtk.SelectionMode.MULTIPLE) - - renderer_text = Gtk.CellRendererText() # holds time - col = Gtk.TreeViewColumn( - _('Date'), renderer_text, text=Column.UNIXTIME) - # user can click this header and sort - col.set_sort_column_id(Column.UNIXTIME) - col.set_resizable(True) - self._ui.logs_listview.append_column(col) - - renderer_text = Gtk.CellRendererText() # holds nickname - col = Gtk.TreeViewColumn( - _('Nickname'), renderer_text, text=Column.NICKNAME) - # user can click this header and sort - col.set_sort_column_id(Column.NICKNAME) - col.set_resizable(True) - col.set_visible(False) - self.nickname_col_for_logs = col - self._ui.logs_listview.append_column(col) - - renderer_text = Gtk.CellRendererText() # holds message - renderer_text.set_property('width_chars', 60) - renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) - col = Gtk.TreeViewColumn( - _('Message'), renderer_text, markup=Column.MESSAGE) - # user can click this header and sort - col.set_sort_column_id(Column.MESSAGE) - col.set_resizable(True) - self.message_col_for_logs = col - self._ui.logs_listview.append_column(col) - - renderer_text = Gtk.CellRendererText() # holds subject - col = Gtk.TreeViewColumn( - _('Subject'), renderer_text, text=Column.SUBJECT) - # user can click this header and sort - col.set_sort_column_id(Column.SUBJECT) - col.set_resizable(True) - col.set_visible(False) - self.subject_col_for_logs = col - self._ui.logs_listview.append_column(col) - - def _init_search_results_listview(self) -> None: - # log_line_id (HIDDEN), jid, time, message, subject, nickname - self.search_results_liststore = Gtk.ListStore( - int, str, str, str, str, str) - self._ui.search_results_listview.set_model( - self.search_results_liststore) - - renderer_text = Gtk.CellRendererText() # holds JID (who said this) - col = Gtk.TreeViewColumn(_('XMPP Address'), renderer_text, text=1) - # user can click this header and sort - col.set_sort_column_id(1) - col.set_resizable(True) - self._ui.search_results_listview.append_column(col) - - renderer_text = Gtk.CellRendererText() # holds time - col = Gtk.TreeViewColumn( - _('Date'), renderer_text, text=Column.UNIXTIME) - # user can click this header and sort - col.set_sort_column_id(Column.UNIXTIME) - col.set_resizable(True) - self._ui.search_results_listview.append_column(col) - - renderer_text = Gtk.CellRendererText() # holds message - renderer_text.set_property('width_chars', 60) - renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) - col = Gtk.TreeViewColumn( - _('Message'), renderer_text, text=Column.MESSAGE) - # user can click this header and sort - col.set_sort_column_id(Column.MESSAGE) - col.set_resizable(True) - self._ui.search_results_listview.append_column(col) - - renderer_text = Gtk.CellRendererText() # holds subject - col = Gtk.TreeViewColumn( - _('Subject'), renderer_text, text=Column.SUBJECT) - # user can click this header and sort - col.set_sort_column_id(Column.SUBJECT) - col.set_resizable(True) - self._ui.search_results_listview.append_column(col) - - renderer_text = Gtk.CellRendererText() # holds nickname - col = Gtk.TreeViewColumn( - _('Nickname'), renderer_text, text=Column.NICKNAME) - # user can click this header and sort - col.set_sort_column_id(Column.NICKNAME) - col.set_resizable(True) - self._ui.search_results_listview.append_column(col) - - def on_history_manager_window_delete_event(self, _widget, _event): - if not self.AT_LEAST_ONE_DELETION_DONE: - if is_standalone(): - Gtk.main_quit() - return - - def _on_yes(): - self.cur.execute('VACUUM') - self.con.commit() - if is_standalone(): - Gtk.main_quit() - - def _on_no(): - if is_standalone(): - Gtk.main_quit() - - ConfirmationDialog( - _('Database Cleanup'), - _('Clean up the database?'), - _('This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n' - 'Normally, the allocated database size will not be freed, it ' - 'will just become reusable. This operation may take a while.'), - [DialogButton.make('Cancel', - callback=_on_no), - DialogButton.make('Remove', - text=_('_Cleanup'), - callback=_on_yes)]).show() - - def _fill_jids_listview(self) -> None: - # get those jids that have at least one entry in logs - self.cur.execute('SELECT jid, jid_id FROM jids WHERE jid_id IN (' - 'SELECT distinct logs.jid_id FROM logs) ORDER BY jid') - # list of tuples: [('aaa@bbb',), ('cc@dd',)] - rows = self.cur.fetchall() - for row in rows: - self.jids_already_in.append(row[0]) # jid - self.jids_liststore.append([row[0], str(row[1])]) # jid, jid_id - - def on_jids_listview_selection_changed(self, _widget): - selection = self._ui.jids_listview.get_selection() - liststore, list_of_paths = selection.get_selected_rows() - - self.logs_liststore.clear() - if not list_of_paths: - return - - self._ui.welcome_box.hide() - self._ui.search_results_scrolledwindow.hide() - self._ui.logs_scrolledwindow.show() - - list_of_rowrefs = [] - for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference.new(liststore, path)) - - for rowref in list_of_rowrefs: # FILL THE STORE, for all rows selected - path = rowref.get_path() - if path is None: - continue - jid = liststore[path][0] # jid - self._fill_logs_listview(jid) - - def _get_jid_id(self, jid: str) -> str: - """ - jids table has jid and jid_id - logs table has log_id, jid_id, contact_name, time, kind, show, message - - So to ask logs we need jid_id that matches our jid in jids table this - method wants jid and returns the jid_id for later sql-ing on logs - """ - if jid.find('/') != -1: # if it has a / - jid_is_from_pm = self._jid_is_from_pm(jid) - if not jid_is_from_pm: # it's normal jid with resource - jid = jid.split('/', 1)[0] # remove the resource - self.cur.execute('SELECT jid_id FROM jids WHERE jid = ?', (jid,)) - jid_id = self.cur.fetchone()[0] - return str(jid_id) - - def _get_jid_from_jid_id(self, jid_id: str) -> str: - """ - jids table has jid and jid_id - - This method accepts jid_id and returns the jid for later sql-ing on logs - """ - self.cur.execute('SELECT jid FROM jids WHERE jid_id = ?', (jid_id,)) - jid = self.cur.fetchone()[0] - return jid - - def _jid_is_from_pm(self, jid: str) -> bool: - """ - If jid is gajim@conf/nkour it's likely a pm one, how we know gajim@conf - is not a normal guy and nkour is not his resource? We ask if gajim@conf - is already in jids (with type room jid). This fails if user disables - logging for room and only enables for pm (so highly unlikely) and if we - fail we do not go chaos (user will see the first pm as if it was message - in room's public chat) and after that everything is ok - """ - possible_room_jid = jid.split('/', 1)[0] - - self.cur.execute('SELECT jid_id FROM jids WHERE jid = ? AND type = ?', - (possible_room_jid, JIDConstant.ROOM_TYPE)) - row = self.cur.fetchone() - if row is None: - return False - return True - - def _jid_is_room_type(self, jid: str) -> bool: - """ - Return True/False if given id is room type or not eg. if it is room - """ - self.cur.execute('SELECT type FROM jids WHERE jid = ?', (jid,)) - row = self.cur.fetchone() - return row[0] == JIDConstant.ROOM_TYPE - - def _fill_logs_listview(self, jid: str) -> None: - """ - Fill the listview with all messages that user sent to or received from - JID - """ - # no need to lower jid in this context as jid is already lowered - # as we use those jids from db - jid_id = self._get_jid_id(jid) - self.cur.execute(''' - SELECT log_line_id, jid_id, time, kind, message, subject, contact_name, show - FROM logs - WHERE jid_id = ? - ORDER BY time - ''', (jid_id,)) - - results = self.cur.fetchall() - - if self._jid_is_room_type(jid): # is it room? - self.nickname_col_for_logs.set_visible(True) - self.subject_col_for_logs.set_visible(False) - else: - self.nickname_col_for_logs.set_visible(False) - self.subject_col_for_logs.set_visible(True) - - format_ = helpers.from_one_line(app.settings.get('time_stamp')) - for row in results: - # exposed in UI (TreeViewColumns) are only - # time, message, subject, nickname - # but store in liststore - # log_line_id, jid_id, time, message, subject, nickname - log_line_id, jid_id, time_, kind, message, subject, nickname, \ - show = row - try: - time_ = time.strftime(format_, time.localtime(float(time_))) - except ValueError: - pass - else: - color = None - if kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV, - KindConstant.GC_MSG): - color = app.css_config.get_value( - '.gajim-incoming-nickname', StyleAttr.COLOR) - elif kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): - color = app.css_config.get_value( - '.gajim-outgoing-nickname', StyleAttr.COLOR) - elif kind in (KindConstant.STATUS, - KindConstant.GCSTATUS): - color = app.css_config.get_value( - '.gajim-status-message', StyleAttr.COLOR) - # include status into (status) message - if message is None: - message = '' - else: - message = ' : ' + message - - message = helpers.get_uf_show(ShowConstant(show)) + message - - message_ = '<span' - if color: - message_ += f' foreground="{convert_rgb_to_hex(color)}"' - message_ += f'>{GLib.markup_escape_text(message)}</span>' - self.logs_liststore.append( - (str(log_line_id), str(jid_id), - time_, message_, subject, nickname)) - - def _fill_search_results_listview(self, text: str) -> None: - """ - Ask db and fill listview with results that match text - """ - self.search_results_liststore.clear() - like_sql = '%' + text + '%' - self.cur.execute(''' - SELECT log_line_id, jid_id, time, message, subject, contact_name - FROM logs - WHERE message LIKE ? OR subject LIKE ? - ORDER BY time - ''', (like_sql, like_sql)) - - results = self.cur.fetchall() - format_ = helpers.from_one_line(app.settings.get('time_stamp')) - for row in results: - # exposed in UI (TreeViewColumns) are only - # JID, time, message, subject, nickname - # but store in liststore - # log_line_id, jid (from jid_id), time, message, subject, nickname - log_line_id, jid_id, time_, message, subject, nickname = row - try: - time_ = time.strftime(format_, time.localtime(float(time_))) - except ValueError: - pass - else: - jid = self._get_jid_from_jid_id(jid_id) - - self.search_results_liststore.append((log_line_id, jid, time_, - message, subject, nickname)) - - def on_logs_listview_key_press_event(self, _widget, event): - liststore, list_of_paths = self._ui.logs_listview.get_selection()\ - .get_selected_rows() - if event.keyval == Gdk.KEY_Delete: - self._delete_logs(liststore, list_of_paths) - - def on_listview_button_press_event(self, widget, event): - if event.button == 3: # right click - _ui = get_builder('history_manager.ui', ['context_menu']) - if Gtk.Buildable.get_name(widget) != 'jids_listview': - _ui.export_menuitem.hide() - _ui.delete_menuitem.connect('activate', - self.on_delete_menuitem_activate, widget) - - _ui.connect_signals(self) - _ui.context_menu.popup(None, None, None, None, - event.button, event.time) - return True - - def on_export_menuitem_activate(self, _widget): - FileSaveDialog(self._on_export, - transient_for=self._ui.history_manager_window, - modal=True) - - def _on_export(self, filename: str) -> None: - selection = self._ui.jids_listview.get_selection() - liststore, list_of_paths = selection.get_selected_rows() - self._export_jids_logs_to_file(liststore, list_of_paths, filename) - - def on_delete_menuitem_activate(self, _widget, listview): - widget_name = Gtk.Buildable.get_name(listview) - liststore, list_of_paths = listview.get_selection().get_selected_rows() - if widget_name == 'jids_listview': - self._delete_jid_logs(liststore, list_of_paths) - elif widget_name in ('logs_listview', 'search_results_listview'): - self._delete_logs(liststore, list_of_paths) - else: # Huh ? We don't know this widget - return - - def on_jids_listview_key_press_event(self, _widget, event): - liststore, list_of_paths = self._ui.jids_listview.get_selection()\ - .get_selected_rows() - if event.keyval == Gdk.KEY_Delete: - self._delete_jid_logs(liststore, list_of_paths) - - def _export_jids_logs_to_file(self, liststore, list_of_paths, path_to_file): - paths_len = len(list_of_paths) - if paths_len == 0: # nothing is selected - return - - list_of_rowrefs = [] - for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference.new(liststore, path)) - - for rowref in list_of_rowrefs: - path = rowref.get_path() - if path is None: - continue - jid_id = liststore[path][1] - self.cur.execute(''' - SELECT time, kind, message, contact_name FROM logs - WHERE jid_id = ? - ORDER BY time - ''', (jid_id,)) - - # FIXME: we may have two contacts selected to export. fix that - # AT THIS TIME FIRST EXECUTE IS LOST! WTH!!!!! - results = self.cur.fetchall() - #print results[0] - with open(path_to_file, 'w', encoding='utf-8') as file_: - for row in results: - # in store: time, kind, message, contact_name FROM logs - # in text: JID or You or nickname (if it's gc_msg), time, - # message - time_, kind, message, nickname = row - if kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV): - who = self._get_jid_from_jid_id(jid_id) - elif kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): - who = _('You') - elif kind == KindConstant.GC_MSG: - who = nickname - else: # status or gc_status. do not save - #print kind - continue - - try: - time_ = time.strftime('%c', time.localtime(float(time_))) - except ValueError: - pass - - file_.write(_('%(who)s on %(time)s said: %(message)s\n') % { - 'who': who, 'time': time_, 'message': message}) - - def _delete_jid_logs(self, liststore, list_of_paths): - paths_len = len(list_of_paths) - if paths_len == 0: # nothing is selected - return - - def on_ok(): - # delete all rows from db that match jid_id - list_of_rowrefs = [] - for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference.new( - liststore, path)) - - for rowref in list_of_rowrefs: - path = rowref.get_path() - if path is None: - continue - jid_id = liststore[path][1] - del liststore[path] # remove from UI - # remove from db - self.cur.execute(''' - DELETE FROM logs - WHERE jid_id = ? - ''', (jid_id,)) - - # now delete "jid, jid_id" row from jids table - self.cur.execute(''' - DELETE FROM jids - WHERE jid_id = ? - ''', (jid_id,)) - - self.con.commit() - - self.AT_LEAST_ONE_DELETION_DONE = True - - ConfirmationDialog( - _('Delete'), - ngettext('Delete Conversation', 'Delete Conversations', paths_len), - ngettext('Do you want to permanently delete this ' - 'conversation with <b>%s</b>?', - 'Do you want to permanently delete these conversations?', - paths_len, liststore[list_of_paths[0]][0]), - [DialogButton.make('Cancel'), - DialogButton.make('Delete', - callback=on_ok)], - transient_for=self._ui.history_manager_window).show() - - def _delete_logs(self, liststore, list_of_paths): - paths_len = len(list_of_paths) - if paths_len == 0: # nothing is selected - return - - def on_ok(): - # delete rows from db that match log_line_id - list_of_rowrefs = [] - for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference.new( - liststore, path)) - - for rowref in list_of_rowrefs: - path = rowref.get_path() - if path is None: - continue - log_line_id = liststore[path][0] - del liststore[path] # remove from UI - # remove from db - self.cur.execute(''' - DELETE FROM logs - WHERE log_line_id = ? - ''', (log_line_id,)) - - self.con.commit() - - self.AT_LEAST_ONE_DELETION_DONE = True - - ConfirmationDialog( - _('Delete'), - ngettext('Delete Message', 'Delete Messages', paths_len), - ngettext('Do you want to permanently delete this message?', - 'Do you want to permanently delete these messages?', - paths_len), - [DialogButton.make('Cancel'), - DialogButton.make('Delete', - callback=on_ok)], - transient_for=self._ui.history_manager_window).show() - - def on_search_db_button_clicked(self, _widget): - text = self._ui.search_entry.get_text() - if not text: - return - - self._ui.welcome_box.hide() - self._ui.logs_scrolledwindow.hide() - self._ui.search_results_scrolledwindow.show() - - self._fill_search_results_listview(text) - - def on_search_results_listview_row_activated(self, _widget, path, _column): - # get log_line_id, jid_id from row we double clicked - log_line_id = str(self.search_results_liststore[path][0]) - jid = self.search_results_liststore[path][1] - # make it string as in gtk liststores I have them all as strings - # as this is what db returns so I don't have to fight with types - jid_id = self._get_jid_id(jid) - - iter_ = self.jids_liststore.get_iter_first() - while iter_: - # self.jids_liststore[iter_][1] holds jid_ids - if self.jids_liststore[iter_][1] == jid_id: - break - iter_ = self.jids_liststore.iter_next(iter_) - - if iter_ is None: - return - - path = self.jids_liststore.get_path(iter_) - self._ui.jids_listview.set_cursor(path) - - iter_ = self.logs_liststore.get_iter_first() - while iter_: - # self.logs_liststore[iter_][0] holds log_line_ids - if self.logs_liststore[iter_][0] == log_line_id: - break - iter_ = self.logs_liststore.iter_next(iter_) - - if iter_ is None: - return - - path = self.logs_liststore.get_path(iter_) - self._ui.logs_listview.scroll_to_cell(path) - self._ui.logs_listview.get_selection().select_path(path) - - -def main() -> None: - if sys.platform != 'win32': - if os.geteuid() == 0: - sys.exit("You must not launch gajim as root, it is insecure.") - - HistoryManager() - Gtk.main() - - -if __name__ == '__main__': - main() ===================================== launch-history-manager.py deleted ===================================== @@ -1,4 +0,0 @@ -#!/usr/bin/env python3 - -from gajim import history_manager -history_manager.main() ===================================== setup.py ===================================== @@ -16,7 +16,7 @@ pos = Path('po').glob('*.po') ALL_LINGUAS = sorted([x.stem for x in pos]) -MAN_FILES = ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1'] +MAN_FILES = ['gajim.1', 'gajim-remote.1'] META_FILES = [('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml')] cwd = Path(__file__).resolve().parent @@ -209,7 +209,6 @@ def run(self): ], 'gui_scripts': [ 'gajim = gajim.gajim:main', - 'gajim-history-manager = gajim.history_manager:main', ] }, data_files=data_files ===================================== win/_base.sh ===================================== @@ -191,7 +191,7 @@ function cleanup_install { fi done - KEEP="gajim|gajim-debug|python3|gajim-history-manager|gdbus|gspawn-win32-helper|gspawn-win64-helper" + KEEP="gajim|gajim-debug|python3|gdbus|gspawn-win32-helper|gspawn-win64-helper" echo "deleting .exe files" find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -and ! \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da5ade2213a1fabff8e1264f1b5cbc90… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da5ade2213a1fabff8e1264f1b5cbc90… You're receiving this email because of your account on dev.gajim.org.

1 0

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

19 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1c0787e5 by wurstsalat at 2022-01-19T23:33:43+01:00 Accounts: Fix trailing whitespace - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -832,7 +832,7 @@ 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, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1c0787e51423bb90d6a69a848319a900… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1c0787e51423bb90d6a69a848319a900… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

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 January 2022