UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-20 09:17:23 +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;
}