[eos-log-tool] set icons in order

endeavouros-team · Jul 31, 2023 · 2abdc4c · 2abdc4c
1 parent e09a88e
commit 2abdc4c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/eos-log-tool/PKGBUILD b/eos-log-tool/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=eos-log-tool
 pkgdesc="Gathers selected system logs and sends them to the internet."
 url="https://github.com/endeavouros-team/PKGBUILDS/raw/master/$pkgname"
 pkgver=23
-pkgrel=1
+pkgrel=2
 
 arch=('any')
 license=('GPL')
@@ -27,7 +27,7 @@ source=(
     $pkgname.desktop
     $pkgname.conf
 )
-sha512sums=('c5bcde944e3fb430e054dc12005aa3766307d36b70ad9c8eadaab168294a3c613ccf9c715ca5e21fc361ae7ced74132ec63dde39bde1dab9c1ef4cd3ad120024'
+sha512sums=('80429dc44cc0e5abddc9c7777f20b394bb8c831736e3dd684cffa5083f2055011255bbc58b0719b55814d30e906ea5c0e1fafd1c76c721c736526df8cf7a4975'
             '177f28300b7721ae165afc651279d619dd2924496e2f727ea2c63c131070a0d727de71619a0cf8d359486f0f91f319e58946a066c8411500976f60ff30e7d3c3'
             '781f2d48101d0a0a23da049ccbaa70d3da30dda7e2e31458bcb671ceb25721dec86c7f32d87245554e5a3043cdf35fd9664761efe0a8cc82aeb982055488d229')
 

diff --git a/eos-log-tool/eos-log-tool b/eos-log-tool/eos-log-tool
@@ -17,6 +17,7 @@ Breakpoint() {
 source /usr/share/endeavouros/scripts/eos-script-lib-yad || exit 1
 
 export -f eos_yad
+AssignIconVariables_in_eos_bash_shared
 
 DIE() {
     echo "$progname: error: $1" >&2
@@ -42,16 +43,23 @@ MsgOld() {
 Msg() {
     local -r msg="$1"
     local -r title="$2"
-    shift 2
+    local icon="$3"
+
+    if [ -n "$icon" ] ; then
+        shift 3
+    else
+        icon="$ICO_TIPS"
+        shift 2
+    fi
     local -r cmd=(
         eos_yad --form --title="$title" --text="$msg"
-        --image=user-info --button=yad-quit "$@"
+        --image=$icon --button=yad-quit "$@"
     )
     "${cmd[@]}"
 }
 ErrorMsg() {
     local -r msg="$1"
-    Msg "$msg" "Error"
+    Msg "$msg" "Error" $ICO_ERROR
 }
 WarningMsg() {
     local -r msg="$1"
@@ -521,10 +529,10 @@ Main()
         --title="EndeavourOS log tools"
         --text="$helptext"
         # --width=600        # not needed?
-        --image=dialog-question
-        --button="Cancel!!Cancel this operation":$code_cancel
-        --button="Save logs locally!!Save the logs to file $FILE_OF_LOGS2":$code_localsave
-        --button="Share logs to the internet!!Send the logs to a pastebin service":$code_send_to_internet
+        --image=$ICO_QUESTION
+        --button="yad-cancel!Cancel this operation":$code_cancel
+        --button="yad-save!Save the logs to file $FILE_OF_LOGS2":$code_localsave
+        --button="Share logs to the internet!$ICO_SHARE!Send the logs to a pastebin service":$code_send_to_internet
     )
 
     # Skip entries that don't have the app installed