diff options
author | sanevala <samuel.nevala@digia.com> | 2013-02-12 12:09:58 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-19 13:50:22 +0100 |
commit | 7518489a2ba7f24183a4d8ee47c9ea20573fa24a (patch) | |
tree | 48adf0d8ebea427c0f37737407f3db419ee41aeb /examples/multimedia/video | |
parent | 6812ff79d98bd0cae6cbe777eba419d09fafbb37 (diff) | |
download | qtmultimedia-7518489a2ba7f24183a4d8ee47c9ea20573fa24a.tar.gz |
User cannot press cancel after folder up.
Moved cancel button on top of folder list views. Selected
file is not anymore emitted on cancel.
Change-Id: I37884e142e774fb03d1a39e4b30e71a4e9f1001f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'examples/multimedia/video')
-rw-r--r-- | examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml index 00a6bf7d4..04f1092f4 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml @@ -51,10 +51,11 @@ Rectangle { signal fileSelected(string file) function selectFile(file) { - if (file != "") + if (file !== "") { folder = loader.item.folders.folder + fileBrowser.fileSelected(file) + } loader.sourceComponent = undefined - fileBrowser.fileSelected(file) } Loader { @@ -160,28 +161,6 @@ Rectangle { } } - Rectangle { - id: cancelButton - width: 100 - height: titleBar.height - 7 - color: "black" - anchors { bottom: parent.bottom; horizontalCenter: parent.horizontalCenter } - - Text { - anchors { fill: parent; margins: 4 } - text: "Cancel" - color: "white" - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - font.pixelSize: 20 - } - - MouseArea { - anchors.fill: parent - onClicked: fileBrowser.selectFile("") - } - } - ListView { id: view1 anchors.top: titleBar.bottom @@ -279,6 +258,28 @@ Rectangle { Keys.onPressed: root.keyPressed(event.key) } + Rectangle { + id: cancelButton + width: 100 + height: titleBar.height - 7 + color: "black" + anchors { bottom: parent.bottom; horizontalCenter: parent.horizontalCenter } + + Text { + anchors { fill: parent; margins: 4 } + text: "Cancel" + color: "white" + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + font.pixelSize: 20 + } + + MouseArea { + anchors.fill: parent + onClicked: fileBrowser.selectFile("") + } + } + Keys.onPressed: { root.keyPressed(event.key); if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) { |