mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-18 16:27:34 +01:00
[apps/settings] Unify prompt controller
This commit is contained in:
@@ -1,7 +1,8 @@
|
|||||||
#include "main_controller.h"
|
|
||||||
#include "../exam_mode_configuration.h"
|
|
||||||
#include <apps/i18n.h>
|
#include <apps/i18n.h>
|
||||||
|
|
||||||
|
#include "../exam_mode_configuration.h"
|
||||||
|
#include "main_controller.h"
|
||||||
|
|
||||||
using namespace Shared;
|
using namespace Shared;
|
||||||
|
|
||||||
namespace Settings {
|
namespace Settings {
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ constexpr SettingsMessageTree s_modelMenu[] =
|
|||||||
#ifdef HAS_CODE
|
#ifdef HAS_CODE
|
||||||
SettingsMessageTree(I18n::Message::CodeApp, s_codeChildren),
|
SettingsMessageTree(I18n::Message::CodeApp, s_codeChildren),
|
||||||
#endif
|
#endif
|
||||||
//SettingsMessageTree(I18n::Message::UsbSetting, s_usbProtectionChildren),
|
|
||||||
SettingsMessageTree(I18n::Message::ExternalApps, s_externalChildren),
|
SettingsMessageTree(I18n::Message::ExternalApps, s_externalChildren),
|
||||||
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren),
|
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren),
|
||||||
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren)};
|
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren)};
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
#include "main_controller.h"
|
|
||||||
#include "../exam_mode_configuration.h"
|
|
||||||
#include <apps/i18n.h>
|
#include <apps/i18n.h>
|
||||||
|
|
||||||
namespace Settings {
|
#include "../exam_mode_configuration.h"
|
||||||
|
#include "main_controller.h"
|
||||||
|
|
||||||
using namespace Shared;
|
using namespace Shared;
|
||||||
|
|
||||||
|
namespace Settings {
|
||||||
|
|
||||||
constexpr SettingsMessageTree s_modelMenu[] =
|
constexpr SettingsMessageTree s_modelMenu[] =
|
||||||
{SettingsMessageTree(I18n::Message::MathOptions, s_modelMathOptionsChildren),
|
{SettingsMessageTree(I18n::Message::MathOptions, s_modelMathOptionsChildren),
|
||||||
SettingsMessageTree(I18n::Message::BrightnessSettings, s_brightnessChildren),
|
SettingsMessageTree(I18n::Message::BrightnessSettings, s_brightnessChildren),
|
||||||
@@ -17,8 +18,8 @@ constexpr SettingsMessageTree s_modelMenu[] =
|
|||||||
SettingsMessageTree(I18n::Message::CodeApp, s_codeChildren),
|
SettingsMessageTree(I18n::Message::CodeApp, s_codeChildren),
|
||||||
#endif
|
#endif
|
||||||
SettingsMessageTree(I18n::Message::UpdatePopUp),
|
SettingsMessageTree(I18n::Message::UpdatePopUp),
|
||||||
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren),
|
|
||||||
SettingsMessageTree(I18n::Message::ExternalApps, s_externalChildren),
|
SettingsMessageTree(I18n::Message::ExternalApps, s_externalChildren),
|
||||||
|
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren),
|
||||||
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren)};
|
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren)};
|
||||||
|
|
||||||
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu);
|
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu);
|
||||||
|
|||||||
Reference in New Issue
Block a user