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

[apps][escher] EXE and OK trigger the same behaviour

Browse Source 
Change-Id: Ide7d38fbc445be717e50ed46f2d784c02c9830e4
This commit is contained in:
Émilie Feral
2017-05-10 12:04:30 +02:00
parent e5dd0d8d7f
commit 4e0e285501
34 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ void CurveParameterController::willDisplayCellForIndex(HighlightCell * cell, int
}
bool CurveParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (selectedRow()) {
case 0:
return true;

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

@@ -41,7 +41,7 @@ KDCoordinate ListController::rowHeight(int j) {
void ListController::editExpression(Function * function, Ion::Events::Event event) {
char * initialText = nullptr;
char initialTextContent[TextField::maxBufferSize()];
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
strlcpy(initialTextContent, function->text(), sizeof(initialTextContent));
initialText = initialTextContent;
}

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

@@ -42,7 +42,7 @@ void DerivativeParameterController::didBecomeFirstResponder() {
}
bool DerivativeParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (selectedRow()) {
case 0:
{

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

@@ -20,7 +20,7 @@ void FunctionParameterController::setFunction(Function * function) {
}
bool FunctionParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (selectedRow()) {
case 0:
{

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

@@ -19,7 +19,7 @@ ValuesController::ValuesController(Responder * parentResponder, CartesianFunctio
}
bool ValuesController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK && selectedRow() == 0
if ((event == Ion::Events::OK || event == Ion::Events::EXE) && selectedRow() == 0
&& selectedColumn()>0 && isDerivativeColumn(selectedColumn())) {
configureDerivativeFunction();
return true;

2
apps/home/controller.cpp
View File

@@ -46,7 +46,7 @@ Controller::Controller(Responder * parentResponder, ::AppsContainer * container)
}
bool Controller::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
m_container->switchTo(m_container->appAtIndex(selectedRow()*k_numberOfColumns+selectedColumn()+1));
return true;
}

2
apps/math_toolbox.cpp
View File

@@ -239,7 +239,7 @@ bool MathToolbox::handleEventForRow(Ion::Events::Event event, int selectedRow) {
if (event == Ion::Events::Back) {
return returnToPreviousMenu();
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
ToolboxNode * selectedNode = (ToolboxNode *)m_nodeModel->children(selectedRow);
if (selectedNode->numberOfChildren() == 0) {
return selectLeaf(selectedNode);

2
apps/probability/calculation_controller.cpp
View File

@@ -210,7 +210,7 @@ bool CalculationController::handleEvent(Ion::Events::Event event) {
}
return true;
}
if (event == Ion::Events::OK && m_highlightedSubviewIndex == 0) {
if ((event == Ion::Events::OK || event == Ion::Events::EXE) && m_highlightedSubviewIndex == 0) {
m_contentView.imageTableView()->select(true);
app()->setFirstResponder(m_contentView.imageTableView());
return true;

2
apps/probability/image_table_view.cpp
View File

@@ -85,7 +85,7 @@ void ImageTableView::willExitResponderChain(Responder * nextFirstResponder) {
}
bool ImageTableView::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
m_calculationController->setCalculationAccordingToIndex(selectedRow());
select(false);
setHighlight(true);

2
apps/probability/law_controller.cpp
View File

@@ -87,7 +87,7 @@ void Probability::LawController::didBecomeFirstResponder() {
}
bool Probability::LawController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
StackViewController * stack = (StackViewController *)parentResponder();
setLawAccordingToIndex(selectedRow());
stack->push(&m_parametersController, KDColorWhite, Palette::PurpleBright, Palette::PurpleBright);

2
apps/regression/initialisation_parameter_controller.cpp
View File

@@ -28,7 +28,7 @@ void InitialisationParameterController::didBecomeFirstResponder() {
}
bool InitialisationParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
RangeMethodPointer rangeMethods[k_totalNumberOfCells] = {&InteractiveCurveViewRange::roundAbscissa,
&InteractiveCurveViewRange::normalize, &InteractiveCurveViewRange::setDefault};
(m_store->*rangeMethods[selectedRow()])();

2
apps/regression/prediction_parameter_controller.cpp
View File

@@ -27,7 +27,7 @@ void PredictionParameterController::didBecomeFirstResponder() {
}
bool PredictionParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
m_goToParameterController.setXPrediction(selectedRow() == 0);
StackViewController * stack = (StackViewController *)parentResponder();
stack->push(&m_goToParameterController);

2
apps/sequence/graph/curve_parameter_controller.cpp
View File

@@ -19,7 +19,7 @@ const char * CurveParameterController::title() {
}
bool CurveParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (selectedRow()) {
case 0:
{

4
apps/sequence/graph/term_sum_controller.cpp
View File

@@ -56,7 +56,7 @@ void TermSumController::viewWillAppear() {
}
bool TermSumController::handleEvent(Ion::Events::Event event) {
if (m_step > 1 && event != Ion::Events::OK && event != Ion::Events::Back) {
if (m_step > 1 && event != Ion::Events::OK && event != Ion::Events::EXE && event != Ion::Events::Back) {
return false;
}
if (event == Ion::Events::Left) {
@@ -87,7 +87,7 @@ bool TermSumController::handleEvent(Ion::Events::Event event) {
}
return false;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
if (m_step == 2) {
StackViewController * stack = (StackViewController *)parentResponder();
stack->pop();

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

@@ -85,7 +85,7 @@ void ListController::selectPreviousNewSequenceCell() {
void ListController::editExpression(Sequence * sequence, int sequenceDefinition, Ion::Events::Event event) {
char * initialText = nullptr;
char initialTextContent[TextField::maxBufferSize()];
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (sequenceDefinition) {
case 0:
strlcpy(initialTextContent, sequence->text(), sizeof(initialTextContent));

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

@@ -24,7 +24,7 @@ void ListParameterController::setFunction(Shared::Function * function) {
}
bool ListParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
int selectedRowIndex = selectedRow();
switch (selectedRowIndex) {
#if FUNCTION_COLOR_CHOICE

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

@@ -24,7 +24,7 @@ SequenceToolbox::~SequenceToolbox() {
}
bool SequenceToolbox::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK && stackDepth() == 0) {
if ((event == Ion::Events::OK || event == Ion::Events::EXE) && stackDepth() == 0) {
if (selectedRow() < m_numberOfAddedCells) {
return selectAddedCell(selectedRow());
}

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

@@ -49,7 +49,7 @@ void TypeParameterController::didBecomeFirstResponder() {
}
bool TypeParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
if (m_sequence) {
Sequence::Type sequenceType = (Sequence::Type)selectedRow();
if (m_sequence->type() != sequenceType) {

2
apps/settings/main_controller.cpp
View File

@@ -55,7 +55,7 @@ void MainController::didBecomeFirstResponder() {
}
bool MainController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
m_subController.setNodeModel(m_nodeModel->children(selectedRow()), selectedRow());
StackViewController * stack = stackController();
stack->push(&m_subController);

2
apps/settings/sub_controller.cpp
View File

@@ -64,7 +64,7 @@ bool SubController::handleEvent(Ion::Events::Event event) {
appsContainer->switchTo(appsContainer->hardwareTestApp());
return true;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
/* Behavious of "Exam mode" menu*/
if (m_preferenceIndex == 4) {
if (GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Activate) {

2
apps/shared/initialisation_parameter_controller.cpp
View File

@@ -26,7 +26,7 @@ void InitialisationParameterController::didBecomeFirstResponder() {
}
bool InitialisationParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
RangeMethodPointer rangeMethods[k_totalNumberOfCells] = {&InteractiveCurveViewRange::setTrigonometric,
&InteractiveCurveViewRange::roundAbscissa, &InteractiveCurveViewRange::normalize, &InteractiveCurveViewRange::setDefault};
(m_graphRange->*rangeMethods[selectedRow()])();

2
apps/shared/interactive_curve_view_controller.cpp
View File

@@ -94,7 +94,7 @@ bool InteractiveCurveViewController::handleEvent(Ion::Events::Event event) {
header()->setSelectedButton(0);
return true;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
return handleEnter();
}
return false;

4
apps/shared/list_controller.cpp
View File

@@ -177,7 +177,7 @@ bool ListController::handleEvent(Ion::Events::Event event) {
footer()->setSelectedButton(0);
return true;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (selectedColumn()) {
case 0:
{
@@ -196,7 +196,7 @@ bool ListController::handleEvent(Ion::Events::Event event) {
return true;
}
Shared::Function * function = m_functionStore->functionAtIndex(functionIndexForRow(selectedRow()));
editExpression(function, Ion::Events::OK);
editExpression(function, event);
return true;
}
default:

2
apps/shared/list_parameter_controller.cpp
View File

@@ -47,7 +47,7 @@ void ListParameterController::setFunction(Function * function) {
}
bool ListParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
return handleEnterOnRow(selectedRow());
}
return false;

2
apps/shared/range_parameter_controller.cpp
View File

@@ -84,7 +84,7 @@ void RangeParameterController::tableViewDidChangeSelection(SelectableTableView *
}
bool RangeParameterController::handleEvent(Ion::Events::Event event) {
if (activeCell() == 2 && event == Ion::Events::OK) {
if (activeCell() == 2 && (event == Ion::Events::OK || event == Ion::Events::EXE)) {
m_interactiveRange->setYAuto(!m_interactiveRange->yAuto());
selectableTableView()->reloadData();
return true;

2
apps/shared/store_controller.cpp
View File

@@ -80,7 +80,7 @@ bool StoreController::handleEvent(Ion::Events::Event event) {
app()->setFirstResponder(tabController());
return true;
}
if (event == Ion::Events::OK && selectedRow() == 0) {
if ((event == Ion::Events::OK || event == Ion::Events::EXE) && selectedRow() == 0) {
m_storeParameterController.selectXColumn(selectedColumn() == 0);
StackViewController * stack = ((StackViewController *)parentResponder()->parentResponder());
stack->push(&m_storeParameterController);

2
apps/shared/store_parameter_controller.cpp
View File

@@ -35,7 +35,7 @@ void StoreParameterController::didBecomeFirstResponder() {
}
bool StoreParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (selectedRow()) {
case 0:
{

2
apps/shared/values_controller.cpp
View File

@@ -60,7 +60,7 @@ bool ValuesController::handleEvent(Ion::Events::Event event) {
selectableTableView()->reloadData();
return true;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
if (selectedRow() == -1) {
return header()->handleEvent(event);
}

2
apps/shared/values_parameter_controller.cpp
View File

@@ -41,7 +41,7 @@ void ValuesParameterController::didBecomeFirstResponder() {
}
bool ValuesParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (selectedRow()) {
case 0:
{

2
apps/variable_box_controller.cpp
View File

@@ -48,7 +48,7 @@ bool VariableBoxController::ContentViewController::handleEvent(Ion::Events::Even
app()->setFirstResponder(this);
return true;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
m_selectableTableView.deselectTable();
if (m_currentPage == Page::RootMenu) {
m_previousSelectedRow = selectedRow();

2
escher/src/button.cpp
View File

@@ -24,7 +24,7 @@ void Button::layoutSubviews() {
}
bool Button::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
m_invocation.perform(this);
return true;
}

2
escher/src/button_row_controller.cpp
View File

@@ -215,7 +215,7 @@ bool ButtonRowController::handleEvent(Ion::Events::Event event) {
}
return true;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
return true;
}
return false;

2
escher/src/tab_view_controller.cpp
View File

@@ -102,7 +102,7 @@ bool TabViewController::handleEvent(Ion::Events::Event event) {
setActiveTab(m_activeChildIndex, false);
return true;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
setActiveTab(m_selectedChildIndex, true);
return true;
}

2
escher/src/text_field.cpp
View File

@@ -312,7 +312,7 @@ bool TextField::handleEvent(Ion::Events::Event event) {
setCursorLocation(cursorLoc);
return true;
}
if (event == Ion::Events::OK && !isEditing()) {
if ((event == Ion::Events::OK || event == Ion::Events::EXE) && !isEditing()) {
setEditing(true);
/* If the text could not be inserted (buffer is full), we set the cursor
* at the end of the text. */