diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp index a0086ede8..7000c73ac 100644 --- a/apps/calculation/history_controller.cpp +++ b/apps/calculation/history_controller.cpp @@ -25,7 +25,7 @@ void HistoryController::reload() { } void HistoryController::didBecomeFirstResponder() { - m_selectableTableView.setSelectedCellAtLocation(0, numberOfRows()-1); + m_selectableTableView.selectCellAtLocation(0, numberOfRows()-1); app()->setFirstResponder(&m_selectableTableView); } diff --git a/apps/graph/list/list_controller.cpp b/apps/graph/list/list_controller.cpp index 02fb6b38c..038a10674 100644 --- a/apps/graph/list/list_controller.cpp +++ b/apps/graph/list/list_controller.cpp @@ -99,9 +99,9 @@ int ListController::indexFromCumulatedHeight(KDCoordinate offsetY) { void ListController::didBecomeFirstResponder() { if (m_selectableTableView.selectedRow() == -1) { - m_selectableTableView.setSelectedCellAtLocation(1, 0); + m_selectableTableView.selectCellAtLocation(1, 0); } else { - m_selectableTableView.setSelectedCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); + m_selectableTableView.selectCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); } app()->setFirstResponder(&m_selectableTableView); } diff --git a/apps/graph/list/parameter_controller.cpp b/apps/graph/list/parameter_controller.cpp index 6b2d307f6..d5a09b24a 100644 --- a/apps/graph/list/parameter_controller.cpp +++ b/apps/graph/list/parameter_controller.cpp @@ -23,7 +23,7 @@ View * ParameterController::view() { } void ParameterController::didBecomeFirstResponder() { - m_selectableTableView.setSelectedCellAtLocation(0, 0); + m_selectableTableView.selectCellAtLocation(0, 0); app()->setFirstResponder(&m_selectableTableView); } diff --git a/apps/graph/values/abscissa_parameter_controller.cpp b/apps/graph/values/abscissa_parameter_controller.cpp index 1745aa86e..fb3f3d58a 100644 --- a/apps/graph/values/abscissa_parameter_controller.cpp +++ b/apps/graph/values/abscissa_parameter_controller.cpp @@ -23,7 +23,7 @@ View * AbscissaParameterController::view() { } void AbscissaParameterController::didBecomeFirstResponder() { - m_selectableTableView.setSelectedCellAtLocation(0, 0); + m_selectableTableView.selectCellAtLocation(0, 0); app()->setFirstResponder(&m_selectableTableView); } diff --git a/apps/graph/values/derivative_parameter_controller.cpp b/apps/graph/values/derivative_parameter_controller.cpp index 3962ecee5..f6ba46703 100644 --- a/apps/graph/values/derivative_parameter_controller.cpp +++ b/apps/graph/values/derivative_parameter_controller.cpp @@ -33,7 +33,7 @@ void DerivativeParameterController::setFunction(Function * function) { } void DerivativeParameterController::didBecomeFirstResponder() { - m_selectableTableView.setSelectedCellAtLocation(0, 0); + m_selectableTableView.selectCellAtLocation(0, 0); app()->setFirstResponder(&m_selectableTableView); } diff --git a/apps/graph/values/function_parameter_controller.cpp b/apps/graph/values/function_parameter_controller.cpp index 3bebbea73..a8a8eae6f 100644 --- a/apps/graph/values/function_parameter_controller.cpp +++ b/apps/graph/values/function_parameter_controller.cpp @@ -33,7 +33,7 @@ void FunctionParameterController::setFunction(Function * function) { } void FunctionParameterController::didBecomeFirstResponder() { - m_selectableTableView.setSelectedCellAtLocation(0, 0); + m_selectableTableView.selectCellAtLocation(0, 0); app()->setFirstResponder(&m_selectableTableView); } diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp index a4d803447..a6ff6779b 100644 --- a/apps/graph/values/values_controller.cpp +++ b/apps/graph/values/values_controller.cpp @@ -172,9 +172,9 @@ void ValuesController::didBecomeFirstResponder() { m_contentView.setTableState(ContentView::TableState::NonEmpty); setSelectedButton(-1); if (m_selectableTableView.selectedRow() == -1) { - m_selectableTableView.setSelectedCellAtLocation(0, 0); + m_selectableTableView.selectCellAtLocation(0, 0); } else { - m_selectableTableView.setSelectedCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); + m_selectableTableView.selectCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); } app()->setFirstResponder(&m_selectableTableView); } @@ -191,7 +191,7 @@ bool ValuesController::handleEvent(Ion::Events::Event event) { case Ion::Events::Event::DOWN_ARROW: if (activeRow() == -1) { setSelectedButton(-1); - m_selectableTableView.setSelectedCellAtLocation(0,0); + m_selectableTableView.selectCellAtLocation(0,0); app()->setFirstResponder(&m_selectableTableView); return true; } diff --git a/apps/graph/values/values_parameter_controller.cpp b/apps/graph/values/values_parameter_controller.cpp index 818444877..91eeb92ea 100644 --- a/apps/graph/values/values_parameter_controller.cpp +++ b/apps/graph/values/values_parameter_controller.cpp @@ -29,7 +29,7 @@ Graph::Interval * ValuesParameterController::interval() { } void ValuesParameterController::didBecomeFirstResponder() { - m_selectableTableView.setSelectedCellAtLocation(0, 0); + m_selectableTableView.selectCellAtLocation(0, 0); app()->setFirstResponder(&m_selectableTableView); } diff --git a/apps/home/controller.cpp b/apps/home/controller.cpp index a799b893c..a9b841356 100644 --- a/apps/home/controller.cpp +++ b/apps/home/controller.cpp @@ -25,9 +25,9 @@ bool Controller::handleEvent(Ion::Events::Event event) { void Controller::didBecomeFirstResponder() { if (m_selectableTableView.selectedRow() == -1) { - m_selectableTableView.setSelectedCellAtLocation(0, 0); + m_selectableTableView.selectCellAtLocation(0, 0); } else { - m_selectableTableView.setSelectedCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); + m_selectableTableView.selectCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); } app()->setFirstResponder(&m_selectableTableView); } diff --git a/apps/probability/law/law_controller.cpp b/apps/probability/law/law_controller.cpp index 6767e486c..f6656b86d 100644 --- a/apps/probability/law/law_controller.cpp +++ b/apps/probability/law/law_controller.cpp @@ -30,9 +30,9 @@ const char * Probability::LawController::title() const { void Probability::LawController::didBecomeFirstResponder() { if (m_selectableTableView.selectedRow() == -1) { - m_selectableTableView.setSelectedCellAtLocation(0, 0); + m_selectableTableView.selectCellAtLocation(0, 0); } else { - m_selectableTableView.setSelectedCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); + m_selectableTableView.selectCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()); } app()->setFirstResponder(&m_selectableTableView); } diff --git a/escher/include/escher/selectable_table_view.h b/escher/include/escher/selectable_table_view.h index 1f1ea426f..24b736a4d 100644 --- a/escher/include/escher/selectable_table_view.h +++ b/escher/include/escher/selectable_table_view.h @@ -23,7 +23,7 @@ public: virtual bool handleEvent(Ion::Events::Event event) override; virtual void didBecomeFirstResponder() override; void deselectTable(); - bool setSelectedCellAtLocation(int i, int j); + bool selectCellAtLocation(int i, int j); private: int m_selectedCellX; int m_selectedCellY; diff --git a/escher/src/selectable_table_view.cpp b/escher/src/selectable_table_view.cpp index b1086472c..a206d513d 100644 --- a/escher/src/selectable_table_view.cpp +++ b/escher/src/selectable_table_view.cpp @@ -33,7 +33,7 @@ void SelectableTableView::deselectTable() { m_selectedCellY = -1; } -bool SelectableTableView::setSelectedCellAtLocation(int i, int j) { +bool SelectableTableView::selectCellAtLocation(int i, int j) { if (i < 0 || i >= dataSource()->numberOfColumns()) { return false; } @@ -58,7 +58,7 @@ bool SelectableTableView::setSelectedCellAtLocation(int i, int j) { bool SelectableTableView::handleEvent(Ion::Events::Event event) { switch (event) { case Ion::Events::Event::DOWN_ARROW: - if (setSelectedCellAtLocation(m_selectedCellX, m_selectedCellY+1)) { + if (selectCellAtLocation(m_selectedCellX, m_selectedCellY+1)) { if (m_delegate) { m_delegate->tableViewDidChangeSelection(this); } @@ -66,7 +66,7 @@ bool SelectableTableView::handleEvent(Ion::Events::Event event) { } return false; case Ion::Events::Event::UP_ARROW: - if (setSelectedCellAtLocation(m_selectedCellX, m_selectedCellY-1)) { + if (selectCellAtLocation(m_selectedCellX, m_selectedCellY-1)) { if (m_delegate) { m_delegate->tableViewDidChangeSelection(this); } @@ -74,7 +74,7 @@ bool SelectableTableView::handleEvent(Ion::Events::Event event) { } return false; case Ion::Events::Event::LEFT_ARROW: - if (setSelectedCellAtLocation(m_selectedCellX-1, m_selectedCellY)) { + if (selectCellAtLocation(m_selectedCellX-1, m_selectedCellY)) { if (m_delegate) { m_delegate->tableViewDidChangeSelection(this); } @@ -82,7 +82,7 @@ bool SelectableTableView::handleEvent(Ion::Events::Event event) { } return false; case Ion::Events::Event::RIGHT_ARROW: - if (setSelectedCellAtLocation(m_selectedCellX+1, m_selectedCellY)) { + if (selectCellAtLocation(m_selectedCellX+1, m_selectedCellY)) { if (m_delegate) { m_delegate->tableViewDidChangeSelection(this); }