From d89e7228527f56e239590c9b395380ea41e384ec Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 6 Dec 2017 22:20:05 +0000
Subject: [PATCH] More zenity

---
 src/freedombone-image-mesh |  2 +-
 src/freedombone-mesh-blog  | 26 ++++++++++----------------
 src/freedombone-mesh-reset |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 150749109..8b9696491 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -446,7 +446,7 @@ function show_desktop_icons {
     echo "Comment[it]=Crea una nuova identità" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo "Comment[ru]=Создайте новое удостоверение личности" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo "Comment[zh]=创建一个新的身份" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-    echo "Exec=mate-terminal --full-screen -e ${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo "Exec=${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_new_identity.png" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
diff --git a/src/freedombone-mesh-blog b/src/freedombone-mesh-blog
index 4aac26305..fdd420aef 100755
--- a/src/freedombone-mesh-blog
+++ b/src/freedombone-mesh-blog
@@ -146,22 +146,16 @@ function delete_blog {
         return
     fi
 
-    dialog --title $"Delete the previous blog entry" \
-           --backtitle $"Freedombone Mesh" \
-           --defaultno \
-           --yesno $"\nAre you sure that you wish to delete the previous blog entry?" 8 60
-    sel=$?
-    case $sel in
-        0) rm $LAST_BLOG_ENTRY
-           if [ $CURRENT_INDEX -gt 0 ]; then
-               CURRENT_INDEX=$PREVIOUS_INDEX
-               echo "$CURRENT_INDEX" > $CURRENT_BLOG_INDEX
-           else
-               rm -f $CURRENT_BLOG_INDEX
-           fi
-           regenerate_blog
-           ;;
-    esac
+    if ! zenity --question --title=$'Delete the previous blog entry' --text=$"\nAre you sure that you wish to delete the previous blog entry?" --ok-label=No --cancel-label=Yes --width=300; then
+        rm $LAST_BLOG_ENTRY
+        if [ $CURRENT_INDEX -gt 0 ]; then
+            CURRENT_INDEX=$PREVIOUS_INDEX
+            echo "$CURRENT_INDEX" > $CURRENT_BLOG_INDEX
+        else
+            rm -f $CURRENT_BLOG_INDEX
+        fi
+        regenerate_blog
+    fi
 }
 
 function change_theme {
diff --git a/src/freedombone-mesh-reset b/src/freedombone-mesh-reset
index 43b3df097..32cfc46e0 100755
--- a/src/freedombone-mesh-reset
+++ b/src/freedombone-mesh-reset
@@ -33,7 +33,7 @@ export TEXTDOMAINDIR="/usr/share/locale"
 
 MESH_INSTALL_COMPLETED=/root/.mesh_setup_completed
 
-if ! zenity --question --title='New Identity' --text="Do you want to reset your identity? This will reset ALL data for this peer, and you will not be able to recover it." --ok-label=No --cancel-label=Yes --width=300; then
+if ! zenity --question --title=$'New Identity' --text=$"Do you want to reset your identity? This will reset ALL data for this peer, and you will not be able to recover it." --ok-label=No --cancel-label=Yes --width=300; then
     sudo batman stop
     sudo pkill qtox
     sudo pkill firefox
-- 
GitLab