diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp index 8c790fb62..7e773f5f6 100644 --- a/radio/src/gui/128x64/popups.cpp +++ b/radio/src/gui/128x64/popups.cpp @@ -72,55 +72,3 @@ void drawAlertBox(const char * title, const char * text, const char * action) #undef MESSAGE_LCD_OFFSET } - -void showAlertBox(const char * title, const char * text, const char * action , uint8_t sound) -{ - drawAlertBox(title, text, action); - - AUDIO_ERROR_MESSAGE(sound); - - lcdRefresh(); - lcdSetContrast(); - clearKeyEvents(); - backlightOn(); - checkBacklight(); -} - -void runPopupWarning(event_t event) -{ - warningResult = false; - - drawMessageBox(); - - 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) - // key ignored, the user has to press [EXIT] - break; - - 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): - if (warningType == WARNING_TYPE_CONFIRM) { - if (popupMenuHandler) - popupMenuHandler(STR_EXIT); - } - warningText = nullptr; - warningType = WARNING_TYPE_ASTERISK; - break; - } -} diff --git a/radio/src/gui/212x64/popups.cpp b/radio/src/gui/212x64/popups.cpp index e8c19f932..3a85afb4c 100644 --- a/radio/src/gui/212x64/popups.cpp +++ b/radio/src/gui/212x64/popups.cpp @@ -72,52 +72,3 @@ void drawAlertBox(const char * title, const char * text, const char * action) #undef MESSAGE_LCD_OFFSET } - -void showAlertBox(const char * title, const char * text, const char * action, uint8_t sound) -{ - drawAlertBox(title, text, action); - AUDIO_ERROR_MESSAGE(sound); - lcdRefresh(); - lcdSetContrast(); - clearKeyEvents(); - backlightOn(); - checkBacklight(); -} - -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_CONFIRM) { - warningType = WARNING_TYPE_ASTERISK; - warningText = nullptr; - warningResult = true; - if (popupMenuHandler) - popupMenuHandler(STR_OK); - break; - } - // no break - - case EVT_KEY_BREAK(KEY_EXIT): - if (warningType == WARNING_TYPE_CONFIRM) { - if (popupMenuHandler) - popupMenuHandler(STR_EXIT); - } - warningText = nullptr; - warningType = WARNING_TYPE_ASTERISK; - break; - } -} diff --git a/radio/src/gui/common/stdlcd/popups.cpp b/radio/src/gui/common/stdlcd/popups.cpp index 0937d0a5c..69293745a 100644 --- a/radio/src/gui/common/stdlcd/popups.cpp +++ b/radio/src/gui/common/stdlcd/popups.cpp @@ -134,3 +134,53 @@ const char * runPopupMenu(event_t event) return result; } + +void runPopupWarning(event_t event) +{ + warningResult = false; + + drawMessageBox(); + + 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) + // key ignored, the user has to press [EXIT] + break; + + 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): + if (warningType == WARNING_TYPE_CONFIRM) { + if (popupMenuHandler) + popupMenuHandler(STR_EXIT); + } + warningText = nullptr; + warningType = WARNING_TYPE_ASTERISK; + break; + } +} + +void showAlertBox(const char * title, const char * text, const char * action , uint8_t sound) +{ + drawAlertBox(title, text, action); + AUDIO_ERROR_MESSAGE(sound); + lcdRefresh(); + lcdSetContrast(); + clearKeyEvents(); + backlightOn(); + checkBacklight(); +}