NAVIGATION_MENUS definition removed

This commit is contained in:
Bertrand Songis
2019-03-21 15:21:16 +01:00
parent b0b027e958
commit 4de9e3f73b
9 changed files with 5 additions and 45 deletions
+5 -2
View File
@@ -86,18 +86,21 @@ void showAlertBox(const char * title, const char * text, const char * action, ui
void runPopupWarning(event_t event)
{
warningResult = false;
drawMessageBox(warningText);
if (warningInfoText) {
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS);
}
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT));
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
if (warningType == WARNING_TYPE_ASTERISK)
break;
if (warningType != WARNING_TYPE_INFO)
warningResult = true;
popupMenuHandler(STR_OK);
// no break
case EVT_KEY_BREAK(KEY_EXIT):
-1
View File
@@ -44,7 +44,6 @@ extern uint8_t warningInfoFlags;
#define WARNING_INFO_FLAGS warningInfoFlags
#define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
#define NAVIGATION_MENUS
#define POPUP_MENU_ADD_ITEM(s) do { popupMenuOffsetType = MENU_OFFSET_INTERNAL; if (popupMenuItemsCount < POPUP_MENU_MAX_LINES) popupMenuItems[popupMenuItemsCount++] = s; } while (0)
#define POPUP_MENU_SELECT_ITEM(s) s_menu_item = (s > 0 ? (s < popupMenuItemsCount ? s : popupMenuItemsCount) : 0)
#define POPUP_MENU_START(func) do { popupMenuHandler = (func); AUDIO_KEY_PRESS(); } while (0)