diff options
| -rwxr-xr-x | libsisyphus.sh | 18 | ||||
| -rwxr-xr-x | ui/accesoriesui.sh | 6 | ||||
| -rwxr-xr-x | ui/gamesui.sh | 6 | ||||
| -rwxr-xr-x | ui/graphicsui.sh | 6 | ||||
| -rwxr-xr-x | ui/internetui.sh | 6 | ||||
| -rwxr-xr-x | ui/multimediaui.sh | 6 | ||||
| -rwxr-xr-x | ui/officeui.sh | 6 | ||||
| -rwxr-xr-x | ui/systemui.sh | 6 |
8 files changed, 40 insertions, 20 deletions
diff --git a/libsisyphus.sh b/libsisyphus.sh index 689d12f..b3d7e9b 100755 --- a/libsisyphus.sh +++ b/libsisyphus.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash -# export dialog flags +# 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 abortnow="killall -9 emerge" # import user interfaces source /usr/lib64/sisyphus/accesoriesui.sh @@ -31,23 +32,28 @@ 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>epkg search $pkgname|$showdialog</action> + <action signal="button-press-event">epkg search $pkgname|$showdialog</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>epkg autoinstall $pkgname|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $pkgname|$showdialog</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>epkg autoremove $pkgname|$showdialog</action> + <action signal="button-press-event">epkg autoremove $pkgname|$showdialog</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>epkg autoupgrade|$showdialog</action> + <action signal="button-press-event">epkg autoupgrade|$showdialog</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>epkg autoclean|$showdialog</action> + <action signal="button-press-event">epkg autoclean|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> </hbox> <hseparator space-expand="true" space-extend="true"></hseparator> diff --git a/ui/accesoriesui.sh b/ui/accesoriesui.sh index 5d34689..84d39c0 100755 --- a/ui/accesoriesui.sh +++ b/ui/accesoriesui.sh @@ -15,11 +15,13 @@ 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>epkg autoinstall $accesories|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $accesories|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>epkg autoremove $accesories|$showdialog</action> + <action signal="button-press-event">epkg autoremove $accesories|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> <label>Back home</label> diff --git a/ui/gamesui.sh b/ui/gamesui.sh index f1f3af0..f1a8fa0 100755 --- a/ui/gamesui.sh +++ b/ui/gamesui.sh @@ -27,11 +27,13 @@ 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>epkg autoinstall $game|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $game|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>epkg autoremove $game|$showdialog</action> + <action signal="button-press-event">epkg autoremove $game|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> <label>Back home</label> diff --git a/ui/graphicsui.sh b/ui/graphicsui.sh index 8730af9..df91404 100755 --- a/ui/graphicsui.sh +++ b/ui/graphicsui.sh @@ -33,11 +33,13 @@ 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>epkg autoinstall $graphics|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $graphics|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>epkg autoremove $graphics|$showdialog</action> + <action signal="button-press-event">epkg autoremove $graphics|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> <label>Back home</label> diff --git a/ui/internetui.sh b/ui/internetui.sh index cdc954e..b28f426 100755 --- a/ui/internetui.sh +++ b/ui/internetui.sh @@ -61,11 +61,13 @@ 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>epkg autoinstall $internet|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $internet|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>epkg autoremove $internet|$showdialog</action> + <action signal="button-press-event">epkg autoremove $internet|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> <label>Back home</label> diff --git a/ui/multimediaui.sh b/ui/multimediaui.sh index eddcd82..1ef72d3 100755 --- a/ui/multimediaui.sh +++ b/ui/multimediaui.sh @@ -44,11 +44,13 @@ 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>epkg autoinstall $multimedia|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $multimedia|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>epkg autoremove $multimedia|$showdialog</action> + <action signal="button-press-event">epkg autoremove $multimedia|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> <label>Back home</label> diff --git a/ui/officeui.sh b/ui/officeui.sh index 03ee543..86066a5 100755 --- a/ui/officeui.sh +++ b/ui/officeui.sh @@ -20,11 +20,13 @@ 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>epkg autoinstall $office|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $office|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>epkg autoremove $office|$showdialog</action> + <action signal="button-press-event">epkg autoremove $office|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> <label>Back home</label> diff --git a/ui/systemui.sh b/ui/systemui.sh index 9191eba..bdcd0e2 100755 --- a/ui/systemui.sh +++ b/ui/systemui.sh @@ -15,11 +15,13 @@ 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>epkg autoinstall $system|$showdialog</action> + <action signal="button-press-event">epkg autoinstall $system|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>epkg autoremove $system|$showdialog</action> + <action signal="button-press-event">epkg autoremove $system|$showdialog</action> + <action signal="button-release-event">$abortnow</action> </button> <button space-expand="true" space-extend="true" label-text="home"> <label>Back home</label> |