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] Move ConsoleController from MenuController to App

Browse Source
This commit is contained in:
Émilie Feral
2018-05-22 15:38:56 +02:00
committed by LeaNumworks
parent 2bd93844cd
commit 5cfe20ad15
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/code/menu_controller.cpp
View File

@@ -1,4 +1,5 @@
#include "menu_controller.h"
#include "app.h"
#include "../i18n.h"
#include "../apps_container.h"
#include <assert.h>
@@ -25,11 +26,6 @@ MenuController::MenuController(Responder * parentResponder, ScriptStore * script
//TODO: Pop up warning message: not enough space to load Python
}, this), KDText::FontSize::Large),
m_selectableTableView(this, this, this, this),
m_consoleController(parentResponder, m_scriptStore
#if EPSILON_GETOPT
, lockOnConsole
#endif
),
m_scriptParameterController(nullptr, I18n::Message::ScriptOptions, this),
m_editorController(this),
m_reloadConsoleWhenBecomingFirstResponder(false),
@@ -46,6 +42,10 @@ MenuController::MenuController(Responder * parentResponder, ScriptStore * script
}
}
ConsoleController * MenuController::consoleController() {
return static_cast<App *>(app())->consoleController();
}
StackViewController * MenuController::stackViewController() {
return static_cast<StackViewController *>(parentResponder()->parentResponder());
}
@@ -145,19 +145,19 @@ void MenuController::deleteScript(Script script) {
}
void MenuController::reloadConsole() {
m_consoleController.unloadPythonEnvironment();
consoleController()->unloadPythonEnvironment();
m_reloadConsoleWhenBecomingFirstResponder = false;
}
void MenuController::loadPythonIfNeeded() {
m_consoleController.loadPythonEnvironment(false);
consoleController()->loadPythonEnvironment(false);
}
void MenuController::openConsoleWithScript(Script script) {
reloadConsole();
if (m_consoleController.loadPythonEnvironment(false)) {
stackViewController()->push(&m_consoleController);
m_consoleController.autoImportScript(script, true);
if (consoleController()->loadPythonEnvironment(false)) {
stackViewController()->push(consoleController());
consoleController()->autoImportScript(script, true);
}
m_reloadConsoleWhenBecomingFirstResponder = true;
}