Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] refactor: AvatarStorage: Access some methods directly
by Daniel Brötzmann (＠wurstsalat) 25 Nov '22

25 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 44eab3c1 by wurstsalat at 2022-11-25T19:00:31+01:00 refactor: AvatarStorage: Access some methods directly - - - - - 6 changed files: - gajim/common/modules/discovery.py - gajim/common/modules/user_avatar.py - gajim/common/modules/vcard_avatars.py - gajim/gtk/avatar.py - gajim/gtk/workspace_dialog.py - gajim/gui_interface.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== @@ -232,8 +232,8 @@ def disco_muc(self, if result.vcard is not None: avatar, avatar_sha = result.vcard.get_avatar() if avatar is not None: - if not app.interface.avatar_exists(avatar_sha): - app.interface.save_avatar(avatar) + if not app.app.avatar_storage.avatar_exists(avatar_sha): + app.app.avatar_storage.save_avatar(avatar) app.storage.cache.set_muc(result.info.jid, 'avatar', avatar_sha) app.app.avatar_storage.invalidate_cache(result.info.jid) ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -66,11 +66,12 @@ def _avatar_metadata_received(self, sha = contact.avatar_sha if sha is not None: - if sha in metadata.avatar_shas and app.interface.avatar_exists(sha): + if (sha in metadata.avatar_shas and + app.app.avatar_storage.avatar_exists(sha)): self._log.info('Avatar already known: %s %s', jid, sha) return - if app.interface.avatar_exists(metadata.default): + if app.app.avatar_storage.avatar_exists(metadata.default): self._log.info('Avatar found in cache, update: %s %s', jid, metadata.default) contact.update_avatar(metadata.default) @@ -109,5 +110,5 @@ def _request_avatar_data(self, return self._log.info('Received Avatar: %s %s', contact.jid, avatar.sha) - app.interface.save_avatar(avatar.data) + app.app.avatar_storage.save_avatar(avatar.data) contact.update_avatar(avatar.sha) ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -95,7 +95,7 @@ def _request_vcard(self, return self._log.info('Received: %s %s', contact.jid, avatar_sha) - app.interface.save_avatar(avatar) + app.app.avatar_storage.save_avatar(avatar) if isinstance(contact, BareContact): app.storage.cache.set_contact(contact.jid, 'avatar', avatar_sha) @@ -173,7 +173,7 @@ def _process_update(self, self._log.info('Avatar already known: %s %s', jid, avatar_sha) return - if app.interface.avatar_exists(avatar_sha): + if app.app.avatar_storage.avatar_exists(avatar_sha): # Check if the avatar is already in storage self._log.info('Found avatar in storage') if groupchat: @@ -214,7 +214,7 @@ def _muc_update_received(self, properties: PresenceProperties) -> None: else: self._log.info('Update: %s %s', nick, properties.avatar_sha) - if not app.interface.avatar_exists(properties.avatar_sha): + if not app.app.avatar_storage.avatar_exists(properties.avatar_sha): if properties.avatar_sha not in self._requested_shas: app.log('avatar').info('Request: %s', nick) self._requested_shas.append(properties.avatar_sha) ===================================== gajim/gtk/avatar.py ===================================== @@ -530,6 +530,9 @@ def get_avatar_path(filename: str) -> Optional[Path]: return None return path + def avatar_exists(self, filename: str) -> bool: + return self.get_avatar_path(filename) is not None + def surface_from_filename(self, filename: str, size: int, ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -154,7 +154,7 @@ def _on_save(self, _button: Gtk.Button) -> None: if use_image: data = self._get_avatar_data() if data is not None: - self._avatar_sha = app.interface.save_avatar(data) + self._avatar_sha = app.app.avatar_storage.save_avatar(data) if self._workspace_id is not None: app.settings.set_workspace_setting( ===================================== gajim/gui_interface.py ===================================== @@ -34,7 +34,6 @@ from __future__ import annotations from typing import Any -from typing import Optional import sys import time @@ -214,12 +213,6 @@ def process_connections(self) -> bool: raise return True # renew timeout (loop for ever) - def save_avatar(self, data: bytes) -> Optional[str]: - return app.app.avatar_storage.save_avatar(data) - - def avatar_exists(self, filename: str) -> bool: - return app.app.avatar_storage.get_avatar_path(filename) is not None - def run(self, _application: Gtk.Application) -> None: # get instances for windows/dialogs that will show_all()/hide() self.instances['file_transfers'] = FileTransfersWindow() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44eab3c10f1ac7ac6685bbe47d35f02f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44eab3c10f1ac7ac6685bbe47d35f02f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatFunctionPage: Don't close control on cancelling join error
by Daniel Brötzmann (＠wurstsalat) 25 Nov '22

25 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8e0f472a by wurstsalat at 2022-11-25T18:30:44+01:00 fix: ChatFunctionPage: Don't close control on cancelling join error Fixes #11116 - - - - - 1 changed file: - gajim/gtk/chat_function_page.py Changes: ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -107,7 +107,6 @@ def __init__(self) -> None: def process_escape(self) -> None: close_control = self._mode in ( - FunctionMode.JOIN_FAILED, FunctionMode.CREATION_FAILED, FunctionMode.CONFIG_FAILED, FunctionMode.CAPTCHA_ERROR) @@ -342,7 +341,6 @@ def _on_cancel_clicked(self, _button: Gtk.Button) -> None: close_control = True elif self._mode in ( - FunctionMode.JOIN_FAILED, FunctionMode.CREATION_FAILED, FunctionMode.CONFIG_FAILED, FunctionMode.CAPTCHA_ERROR): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e0f472a0d7d71ea7268901d09df4ef0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e0f472a0d7d71ea7268901d09df4ef0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cq: Contacts: Add more log output
by Daniel Brötzmann (＠wurstsalat) 25 Nov '22

25 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 88daed91 by wurstsalat at 2022-11-25T16:24:19+01:00 cq: Contacts: Add more log output - - - - - b8c09a65 by wurstsalat at 2022-11-25T17:38:12+01:00 fix: SearchView: Set chat type correctly for ResultRows Fixes #11087 - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -147,7 +147,8 @@ def add_group_chat_contact(self, jid: Union[str, JID]) -> GroupchatContact: if contact is not None: if not isinstance(contact, GroupchatContact): raise ValueError(f'Trying to add GroupchatContact {jid}, ' - f'but contact exists already as {contact}') + f'but contact already exists as {contact} ' + f'(in roster: {contact.is_in_roster})') return contact contact = GroupchatContact(self._log, jid, self._account) ===================================== gajim/gtk/search_view.py ===================================== @@ -201,7 +201,7 @@ def _add_results(self) -> None: result_row = ResultRow( msg, accounts[msg.account_id], - archive_jid.jid) + JID.from_string(archive_jid.jid)) else: assert self._account is not None assert self._jid is not None @@ -347,8 +347,7 @@ def _on_row_activated(_listbox: SearchView, row: ResultRow) -> None: control.scroll_to_message(row.log_line_id, row.timestamp) return - # Wrong chat or no control opened - # TODO: type 'pm' is KindConstant.CHAT_MSG_RECV, too + # Other chat or no control opened jid = JID.from_string(row.jid) app.window.add_chat(row.account, jid, row.type, select=True) control = app.window.get_control() @@ -407,6 +406,8 @@ def __init__(self, msg: SearchLogRow, account: str, jid: JID) -> None: self.type = 'contact' if msg.kind == KindConstant.GC_MSG: self.type = 'groupchat' + if jid.is_full: + self.type = 'pm' self.contact = self._client.get_module('Contacts').get_contact( jid, groupchat=self.type == 'groupchat') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/027b2d47f61ff9329eed44597c8c061… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/027b2d47f61ff9329eed44597c8c061… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: cfix: Preferences: Use correct preview actions
by Daniel Brötzmann (＠wurstsalat) 25 Nov '22

25 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 66d9ad4d by wurstsalat at 2022-11-25T15:25:54+01:00 cfix: Preferences: Use correct preview actions - - - - - 26f68c7f by wurstsalat at 2022-11-25T15:26:17+01:00 cfix: Menus: Fix linting error - - - - - b02f54d3 by wurstsalat at 2022-11-25T15:26:40+01:00 cq: File Choosers: Fix typo - - - - - 027b2d47 by wurstsalat at 2022-11-25T15:27:57+01:00 cfix: FileTransferSelector: Improve file choosing - - - - - 4 changed files: - gajim/gtk/file_transfer_selector.py - gajim/gtk/filechoosers.py - gajim/gtk/menus.py - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/file_transfer_selector.py ===================================== @@ -232,7 +232,7 @@ def _on_choose_files_clicked(self, _button: Gtk.Button) -> None: FileChooserDialog(self.add_files, select_multiple=True, transient_for=app.window, - path=app.settings.get('last_send_dir')) + path=app.settings.get('last_send_dir') or None) class FileRow(Gtk.ListBoxRow): ===================================== gajim/gtk/filechoosers.py ===================================== @@ -87,7 +87,7 @@ def _update_preview(self, filechooser: Gtk.FileChooser) -> None: return try: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( - path_to_file, *self._preivew_size) + path_to_file, *self._preview_size) except GLib.Error: preview.clear() return @@ -103,7 +103,7 @@ class BaseFileOpenDialog: class BaseAvatarChooserDialog: _title = _('Choose Avatar…') - _preivew_size = (100, 100) + _preview_size = (100, 100) if _require_native(): _filters = [Filter(_('PNG files'), '*.png', True), @@ -179,7 +179,7 @@ class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): _title = '' _filters: list[Filter] = [] _action = Gtk.FileChooserAction.OPEN - _preivew_size = (200, 200) + _preview_size = (200, 200) def __init__(self, accept_cb: Callable[..., Any], ===================================== gajim/gtk/menus.py ===================================== @@ -677,19 +677,19 @@ def get_preview_menu(preview: Preview) -> GajimMenu: variant = GLib.Variant('s', preview.id) download = (_('_Download'), 'win.preview-download', variant) - open = (_('_Open'), 'win.preview-open', variant) + open_file = (_('_Open'), 'win.preview-open', variant) save_as = (_('_Save as'), 'win.preview-save-as', variant) open_folder = (_('Open _Folder'), 'win.preview-open-folder', variant) copy_link = (_('_Copy Link'), 'win.preview-copy-link', variant) open_link = (_('Open Link in _Browser'), 'win.preview-open-link', variant) if preview.is_geo_uri: - menu_items.append(open) + menu_items.append(open_file) menu_items.append(copy_link) return GajimMenu.from_list(menu_items) if preview.orig_exists: - menu_items.append(open) + menu_items.append(open_file) menu_items.append(save_as) menu_items.append(open_folder) else: ===================================== gajim/gtk/preferences.py ===================================== @@ -48,7 +48,7 @@ from .settings import SettingsDialog from .sidebar_switcher import SideBarSwitcher from .video_preview import VideoPreview -from .preview import PREVIEW_CLICK_ACTIONS +from .preview import PREVIEW_ACTIONS from .util import open_window from .util import get_app_window from .builder import get_builder @@ -416,6 +416,12 @@ def __init__(self, *args: Any) -> None: 10485760: '10 MiB', } + preview_actions = {} + for action, data in PREVIEW_ACTIONS.items(): + if action == 'download': + continue + preview_actions[action] = data[0] + settings = [ Setting(SettingKind.SWITCH, _('File Preview'), @@ -460,7 +466,7 @@ def __init__(self, *args: Any) -> None: 'preview_leftclick_action', desc=_('Action for left-clicking a preview'), bind='enable_file_preview', - props={'entries': PREVIEW_CLICK_ACTIONS}), + props={'entries': preview_actions}), Setting(SettingKind.SWITCH, _('HTTPS Verification'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/45033e89ad327a0958c493c16868758… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/45033e89ad327a0958c493c16868758… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Preview: Use Gio.Menu and Actions
by Daniel Brötzmann (＠wurstsalat) 25 Nov '22

25 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 45033e89 by wurstsalat at 2022-11-25T15:14:42+01:00 refactor: Preview: Use Gio.Menu and Actions - - - - - 7 changed files: - gajim/common/preview.py - − gajim/data/gui/preview_context_menu.ui - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -20,6 +20,7 @@ from pathlib import Path from urllib.parse import urlparse from urllib.parse import ParseResult +import uuid from gi.repository import Gio from gi.repository import GLib @@ -64,6 +65,8 @@ def __init__(self, from_us: bool = False, context: Optional[str] = None ) -> None: + + self.id = str(uuid.uuid4()) self._uri = uri self._urlparts = urlparts self._filename = filename_from_uri(uri) @@ -194,12 +197,20 @@ def __init__(self) -> None: self._orig_dir = Path(configpaths.get('MY_DATA')) / 'downloads' self._thumb_dir = Path(configpaths.get('MY_CACHE')) / 'downloads.thumb' + self._previews: dict[str, Preview] = {} + if GLib.mkdir_with_parents(str(self._orig_dir), 0o700) != 0: log.error('Failed to create: %s', self._orig_dir) if GLib.mkdir_with_parents(str(self._thumb_dir), 0o700) != 0: log.error('Failed to create: %s', self._thumb_dir) + def get_preview(self, preview_id: str) -> Optional[Preview]: + return self._previews.get(preview_id) + + def clear_previews(self) -> None: + self._previews.clear() + def _get_session(self, account: str) -> Soup.Session: if account not in self._sessions: self._sessions[account] = self._create_session(account) @@ -300,9 +311,11 @@ def create_preview(self, if uri.startswith('geo:'): preview = Preview(uri, None, None, None, 96, widget) preview.update_widget() + self._previews[preview.id] = preview return preview = self._process_web_uri(uri, widget, from_us, context) + self._previews[preview.id] = preview if not preview.orig_exists: if context is not None and not from_us: ===================================== gajim/data/gui/preview_context_menu.ui deleted ===================================== @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkMenu" id="context_menu"> - <property name="can-focus">False</property> - <child> - <object class="GtkMenuItem" id="download"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Download</property> - <property name="use-underline">True</property> - <signal name="activate" handler="_on_download" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="open"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Open</property> - <property name="use-underline">True</property> - <signal name="activate" handler="_on_open" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="save_as"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Save as</property> - <property name="use-underline">True</property> - <signal name="activate" handler="_on_save_as" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="open_folder"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Open _Folder</property> - <property name="use-underline">True</property> - <signal name="activate" handler="_on_open_folder" swapped="no"/> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="encryption_separator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="copy_link_location"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Copy Link</property> - <property name="use-underline">True</property> - <signal name="activate" handler="_on_copy_link_location" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="open_link_in_browser"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Open Link in _Browser</property> - <property name="use-underline">True</property> - <signal name="activate" handler="_on_open_link_in_browser" swapped="no"/> - </object> - </child> - </object> -</interface> ===================================== gajim/gtk/chat_stack.py ===================================== @@ -191,6 +191,8 @@ def show_chat(self, account: str, jid: JID) -> None: client = app.get_client(account) self._current_contact = client.get_module('Contacts').get_contact(jid) + app.preview_manager.clear_previews() + self._chat_banner.switch_contact(self._current_contact) self._chat_control.switch_contact(self._current_contact) self._message_action_box.switch_contact(self._current_contact) ===================================== gajim/gtk/const.py ===================================== @@ -253,6 +253,12 @@ def __str__(self): ('add-chat', 'a{sv}', True), ('add-group-chat', 'as', True), ('add-to-roster', 'a{sv}', True), + ('preview-open', 's', True), + ('preview-save-as', 's', True), + ('preview-open-folder', 's', True), + ('preview-copy-link', 's', True), + ('preview-open-link', 's', True), + ('preview-download', 's', True), ] ===================================== gajim/gtk/main.py ===================================== @@ -19,6 +19,9 @@ from typing import TYPE_CHECKING import logging +import os +from pathlib import Path +import shutil from gi.repository import Gtk from gi.repository import Gdk @@ -37,6 +40,8 @@ from gajim.common.const import SimpleClientState from gajim.common.ged import EventHelper from gajim.common.i18n import _ +from gajim.common.helpers import open_file +from gajim.common.helpers import open_uri from gajim.common.helpers import play_sound from gajim.common.modules.bytestream import is_transfer_active from gajim.common.modules.contacts import GroupchatContact @@ -55,8 +60,10 @@ from .dialogs import DialogButton from .dialogs import ConfirmationDialog from .dialogs import ConfirmationCheckDialog +from .dialogs import ErrorDialog from .dialogs import InputDialog from .builder import get_builder +from .filechoosers import FileSaveDialog from .util import get_app_window from .util import resize_window from .util import restore_main_window_position @@ -404,6 +411,12 @@ def _connect_actions(self) -> None: ('switch-workspace-8', self._on_action), ('switch-workspace-9', self._on_action), ('toggle-chat-list', self._on_action), + ('preview-download', self._on_preview_action), + ('preview-open', self._on_preview_action), + ('preview-save-as', self._on_preview_action), + ('preview-open-folder', self._on_preview_action), + ('preview-copy-link', self._on_preview_action), + ('preview-open-link', self._on_preview_action), ('copy-message', self._on_copy_message), ('retract-message', self._on_retract_message), ('add-workspace', self._add_workspace), @@ -485,6 +498,91 @@ def _on_action(self, return None + def _on_preview_action(self, + action: Gio.SimpleAction, + param: GLib.Variant + ) -> None: + + action_name = action.get_name() + preview = app.preview_manager.get_preview(param.get_string()) + if preview is None: + return + + if action_name == 'preview-download': + if not preview.orig_exists: + app.preview_manager.download_content(preview, force=True) + + elif action_name == 'preview-open': + if preview.is_geo_uri: + open_uri(preview.uri) + return + + if not preview.orig_exists: + app.preview_manager.download_content(preview, force=True) + return + + assert preview.orig_path is not None + open_file(preview.orig_path) + + elif action_name == 'preview-save-as': + def _on_ok(target: str) -> None: + assert preview is not None + assert preview.orig_path is not None + + target_path = Path(target) + orig_ext = preview.orig_path.suffix + new_ext = target_path.suffix + if orig_ext != new_ext: + # Windows file chooser selects the full file name including + # extension. Starting to type will overwrite the extension + # as well. Restore the extension if it's lost. + target_path = target_path.with_suffix(orig_ext) + dirname = target_path.parent + if not os.access(dirname, os.W_OK): + ErrorDialog( + _('Directory "%s" is not writable') % dirname, + _('You do not have the proper permissions to ' + 'create files in this directory.'), + transient_for=self) + return + + shutil.copyfile(preview.orig_path, target_path) + app.settings.set('last_save_dir', str(target_path.parent)) + + if not preview.orig_exists: + app.preview_manager.download_content(preview, force=True) + return + + FileSaveDialog(_on_ok, + path=app.settings.get('last_save_dir'), + file_name=preview.filename, + transient_for=self) + + elif action_name == 'preview-open-folder': + if not preview.orig_exists: + app.preview_manager.download_content(preview, force=True) + return + + assert preview.orig_path is not None + open_file(preview.orig_path.parent) + + elif action_name == 'preview-copy-link': + display = Gdk.Display.get_default() + assert display is not None + clipboard = Gtk.Clipboard.get_default(display) + clipboard.set_text(preview.uri, -1) + + elif action_name == 'preview-open-link': + if preview.is_aes_encrypted: + if preview.is_geo_uri: + open_uri(preview.uri) + return + + assert preview.orig_path + open_file(preview.orig_path) + else: + open_uri(preview.uri) + def _on_show_offline(self, action: Gio.SimpleAction, value: GLib.Variant) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -43,6 +43,7 @@ from gajim.common.i18n import get_short_lang_code from gajim.common.const import URIType from gajim.common.const import XmppUriQuery +from gajim.common.preview import Preview from gajim.common.structs import URI from gajim.common.structs import VariantMixin from gajim.common.modules.contacts import GroupchatContact @@ -670,6 +671,39 @@ def get_chat_row_menu(contact: types.ChatContactT, return menu +def get_preview_menu(preview: Preview) -> GajimMenu: + menu_items: MenuItemListT = [] + + variant = GLib.Variant('s', preview.id) + + download = (_('_Download'), 'win.preview-download', variant) + open = (_('_Open'), 'win.preview-open', variant) + save_as = (_('_Save as'), 'win.preview-save-as', variant) + open_folder = (_('Open _Folder'), 'win.preview-open-folder', variant) + copy_link = (_('_Copy Link'), 'win.preview-copy-link', variant) + open_link = (_('Open Link in _Browser'), 'win.preview-open-link', variant) + + if preview.is_geo_uri: + menu_items.append(open) + menu_items.append(copy_link) + return GajimMenu.from_list(menu_items) + + if preview.orig_exists: + menu_items.append(open) + menu_items.append(save_as) + menu_items.append(open_folder) + else: + if not preview.download_in_progress: + menu_items.append(download) + + menu_items.append(copy_link) + + if not preview.is_aes_encrypted: + menu_items.append(open_link) + + return GajimMenu.from_list(menu_items) + + def get_format_menu() -> GajimMenu: menuitems: MenuItemListT = [ ===================================== gajim/gtk/preview.py ===================================== @@ -17,9 +17,6 @@ from typing import Optional import logging -import shutil -import os -from pathlib import Path from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -28,8 +25,6 @@ from gi.repository import Pango from gajim.common import app -from gajim.common.helpers import open_file -from gajim.common.helpers import open_uri from gajim.common.i18n import _ from gajim.common.preview import Preview from gajim.common.preview_helpers import split_geo_uri @@ -38,22 +33,23 @@ from gajim.common.preview_helpers import get_icon_for_mime_type from gajim.common.types import GdkPixbufType -from .dialogs import ErrorDialog -from .filechoosers import FileSaveDialog from .preview_audio import AudioWidget from .builder import get_builder +from .menus import get_preview_menu +from .util import GajimPopover from .util import ensure_not_destroyed from .util import get_cursor from .util import load_icon_pixbuf log = logging.getLogger('gajim.gui.preview') -PREVIEW_CLICK_ACTIONS = { - 'open': _('Open'), - 'save_as': _('Save As…'), - 'open_folder': _('Open Folder'), - 'copy_link_location': _('Copy Link Location'), - 'open_link_in_browser': _('Open Link in Browser'), +PREVIEW_ACTIONS: dict[str, tuple[str, str]] = { + 'open': (_('Open'), 'preview-open'), + 'save_as': (_('Save as…'), 'preview-save-as'), + 'open_folder': (_('Open Folder'), 'preview-open-folder'), + 'copy_link_location': (_('Copy Link'), 'preview-copy-link'), + 'open_link_in_browser': (_('Open Link in Browser'), 'preview-open-link'), + 'download': (_('Download File'), 'preview-download'), } @@ -76,7 +72,7 @@ def __init__(self, account: str) -> None: leftclick_action = app.settings.get('preview_leftclick_action') self._ui.icon_button.set_tooltip_text( - PREVIEW_CLICK_ACTIONS[leftclick_action]) + PREVIEW_ACTIONS[leftclick_action][0]) app.settings.connect_signal( 'preview_leftclick_action', self._update_icon_button_tooltip) @@ -89,7 +85,7 @@ def _on_destroy(self, _widget: Gtk.Widget) -> None: def _update_icon_button_tooltip(self, setting: str, *args: Any) -> None: self._ui.icon_button.set_tooltip_text( - PREVIEW_CLICK_ACTIONS[setting]) + PREVIEW_ACTIONS[setting][0]) def get_text(self) -> str: if self._preview is None: @@ -204,135 +200,45 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.file_name.set_text(preview.filename) self._ui.file_name.set_tooltip_text(preview.filename) - def _get_context_menu(self) -> Gtk.Menu: - def _destroy(menu: Gtk.Menu, _pspec: Any) -> None: - visible = menu.get_property('visible') - if not visible: - GLib.idle_add(menu.destroy) - - menu = get_builder('preview_context_menu.ui') - menu.connect_signals(self) - menu.context_menu.connect('notify::visible', _destroy) - - assert self._preview - if self._preview.is_aes_encrypted: - menu.open_link_in_browser.hide() - - if self._preview.is_geo_uri: - menu.download.hide() - menu.open_link_in_browser.hide() - menu.save_as.hide() - menu.open_folder.hide() - return menu.context_menu - - if self._preview.orig_exists: - menu.download.hide() - else: - if self._preview.download_in_progress: - menu.download.hide() - menu.open.hide() - menu.save_as.hide() - menu.open_folder.hide() - - return menu.context_menu - - def _on_download(self, _menu: Gtk.Menu) -> None: + def _on_download(self, _button: Gtk.Button) -> None: if self._preview is None: return - if not self._preview.orig_exists: - app.preview_manager.download_content(self._preview, force=True) - def _on_open(self, _menu: Gtk.Menu) -> None: - if self._preview is None: - return + variant = GLib.Variant('s', self._preview.id) + app.window.activate_action('preview-download', variant) - if self._preview.is_geo_uri: - open_uri(self._preview.uri) - return - - if not self._preview.orig_exists: - app.preview_manager.download_content(self._preview, force=True) - return - - assert self._preview.orig_path - open_file(self._preview.orig_path) - - def _on_save_as(self, _menu: Gtk.Menu) -> None: + def _on_save_as(self, _button: Gtk.Button) -> None: assert self._preview is not None + variant = GLib.Variant('s', self._preview.id) + app.window.activate_action('preview-save-as', variant) - def _on_ok(target: str) -> None: - assert self._preview is not None - assert self._preview.orig_path is not None - - target_path = Path(target) - orig_ext = self._preview.orig_path.suffix - new_ext = target_path.suffix - if orig_ext != new_ext: - # Windows file chooser selects the full file name including - # extension. Starting to type will overwrite the extension - # as well. Restore the extension if it's lost. - target_path = target_path.with_suffix(orig_ext) - dirname = target_path.parent - if not os.access(dirname, os.W_OK): - ErrorDialog( - _('Directory "%s" is not writable') % dirname, - _('You do not have the proper permissions to ' - 'create files in this directory.'), - transient_for=app.app.get_active_window()) - return - shutil.copyfile(str(self._preview.orig_path), target_path) - file_dir = os.path.dirname(target_path) - if file_dir: - app.settings.set('last_save_dir', file_dir) - - if not self._preview.orig_exists: - app.preview_manager.download_content(self._preview, force=True) - return - - FileSaveDialog(_on_ok, - path=app.settings.get('last_save_dir'), - file_name=self._preview.filename, - transient_for=app.app.get_active_window()) + def _on_open_folder(self, _button: Gtk.Button) -> None: + assert self._preview is not None + variant = GLib.Variant('s', self._preview.id) + app.window.activate_action('preview-open-folder', variant) - def _on_open_folder(self, _menu: Gtk.Menu) -> None: - assert self._preview - if not self._preview.orig_exists: - app.preview_manager.download_content(self._preview, force=True) + def _on_content_button_clicked(self, _button: Gtk.Button) -> None: + if self._preview is None: return - assert self._preview.orig_path - open_file(self._preview.orig_path.parent) - - def _on_copy_link_location(self, _menu: Gtk.Menu) -> None: - display = Gdk.Display.get_default() - assert display is not None - clipboard = Gtk.Clipboard.get_default(display) - assert self._preview - clipboard.set_text(self._preview.uri, -1) - - def _on_open_link_in_browser(self, _menu: Gtk.Menu) -> None: - assert self._preview - if self._preview.is_aes_encrypted: - if self._preview.is_geo_uri: - open_uri(self._preview.uri) - return - assert self._preview.orig_path - open_file(self._preview.orig_path) - else: - open_uri(self._preview.uri) - def _on_content_button_clicked(self, _button: Gtk.Button) -> None: - action = app.settings.get('preview_leftclick_action') - method = getattr(self, f'_on_{action}') - method(None) + leftclick_action = app.settings.get('preview_leftclick_action') + variant = GLib.Variant('s', self._preview.id) + action = PREVIEW_ACTIONS[leftclick_action][1] + app.window.activate_action(action, variant) def _on_button_press_event(self, _button: Gtk.Button, event: Gdk.EventButton ) -> None: - if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3: - # Right click - menu = self._get_context_menu() - menu.popup_at_pointer(event) + + if self._preview is None: + return + + if (event.type == Gdk.EventType.BUTTON_PRESS and + event.button == Gdk.BUTTON_SECONDARY): + menu = get_preview_menu(self._preview) + popover = GajimPopover(menu, relative_to=self, event=event) + popover.popup() def _on_cancel_download_clicked(self, _button: Gtk.Button) -> None: assert self._preview is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/45033e89ad327a0958c493c168687584… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/45033e89ad327a0958c493c168687584… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: change: Add FileTransferSelector as a central page for sending files
by Daniel Brötzmann (＠wurstsalat) 24 Nov '22

24 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a6037e25 by wurstsalat at 2022-11-24T22:23:04+00:00 change: Add FileTransferSelector as a central page for sending files Fixes #9511 - - - - - 53d01bd6 by wurstsalat at 2022-11-24T23:33:00+01:00 refactor: Remove obsolete FileTransferSend dialog - - - - - 17 changed files: - gajim/common/events.py - gajim/common/modules/httpupload.py - gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/control.py - + gajim/gtk/file_transfer_selector.py - − gajim/gtk/file_transfer_send.py - gajim/gtk/filetransfer.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py - gajim/gui_interface.py Changes: ===================================== gajim/common/events.py ===================================== @@ -44,9 +44,9 @@ if typing.TYPE_CHECKING: from gajim.common.client import Client + from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.plugins.pluginmanager import PluginManifest - ChatListEventT = Union[ 'MessageReceived', 'MamMessageReceived', @@ -237,6 +237,22 @@ class FileSendError(ApplicationEvent): error_msg: str = '' +@dataclass +class HTTPUploadStarted(ApplicationEvent): + name: str = field(init=False, default='http-upload-started') + account: str + jid: JID + transfer: HTTPFileTransfer + + +@dataclass +class HTTPUploadError(ApplicationEvent): + name: str = field(init=False, default='http-upload-error') + account: str + jid: JID + error_msg: str + + @dataclass class AccountEnabled(ApplicationEvent): name: str = field(init=False, default='account-enabled') ===================================== gajim/common/modules/httpupload.py ===================================== @@ -25,6 +25,7 @@ from urllib.parse import urlparse import mimetypes from collections import defaultdict +from pathlib import Path from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError @@ -42,6 +43,8 @@ from gajim.common import app from gajim.common import types +from gajim.common.events import HTTPUploadError +from gajim.common.events import HTTPUploadStarted from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase from gajim.common.helpers import get_account_proxy @@ -49,6 +52,7 @@ from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule from gajim.common.exceptions import FileError +from gajim.common.structs import OutgoingMessage class HTTPUpload(BaseModule): @@ -105,18 +109,44 @@ def get_running_transfers(self, return self._running_transfers.get((contact.account, contact.jid)) - def make_transfer(self, - path: str, - encryption: Optional[str], - contact: types.ContactT, - groupchat: bool = False - ) -> HTTPFileTransfer: - if not path or not os.path.exists(path): + def send_file(self, contact: types.ChatContactT, path: Path) -> None: + encryption = contact.settings.get('encryption') or None + + try: + transfer = self._make_transfer( + path, + encryption, + contact) + except FileError as error: + event = HTTPUploadError( + contact.account, + contact.jid, + _('Could not open file (%s)') % str(error)) + app.ged.raise_event(event) + return + + transfer.connect('cancel', self._on_cancel_upload) + transfer.connect('state-changed', self._on_http_upload_state_changed) + + event = HTTPUploadStarted( + contact.account, + contact.jid, + transfer) + app.ged.raise_event(event) + self._start_transfer(transfer) + + def _make_transfer(self, + path: Path, + encryption: Optional[str], + contact: types.ChatContactT, + ) -> HTTPFileTransfer: + + if not path or not path.exists(): raise FileError(_('Could not access file')) invalid_file = False msg = '' - stat = os.stat(path) + stat = path.stat() if os.path.isfile(path): if stat[6] == 0: @@ -143,18 +173,43 @@ def make_transfer(self, self._log.info('Detected MIME type of file: %s', mime) transfer = HTTPFileTransfer(self._account, - path, + str(path), contact, mime, encryption, - groupchat) + contact.is_groupchat) key = (contact.account, contact.jid) self._running_transfers[key].add(transfer) return transfer - def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: + def _on_http_upload_state_changed(self, + transfer: HTTPFileTransfer, + _signal_name: str, + state: FTState + ) -> None: + + if state.is_finished: + uri = transfer.get_transformed_uri() + + type_ = 'chat' + if transfer.is_groupchat: + type_ = 'groupchat' + + message = OutgoingMessage(account=transfer.account, + contact=transfer.contact, + message=uri, + type_=type_, + oob_url=uri) + + self._client.send_message(message) + + def _on_cancel_upload(self, + transfer: HTTPFileTransfer, + _signal_name: str + ) -> None: + transfer.set_cancelled() key = (transfer.account, transfer.contact.jid) @@ -166,14 +221,14 @@ def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: self._session.cancel_message(message, Soup.Status.CANCELLED) - def start_transfer(self, transfer: HTTPFileTransfer) -> None: + def _start_transfer(self, transfer: HTTPFileTransfer) -> None: if transfer.encryption is not None and not transfer.is_encrypted: transfer.set_encrypting() plugin = app.plugin_manager.encryption_plugins[transfer.encryption] if hasattr(plugin, 'encrypt_file'): plugin.encrypt_file(transfer, self._account, - self.start_transfer) + self._start_transfer) else: transfer.set_error('encryption-not-available') ===================================== gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui ===================================== @@ -1,107 +1,85 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkStack" id="send_stack"> + <object class="GtkBox" id="file_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="transition-type">slide-left-right</property> + <property name="spacing">12</property> <child> - <object class="GtkBox"> + <object class="GtkBox" id="preview_image_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="border-width">18</property> + <property name="valign">center</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> - <object class="GtkLabel"> + <object class="GtkImage" id="preview_image"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Files to send</property> - <property name="xalign">0</property> + <property name="icon_size">6</property> <style> - <class name="dim-label"/> + <class name="preview-image"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</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="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="file_name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</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="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkLabel" id="file_size_label"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkListBox" id="listbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - <property name="selection-mode">multiple</property> - <property name="activate-on-single-click">False</property> - <signal name="add" handler="_on_files_changed" swapped="no"/> - <signal name="remove" handler="_on_files_changed" swapped="no"/> - </object> - </child> - </object> - </child> + <property name="can-focus">False</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolbar"> - <property name="visible">True</property> + <object class="GtkLabel" id="warning_label"> <property name="can-focus">False</property> - <property name="show-arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Add Files</property> - <property name="use-underline">True</property> - <property name="icon-name">list-add-symbolic</property> - <signal name="clicked" handler="_select_files" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Remove Files</property> - <property name="use-underline">True</property> - <property name="icon-name">list-remove-symbolic</property> - <signal name="clicked" handler="_remove_files" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="no-show-all">True</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> <style> - <class name="inline-toolbar"/> + <class name="warning-color"/> </style> </object> <packing> @@ -114,89 +92,143 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_file_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Remove</property> + <property name="valign">center</property> <child> - <object class="GtkLabel"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Description</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> + <property name="icon-name">list-remove-symbolic</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">slide-left-right</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkScrolledWindow"> - <property name="height-request">70</property> + <property name="width-request">500</property> + <property name="height-request">350</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="hscrollbar-policy">never</property> <property name="shadow-type">in</property> <child> - <object class="GtkTextView" id="description"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="wrap-mode">word-char</property> - <property name="left-margin">6</property> - <property name="right-margin">6</property> - <property name="top-margin">6</property> - <property name="bottom-margin">6</property> + <property name="can-focus">False</property> + <child> + <object class="GtkListBox" id="listbox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + <property name="activate-on-single-click">False</property> + <signal name="add" handler="_on_files_changed" swapped="no"/> + <signal name="remove" handler="_on_files_changed" swapped="no"/> + <child type="placeholder"> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">center</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">Drop files here</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="dnd-area"/> + </style> + </object> + </child> + <style> + <class name="gajim-listbox"/> + </style> + </object> + </child> </object> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkButton" id="files_send"> - <property name="label" translatable="yes">_Send Files</property> + <object class="GtkButton"> + <property name="label" translatable="yes">Add Files…</property> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> + <signal name="clicked" handler="_on_choose_files_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> </object> <packing> - <property name="name">file_selection</property> + <property name="name">file-selection</property> </packing> </child> <child> <object class="GtkBox" id="resource_box"> <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">6</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">Choose Device</property> <style> - <class name="large-header"/> + <class name="bold16"/> </style> </object> <packing> @@ -205,27 +237,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="resource_send"> - <property name="label" translatable="yes">_Send Files</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_to_resource" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkLabel" id="resource_instructions"> <property name="visible">True</property> @@ -240,7 +251,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -248,7 +259,7 @@ </child> </object> <packing> - <property name="name">resource_selection</property> + <property name="name">resource-selection</property> <property name="position">1</property> </packing> </child> ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -117,6 +117,7 @@ <property name="focus-on-click">False</property> <property name="receives-default">True</property> <property name="action-name">win.send-file</property> + <property name="action-target">['']</property> <property name="relief">none</property> <child> <object class="GtkImage"> ===================================== gajim/data/style/gajim.css ===================================== @@ -920,9 +920,6 @@ #FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } #FeaturesInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } #FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } -/* SendFileDialog */ -#SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } - /* AccountsWindow */ .accounts-menu { border-right: 1px solid @borders; ===================================== gajim/gtk/builder.pyi ===================================== @@ -326,13 +326,17 @@ class FileTransferJingleBuilder(Builder): progress_bar: Gtk.ProgressBar -class FileTransferSendBuilder(Builder): - send_stack: Gtk.Stack +class FileTransferSelectorBuilder(Builder): + file_box: Gtk.Box + preview_image_box: Gtk.Box + preview_image: Gtk.Image + file_name_label: Gtk.Label + file_size_label: Gtk.Label + warning_label: Gtk.Label + remove_file_button: Gtk.Button + stack: Gtk.Stack listbox: Gtk.ListBox - description: Gtk.TextView - files_send: Gtk.Button resource_box: Gtk.Box - resource_send: Gtk.Button resource_instructions: Gtk.Label @@ -964,7 +968,7 @@ def get_builder(file_name: Literal['file_transfer.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['file_transfer_jingle.ui'], widgets: list[str] = ...) -> FileTransferJingleBuilder: ... @overload -def get_builder(file_name: Literal['file_transfer_send.ui'], widgets: list[str] = ...) -> FileTransferSendBuilder: ... +def get_builder(file_name: Literal['file_transfer_selector.ui'], widgets: list[str] = ...) -> FileTransferSelectorBuilder: ... @overload def get_builder(file_name: Literal['filetransfers.ui'], widgets: list[str] = ...) -> FiletransfersBuilder: ... @overload ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -17,6 +17,7 @@ from typing import Optional from enum import Enum +from pathlib import Path from gi.repository import GObject from gi.repository import Gtk @@ -33,11 +34,13 @@ from gajim.common.modules.contacts import GroupchatContact from .dataform import DataFormWidget +from .file_transfer_selector import FileTransferSelector from .groupchat_inviter import GroupChatInviter class FunctionMode(Enum): INVITE = 'invite' + SEND_FILE = 'send-file' CHANGE_NICKNAME = 'change-nickname' KICK = 'kick' BAN = 'ban' @@ -135,7 +138,8 @@ def _reset(self) -> None: def set_mode(self, contact: types.ChatContactT, mode: FunctionMode, - data: Optional[str] = None + data: Optional[str] = None, + files: Optional[list[str]] = None ) -> None: self._reset() @@ -159,6 +163,15 @@ def set_mode(self, self._widget.connect('listbox-changed', self._on_ready) self._widget.load_contacts() + elif mode == FunctionMode.SEND_FILE: + self._confirm_button.set_label(_('Send Files')) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + self._widget = FileTransferSelector(self._contact, data) + self._widget.connect('changed', self._on_ready) + if files is not None: + self._widget.add_files(files) + elif mode == FunctionMode.CHANGE_NICKNAME: self._confirm_button.set_label(_('Change')) self._confirm_button.get_style_context().add_class( @@ -264,6 +277,13 @@ def _on_confirm_clicked(self, _button: Gtk.Button) -> None: for jid in invitees: self._invite(JID.from_string(jid)) + elif self._mode == FunctionMode.SEND_FILE: + assert isinstance(self._widget, FileTransferSelector) + if self._widget.transfer_resource_required(): + return + + self._send_files(self._widget.get_catalog()) + elif self._mode == FunctionMode.CHANGE_NICKNAME: assert isinstance(self._widget, InputWidget) nickname = self._widget.get_text() @@ -347,6 +367,24 @@ def _invite(self, invited_jid: JID) -> None: 'message', _('%s has been invited to this group chat') % invited_contact.name) + def _send_files(self, catalog: list[tuple[Path, str, JID]]) -> None: + assert self._contact is not None + client = app.get_client(self._contact.account) + + # catalog: list[(file Path, transfer method, recipient JID)] + for path, method, jid in catalog: + if method == 'httpupload': + client.get_module('HTTPUpload').send_file( + self._contact, path) + continue + + # Send using Jingle + app.interface.instances['file_transfers'].send_file( + self._contact.account, + self._contact, + jid, + str(path)) + class InputWidget(Gtk.Box): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -564,16 +564,19 @@ def _on_action(self, app.call_manager.start_call(account, jid, CallType.VIDEO) elif action_name.startswith('send-file'): + method = None name = action.get_name() if 'httpupload' in name: - app.interface.start_file_transfer(contact, method='httpupload') - return + method = 'httpupload' if 'jingle' in name: - app.interface.start_file_transfer(contact, method='jingle') - return + method = 'jingle' - app.interface.start_file_transfer(contact) + file_paths = None + if param is not None: + file_paths = param.get_strv() or None + self._show_chat_function_page( + FunctionMode.SEND_FILE, method, file_paths) elif action_name == 'add-to-roster': if (isinstance(contact, GroupchatParticipant) and @@ -676,12 +679,13 @@ def _on_drag_motion(self, def _show_chat_function_page(self, function_mode: FunctionMode, - data: Optional[str] = None + data: Optional[str] = None, + files: Optional[list[str]] = None ) -> None: assert self._current_contact is not None self._chat_function_page.set_mode( - self._current_contact, function_mode, data) + self._current_contact, function_mode, data, files) self.set_transition_type(Gtk.StackTransitionType.SLIDE_UP_DOWN) self.set_visible_child_name('function') ===================================== gajim/gtk/const.py ===================================== @@ -198,9 +198,9 @@ def __str__(self): ('retract-message', 'a{sv}', False), ('quote', 's', False), ('mention', 's', False), - ('send-file-httpupload', None, False), - ('send-file-jingle', None, False), - ('send-file', None, False), + ('send-file-httpupload', 'as', False), + ('send-file-jingle', 'as', False), + ('send-file', 'as', False), ('add-to-roster', None, True), ('start-voice-call', None, False), ('start-video-call', None, False), ===================================== gajim/gtk/control.py ===================================== @@ -233,6 +233,8 @@ def _register_events(self) -> None: ged.GUI2, self._on_jingle_request_received), ('file-request-received', ged.GUI2, self._on_file_request_event), ('file-request-sent', ged.GUI2, self._on_file_request_event), + ('http-upload-started', ged.GUI2, self._on_http_upload_started), + ('http-upload-error', ged.GUI2, self._on_http_upload_error), ]) def _is_event_processable(self, event: Any) -> bool: @@ -440,6 +442,12 @@ def _on_file_request_event(self, self.add_jingle_file_transfer(event=event) + def _on_http_upload_started(self, event: events.HTTPUploadStarted) -> None: + self.add_file_transfer(event.transfer) + + def _on_http_upload_error(self, event: events.HTTPUploadError) -> None: + self.add_info_message(event.error_msg) + @property def is_chat(self) -> bool: return isinstance(self.contact, BareContact) @@ -488,22 +496,18 @@ def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: - # we may have more than one file dropped - uri_splitted = selection.get_uris() - for uri in uri_splitted: + uris = selection.get_uris() + paths: list[str] = [] + for uri in uris: path = get_file_path_from_dnd_dropped_uri(uri) - if not path: - self.add_info_message( - _('The following address was not understood and was ' - 'not uploaded: %s') % uri) - continue - if not path.is_file(): # is it a regular file? + if path is None or not path.is_file(): self.add_info_message( - _('The following file could not be accessed and was ' - 'not uploaded: %s') % path) + _('You dropped something Gajim could not ' + 'process: %s' % path)) continue + paths.append(str(path)) - app.interface.start_file_transfer(self.contact, str(path)) + app.window.activate_action('send-file', GLib.Variant('as', paths)) def get_our_nick(self) -> str: if isinstance(self.contact, GroupchatParticipant): ===================================== gajim/gtk/file_transfer_selector.py ===================================== @@ -0,0 +1,313 @@ +# 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 Any +from typing import cast +from typing import Optional +from typing import Union + +import logging +from pathlib import Path + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import GObject +from gi.repository import Gtk + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID + +from gajim.common import app +from gajim.common import types +from gajim.common.helpers import get_file_path_from_dnd_dropped_uri +from gajim.common.helpers import load_file_async +from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact +from gajim.common.preview import PREVIEWABLE_MIME_TYPES +from gajim.common.preview_helpers import create_thumbnail +from gajim.common.preview_helpers import guess_mime_type +from gajim.common.preview_helpers import get_icon_for_mime_type +from gajim.common.preview_helpers import pixbuf_from_data + +from .builder import get_builder +from .filechoosers import FileChooserDialog +from .resource_selector import ResourceSelector + +PREVIEW_SIZE = 72 + +log = logging.getLogger('gajim.gui.file_transfer_selector') + + +class FileTransferSelector(Gtk.Box): + + __gsignals__ = { + 'changed': (GObject.SignalFlags.RUN_LAST, None, (bool,)), + } + + def __init__(self, + contact: types.ChatContactT, + method: Optional[str] = None + ) -> None: + + Gtk.Box.__init__(self) + + self._contact = contact + self._method = method or app.window.get_preferred_ft_method(contact) + + client = app.get_client(contact.account) + self._max_file_size = client.get_module('HTTPUpload').max_file_size or 0 + + self._ui = get_builder('file_transfer_selector.ui') + self.add(self._ui.stack) + + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + + self._resource_selector = None + if isinstance(contact, BareContact): + # No jingle file transfers in group chats + self._resource_selector = ResourceSelector( + contact, + constraints=[Namespace.JINGLE_FILE_TRANSFER_5]) + self._resource_selector.connect( + 'selection-changed', self._on_resource_selection) + self._ui.resource_box.pack_start( + self._resource_selector, True, False, 0) + + self._ui.resource_instructions.set_text( + _('%s is online with multiple devices.\n' + 'Choose the device you would like to send the ' + 'files to.') % self._contact.name) + + uri_entry = Gtk.TargetEntry.new( + 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) + dst_targets = Gtk.TargetList.new([uri_entry]) + + self._ui.listbox.drag_dest_set( + Gtk.DestDefaults.ALL, + [uri_entry], + Gdk.DragAction.COPY | Gdk.DragAction.MOVE) + self._ui.listbox.drag_dest_set_target_list(dst_targets) + self._ui.listbox.connect( + 'drag-data-received', self._on_drag_data_received) + + self.show_all() + + def transfer_resource_required(self) -> bool: + if not isinstance(self._contact, BareContact): + # No jingle file transfer for group chats + return False + + if self._method is None: + log.error('No file transfer method available') + return False + + current_page = self._ui.stack.get_visible_child_name() + if self._method == 'httpupload': + for path in self._get_file_paths(): + if path.stat().st_size > self._max_file_size: + if current_page == 'resource-selection': + return False + + self._ui.stack.set_visible_child_name('resource-selection') + self.emit('changed', False) + return True + return False + + if current_page == 'resource-selection': + return False + + self._ui.stack.set_visible_child_name('resource-selection') + self.emit('changed', False) + return True + + def get_catalog(self) -> list[tuple[Path, str, JID]]: + # catalog: list[(file Path, transfer method, recipient JID)] + catalog: list[tuple[Path, str, JID]] = [] + + file_paths = self._get_file_paths() + for path in file_paths: + if (self._method == 'jingle' or + path.stat().st_size > self._max_file_size): + assert self._resource_selector is not None + item = (path, 'jingle', self._resource_selector.get_jid()) + elif self._method == 'httpupload': + item = (path, 'httpupload', self._contact.jid) + else: + # No file transfer method available + continue + + catalog.append(item) + + return catalog + + def add_files(self, file_paths: Union[list[Path], list[str]]) -> None: + for path in file_paths: + if isinstance(path, str): + path = Path(path) + + if path.is_dir(): + continue + + size_warning = bool(self._method == 'httpupload' and + path.stat().st_size > self._max_file_size) + jingle_warning = bool(self._method == 'jingle') + + row = FileRow(path, size_warning, jingle_warning) + self._ui.listbox.add(row) + app.settings.set('last_send_dir', str(path)) + + self._ui.listbox.show_all() + + def _on_destroy(self, _widget: FileTransferSelector) -> None: + app.check_finalize(self) + + def _get_file_paths(self) -> list[Path]: + paths: list[Path] = [] + for row in cast(list[FileRow], self._ui.listbox.get_children()): + paths.append(row.file_path) + + return paths + + def _on_drag_data_received(self, + _widget: Gtk.Widget, + _context: Gdk.DragContext, + _x_coord: int, + _y_coord: int, + selection: Gtk.SelectionData, + target_type: int, + _timestamp: int + ) -> None: + if not selection.get_data(): + return + + if target_type == 80: + uris = selection.get_uris() + paths: list[Path] = [] + for uri in uris: + path = get_file_path_from_dnd_dropped_uri(uri) + if path is None or not path.is_file(): + log.warning('Could not add file %s', str(path)) + continue + paths.append(path) + + self.add_files(paths) + + def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: + file_paths = self._get_file_paths() + if not file_paths: + self.emit('changed', False) + return + + if self._method == 'httpupload' and self._contact.is_groupchat: + # Enforce HTTPUpload file size limit for group chats + for path in file_paths: + if path.stat().st_size > self._max_file_size: + self.emit('changed', False) + return + + self.emit('changed', True) + + def _on_resource_selection(self, + _selector: ResourceSelector, + state: bool + ) -> None: + + self.emit('changed', state) + + def _on_choose_files_clicked(self, _button: Gtk.Button) -> None: + FileChooserDialog(self.add_files, + select_multiple=True, + transient_for=app.window, + path=app.settings.get('last_send_dir')) + + +class FileRow(Gtk.ListBoxRow): + def __init__(self, + path: Path, + size_warning: bool, + jingle_warning: bool + ) -> None: + + Gtk.ListBoxRow.__init__(self) + self.file_path = path + + self._ui = get_builder('file_transfer_selector.ui') + self.add(self._ui.file_box) + + self._ui.remove_file_button.connect('clicked', self._on_remove_clicked) + + self._ui.file_name_label.set_text(path.name) + + if app.settings.get('use_kib_mib'): + units = GLib.FormatSizeFlags.IEC_UNITS + else: + units = GLib.FormatSizeFlags.DEFAULT + + file_size_string = GLib.format_size_full(path.stat().st_size, units) + self._ui.file_size_label.set_text(file_size_string) + + if size_warning: + self._ui.warning_label.set_text( + _('File too big, will use direct transfer (not encrypted)')) + self._ui.warning_label.show() + + if jingle_warning: + self._ui.warning_label.set_text( + _('Direct transfer (not encrypted)')) + self._ui.warning_label.show() + + self._ui.preview_image_box.set_size_request(PREVIEW_SIZE, -1) + self._set_preview(path) + + def _set_preview(self, path: Path) -> None: + mime_type = guess_mime_type(path) + if mime_type not in PREVIEWABLE_MIME_TYPES: + self._set_icon_for_mime_type(mime_type) + return + + load_file_async(self.file_path, self._on_load_finished, mime_type) + + def _on_load_finished(self, + data: Optional[bytes], + _error: Optional[GLib.Error], + mime_type: Any + ) -> None: + + if data is None: + self._set_icon_for_mime_type(mime_type) + return + + preview_bytes = create_thumbnail(data, PREVIEW_SIZE, mime_type) + if preview_bytes is None: + self._set_icon_for_mime_type(mime_type) + return + + pixbuf = pixbuf_from_data(preview_bytes) + if pixbuf is None: + self._set_icon_for_mime_type(mime_type) + return + + self._ui.preview_image.set_from_pixbuf(pixbuf) + + def _set_icon_for_mime_type(self, mime_type: str) -> None: + icon = get_icon_for_mime_type(mime_type) + self._ui.preview_image.set_from_gicon(icon, Gtk.IconSize.DIALOG) + + def _on_remove_clicked(self, _button: Gtk.Button) -> None: + listbox = cast(Gtk.ListBox, self.get_parent()) + listbox.remove(self) + self.destroy() ===================================== gajim/gtk/file_transfer_send.py deleted ===================================== @@ -1,157 +0,0 @@ -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Travis Shirk <travis AT pobox.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/>. - -from __future__ import annotations - -from typing import Callable -from typing import cast -from typing import Optional - -from pathlib import Path - -from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import Pango - -from nbxmpp.namespaces import Namespace -from nbxmpp.protocol import JID - -from gajim.common import app -from gajim.common.i18n import _ -from gajim.common.modules.contacts import BareContact - -from .filechoosers import FileChooserDialog -from .resource_selector import ResourceSelector -from .builder import get_builder - - -class SendFileDialog(Gtk.ApplicationWindow): - def __init__(self, - contact: BareContact, - send_callback: Callable[..., bool], - transient_for: Gtk.Window, - files: Optional[list[str]] = None - ) -> None: - Gtk.ApplicationWindow.__init__(self) - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(True) - self.set_default_size(500, 350) - self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self.set_transient_for(transient_for) - self.set_title(_('Choose a File to Send…')) - self.set_destroy_with_parent(True) - - self._contact = contact - self._send_callback = send_callback - - self._ui = get_builder('file_transfer_send.ui') - self.add(self._ui.send_stack) - - self._ui.resource_instructions.set_text( - _('%s is online with multiple devices.\n' - 'Choose the device you would like to send the ' - 'file to.') % self._contact.name) - - self._resource_selector = ResourceSelector( - contact, - constraints=[Namespace.JINGLE_FILE_TRANSFER_5]) - self._resource_selector.connect( - 'selection-changed', self._on_resource_selection) - self._ui.resource_box.pack_start( - self._resource_selector, True, False, 0) - - if files is not None: - self.set_files(files) - - self.connect('key-press-event', self._on_key_press) - self._ui.connect_signals(self) - self.show_all() - - def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: - sensitive = bool(len(self._ui.listbox.get_children()) > 0) - self._ui.files_send.set_sensitive(sensitive) - - def _on_resource_selection(self, - _selector: ResourceSelector, - state: bool - ) -> None: - self._ui.resource_send.set_sensitive(state) - - def _on_send_to_resource(self, _button: Gtk.Button) -> None: - resource_jid = self._resource_selector.get_jid() - self._send_files(resource_jid) - - def _on_send_clicked(self, _button: Gtk.Button) -> None: - count = len(self._contact.get_resources()) - if count == 0 or count > 1: - self._ui.send_stack.set_visible_child_name('resource_selection') - return - - resource_jid = self._contact.get_resources()[0].jid - self._send_files(resource_jid) - - def _send_files(self, resource_jid: JID) -> None: - files = cast(list[FileRow], self._ui.listbox.get_children()) - for file in files: - self._send_callback( - resource_jid, str(file.file_path), self._get_description()) - self.destroy() - - def _select_files(self, _button: Gtk.Button) -> None: - FileChooserDialog(self.set_files, - select_multiple=True, - transient_for=self, - path=app.settings.get('last_send_dir')) - - def _remove_files(self, _button: Gtk.Button) -> None: - selected = self._ui.listbox.get_selected_rows() - for item in selected: - self._ui.listbox.remove(item) - - def set_files(self, file_names: list[str]) -> None: - last_dir = '' - for file in file_names: - row = FileRow(file) - if row.file_path.is_dir(): - continue - last_dir = row.file_path.parent - self._ui.listbox.add(row) - self._ui.listbox.show_all() - app.settings.set('last_send_dir', str(last_dir)) - self._ui.files_send.set_sensitive(True) - - def _get_description(self) -> str: - buffer_ = self._ui.description.get_buffer() - start, end = buffer_.get_bounds() - return buffer_.get_text(start, end, False) - - def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - -class FileRow(Gtk.ListBoxRow): - def __init__(self, path: str) -> None: - Gtk.ListBoxRow.__init__(self) - self.file_path: Path = Path(path) - label = Gtk.Label(label=self.file_path.name) - label.set_ellipsize(Pango.EllipsizeMode.END) - label.set_xalign(0) - self.add(label) ===================================== gajim/gtk/filetransfer.py ===================================== @@ -60,7 +60,6 @@ from .dialogs import ConfirmationDialog from .dialogs import ErrorDialog from .filechoosers import FileSaveDialog -from .file_transfer_send import SendFileDialog from .tooltips import FileTransfersTooltip from .builder import get_builder from .util import format_eta @@ -405,16 +404,9 @@ def _on_yes(): text=_('_Download Again'), callback=_on_yes)]).show() - def show_file_send_request(self, - account: str, - contact: types.BareContact - ) -> None: - send_callback = partial(self.send_file, account, contact) - SendFileDialog(contact, send_callback, self.window) - def send_file(self, account: str, - contact: types.BareContact, + contact: types.ResourceContact, resource_jid: JID, file_path: str, file_desc: str = '' ===================================== gajim/gtk/main.py ===================================== @@ -39,6 +39,7 @@ from gajim.common.i18n import _ from gajim.common.helpers import play_sound from gajim.common.modules.bytestream import is_transfer_active +from gajim.common.modules.contacts import GroupchatContact from gajim.plugins.pluginmanager import PluginManifest from gajim.plugins.repository import PluginRepository @@ -984,6 +985,33 @@ def _on_window_active(self, if control.get_autoscroll(): self.mark_as_read(control.contact.account, control.contact.jid) + def get_preferred_ft_method(self, + contact: types.ChatContactT + ) -> Optional[str]: + + ft_pref = app.settings.get_account_setting( + contact.account, + 'filetransfer_preference') + httpupload_enabled = app.window.get_action_enabled( + 'send-file-httpupload') + jingle_enabled = app.window.get_action_enabled('send-file-jingle') + + if isinstance(contact, GroupchatContact): + if httpupload_enabled: + return 'httpupload' + return None + + if httpupload_enabled and jingle_enabled: + return ft_pref + + if httpupload_enabled: + return 'httpupload' + + if jingle_enabled: + return 'jingle' + + return None + def show_add_join_groupchat(self, account: str, jid: str, ===================================== gajim/gtk/menus.py ===================================== @@ -103,7 +103,7 @@ def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: def get_private_chat_menu(contact: types.GroupchatParticipant) -> GajimMenu: menu = GajimMenu() menu.add_item(_('Details'), 'win.show-contact-info') - menu.add_item(_('Upload File…'), 'win.send-file-httpupload') + menu.add_item(_('Upload File…'), 'win.send-file-httpupload([""])') menu.add_item(_('Search…'), 'win.search-history') if can_add_to_roster(contact): @@ -116,8 +116,8 @@ def get_private_chat_menu(contact: types.GroupchatParticipant) -> GajimMenu: def get_send_file_submenu() -> GajimMenu: menu = GajimMenu() - menu.add_item(_('Upload File…'), 'win.send-file-httpupload') - menu.add_item(_('Send File Directly…'), 'win.send-file-jingle') + menu.add_item(_('Upload File…'), 'win.send-file-httpupload([""])') + menu.add_item(_('Send File Directly…'), 'win.send-file-jingle([""])') return menu ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -25,7 +25,6 @@ from gi.repository import GLib from gi.repository import Gdk -from gi.repository import GdkPixbuf from gi.repository import Gio from gi.repository import Gtk from gi.repository import GObject @@ -45,9 +44,7 @@ from gajim.gui.security_label_selector import SecurityLabelSelector from .builder import get_builder -from .dialogs import DialogButton from .dialogs import ErrorDialog -from .dialogs import PastePreviewDialog from .emoji_chooser import emoji_chooser from .menus import get_encryption_menu from .menus import get_format_menu @@ -577,32 +574,16 @@ def _on_paste_clipboard(self, clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) image = clipboard.wait_for_image() if image is None: + log.info('No image pasted') return - PastePreviewDialog( - _('Paste Image'), - _('You are trying to paste an image'), - _('Are you sure you want to paste your ' - "clipboard's image into the chat window?"), - _('_Do not ask me again'), - image, - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Paste'), - callback=self._paste_event_confirmed, - args=[image])]).show() - - def _paste_event_confirmed(self, - image: GdkPixbuf.Pixbuf - ) -> None: - - dir_ = tempfile.gettempdir() - path = os.path.join(dir_, f'{uuid.uuid4()}.png') + temp_dir = tempfile.gettempdir() + image_path = os.path.join(temp_dir, f'{uuid.uuid4()}.png') + + image.savev(image_path, 'png', [], []) if image is None: log.error('Could not process pasted image') return - image.savev(path, 'png', [], []) - - assert self._contact is not None - app.interface.start_file_transfer(self._contact, path) + app.window.activate_action( + 'send-file', GLib.Variant('as', [image_path])) ===================================== gajim/gui_interface.py ===================================== @@ -39,7 +39,6 @@ import sys import time import logging -from functools import partial from threading import Thread from gi.repository import Gtk @@ -50,30 +49,16 @@ from nbxmpp import JID from gajim.common import app -from gajim.common import exceptions from gajim.common import proxy65_manager from gajim.common import socks5 - from gajim.common.events import FileCompleted from gajim.common.events import FileHashError from gajim.common.events import FileProgress from gajim.common.events import FileError -from gajim.common.modules.contacts import BareContact -from gajim.common.modules.contacts import GroupchatContact -from gajim.common.structs import OutgoingMessage -from gajim.common.i18n import _ -from gajim.common.const import FTState from gajim.common.file_props import FileProp -from gajim.common.types import ChatContactT - -from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.gui.dialogs import ErrorDialog -from gajim.gui.filechoosers import FileChooserDialog -from gajim.gui.file_transfer_send import SendFileDialog from gajim.gui.filetransfer import FileTransfersWindow -from gajim.gui.control import ChatControl - log = logging.getLogger('gajim.interface') @@ -202,130 +187,6 @@ def __compare_hashes(account: str, file_props: FileProp) -> None: if session: session.end_session() - def send_httpupload(self, - chat_control: ChatControl, - path: Optional[str] = None - ) -> None: - if path is not None: - self._send_httpupload(chat_control, path) - return - - accept_cb = partial(self._on_file_dialog_ok, chat_control) - FileChooserDialog(accept_cb, - select_multiple=True, - transient_for=app.window) - - def _on_file_dialog_ok(self, - chat_control: ChatControl, - paths: list[str] - ) -> None: - for path in paths: - self._send_httpupload(chat_control, path) - - def _send_httpupload(self, chat_control: ChatControl, path: str) -> None: - client = app.get_client(chat_control.contact.account) - encryption = chat_control.contact.settings.get('encryption') or None - try: - transfer = client.get_module('HTTPUpload').make_transfer( - path, - encryption, - chat_control.contact, - chat_control.is_groupchat) - except exceptions.FileError as error: - ErrorDialog(_('Could not Open File'), str(error)) - return - - transfer.connect('cancel', self._on_cancel_upload) - transfer.connect('state-changed', - self._on_http_upload_state_changed) - chat_control.add_file_transfer(transfer) - client.get_module('HTTPUpload').start_transfer(transfer) - - def _on_http_upload_state_changed(self, - transfer: HTTPFileTransfer, - _signal_name: str, - state: FTState - ) -> None: - # Note: This has to be a bound method in order to connect the signal - if state.is_finished: - uri = transfer.get_transformed_uri() - - type_ = 'chat' - if transfer.is_groupchat: - type_ = 'groupchat' - - message = OutgoingMessage(account=transfer.account, - contact=transfer.contact, - message=uri, - type_=type_, - oob_url=uri) - - client = app.get_client(transfer.account) - client.send_message(message) - - def _on_cancel_upload(self, - transfer: HTTPFileTransfer, - _signal_name: str - ) -> None: - # Note: This has to be a bound method in order to connect the signal - client = app.get_client(transfer.account) - client.get_module('HTTPUpload').cancel_transfer(transfer) - - def _get_pref_ft_method(self, contact: ChatContactT) -> Optional[str]: - ft_pref = app.settings.get_account_setting(contact.account, - 'filetransfer_preference') - httpupload = app.window.get_action_enabled('send-file-httpupload') - jingle = app.window.get_action_enabled('send-file-jingle') - - if isinstance(contact, GroupchatContact): - if httpupload: - return 'httpupload' - return None - - if httpupload and jingle: - return ft_pref - - if httpupload: - return 'httpupload' - - if jingle: - return 'jingle' - return None - - def start_file_transfer(self, - contact: ChatContactT, - path: Optional[str] = None, - method: Optional[str] = None - ) -> None: - - if method is None: - method = self._get_pref_ft_method(contact) - if method is None: - return - - control = app.window.get_control() - if not control.has_active_chat(): - return - - if path is None: - if method == 'httpupload': - self.send_httpupload(control) - return - if method == 'jingle': - self.instances['file_transfers'].show_file_send_request( - contact.account, contact) - return - - if method == 'httpupload': - self.send_httpupload(control, path) - else: - assert isinstance(contact, BareContact) - send_callback = partial( - self.instances['file_transfers'].send_file, - contact.account, - contact) - SendFileDialog(contact, send_callback, app.window, [path]) - def process_connections(self) -> bool: ''' Called each foo (200) milliseconds. Check for idlequeue timeouts View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/01fd1b7209f7608207bb2f18261f24f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/01fd1b7209f7608207bb2f18261f24f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch filetransfer-page
by Daniel Brötzmann (＠wurstsalat) 24 Nov '22

24 Nov '22

Daniel Brötzmann deleted branch filetransfer-page at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][filetransfer-page] refactor: Remove obsolete FileTransferSend dialog
by Daniel Brötzmann (＠wurstsalat) 24 Nov '22

24 Nov '22

Daniel Brötzmann pushed to branch filetransfer-page at gajim / gajim Commits: 53d01bd6 by wurstsalat at 2022-11-24T23:33:00+01:00 refactor: Remove obsolete FileTransferSend dialog - - - - - 4 changed files: - − gajim/data/gui/file_transfer_send.ui - gajim/data/style/gajim.css - − gajim/gtk/file_transfer_send.py - gajim/gtk/filetransfer.py Changes: ===================================== gajim/data/gui/file_transfer_send.ui deleted ===================================== @@ -1,256 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.24"/> - <object class="GtkStack" id="send_stack"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="transition-type">slide-left-right</property> - <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">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Files to send</property> - <property name="xalign">0</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="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkListBox" id="listbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - <property name="selection-mode">multiple</property> - <property name="activate-on-single-click">False</property> - <signal name="add" handler="_on_files_changed" swapped="no"/> - <signal name="remove" handler="_on_files_changed" swapped="no"/> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkToolbar"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="show-arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Add Files</property> - <property name="use-underline">True</property> - <property name="icon-name">list-add-symbolic</property> - <signal name="clicked" handler="_select_files" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Remove Files</property> - <property name="use-underline">True</property> - <property name="icon-name">list-remove-symbolic</property> - <signal name="clicked" handler="_remove_files" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <style> - <class name="inline-toolbar"/> - </style> - </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">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Description</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="height-request">70</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkTextView" id="description"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="wrap-mode">word-char</property> - <property name="left-margin">6</property> - <property name="right-margin">6</property> - <property name="top-margin">6</property> - <property name="bottom-margin">6</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="files_send"> - <property name="label" translatable="yes">_Send Files</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - </object> - <packing> - <property name="name">file_selection</property> - </packing> - </child> - <child> - <object class="GtkBox" id="resource_box"> - <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">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Choose Device</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="GtkButton" id="resource_send"> - <property name="label" translatable="yes">_Send Files</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_to_resource" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="resource_instructions"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="justify">center</property> - <property name="wrap">True</property> - <property name="max-width-chars">50</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="name">resource_selection</property> - <property name="position">1</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -920,9 +920,6 @@ #FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } #FeaturesInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } #FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } -/* SendFileDialog */ -#SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } - /* AccountsWindow */ .accounts-menu { border-right: 1px solid @borders; ===================================== gajim/gtk/file_transfer_send.py deleted ===================================== @@ -1,157 +0,0 @@ -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Travis Shirk <travis AT pobox.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/>. - -from __future__ import annotations - -from typing import Callable -from typing import cast -from typing import Optional - -from pathlib import Path - -from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import Pango - -from nbxmpp.namespaces import Namespace -from nbxmpp.protocol import JID - -from gajim.common import app -from gajim.common.i18n import _ -from gajim.common.modules.contacts import BareContact - -from .filechoosers import FileChooserDialog -from .resource_selector import ResourceSelector -from .builder import get_builder - - -class SendFileDialog(Gtk.ApplicationWindow): - def __init__(self, - contact: BareContact, - send_callback: Callable[..., bool], - transient_for: Gtk.Window, - files: Optional[list[str]] = None - ) -> None: - Gtk.ApplicationWindow.__init__(self) - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(True) - self.set_default_size(500, 350) - self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self.set_transient_for(transient_for) - self.set_title(_('Choose a File to Send…')) - self.set_destroy_with_parent(True) - - self._contact = contact - self._send_callback = send_callback - - self._ui = get_builder('file_transfer_send.ui') - self.add(self._ui.send_stack) - - self._ui.resource_instructions.set_text( - _('%s is online with multiple devices.\n' - 'Choose the device you would like to send the ' - 'file to.') % self._contact.name) - - self._resource_selector = ResourceSelector( - contact, - constraints=[Namespace.JINGLE_FILE_TRANSFER_5]) - self._resource_selector.connect( - 'selection-changed', self._on_resource_selection) - self._ui.resource_box.pack_start( - self._resource_selector, True, False, 0) - - if files is not None: - self.set_files(files) - - self.connect('key-press-event', self._on_key_press) - self._ui.connect_signals(self) - self.show_all() - - def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: - sensitive = bool(len(self._ui.listbox.get_children()) > 0) - self._ui.files_send.set_sensitive(sensitive) - - def _on_resource_selection(self, - _selector: ResourceSelector, - state: bool - ) -> None: - self._ui.resource_send.set_sensitive(state) - - def _on_send_to_resource(self, _button: Gtk.Button) -> None: - resource_jid = self._resource_selector.get_jid() - self._send_files(resource_jid) - - def _on_send_clicked(self, _button: Gtk.Button) -> None: - count = len(self._contact.get_resources()) - if count == 0 or count > 1: - self._ui.send_stack.set_visible_child_name('resource_selection') - return - - resource_jid = self._contact.get_resources()[0].jid - self._send_files(resource_jid) - - def _send_files(self, resource_jid: JID) -> None: - files = cast(list[FileRow], self._ui.listbox.get_children()) - for file in files: - self._send_callback( - resource_jid, str(file.file_path), self._get_description()) - self.destroy() - - def _select_files(self, _button: Gtk.Button) -> None: - FileChooserDialog(self.set_files, - select_multiple=True, - transient_for=self, - path=app.settings.get('last_send_dir')) - - def _remove_files(self, _button: Gtk.Button) -> None: - selected = self._ui.listbox.get_selected_rows() - for item in selected: - self._ui.listbox.remove(item) - - def set_files(self, file_names: list[str]) -> None: - last_dir = '' - for file in file_names: - row = FileRow(file) - if row.file_path.is_dir(): - continue - last_dir = row.file_path.parent - self._ui.listbox.add(row) - self._ui.listbox.show_all() - app.settings.set('last_send_dir', str(last_dir)) - self._ui.files_send.set_sensitive(True) - - def _get_description(self) -> str: - buffer_ = self._ui.description.get_buffer() - start, end = buffer_.get_bounds() - return buffer_.get_text(start, end, False) - - def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - -class FileRow(Gtk.ListBoxRow): - def __init__(self, path: str) -> None: - Gtk.ListBoxRow.__init__(self) - self.file_path: Path = Path(path) - label = Gtk.Label(label=self.file_path.name) - label.set_ellipsize(Pango.EllipsizeMode.END) - label.set_xalign(0) - self.add(label) ===================================== gajim/gtk/filetransfer.py ===================================== @@ -60,7 +60,6 @@ from .dialogs import ConfirmationDialog from .dialogs import ErrorDialog from .filechoosers import FileSaveDialog -from .file_transfer_send import SendFileDialog from .tooltips import FileTransfersTooltip from .builder import get_builder from .util import format_eta @@ -405,13 +404,6 @@ def _on_yes(): text=_('_Download Again'), callback=_on_yes)]).show() - def show_file_send_request(self, - account: str, - contact: types.BareContact - ) -> None: - send_callback = partial(self.send_file, account, contact) - SendFileDialog(contact, send_callback, self.window) - def send_file(self, account: str, contact: types.ResourceContact, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53d01bd6cfb908ae79bc000251aea6e5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53d01bd6cfb908ae79bc000251aea6e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][filetransfer-page] 18 commits: imprv: Preferences: Improve preview settings
by Philipp Hörist (＠lovetox) 24 Nov '22

24 Nov '22

Philipp Hörist pushed to branch filetransfer-page at gajim / gajim Commits: 2d6e4b5a by wurstsalat at 2022-11-08T14:27:57+01:00 imprv: Preferences: Improve preview settings - - - - - 35b754f6 by wurstsalat at 2022-11-08T16:02:10+01:00 cfix: Preferences: Revert preview file size units - - - - - 8e5bb40c by wurstsalat at 2022-11-09T20:32:44+01:00 fix: Preview: Stop further processing if decompression bomb detected Fixes #11280 - - - - - dfa950f3 by Philipp Hörist at 2022-11-11T19:07:12+01:00 perf: Control: Request history more efficiently - Limit how many events are requested - Merge events and messages and add them afterwards - - - - - 40770fa7 by wurstsalat at 2022-11-13T14:17:10+01:00 cq: Update pyright config - - - - - c549fff0 by wurstsalat at 2022-11-15T12:00:59+01:00 imprv: ChatList: Scroll to top when switching workspace - - - - - 096e6d69 by Daniel Brötzmann at 2022-11-15T12:15:17+00:00 chore: DOAP: Add XEP-0402 - - - - - 69553e56 by wurstsalat at 2022-11-16T12:32:53+01:00 fix: ConversationView: Fix scrollbar not being the right-most widget This makes it possible to easily 'find' the scrollbar while having Gajim in fullscreen mode. - - - - - 2cf08d52 by wurstsalat at 2022-11-16T12:44:11+01:00 cfix: SearchView: Add separate class for search view rows - - - - - 7b3971b6 by wurstsalat at 2022-11-16T16:50:52+01:00 fix: Preview: Respect MUC context for PMs Fixes #11289 - - - - - 7ccf4806 by wurstsalat at 2022-11-17T17:38:46+01:00 fix: MessageActionsBox: Reintroduce gui_extension_point This is necessary when activating plugins after launch - - - - - d7121d8e by wurstsalat at 2022-11-18T14:07:32+01:00 fix: GroupchatRoster: Set visibility when hiding Hides the roster completely, so that the chat scrollbar is the right-most widget. Caveat: Un-reveal animation is gone - - - - - 23f90923 by wurstsalat at 2022-11-24T16:57:55+01:00 other: Remove obsolete htmltextview test - - - - - a3d7d6a3 by mjk at 2022-11-24T19:43:00+00:00 imprv: Prettify display of geographical locations - - - - - 42adccad by wurstsalat at 2022-11-24T20:54:40+01:00 refactor: MoreMenuButton: Use Gio.Menu Fixes #11262 - - - - - 01fd1b72 by wurstsalat at 2022-11-24T22:08:22+01:00 fix: Chatstates: Switch to Chatstate.ACTIVE after timeout - - - - - a6037e25 by wurstsalat at 2022-11-24T22:23:04+00:00 change: Add FileTransferSelector as a central page for sending files Fixes #9511 - - - - - d15f59be by wurstsalat at 2022-11-24T22:23:04+00:00 other: Remove obsolete FileTransferSend dialog - - - - - 30 changed files: - data/gajim.doap - gajim/common/events.py - gajim/common/modules/chatstates.py - gajim/common/modules/contacts.py - gajim/common/modules/httpupload.py - gajim/common/preview.py - gajim/common/preview_helpers.py - gajim/common/storage/events.py - gajim/data/gui/chat_control.ui - gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_function_page.py - gajim/gtk/chat_list_row.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - + gajim/gtk/file_transfer_selector.py - − gajim/gtk/file_transfer_send.py - gajim/gtk/filetransfer.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py - gajim/gtk/preferences.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5f0240d9830ff56f7773b11899acfcd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5f0240d9830ff56f7773b11899acfcd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Chatstates: Switch to Chatstate.ACTIVE after timeout
by Daniel Brötzmann (＠wurstsalat) 24 Nov '22

24 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 01fd1b72 by wurstsalat at 2022-11-24T22:08:22+01:00 fix: Chatstates: Switch to Chatstate.ACTIVE after timeout - - - - - 1 changed file: - gajim/common/modules/chatstates.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -192,8 +192,8 @@ def _process_chatstate(self, def _on_remote_composing_timeout(self, contact: types.ContactT): self._log.info( - 'Automatically switching the chat state of %s to PAUSED', contact) - self._remote_chatstate[contact.jid] = State.PAUSED + 'Automatically switching the chat state of %s to ACTIVE', contact) + self._remote_chatstate[contact.jid] = State.ACTIVE contact.notify('chatstate-update') def _remove_remote_composing_timeout(self, contact: types.ContactT): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/01fd1b7209f7608207bb2f18261f24f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/01fd1b7209f7608207bb2f18261f24f6… 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