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
87}87}
88 88
89void ScriptEditorWindow::loadScriptClicked() {89void ScriptEditorWindow::loadScriptClicked() {
90 auto scriptEngines = DependencyManager::get<ScriptEngines>();
91 QString scriptName = QFileDialog::getOpenFileName(this, tr("Interface"),90 QString scriptName = QFileDialog::getOpenFileName(this, tr("Interface"),
92 scriptEngines->getPreviousScriptLocation(),91 qApp->getPreviousScriptLocation(),
93 tr("JavaScript Files (*.js)"));92 tr("JavaScript Files (*.js)"));
94 if (!scriptName.isEmpty()) {93 if (!scriptName.isEmpty()) {
95 scriptEngines->setPreviousScriptLocation(scriptName);94 qApp->setPreviousScriptLocation(scriptName);
96 addScriptEditorWidget("loading...")->loadFile(scriptName);95 addScriptEditorWidget("loading...")->loadFile(scriptName);
97 updateButtons();96 updateButtons();
98 }97 }
@@ -100,7 +99,7 @@ void ScriptEditorWindow::loadScriptClicked() { · 1 unmodified line
100 99
101void ScriptEditorWindow::loadMenuAboutToShow() {100void ScriptEditorWindow::loadMenuAboutToShow() {
102 _loadMenu->clear();101 _loadMenu->clear();
103 QStringList runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();;102 QStringList runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();
104 if (runningScripts.count() > 0) {103 if (runningScripts.count() > 0) {
105 QSignalMapper* signalMapper = new QSignalMapper(this);104 QSignalMapper* signalMapper = new QSignalMapper(this);
106 foreach (const QString& runningScript, runningScripts) {105 foreach (const QString& runningScript, runningScripts) {