diff options
| -rwxr-xr-x | libsisyphus.sh | 15 | ||||
| -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, 22 deletions
diff --git a/libsisyphus.sh b/libsisyphus.sh index 6b45512..5fc6386 100755 --- a/libsisyphus.sh +++ b/libsisyphus.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash -# export xterm flags -export local showprogress="xterm -maximized -e" -export local showresults="xterm -maximized -hold -e" +# export dialog flags +export local showdialog="yad --title "sisyphus" --text-info --width 800 --height 600 --center --no-buttons --on-top --sticky --fixed --skip-taskbar --listen --tail &" # import user interfaces source /usr/lib64/sisyphus/accesoriesui.sh @@ -32,23 +31,23 @@ 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/search.svg</input> - <action>$showresults epkg search $pkgname</action> + <action>epkg search $pkgname|$showdialog</action> </button> <button space-expand="true" space-extend="true" tooltip-text="Install package(s)"> <input file>/usr/share/sisyphus/install.svg</input> - <action>$showprogress epkg autoinstall $pkgname</action> + <action>epkg autoinstall $pkgname|$showdialog</action> </button> <button space-expand="true" space-extend="true" tooltip-text="Uninstall package(s)"> <input file>/usr/share/sisyphus/remove.svg</input> - <action>$showprogress epkg autoremove $pkgname</action> + <action>epkg autoremove $pkgname|$showdialog</action> </button> <button space-expand="true" space-extend="true" tooltip-text="Upgrade system"> <input file>/usr/share/sisyphus/upgrade.svg</input> - <action>$showprogress epkg autoupgrade</action> + <action>epkg autoupgrade|$showdialog</action> </button> <button space-expand="true" space-extend="true" tooltip-text="Remove orphan packages(s) aka no longer needed"> <input file>/usr/share/sisyphus/purge.svg</input> - <action>$showprogress epkg autoclean</action> + <action>epkg autoclean|$showdialog</action> </button> </hbox> <hseparator space-expand="true" space-extend="true"></hseparator> diff --git a/ui/accesoriesui.sh b/ui/accesoriesui.sh index 0139efb..5d34689 100755 --- a/ui/accesoriesui.sh +++ b/ui/accesoriesui.sh @@ -15,11 +15,11 @@ 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>$showprogress epkg autoinstall $accesories</action> + <action>epkg autoinstall $accesories|$showdialog</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>$showprogress epkg autoremove $accesories</action> + <action>epkg autoremove $accesories|$showdialog</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 1795ead..f1f3af0 100755 --- a/ui/gamesui.sh +++ b/ui/gamesui.sh @@ -27,11 +27,11 @@ 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>$showprogress epkg autoinstall $game</action> + <action>epkg autoinstall $game|$showdialog</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>$showprogress epkg autoremove $game</action> + <action>epkg autoremove $game|$showdialog</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 5c3f243..e9a4efa 100755 --- a/ui/graphicsui.sh +++ b/ui/graphicsui.sh @@ -15,11 +15,11 @@ 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>$showprogress epkg autoinstall $graphics</action> + <action>epkg autoinstall $graphics|$showdialog</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>$showprogress epkg autoremove $graphics</action> + <action>epkg autoremove $graphics|$showdialog</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 ec409d9..69cd7c4 100755 --- a/ui/internetui.sh +++ b/ui/internetui.sh @@ -19,11 +19,11 @@ 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>$showprogress epkg autoinstall $internet</action> + <action>epkg autoinstall $internet|$showdialog</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>$showprogress epkg autoremove $internet</action> + <action>epkg autoremove $internet|$showdialog</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 a1bc4c5..dc59493 100755 --- a/ui/multimediaui.sh +++ b/ui/multimediaui.sh @@ -15,11 +15,11 @@ 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>$showprogress epkg autoinstall $multimedia</action> + <action>epkg autoinstall $multimedia|$showdialog</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>$showprogress epkg autoremove $multimedia</action> + <action>epkg autoremove $multimedia|$showdialog</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 7e8703d..03ee543 100755 --- a/ui/officeui.sh +++ b/ui/officeui.sh @@ -20,11 +20,11 @@ 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>$showprogress epkg autoinstall $office</action> + <action>epkg autoinstall $office|$showdialog</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>$showprogress epkg autoremove $office</action> + <action>epkg autoremove $office|$showdialog</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 9a3e95e..9191eba 100755 --- a/ui/systemui.sh +++ b/ui/systemui.sh @@ -15,11 +15,11 @@ 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>$showprogress epkg autoinstall $system</action> + <action>epkg autoinstall $system|$showdialog</action> </button> <button space-expand="true" space-extend="true" label-text="uninstall"> <label>Uninstall package</label> - <action>$showprogress epkg autoremove $system</action> + <action>epkg autoremove $system|$showdialog</action> </button> <button space-expand="true" space-extend="true" label-text="home"> <label>Back home</label> |