Bob Mottram vor 7 Jahren
Ursprung
Commit
d89e722852
3 geänderte Dateien mit 12 neuen und 18 gelöschten Zeilen
  1. 1
    1
      src/freedombone-image-mesh
  2. 10
    16
      src/freedombone-mesh-blog
  3. 1
    1
      src/freedombone-mesh-reset

+ 1
- 1
src/freedombone-image-mesh Datei anzeigen

@@ -446,7 +446,7 @@ function show_desktop_icons {
446 446
     echo "Comment[it]=Crea una nuova identità" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
447 447
     echo "Comment[ru]=Создайте новое удостоверение личности" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
448 448
     echo "Comment[zh]=创建一个新的身份" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
449
-    echo "Exec=mate-terminal --full-screen -e ${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
449
+    echo "Exec=${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
450 450
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_new_identity.png" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
451 451
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
452 452
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop

+ 10
- 16
src/freedombone-mesh-blog Datei anzeigen

@@ -146,22 +146,16 @@ function delete_blog {
146 146
         return
147 147
     fi
148 148
 
149
-    dialog --title $"Delete the previous blog entry" \
150
-           --backtitle $"Freedombone Mesh" \
151
-           --defaultno \
152
-           --yesno $"\nAre you sure that you wish to delete the previous blog entry?" 8 60
153
-    sel=$?
154
-    case $sel in
155
-        0) rm $LAST_BLOG_ENTRY
156
-           if [ $CURRENT_INDEX -gt 0 ]; then
157
-               CURRENT_INDEX=$PREVIOUS_INDEX
158
-               echo "$CURRENT_INDEX" > $CURRENT_BLOG_INDEX
159
-           else
160
-               rm -f $CURRENT_BLOG_INDEX
161
-           fi
162
-           regenerate_blog
163
-           ;;
164
-    esac
149
+    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
150
+        rm $LAST_BLOG_ENTRY
151
+        if [ $CURRENT_INDEX -gt 0 ]; then
152
+            CURRENT_INDEX=$PREVIOUS_INDEX
153
+            echo "$CURRENT_INDEX" > $CURRENT_BLOG_INDEX
154
+        else
155
+            rm -f $CURRENT_BLOG_INDEX
156
+        fi
157
+        regenerate_blog
158
+    fi
165 159
 }
166 160
 
167 161
 function change_theme {

+ 1
- 1
src/freedombone-mesh-reset Datei anzeigen

@@ -33,7 +33,7 @@ export TEXTDOMAINDIR="/usr/share/locale"
33 33
 
34 34
 MESH_INSTALL_COMPLETED=/root/.mesh_setup_completed
35 35
 
36
-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
36
+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
37 37
     sudo batman stop
38 38
     sudo pkill qtox
39 39
     sudo pkill firefox