slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

User cannot press cancel after folder up.

Browse Source 
Moved cancel button on top of folder list views. Selected
file is not anymore emitted on cancel.

Change-Id: Ia7b666b4519fe03ca36c41d1694d2ad3ff4ace51
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
sanevala
2013-02-12 12:19:51 +02:00
committed by The Qt Project
parent c42e7baac9
commit 7f19343623
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
View File

@@ -52,10 +52,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 {
@@ -161,28 +162,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
@@ -280,6 +259,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) {