UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix main_controller

Browse Source
This commit is contained in:
BuildTools
2019-11-10 10:43:30 -05:00
parent 21de90d388
commit d4ac3e9fc9
5 changed files with 6 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/settings/main_controller.cpp
View File

@@ -17,13 +17,8 @@ MainController::MainController(Responder * parentResponder, InputEventHandlerDel
m_languageController(this, 13),
m_accessibilityController(this),
m_examModeController(this),
<<<<<<< HEAD
m_aboutController(this),
m_contributorsController(this),
m_symbolController(this)
=======
m_aboutController(this)
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
{
for (int i = 0; i < k_numberOfSimpleChevronCells; i++) {
m_cells[i].setMessageFont(KDFont::LargeFont);
@@ -82,13 +77,8 @@ bool MainController::handleEvent(Ion::Events::Event event) {
subController = &m_aboutController;
} else if (model()->children(selectedRow())->label() == I18n::Message::Accessibility) {
subController = &m_accessibilityController;
<<<<<<< HEAD
} else if (rowIndex == 10 + hasPrompt()) {
subController = &m_contributorsController;
} else if (rowIndex == 11 + hasPrompt()){
} else if (model()->children(selectedRow())->label() == I18n::Message::SymbolMultiplication){
subController = &m_symbolController;
=======
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
} else {
subController = &m_preferencesController;
}

8
apps/settings/main_controller.h
View File

@@ -9,11 +9,7 @@
#include "sub_menu/exam_mode_controller.h"
#include "sub_menu/language_controller.h"
#include "sub_menu/preferences_controller.h"
<<<<<<< HEAD
#include "sub_menu/contributors_controller.h"
#include "sub_menu/symbol_controller.h"
=======
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
namespace Settings {
@@ -48,11 +44,7 @@ private:
AccessibilityController m_accessibilityController;
ExamModeController m_examModeController;
AboutController m_aboutController;
<<<<<<< HEAD
ContributorsController m_contributorsController;
SymbolController m_symbolController;
=======
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
};
}

16
apps/settings/main_controller_prompt_beta.cpp
View File

@@ -19,11 +19,7 @@ constexpr SettingsMessageTree s_modelAboutChildren[6] = {SettingsMessageTree(I18
constexpr SettingsMessageTree s_modelAboutChildren[5] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5)};
#endif
constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)};
<<<<<<< HEAD
constexpr SettingsMessageTree s_contributorsChildren[5] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess)};
constexpr SettingsMessageTree s_symbolChildren[4] = {SettingsMessageTree(I18n::Message::SymbolMultiplicationCross),SettingsMessageTree(I18n::Message::SymbolMultiplicationMiddleDot),SettingsMessageTree(I18n::Message::SymbolMultiplicationStar),SettingsMessageTree(I18n::Message::SymbolMultiplicationAutoSymbol)};
=======
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3),
@@ -32,25 +28,17 @@ constexpr SettingsMessageTree s_modelMenu[] =
SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren, 3),
SettingsMessageTree(I18n::Message::Brightness),
SettingsMessageTree(I18n::Message::Language),
SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 1),
SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 2),
SettingsMessageTree(I18n::Message::BetaPopUp),
#ifdef USERNAME
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 6),
#else
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 5),
#endif
<<<<<<< HEAD
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5),
SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren, 4)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 13);
=======
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 10);
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 11);
I18n::Message MainController::promptMessage() const {
return I18n::Message::BetaPopUp;

14
apps/settings/main_controller_prompt_none.cpp
View File

@@ -20,11 +20,7 @@ constexpr SettingsMessageTree s_modelAboutChildren[6] = {SettingsMessageTree(I18
constexpr SettingsMessageTree s_modelAboutChildren[5] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5)};
#endif
constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)};
<<<<<<< HEAD
constexpr SettingsMessageTree s_contributorsChildren[5] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess)};
constexpr SettingsMessageTree s_symbolChildren[4] = {SettingsMessageTree(I18n::Message::SymbolMultiplicationCross),SettingsMessageTree(I18n::Message::SymbolMultiplicationMiddleDot),SettingsMessageTree(I18n::Message::SymbolMultiplicationStar),SettingsMessageTree(I18n::Message::SymbolMultiplicationAutoSymbol)};
=======
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3),
@@ -39,18 +35,10 @@ constexpr SettingsMessageTree s_modelMenu[] =
#else
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 5),
#endif
<<<<<<< HEAD
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5),
SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren, 4)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 12);
=======
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 9);
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 10);
I18n::Message MainController::promptMessage() const {
return I18n::Message::Default;

16
apps/settings/main_controller_prompt_update.cpp
View File

@@ -19,11 +19,7 @@ constexpr SettingsMessageTree s_modelAboutChildren[6] = {SettingsMessageTree(I18
constexpr SettingsMessageTree s_modelAboutChildren[5] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5)};
#endif
constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)};
<<<<<<< HEAD
constexpr SettingsMessageTree s_contributorsChildren[5] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess)};
constexpr SettingsMessageTree s_symbolChildren[4] = {SettingsMessageTree(I18n::Message::SymbolMultiplicationCross),SettingsMessageTree(I18n::Message::SymbolMultiplicationMiddleDot),SettingsMessageTree(I18n::Message::SymbolMultiplicationStar),SettingsMessageTree(I18n::Message::SymbolMultiplicationAutoSymbol)};
=======
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 3),
@@ -32,25 +28,17 @@ constexpr SettingsMessageTree s_modelMenu[] =
SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren, 3),
SettingsMessageTree(I18n::Message::Brightness),
SettingsMessageTree(I18n::Message::Language),
SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 1),
SettingsMessageTree(I18n::Message::ExamMode, s_modelExamChildren, 2),
SettingsMessageTree(I18n::Message::UpdatePopUp),
#ifdef USERNAME
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 6),
#else
SettingsMessageTree(I18n::Message::About, s_modelAboutChildren, 5),
#endif
<<<<<<< HEAD
SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren, 4),
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6),
SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren, 5),
SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren, 4)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 13);
=======
SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren, 6)};
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 10);
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
constexpr SettingsMessageTree s_model = SettingsMessageTree(I18n::Message::SettingsApp, s_modelMenu, 11);
I18n::Message MainController::promptMessage() const {
return I18n::Message::UpdatePopUp;