From 282ad42006ba095799270c9201a285ac7fe155f2 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 2 Dec 2019 11:30:30 +0100 Subject: [PATCH] Revert --- radio/src/gui/colorlcd/CMakeLists.txt | 1 + radio/src/gui/colorlcd/confirm_dialog.cpp | 44 +++++++++++++++++++++++ radio/src/gui/colorlcd/confirm_dialog.h | 38 ++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 radio/src/gui/colorlcd/confirm_dialog.cpp create mode 100644 radio/src/gui/colorlcd/confirm_dialog.h diff --git a/radio/src/gui/colorlcd/CMakeLists.txt b/radio/src/gui/colorlcd/CMakeLists.txt index ea0c16f88..b2611f23d 100644 --- a/radio/src/gui/colorlcd/CMakeLists.txt +++ b/radio/src/gui/colorlcd/CMakeLists.txt @@ -96,6 +96,7 @@ foreach(LIBOPENUI_FILE ${LIBOPENUI_SRC}) endforeach() add_gui_src(fullscreen_dialog.cpp) +add_gui_src(confirm_dialog.cpp) add_gui_src(timeedit.cpp) add_gui_src(curve.cpp) add_gui_src(sourcechoice.cpp) diff --git a/radio/src/gui/colorlcd/confirm_dialog.cpp b/radio/src/gui/colorlcd/confirm_dialog.cpp new file mode 100644 index 000000000..87f2f69cd --- /dev/null +++ b/radio/src/gui/colorlcd/confirm_dialog.cpp @@ -0,0 +1,44 @@ +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "confirm_dialog.h" +#include "static.h" + +ConfirmDialog::ConfirmDialog(const char * title, const char * message, std::function confirmHandler) : + Dialog(title, {50, 73, LCD_W - 100, LCD_H - 146}), + confirmHandler(std::move(confirmHandler)) +{ + new StaticText(this, {0, height() / 2, width(), PAGE_LINE_HEIGHT}, message, CENTERED); +} + +#if defined(HARDWARE_KEYS) +void ConfirmDialog::onEvent(event_t event) +{ + TRACE_WINDOWS("%s received event 0x%X", getWindowDebugString().c_str(), event); + + if (event == EVT_KEY_BREAK(KEY_ENTER)) { + deleteLater(); // this restore the focus (it can be changed then in confirmHandler) + confirmHandler(); + } + else if (event == EVT_KEY_BREAK(KEY_EXIT)) { + deleteLater(); + } +} +#endif diff --git a/radio/src/gui/colorlcd/confirm_dialog.h b/radio/src/gui/colorlcd/confirm_dialog.h new file mode 100644 index 000000000..8d6c2b841 --- /dev/null +++ b/radio/src/gui/colorlcd/confirm_dialog.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _CONFIRM_DIALOG_H_ +#define _CONFIRM_DIALOG_H_ + +#include "dialog.h" + +class ConfirmDialog: public Dialog { + public: + ConfirmDialog(const char * title, const char * message, std::function confirmHandler); + +#if defined(HARDWARE_KEYS) + void onEvent(event_t event) override; +#endif + + protected: + std::function confirmHandler; +}; + +#endif // _CONFIRM_DIALOG_H_