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

[escher] change horrible naming in selectable table view

Browse Source 
Change-Id: Ia7bc06f2f079e529aa17ab01d961fb6ff62cbf98
This commit is contained in:
Émilie Feral
2016-10-28 09:44:02 +02:00
parent 0913798faf
commit 5133f75789
12 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/history_controller.cpp
View File

@@ -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);
}

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

@@ -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);
}

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

@@ -23,7 +23,7 @@ View * ParameterController::view() {
}
void ParameterController::didBecomeFirstResponder() {
m_selectableTableView.setSelectedCellAtLocation(0, 0);
m_selectableTableView.selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
}

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

@@ -23,7 +23,7 @@ View * AbscissaParameterController::view() {
}
void AbscissaParameterController::didBecomeFirstResponder() {
m_selectableTableView.setSelectedCellAtLocation(0, 0);
m_selectableTableView.selectCellAtLocation(0, 0);
app()->setFirstResponder(&m_selectableTableView);
}

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

@@ -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);
}

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

@@ -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);
}

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

@@ -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;
}

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

@@ -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);
}

4
apps/home/controller.cpp
View File

@@ -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);
}

4
apps/probability/law/law_controller.cpp
View File

@@ -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);
}

2
escher/include/escher/selectable_table_view.h
View File

@@ -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;

10
escher/src/selectable_table_view.cpp
View File

@@ -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);
}