h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor: tweak other menus visual appearance

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-23 14:46:25 +02:00
parent 5fa1dad2ca
commit b03df9811c
6 changed files with 75 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/ui/advanced_menu.sh
View File

@@ -13,16 +13,16 @@ set -e
function advanced_ui(){
top_border
echo -e "| ${yellow}~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~${white} | "
echo -e "| ${yellow}~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~${white} |"
hr
echo -e "| Klipper: | Mainsail: | "
echo -e "| 1) [Rollback] | 6) [Theme installer] | "
echo -e "| | | "
echo -e "| Firmware: | System: | "
echo -e "| 2) [Build only] | 7) [Change hostname] | "
echo -e "| 3) [Flash only] | | "
echo -e "| 4) [Build + Flash] | Extras: | "
echo -e "| 5) [Get MCU ID] | 8) [G-Code Shell Command] | "
echo -e "| Klipper: | Mainsail: |"
echo -e "| 1) [Rollback] | 6) [Theme installer] |"
echo -e "| | |"
echo -e "| Firmware: | System: |"
echo -e "| 2) [Build only] | 7) [Change hostname] |"
echo -e "| 3) [Flash only] | |"
echo -e "| 4) [Build + Flash] | Extras: |"
echo -e "| 5) [Get MCU ID] | 8) [G-Code Shell Command] |"
back_footer
}

28
scripts/ui/install_menu.sh
View File

@@ -13,22 +13,22 @@ set -e
function install_ui(){
top_border
echo -e "| ${green}~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~${white} | "
echo -e "| ${green}~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~${white} |"
hr
echo -e "| You need this menu usually only for installing | "
echo -e "| all necessary dependencies for the various | "
echo -e "| functions on a completely fresh system. | "
echo -e "| You need this menu usually only for installing |"
echo -e "| all necessary dependencies for the various |"
echo -e "| functions on a completely fresh system. |"
hr
echo -e "| Firmware & API: | 3rd Party Webinterface: | "
echo -e "| 1) [Klipper] | 6) [OctoPrint] | "
echo -e "| 2) [Moonraker] | | "
echo -e "| | Other: | "
echo -e "| Klipper Webinterface: | 7) [PrettyGCode] | "
echo -e "| 3) [Mainsail] | 8) [Telegram Bot] | "
echo -e "| 4) [Fluidd] | | "
echo -e "| | Webcam Streamer: | "
echo -e "| Touchscreen GUI: | 9) [MJPG-Streamer] | "
echo -e "| 5) [KlipperScreen] | | "
echo -e "| Firmware & API: | 3rd Party Webinterface: |"
echo -e "| 1) [Klipper] | 6) [OctoPrint] |"
echo -e "| 2) [Moonraker] | |"
echo -e "| | Other: |"
echo -e "| Klipper Webinterface : | 7) [PrettyGCode] |"
echo -e "| 3) [Mainsail] | 8) [Telegram Bot] |"
echo -e "| 4) [Fluidd] | |"
echo -e "| | Webcam Streamer: |"
echo -e "| Touchscreen GUI: | 9) [MJPG-Streamer] |"
echo -e "| 5) [KlipperScreen] | |"
back_footer
}

10
scripts/ui/main_menu.sh
View File

@@ -39,13 +39,13 @@ function get_kiauh_version(){
function kiauh_update_dialog(){
[ ! "$(kiauh_update_avail)" == "true" ] && return
top_border
echo -e "|${green} New KIAUH update available! ${white}| "
echo -e "|${green} New KIAUH update available! ${white}|"
hr
echo -e "|${green} View Changelog: https://git.io/JnmlX ${white}| "
echo -e "|${green} View Changelog: https://git.io/JnmlX ${white}|"
blank_line
echo -e "|${yellow} It is recommended to keep KIAUH up to date. Updates ${white}| "
echo -e "|${yellow} usually contain bugfixes, important changes or new ${white}| "
echo -e "|${yellow} features. Please consider updating! ${white}| "
echo -e "|${yellow} It is recommended to keep KIAUH up to date. Updates ${white}|"
echo -e "|${yellow} usually contain bugfixes, important changes or new ${white}|"
echo -e "|${yellow} features. Please consider updating! ${white}|"
bottom_border
read -p "${cyan}Do you want to update now? (Y/n):${white} " yn
while true; do

31
scripts/ui/remove_menu.sh
View File

@@ -13,19 +13,20 @@ set -e
function remove_ui(){
top_border
echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${white} | "
echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${white} |"
hr
echo -e "| ${yellow}INFO: Configurations and/or any backups will be kept!${white} | "
echo -e "| ${yellow}INFO: Configurations and/or any backups will be kept!${white} |"
hr
echo -e "| Firmware: | Touchscreen GUI: | "
echo -e "| 1) [Klipper] | 5) [KlipperScreen] | "
echo -e "| | | "
echo -e "| Klipper API: | Other: | "
echo -e "| 2) [Moonraker] | 6) [OctoPrint] | "
echo -e "| | 7) [PrettyGCode] | "
echo -e "| Klipper Webinterface: | 8) [Telegram Bot] | "
echo -e "| 3) [Mainsail] | 9) [MJPG-Streamer] | "
echo -e "| 4) [Fluidd] | 10) [NGINX] | "
echo -e "| Firmware & API: | 3rd Party Webinterface: |"
echo -e "| 1) [Klipper] | 6) [OctoPrint] |"
echo -e "| 2) [Moonraker] | |"
echo -e "| | Webcam Streamer: |"
echo -e "| Klipper Webinterface: | 7) [MJPG-Streamer] |"
echo -e "| 3) [Mainsail] | |"
echo -e "| 4) [Fluidd] | Other: |"
echo -e "| | 8) [PrettyGCode] |"
echo -e "| Touchscreen GUI: | 9) [Telegram Bot] |"
echo -e "| 5) [KlipperScreen] | 10) [NGINX] |"
back_footer
}
@@ -47,11 +48,11 @@ function remove_menu(){
6)
do_action "remove_octoprint" "remove_ui";;
7)
do_action "remove_prettygcode" "remove_ui";;
8)
do_action "remove_telegram_bot" "remove_ui";;
9)
do_action "remove_mjpg-streamer" "remove_ui";;
8)
do_action "remove_prettygcode" "remove_ui";;
9)
do_action "remove_telegram_bot" "remove_ui";;
10)
do_action "remove_nginx" "remove_ui";;
B|b)

