PR Submenu change from "quit" to "back" #111

Merged
The-Monkey-King merged 8 commits from patch-1 into master 2021-09-12 20:41:28 +02:00
8 changed files with 28 additions and 22 deletions

View File

@@ -18,7 +18,7 @@ advanced_ui(){
echo -e "| 6) [Get MCU ID] | | " echo -e "| 6) [Get MCU ID] | | "
echo -e "| | CustomPiOS: | " echo -e "| | CustomPiOS: | "
echo -e "| | 10) [Migration Helper] | " echo -e "| | 10) [Migration Helper] | "
quit_footer back_footer
} }
advanced_menu(){ advanced_menu(){
@@ -72,7 +72,7 @@ advanced_menu(){
do_action "setup_gcode_shell_command" "advanced_ui";; do_action "setup_gcode_shell_command" "advanced_ui";;
10) 10)
do_action "migration_menu";; do_action "migration_menu";;
Q|q) B|b)
clear; main_menu; break;; clear; main_menu; break;;
*) *)
deny_action "advanced_ui";; deny_action "advanced_ui";;
@@ -99,7 +99,7 @@ switch_ui(){
echo -e "| dmbutyugin: | " echo -e "| dmbutyugin: | "
echo -e "| 2) [--> scurve-shaping] | " echo -e "| 2) [--> scurve-shaping] | "
echo -e "| 3) [--> scurve-smoothing] | " echo -e "| 3) [--> scurve-smoothing] | "
quit_footer back_footer
} }
switch_menu(){ switch_menu(){
@@ -137,7 +137,7 @@ switch_menu(){
read_branch read_branch
print_msg && clear_msg print_msg && clear_msg
switch_ui;; switch_ui;;
Q|q) B|b)
clear; advanced_menu; break;; clear; advanced_menu; break;;
*) *)
deny_action "switch_ui";; deny_action "switch_ui";;
@@ -167,7 +167,7 @@ rollback_ui(){
hr hr
echo -e "| Commit last updated from: | " echo -e "| Commit last updated from: | "
echo -e "| $PREV_UI | " echo -e "| $PREV_UI | "
quit_footer back_footer
} }
############################################################# #############################################################
@@ -190,7 +190,7 @@ migration_ui(){
echo -e "| 1) [Migrate MainsailOS] | " echo -e "| 1) [Migrate MainsailOS] | "
echo -e "| 2) [Migrate FluiddPi] | " echo -e "| 2) [Migrate FluiddPi] | "
echo -e "| | " echo -e "| | "
quit_footer back_footer
} }
migration_menu(){ migration_menu(){
@@ -201,8 +201,8 @@ migration_menu(){
case "$action" in case "$action" in
1) migrate_custompios "mainsail"; migration_menu;; 1) migrate_custompios "mainsail"; migration_menu;;
2) migrate_custompios "fluiddpi"; migration_menu;; 2) migrate_custompios "fluiddpi"; migration_menu;;
Q|q) clear; advanced_menu; break;; B|b) clear; advanced_menu; break;;
*) print_unkown_cmd; migration_menu;; *) print_unkown_cmd; migration_menu;;
esac esac
done done
} }

View File

@@ -14,7 +14,7 @@ backup_ui(){
echo -e "| 2) [Moonraker] | Other: | " echo -e "| 2) [Moonraker] | Other: | "
echo -e "| 3) [Moonraker DB] | 7) [Duet Web Control] | " echo -e "| 3) [Moonraker DB] | 7) [Duet Web Control] | "
echo -e "| | 8) [OctoPrint] | " echo -e "| | 8) [OctoPrint] | "
quit_footer back_footer
} }
backup_menu(){ backup_menu(){
@@ -40,11 +40,11 @@ backup_menu(){
do_action "backup_dwc2" "backup_ui";; do_action "backup_dwc2" "backup_ui";;
8) 8)
do_action "backup_octoprint" "backup_ui";; do_action "backup_octoprint" "backup_ui";;
Q|q) B|b)
clear; main_menu; break;; clear; main_menu; break;;
*) *)
deny_action "backup_ui";; deny_action "backup_ui";;
esac esac
done done
backup_menu backup_menu
} }

View File

