From dfe146c26384fe841ad4d749e362d4f7d264dff9 Mon Sep 17 00:00:00 2001 From: "AKA \"Thom Wiley" Date: Sun, 12 Sep 2021 09:21:18 -0400 Subject: [PATCH 1/8] Proposed UI back_footer instead of quit_footer When I first ran the code, I went to advanced because I had klipper already installed and I wanted to see if I could install fluidd using this code base. So when see advanced menu I was concerned that "quit" meant quitting the tool instead of exiting the advanced menu. So proposing a back_footer for sub menus that will revert back to main menu. Save quit footer for main menu to exit program. --- scripts/ui/advanced_menu.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/ui/advanced_menu.sh b/scripts/ui/advanced_menu.sh index 98ce539..b227d22 100755 --- a/scripts/ui/advanced_menu.sh +++ b/scripts/ui/advanced_menu.sh @@ -18,7 +18,7 @@ advanced_ui(){ echo -e "| 6) [Get MCU ID] | | " echo -e "| | CustomPiOS: | " echo -e "| | 10) [Migration Helper] | " -quit_footer +back_footer } advanced_menu(){ @@ -72,7 +72,7 @@ advanced_menu(){ do_action "setup_gcode_shell_command" "advanced_ui";; 10) do_action "migration_menu";; - Q|q) + B|b) clear; main_menu; break;; *) deny_action "advanced_ui";; @@ -99,7 +99,7 @@ switch_ui(){ echo -e "| dmbutyugin: | " echo -e "| 2) [--> scurve-shaping] | " echo -e "| 3) [--> scurve-smoothing] | " - quit_footer + back_footer } switch_menu(){ @@ -137,7 +137,7 @@ switch_menu(){ read_branch print_msg && clear_msg switch_ui;; - Q|q) + B|b) clear; advanced_menu; break;; *) deny_action "switch_ui";; @@ -167,7 +167,7 @@ rollback_ui(){ hr echo -e "| Commit last updated from: | " echo -e "| $PREV_UI | " - quit_footer + back_footer } ############################################################# @@ -190,7 +190,7 @@ migration_ui(){ echo -e "| 1) [Migrate MainsailOS] | " echo -e "| 2) [Migrate FluiddPi] | " echo -e "| | " - quit_footer + back_footer } migration_menu(){ @@ -201,8 +201,8 @@ migration_menu(){ case "$action" in 1) migrate_custompios "mainsail"; 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;; esac done -} \ No newline at end of file +} -- 2.39.5 From f8c05ce4aa8fd067d93d6b62b6cf13ec1cea71cb Mon Sep 17 00:00:00 2001 From: "AKA \"Thom Wiley" Date: Sun, 12 Sep 2021 09:30:03 -0400 Subject: [PATCH 2/8] Adding back_footer action to general_ui.sh for submenus When I first ran the code, I went to advanced because I had klipper already installed and I wanted to see if I could install fluidd using this code base. So when see advanced menu I was concerned that "quit" meant quitting the tool instead of exiting the advanced menu. So proposing a back_footer for sub menus that will revert back to main menu. Save quit footer for main menu to exit program. --- scripts/ui/general_ui.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/ui/general_ui.sh b/scripts/ui/general_ui.sh index f34d37a..a2d7d0b 100755 --- a/scripts/ui/general_ui.sh +++ b/scripts/ui/general_ui.sh @@ -21,6 +21,12 @@ quit_footer(){ bottom_border } +back_footer(){ + hr + echo -e "| ${green}B) Back${default} | " + bottom_border +} + print_header(){ top_border echo -e "| $(title_msg "~~~~~~~~~~~~~~~~~ [ KIAUH ] ~~~~~~~~~~~~~~~~~") |" @@ -60,4 +66,4 @@ deny_action(){ print_unkown_cmd print_msg && clear_msg $1 -} \ No newline at end of file +} -- 2.39.5 From 3ea4ee45fe0582da563a735b09a8374f8fc13521 Mon Sep 17 00:00:00 2001 From: "AKA \"Thom Wiley" Date: Sun, 12 Sep 2021 09:32:34 -0400 Subject: [PATCH 3/8] Updated backup_menu with back_footer When I first ran the code, I went to advanced because I had klipper already installed and I wanted to see if I could install fluidd using this code base. So when see advanced menu I was concerned that "quit" meant quitting the tool instead of exiting the advanced menu. So proposing a back_footer for sub menus that will revert back to main menu. Save quit footer for main menu to exit program. --- scripts/ui/backup_menu.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ui/backup_menu.sh b/scripts/ui/backup_menu.sh index 16755a1..231176c 100755 --- a/scripts/ui/backup_menu.sh +++ b/scripts/ui/backup_menu.sh @@ -14,7 +14,7 @@ backup_ui(){ echo -e "| 2) [Moonraker] | Other: | " echo -e "| 3) [Moonraker DB] | 7) [Duet Web Control] | " echo -e "| | 8) [OctoPrint] | " - quit_footer + back_footer } backup_menu(){ @@ -40,11 +40,11 @@ backup_menu(){ do_action "backup_dwc2" "backup_ui";; 8) do_action "backup_octoprint" "backup_ui";; - Q|q) + B|b) clear; main_menu; break;; *) deny_action "backup_ui";; esac done backup_menu -} \ No newline at end of file +} -- 2.39.5 From 6aa2a7bff009bf56a89d3c0040bdb751076ee6e0 Mon Sep 17 00:00:00 2001 From: "AKA \"Thom Wiley" Date: Sun, 12 Sep 2021 09:33:51 -0400 Subject: [PATCH 4/8] Updated install_menu.sh to back_footer When I first ran the code, I went to advanced because I had klipper already installed and I wanted to see if I could install fluidd using this code base. So when see advanced menu I was concerned that "quit" meant quitting the tool instead of exiting the advanced menu. So proposing a back_footer for sub menus that will revert back to main menu. Save quit footer for main menu to exit program. --- scripts/ui/install_menu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ui/install_menu.sh b/scripts/ui/install_menu.sh index 8bcd528..40978b8 100755 --- a/scripts/ui/install_menu.sh +++ b/scripts/ui/install_menu.sh @@ -17,7 +17,7 @@ install_ui(){ echo -e "| 4) [Fluidd] | Webcam: | " echo -e "| | 9) [MJPG-Streamer] | " echo -e "| | | " - quit_footer + back_footer } install_menu(){ @@ -43,7 +43,7 @@ install_menu(){ do_action "install_pgc_for_klipper" "install_ui";; 9) do_action "install_mjpg-streamer" "install_ui";; - Q|q) + B|b) clear; main_menu; break;; *) deny_action "install_ui";; -- 2.39.5 From 19e159cdf5227b86b13dba448bbe92356bf6d7c9 Mon Sep 17 00:00:00 2001 From: "AKA \"Thom Wiley" Date: Sun, 12 Sep 2021 09:34:57 -0400 Subject: [PATCH 5/8] Updated remove_menu.sh for back_footer When I first ran the code, I went to advanced because I had klipper already installed and I wanted to see if I could install fluidd using this code base. So when see advanced menu I was concerned that "quit" meant quitting the tool instead of exiting the advanced menu. So proposing a back_footer for sub menus that will revert back to main menu. Save quit footer for main menu to exit program. --- scripts/ui/remove_menu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ui/remove_menu.sh b/scripts/ui/remove_menu.sh index 873674a..83d39fc 100755 --- a/scripts/ui/remove_menu.sh +++ b/scripts/ui/remove_menu.sh @@ -17,7 +17,7 @@ remove_ui(){ echo -e "| 3) [Mainsail] | 9) [PrettyGCode] | " echo -e "| 4) [Fluidd] | | " echo -e "| | 10) [NGINX] | " - quit_footer + back_footer } remove_menu(){ @@ -45,7 +45,7 @@ remove_menu(){ do_action "remove_prettygcode" "remove_ui";; 10) do_action "remove_nginx" "remove_ui";; - Q|q) + B|b) clear; main_menu; break;; *) deny_action "remove_ui";; -- 2.39.5 From 89daa4fd46b5c26da3a25ff6506f76bddf88189e Mon Sep 17 00:00:00 2001 From: "AKA \"Thom Wiley" Date: Sun, 12 Sep 2021 09:36:26 -0400 Subject: [PATCH 6/8] Updated settings_menu.sh to have a back_footer When I first ran the code, I went to advanced because I had klipper already installed and I wanted to see if I could install fluidd using this code base. So when see advanced menu I was concerned that "quit" meant quitting the tool instead of exiting the advanced menu. So proposing a back_footer for sub menus that will revert back to main menu. Save quit footer for main menu to exit program. --- scripts/ui/settings_menu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ui/settings_menu.sh b/scripts/ui/settings_menu.sh index 1c06c70..0537941 100755 --- a/scripts/ui/settings_menu.sh +++ b/scripts/ui/settings_menu.sh @@ -20,7 +20,7 @@ settings_ui(){ else echo -e "| 1) Change config folder | " fi - quit_footer + back_footer } settings_menu(){ @@ -34,7 +34,7 @@ settings_menu(){ else deny_action "settings_ui" fi;; - Q|q) + B|b) clear; main_menu; break;; *) deny_action "settings_ui";; -- 2.39.5 From 9465507aa98515c9e5b65d3e4c3b57e36f28ecf7 Mon Sep 17 00:00:00 2001 From: "AKA \"Thom Wiley" Date: Sun, 12 Sep 2021 09:37:44 -0400 Subject: [PATCH 7/8] Updated update_menu.sh to have back_footer When I first ran the code, I went to advanced because I had klipper already installed and I wanted to see if I could install fluidd using this code base. So when see advanced menu I was concerned that "quit" meant quitting the tool instead of exiting the advanced menu. So proposing a back_footer for sub menus that will revert back to main menu. Save quit footer for main menu to exit program. --- scripts/ui/update_menu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ui/update_menu.sh b/scripts/ui/update_menu.sh index 7fe52a6..26fb096 100755 --- a/scripts/ui/update_menu.sh +++ b/scripts/ui/update_menu.sh @@ -24,7 +24,7 @@ update_ui(){ echo -e "| 8) [PrettyGCode] | $LOCAL_PGC_COMMIT | $REMOTE_PGC_COMMIT | " echo -e "| |------------------------------| " echo -e "| 9) [System] | $DISPLAY_SYS_UPDATE | " - quit_footer + back_footer } update_menu(){ @@ -55,7 +55,7 @@ update_menu(){ do_action "update_system" "update_ui";; a) do_action "update_all" "update_ui";; - Q|q) + B|b) clear; main_menu; break;; *) deny_action "update_ui";; -- 2.39.5 From 67c066284a17d31a3de47e8517a50bf8117c60d0 Mon Sep 17 00:00:00 2001 From: "AKA \"Thom Wiley" Date: Sun, 12 Sep 2021 10:20:19 -0400 Subject: [PATCH 8/8] Updated upload_log.sh with back instead of quit Missed this one. Seeing if I can add this to the existing PR. --- scripts/upload_log.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upload_log.sh b/scripts/upload_log.sh index 03d3584..e2a03b2 100755 --- a/scripts/upload_log.sh +++ b/scripts/upload_log.sh @@ -71,7 +71,7 @@ upload_selection(){ printf "| $i) %-50s|\n" "${logfiles[$i]}" i=$((i + 1)) done - quit_footer + back_footer while true; do read -p "${cyan}Please select:${default} " choice if [ $choice = "q" ] || [ $choice = "Q" ]; then @@ -101,4 +101,4 @@ upload_log(){ ERROR_MSG="File not found!" && print_msg && clear_msg upload_selection fi -} \ No newline at end of file +} -- 2.39.5