Merge pull request #521 from JaKooLit/main

main to development

1 files changed, 9 insertions, 9 deletions

diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index b33a31c7..0c6e8612 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -15,15 +15,15 @@ active_window_path="${dir}/${active_window_file}"
 
 notify_cmd_base="notify-send -t 10000 -A action1=Open -A action2=Delete -h string:x-canonical-private-synchronous:shot-notify"
 #notify_swappy="notify-send -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png"
-notify_cmd_shot="${notify_cmd_base} -i ${dir}/${file}"
-notify_cmd_shot_win="${notify_cmd_base} -i ${active_window_path}"
+notify_cmd_shot="${notify_cmd_base} -i ${iDIR}/picture.png"
+notify_cmd_shot_win="${notify_cmd_base} -i ${iDIR}/picture.png"
 
 # notify and view screenshot
 notify_view() {
     if [[ "$1" == "active" ]]; then
         if [[ -e "${active_window_path}" ]]; then
-			"${sDIR}/Sounds.sh" --screenshot
-            resp=$(timeout 5 ${notify_cmd_shot_win} "Screenshot of '${active_window_class}' Saved.")
+			"${sDIR}/Sounds.sh" --screenshot        
+            resp=$(timeout 5 ${notify_cmd_shot_win} "$(printf "\n Screenshot of ${active_window_class}\n Saved.")")
             case "$resp" in
 				action1)
 					xdg-open "${active_window_path}" &
@@ -33,13 +33,13 @@ notify_view() {
 					;;
 			esac
         else
-            ${notify_cmd_shot} "Screenshot of '${active_window_class}' not Saved"
+            ${notify_cmd_shot} "$(printf "\n Screenshot of ${active_window_class}\n NOT Saved.")"
             "${sDIR}/Sounds.sh" --error
         fi
 
     elif [[ "$1" == "swappy" ]]; then
 		"${sDIR}/Sounds.sh" --screenshot
-		resp=$(${notify_cmd_shot} "Screenshot Captured (swappy)")
+		resp=$(${notify_cmd_shot} "$(printf "\n Screenshot Captured\n by Swappy")")
 		case "$resp" in
 			action1)
 				swappy -f - <"$tmpfile"
@@ -53,7 +53,7 @@ notify_view() {
         local check_file="${dir}/${file}"
         if [[ -e "$check_file" ]]; then
             "${sDIR}/Sounds.sh" --screenshot
-            resp=$(timeout 5 ${notify_cmd_shot} "Screenshot Saved.")
+            resp=$(timeout 5 ${notify_cmd_shot} "$(printf "\n Screenshot Saved")")
 			case "$resp" in
 				action1)
 					xdg-open "${check_file}" &
@@ -63,7 +63,7 @@ notify_view() {
 					;;
 			esac
         else
-            ${notify_cmd_shot} "Screenshot NOT Saved."
+            ${notify_cmd_shot} "$(printf "\n Screenshot NOT Saved")"
             "${sDIR}/Sounds.sh" --error
         fi
     fi
@@ -74,7 +74,7 @@ notify_view() {
 # countdown
 countdown() {
 	for sec in $(seq $1 -1 1); do
-		notify-send -h string:x-canonical-private-synchronous:shot-notify -t 1000 -i "$iDIR"/timer.png "Taking shot in : $sec"
+		notify-send -h string:x-canonical-private-synchronous:shot-notify -t 1000 -i "$iDIR"/timer.png  "$(printf "\n Taking shot in: $sec") secs"
 		sleep 1
 	done
 }