12
scripts/ui/settings_menu.sh
View File

@@ -74,6 +74,7 @@ function settings_ui() {
hr
echo -e "| 1) Change Klipper config folder location |"
echo -e "| 2) Set custom Klipper repository |"
blank_line
if [ "${mainsail_install_unstable}" == "false" ]; then
echo -e "| 3) ${green}Allow${white} unstable Mainsail releases |"
else
@@ -84,6 +85,7 @@ function settings_ui() {
else
echo -e "| 4) ${red}Disallow${white} unstable Fluidd releases |"
fi
blank_line
if [ "${backup_before_update}" == "false" ]; then
echo -e "| 5) ${green}Enable${white} automatic backups before updates |"
else
@@ -117,6 +119,16 @@ function show_settings_help(){
blank_line
echo -e "| Default: ${red}false${white} |"
blank_line
hr
echo -e "| ${cyan}Backup before updating:${white} |"
echo -e "| If set to true, KIAUH will automatically create a |"
echo -e "| backup from the corresponding component you are about |"
echo -e "| to update before actually updating it, preserving the |"
echo -e "| current state of the component in a safe location. |"
echo -e "| All backups are stored in '~/kiauh_backups'. |"
blank_line
echo -e "| Default: ${red}false${white} |"
blank_line
back_footer
while true; do
read -p "${cyan}###### Please select:${white} " choice

38
scripts/ui/update_menu.sh
View File

@@ -13,26 +13,26 @@ set -e
function update_ui(){
top_border
echo -e "| ${green}~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~${white} | "
echo -e "| ${green}~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~${white} |"
hr
echo -e "| a) [Update all] | | | "
echo -e "| | Installed: | Latest: | "
echo -e "| Klipper & API: |---------------|--------------| "
echo -e "| 1) [Klipper] |$(compare_klipper_versions)| "
echo -e "| 2) [Moonraker] |$(compare_moonraker_versions)| "
echo -e "| | | | "
echo -e "| Webinterface: |---------------|--------------| "
echo -e "| 3) [Mainsail] |$(compare_mainsail_versions)| "
echo -e "| 4) [Fluidd] |$(compare_fluidd_versions)| "
echo -e "| | | | "
echo -e "| Touchscreen GUI: |---------------|--------------| "
echo -e "| 5) [KlipperScreen] |$(compare_klipperscreen_versions)| "
echo -e "| | | | "
echo -e "| Other: |---------------|--------------| "
echo -e "| 6) [PrettyGCode] |$(compare_prettygcode_versions)| "
echo -e "| 7) [Telegram Bot] |$(compare_telegram_bot_versions)| "
echo -e "| |------------------------------| "
echo -e "| 8) [System] | $(check_system_updates) | "
echo -e "| a) [Update all] | | |"
echo -e "| | Installed: | Latest: |"
echo -e "| Klipper & API: |---------------|--------------|"
echo -e "| 1) [Klipper] |$(compare_klipper_versions)|"
echo -e "| 2) [Moonraker] |$(compare_moonraker_versions)|"
echo -e "| | | |"
echo -e "| Klipper Webinterface: |---------------|--------------|"
echo -e "| 3) [Mainsail] |$(compare_mainsail_versions)|"
echo -e "| 4) [Fluidd] |$(compare_fluidd_versions)|"
echo -e "| | | |"
echo -e "| Touchscreen GUI: |---------------|--------------|"
echo -e "| 5) [KlipperScreen] |$(compare_klipperscreen_versions)|"
echo -e "| | | |"
echo -e "| Other: |---------------|--------------|"
echo -e "| 6) [PrettyGCode] |$(compare_prettygcode_versions)|"
echo -e "| 7) [Telegram Bot] |$(compare_telegram_bot_versions)|"
echo -e "| |------------------------------|"
echo -e "| 8) [System] | $(check_system_updates) |"
back_footer
}