Reduce dependence on D-Bus (#2003)
* Handle captures without sigslots Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Set {app,organization}Name and version consistently Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make 'full' dbus-free Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Move CaptureRequest::exportCapture to Controller We need to wait until the upload widget (or similar widgets) have finished before exiting. This must be done using a signal. The problem is that CaptureRequest can't be guaranteed to survive until the widget has finished what it's doing. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Use QApplication with the 'full' subcommand Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Do unto 'screen' as we did to 'full' Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add FlameshotDaemon singleton class Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Support clipboard hosting for both pixmaps and text * Fix upload handling Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Do not show tray icon if not daemon Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Clean up handling of pin task Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove annoying Qt warning messages The messages were caused by the color wheel. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix small bug in Controller::exportCapture * Fix --raw output * Make 'gui' dbus-independent Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix accept on select bug Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix compile error on Windows Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make it work on Windows * Remove obsolete function in main.cpp Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make 'launcher' work without dbus Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * clang-format, sigh Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Enable CLI parsing on MacOS Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make 'config' work without dbus Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Small refactor of capture request handling Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove obsolete DBusUtils Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove unused D-Bus sigslots Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove D-Bus methods openConfig, autostartEnabled and trayIconEnabled Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove D-Bus method requestCapture Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove CaptureRequest id mechanism Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix 'launcher' crash Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Handle clipboard notifications properly Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add 'autoCloseIdleDaemon' option Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Document FlameshotDaemon class Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make 'flameshot gui' run in single-application mode Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add `allowmultipleGuiInstances` config option Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix endless loop with multiple GUI instances Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Move upload confirmation dialog where it belongs Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add the new config options to the GUI as well Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix failing build on Windows Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Handle persistence on MacOS Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * fixed notifications on macos * Fixed display on macos * Reformat tests/action_options.sh Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix infinite recursion in tests/action_options.sh Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> Co-authored-by: Dearsh Oberoi <59907159+deo002@users.noreply.github.com> Co-authored-by: Jeremy Borgman <borgman.jeremy@pm.me>
This commit is contained in:
@@ -41,6 +41,32 @@ cmd() {
|
||||
sleep 1
|
||||
}
|
||||
|
||||
notify() {
|
||||
if [ "$FLAMESHOT_PLATFORM" = "MAC" ]
|
||||
then
|
||||
osascript - "$1" <<EOF
|
||||
on run argv
|
||||
display notification (item 1 of argv) with title "Flameshot"
|
||||
end run
|
||||
EOF
|
||||
|
||||
else
|
||||
notify-send "GUI Test 1: --path" "Make a selection, then accept"
|
||||
fi
|
||||
}
|
||||
|
||||
display_img() {
|
||||
if [ "$FLAMESHOT_PLATFORM" = "MAC" ]
|
||||
then
|
||||
open -a Preview.app -f
|
||||
else
|
||||
display
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
wait_for_key() {
|
||||
echo "Press Enter to continue..." >&2 && read ____
|
||||
}
|
||||
@@ -54,7 +80,7 @@ for subcommand in full screen
|
||||
do
|
||||
cmd flameshot "$subcommand" --path /tmp/
|
||||
cmd flameshot "$subcommand" --clipboard
|
||||
cmd command "$FLAMESHOT" "$subcommand" --raw | display
|
||||
cmd command "$FLAMESHOT" "$subcommand" --raw | display_img
|
||||
[ "$subcommand" = "full" ] && sleep 1
|
||||
echo
|
||||
done
|
||||
@@ -70,30 +96,30 @@ sleep 1
|
||||
# ┗━━━━━━━━━━━━━━━┛
|
||||
|
||||
wait_for_key
|
||||
notify-send "GUI Test 1: --path" "Make a selection, then accept"
|
||||
notify "GUI Test 1: --path" #"Make a selection, then accept"
|
||||
cmd flameshot gui --path /tmp/
|
||||
wait_for_key
|
||||
notify-send "GUI Test 2: Clipboard" "Make a selection, then accept"
|
||||
notify "GUI Test 2: Clipboard" "Make a selection, then accept"
|
||||
cmd flameshot gui --clipboard
|
||||
wait_for_key
|
||||
notify-send "GUI Test 3: Print geometry" "Make a selection, then accept"
|
||||
notify "GUI Test 3: Print geometry" "Make a selection, then accept"
|
||||
cmd command "$FLAMESHOT" gui --print-geometry
|
||||
wait_for_key
|
||||
notify-send "GUI Test 4: Pin" "Make a selection, then accept"
|
||||
notify "GUI Test 4: Pin" "Make a selection, then accept"
|
||||
cmd flameshot gui --pin
|
||||
wait_for_key
|
||||
notify-send "GUI Test 5: Print raw" "Make a selection, then accept"
|
||||
cmd command "$FLAMESHOT" gui --raw | display
|
||||
notify "GUI Test 5: Print raw" "Make a selection, then accept"
|
||||
cmd command "$FLAMESHOT" gui --raw | display_img
|
||||
wait_for_key
|
||||
notify-send "GUI Test 6: Copy on select" "Make a selection, flameshot will close automatically"
|
||||
notify "GUI Test 6: Copy on select" "Make a selection, flameshot will close automatically"
|
||||
cmd flameshot gui --clipboard --accept-on-select
|
||||
wait_for_key
|
||||
notify-send "GUI Test 7: File dialog on select" "After selecting, a file dialog will open"
|
||||
notify "GUI Test 7: File dialog on select" "After selecting, a file dialog will open"
|
||||
cmd flameshot gui --accept-on-select
|
||||
|
||||
# All options except for --print-geometry (incompatible with --raw)
|
||||
wait_for_key
|
||||
notify-send "GUI Test 8: All actions except print-geometry" "Just make a selection"
|
||||
cmd command "$FLAMESHOT" gui -p /tmp/ -c -r --pin | display
|
||||
notify "GUI Test 8: All actions except print-geometry" "Just make a selection"
|
||||
cmd command "$FLAMESHOT" gui -p /tmp/ -c -r --pin | display_img
|
||||
|
||||
echo '>> All tests done.'
|
||||
|
||||
Reference in New Issue
Block a user