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
3438 return scriptEngine;3438 return scriptEngine;
3439}3439}
3440 3440
3441void Application::loadDialog() {3441QString Application::getPreviousScriptLocation() {
3442 QString suggestedName;3442 QString suggestedName;
3443
3444 if (_previousScriptLocation.isEmpty()) {3443 if (_previousScriptLocation.isEmpty()) {
3445 QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);3444 QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
3446// Temporary fix to Qt bug: http://stackoverflow.com/questions/161944753445// Temporary fix to Qt bug: http://stackoverflow.com/questions/16194475
@@ -3450,14 +3449,22 @@ void Application::loadDialog() { · 3 unmodified lines
3450 } else {3449 } else {
3451 suggestedName = _previousScriptLocation;3450 suggestedName = _previousScriptLocation;
3452 }3451 }
3452 return suggestedName;
3453}
3454
3455void Application::setPreviousScriptLocation(QString previousScriptLocation) {
3456 _previousScriptLocation = previousScriptLocation;
3457 QMutexLocker locker(&_settingsMutex);
3458 _settings->setValue("LastScriptLocation", _previousScriptLocation);
3459}
3460
3461void Application::loadDialog() {
3453 3462
3454 QString fileNameString = QFileDialog::getOpenFileName(_glWidget, tr("Open Script"), suggestedName,3463 QString fileNameString = QFileDialog::getOpenFileName(_glWidget, tr("Open Script"),
3464 getPreviousScriptLocation(),
3455 tr("JavaScript Files (*.js)"));3465 tr("JavaScript Files (*.js)"));
3456 if (!fileNameString.isEmpty()) {3466 if (!fileNameString.isEmpty()) {
3457 _previousScriptLocation = fileNameString;3467 setPreviousScriptLocation(fileNameString);
3458 QMutexLocker locker(&_settingsMutex);
3459 _settings->setValue("LastScriptLocation", _previousScriptLocation);
3460
3461 loadScript(fileNameString);3468 loadScript(fileNameString);
3462 }3469 }
3463}3470}

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