UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 16:57:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/code] Fix Python loading when going in the VarBoxController

Browse Source 
The Var box controller deinited python on exit, and the console
controller did not reload python + it made the console controller lose
all its context, such as imported scripts
This commit is contained in:
Léa Saviot
2018-09-21 11:53:53 +02:00
parent 47e78a79fa
commit 2661032993
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/code/menu_controller.cpp
View File

@@ -14,13 +14,11 @@ MenuController::MenuController(Responder * parentResponder, App * pythonDelegate
m_scriptStore(scriptStore),
m_addNewScriptCell(),
m_consoleButton(this, I18n::Message::Console, Invocation([](void * context, void * sender) {
MenuController * menu = (MenuController *)context;
if (menu->consoleController()->loadPythonEnvironment()) {
menu->stackViewController()->push(menu->consoleController());
return;
}
//TODO: Pop up warning message: not enough space to load Python
}, this), KDText::FontSize::Large),
MenuController * menu = (MenuController *)context;
menu->consoleController()->setAutoImport(true);
menu->stackViewController()->push(menu->consoleController());
return;
}, this), KDText::FontSize::Large),
m_selectableTableView(this, this, this, this),
m_scriptParameterController(nullptr, I18n::Message::ScriptOptions, this),
m_editorController(this, pythonDelegate),
@@ -146,16 +144,11 @@ void MenuController::reloadConsole() {
m_reloadConsoleWhenBecomingFirstResponder = false;
}
void MenuController::loadPythonIfNeeded() {
consoleController()->loadPythonEnvironment(false);
}
void MenuController::openConsoleWithScript(Script script) {
reloadConsole();
if (consoleController()->loadPythonEnvironment(false)) {
stackViewController()->push(consoleController());
consoleController()->autoImportScript(script, true);
}
consoleController()->setAutoImport(false);
stackViewController()->push(consoleController());
consoleController()->autoImportScript(script, true);
m_reloadConsoleWhenBecomingFirstResponder = true;
}