Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 06:49:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removing playdead related stuff and small tweaks

Browse Source
This commit is contained in:
Erwin Ried 2020-05-11 11:08:22 +02:00
parent 50b9f3219c
commit f18d9f6ed1
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/application/apps/ui_settings.cpp
View File

@ -183,6 +183,7 @@ SetFrequencyCorrectionModel SetRadioView::form_collect() {
};
}
/*
SetPlayDeadView::SetPlayDeadView(NavigationView& nav) {
add_children({
&text_sequence,
@ -234,10 +235,11 @@ SetPlayDeadView::SetPlayDeadView(NavigationView& nav) {
void SetPlayDeadView::focus() {
button_cancel.focus();
}
*/
SetUIView::SetUIView(NavigationView& nav) {
add_children({
&checkbox_login,
//&checkbox_login,
&checkbox_bloff,
&options_bloff,
&checkbox_showsplash,
@ -245,7 +247,7 @@ SetUIView::SetUIView(NavigationView& nav) {
});
checkbox_showsplash.set_value(persistent_memory::config_splash());
checkbox_login.set_value(persistent_memory::config_login());
//checkbox_login.set_value(persistent_memory::config_login());
uint32_t backlight_timer = persistent_memory::config_backlight_timer();
@ -263,13 +265,13 @@ SetUIView::SetUIView(NavigationView& nav) {
persistent_memory::set_config_backlight_timer(0);
persistent_memory::set_config_splash(checkbox_showsplash.value());
persistent_memory::set_config_login(checkbox_login.value());
//persistent_memory::set_config_login(checkbox_login.value());
nav.pop();
};
}
void SetUIView::focus() {
checkbox_login.focus();
button_ok.focus();
}
SetAudioView::SetAudioView(NavigationView& nav) {
@ -478,7 +480,7 @@ SettingsMenuView::SettingsMenuView(NavigationView& nav) {
//{ "SD card modules", ui::Color::dark_cyan(), [&nav](){ nav.push<ModInfoView>(); } },
{ "Date/Time", ui::Color::dark_cyan(), nullptr, [&nav](){ nav.push<SetDateTimeView>(); } },
{ "Touch screen", ui::Color::dark_cyan(), nullptr, [&nav](){ nav.push<TouchCalibrationView>(); } },
{ "Play dead", ui::Color::dark_cyan(), &bitmap_icon_playdead, [&nav](){ nav.push<SetPlayDeadView>(); } }
//{ "Play dead", ui::Color::dark_cyan(), &bitmap_icon_playdead, [&nav](){ nav.push<SetPlayDeadView>(); } }
});
set_max_rows(2); // allow wider buttons
}

19
firmware/application/apps/ui_settings.hpp
View File

@ -101,11 +101,11 @@ private:
Button button_done {
{ 2 * 8, 16 * 16, 12 * 8, 32 },
"Done"
"Save"
};
Button button_cancel {
{ 16 * 8, 16 * 16, 12 * 8, 32 },
"Cancel",
"Cancel"
};
void form_init(const SetDateTimeModel& model);
@ -174,7 +174,7 @@ private:
Button button_done {
{ 2 * 8, 16 * 16, 12 * 8, 32 },
"Done"
"Save"
};
Button button_cancel {
{ 16 * 8, 16 * 16, 12 * 8, 32 },
@ -194,11 +194,11 @@ public:
std::string title() const override { return "UI settings"; };
private:
Checkbox checkbox_login {
/*Checkbox checkbox_login {
{ 3 * 8, 2 * 16 },
20,
"Login with play dead"
};
};*/
Checkbox checkbox_bloff {
{ 3 * 8, 5 * 16 },
@ -212,7 +212,9 @@ private:
{
{ "5 seconds", 5 },
{ "15 seconds", 15 },
{ "30 seconds", 30 },
{ "1 minute", 60 },
{ "3 minutes", 180 },
{ "5 minutes", 300 },
{ "10 minutes", 600 }
}
@ -226,7 +228,7 @@ private:
Button button_ok {
{ 2 * 8, 16 * 16, 12 * 8, 32 },
"OK"
"Save"
};
};
@ -253,10 +255,11 @@ private:
Button button_ok {
{ 2 * 8, 16 * 16, 12 * 8, 32 },
"OK"
"Save"
};
};
/*
class SetPlayDeadView : public View {
public:
SetPlayDeadView(NavigationView& nav);
@ -284,7 +287,7 @@ private:
{ 128, 192, 96, 24 },
"Cancel"
};
};
};*/
/*class ModInfoView : public View {
public: