diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp index e10f61fb185fe1e8ad0dc7abc645304cfe0b44d7..0e5eaf9e7f1aeafdbd5afd1019451413af1ade29 100644 --- a/firmware/application/apps/ui_fileman.cpp +++ b/firmware/application/apps/ui_fileman.cpp @@ -32,8 +32,8 @@ namespace ui { void FileManBaseView::load_directory_contents(const std::filesystem::path& dir_path) { current_path = dir_path; - text_current.set(dir_path.string().substr(0, 30 - 8)); - + text_current.set(dir_path.string().length()? dir_path.string().substr(0, 30 - 6):"(sd root)"); + entry_list.clear(); auto filtering = (bool)extension_filter.size(); @@ -315,7 +315,7 @@ FileManagerView::FileManagerView( button_delete.on_select = [this, &nav](Button&) { // Use display_modal ? - nav.push<ModalMessageView>("Delete", "Delete " + entry_list[menu_view.highlighted_index()].entry_path.filename().string() + "\nAre you sure ?", YESNO, + nav.push<ModalMessageView>("Delete", "Delete " + entry_list[menu_view.highlighted_index()].entry_path.filename().string() + "\nAre you sure?", YESNO, [this](bool choice) { if (choice) on_delete(); diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp index 2ea385716c2e14451e350eee490a27fe9012478d..68c09db828a5ad61d9bb0111dffd5907fec73c71 100644 --- a/firmware/application/apps/ui_fileman.hpp +++ b/firmware/application/apps/ui_fileman.hpp @@ -85,10 +85,10 @@ protected: void refresh_list(); Labels labels { - { { 0, 0 }, "Current:", Color::light_grey() } + { { 0, 0 }, "Path:", Color::light_grey() } }; Text text_current { - { 8 * 8, 0 * 8, 22 * 8, 16 }, + { 6 * 8, 0 * 8, 24 * 8, 16 }, "", }; diff --git a/firmware/application/apps/ui_script.cpp b/firmware/application/apps/ui_script.cpp index d2e68ac49d93b1b9d51f4ca8d3792690b36a8418..702882a67c130ca3e141ee4e3bcbbd8c6551d2a6 100644 --- a/firmware/application/apps/ui_script.cpp +++ b/firmware/application/apps/ui_script.cpp @@ -94,7 +94,7 @@ ScriptView::ScriptView( }; button_del.on_select = [this, &nav](Button&) { - nav.push<ModalMessageView>("Confirm", "Are you sure ?", YESNO, + nav.push<ModalMessageView>("Confirm", "Are you sure?", YESNO, [this](bool choice) { if (choice) { on_delete(); diff --git a/firmware/application/apps/ui_sd_wipe.cpp b/firmware/application/apps/ui_sd_wipe.cpp index 295789bd3bd3d47e63e69166b0e34eb425b0d0b5..f17e76ae2ea1ff25afbbb2b30b7a5d6154f17c54 100644 --- a/firmware/application/apps/ui_sd_wipe.cpp +++ b/firmware/application/apps/ui_sd_wipe.cpp @@ -45,7 +45,7 @@ void WipeSDView::focus() { dummy.focus(); if (!confirmed) { - nav_.push<ModalMessageView>("Warning !", "Wipe FAT of SD card ?", YESCANCEL, [this](bool choice) { + nav_.push<ModalMessageView>("Warning !", "Wipe FAT of SD card?", YESCANCEL, [this](bool choice) { if (choice) confirmed = true; } diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index a7b7a92f1e88f6b13d22230980b1d2ec18e91c92..937739f02306a9d86431fbc22996b4876aff4ede 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -198,7 +198,7 @@ void SystemStatusView::on_stealth() { void SystemStatusView::on_bias_tee() { if (!portapack::antenna_bias) { - nav_.display_modal("Bias voltage", "Enable DC voltage on\nantenna connector ?", YESNO, [this](bool v) { + nav_.display_modal("Bias voltage", "Enable DC voltage on\nantenna connector?", YESNO, [this](bool v) { if (v) { portapack::set_antenna_bias(true); //radio::set_antenna_bias(true);