Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Update pyrightconfig
by Daniel Brötzmann (＠wurstsalat) 20 Jan '22

20 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 580c5eaa by wurstsalat at 2022-01-20T23:22:54+01:00 Update pyrightconfig - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -30,6 +30,7 @@ "gajim/gtk/chat_filter.py", "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_page.py", + "gajim/gtk/const.py", "gajim/gtk/contacts_flowbox.py", "gajim/gtk/conversation/code_widget.py", "gajim/gtk/conversation/jump_to_end_button.py", @@ -61,6 +62,7 @@ "gajim/gtk/notification.py", "gajim/gtk/preview_audio.py", "gajim/gtk/proxies.py", + "gajim/gtk/remove_account.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/-/commit/580c5eaaa2b9a63a9d10bb666ca49246… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/580c5eaaa2b9a63a9d10bb666ca49246… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Change default for use_libappindicator
by Philipp Hörist (＠lovetox) 20 Jan '22

20 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 20b7c585 by lovetox at 2022-01-20T23:14:32+01:00 Settings: Change default for use_libappindicator - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -260,7 +260,7 @@ class _ACCOUNT_DEFAULT: 'groupchat_roster_width': 210, 'dev_force_bookmark_2': False, 'developer_modus': False, - 'use_libappindicator': False, + 'use_libappindicator': True, 'show_help_start_chat': True, 'gc_notify_on_all_messages_private_default': True, 'gc_notify_on_all_messages_public_default': False, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/20b7c585872df8d23e78a2290b004ffc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/20b7c585872df8d23e78a2290b004ffc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusIcon: Refactor
by Philipp Hörist (＠lovetox) 20 Jan '22

