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

[code] The addScript button disappears when needed.

Browse Source 
When there is already the maximal number of scripts or when the
ScriptStore accordion buffer is full.

Change-Id: I0d43d42626da7f060a2309c66f1806b35a29bf38
This commit is contained in:
Léa Saviot
2017-11-10 17:49:05 +01:00
committed by Romain Goyet
parent 024067d8a8
commit 4f74b6d849
6 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/code/menu_controller.cpp
View File

@@ -40,7 +40,7 @@ void MenuController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_consoleButton);
return;
}
assert(m_selectableTableView.selectedRow() < numberOfRows());
assert(m_selectableTableView.selectedRow() < m_scriptStore->numberOfScripts());
app()->setFirstResponder(&m_selectableTableView);
}
@@ -62,7 +62,7 @@ bool MenuController::handleEvent(Ion::Events::Event event) {
if (selectedRow >= 0 && selectedRow < m_scriptStore->numberOfScripts()) {
configureScript();
return true;
} else if (selectedRow == m_scriptStore->numberOfScripts()) {
} else if (shouldDisplayAddScriptRow() && selectedRow == m_scriptStore->numberOfScripts()) {
addScript();
return true;
}
@@ -80,6 +80,7 @@ void MenuController::setParameteredScript() {
}
void MenuController::addScript() {
assert(m_scriptStore->numberOfScripts() < k_maxNumberOfScripts);
if (m_scriptStore->addNewScript()) {
m_selectableTableView.reloadData();
renameScriptAtIndex(m_scriptStore->numberOfScripts()-1);
@@ -109,10 +110,14 @@ void MenuController::reloadConsole() {
m_consoleController.unloadPythonEnvironment();
}
bool MenuController::shouldDisplayAddScriptRow() {
return (m_scriptStore->numberOfScripts() < k_maxNumberOfScripts
&& !m_scriptStore->isFull());
}
int MenuController::numberOfRows() {
return m_scriptStore->numberOfScripts() + 1;
//TODO do not add the addScript row if there can be no more scripts stored.
};
return m_scriptStore->numberOfScripts() + shouldDisplayAddScriptRow();
}
KDCoordinate MenuController::rowHeight(int j) {
return cellHeight();
@@ -152,7 +157,7 @@ int MenuController::reusableCellCount(int type) {
int MenuController::typeAtLocation(int i, int j) {
assert(i==0);
assert(j>=0 && j<numberOfRows());
if (j == numberOfRows()-1) {
if (j == numberOfRows()-1 && shouldDisplayAddScriptRow()) {
return AddScriptCellType;
} else {
return ScriptCellType;