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>
This commit is contained in:
@@ -51,10 +51,11 @@ Rectangle {
|
|||||||
signal fileSelected(string file)
|
signal fileSelected(string file)
|
||||||
|
|
||||||
function selectFile(file) {
|
function selectFile(file) {
|
||||||
if (file != "")
|
if (file !== "") {
|
||||||
folder = loader.item.folders.folder
|
folder = loader.item.folders.folder
|
||||||
|
fileBrowser.fileSelected(file)
|
||||||
|
}
|
||||||
loader.sourceComponent = undefined
|
loader.sourceComponent = undefined
|
||||||
fileBrowser.fileSelected(file)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader {
|
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 {
|
ListView {
|
||||||
id: view1
|
id: view1
|
||||||
anchors.top: titleBar.bottom
|
anchors.top: titleBar.bottom
|
||||||
@@ -279,6 +258,28 @@ Rectangle {
|
|||||||
Keys.onPressed: root.keyPressed(event.key)
|
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: {
|
Keys.onPressed: {
|
||||||
root.keyPressed(event.key);
|
root.keyPressed(event.key);
|
||||||
if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
|
if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
|
||||||
|
|||||||
Reference in New Issue
Block a user