@@ -21,6 +21,12 @@ quit_footer(){
bottom_border bottom_border
} }
back_footer(){
hr
echo -e "| ${green}B) Back${default} | "
bottom_border
}
print_header(){ print_header(){
top_border top_border
echo -e "| $(title_msg "~~~~~~~~~~~~~~~~~ [ KIAUH ] ~~~~~~~~~~~~~~~~~") |" echo -e "| $(title_msg "~~~~~~~~~~~~~~~~~ [ KIAUH ] ~~~~~~~~~~~~~~~~~") |"
@@ -60,4 +66,4 @@ deny_action(){
print_unkown_cmd print_unkown_cmd
print_msg && clear_msg print_msg && clear_msg
$1 $1
} }

View File

@@ -17,7 +17,7 @@ install_ui(){
echo -e "| 4) [Fluidd] | Webcam: | " echo -e "| 4) [Fluidd] | Webcam: | "
echo -e "| | 9) [MJPG-Streamer] | " echo -e "| | 9) [MJPG-Streamer] | "
echo -e "| | | " echo -e "| | | "
quit_footer back_footer
} }
install_menu(){ install_menu(){
@@ -43,7 +43,7 @@ install_menu(){
do_action "install_pgc_for_klipper" "install_ui";; do_action "install_pgc_for_klipper" "install_ui";;
9) 9)
do_action "install_mjpg-streamer" "install_ui";; do_action "install_mjpg-streamer" "install_ui";;
Q|q) B|b)
clear; main_menu; break;; clear; main_menu; break;;
*) *)
deny_action "install_ui";; deny_action "install_ui";;

View File

@@ -17,7 +17,7 @@ remove_ui(){
echo -e "| 3) [Mainsail] | 9) [PrettyGCode] | " echo -e "| 3) [Mainsail] | 9) [PrettyGCode] | "
echo -e "| 4) [Fluidd] | | " echo -e "| 4) [Fluidd] | | "
echo -e "| | 10) [NGINX] | " echo -e "| | 10) [NGINX] | "
quit_footer back_footer
} }
remove_menu(){ remove_menu(){
@@ -45,7 +45,7 @@ remove_menu(){
do_action "remove_prettygcode" "remove_ui";; do_action "remove_prettygcode" "remove_ui";;
10) 10)
do_action "remove_nginx" "remove_ui";; do_action "remove_nginx" "remove_ui";;
Q|q) B|b)
clear; main_menu; break;; clear; main_menu; break;;
*) *)
deny_action "remove_ui";; deny_action "remove_ui";;

View File

@@ -20,7 +20,7 @@ settings_ui(){
else else
echo -e "| 1) Change config folder | " echo -e "| 1) Change config folder | "
fi fi
quit_footer back_footer
} }
settings_menu(){ settings_menu(){
@@ -34,7 +34,7 @@ settings_menu(){
else else
deny_action "settings_ui" deny_action "settings_ui"
fi;; fi;;
Q|q) B|b)
clear; main_menu; break;; clear; main_menu; break;;
*) *)
deny_action "settings_ui";; deny_action "settings_ui";;

View File

@@ -24,7 +24,7 @@ update_ui(){
echo -e "| 8) [PrettyGCode] | $LOCAL_PGC_COMMIT | $REMOTE_PGC_COMMIT | " echo -e "| 8) [PrettyGCode] | $LOCAL_PGC_COMMIT | $REMOTE_PGC_COMMIT | "
echo -e "| |------------------------------| " echo -e "| |------------------------------| "
echo -e "| 9) [System] | $DISPLAY_SYS_UPDATE | " echo -e "| 9) [System] | $DISPLAY_SYS_UPDATE | "
quit_footer back_footer
} }
update_menu(){ update_menu(){
@@ -55,7 +55,7 @@ update_menu(){
do_action "update_system" "update_ui";; do_action "update_system" "update_ui";;
a) a)
do_action "update_all" "update_ui";; do_action "update_all" "update_ui";;
Q|q) B|b)
clear; main_menu; break;; clear; main_menu; break;;
*) *)
deny_action "update_ui";; deny_action "update_ui";;

View File

@@ -71,7 +71,7 @@ upload_selection(){
printf "| $i) %-50s|\n" "${logfiles[$i]}" printf "| $i) %-50s|\n" "${logfiles[$i]}"
i=$((i + 1)) i=$((i + 1))
done done
quit_footer back_footer
while true; do while true; do
read -p "${cyan}Please select:${default} " choice read -p "${cyan}Please select:${default} " choice
if [ $choice = "q" ] || [ $choice = "Q" ]; then if [ $choice = "q" ] || [ $choice = "Q" ]; then
@@ -101,4 +101,4 @@ upload_log(){
ERROR_MSG="File not found!" && print_msg && clear_msg ERROR_MSG="File not found!" && print_msg && clear_msg
upload_selection upload_selection
fi fi
} }