20 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6d7452a5 by lovetox at 2022-01-20T22:56:58+01:00 StatusIcon: Refactor - Move methods from gui_interface - Add NoneBackend for Wayland - Further simplify code - - - - - 5 changed files: - gajim/gtk/application.py - gajim/gtk/main.py - gajim/gtk/preferences.py - gajim/gtk/status_icon.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -231,6 +231,10 @@ def _startup(self, _application: GajimApplication) -> None: self.interface = Interface() self.interface.run(self) + + from gajim.gui.status_icon import StatusIcon + self.systray = StatusIcon() + self.add_actions() self._load_shortcuts() menus.build_accounts_menu() ===================================== gajim/gtk/main.py ===================================== @@ -30,7 +30,6 @@ from gajim.common import app from gajim.common import ged -from gajim.common.const import Display from gajim.common.const import Direction from gajim.common.events import ApplicationEvent from gajim.common.events import AllowGajimUpdateCheck @@ -141,9 +140,9 @@ def __init__(self) -> None: self._prepare_window() self._start_timers() - if not app.is_display(Display.WAYLAND): - app.interface.systray.connect_unread_changed( - self._chat_page.get_chat_list_stack()) + chat_list_stack = self._chat_page.get_chat_list_stack() + app.app.systray.connect_unread_widget(chat_list_stack, + 'unread-count-changed') def _start_timers(self) -> None: GLib.timeout_add_seconds(UNLOAD_CHAT_TIME, @@ -325,8 +324,7 @@ def _on_window_delete(self, self.quit() else: if (app.settings.get('allow_hide_roster') or - (app.interface.systray_enabled and - app.settings.get('trayicon') != 'on_event')): + app.app.systray.is_visible()): save_main_window_position() if (os.name == 'nt' or app.settings.get('hide_on_main_window_x_button')): ===================================== gajim/gtk/preferences.py ===================================== @@ -440,8 +440,7 @@ def __init__(self, *args: Any) -> None: _('Notification Area Icon'), SettingType.CONFIG, 'trayicon', - props={'entries': trayicon_items}, - callback=self._on_trayicon), + props={'entries': trayicon_items}), Setting(SettingKind.NOTIFICATIONS, _('Show Notifications'), @@ -451,15 +450,6 @@ def __init__(self, *args: Any) -> None: PreferenceBox.__init__(self, settings) - @staticmethod - def _on_trayicon(value: str, *args: Any) -> None: - if value == 'never': - app.interface.hide_systray() - elif value == 'on_event': - app.interface.show_systray() - else: - app.interface.show_systray() - class NotificationsDialog(SettingsDialog): def __init__(self, account: str, parent: Preferences) -> None: ===================================== gajim/gtk/status_icon.py ===================================== @@ -19,11 +19,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import typing from typing import Any from typing import Union import sys +import logging from gi.repository import Gtk from gi.repository import GLib @@ -31,6 +31,7 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import ged +from gajim.common.const import Display from gajim.common.i18n import _ from gajim.common.events import AccountConnected from gajim.common.events import AccountDisonnected @@ -51,52 +52,63 @@ elif app.is_installed('AYATANA_APPINDICATOR'): from gi.repository import AyatanaAppIndicator3 as appindicator # pylint: disable=ungrouped-imports -if typing.TYPE_CHECKING: - from gi.repository import AyatanaAppIndicator3 as appindicator + +log = logging.getLogger('gajim.gui.statusicon') class StatusIcon: - def __init__(self): - self._backend = None - - def connect_unread_changed(self, chat_list_stack: Gtk.Stack) -> None: - # We trigger the signal connection from the main window because it - # is not yet available when initializing StatusIcon - chat_list_stack.connect( - 'unread-count-changed', self._on_unread_count_changed) - - def _on_unread_count_changed(self, - _chat_list_stack: Gtk.Stack, - _workspace_id: str, - _count: int) -> None: - if app.settings.get('trayicon_notification_on_events'): - count = app.window.get_total_unread_count() - self._backend._update_icon(count=count) # type: ignore - - def show_icon(self) -> None: - if self._backend is not None: - self._backend.show_icon() + def __init__(self) -> None: + if app.is_display(Display.WAYLAND): + self._backend = NoneBackend() + log.info('Not supported on Wayland') return - indicator_installed = (app.is_installed('APPINDICATOR') or - app.is_installed('AYATANA_APPINDICATOR')) - use_indicator = app.settings.get('use_libappindicator') - if indicator_installed and use_indicator: + app.settings.connect_signal('trayicon', self._on_setting_changed) + + if self._can_use_libindicator(): self._backend = AppIndicator() + log.info('Use AppIndicator3 backend') + else: self._backend = GtkStatusIcon() + log.info('Use GtkStatusIcon backend') + + @staticmethod + def _can_use_libindicator() -> bool: + if not app.settings.get('use_libappindicator'): + return False + return (app.is_installed('APPINDICATOR') or + app.is_installed('AYATANA_APPINDICATOR')) - def hide_icon(self) -> None: - if self._backend is None: + def _on_setting_changed(self, *args: Any) -> None: + count = app.window.get_total_unread_count() + self._backend.update_state(count=count) + + def connect_unread_widget(self, widget: Gtk.Widget, signal: str) -> None: + widget.connect(signal, self._on_unread_count_changed) + + def _on_unread_count_changed(self, *args: Any) -> None: + if not app.settings.get('trayicon_notification_on_events'): return - self._backend.hide_icon() + count = app.window.get_total_unread_count() + self._backend.update_state(count=count) + + def is_visible(self) -> bool: + return self._backend.is_visible() + + +class NoneBackend: + def update_state(self, count: int = 0) -> None: + pass + + def is_visible(self) -> bool: + return False class GtkMenuBackend(EventHelper): - def __init__(self): + def __init__(self) -> None: EventHelper.__init__(self) self._popup_menus: list[Gtk.Menu] = [] - self._enabled = True self._ui = get_builder('systray_context_menu.ui') self._ui.sounds_mute_menuitem.set_active( @@ -111,13 +123,10 @@ def __init__(self): ('account-disconnected', ged.CORE, self._on_account_state), ]) - def show_icon(self) -> None: - raise NotImplementedError - - def hide_icon(self) -> None: + def update_state(self, count: int = 0) -> None: raise NotImplementedError - def _update_icon(self, count: int = 0) -> None: + def is_visible(self) -> bool: raise NotImplementedError def _add_status_menu(self) -> None: @@ -141,7 +150,7 @@ def _add_status_menu(self) -> None: self._ui.status_menu.set_submenu(sub_menu) def _on_our_show(self, _event: ShowChanged) -> None: - self._update_icon() + self.update_state() def _on_account_state(self, _event: Union[AccountConnected, AccountDisonnected] @@ -190,8 +199,7 @@ def _on_show(_widget: Gtk.MenuItem, show: str) -> None: class GtkStatusIcon(GtkMenuBackend): - - def __init__(self): + def __init__(self) -> None: GtkMenuBackend.__init__(self) self._hide_menuitem_added = False @@ -200,40 +208,30 @@ def __init__(self): self._status_icon.connect('popup-menu', self._on_popup_menu) self._status_icon.connect('size-changed', self._on_size_changed) - self._update_icon() - - def show_icon(self): - self._enabled = True - self._status_icon.set_visible(True) - self._update_icon() - - def hide_icon(self) -> None: - self._enabled = False - self._status_icon.set_visible(False) + self.update_state() - def _update_icon(self, count: int = 0): - if not self._enabled: + def update_state(self, count: int = 0) -> None: + if app.settings.get('trayicon') == 'never': + self._status_icon.set_visible(False) return - if app.settings.get('trayicon') == 'always': - self._status_icon.set_visible(True) + self._status_icon.set_visible(True) if count > 0: - self._status_icon.set_visible(True) self._status_icon.set_from_icon_name('dcraven-message-new') return - if app.settings.get('trayicon') == 'on_event': - self._status_icon.set_visible(False) - show = get_global_show() icon_name = get_icon_name(show) self._status_icon.set_from_icon_name(icon_name) + def is_visible(self) -> bool: + return self._status_icon.get_visible() + def _on_size_changed(self, _status_icon: Gtk.StatusIcon, size: int) -> None: - self._update_icon() + self.update_state() def _on_popup_menu(self, _status_icon: Gtk.StatusIcon, @@ -271,8 +269,7 @@ def _build_menu(self, event_time: int) -> None: class AppIndicator(GtkMenuBackend): - - def __init__(self): + def __init__(self) -> None: GtkMenuBackend.__init__(self) self._status_icon = appindicator.Indicator.new( @@ -287,32 +284,24 @@ def __init__(self): self._status_icon.set_secondary_activate_target( self._ui.toggle_window_menuitem) - self._update_icon() - - def show_icon(self): - self._enabled = True - self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) - self._update_icon() - - def hide_icon(self) -> None: - self._enabled = False - self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) + self.update_state() - def _update_icon(self, count: int = 0) -> None: - if not self._enabled: + def update_state(self, count: int = 0) -> None: + if app.settings.get('trayicon') == 'never': + self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) return - if app.settings.get('trayicon') == 'always': - self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) + self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) if count > 0: icon_name = 'dcraven-message-new' self._status_icon.set_icon_full(icon_name, _('Pending Event')) - - if app.settings.get('trayicon') == 'on_event': - self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) + return show = get_global_show() icon_name = get_icon_name(show) self._status_icon.set_icon_full(icon_name, show) - self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) + + def is_visible(self) -> bool: + status = self._status_icon.get_status() + return status == appindicator.IndicatorStatus.ACTIVE ===================================== gajim/gui_interface.py ===================================== @@ -77,7 +77,7 @@ from gajim.common.i18n import _ from gajim.common.client import Client from gajim.common.preview import PreviewManager -from gajim.common.const import Display, FTState +from gajim.common.const import FTState from gajim.common.file_props import FileProp from gajim.common.modules.contacts import GroupchatContact @@ -163,12 +163,6 @@ def __init__(self): logind.enable() music_track.enable() - self.systray_enabled: bool = False - - if not app.is_display(Display.WAYLAND): - from gajim.gui.status_icon import StatusIcon - self.systray = StatusIcon() - def _create_core_handlers_list(self) -> None: # pylint: disable=line-too-long self.handlers = { @@ -857,16 +851,6 @@ def _change_status(account: str, status: str) -> None: client.change_status(status, message) - def show_systray(self) -> None: - if not app.is_display(Display.WAYLAND): - self.systray_enabled = True - self.systray.show_icon() - - def hide_systray(self) -> None: - if not app.is_display(Display.WAYLAND): - self.systray_enabled = False - self.systray.hide_icon() - def process_connections(self) -> bool: """ Called each foo (200) milliseconds. Check for idlequeue timeouts @@ -989,9 +973,6 @@ def create_zeroconf_default_config(self) -> None: False) def run(self, _application: Gtk.Application) -> None: - if app.settings.get('trayicon') != 'never': - self.show_systray() - # Creating plugin manager from gajim import plugins app.plugin_manager = plugins.PluginManager() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6d7452a525431a494176cc4897f84d47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6d7452a525431a494176cc4897f84d47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Const: Sort window modules, typing
by Daniel Brötzmann (＠wurstsalat) 20 Jan '22

20 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a5f1222b by wurstsalat at 2022-01-20T22:39:34+01:00 Const: Sort window modules, typing - - - - - ad699686 by wurstsalat at 2022-01-20T22:39:34+01:00 FileChoosers: Typing - - - - - 2 changed files: - gajim/gtk/const.py - gajim/gtk/filechoosers.py Changes: ===================================== gajim/gtk/const.py ===================================== @@ -20,15 +20,19 @@ from typing import Callable from typing import NamedTuple from typing import Optional +from typing import Union -from collections import namedtuple from enum import Enum from enum import IntEnum from enum import unique from gajim.common.setting_values import AllSettingsT -Filter = namedtuple('Filter', 'name pattern default') + +class Filter(NamedTuple): + name: str + pattern: Union[str, list[str]] + default: bool class Setting(NamedTuple): @@ -128,40 +132,40 @@ def __str__(self): WINDOW_MODULES = { 'AccountsWindow': 'gajim.gui.accounts', - 'HistorySyncAssistant': 'gajim.gui.history_sync', - 'ServerInfo': 'gajim.gui.server_info', - 'MamPreferences': 'gajim.gui.mam_preferences', - 'Preferences': 'gajim.gui.preferences', - 'CreateGroupchatWindow': 'gajim.gui.groupchat_creation', - 'StartChatDialog': 'gajim.gui.start_chat', + 'AccountWizard': 'gajim.gui.account_wizard', 'AddContact': 'gajim.gui.add_contact', - 'SingleMessageWindow': 'gajim.gui.single_message', + 'AdhocMUC': 'gajim.gui.adhoc_muc', + 'AdvancedConfig': 'gajim.gui.advanced_config', + 'BlockingList': 'gajim.gui.blocking', 'Bookmarks': 'gajim.gui.bookmarks', - 'AccountWizard': 'gajim.gui.account_wizard', + 'CertificateDialog': 'gajim.gui.certificate_dialog', + 'ChangePassword': 'gajim.gui.change_password', + 'ContactInfo': 'gajim.gui.contact_info', + 'CreateGroupchatWindow': 'gajim.gui.groupchat_creation', + 'Features': 'gajim.gui.features', + 'GroupchatConfig': 'gajim.gui.groupchat_config', + 'GroupChatInvitation': 'gajim.gui.groupchat_invitation', + 'GroupchatJoin': 'gajim.gui.groupchat_join', + 'HistoryExport': 'gajim.gui.history_export', + 'HistorySyncAssistant': 'gajim.gui.history_sync', + 'MamPreferences': 'gajim.gui.mam_preferences', 'ManageProxies': 'gajim.gui.proxies', 'ManageSounds': 'gajim.gui.manage_sounds', - 'ServiceDiscoveryWindow': 'gajim.gui.discovery', - 'BlockingList': 'gajim.gui.blocking', - 'XMLConsoleWindow': 'gajim.gui.xml_console', - 'GroupchatJoin': 'gajim.gui.groupchat_join', + 'PasswordDialog': 'gajim.gui.password_dialog', 'PEPConfig': 'gajim.gui.pep_config', - 'GroupchatConfig': 'gajim.gui.groupchat_config', + 'PluginsWindow': 'gajim.plugins.gui', + 'Preferences': 'gajim.gui.preferences', 'ProfileWindow': 'gajim.gui.profile', - 'SSLErrorDialog': 'gajim.gui.ssl_error_dialog', - 'Themes': 'gajim.gui.themes', - 'AdvancedConfig': 'gajim.gui.advanced_config', - 'CertificateDialog': 'gajim.gui.certificate_dialog', 'RemoveAccount': 'gajim.gui.remove_account', - 'ChangePassword': 'gajim.gui.change_password', - 'PluginsWindow': 'gajim.plugins.gui', - 'Features': 'gajim.gui.features', - 'GroupChatInvitation': 'gajim.gui.groupchat_invitation', - 'ContactInfo': 'gajim.gui.contact_info', - 'WorkspaceDialog': 'gajim.gui.workspace_dialog', 'RosterItemExchange': 'gajim.gui.roster_item_exchange', + 'ServerInfo': 'gajim.gui.server_info', + 'ServiceDiscoveryWindow': 'gajim.gui.discovery', 'ServiceRegistration': 'gajim.gui.service_registration', + 'SingleMessageWindow': 'gajim.gui.single_message', + 'SSLErrorDialog': 'gajim.gui.ssl_error_dialog', + 'StartChatDialog': 'gajim.gui.start_chat', 'SynchronizeAccounts': 'gajim.gui.synchronize_accounts', - 'AdhocMUC': 'gajim.gui.adhoc_muc', - 'PasswordDialog': 'gajim.gui.password_dialog', - 'HistoryExport': 'gajim.gui.history_export', + 'Themes': 'gajim.gui.themes', + 'WorkspaceDialog': 'gajim.gui.workspace_dialog', + 'XMLConsoleWindow': 'gajim.gui.xml_console', } ===================================== gajim/gtk/filechoosers.py ===================================== @@ -15,7 +15,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import List +from __future__ import annotations + +from typing import cast +from typing import Any +from typing import Callable +from typing import Optional +from typing import Union import os import sys @@ -42,7 +48,12 @@ def _require_native() -> bool: # Notes: Adding mime types to Gtk.FileFilter forces non-native dialogs class BaseFileChooser: - def _on_response(self, dialog, response, accept_cb, cancel_cb): + def _on_response(self, + dialog: Union[Gtk.FileChooser, Gtk.FileChooserNative], + response: Gtk.ResponseType, + accept_cb: Callable[..., Any], + cancel_cb: Optional[Callable[..., Any]] + ) -> None: if response == Gtk.ResponseType.ACCEPT: if self.get_select_multiple(): accept_cb(dialog.get_filenames()) @@ -54,7 +65,7 @@ def _on_response(self, dialog, response, accept_cb, cancel_cb): if cancel_cb is not None: cancel_cb() - def _add_filters(self, filters): + def _add_filters(self, filters: list[Filter]) -> None: for filterinfo in filters: filter_ = Gtk.FileFilter() filter_.set_name(filterinfo.name) @@ -67,9 +78,9 @@ def _add_filters(self, filters): if filterinfo.default: self.set_filter(filter_) - def _update_preview(self, filechooser): + def _update_preview(self, filechooser: Gtk.FileChooser) -> None: path_to_file = filechooser.get_preview_filename() - preview = filechooser.get_preview_widget() + preview = cast(Gtk.Image, filechooser.get_preview_widget()) if path_to_file is None or os.path.isdir(path_to_file): # nothing to preview preview.clear() @@ -80,7 +91,7 @@ def _update_preview(self, filechooser): except GLib.Error: preview.clear() return - filechooser.get_preview_widget().set_from_pixbuf(pixbuf) + preview.set_from_pixbuf(pixbuf) class BaseFileOpenDialog: @@ -107,12 +118,18 @@ class BaseAvatarChooserDialog: class NativeFileChooserDialog(Gtk.FileChooserNative, BaseFileChooser): _title = '' - _filters: List[Filter] = [] + _filters: list[Filter] = [] _action = Gtk.FileChooserAction.OPEN - def __init__(self, accept_cb, cancel_cb=None, transient_for=None, - path=None, file_name=None, select_multiple=False, - modal=False): + def __init__(self, + accept_cb: Callable[..., Any], + cancel_cb: Optional[Callable[..., Any]] = None, + transient_for: Optional[Gtk.Window] = None, + path: Optional[str] = None, + file_name: Optional[str] = None, + select_multiple: bool = False, + modal: bool = False + ) -> None: if transient_for is None: transient_for = app.app.get_active_window() @@ -159,13 +176,20 @@ class NativeAvatarChooserDialog(BaseAvatarChooserDialog, NativeFileChooserDialog class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): _title = '' - _filters: List[Filter] = [] + _filters: list[Filter] = [] _action = Gtk.FileChooserAction.OPEN _preivew_size = (200, 200) - def __init__(self, accept_cb, cancel_cb=None, transient_for=None, - path=None, file_name=None, select_multiple=False, - preview=True, modal=False): + def __init__(self, + accept_cb: Callable[..., Any], + cancel_cb: Optional[Callable[..., Any]] = None, + transient_for: Optional[Gtk.Window] = None, + path: Optional[str] = None, + file_name: Optional[str] = None, + select_multiple: bool = False, + preview: bool = True, + modal: bool = False + ) -> None: if transient_for is None: transient_for = app.app.get_active_window() @@ -196,7 +220,7 @@ def __init__(self, accept_cb, cancel_cb=None, transient_for=None, self.connect('response', self._on_response, accept_cb, cancel_cb) self.show() - def _on_response(self, *args): + def _on_response(self, *args: Any) -> None: super()._on_response(*args) self.destroy() @@ -209,13 +233,18 @@ class GtkAvatarChooserDialog(BaseAvatarChooserDialog, GtkFileChooserDialog): pass -def FileChooserDialog(*args, **kwargs): +def FileChooserDialog(*args: Any, + **kwargs: Any + ) -> Union[NativeFileOpenDialog, GtkFileOpenDialog]: if _require_native(): return NativeFileOpenDialog(*args, **kwargs) return GtkFileOpenDialog(*args, **kwargs) -def AvatarChooserDialog(*args, **kwargs): +def AvatarChooserDialog(*args: Any, + **kwargs: Any + ) -> Union[NativeAvatarChooserDialog, + GtkAvatarChooserDialog]: if _require_native(): return NativeAvatarChooserDialog(*args, **kwargs) return GtkAvatarChooserDialog(*args, **kwargs) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5d5ad12c31f991c227e42645fad7681… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5d5ad12c31f991c227e42645fad7681… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Pass JID instead of string
by Philipp Hörist (＠lovetox) 20 Jan '22

20 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5d5ad12c by lovetox at 2022-01-20T20:38:50+01:00 Groupchat: Pass JID instead of string - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -742,7 +742,7 @@ def _on_roster_row_activated(self, if not self.is_anonymous and muc_prefer_direct_msg: participant = self.contact.get_resource(nick) app.window.add_chat(self.account, - participant.real_jid.bare, + participant.real_jid, 'contact', select=True, workspace='current') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5d5ad12c31f991c227e42645fad7681b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5d5ad12c31f991c227e42645fad7681b… You're receiving this email because of your account on dev.gajim.org.

1 0

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

20 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cfd2c525 by wurstsalat at 2022-01-20T19:52:31+01:00 AddContact: Typing - - - - - 293ae9ef by wurstsalat at 2022-01-20T20:02:51+01:00 RemoveAccount: Typing - - - - - ea8dba3a by wurstsalat at 2022-01-20T20:10:34+01:00 ChangePassword: Typing - - - - - 3 changed files: - gajim/gtk/add_contact.py - gajim/gtk/change_password.py - gajim/gtk/remove_account.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -12,11 +12,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Any -from typing import Dict -from typing import List +from typing import cast from typing import Optional -from typing import Tuple from typing import Union import logging @@ -40,6 +40,7 @@ from .assistant import Assistant from .assistant import Page from .assistant import ErrorPage +from .assistant import ProgressPage from .groupchat_info import GroupChatInfoScrolled from .builder import get_builder from .util import open_window @@ -75,7 +76,7 @@ def __init__(self, 'gateway': Gateway(), }) - progress = self.add_default_page('progress') + progress = cast(ProgressPage, self.add_default_page('progress')) progress.set_title(_('Gathering information…')) progress.set_text(_('Trying to gather information on this address…')) @@ -92,8 +93,8 @@ def _on_button_clicked(self, button_name: str ) -> None: page = self.get_current_page() - account, _ = self.get_page('address').get_account_and_jid() - assert account is not None + address_page = cast(Address, self.get_page('address')) + account, _ = address_page.get_account_and_jid() if button_name == 'next': self._start_disco() @@ -102,13 +103,14 @@ def _on_button_clicked(self, if button_name == 'back': self.show_page('address', Gtk.StackTransitionType.SLIDE_RIGHT) - self.get_page('address').focus() + address_page.focus() return if button_name == 'add': client = app.get_client(account) if page == 'contact': - data = self.get_page('contact').get_subscription_data() + contact_page = cast(Contact, self.get_page('contact')) + data = contact_page.get_subscription_data() client.get_module('Presence').subscribe( self._result.jid, msg=data['message'], @@ -124,7 +126,7 @@ def _on_button_clicked(self, return if button_name == 'join': - _, jid = self.get_page('address').get_account_and_jid() + _, jid = address_page.get_account_and_jid() open_window('GroupchatJoin', account=account, jid=jid) self.destroy() @@ -132,22 +134,25 @@ def _start_disco(self) -> None: self._result = None self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) - account, jid = self.get_page('address').get_account_and_jid() + address_page = cast(Address, self.get_page('address')) + account, jid = address_page.get_account_and_jid() assert account is not None self._disco_info(account, jid) @as_task - def _disco_info(self, account: str, address: str) -> None: + def _disco_info(self, account: str, address: str) -> Any: _task = yield client = app.get_client(account) result = yield client.get_module('Discovery').disco_info(address) if is_error(result): + assert isinstance(result, StanzaError) self._process_error(account, result) raise result log.info('Disco Info received: %s', address) + assert isinstance(result, DiscoInfo) self._process_info(account, result) def _process_error(self, account: str, result: StanzaError) -> None: @@ -160,10 +165,12 @@ def _process_error(self, account: str, result: StanzaError) -> None: ] if result.condition in contact_conditions: # It seems to be a contact - self.get_page('contact').prepare(account, result) + address_page = cast(Contact, self.get_page('contact')) + address_page.prepare(account, result) self.show_page('contact', Gtk.StackTransitionType.SLIDE_LEFT) else: - self.get_page('error').set_text(result.get_text()) + error_page = cast(ErrorPage, self.get_page('error')) + error_page.set_text(result.get_text()) self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) def _process_info(self, account: str, result: DiscoInfo) -> None: @@ -175,7 +182,8 @@ def _process_info(self, account: str, result: DiscoInfo) -> None: if identity.type == 'text' and result.jid.is_domain: # It's a group chat component advertising # category 'conference' - self.get_page('error').set_text( + error_page = cast(ErrorPage, self.get_page('error')) + error_page.set_text( _('This address does not seem to offer any gateway ' 'service.')) self.show_page('error') @@ -183,21 +191,25 @@ def _process_info(self, account: str, result: DiscoInfo) -> None: if identity.type == 'irc' and result.jid.is_domain: # It's an IRC gateway advertising category 'conference' - self.get_page('gateway').prepare(account, result) + gateway_page = cast(Gateway, self.get_page('gateway')) + gateway_page.prepare(account, result) self.show_page( 'gateway', Gtk.StackTransitionType.SLIDE_LEFT) return - self.get_page('groupchat').prepare(account, result) + groupchat_page = cast(GroupChat, self.get_page('groupchat')) + groupchat_page.prepare(account, result) self.show_page('groupchat', Gtk.StackTransitionType.SLIDE_LEFT) return if result.is_gateway: - self.get_page('gateway').prepare(account, result) + gateway_page = cast(Gateway, self.get_page('gateway')) + gateway_page.prepare(account, result) self.show_page('gateway', Gtk.StackTransitionType.SLIDE_LEFT) return - self.get_page('contact').prepare(account, result) + contact_page = cast(Contact, self.get_page('contact')) + contact_page.prepare(account, result) self.show_page('contact', Gtk.StackTransitionType.SLIDE_LEFT) @@ -217,6 +229,7 @@ def __init__(self, account: Optional[str], jid: Optional[JID]) -> None: accounts = app.get_enabled_accounts_with_labels(connected_only=True) liststore = self._ui.account_combo.get_model() + assert isinstance(liststore, Gtk.ListStore) for acc in accounts: liststore.append(acc) @@ -238,13 +251,14 @@ def __init__(self, account: Optional[str], jid: Optional[JID]) -> None: self.show_all() - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['next'] def get_default_button(self) -> str: return 'next' - def get_account_and_jid(self) -> Tuple[str, str]: + def get_account_and_jid(self) -> tuple[str, str]: + assert self._account is not None return self._account, self._ui.address_entry.get_text() def focus(self) -> None: @@ -316,7 +330,7 @@ def __init__(self) -> None: self.set_title(_('Add Contact')) self.set_heading(_('An Error Occurred')) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back'] def get_default_button(self) -> str: @@ -339,7 +353,7 @@ def __init__(self) -> None: self.show_all() - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back', 'add'] def get_default_button(self) -> str: @@ -357,7 +371,9 @@ def prepare(self, account: str, result: Union[DiscoInfo, StanzaError]): self._ui.contact_grid.set_sensitive(True) def _update_groups(self, account: str) -> None: - self._ui.group_combo.get_model().clear() + model = self._ui.group_combo.get_model() + assert isinstance(model, Gtk.ListStore) + model.clear() client = app.get_client(account) for group in client.get_module('Roster').get_groups(): self._ui.group_combo.append_text(group) @@ -366,7 +382,7 @@ def _on_info_clicked(self, _button: Gtk.Button) -> None: open_window( 'ContactInfo', account=self._account, contact=self._contact) - def get_subscription_data(self) -> Dict[str, Union[str, List[str], bool]]: + def get_subscription_data(self) -> dict[str, Union[str, list[str], bool]]: group = self._ui.group_combo.get_child().get_text() groups = [group] if group else [] return { @@ -392,7 +408,7 @@ def __init__(self) -> None: self.show_all() - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back', 'add'] def get_default_button(self) -> str: @@ -482,7 +498,7 @@ def __init__(self) -> None: self.show_all() - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back', 'join'] def get_default_button(self) -> str: ===================================== gajim/gtk/change_password.py ===================================== @@ -13,7 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any -from typing import List +from typing import cast import logging @@ -32,6 +32,7 @@ from .assistant import Assistant from .assistant import Page from .assistant import ErrorPage +from .assistant import ProgressPage from .assistant import SuccessPage from .dataform import DataFormWidget from .util import ensure_not_destroyed @@ -57,7 +58,7 @@ def __init__(self, account: str) -> None: 'error': Error(), 'success': Success()}) - progress = self.add_default_page('progress') + progress = cast(ProgressPage, self.add_default_page('progress')) progress.set_title(_('Changing Password...')) progress.set_text(_('Trying to change password...')) @@ -83,11 +84,13 @@ def _on_button_clicked(self, def _on_apply(self, next_stage: bool = False) -> None: if next_stage: - form = self.get_page('next_stage').get_submit_form() + next_stage_page = cast(NextStage, self.get_page('next_stage')) + form = next_stage_page.get_submit_form() self._client.get_module('Register').change_password_with_form( form, callback=self._on_change_password) else: - password = self.get_page('password').get_password() + password_page = cast(EnterPassword, self.get_page('password')) + password = password_page.get_password() self._client.get_module('Register').change_password( password, callback=self._on_change_password) @@ -96,16 +99,19 @@ def _on_change_password(self, task: Task) -> None: try: task.finish() except ChangePasswordStanzaError as error: - self.get_page('next_stage').set_form(error.get_form()) + next_stage_page = cast(NextStage, self.get_page('next_stage')) + next_stage_page.set_form(error.get_form()) self.show_page('next_stage', Gtk.StackTransitionType.SLIDE_LEFT) except StanzaError as error: error_text = to_user_string(error) - self.get_page('error').set_text(error_text) + error_page = cast(Error, self.get_page('error')) + error_page.set_text(error_text) self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) else: - password = self.get_page('password').get_password() + password_page = cast(EnterPassword, self.get_page('password')) + password = password_page.get_password() passwords.save_password(self.account, password) self.show_page('success') @@ -190,7 +196,7 @@ def _set_complete(self, state: bool) -> None: def get_password(self) -> str: return self._password1_entry.get_text() - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['apply'] @@ -219,9 +225,10 @@ def set_form(self, form: SimpleDataForm) -> None: self._current_form.show_all() def get_submit_form(self) -> SimpleDataForm: + assert self._current_form is not None return self._current_form.get_submit_form() - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['apply'] @@ -233,7 +240,7 @@ def __init__(self) -> None: self.set_text( _('An error occurred while trying to change your password.')) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back'] @@ -244,5 +251,5 @@ def __init__(self) -> None: self.set_heading(_('Password Changed')) self.set_text(_('Your password has successfully been changed.')) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['close'] ===================================== gajim/gtk/remove_account.py ===================================== @@ -13,7 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any -from typing import List +from typing import cast import logging @@ -24,12 +24,15 @@ from gajim.common import app from gajim.common import ged +from gajim.common.events import AccountConnected +from gajim.common.events import AccountDisonnected from gajim.common.i18n import _ from gajim.common.helpers import to_user_string from gajim.common.helpers import event_filter from .assistant import Assistant from .assistant import Page +from .assistant import ProgressPage from .assistant import ErrorPage from .assistant import SuccessPage @@ -58,7 +61,7 @@ def __init__(self, account: str) -> None: 'error': Error(), 'success': Success()}) - progress = self.add_default_page('progress') + progress = cast(ProgressPage, self.add_default_page('progress')) progress.set_title(_('Removing Account...')) progress.set_text(_('Trying to remove account...')) @@ -75,12 +78,12 @@ def __init__(self, account: str) -> None: self.show_all() @event_filter(['account']) - def _on_account_connected(self, _event): + def _on_account_connected(self, _event: AccountConnected) -> None: self._client = app.get_client(self.account) self._set_remove_from_server_checkbox() @event_filter(['account']) - def _on_account_disconnected(self, _event): + def _on_account_disconnected(self, _event: AccountDisonnected) -> None: self._set_remove_from_server_checkbox() if self._account_removed: @@ -89,7 +92,8 @@ def _on_account_disconnected(self, _event): def _set_remove_from_server_checkbox(self) -> None: enabled = self._client is not None and self._client.state.is_available - self.get_page('remove_choice').set_remove_from_server(enabled) + remove_choice_page = cast(RemoveChoice, self.get_page('remove_choice')) + remove_choice_page.set_remove_from_server(enabled) def _on_button_clicked(self, _assistant: Assistant, @@ -112,7 +116,9 @@ def _on_button_clicked(self, self.destroy() def _on_remove(self, *args: Any) -> None: - if self.get_page('remove_choice').remove_from_server: + remove_choice_page = cast(RemoveChoice, self.get_page('remove_choice')) + if remove_choice_page.remove_from_server: + assert self._client is not None self._client.set_remove_account(True) self._client.get_module('Register').unregister( callback=self._on_remove_response) @@ -130,10 +136,12 @@ def _on_remove_response(self, task: Task) -> None: try: task.finish() except StanzaError as error: + assert self._client is not None self._client.set_remove_account(False) error_text = to_user_string(error) - self.get_page('error').set_text(error_text) + error_page = cast(Error, self.get_page('error')) + error_page.set_text(error_text) self.show_page('error') return @@ -194,7 +202,7 @@ def set_remove_from_server(self, enabled: bool) -> None: self._server.set_active(False) self._server.set_tooltip_text(_('Account has to be connected')) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['remove'] @@ -204,7 +212,7 @@ def __init__(self) -> None: self.set_title(_('Account Removal Failed')) self.set_heading(_('Account Removal Failed')) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back'] @@ -216,5 +224,5 @@ def __init__(self) -> None: self.set_text( _('Your account has has been removed successfully.')) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['close'] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5c8e01e6ef58d2b7d38228e701f993a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5c8e01e6ef58d2b7d38228e701f993a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatInviter: Move description
by Daniel Brötzmann (＠wurstsalat) 20 Jan '22

20 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 15cbce17 by wurstsalat at 2022-01-20T18:45:28+01:00 GroupchatInviter: Move description - - - - - 5c8e01e6 by wurstsalat at 2022-01-20T19:49:53+01:00 Assistant: Typing - - - - - 2 changed files: - gajim/data/gui/groupchat_inviter.ui - gajim/gtk/assistant.py Changes: ===================================== gajim/data/gui/groupchat_inviter.ui ===================================== @@ -32,6 +32,24 @@ <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">Click on contacts you would like to invite to this group chat.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</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="GtkSearchEntry" id="search_entry"> <property name="width-request">300</property> @@ -48,7 +66,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -122,7 +140,7 @@ You can also type an XMPP address.</property> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -135,24 +153,6 @@ You can also type an XMPP address.</property> <class name="bold"/> </style> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Click on contacts you would like to invite to this group chat.</property> - <property name="justify">center</property> - <property name="wrap">True</property> - <property name="max-width-chars">42</property> - <style> - <class name="dim-label"/> - </style> - </object> <packing> <property name="expand">False</property> <property name="fill">True</property> ===================================== gajim/gtk/assistant.py ===================================== @@ -13,11 +13,11 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations + from typing import Any -from typing import Dict from typing import Callable from typing import Optional -from typing import Tuple +from typing import cast from gi.repository import Gdk from gi.repository import Gtk @@ -58,8 +58,8 @@ def __init__(self, self.set_transient_for(transient_for) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self._pages: Dict[str, Page] = {} - self._buttons: Dict[str, Tuple[Gtk.Button, bool]] = {} + self._pages: dict[str, Page] = {} + self._buttons: dict[str, tuple[Gtk.Button, bool]] = {} self._button_visible_func = None self._ui = get_builder('assistant.ui') @@ -84,13 +84,14 @@ def _on_key_press_event(self, self.destroy() def _update_page_complete(self, *args: Any) -> None: - page_widget = self._ui.stack.get_visible_child() + page_widget = cast(Page, self._ui.stack.get_visible_child()) for button, complete in self._buttons.values(): if complete: button.set_sensitive(page_widget.complete) def update_title(self) -> None: - self.set_title(self._ui.stack.get_visible_child().title) + page_widget = cast(Page, self._ui.stack.get_visible_child()) + self.set_title(page_widget.title) def _hide_buttons(self) -> None: for button, _ in self._buttons.values(): @@ -98,6 +99,7 @@ def _hide_buttons(self) -> None: def _set_buttons_visible(self) -> None: page_name = self._ui.stack.get_visible_child_name() + assert page_name is not None if self._button_visible_func is None: buttons = self.get_page(page_name).get_visible_buttons() if buttons is not None: @@ -105,8 +107,8 @@ def _set_buttons_visible(self) -> None: default = buttons[0] else: default = self.get_page(page_name).get_default_button() - - self.set_default_button(default) + if default is not None: + self.set_default_button(default) else: buttons = self._button_visible_func(self, page_name) @@ -141,7 +143,7 @@ def add_button(self, self._buttons[name] = (button, complete) self._ui.action_area.pack_end(button, False, False, 0) - def add_pages(self, pages: Dict[str, Page]): + def add_pages(self, pages: dict[str, Page]): self._pages = pages for name, widget in pages.items(): widget.connect('update-page-complete', self._update_page_complete) @@ -162,7 +164,9 @@ def add_default_page(self, name: str) -> Page: return page def get_current_page(self) -> str: - return self._ui.stack.get_visible_child_name() + name = self._ui.stack.get_visible_child_name() + assert name is not None + return name def show_page(self, name: str, @@ -198,7 +202,7 @@ def __on_destroy(self, *args: Any) -> None: class Page(Gtk.Box): - __gsignals__: dict = { + __gsignals__ = { 'update-page-complete': (GObject.SignalFlags.RUN_LAST, None, ()), } @@ -210,10 +214,10 @@ def __init__(self) -> None: self.title: str = '' self.complete: bool = True - def get_visible_buttons(self) -> None: + def get_visible_buttons(self) -> Optional[list[str]]: return None - def get_default_button(self) -> None: + def get_default_button(self) -> Optional[str]: return None def update_page_complete(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/88d4fd4c826edbe3588da5a7ef01008… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/88d4fd4c826edbe3588da5a7ef01008… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

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