From df928ba7cb02b01a0a991349c0e57c2f2be7eb12 Mon Sep 17 00:00:00 2001 From: herypt <70331266+herypt@users.noreply.github.com> Date: Sun, 16 May 2021 17:39:01 +0200 Subject: [PATCH] Add progress bar to Thunar actions --- qubes-rpc/thunar/qvm-actions.sh | 6 ++---- rpm_spec/core-agent.spec.in | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qubes-rpc/thunar/qvm-actions.sh b/qubes-rpc/thunar/qvm-actions.sh index 3e4a968..1c518f5 100755 --- a/qubes-rpc/thunar/qvm-actions.sh +++ b/qubes-rpc/thunar/qvm-actions.sh @@ -13,12 +13,10 @@ shift # copy and move handle a list of files where other actions don't case "$action" in copy) - #shellcheck disable=SC2016 - qvm-copy-to-vm '$default' "$@" | zenity --notification --text="Copying files..." --timeout 3 + /usr/lib/qubes/qvm-copy-to-vm.gnome "$@" ;; move) - #shellcheck disable=SC2016 - qvm-move-to-vm '$default' "$@" | zenity --notification --text="Moving files..." --timeout 3 + /usr/lib/qubes/qvm-move-to-vm.gnome "$@" ;; img) for file in "$@" diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 9ed6baf..45acb89 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -707,7 +707,9 @@ rm -f %{name}-%{version} /usr/lib/qubes/qopen-in-vm /usr/lib/qubes/qrun-in-vm /usr/lib/qubes/qubes-trigger-sync-appmenus.sh +/usr/lib/qubes/qvm-copy-to-vm.gnome /usr/lib/qubes/qvm-copy-to-vm.kde +/usr/lib/qubes/qvm-move-to-vm.gnome /usr/lib/qubes/qvm-move-to-vm.kde /usr/lib/qubes/tar2qfile /usr/lib/qubes/vm-file-editor @@ -774,8 +776,6 @@ rm -f %{name}-%{version} %endif %files nautilus -/usr/lib/qubes/qvm-copy-to-vm.gnome -/usr/lib/qubes/qvm-move-to-vm.gnome /usr/share/nautilus-python/extensions/qvm_copy_nautilus.py* /usr/share/nautilus-python/extensions/qvm_move_nautilus.py* /usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*