diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-16 21:52:48 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-16 21:53:57 +0100 |
commit | 7030adff1869e850a7b983e88d7a773d5d594886 (patch) | |
tree | a3e8ef3ba29c9ea34ee00038595aaa1fe00afe2c /src/imports/dialogs/DefaultFileDialog.qml | |
parent | 5ba070d305572a7e427a62042967d737bd4791ac (diff) | |
parent | 6ccb9f8f04ea257520e518b25999907c6a8421e1 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id18709cb0a4d85ffdadffa28aef98323367292d4
Diffstat (limited to 'src/imports/dialogs/DefaultFileDialog.qml')
-rw-r--r-- | src/imports/dialogs/DefaultFileDialog.qml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/imports/dialogs/DefaultFileDialog.qml b/src/imports/dialogs/DefaultFileDialog.qml index 0a5eabddf2..627a719f60 100644 --- a/src/imports/dialogs/DefaultFileDialog.qml +++ b/src/imports/dialogs/DefaultFileDialog.qml @@ -53,7 +53,13 @@ AbstractFileDialog { currentPathField.visible = false } } - onFolderChanged: view.model.folder = folder + onFolderChanged: { + var str = new String(folder) + if (str.indexOf("qrc:") === 0) + folder = "file:" + str.slice(4) + if (view.model.folder != folder) + view.model.folder = folder + } property real __textX: titleBar.height property SystemPalette __palette @@ -61,12 +67,15 @@ AbstractFileDialog { property int __lastClickedIdx: -1 function __dirDown(path) { - view.model.folder = path + view.model.folder = "file://" + path __lastClickedIdx = -1 __selectedIndices = [] } function __dirUp() { - view.model.folder = view.model.parentFolder + if (view.model.parentFolder == "") + view.model.folder = "file:///" + else + view.model.folder = view.model.parentFolder __lastClickedIdx = -1 __selectedIndices = [] } |