diff options
| -rwxr-xr-x | libsisyphus.sh | 13 | ||||
| -rwxr-xr-x | ui/accesoriesui.sh | 4 | ||||
| -rwxr-xr-x | ui/gamesui.sh | 4 | ||||
| -rwxr-xr-x | ui/graphicsui.sh | 4 | ||||
| -rwxr-xr-x | ui/internetui.sh | 4 | ||||
| -rwxr-xr-x | ui/multimediaui.sh | 4 | ||||
| -rwxr-xr-x | ui/officeui.sh | 4 | ||||
| -rwxr-xr-x | ui/systemui.sh | 4 |
8 files changed, 21 insertions, 20 deletions
diff --git a/libsisyphus.sh b/libsisyphus.sh index b3d7e9b..a3801fd 100755 --- a/libsisyphus.sh +++ b/libsisyphus.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash # export dialog && abort flags -export local showdialog="yad --title "sisyphus" --text-info --width 800 --height 600 --center --no-buttons --on-top --sticky --fixed --skip-taskbar --listen --tail" +export local sisyphusprogress="yad --title "sisyphus" --progress --pulsate --width 400 --center --no-buttons --on-top --sticky --fixed --undecorated --skip-taskbar --auto-close &" +export local sisyphustextinfo="yad --title "sisyphus" --text-info --width 800 --height 600 --center --no-buttons --on-top --sticky --fixed --skip-taskbar --listen --tail" export local abortnow="killall -9 emerge" # import user interfaces @@ -32,27 +33,27 @@ export local mainui=' <hbox space-expand="false" space-extend="false"> <button space-expand="true" space-extend="true" tooltip-text="Search package(s)"> <input file>/usr/share/sisyphus/appsearch.svg</input> - <action signal="button-press-event">epkg search $pkgname|$showdialog</action> + <action signal="button-press-event">epkg search $pkgname|$sisyphustextinfo</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" tooltip-text="Install package(s)"> <input file>/usr/share/sisyphus/appinstall.svg</input> - <action signal="button-press-event">epkg autoinstall $pkgname|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $pkgname|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" tooltip-text="Uninstall package(s)"> <input file>/usr/share/sisyphus/appremove.svg</input> - <action signal="button-press-event">epkg autoremove $pkgname|$showdialog</action> + <action signal="button-press-event">epkg autoremove $pkgname|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" tooltip-text="Upgrade system"> <input file>/usr/share/sisyphus/appupgrade.svg</input> - <action signal="button-press-event">epkg autoupgrade|$showdialog</action> + <action signal="button-press-event">epkg autoupgrade|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" tooltip-text="Remove orphan packages(s) aka no longer needed"> <input file>/usr/share/sisyphus/appcleanup.svg</input> - <action signal="button-press-event">epkg autoclean|$showdialog</action> + <action signal="button-press-event">epkg autoclean|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> </hbox> diff --git a/ui/accesoriesui.sh b/ui/accesoriesui.sh index 84d39c0..e105415 100755 --- a/ui/accesoriesui.sh +++ b/ui/accesoriesui.sh @@ -15,12 +15,12 @@ export local accesoriesui=' <hbox space-expand="false" space-extend="false"> <button space-expand="true" space-extend="true" label-text="install"> <label>Install package</label> - <action signal="button-press-event">epkg autoinstall $accesories|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $accesories|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action signal="button-press-event">epkg autoremove $accesories|$showdialog</action> + <action signal="button-press-event">epkg autoremove $accesories|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> diff --git a/ui/gamesui.sh b/ui/gamesui.sh index f1a8fa0..f4a5f77 100755 --- a/ui/gamesui.sh +++ b/ui/gamesui.sh @@ -27,12 +27,12 @@ export local gamesui=' <hbox space-expand="false" space-extend="false"> <button space-expand="true" space-extend="true" label-text="install"> <label>Install package</label> - <action signal="button-press-event">epkg autoinstall $game|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $game|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action signal="button-press-event">epkg autoremove $game|$showdialog</action> + <action signal="button-press-event">epkg autoremove $game|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> diff --git a/ui/graphicsui.sh b/ui/graphicsui.sh index df91404..e595268 100755 --- a/ui/graphicsui.sh +++ b/ui/graphicsui.sh @@ -33,12 +33,12 @@ export local graphicsui=' <hbox space-expand="false" space-extend="false"> <button space-expand="true" space-extend="true" label-text="install"> <label>Install package</label> - <action signal="button-press-event">epkg autoinstall $graphics|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $graphics|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action signal="button-press-event">epkg autoremove $graphics|$showdialog</action> + <action signal="button-press-event">epkg autoremove $graphics|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> diff --git a/ui/internetui.sh b/ui/internetui.sh index b28f426..4c2907b 100755 --- a/ui/internetui.sh +++ b/ui/internetui.sh @@ -61,12 +61,12 @@ export local internetui=' <hbox space-expand="false" space-extend="false"> <button space-expand="true" space-extend="true" label-text="install"> <label>Install package</label> - <action signal="button-press-event">epkg autoinstall $internet|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $internet|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action signal="button-press-event">epkg autoremove $internet|$showdialog</action> + <action signal="button-press-event">epkg autoremove $internet|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> diff --git a/ui/multimediaui.sh b/ui/multimediaui.sh index 1ef72d3..b2ff5ce 100755 --- a/ui/multimediaui.sh +++ b/ui/multimediaui.sh @@ -44,12 +44,12 @@ export local multimediaui=' <hbox space-expand="false" space-extend="false"> <button space-expand="true" space-extend="true" label-text="install"> <label>Install package</label> - <action signal="button-press-event">epkg autoinstall $multimedia|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $multimedia|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action signal="button-press-event">epkg autoremove $multimedia|$showdialog</action> + <action signal="button-press-event">epkg autoremove $multimedia|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> diff --git a/ui/officeui.sh b/ui/officeui.sh index 86066a5..e9fb62c 100755 --- a/ui/officeui.sh +++ b/ui/officeui.sh @@ -20,12 +20,12 @@ export local officeui=' <hbox space-expand="false" space-extend="false"> <button space-expand="true" space-extend="true" label-text="install"> <label>Install package</label> - <action signal="button-press-event">epkg autoinstall $office|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $office|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action signal="button-press-event">epkg autoremove $office|$showdialog</action> + <action signal="button-press-event">epkg autoremove $office|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> diff --git a/ui/systemui.sh b/ui/systemui.sh index bdcd0e2..dd88019 100755 --- a/ui/systemui.sh +++ b/ui/systemui.sh @@ -15,12 +15,12 @@ export local systemui=' <hbox space-expand="false" space-extend="false"> <button space-expand="true" space-extend="true" label-text="install"> <label>Install package</label> - <action signal="button-press-event">epkg autoinstall $system|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $system|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action signal="button-press-event">epkg autoremove $system|$showdialog</action> + <action signal="button-press-event">epkg autoremove $system|$sisyphusprogress</action> <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> |