History

Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script.

Thijs Wenker committed 12 years ago

Commit fc2ed9f1 parent 4bdc9454 files · +30 −10Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+14−7
@@ -3438,9 +3438,8 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript · 3437 unmodified lines
34383438 return scriptEngine;
34393439 }
34403440
3441−void Application::loadDialog() {
3441+QString Application::getPreviousScriptLocation() {
34423442 QString suggestedName;
3443−
34443443 if (_previousScriptLocation.isEmpty()) {
34453444 QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
34463445 // Temporary fix to Qt bug: http://stackoverflow.com/questions/16194475
@@ -3450,14 +3449,22 @@ void Application::loadDialog() { · 3 unmodified lines
34503449 } else {
34513450 suggestedName = _previousScriptLocation;
34523451 }
3452+ return suggestedName;
3453+}
3454+
3455+void Application::setPreviousScriptLocation(QString previousScriptLocation) {
3456+ _previousScriptLocation = previousScriptLocation;
3457+ QMutexLocker locker(&_settingsMutex);
3458+ _settings->setValue("LastScriptLocation", _previousScriptLocation);
3459+}
3460+
3461+void Application::loadDialog() {
34533462
3454− QString fileNameString = QFileDialog::getOpenFileName(_glWidget, tr("Open Script"), suggestedName,
3463+ QString fileNameString = QFileDialog::getOpenFileName(_glWidget, tr("Open Script"),
3464+ getPreviousScriptLocation(),
34553465 tr("JavaScript Files (*.js)"));
34563466 if (!fileNameString.isEmpty()) {
3457− _previousScriptLocation = fileNameString;
3458− QMutexLocker locker(&_settingsMutex);
3459− _settings->setValue("LastScriptLocation", _previousScriptLocation);
3460−
3467+ setPreviousScriptLocation(fileNameString);
34613468 loadScript(fileNameString);
34623469 }
34633470 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t