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] Execute a script from the script options.

Browse Source 
A button in the options opens the console, with only the current script
imported.

Change-Id: Ia3053534d6fdb2bd1340ce3c42b7249510c97bbc
This commit is contained in:
Léa Saviot
2017-11-14 17:58:16 +01:00
committed by Romain Goyet
parent 57633829a9
commit 6baaa8547a
12 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/code/menu_controller.cpp
View File

@@ -23,7 +23,8 @@ MenuController::MenuController(Responder * parentResponder, ScriptStore * script
m_selectableTableView(this, this, 0, 1, 0, 0, 0, 0, this, this, false),
m_consoleController(parentResponder, m_scriptStore),
m_scriptParameterController(nullptr, I18n::Message::ScriptOptions, m_scriptStore, this),
m_editorController(this)
m_editorController(this),
m_reloadConsoleWhenBecomingFirstResponder(false)
{
for (int i = 0; i < k_maxNumberOfDisplayableScriptCells; i++) {
m_scriptCells[i].setParentResponder(&m_selectableTableView);
@@ -35,18 +36,19 @@ MenuController::MenuController(Responder * parentResponder, ScriptStore * script
}
void MenuController::didBecomeFirstResponder() {
if (footer()->selectedButton() <= 0) {
assert(m_selectableTableView.selectedRow() < m_scriptStore->numberOfScripts());
if (m_selectableTableView.selectedRow() < 0) {
m_selectableTableView.selectCellAtLocation(0,0);
}
app()->setFirstResponder(&m_selectableTableView);
if (m_reloadConsoleWhenBecomingFirstResponder) {
reloadConsole();
}
if (footer()->selectedButton() == 0) {
assert(m_selectableTableView.selectedRow() < 0);
app()->setFirstResponder(&m_consoleButton);
return;
}
assert(m_selectableTableView.selectedRow() < 0);
assert(footer()->selectedButton() == 0);
app()->setFirstResponder(&m_consoleButton);
return;
if (m_selectableTableView.selectedRow() < 0) {
m_selectableTableView.selectCellAtLocation(0,0);
}
app()->setFirstResponder(&m_selectableTableView);
}
bool MenuController::handleEvent(Ion::Events::Event event) {
@@ -129,6 +131,16 @@ void MenuController::deleteScriptAtIndex(int i) {
void MenuController::reloadConsole() {
m_consoleController.unloadPythonEnvironment();
m_reloadConsoleWhenBecomingFirstResponder = false;
}
void MenuController::openConsoleWithScriptAtIndex(int scriptIndex) {
reloadConsole();
if (m_consoleController.loadPythonEnvironment(false)) {
m_consoleController.autoImportScriptAtIndex(scriptIndex);
stackViewController()->push(&m_consoleController);
}
m_reloadConsoleWhenBecomingFirstResponder = true;
}
bool MenuController::shouldDisplayAddScriptRow() {