diff options
| author | Tomi Korpipää <tomi.korpipaa@qt.io> | 2016-06-13 15:18:32 +0300 |
|---|---|---|
| committer | Catublipas <alex.perez@wepall.com> | 2016-06-13 12:26:52 +0000 |
| commit | 638b0ac3c7199bc40b8649328fa7e3e66648538d (patch) | |
| tree | f88f271ae9345ea2e66529e1dba8921e4ffc03c2 /editorlib | |
| parent | 3aa89281010abf0c75815c33458728f6f1b621f2 (diff) | |
Default folder bug fix
Property bindings always set all folders to default after restart. Now
folders are reset to default only when default folder is changed.
Change-Id: I8b067d64e3fecee414fdd9297fee1ad91eeee34f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'editorlib')
| -rw-r--r-- | editorlib/qml/SettingsDialog.qml | 4 | ||||
| -rw-r--r-- | editorlib/qml/main.qml | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/editorlib/qml/SettingsDialog.qml b/editorlib/qml/SettingsDialog.qml index 4c58709..58f1e72 100644 --- a/editorlib/qml/SettingsDialog.qml +++ b/editorlib/qml/SettingsDialog.qml @@ -174,6 +174,10 @@ Window { onAccepted: { mainwindow.defaultFolder = fileUrl // Use fileUrl, as dialog is in select folder mode parseFolderString() + // When default folder is changed, reset all saved folders + mainwindow.importFolder = fileUrl + mainwindow.saveFolder = fileUrl + mainwindow.textureFolder = fileUrl } } diff --git a/editorlib/qml/main.qml b/editorlib/qml/main.qml index c5e58bd..534330f 100644 --- a/editorlib/qml/main.qml +++ b/editorlib/qml/main.qml @@ -80,10 +80,10 @@ ApplicationWindow { property string selectedEntityName: "" property var sceneModel: EditorSceneItemComponentsModel property url saveFileUrl: "" - property url defaultFolder: "file:///c:" - property url saveFolder: defaultFolder - property url textureFolder: defaultFolder - property url importFolder: defaultFolder + property url defaultFolder: "file:///" + property url saveFolder: "file:///" + property url textureFolder: "file:///" + property url importFolder: "file:///" property string saveFileTitleAddition: { if (saveFileUrl != "") " - " + saveFileUrl.toString().substring(saveFileUrl.toString().lastIndexOf("/") + 1) |