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

Merge pull request #5 from eried/master

Browse Source 
Upstream merge
This commit is contained in:
Gregory Fenton 2020-06-01 14:14:59 +01:00 committed by GitHub
commit e8792e446a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/application/apps/ui_fileman.cpp
View File

@ -32,8 +32,8 @@ namespace ui {
void FileManBaseView::load_directory_contents(const std::filesystem::path& dir_path) { void FileManBaseView::load_directory_contents(const std::filesystem::path& dir_path) {
current_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(); entry_list.clear();
auto filtering = (bool)extension_filter.size(); auto filtering = (bool)extension_filter.size();
@ -315,7 +315,7 @@ FileManagerView::FileManagerView(
button_delete.on_select = [this, &nav](Button&) { button_delete.on_select = [this, &nav](Button&) {
// Use display_modal ? // 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) { [this](bool choice) {
if (choice) if (choice)
on_delete(); on_delete();

4
firmware/application/apps/ui_fileman.hpp
View File

@ -85,10 +85,10 @@ protected:
void refresh_list(); void refresh_list();
Labels labels { Labels labels {
{ { 0, 0 }, "Current:", Color::light_grey() } { { 0, 0 }, "Path:", Color::light_grey() }
}; };
Text text_current { Text text_current {
{ 8 * 8, 0 * 8, 22 * 8, 16 }, { 6 * 8, 0 * 8, 24 * 8, 16 },
"", "",
}; };

2
firmware/application/apps/ui_script.cpp
View File

@ -94,7 +94,7 @@ ScriptView::ScriptView(
}; };
button_del.on_select = [this, &nav](Button&) { 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) { [this](bool choice) {
if (choice) { if (choice) {
on_delete(); on_delete();

2
firmware/application/apps/ui_sd_wipe.cpp
View File

@ -45,7 +45,7 @@ void WipeSDView::focus() {
dummy.focus(); dummy.focus();
if (!confirmed) { 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) if (choice)
confirmed = true; confirmed = true;
} }

2
firmware/application/ui_navigation.cpp
View File

@ -198,7 +198,7 @@ void SystemStatusView::on_stealth() {
void SystemStatusView::on_bias_tee() { void SystemStatusView::on_bias_tee() {
if (!portapack::antenna_bias) { 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) { if (v) {
portapack::set_antenna_bias(true); portapack::set_antenna_bias(true);
//radio::set_antenna_bias(true); //radio::set_antenna_bias(true);