UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Substitute Escher app() by Container::activeApp()

Browse Source
This commit is contained in:
Ruben Dashyan
2019-07-18 16:10:26 +02:00
committed by EmilieNumworks
parent 1a2a651f36
commit 44809f4b3f
101 changed files with 181 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/app.h
View File

@@ -40,7 +40,7 @@ private:
};
inline App * app() {
return static_cast<App *>(::app());
return static_cast<App *>(Container::activeApp());
}
}

4
apps/calculation/edit_expression_controller.cpp
View File

@@ -61,7 +61,7 @@ void EditExpressionController::didBecomeFirstResponder() {
int lastRow = m_calculationStore->numberOfCalculations() > 0 ? m_calculationStore->numberOfCalculations()-1 : 0;
m_historyController->scrollToCell(0, lastRow);
((ContentView *)view())->expressionField()->setEditing(true, false);
app()->setFirstResponder(((ContentView *)view())->expressionField());
Container::activeApp()->setFirstResponder(((ContentView *)view())->expressionField());
}
bool EditExpressionController::textFieldDidReceiveEvent(::TextField * textField, Ion::Events::Event event) {
@@ -133,7 +133,7 @@ bool EditExpressionController::inputViewDidReceiveEvent(Ion::Events::Event event
if (m_calculationStore->numberOfCalculations() > 0) {
m_cacheBuffer[0] = 0;
((ContentView *)view())->expressionField()->setEditing(false, false);
app()->setFirstResponder(m_historyController);
Container::activeApp()->setFirstResponder(m_historyController);
}
return true;
}

14
apps/calculation/history_controller.cpp
View File

@@ -24,7 +24,7 @@ void HistoryController::reload() {
void HistoryController::didBecomeFirstResponder() {
selectCellAtLocation(0, numberOfRows()-1);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
void HistoryController::willExitResponderChain(Responder * nextFirstResponder) {
@@ -36,7 +36,7 @@ void HistoryController::willExitResponderChain(Responder * nextFirstResponder) {
bool HistoryController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Down) {
m_selectableTableView.deselectTable();
app()->setFirstResponder(parentResponder());
Container::activeApp()->setFirstResponder(parentResponder());
return true;
}
if (event == Ion::Events::Up) {
@@ -48,7 +48,7 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
SubviewType subviewType = selectedSubviewType();
EditExpressionController * editController = (EditExpressionController *)parentResponder();
m_selectableTableView.deselectTable();
app()->setFirstResponder(editController);
Container::activeApp()->setFirstResponder(editController);
Calculation * calculation = m_calculationStore->calculationAtIndex(focusRow);
if (subviewType == SubviewType::Input) {
editController->insertTextBody(calculation->inputText());
@@ -72,7 +72,7 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
m_calculationStore->deleteCalculationAtIndex(focusRow);
reload();
if (numberOfRows()== 0) {
app()->setFirstResponder(editController);
Container::activeApp()->setFirstResponder(editController);
return true;
}
if (focusRow > 0) {
@@ -92,13 +92,13 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
m_selectableTableView.deselectTable();
m_calculationStore->deleteAll();
reload();
app()->setFirstResponder(parentResponder());
Container::activeApp()->setFirstResponder(parentResponder());
return true;
}
if (event == Ion::Events::Back) {
EditExpressionController * editController = (EditExpressionController *)parentResponder();
m_selectableTableView.deselectTable();
app()->setFirstResponder(editController);
Container::activeApp()->setFirstResponder(editController);
return true;
}
return false;
@@ -120,7 +120,7 @@ void HistoryController::tableViewDidChangeSelection(SelectableTableView * t, int
if (selectedCell == nullptr) {
return;
}
app()->setFirstResponder(selectedCell);
Container::activeApp()->setFirstResponder(selectedCell);
}
int HistoryController::numberOfRows() {

6
apps/calculation/history_view_cell.cpp
View File

@@ -167,9 +167,9 @@ void HistoryViewCell::setCalculation(Calculation * calculation, bool expanded) {
void HistoryViewCell::didBecomeFirstResponder() {
assert(m_dataSource);
if (m_dataSource->selectedSubviewType() == HistoryViewCellDataSource::SubviewType::Input) {
app()->setFirstResponder(&m_inputView);
Container::activeApp()->setFirstResponder(&m_inputView);
} else {
app()->setFirstResponder(&m_scrollableOutputView);
Container::activeApp()->setFirstResponder(&m_scrollableOutputView);
}
}
@@ -181,7 +181,7 @@ bool HistoryViewCell::handleEvent(Ion::Events::Event event) {
m_dataSource->setSelectedSubviewType(otherSubviewType, this);
CalculationSelectableTableView * tableView = (CalculationSelectableTableView *)parentResponder();
tableView->scrollToSubviewOfTypeOfCellAtLocation(otherSubviewType, tableView->selectedColumn(), tableView->selectedRow());
app()->setFirstResponder(this);
Container::activeApp()->setFirstResponder(this);
return true;
}
return false;

2
apps/code/app.h
View File

@@ -85,7 +85,7 @@ private:
};
inline App * app() {
return static_cast<App *>(::app());
return static_cast<App *>(Container::activeApp());
}
}

4
apps/code/console_controller.cpp
View File

@@ -153,7 +153,7 @@ void ConsoleController::viewWillAppear() {
}
void ConsoleController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_editCell);
Container::activeApp()->setFirstResponder(&m_editCell);
}
bool ConsoleController::handleEvent(Ion::Events::Event event) {
@@ -162,7 +162,7 @@ bool ConsoleController::handleEvent(Ion::Events::Event event) {
const char * text = m_consoleStore.lineAtIndex(m_selectableTableView.selectedRow()).text();
m_editCell.setEditing(true);
m_selectableTableView.selectCellAtLocation(0, m_consoleStore.numberOfLines());
app()->setFirstResponder(&m_editCell);
Container::activeApp()->setFirstResponder(&m_editCell);
return m_editCell.insertText(text);
}
} else if (event == Ion::Events::Clear) {

2
apps/code/console_edit_cell.cpp
View File

@@ -35,7 +35,7 @@ void ConsoleEditCell::layoutSubviews() {
}
void ConsoleEditCell::didBecomeFirstResponder() {
app()->setFirstResponder(&m_textField);
Container::activeApp()->setFirstResponder(&m_textField);
}
void ConsoleEditCell::setEditing(bool isEditing, bool reinitDraftBuffer) {

2
apps/code/console_line_cell.cpp
View File

@@ -90,7 +90,7 @@ void ConsoleLineCell::layoutSubviews() {
}
void ConsoleLineCell::didBecomeFirstResponder() {
app()->setFirstResponder(&m_scrollableView);
Container::activeApp()->setFirstResponder(&m_scrollableView);
}
}

2
apps/code/editor_controller.cpp
View File

@@ -39,7 +39,7 @@ bool EditorController::handleEvent(Ion::Events::Event event) {
}
void EditorController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_editorView);
Container::activeApp()->setFirstResponder(&m_editorView);
}
void EditorController::viewWillAppear() {

2
apps/code/editor_view.cpp
View File

@@ -31,7 +31,7 @@ View * EditorView::subviewAtIndex(int index) {
}
void EditorView::didBecomeFirstResponder() {
app()->setFirstResponder(&m_textArea);
Container::activeApp()->setFirstResponder(&m_textArea);
}
void EditorView::layoutSubviews() {

18
apps/code/menu_controller.cpp
View File

@@ -61,14 +61,14 @@ void MenuController::didBecomeFirstResponder() {
}
if (footer()->selectedButton() == 0) {
assert(m_selectableTableView.selectedRow() < 0);
app()->setFirstResponder(&m_consoleButton);
Container::activeApp()->setFirstResponder(&m_consoleButton);
return;
}
if (m_selectableTableView.selectedRow() < 0) {
m_selectableTableView.selectCellAtLocation(0,0);
}
assert(m_selectableTableView.selectedRow() < m_scriptStore->numberOfScripts() + 1);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
#if EPSILON_GETOPT
if (consoleController()->locked()) {
consoleController()->setAutoImport(true);
@@ -92,7 +92,7 @@ bool MenuController::handleEvent(Ion::Events::Event event) {
if (footer()->selectedButton() == 0) {
footer()->setSelectedButton(-1);
m_selectableTableView.selectCellAtLocation(0, numberOfRows()-1);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
return true;
}
}
@@ -124,7 +124,7 @@ void MenuController::renameSelectedScript() {
AppsContainer::sharedAppsContainer()->setShiftAlphaStatus(Ion::Events::ShiftAlphaStatus::AlphaLock);
m_selectableTableView.selectCellAtLocation(0, (m_selectableTableView.selectedRow()));
ScriptNameCell * myCell = static_cast<ScriptNameCell *>(m_selectableTableView.selectedCell());
app()->setFirstResponder(myCell);
Container::activeApp()->setFirstResponder(myCell);
myCell->setHighlighted(false);
myCell->textField()->setEditing(true, false);
myCell->textField()->setCursorLocation(myCell->textField()->text() + strlen(myCell->textField()->text()));
@@ -337,16 +337,16 @@ bool MenuController::textFieldDidFinishEditing(TextField * textField, const char
}
m_selectableTableView.selectedCell()->setHighlighted(true);
reloadConsole();
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
AppsContainer::sharedAppsContainer()->setShiftAlphaStatus(Ion::Events::ShiftAlphaStatus::Default);
return true;
} else if (error == Script::ErrorStatus::NameTaken) {
app()->displayWarning(I18n::Message::NameTaken);
Container::activeApp()->displayWarning(I18n::Message::NameTaken);
} else if (error == Script::ErrorStatus::NonCompliantName) {
app()->displayWarning(I18n::Message::AllowedCharactersaz09, I18n::Message::NameCannotStartWithNumber);
Container::activeApp()->displayWarning(I18n::Message::AllowedCharactersaz09, I18n::Message::NameCannotStartWithNumber);
} else {
assert(error == Script::ErrorStatus::NotEnoughSpaceAvailable);
app()->displayWarning(I18n::Message::NameTooLong);
Container::activeApp()->displayWarning(I18n::Message::NameTooLong);
}
return false;
}
@@ -420,7 +420,7 @@ bool MenuController::privateTextFieldDidAbortEditing(TextField * textField, bool
textField->setText(scriptName);
if (menuControllerStaysInResponderChain) {
m_selectableTableView.selectCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow());
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
AppsContainer::sharedAppsContainer()->setShiftAlphaStatus(Ion::Events::ShiftAlphaStatus::Default);
return true;

2
apps/code/python_toolbox.cpp
View File

@@ -370,7 +370,7 @@ bool PythonToolbox::selectLeaf(int selectedRow) {
editedText = strippedEditedText;
}
sender()->handleEventWithText(editedText, true);
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}

2
apps/code/script_name_cell.cpp
View File

@@ -26,7 +26,7 @@ KDSize ScriptNameCell::minimalSizeForOptimalDisplay() const {
}
void ScriptNameCell::didBecomeFirstResponder() {
app()->setFirstResponder(&m_textField);
Container::activeApp()->setFirstResponder(&m_textField);
}
void ScriptNameCell::layoutSubviews() {

4
apps/code/script_parameter_controller.cpp
View File

@@ -45,7 +45,7 @@ bool ScriptParameterController::handleEvent(Ion::Events::Event event) {
m_script.toggleImportationStatus();
m_selectableTableView.reloadData();
m_menuController->reloadConsole();
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
return true;
case 3:
dismissScriptParameterController();
@@ -67,7 +67,7 @@ void ScriptParameterController::viewWillAppear() {
void ScriptParameterController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
HighlightCell * ScriptParameterController::reusableCell(int index) {

2
apps/code/variable_box_controller.cpp
View File

@@ -100,7 +100,7 @@ bool VariableBoxController::selectLeaf(int rowIndex) {
if (selectedScriptNode.type() == ScriptNode::Type::Function) {
insertTextInCaller(ScriptNodeCell::k_parenthesesWithEmpty);
}
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}

7
apps/exam_pop_up_controller.cpp
View File

@@ -47,8 +47,7 @@ bool ExamPopUpController::handleEvent(Ion::Events::Event event) {
ExamPopUpController::ContentView::ContentView(Responder * parentResponder) :
m_cancelButton(parentResponder, I18n::Message::Cancel, Invocation([](void * context, void * sender) {
AppsContainer * container = AppsContainer::sharedAppsContainer();
container->activeApp()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}, parentResponder), KDFont::SmallFont),
m_okButton(parentResponder, I18n::Message::Ok, Invocation([](void * context, void * sender) {
@@ -64,7 +63,7 @@ ExamPopUpController::ContentView::ContentView(Responder * parentResponder) :
Ion::LED::setColor(KDColorBlack);
}
container->refreshPreferences();
container->activeApp()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}, parentResponder), KDFont::SmallFont),
m_warningTextView(KDFont::SmallFont, I18n::Message::Warning, 0.5, 0.5, KDColorWhite, KDColorBlack),
@@ -81,7 +80,7 @@ void ExamPopUpController::ContentView::drawRect(KDContext * ctx, KDRect rect) co
void ExamPopUpController::ContentView::setSelectedButton(int selectedButton) {
m_cancelButton.setHighlighted(selectedButton == 0);
m_okButton.setHighlighted(selectedButton == 1);
app()->setFirstResponder(selectedButton == 0 ? &m_cancelButton : &m_okButton);
Container::activeApp()->setFirstResponder(selectedButton == 0 ? &m_cancelButton : &m_okButton);
}
int ExamPopUpController::ContentView::selectedButton() {

2
apps/graph/app.h
View File

@@ -53,7 +53,7 @@ private:
};
inline App * app() {
return static_cast<App *>(::app());
return static_cast<App *>(Container::activeApp());
}
}

2
apps/graph/graph/calculation_parameter_controller.cpp
View File

@@ -33,7 +33,7 @@ View * CalculationParameterController::view() {
void CalculationParameterController::didBecomeFirstResponder() {
m_selectableTableView.selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool CalculationParameterController::handleEvent(Ion::Events::Event event) {

2
apps/graph/graph/tangent_graph_controller.cpp
View File

@@ -34,7 +34,7 @@ void TangentGraphController::didBecomeFirstResponder() {
if (curveView()->isMainViewSelected()) {
m_bannerView->abscissaValue()->setParentResponder(this);
m_bannerView->abscissaValue()->setDelegates(textFieldDelegateApp(), this);
app()->setFirstResponder(m_bannerView->abscissaValue());
Container::activeApp()->setFirstResponder(m_bannerView->abscissaValue());
}
}

16
apps/graph/list/list_controller.cpp
View File

@@ -41,7 +41,7 @@ void ListController::renameSelectedFunction() {
AppsContainer::sharedAppsContainer()->setShiftAlphaStatus(Ion::Events::ShiftAlphaStatus::AlphaLock);
TextFieldFunctionTitleCell * selectedTitleCell = (TextFieldFunctionTitleCell *)(selectableTableView()->selectedCell());
selectedTitleCell->setHorizontalAlignment(1.0f);
app()->setFirstResponder(selectedTitleCell);
Container::activeApp()->setFirstResponder(selectedTitleCell);
selectedTitleCell->setEditing(true);
}
@@ -87,27 +87,27 @@ bool ListController::textFieldDidFinishEditing(TextField * textField, const char
}
m_selectableTableView.selectedCell()->setHighlighted(true);
m_selectableTableView.reloadData();
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
if (selectTab) {
m_selectableTableView.parentResponder()->handleEvent(event);
}
AppsContainer::sharedAppsContainer()->setShiftAlphaStatus(Ion::Events::ShiftAlphaStatus::Default);
return true;
} else if (error == Ion::Storage::Record::ErrorStatus::NameTaken) {
app()->displayWarning(I18n::Message::NameTaken);
Container::activeApp()->displayWarning(I18n::Message::NameTaken);
} else if (error == Ion::Storage::Record::ErrorStatus::NonCompliantName) {
assert(nameError != Function::NameNotCompliantError::None);
if (nameError == Function::NameNotCompliantError::CharacterNotAllowed) {
app()->displayWarning(I18n::Message::AllowedCharactersAZaz09);
Container::activeApp()->displayWarning(I18n::Message::AllowedCharactersAZaz09);
} else if (nameError == Function::NameNotCompliantError::NameCannotStartWithNumber) {
app()->displayWarning(I18n::Message::NameCannotStartWithNumber);
Container::activeApp()->displayWarning(I18n::Message::NameCannotStartWithNumber);
} else {
assert(nameError == Function::NameNotCompliantError::ReservedName);
app()->displayWarning(I18n::Message::ReservedName);
Container::activeApp()->displayWarning(I18n::Message::ReservedName);
}
} else {
assert(error == Ion::Storage::Record::ErrorStatus::NotEnoughSpaceAvailable);
app()->displayWarning(I18n::Message::NameTooLong);
Container::activeApp()->displayWarning(I18n::Message::NameTooLong);
}
textField->setEditing(true, false);
return false;
@@ -121,7 +121,7 @@ bool ListController::textFieldDidAbortEditing(TextField * textField) {
ExpiringPointer<Function> function = modelStore()->modelForRecord(modelStore()->recordAtIndex(selectedRow()));
setFunctionNameInTextField(function, textField);
m_selectableTableView.selectedCell()->setHighlighted(true);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
AppsContainer::sharedAppsContainer()->setShiftAlphaStatus(Ion::Events::ShiftAlphaStatus::Default);
return true;
}

4
apps/graph/list/text_field_function_title_cell.cpp
View File

@@ -24,7 +24,7 @@ Responder * TextFieldFunctionTitleCell::responder() {
}
void TextFieldFunctionTitleCell::setEditing(bool editing) {
app()->setFirstResponder(&m_textField);
Container::activeApp()->setFirstResponder(&m_textField);
const char * previousText = m_textField.text();
m_textField.setEditing(true, false);
m_textField.setText(previousText);
@@ -67,7 +67,7 @@ void TextFieldFunctionTitleCell::layoutSubviews() {
void TextFieldFunctionTitleCell::didBecomeFirstResponder() {
if (isEditing()) {
app()->setFirstResponder(&m_textField);
Container::activeApp()->setFirstResponder(&m_textField);
}
}

2
apps/graph/values/derivative_parameter_controller.cpp
View File

@@ -31,7 +31,7 @@ View * DerivativeParameterController::view() {
void DerivativeParameterController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool DerivativeParameterController::handleEvent(Ion::Events::Event event) {

6
apps/hardware_test/pop_up_controller.cpp
View File

@@ -35,7 +35,7 @@ bool PopUpController::handleEvent(Ion::Events::Event event) {
PopUpController::ContentView::ContentView(Responder * parentResponder) :
Responder(parentResponder),
m_cancelButton(this, I18n::Message::Cancel, Invocation([](void * context, void * sender) {
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}, this), KDFont::SmallFont),
m_okButton(this, I18n::Message::Ok, Invocation([](void * context, void * sender) {
@@ -61,9 +61,9 @@ void PopUpController::ContentView::setSelectedButton(int selectedButton) {
m_cancelButton.setHighlighted(selectedButton == 0);
m_okButton.setHighlighted(selectedButton == 1);
if (selectedButton == 0) {
app()->setFirstResponder(&m_cancelButton);
Container::activeApp()->setFirstResponder(&m_cancelButton);
} else {
app()->setFirstResponder(&m_okButton);
Container::activeApp()->setFirstResponder(&m_okButton);
}
}

2
apps/home/app.h
View File

@@ -27,7 +27,7 @@ private:
};
inline App * app() {
return static_cast<App *>(::app());
return static_cast<App *>(Container::activeApp());
}
}

2
apps/home/controller.cpp
View File

@@ -81,7 +81,7 @@ void Controller::didBecomeFirstResponder() {
if (selectionDataSource()->selectedRow() == -1) {
selectionDataSource()->selectCellAtLocation(0, 0);
}
app()->setFirstResponder(m_view.selectableTableView());
Container::activeApp()->setFirstResponder(m_view.selectableTableView());
}
void Controller::viewWillAppear() {

2
apps/math_toolbox.cpp
View File

@@ -120,7 +120,7 @@ bool MathToolbox::selectLeaf(int selectedRow) {
text = textToInsert;
}
sender()->handleEventWithText(text);
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}

2
apps/on_boarding/language_controller.cpp
View File

@@ -13,7 +13,7 @@ bool LanguageController::handleEvent(Ion::Events::Event event) {
if (Shared::LanguageController::handleEvent(event)) {
AppsContainer * appsContainer = AppsContainer::sharedAppsContainer();
#ifdef EPSILON_BOOT_PROMPT
app()->displayModalViewController(appsContainer->promptController(), 0.5f, 0.5f);
Container::activeApp()->displayModalViewController(appsContainer->promptController(), 0.5f, 0.5f);
#else
appsContainer->switchTo(appsContainer->appSnapshotAtIndex(0));
#endif

2
apps/on_boarding/logo_controller.cpp
View File

@@ -14,7 +14,7 @@ View * LogoController::view() {
}
bool LogoController::fire() {
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}

2
apps/on_boarding/pop_up_controller.cpp
View File

@@ -52,7 +52,7 @@ PopUpController::PopUpController(I18n::Message * messages, KDColor * colors, uin
bool PopUpController::handleEvent(Ion::Events::Event event) {
if (event != Ion::Events::Back && event != Ion::Events::OnOff && event != Ion::Events::USBPlug && event != Ion::Events::USBEnumeration) {
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
AppsContainer * appsContainer = AppsContainer::sharedAppsContainer();
if (appsContainer->activeApp()->snapshot() == appsContainer->onBoardingAppSnapshot()) {
bool switched = appsContainer->switchTo(appsContainer->appSnapshotAtIndex(0));

2
apps/probability/app.h
View File

@@ -64,7 +64,7 @@ private:
};
inline App * app() {
return static_cast<App *>(::app());
return static_cast<App *>(Container::activeApp());
}
}

4
apps/probability/calculation_controller.cpp
View File

@@ -86,7 +86,7 @@ void CalculationController::didEnterResponderChain(Responder * previousResponder
}
void CalculationController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
View * CalculationController::view() {
@@ -192,7 +192,7 @@ bool CalculationController::textFieldDidHandleEvent(::TextField * textField, boo
/* We do not reload the responder because the first responder might be the
* toolbox (or the variable box) and reloading the responder would corrupt
* the first responder. */
bool shouldUpdateFirstResponder = app()->firstResponder() == textField;
bool shouldUpdateFirstResponder = Container::activeApp()->firstResponder() == textField;
m_selectableTableView.reloadData(shouldUpdateFirstResponder);
// The textField frame might have increased which forces to reload the textField scroll
textField->scrollToCursor();

6
apps/probability/calculation_type_controller.cpp
View File

@@ -39,21 +39,21 @@ void CalculationTypeController::viewDidDisappear() {
}
void CalculationTypeController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool CalculationTypeController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
m_calculationController->setCalculationAccordingToIndex(selectedRow());
m_calculationController->reload();
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}
if (event == Ion::Events::Back || event == Ion::Events::Right) {
if (event == Ion::Events::Right) {
m_calculationController->selectCellAtLocation(1,0);
}
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}
return false;

2
apps/probability/law_controller.cpp
View File

@@ -79,7 +79,7 @@ void Probability::LawController::didBecomeFirstResponder() {
} else {
selectCellAtLocation(selectedColumn(), selectedRow());
}
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool Probability::LawController::handleEvent(Ion::Events::Event event) {

2
apps/probability/parameters_controller.cpp
View File

@@ -144,7 +144,7 @@ double ParametersController::parameterAtIndex(int index) {
bool ParametersController::setParameterAtIndex(int parameterIndex, double f) {
if (!m_law->authorizedValueAtIndex(f, parameterIndex)) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
m_law->setParameterAtIndex(f, parameterIndex);

4
apps/probability/responder_image_cell.cpp
View File

@@ -21,8 +21,8 @@ KDSize ResponderImageCell::minimalSizeForOptimalDisplay() const {
bool ResponderImageCell::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Down) {
KDPoint topLeftAngle = app()->modalView()->pointFromPointInView(this, KDPoint(k_outline, k_outline));
app()->displayModalViewController(&m_calculationTypeController, 0.0f, 0.0f, topLeftAngle.y(), topLeftAngle.x());
KDPoint topLeftAngle = Container::activeApp()->modalView()->pointFromPointInView(this, KDPoint(k_outline, k_outline));
Container::activeApp()->displayModalViewController(&m_calculationTypeController, 0.0f, 0.0f, topLeftAngle.y(), topLeftAngle.x());
return true;
}
return false;

2
apps/regression/app.h
View File

@@ -58,7 +58,7 @@ private:
};
inline App * app() {
return static_cast<App *>(::app());
return static_cast<App *>(Container::activeApp());
}
}

4
apps/regression/calculation_controller.cpp
View File

@@ -50,7 +50,7 @@ const char * CalculationController::title() {
bool CalculationController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Up) {
selectableTableView()->deselectTable();
app()->setFirstResponder(tabController());
Container::activeApp()->setFirstResponder(tabController());
return true;
}
return false;
@@ -78,7 +78,7 @@ void CalculationController::tableViewDidChangeSelection(SelectableTableView * t,
if (t->selectedRow() == 0 && t->selectedColumn() == 0) {
if (previousSelectedCellX == 0 && previousSelectedCellY == 1) {
selectableTableView()->deselectTable();
app()->setFirstResponder(tabController());
Container::activeApp()->setFirstResponder(tabController());
} else {
t->selectCellAtLocation(0, 1);
}

4
apps/regression/go_to_parameter_controller.cpp
View File

@@ -57,7 +57,7 @@ bool GoToParameterController::setParameterAtIndex(int parameterIndex, double f)
}
}
// Value not reached
app()->displayWarning(I18n::Message::ValueNotReachedByRegression);
Container::activeApp()->displayWarning(I18n::Message::ValueNotReachedByRegression);
return false;
}
m_graphController->selectRegressionCurve();
@@ -68,7 +68,7 @@ bool GoToParameterController::setParameterAtIndex(int parameterIndex, double f)
/* We here compute y2 = a*((y1-b)/a)+b, which does not always give y1,
* because of computation precision. y2 migth thus be invalid. */
if (std::isnan(yFromX) || std::isinf(yFromX)) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
m_cursor->moveTo(unknown, yFromX);

3
apps/regression/graph_options_controller.cpp
View File

@@ -2,7 +2,6 @@
#include "app.h"
#include "graph_controller.h"
#include "regression_controller.h"
#include <apps/apps_container.h>
#include <assert.h>
using namespace Shared;
@@ -32,7 +31,7 @@ void GraphOptionsController::didBecomeFirstResponder() {
if (selectedRow() < 0) {
selectCellAtLocation(0, 0);
}
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
void GraphOptionsController::viewWillAppear() {

2
apps/regression/initialisation_parameter_controller.cpp
View File

@@ -22,7 +22,7 @@ View * InitialisationParameterController::view() {
void InitialisationParameterController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool InitialisationParameterController::handleEvent(Ion::Events::Event event) {

2
apps/regression/regression_controller.cpp
View File

@@ -30,7 +30,7 @@ const char * RegressionController::title() {
void RegressionController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool RegressionController::handleEvent(Ion::Events::Event event) {

2
apps/regression/store_parameter_controller.cpp
View File

@@ -37,7 +37,7 @@ void StoreParameterController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
}
m_lastSelectionIsRegression = false;
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
HighlightCell * StoreParameterController::reusableCell(int index, int type) {

2
apps/sequence/app.h
View File

@@ -59,7 +59,7 @@ private:
};
inline App * app() {
return static_cast<App *>(::app());
return static_cast<App *>(Container::activeApp());
}
}

2
apps/sequence/list/list_controller.cpp
View File

@@ -258,7 +258,7 @@ int ListController::sequenceDefinitionForRow(int j) {
}
void ListController::addEmptyModel() {
app()->displayModalViewController(&m_typeStackController, 0.f, 0.f, Metric::TabHeight+Metric::ModalTopMargin, Metric::CommonRightMargin, Metric::ModalBottomMargin, Metric::CommonLeftMargin);
Container::activeApp()->displayModalViewController(&m_typeStackController, 0.f, 0.f, Metric::TabHeight+Metric::ModalTopMargin, Metric::CommonRightMargin, Metric::ModalBottomMargin, Metric::CommonLeftMargin);
}
void ListController::editExpression(Ion::Events::Event event) {

6
apps/sequence/list/list_parameter_controller.cpp
View File

@@ -77,7 +77,7 @@ bool ListParameterController::textFieldDidFinishEditing(TextField * textField, c
}
int index = std::round(floatBody);
if (index < 0 || floatBody >= maxFirstIndex) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
sequence()->setInitialRank(index);
@@ -104,7 +104,7 @@ void ListParameterController::tableViewDidChangeSelection(SelectableTableView *
if (myCell) {
myCell->setEditing(false);
}
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
#if FUNCTION_COLOR_CHOICE
if (t->selectedRow() == 2) {
@@ -112,7 +112,7 @@ void ListParameterController::tableViewDidChangeSelection(SelectableTableView *
if (t->selectedRow() == 1) {
#endif
MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->selectedCell();
app()->setFirstResponder(myNewCell);
Container::activeApp()->setFirstResponder(myNewCell);
}
}

2
apps/sequence/list/sequence_toolbox.cpp
View File

@@ -99,7 +99,7 @@ bool SequenceToolbox::selectAddedCell(int selectedRow){
char buffer[bufferSize];
m_addedCellLayout[selectedRow].serializeParsedExpression(buffer, bufferSize);
sender()->handleEventWithText(buffer);
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}

4
apps/sequence/list/type_parameter_controller.cpp
View File

@@ -49,7 +49,7 @@ void TypeParameterController::viewDidDisappear() {
void TypeParameterController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool TypeParameterController::handleEvent(Ion::Events::Event event) {
@@ -81,7 +81,7 @@ bool TypeParameterController::handleEvent(Ion::Events::Event event) {
Ion::Storage::Record record = sequenceStore()->recordAtIndex(sequenceStore()->numberOfModels()-1);
Sequence * newSequence = sequenceStore()->modelForRecord(record);
newSequence->setType((Sequence::Type)selectedRow());
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
m_listController->editExpression(0, Ion::Events::OK);
return true;
}

2
apps/sequence/values/interval_parameter_controller.cpp
View File

@@ -22,7 +22,7 @@ void IntervalParameterController::willDisplayCellForIndex(HighlightCell * cell,
bool IntervalParameterController::setParameterAtIndex(int parameterIndex, double f) {
if (f < 0) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
double parameter = std::round(f);

4
apps/settings/app.h
View File

@@ -25,10 +25,6 @@ private:
StackViewController m_stackViewController;
};
inline App * app() {
return static_cast<App *>(::app());
}
}
#endif

2
apps/settings/main_controller.cpp
View File

@@ -65,7 +65,7 @@ void MainController::didBecomeFirstResponder() {
if (selectedRow() < 0) {
selectCellAtLocation(0, 0);
}
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool MainController::handleEvent(Ion::Events::Event event) {

2
apps/settings/sub_menu/about_controller.cpp
View File

@@ -18,7 +18,7 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
/* We hide here the activation hardware test app: in the menu "about", by
* clicking on '6' on the last row. */
if ((event == Ion::Events::Six || event == Ion::Events::LowerT || event == Ion::Events::UpperT) && m_messageTreeModel->label() == I18n::Message::About && selectedRow() == numberOfRows()-1) {
app()->displayModalViewController(&m_hardwareTestPopUpController, 0.f, 0.f, Metric::ExamPopUpTopMargin, Metric::PopUpRightMargin, Metric::ExamPopUpBottomMargin, Metric::PopUpLeftMargin);
Container::activeApp()->displayModalViewController(&m_hardwareTestPopUpController, 0.f, 0.f, Metric::ExamPopUpTopMargin, Metric::PopUpRightMargin, Metric::ExamPopUpBottomMargin, Metric::PopUpLeftMargin);
return true;
}
if (event == Ion::Events::OK || event == Ion::Events::EXE) {

2
apps/settings/sub_menu/generic_sub_controller.cpp
View File

@@ -28,7 +28,7 @@ View * GenericSubController::view() {
void GenericSubController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool GenericSubController::handleEvent(Ion::Events::Event event) {

2
apps/settings/sub_menu/preferences_controller.cpp
View File

@@ -22,7 +22,7 @@ PreferencesController::PreferencesController(Responder * parentResponder) :
void PreferencesController::didBecomeFirstResponder() {
selectCellAtLocation(0, valueIndexForPreference(m_messageTreeModel->label()));
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool PreferencesController::handleEvent(Ion::Events::Event event) {

2
apps/shared/buffer_text_view_with_text_field.cpp
View File

@@ -40,7 +40,7 @@ void BufferTextViewWithTextField::drawRect(KDContext * ctx, KDRect rect) const {
}
void BufferTextViewWithTextField::didBecomeFirstResponder() {
app()->setFirstResponder(&m_textField);
Container::activeApp()->setFirstResponder(&m_textField);
m_textField.setEditing(true, false);
markRectAsDirty(bounds());
}

2
apps/shared/editable_cell_table_view_controller.cpp
View File

@@ -27,7 +27,7 @@ bool EditableCellTableViewController::textFieldDidFinishEditing(TextField * text
return false;
}
if (!setDataAtLocation(floatBody, selectedColumn(), selectedRow())) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
/* At this point, a new cell is selected depending on the event, before the

2
apps/shared/float_parameter_controller.cpp
View File

@@ -27,7 +27,7 @@ void FloatParameterController::didBecomeFirstResponder() {
selColumn = selColumn >= numberOfColumns() ? numberOfColumns() - 1 : selColumn;
selectCellAtLocation(selColumn, selRow);
}
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
void FloatParameterController::viewWillAppear() {

2
apps/shared/function_app.h
View File

@@ -32,7 +32,7 @@ public:
Poincare::Preferences::AngleUnit m_angleUnitVersion;
};
static FunctionApp * app() {
return static_cast<FunctionApp *>(::app());
return static_cast<FunctionApp *>(Container::activeApp());
}
virtual ~FunctionApp() = default;
virtual FunctionStore * functionStore() { return static_cast<FunctionApp::Snapshot *>(snapshot())->functionStore(); }

2
apps/shared/function_curve_parameter_controller.cpp
View File

@@ -19,7 +19,7 @@ void FunctionCurveParameterController::didBecomeFirstResponder() {
if (selectedRow() < 0) {
selectCellAtLocation(0, 0);
}
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool FunctionCurveParameterController::handleGotoSelection() {

2
apps/shared/function_graph_controller.cpp
View File

@@ -31,7 +31,7 @@ void FunctionGraphController::didBecomeFirstResponder() {
if (curveView()->isMainViewSelected()) {
bannerView()->abscissaValue()->setParentResponder(this);
bannerView()->abscissaValue()->setDelegates(textFieldDelegateApp(), this);
app()->setFirstResponder(bannerView()->abscissaValue());
Container::activeApp()->setFirstResponder(bannerView()->abscissaValue());
} else {
InteractiveCurveViewController::didBecomeFirstResponder();
}

6
apps/shared/function_list_controller.cpp
View File

@@ -154,7 +154,7 @@ void FunctionListController::didBecomeFirstResponder() {
selectCellAtLocation(selectedColumn(), numberOfRows()-1);
}
footer()->setSelectedButton(-1);
app()->setFirstResponder(selectableTableView());
Container::activeApp()->setFirstResponder(selectableTableView());
}
bool FunctionListController::handleEvent(Ion::Events::Event event) {
@@ -162,12 +162,12 @@ bool FunctionListController::handleEvent(Ion::Events::Event event) {
if (selectedRow() == -1) {
footer()->setSelectedButton(-1);
selectableTableView()->selectCellAtLocation(1, numberOfRows()-1);
app()->setFirstResponder(selectableTableView());
Container::activeApp()->setFirstResponder(selectableTableView());
return true;
}
selectableTableView()->deselectTable();
assert(selectedRow() == -1);
app()->setFirstResponder(tabController());
Container::activeApp()->setFirstResponder(tabController());
return true;
}
if (event == Ion::Events::Down) {

2
apps/shared/initialisation_parameter_controller.cpp
View File

@@ -29,7 +29,7 @@ if (event == Ion::Events::OK || event == Ion::Events::EXE) {
void InitialisationParameterController::didBecomeFirstResponder() {
m_selectableTableView.selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
int InitialisationParameterController::numberOfRows() {

2
apps/shared/input_event_handler_delegate.h
View File

@@ -11,7 +11,7 @@ public:
NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override { return inputEventHandlerDelegateApp()->variableBoxForInputEventHandler(textInput); }
private:
InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() const {
return static_cast<InputEventHandlerDelegateApp *>(::app());
return static_cast<InputEventHandlerDelegateApp *>(Container::activeApp());
}
};

4
apps/shared/interactive_curve_view_controller.cpp
View File

@@ -78,14 +78,14 @@ bool InteractiveCurveViewController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Down) {
header()->setSelectedButton(-1);
curveView()->selectMainView(true);
app()->setFirstResponder(this);
Container::activeApp()->setFirstResponder(this);
reloadBannerView();
curveView()->reload();
return true;
}
if (event == Ion::Events::Up) {
header()->setSelectedButton(-1);
app()->setFirstResponder(tabController());
Container::activeApp()->setFirstResponder(tabController());
return true;
}
return false;

4
apps/shared/interval_parameter_controller.cpp
View File

@@ -44,14 +44,14 @@ double IntervalParameterController::parameterAtIndex(int index) {
bool IntervalParameterController::setParameterAtIndex(int parameterIndex, double f) {
if (f <= 0.0f && parameterIndex == 2) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
double start = parameterIndex == 0 ? f : m_interval->start();
double end = parameterIndex == 1 ? f : m_interval->end();
if (start > end) {
if (parameterIndex == 1) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
double g = f+1.0;

2
apps/shared/language_controller.cpp
View File

@@ -31,7 +31,7 @@ View * LanguageController::view() {
}
void LanguageController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
void LanguageController::viewWillAppear() {

2
apps/shared/layout_field_delegate.h
View File

@@ -14,7 +14,7 @@ public:
void layoutFieldDidChangeSize(LayoutField * layoutField) override;
protected:
ExpressionFieldDelegateApp * expressionFieldDelegateApp() const {
return static_cast<ExpressionFieldDelegateApp *>(::app());
return static_cast<ExpressionFieldDelegateApp *>(Container::activeApp());
}
};

2
apps/shared/list_parameter_controller.cpp
View File

@@ -21,7 +21,7 @@ const char * ListParameterController::title() {
}
void ListParameterController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
void ListParameterController::viewWillAppear() {

2
apps/shared/message_controller.cpp
View File

@@ -8,7 +8,7 @@ MessageController::MessageController(I18n::Message * messages, KDColor * colors,
bool MessageController::handleEvent(Ion::Events::Event event) {
if (event != Ion::Events::Back && event != Ion::Events::OnOff && event != Ion::Events::Home) {
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}
return false;

2
apps/shared/scrollable_exact_approximate_expressions_cell.cpp
View File

@@ -32,7 +32,7 @@ void ScrollableExactApproximateExpressionsCell::reloadScroll() {
void ScrollableExactApproximateExpressionsCell::didBecomeFirstResponder() {
m_view.setSelectedSubviewPosition(ScrollableExactApproximateExpressionsView::SubviewPosition::Left);
app()->setFirstResponder(&m_view);
Container::activeApp()->setFirstResponder(&m_view);
}
int ScrollableExactApproximateExpressionsCell::numberOfSubviews() const {

14
apps/shared/store_controller.cpp
View File

@@ -36,7 +36,7 @@ void StoreController::ContentView::displayFormulaInput(bool display) {
}
void StoreController::ContentView::didBecomeFirstResponder() {
app()->setFirstResponder(m_displayFormulaInputView ? static_cast<Responder *>(&m_formulaInputView) : static_cast<Responder *>(&m_dataView));
Container::activeApp()->setFirstResponder(m_displayFormulaInputView ? static_cast<Responder *>(&m_formulaInputView) : static_cast<Responder *>(&m_dataView));
}
View * StoreController::ContentView::subviewAtIndex(int index) {
@@ -86,12 +86,12 @@ bool StoreController::textFieldDidFinishEditing(TextField * textField, const cha
// Handle formula input
Expression expression = Expression::Parse(textField->text());
if (expression.isUninitialized()) {
app()->displayWarning(I18n::Message::SyntaxError);
Container::activeApp()->displayWarning(I18n::Message::SyntaxError);
return false;
}
m_contentView.displayFormulaInput(false);
if (fillColumnWithFormula(expression)) {
app()->setFirstResponder(&m_contentView);
Container::activeApp()->setFirstResponder(&m_contentView);
}
return true;
}
@@ -107,7 +107,7 @@ bool StoreController::textFieldDidFinishEditing(TextField * textField, const cha
bool StoreController::textFieldDidAbortEditing(TextField * textField) {
if (textField == m_contentView.formulaInputView()->textField()) {
m_contentView.displayFormulaInput(false);
app()->setFirstResponder(&m_contentView);
Container::activeApp()->setFirstResponder(&m_contentView);
return true;
}
return EditableCellTableViewController::textFieldDidAbortEditing(textField);
@@ -185,7 +185,7 @@ bool StoreController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Up) {
selectableTableView()->deselectTable();
assert(selectedRow() == -1);
app()->setFirstResponder(tabController());
Container::activeApp()->setFirstResponder(tabController());
return true;
}
assert(selectedColumn() >= 0 && selectedColumn() < numberOfColumns());
@@ -213,7 +213,7 @@ void StoreController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
}
EditableCellTableViewController::didBecomeFirstResponder();
app()->setFirstResponder(&m_contentView);
Container::activeApp()->setFirstResponder(&m_contentView);
}
Responder * StoreController::tabController() const {
@@ -289,7 +289,7 @@ bool StoreController::privateFillColumnWithFormula(Expression formula, Expressio
// Compute the new value using the formula
double evaluation = PoincareHelpers::ApproximateToScalar<double>(formula, *store);
if (std::isnan(evaluation) || std::isinf(evaluation)) {
app()->displayWarning(I18n::Message::DataNotSuitable);
Container::activeApp()->displayWarning(I18n::Message::DataNotSuitable);
return false;
}
}

2
apps/shared/store_parameter_controller.cpp
View File

@@ -26,7 +26,7 @@ const char * StoreParameterController::title() {
void StoreParameterController::didBecomeFirstResponder() {
selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool StoreParameterController::handleEvent(Ion::Events::Event event) {

8
apps/shared/sum_graph_controller.cpp
View File

@@ -44,14 +44,14 @@ void SumGraphController::viewWillAppear() {
void SumGraphController::didEnterResponderChain(Responder * previousFirstResponder) {
app()->setFirstResponder(m_legendView.textField());
Container::activeApp()->setFirstResponder(m_legendView.textField());
}
bool SumGraphController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Back && m_step != Step::FirstParameter) {
m_step = (Step)((int)m_step-1);
if (m_step == Step::SecondParameter) {
app()->setFirstResponder(m_legendView.textField());
Container::activeApp()->setFirstResponder(m_legendView.textField());
m_graphView->setAreaHighlightColor(false);
m_graphView->setCursorView(&m_cursorView);
}
@@ -95,7 +95,7 @@ bool SumGraphController::textFieldDidFinishEditing(TextField * textField, const
return false;
}
if ((m_step == Step::SecondParameter && floatBody < m_startSum) || !moveCursorHorizontallyToPosition(floatBody)) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
return handleEnter();
@@ -125,7 +125,7 @@ bool SumGraphController::handleEnter() {
} else {
m_graphView->setAreaHighlightColor(true);
m_graphView->setCursorView(nullptr);
app()->setFirstResponder(this);
Container::activeApp()->setFirstResponder(this);
}
m_step = (Step)((int)m_step+1);
reloadBannerView();

2
apps/shared/tab_table_controller.cpp
View File

@@ -8,7 +8,7 @@ TabTableController::TabTableController(Responder * parentResponder) :
}
void TabTableController::didBecomeFirstResponder() {
app()->setFirstResponder(selectableTableView());
Container::activeApp()->setFirstResponder(selectableTableView());
}
void TabTableController::viewWillAppear() {

2
apps/shared/text_field_delegate.h
View File

@@ -11,7 +11,7 @@ public:
bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
protected:
TextFieldDelegateApp * textFieldDelegateApp() const {
return static_cast<TextFieldDelegateApp *>(::app());
return static_cast<TextFieldDelegateApp *>(Container::activeApp());
}
};

4
apps/shared/values_controller.cpp
View File

@@ -79,7 +79,7 @@ bool ValuesController::handleEvent(Ion::Events::Event event) {
if (selectedRow() == -1) {
header()->setSelectedButton(-1);
selectableTableView()->selectCellAtLocation(0,0);
app()->setFirstResponder(selectableTableView());
Container::activeApp()->setFirstResponder(selectableTableView());
return true;
}
return false;
@@ -88,7 +88,7 @@ bool ValuesController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Up) {
if (selectedRow() == -1) {
header()->setSelectedButton(-1);
app()->setFirstResponder(tabController());
Container::activeApp()->setFirstResponder(tabController());
return true;
}
selectableTableView()->deselectTable();

2
apps/shared/values_function_parameter_controller.cpp
View File

@@ -15,7 +15,7 @@ void ValuesFunctionParameterController::viewWillAppear() {
void ValuesFunctionParameterController::didBecomeFirstResponder() {
m_selectableTableView.reloadData();
selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
}

2
apps/shared/values_parameter_controller.cpp
View File

@@ -38,7 +38,7 @@ void ValuesParameterController::didBecomeFirstResponder() {
if (selectedRow() < 0) {
selectCellAtLocation(0, 0);
}
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool ValuesParameterController::handleEvent(Ion::Events::Event event) {

2
apps/solver/app.h
View File

@@ -46,7 +46,7 @@ private:
};
inline App * app() {
return static_cast<App *>(::app());
return static_cast<App *>(Container::activeApp());
}
}

2
apps/solver/equation_list_view.cpp
View File

@@ -44,7 +44,7 @@ View * EquationListView::subviewAtIndex(int index) {
}
void EquationListView::didBecomeFirstResponder() {
app()->setFirstResponder(&m_listView);
Container::activeApp()->setFirstResponder(&m_listView);
}
void EquationListView::layoutSubviews() {

4
apps/solver/equation_models_parameter_controller.cpp
View File

@@ -42,7 +42,7 @@ void EquationModelsParameterController::viewWillAppear() {
}
void EquationModelsParameterController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
bool EquationModelsParameterController::handleEvent(Ion::Events::Event event) {
@@ -53,7 +53,7 @@ bool EquationModelsParameterController::handleEvent(Ion::Events::Event event) {
}
assert(error == Ion::Storage::Record::ErrorStatus::None);
m_listController->editSelectedRecordWithText(k_models[selectedRow()]);
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
m_listController->editExpression(Ion::Events::OK);
return true;
}

20
apps/solver/list_controller.cpp
View File

@@ -81,7 +81,7 @@ bool ListController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Up && selectedRow() == -1) {
footer()->setSelectedButton(-1);
selectableTableView()->selectCellAtLocation(0, numberOfRows()-1);
app()->setFirstResponder(selectableTableView());
Container::activeApp()->setFirstResponder(selectableTableView());
return true;
}
if (event == Ion::Events::Down) {
@@ -105,7 +105,7 @@ void ListController::didBecomeFirstResponder() {
selectCellAtLocation(selectedColumn(), numberOfRows()-1);
}
footer()->setSelectedButton(-1);
app()->setFirstResponder(selectableTableView());
Container::activeApp()->setFirstResponder(selectableTableView());
}
void ListController::didEnterResponderChain(Responder * previousFirstResponder) {
@@ -132,7 +132,7 @@ bool ListController::textFieldDidReceiveEvent(TextField * textField, Ion::Events
textField->handleEvent(Ion::Events::ShiftRight);
textField->handleEventWithText("=0");
if (!textRepresentsAnEquality(textField->text())) {
app()->displayWarning(I18n::Message::RequireEquation);
Container::activeApp()->displayWarning(I18n::Message::RequireEquation);
return true;
}
}
@@ -149,7 +149,7 @@ bool ListController::layoutFieldDidReceiveEvent(LayoutField * layoutField, Ion::
layoutField->handleEvent(Ion::Events::ShiftRight);
layoutField->handleEventWithText("=0");
if (!layoutRepresentsAnEquality(layoutField->layout())) {
app()->displayWarning(I18n::Message::RequireEquation);
Container::activeApp()->displayWarning(I18n::Message::RequireEquation);
return true;
}
}
@@ -172,22 +172,22 @@ bool ListController::layoutFieldDidFinishEditing(LayoutField * layoutField, Poin
void ListController::resolveEquations() {
if (m_equationStore->numberOfDefinedModels() == 0) {
app()->displayWarning(I18n::Message::EnterEquation);
Container::activeApp()->displayWarning(I18n::Message::EnterEquation);
return;
}
EquationStore::Error e = m_equationStore->exactSolve(textFieldDelegateApp()->localContext());
switch (e) {
case EquationStore::Error::EquationUndefined:
app()->displayWarning(I18n::Message::UndefinedEquation);
Container::activeApp()->displayWarning(I18n::Message::UndefinedEquation);
return;
case EquationStore::Error::EquationUnreal:
app()->displayWarning(I18n::Message::UnrealEquation);
Container::activeApp()->displayWarning(I18n::Message::UnrealEquation);
return;
case EquationStore::Error::TooManyVariables:
app()->displayWarning(I18n::Message::TooManyVariables);
Container::activeApp()->displayWarning(I18n::Message::TooManyVariables);
return;
case EquationStore::Error::NonLinearSystem:
app()->displayWarning(I18n::Message::NonLinearSystem);
Container::activeApp()->displayWarning(I18n::Message::NonLinearSystem);
return;
case EquationStore::Error::RequireApproximateSolution:
{
@@ -209,7 +209,7 @@ void ListController::reloadButtonMessage() {
}
void ListController::addEmptyModel() {
app()->displayModalViewController(&m_modelsStackController, 0.f, 0.f, Metric::CommonTopMargin, Metric::CommonRightMargin, 0, Metric::CommonLeftMargin);
Container::activeApp()->displayModalViewController(&m_modelsStackController, 0.f, 0.f, Metric::CommonTopMargin, Metric::CommonRightMargin, 0, Metric::CommonLeftMargin);
}
bool ListController::removeModelRow(Ion::Storage::Record record) {

2
apps/solver/solutions_controller.cpp
View File

@@ -284,7 +284,7 @@ int SolutionsController::typeAtLocation(int i, int j) {
}
void SolutionsController::didBecomeFirstResponder() {
app()->setFirstResponder(m_contentView.selectableTableView());
Container::activeApp()->setFirstResponder(m_contentView.selectableTableView());
}
}

2
apps/statistics/calculation_controller.cpp
View File

@@ -167,7 +167,7 @@ const char * CalculationController::title() {
bool CalculationController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Up) {
selectableTableView()->deselectTable();
app()->setFirstResponder(tabController());
Container::activeApp()->setFirstResponder(tabController());
return true;
}
return false;

10
apps/statistics/histogram_parameter_controller.cpp
View File

@@ -43,7 +43,7 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
if (parameterIndex == 0) {
// The bar width cannot be negative
if (f <= 0.0f) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
@@ -52,7 +52,7 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
if (m_store->firstDrawnBarAbscissa() <= m_store->maxValue(i)+f) {
break;
} else if (i == DoublePairStore::k_numberOfSeries - 1) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
}
@@ -67,7 +67,7 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
}
}
if (maxNewNumberOfBars > Store::k_maxNumberOfBars) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
@@ -84,7 +84,7 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
}
}
if (maxNewNumberOfBars > Store::k_maxNumberOfBars) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
// There should be at least one value in the drawn bin
@@ -92,7 +92,7 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
if (f <= m_store->maxValue(i)+m_store->barWidth()) {
break;
} else if (i == DoublePairStore::k_numberOfSeries - 1) {
app()->displayWarning(I18n::Message::ForbiddenValue);
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
}

2
apps/statistics/multiple_data_view_controller.cpp
View File

@@ -58,7 +58,7 @@ bool MultipleDataViewController::handleEvent(Ion::Events::Event event) {
multipleDataView()->selectDataView(*m_selectedSeriesIndex);
highlightSelection();
} else {
app()->setFirstResponder(tabController());
Container::activeApp()->setFirstResponder(tabController());
}
reloadBannerView();
return true;

2
apps/variable_box_controller.cpp
View File

@@ -211,7 +211,7 @@ bool VariableBoxController::selectLeaf(int selectedRow) {
// Handle the text
sender()->handleEventWithText(nameToHandle);
app()->dismissModalViewController();
Container::activeApp()->dismissModalViewController();
return true;
}

4
escher/include/escher/container.h
View File

@@ -42,8 +42,4 @@ private:
virtual Timer * containerTimerAtIndex(int i);
};
inline App * app() {
return Container::activeApp();
}
#endif

2
escher/src/alternate_empty_view_controller.cpp
View File

@@ -67,7 +67,7 @@ bool AlternateEmptyViewController::handleEvent(Ion::Events::Event event) {
void AlternateEmptyViewController::didBecomeFirstResponder() {
if (!m_contentView.alternateEmptyViewDelegate()->isEmpty()) {
app()->setFirstResponder(m_contentView.mainViewController());
Container::activeApp()->setFirstResponder(m_contentView.mainViewController());
}
}

4
escher/src/bank_view_controller.cpp
View File

@@ -14,14 +14,14 @@ void BankViewController::setActiveIndex(int i) {
}
ViewController * upcomingVC = childAtIndex(i);
upcomingVC->viewWillAppear();
app()->setFirstResponder(upcomingVC);
Container::activeApp()->setFirstResponder(upcomingVC);
childAtIndex(m_activeIndex)->viewDidDisappear();
m_activeIndex = i;
m_view.setSubview(upcomingVC->view());
}
void BankViewController::didEnterResponderChain(Responder * previousResponder) {
app()->setFirstResponder(activeViewController());
Container::activeApp()->setFirstResponder(activeViewController());
}
void BankViewController::initView() {

4
escher/src/button_row_controller.cpp
View File

@@ -154,7 +154,7 @@ bool ButtonRowController::ContentView::setSelectedButton(int selectedButton) {
if (m_selectedButton >= 0) {
Button * button = buttonAtIndex(selectedButton);
button->setHighlighted(true);
app()->setFirstResponder(button);
Container::activeApp()->setFirstResponder(button);
return true;
}
return false;
@@ -171,7 +171,7 @@ const char * ButtonRowController::title() {
}
void ButtonRowController::didBecomeFirstResponder(){
app()->setFirstResponder(m_contentView.mainViewController());
Container::activeApp()->setFirstResponder(m_contentView.mainViewController());
}
int ButtonRowController::selectedButton() {

2
escher/src/editable_text_cell.cpp
View File

@@ -51,7 +51,7 @@ void EditableTextCell::layoutSubviews() {
}
void EditableTextCell::didBecomeFirstResponder() {
app()->setFirstResponder(&m_textField);
Container::activeApp()->setFirstResponder(&m_textField);
}
KDSize EditableTextCell::minimalSizeForOptimalDisplay() const {

2
escher/src/even_odd_editable_text_cell.cpp
View File

@@ -37,5 +37,5 @@ void EvenOddEditableTextCell::layoutSubviews() {
}
void EvenOddEditableTextCell::didBecomeFirstResponder() {
app()->setFirstResponder(&m_editableCell);
Container::activeApp()->setFirstResponder(&m_editableCell);
}

2
escher/src/input_event_handler.cpp
View File

@@ -12,7 +12,7 @@ bool InputEventHandler::handleBoxEvent(Ion::Events::Event event) {
}
if (box) {
box->setSender(this);
app()->displayModalViewController(box, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
Container::activeApp()->displayModalViewController(box, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
return true;
}
return false;

2
escher/src/input_view_controller.cpp
View File

@@ -11,7 +11,7 @@ InputViewController::ExpressionFieldController::ExpressionFieldController(Respon
}
void InputViewController::ExpressionFieldController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_expressionField);
Container::activeApp()->setFirstResponder(&m_expressionField);
}
InputViewController::InputViewController(Responder * parentResponder, ViewController * child, InputEventHandlerDelegate * inputEventHandlerDelegate, TextFieldDelegate * textFieldDelegate, LayoutFieldDelegate * layoutFieldDelegate) :

2
escher/src/message_table_cell_with_editable_text.cpp
View File

@@ -19,7 +19,7 @@ const char * MessageTableCellWithEditableText::editedText() const {
}
void MessageTableCellWithEditableText::didBecomeFirstResponder() {
app()->setFirstResponder(&m_textField);
Container::activeApp()->setFirstResponder(&m_textField);
}
bool MessageTableCellWithEditableText::isEditing() {

8
escher/src/modal_view_controller.cpp
View File

@@ -117,11 +117,11 @@ void ModalViewController::displayModalViewController(ViewController * vc, float
KDCoordinate topMargin, KDCoordinate leftMargin, KDCoordinate bottomMargin, KDCoordinate rightMargin) {
m_currentModalViewController = vc;
vc->setParentResponder(this);
m_previousResponder = app()->firstResponder();
m_previousResponder = Container::activeApp()->firstResponder();
m_currentModalViewController->initView();
m_contentView.presentModalView(vc->view(), verticalAlignment, horizontalAlignment, topMargin, leftMargin, bottomMargin, rightMargin);
m_currentModalViewController->viewWillAppear();
app()->setFirstResponder(vc);
Container::activeApp()->setFirstResponder(vc);
}
void ModalViewController::reloadModalViewController() {
@@ -130,13 +130,13 @@ void ModalViewController::reloadModalViewController() {
void ModalViewController::dismissModalViewController() {
m_currentModalViewController->viewDidDisappear();
app()->setFirstResponder(m_previousResponder);
Container::activeApp()->setFirstResponder(m_previousResponder);
m_contentView.dismissModalView();
m_currentModalViewController = nullptr;
}
void ModalViewController::didBecomeFirstResponder() {
app()->setFirstResponder(m_regularViewController);
Container::activeApp()->setFirstResponder(m_regularViewController);
}
bool ModalViewController::handleEvent(Ion::Events::Event event) {

8
escher/src/nested_menu_controller.cpp
View File

@@ -79,7 +79,7 @@ View * NestedMenuController::ListController::view() {
void NestedMenuController::ListController::didBecomeFirstResponder() {
m_selectableTableView->reloadData();
m_selectableTableView->selectCellAtLocation(0, m_firstSelectedRow);
app()->setFirstResponder(m_selectableTableView);
Container::activeApp()->setFirstResponder(m_selectableTableView);
}
void NestedMenuController::ListController::setFirstSelectedRow(int firstSelectedRow) {
@@ -103,7 +103,7 @@ bool NestedMenuController::handleEvent(Ion::Events::Event event) {
}
void NestedMenuController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_listController);
Container::activeApp()->setFirstResponder(&m_listController);
}
void NestedMenuController::viewWillAppear() {
@@ -155,7 +155,7 @@ bool NestedMenuController::handleEventForRow(Ion::Events::Event event, int rowIn
bool NestedMenuController::selectSubMenu(int selectedRow) {
m_stack.push(selectedRow, m_selectableTableView.contentOffset().y());
m_listController.setFirstSelectedRow(0);
app()->setFirstResponder(&m_listController);
Container::activeApp()->setFirstResponder(&m_listController);
return true;
}
@@ -165,6 +165,6 @@ bool NestedMenuController::returnToPreviousMenu() {
m_listController.setFirstSelectedRow(state.selectedRow());
KDPoint scroll = m_selectableTableView.contentOffset();
m_selectableTableView.setContentOffset(KDPoint(scroll.x(), state.verticalScroll()));
app()->setFirstResponder(&m_listController);
Container::activeApp()->setFirstResponder(&m_listController);
return true;
}

6
escher/src/selectable_table_view.cpp
View File

@@ -104,11 +104,7 @@ bool SelectableTableView::selectCellAtLocation(int i, int j, bool setFirstRespon
if (cell) {
// Update first responder
if ((i != previousX || j != previousY) && setFirstResponder) {
if (cell->responder()) {
app()->setFirstResponder(cell->responder());
} else {
app()->setFirstResponder(this);
}
Container::activeApp()->setFirstResponder(cell->responder() ? cell->responder() : this);
}
}

4
escher/src/stack_view_controller.cpp
View File

@@ -137,12 +137,12 @@ void StackViewController::setupActiveViewController() {
m_view.setContentView(vc->view());
vc->viewWillAppear();
vc->setParentResponder(this);
app()->setFirstResponder(vc);
Container::activeApp()->setFirstResponder(vc);
}
void StackViewController::didBecomeFirstResponder() {
ViewController * vc = m_childrenFrame[m_numberOfChildren-1].viewController();
app()->setFirstResponder(vc);
Container::activeApp()->setFirstResponder(vc);
}
bool StackViewController::handleEvent(Ion::Events::Event event) {

14
escher/src/tab_view_controller.cpp
View File

@@ -75,16 +75,14 @@ int TabViewController::activeTab() const {
}
bool TabViewController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Back) {
if (app()->firstResponder() != this) {
app()->setFirstResponder(this);
App * app = Container::activeApp();
if (app->firstResponder() != this) {
if (event == Ion::Events::Back) {
app->setFirstResponder(this);
return true;
}
return false;
}
if (app()->firstResponder() != this) {
return false;
}
if (event == Ion::Events::Left) {
if (m_dataSource->selectedTab() > 0) {
setSelectedTab(m_dataSource->selectedTab()-1);
@@ -116,7 +114,7 @@ void TabViewController::setActiveTab(int8_t i) {
m_children[i]->viewWillAppear();
m_view.m_tabView.setActiveIndex(i);
}
app()->setFirstResponder(activeVC);
Container::activeApp()->setFirstResponder(activeVC);
if (i != m_dataSource->activeTab()) {
m_children[m_dataSource->activeTab()]->viewDidDisappear();
m_dataSource->setActiveTab(i);
@@ -132,7 +130,7 @@ void TabViewController::setSelectedTab(int8_t i) {
}
void TabViewController::didEnterResponderChain(Responder * previousResponder) {
app()->setFirstResponder(activeViewController());
Container::activeApp()->setFirstResponder(activeViewController());
}
void TabViewController::didBecomeFirstResponder() {

Some files were not shown because too many files have changed in this diff Show More