Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Recon: fix output when typing name (#1538)

Browse Source 
* Changed some buttons name and fixed blank output if typed

* code format

---------

Co-authored-by: Gull Ra Driel <gull@NiloreaDevLaptop.home>
Co-authored-by: gullradriel <gull@nomail.net>
This commit is contained in:
gullradriel 2023-10-30 22:54:37 +01:00 committed by GitHub
parent 01dd0c79ed
commit 211f40ddf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
firmware/application/apps/ui_recon_settings.cpp
View File

@ -39,10 +39,10 @@ namespace ui {
ReconSetupViewMain::ReconSetupViewMain(NavigationView& nav, Rect parent_rect, std::string input_file, std::string output_file) ReconSetupViewMain::ReconSetupViewMain(NavigationView& nav, Rect parent_rect, std::string input_file, std::string output_file)
: View(parent_rect), _input_file{input_file}, _output_file{output_file} { : View(parent_rect), _input_file{input_file}, _output_file{output_file} {
hidden(true); hidden(true);
add_children({&button_load_freqs, add_children({&button_input_file,
&text_input_file, &text_input_file,
&button_save_freqs, &button_choose_output_file,
&button_output_file, &button_choose_output_name,
&checkbox_autosave_freqs, &checkbox_autosave_freqs,
&checkbox_autostart_recon, &checkbox_autostart_recon,
&checkbox_clear_output}); &checkbox_clear_output});
@ -52,9 +52,9 @@ ReconSetupViewMain::ReconSetupViewMain(NavigationView& nav, Rect parent_rect, st
checkbox_clear_output.set_value(persistent_memory::recon_clear_output()); checkbox_clear_output.set_value(persistent_memory::recon_clear_output());
text_input_file.set(_input_file); text_input_file.set(_input_file);
button_output_file.set_text(_output_file); button_choose_output_name.set_text(_output_file);
button_load_freqs.on_select = [this, &nav](Button&) { button_input_file.on_select = [this, &nav](Button&) {
auto open_view = nav.push<FileLoadView>(".TXT"); auto open_view = nav.push<FileLoadView>(".TXT");
open_view->push_dir(freqman_dir); open_view->push_dir(freqman_dir);
open_view->on_changed = [this, &nav](std::filesystem::path new_file_path) { open_view->on_changed = [this, &nav](std::filesystem::path new_file_path) {
@ -67,25 +67,24 @@ ReconSetupViewMain::ReconSetupViewMain(NavigationView& nav, Rect parent_rect, st
}; };
}; };
button_save_freqs.on_select = [this, &nav](Button&) { button_choose_output_file.on_select = [this, &nav](Button&) {
auto open_view = nav.push<FileLoadView>(".TXT"); auto open_view = nav.push<FileLoadView>(".TXT");
open_view->push_dir(freqman_dir); open_view->push_dir(freqman_dir);
open_view->on_changed = [this, &nav](std::filesystem::path new_file_path) { open_view->on_changed = [this, &nav](std::filesystem::path new_file_path) {
if (new_file_path.native().find(freqman_dir.native()) == 0) { if (new_file_path.native().find(freqman_dir.native()) == 0) {
_output_file = new_file_path.stem().string(); _output_file = new_file_path.stem().string();
button_output_file.set_text(_output_file); button_choose_output_name.set_text(_output_file);
} else { } else {
nav.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired."); nav.display_modal("SAVE ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
} }
}; };
}; };
button_output_file.on_select = [this, &nav](Button&) { button_choose_output_name.on_select = [this, &nav](Button&) {
text_prompt(nav, _output_file, 28, text_prompt(nav, _output_file, 28, [this](std::string& buffer) {
[this](std::string& buffer) { _output_file = buffer;
_output_file = std::move(buffer); button_choose_output_name.set_text(_output_file);
button_output_file.set_text(_output_file); });
});
}; };
}; };
@ -105,7 +104,7 @@ void ReconSetupViewMore::save() {
}; };
void ReconSetupViewMain::focus() { void ReconSetupViewMain::focus() {
button_load_freqs.focus(); button_input_file.focus();
} }
ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect) ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)

7
firmware/application/apps/ui_recon_settings.hpp
View File

@ -73,17 +73,18 @@ class ReconSetupViewMain : public View {
std::string _input_file{"RECON"}; std::string _input_file{"RECON"};
std::string _output_file{"RECON_RESULTS"}; std::string _output_file{"RECON_RESULTS"};
Button button_load_freqs{ Button button_input_file{
{1 * 8, 12, 18 * 8, 22}, {1 * 8, 12, 18 * 8, 22},
"select input file"}; "select input file"};
Text text_input_file{ Text text_input_file{
{1 * 8, 4 + 2 * 16, 18 * 8, 22}, {1 * 8, 4 + 2 * 16, 18 * 8, 22},
"RECON"}; "RECON"};
Button button_save_freqs{ Button button_choose_output_file{
{1 * 8, 4 * 16 - 8, 18 * 8, 22}, {1 * 8, 4 * 16 - 8, 18 * 8, 22},
"select output file"}; "select output file"};
Button button_output_file{
Button button_choose_output_name{
{1 * 8, 5 * 16 - 2, 18 * 8, 22}, {1 * 8, 5 * 16 - 2, 18 * 8, 22},
"RECON_RESULTS"}; "RECON_RESULTS"};