History

Make all load script dialogs QML and respect previous script location

Brad Davis committed 10 years ago

Commit aa032411 parent db7e4ee6 files · +26 −30Browse files

Showing the changes to interface/src/ui/ScriptEditorWindow.cpp (1 of 6 files). Show all

Unified · Split

interface/src/ui/ScriptEditorWindow.cpp+3−4
@@ -87,12 +87,11 @@ void ScriptEditorWindow::loadScriptMenu(const QString& scriptName) { · 86 unmodified lines
8787 }
8888
8989 void ScriptEditorWindow::loadScriptClicked() {
90− auto scriptEngines = DependencyManager::get<ScriptEngines>();
9190 QString scriptName = QFileDialog::getOpenFileName(this, tr("Interface"),
92− scriptEngines->getPreviousScriptLocation(),
91+ qApp->getPreviousScriptLocation(),
9392 tr("JavaScript Files (*.js)"));
9493 if (!scriptName.isEmpty()) {
95− scriptEngines->setPreviousScriptLocation(scriptName);
94+ qApp->setPreviousScriptLocation(scriptName);
9695 addScriptEditorWidget("loading...")->loadFile(scriptName);
9796 updateButtons();
9897 }
@@ -100,7 +99,7 @@ void ScriptEditorWindow::loadScriptClicked() { · 1 unmodified line
10099
101100 void ScriptEditorWindow::loadMenuAboutToShow() {
102101 _loadMenu->clear();
103− QStringList runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();;
102+ QStringList runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();
104103 if (runningScripts.count() > 0) {
105104 QSignalMapper* signalMapper = new QSignalMapper(this);
106105 foreach (const QString& runningScript, runningScripts) {