gui script better preload, better xlunch icons, yad website link

pull/559/head
Botspot 5 years ago
parent 4846cf41cb
commit fbe5f49ef2

22
gui

@ -124,6 +124,9 @@ install() {
' "$title" ' "$title"
sleep 1 sleep 1
while ps -C manage &>/dev/null;do sleep 0.1; done while ps -C manage &>/dev/null;do sleep 0.1; done
#re-preload all categories in background
"${DIRECTORY}/etc/preload-daemon" "$format" &>/dev/null &
} }
uninstall() { uninstall() {
@ -148,6 +151,9 @@ uninstall() {
' "$title" ' "$title"
sleep 1 sleep 1
while ps -C manage &>/dev/null;do sleep 0.1; done while ps -C manage &>/dev/null;do sleep 0.1; done
#re-preload all categories in background
"${DIRECTORY}/etc/preload-daemon" "$format" &>/dev/null &
} }
motd="$(echo -e "$(wget -qO- https://raw.githubusercontent.com/Botspot/pi-apps-announcements/main/message | shuf -n 1)")" motd="$(echo -e "$(wget -qO- https://raw.githubusercontent.com/Botspot/pi-apps-announcements/main/message | shuf -n 1)")"
@ -285,7 +291,8 @@ $LIST"
-p "$searchbox" -a -c 2 --title "Pi-Apps: Raspberry Pi app store" \ -p "$searchbox" -a -c 2 --title "Pi-Apps: Raspberry Pi app store" \
--icon "${DIRECTORY}/icons/logo.png" --scrollbarcolor ffffff40 --scrollindicatorcolor 0000ff80\ --icon "${DIRECTORY}/icons/logo.png" --scrollbarcolor ffffff40 --scrollindicatorcolor 0000ff80\
--width $width --height $height --xposition $xposition --yposition $yposition \ --width $width --height $height --xposition $xposition --yposition $yposition \
--button "${DIRECTORY}/icons/logo-128.png;;$((($width/2)-(128/2))),0;pi-apps-homepage1" --button "${DIRECTORY}/icons/logo-128-trans.png;;$((($width/2)-(128/2))),0;pi-apps-homepage1" \
--button "${DIRECTORY}/icons/logo-trans.png;;$([ -z "$prefix" ] && echo '45' || echo '65'),$([ -z "$prefix" ] && echo '10' || echo '0');pi-apps-homepage1"
#-g ~/blur.png #-g ~/blur.png
)" )"
button=0 button=0
@ -345,12 +352,13 @@ This app installed these packages: $(cat "${DIRECTORY}/data/installed-packages/$
description="$(cat "${DIRECTORY}/apps/${output}/description" || echo 'Description unavailable')" description="$(cat "${DIRECTORY}/apps/${output}/description" || echo 'Description unavailable')"
text="$(echo "$(cat "${DIRECTORY}/apps/${output}/description" || echo "Description unavailable")" | head -n1) text="$(cat "${DIRECTORY}/apps/${output}/description" || echo "Description unavailable")
Current status: $(cat "${DIRECTORY}/data/status/${output}" || echo 'Uninstalled')
Website: $(cat "${DIRECTORY}/apps/${output}/website" || echo 'unavailable')
$(echo "$description" | grep -v "$(echo "$description" | head -n1)")
$installedpackages" $installedpackages"
abovetext="<b>$output</b>
Current status: $(cat "${DIRECTORY}/data/status/${output}" || echo 'Uninstalled')
Website: <a href="\""$(cat "${DIRECTORY}/apps/${output}/website" || echo 'unavailable')"\"">$(cat "${DIRECTORY}/apps/${output}/website" || echo 'unavailable')</a>"
#if already installed then no need to provide install button. And vice versa. #if already installed then no need to provide install button. And vice versa.
whichbutton="$( whichbutton="$(
if [ "$(cat "${DIRECTORY}/data/settings/Show Edit button")" == 'Yes' ];then if [ "$(cat "${DIRECTORY}/data/settings/Show Edit button")" == 'Yes' ];then
@ -372,7 +380,7 @@ $installedpackages"
fi fi
)" )"
echo "$text" | yad --text-info --fontname=12 --wrap --show-uri \ echo "$text" | yad --text-info --fontname=12 --wrap --show-uri --text="$abovetext" \
--image="${DIRECTORY}/apps/${output}/icon-64.png" --image-on-top \ --image="${DIRECTORY}/apps/${output}/icon-64.png" --image-on-top \
--title="Details of ${output}" --window-icon="${DIRECTORY}/icons/logo.png" --center --width=700 --height=300 \ --title="Details of ${output}" --window-icon="${DIRECTORY}/icons/logo.png" --center --width=700 --height=300 \
--button=Back!"${DIRECTORY}/icons/back.png":0 \ --button=Back!"${DIRECTORY}/icons/back.png":0 \
@ -451,7 +459,7 @@ $installedpackages"
fi fi
;; ;;
2) 2)
#uninstal #uninstall
if ! echo "$output" | grep -q '/' ;then if ! echo "$output" | grep -q '/' ;then
uninstall "$output" uninstall "$output"
#clear output var to prompt main window to open next #clear output var to prompt main window to open next

Loading…
Cancel
Save