X-Git-Url: https://www.flypig.org.uk/git/?p=openvpnui.git;a=blobdiff_plain;f=qml%2Ffilebrowse%2Fpages%2FDirectoryPage.qml;fp=qml%2Ffilebrowse%2Fpages%2FDirectoryPage.qml;h=6641846beef627116e5abff9c52d4453c2f76da6;hp=eb55286ef330acb13dc56c38be3ac00894e1a8bc;hb=052fa14434d3ca4b7d08c2c2fccf3791e20afbaa;hpb=e24363e314aca32e7bee952f02f517a04a8dc5f2

diff --git a/qml/filebrowse/pages/DirectoryPage.qml b/qml/filebrowse/pages/DirectoryPage.qml
index eb55286..6641846 100644
--- a/qml/filebrowse/pages/DirectoryPage.qml
+++ b/qml/filebrowse/pages/DirectoryPage.qml
@@ -6,7 +6,7 @@ import "../components"
 
 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
@@ -36,14 +36,17 @@ Page {
                         Functions.cancel()
                         break;
                     case 2:
-                        pageStack.push(Qt.resolvedUrl("SearchPage.qml"), { dir: page.dir });
+                        Functions.fileSelect("")
                         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;
-                    case 4:
+                    case 5:
                         fileModel.showAll = false
                         menuShowFiltered.visible = false
                         menuShowAll.visible = true
@@ -57,20 +60,24 @@ Page {
                 onClicked: _selectedMenu = 1
             }
             MenuItem {
-                text: qsTr("Search")
+                text: qsTr("Clear")
                 onClicked: _selectedMenu = 2
             }
+            MenuItem {
+                text: qsTr("Search")
+                onClicked: _selectedMenu = 3
+            }
             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")
-                onClicked: _selectedMenu = 4
+                onClicked: _selectedMenu = 5
             }
         }
 
@@ -140,8 +147,8 @@ Page {
                                    { dir: fileModel.appendPath(listLabel.text) });
                 }
                 else {
-                    Functions.cancel()
                     Functions.fileSelect(fileModel.appendPath(listLabel.text))
+                    //Functions.cancel()
                     //pageStack.push(Qt.resolvedUrl("FilePage.qml"),
                     //               { file: fileModel.appendPath(listLabel.text) });
                 }
@@ -164,8 +171,7 @@ Page {
                          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) });
                          }
                      }
                  }