From a48ecccd7dfbdb02ea9efffcad14db49469c4cef Mon Sep 17 00:00:00 2001 From: GullCode Date: Mon, 3 Apr 2023 12:46:59 +0200 Subject: [PATCH] widget size and position adjustement to avoid overlap, changed OPT in favor of CONFIG and gave all the side buttons the same size --- firmware/application/apps/ui_recon.cpp | 12 ++++++------ firmware/application/apps/ui_recon.hpp | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/firmware/application/apps/ui_recon.cpp b/firmware/application/apps/ui_recon.cpp index c34f953d..afe70ead 100644 --- a/firmware/application/apps/ui_recon.cpp +++ b/firmware/application/apps/ui_recon.cpp @@ -766,7 +766,7 @@ namespace ui { } button_scanner_mode.set_style( &style_blue ); button_scanner_mode.set_text( "RECON" ); - file_name.set( "USE:" ); + file_name.set( "=>" ); field_squelch.set_value( squelch ); @@ -1194,7 +1194,7 @@ namespace ui { button_scanner_mode.set_style( &style_white ); button_scanner_mode.set_text( "MSEARCH" ); file_name.set_style( &style_white ); - file_name.set( "USE: MANUAL RANGE" ); + file_name.set( "=> MANUAL RANGE" ); start_recon_thread(); user_resume(); @@ -1574,12 +1574,12 @@ namespace ui { { desc_cycle.set(" NO " + input_file + ".TXT FILE ..." ); file_name.set_style( &style_white ); - file_name.set( "USE: NO DATA" ); + file_name.set( "=> NO DATA" ); } else { file_name.set_style( &style_blue ); - file_name.set( "USE: "+input_file + ".TXT" ); + file_name.set( "=> "+input_file ); } step_mode.set_selected_index(def_step); //Impose the default step into the manual step selector } @@ -1591,11 +1591,11 @@ namespace ui { { desc_cycle.set(" NO " + output_file + ".TXT FILE ..." ); file_name.set_style( &style_white ); - file_name.set( "USE:" ); + file_name.set( "=> EMPTY" ); } else { - file_name.set( "USE: "+output_file + ".TXT" ); + file_name.set( "=> "+output_file ); file_name.set_style( &style_red ); } step_mode.set_selected_index(def_step); //Impose the default step into the manual step selector diff --git a/firmware/application/apps/ui_recon.hpp b/firmware/application/apps/ui_recon.hpp index a7543103..8526c5c6 100644 --- a/firmware/application/apps/ui_recon.hpp +++ b/firmware/application/apps/ui_recon.hpp @@ -270,16 +270,16 @@ namespace ui { }; RSSI rssi { - { 0 * 16, 2 * 16, 240 - 5 * 8 - 1 , 16 }, + { 0 * 16, 2 * 16, 240 - 8 * 8 + 4 , 16 }, }; ButtonWithEncoder text_cycle { - { 0, 3 * 16, 3 * 8, 16 }, + { 0, 3 * 16, 4 * 8, 16 }, "" }; Text text_max { - { 3 * 8, 3 * 16, 20 * 8 , 16 }, + { 4 * 8, 3 * 16, 240 - 7 * 8 - 4 * 8 , 16 }, }; Text desc_cycle { @@ -292,11 +292,11 @@ namespace ui { }; */ Text big_display { //Show frequency in text mode - { 0, 5 * 16 , 21 * 8, 16 }, + { 0, 5 * 16 , 23 * 8, 16 }, }; Text freq_stats { //Show frequency stats in text mode - { 0, 6 * 16 , 21 * 8, 16 }, + { 0, 6 * 16 , 23 * 8, 16 }, }; // TIMER: 9999 @@ -311,12 +311,12 @@ namespace ui { }; Button button_recon_setup { - { 240 - 5 * 8 , 2 * 16 , 5 * 8, 28 }, - "OPT" + { 240 - 7 * 8 , 2 * 16 , 7 * 8, 28 }, + "CONFIG" }; Button button_looking_glass { - { 240 - 5 * 8 , 5 * 16 , 5 * 8, 28 }, + { 240 - 7 * 8 , 5 * 16 , 7 * 8, 28 }, "GLASS" };