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 libraries/script-engine/src/ScriptEngines.cpp (1 of 6 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+1−13
@@ -34,8 +34,7 @@ ScriptsModel& getScriptsModel() { · 33 unmodified lines
34}34}
35 35
36ScriptEngines::ScriptEngines()36ScriptEngines::ScriptEngines()
37 : _scriptsLocationHandle("scriptsLocation", DESKTOP_LOCATION),37 : _scriptsLocationHandle("scriptsLocation", DESKTOP_LOCATION)
38 _previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION)
39{38{
40 _scriptsModelFilter.setSourceModel(&_scriptsModel);39 _scriptsModelFilter.setSourceModel(&_scriptsModel);
41 _scriptsModelFilter.sort(0, Qt::AscendingOrder);40 _scriptsModelFilter.sort(0, Qt::AscendingOrder);
@@ -445,14 +444,3 @@ void ScriptEngines::onScriptEngineError(const QString& scriptFilename) { · 403 unmodified lines
445 qCDebug(scriptengine) << "Application::loadScript(), script failed to load...";444 qCDebug(scriptengine) << "Application::loadScript(), script failed to load...";
446 emit scriptLoadError(scriptFilename, "");445 emit scriptLoadError(scriptFilename, "");
447}446}
448
449QString ScriptEngines::getPreviousScriptLocation() const {
450 return _previousScriptLocation.get();
451}
452
453void ScriptEngines::setPreviousScriptLocation(const QString& previousScriptLocation) {
454 if (_previousScriptLocation.get() != previousScriptLocation) {
455 _previousScriptLocation.set(previousScriptLocation);
456 emit previousScriptLocationChanged();
457 }
458}