Selaa lähdekoodia

User control panel menu style

Bob Mottram 7 vuotta sitten
vanhempi
commit
8508da2f53
2 muutettua tiedostoa jossa 20 lisäystä ja 27 poistoa
  1. 1
    1
      src/freedombone-controlpanel
  2. 19
    26
      src/freedombone-controlpanel-user

+ 1
- 1
src/freedombone-controlpanel Näytä tiedosto

@@ -2298,7 +2298,7 @@ function menu_top_level {
2298 2298
            21 $"Restart the system")
2299 2299
 
2300 2300
         # shellcheck disable=SC2068
2301
-        selection=$(dialog --backtitle $"Freedombone Control Panel" --title $"Control Panel" --menu $"Choose an operation, or ESC to exit:" 28 60 28 "${W[@]}" 3>&2 2>&1 1>&3)
2301
+        selection=$(dialog --backtitle $"Freedombone Control Panel" --title $"Administrator Control Panel" --menu $"Choose an operation, or ESC to exit:" 28 60 28 "${W[@]}" 3>&2 2>&1 1>&3)
2302 2302
         if [ ! "$selection" ]; then
2303 2303
             break
2304 2304
         fi

+ 19
- 26
src/freedombone-controlpanel-user Näytä tiedosto

@@ -899,28 +899,24 @@ function show_your_email_address {
899 899
 function menu_top_level {
900 900
     while true
901 901
     do
902
-        data=$(mktemp 2>/dev/null)
903
-        dialog --backtitle $"Freedombone User Control Panel" \
904
-               --title $"User Control Panel" \
905
-               --radiolist $"Choose an operation:" 20 60 13 \
906
-               1 $"Use Email" off \
907
-               2 $"Show your Email Address" off \
908
-               3 $"Change Email Filtering/Blocking Rules" off \
909
-               4 $"Run an App" off \
910
-               5 $"Browse the Web" off \
911
-               6 $"My Encryption Keys" off \
912
-               7 $"Set an outgoing email proxy" off \
913
-               8 $"Administrator controls" off \
914
-               9 $"Exit to the command line" off \
915
-               10 $"Log out" on 2> "$data"
916
-        sel=$?
917
-        case $sel in
918
-            1) rm -f "$data"
919
-               exit 1;;
920
-            255) rm -f "$data"
921
-                 exit 1;;
922
-        esac
923
-        case $(cat "$data") in
902
+        W=(1 $"Use Email"
903
+           2 $"Show your Email Address"
904
+           3 $"Change Email Filtering/Blocking Rules"
905
+           4 $"Run an App"
906
+           5 $"Browse the Web"
907
+           6 $"My Encryption Keys"
908
+           7 $"Set an outgoing email proxy"
909
+           8 $"Administrator controls"
910
+           9 $"Exit to the command line")
911
+
912
+        # shellcheck disable=SC2068
913
+        selection=$(dialog --backtitle $"Freedombone Control Panel" --title $"User Control Panel" --menu $"Choose an operation, or ESC to log out:" 20 60 13 "${W[@]}" 3>&2 2>&1 1>&3)
914
+        if [ ! "$selection" ]; then
915
+            kill -HUP "$(pgrep -s 0 -o)"
916
+            break
917
+        fi
918
+
919
+        case $selection in
924 920
             1) mutt;;
925 921
             2) show_your_email_address;;
926 922
             3) menu_email;;
@@ -929,11 +925,8 @@ function menu_top_level {
929 925
             6) menu_encryption_keys;;
930 926
             7) smtp_proxy;;
931 927
             8) menu_admin;;
932
-            9) rm -f "$data"
933
-               break;;
934
-            10) kill -HUP "$(pgrep -s 0 -o)";;
928
+            9) break;;
935 929
         esac
936
-        rm -f "$data"
937 930
     done
938 931
 }
939 932