[Update] Epsilon 14

This commit is contained in:
Joachim LF
2020-07-09 15:33:21 +02:00
committed by Quentin Guidée
320 changed files with 6893 additions and 2610 deletions

View File

@@ -19,11 +19,11 @@ MathOptionsController::MathOptionsController(Responder * parentResponder, InputE
bool MathOptionsController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) {
GenericSubController * subController = nullptr;
if (m_messageTreeModel->children(selectedRow())->label() == I18n::Message::DisplayMode)
if (m_messageTreeModel->childAtIndex(selectedRow())->label() == I18n::Message::DisplayMode)
subController = &m_displayModeController;
else
subController = &m_preferencesController;
subController->setMessageTreeModel(m_messageTreeModel->children(selectedRow()));
subController->setMessageTreeModel(m_messageTreeModel->childAtIndex(selectedRow()));
StackViewController * stack = stackController();
stack->push(subController);
return true;
@@ -45,7 +45,7 @@ int MathOptionsController::reusableCellCount(int type) {
void MathOptionsController::willDisplayCellForIndex(HighlightCell * cell, int index) {
MessageTableCellWithChevronAndMessage * myTextCell = (MessageTableCellWithChevronAndMessage *)cell;
Preferences * preferences = Preferences::sharedPreferences();
I18n::Message thisLabel = m_messageTreeModel->children(index)->label();
I18n::Message thisLabel = m_messageTreeModel->childAtIndex(index)->label();
myTextCell->setMessage(thisLabel);
//add text for preferences
@@ -72,7 +72,7 @@ void MathOptionsController::willDisplayCellForIndex(HighlightCell * cell, int in
default:
break;
}
I18n::Message message = childIndex >= 0 ? m_messageTreeModel->children(index)->children(childIndex)->label() : I18n::Message::Default;
I18n::Message message = childIndex >= 0 ? m_messageTreeModel->childAtIndex(index)->childAtIndex(childIndex)->label() : I18n::Message::Default;
myTextCell->setSubtitle(message);
}