projects
/
openvpnui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linked key and ca file configuration to vpn execution. Added option to
[openvpnui.git]
/
qml
/
filebrowse
/
pages
/
DirectoryPage.qml
diff --git
a/qml/filebrowse/pages/DirectoryPage.qml
b/qml/filebrowse/pages/DirectoryPage.qml
index
eb55286
..
6641846
100644
(file)
--- a/
qml/filebrowse/pages/DirectoryPage.qml
+++ b/
qml/filebrowse/pages/DirectoryPage.qml
@@
-6,7
+6,7
@@
import "../components"
Page {
id: page
Page {
id: page
- allowedOrientations: Orientation.All
+ //allowedOrientations: Orientation.All
property string dir: "/"
property string initialDir: ""
property bool initial: false // this is set to true if the page is initial page
property string dir: "/"
property string initialDir: ""
property bool initial: false // this is set to true if the page is initial page
@@
-36,14
+36,17
@@
Page {
Functions.cancel()
break;
case 2:
Functions.cancel()
break;
case 2:
- pageStack.push(Qt.resolvedUrl("SearchPage.qml"), { dir: page.dir });
+ Functions.fileSelect("")
break;
case 3:
break;
case 3:
+ pageStack.push(Qt.resolvedUrl("SearchPage.qml"), { dir: page.dir });
+ break;
+ case 4:
fileModel.showAll = true
menuShowAll.visible = false
menuShowFiltered.visible = true
break;
fileModel.showAll = true
menuShowAll.visible = false
menuShowFiltered.visible = true
break;
- case 4:
+ case 5:
fileModel.showAll = false
menuShowFiltered.visible = false
menuShowAll.visible = true
fileModel.showAll = false
menuShowFiltered.visible = false
menuShowAll.visible = true
@@
-57,20
+60,24
@@
Page {
onClicked: _selectedMenu = 1
}
MenuItem {
onClicked: _selectedMenu = 1
}
MenuItem {
- text: qsTr("Search")
+ text: qsTr("Clear")
onClicked: _selectedMenu = 2
}
onClicked: _selectedMenu = 2
}
+ MenuItem {
+ text: qsTr("Search")
+ onClicked: _selectedMenu = 3
+ }
MenuItem {
id: menuShowAll
visible: !fileModel.showAll
text: qsTr("Show all files")
MenuItem {
id: menuShowAll
visible: !fileModel.showAll
text: qsTr("Show all files")
- onClicked: _selectedMenu = 3
+ onClicked: _selectedMenu = 4
}
MenuItem {
id: menuShowFiltered
visible: fileModel.showAll
text: qsTr("Show only ") + engine.extensionFilter + qsTr(" files")
}
MenuItem {
id: menuShowFiltered
visible: fileModel.showAll
text: qsTr("Show only ") + engine.extensionFilter + qsTr(" files")
- onClicked: _selectedMenu = 4
+ onClicked: _selectedMenu = 5
}
}
}
}
@@
-140,8
+147,8
@@
Page {
{ dir: fileModel.appendPath(listLabel.text) });
}
else {
{ dir: fileModel.appendPath(listLabel.text) });
}
else {
- Functions.cancel()
Functions.fileSelect(fileModel.appendPath(listLabel.text))
Functions.fileSelect(fileModel.appendPath(listLabel.text))
+ //Functions.cancel()
//pageStack.push(Qt.resolvedUrl("FilePage.qml"),
// { file: fileModel.appendPath(listLabel.text) });
}
//pageStack.push(Qt.resolvedUrl("FilePage.qml"),
// { file: fileModel.appendPath(listLabel.text) });
}
@@
-164,8
+171,7
@@
Page {
visible: true
text: qsTr("Properties")
onClicked: {
visible: true
text: qsTr("Properties")
onClicked: {
- pageStack.push(Qt.resolvedUrl("FilePage.qml"),
- { file: fileModel.fileNameAt(index) });
+ pageStack.push(Qt.resolvedUrl("FilePage.qml"), { file: fileModel.fileNameAt(index) });
}
}
}
}
}
}