Popups can now have an handler. It could perhaps avoid another EEPROM format @3djc ?

This commit is contained in:
Bertrand Songis
2019-03-21 15:44:16 +01:00
parent 4de9e3f73b
commit d4b14f614c
21 changed files with 104 additions and 61 deletions
+2 -2
View File
@@ -52,7 +52,7 @@ void onModelSelectMenu(const char * result)
else if (result == STR_DELETE_MODEL) {
char * nametmp = reusableBuffer.modelsel.mainname;
strcat_modelname (nametmp, sub);
POPUP_CONFIRMATION(STR_DELETEMODEL);
POPUP_CONFIRMATION(STR_DELETEMODEL, nullptr);
SET_WARNING_INFO(nametmp, sizeof(g_model.header.name), 0);
}
else if (result) {
@@ -102,7 +102,7 @@ void menuModelSelect(event_t event)
if (s_copyMode && s_copyTgtOfs == 0 && g_eeGeneral.currModel != sub && eeModelExists(sub)) {
char * nametmp = reusableBuffer.modelsel.mainname;
strcat_modelname (nametmp, sub);
POPUP_CONFIRMATION(STR_DELETEMODEL);
POPUP_CONFIRMATION(STR_DELETEMODEL, nullptr);
SET_WARNING_INFO(nametmp, sizeof(g_model.header.name), 0);
killEvents(event);
break;
+1 -1
View File
@@ -506,7 +506,7 @@ void menuModelTelemetryFrsky(event_t event)
s_editMode = 0;
if (attr && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(KEY_ENTER);
POPUP_CONFIRMATION(STR_CONFIRMDELETE);
POPUP_CONFIRMATION(STR_CONFIRMDELETE, nullptr);
}
break;
+15 -3
View File
@@ -86,6 +86,8 @@ void showAlertBox(const char * title, const char * text, const char * action, ui
void runPopupWarning(event_t event)
{
warningResult = false;
drawMessageBox(warningText);
if (warningInfoText) {
@@ -99,12 +101,22 @@ void runPopupWarning(event_t event)
if (warningType == WARNING_TYPE_ASTERISK)
break;
if (warningType != WARNING_TYPE_INFO)
popupMenuHandler(STR_OK);
if (warningType == WARNING_TYPE_CONFIRM) {
warningType = WARNING_TYPE_ASTERISK;
warningText = nullptr;
warningResult = true;
if (popupMenuHandler)
popupMenuHandler(STR_OK);
break;
}
// no break
case EVT_KEY_BREAK(KEY_EXIT):
warningText = NULL;
if (warningType == WARNING_TYPE_CONFIRM) {
if (popupMenuHandler)
popupMenuHandler(STR_EXIT);
}
warningText = nullptr;
warningType = WARNING_TYPE_ASTERISK;
break;
}
+1 -1
View File
@@ -39,7 +39,7 @@ extern uint8_t warningInfoFlags;
#define DISPLAY_WARNING (*popupFunc)
#define POPUP_INFORMATION(s) (warningText = s, warningType = WARNING_TYPE_INFO, warningInfoText = 0, popupFunc = runPopupWarning)
#define POPUP_WARNING(s) (warningText = s, warningInfoText = 0, popupFunc = runPopupWarning)
#define POPUP_CONFIRMATION(s) (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning)
#define POPUP_CONFIRMATION(s, func) (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning, popupMenuHandler = func)
#define POPUP_INPUT(s, func) (warningText = s, popupFunc = func)
#define WARNING_INFO_FLAGS warningInfoFlags
#define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
+1 -1
View File
@@ -460,7 +460,7 @@ void menuRadioSetup(event_t event)
if (g_eeGeneral.fai)
POPUP_WARNING("FAI\001mode blocked!");
else
POPUP_CONFIRMATION("FAI mode?");
POPUP_CONFIRMATION("FAI mode?", nullptr);
}
break;
#endif
+1 -1
View File
@@ -46,6 +46,6 @@ void menuRadioVersion(event_t event)
eepromBackup();
}
else if (event == EVT_KEY_LONG(KEY_MENU)) {
POPUP_CONFIRMATION(STR_CONFIRMRESET);
POPUP_CONFIRMATION(STR_CONFIRMRESET, nullptr);
}
}
+1 -1
View File
@@ -149,7 +149,7 @@ void menuStatisticsDebug(event_t event)
#if defined(WATCHDOG_TEST)
case EVT_KEY_LONG(KEY_MENU):
{
POPUP_CONFIRMATION("Test the watchdog?");
POPUP_CONFIRMATION("Test the watchdog?", nullptr);
const char * w = "The radio will reset!";
SET_WARNING_INFO(w, strlen(w), 0);
}