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

diff --git a/qml/filebrowse/pages/SearchPage.qml b/qml/filebrowse/pages/SearchPage.qml
index e11d8e8..67c5d62 100644
--- a/qml/filebrowse/pages/SearchPage.qml
+++ b/qml/filebrowse/pages/SearchPage.qml
@@ -6,11 +6,18 @@ import "../components"
 
 Page {
     id: page
-    allowedOrientations: Orientation.All
+    //allowedOrientations: Orientation.All
     showNavigationIndicator: false // hide back indicator because it would be on top of search field
     property string dir: "/"
     property string currentDirectory: ""
 
+    onStatusChanged: {
+        if (status === PageStatus.Active) {
+            listModel.update("." + engine.extensionFilter);
+            //foundText.visible = true;
+        }
+    }
+
     // this and its bg worker thread will be destroyed when page in popped from stack
     SearchEngine {
         id: searchEngine
@@ -49,12 +56,12 @@ Page {
 
         VerticalScrollDecorator { flickable: fileList }
 
-        PullDownMenu {
-            MenuItem {
-                text: qsTr("Settings")
-                onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
-            }
-        }
+//        PullDownMenu {
+//            MenuItem {
+//                text: qsTr("Settings")
+//                onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
+//            }
+//        }
 
         header: Item {
             width: parent.width
@@ -117,7 +124,7 @@ Page {
             }
             Label {
                 id: foundText
-                visible: false
+                visible: true
                 anchors.left: parent.left
                 anchors.leftMargin: searchField.textLeftMargin
                 anchors.top: searchField.bottom
@@ -183,8 +190,9 @@ Page {
                     pageStack.push(Qt.resolvedUrl("DirectoryPage.qml"),
                                    { dir: model.fullname });
                 else
-                    pageStack.push(Qt.resolvedUrl("FilePage.qml"),
-                                   { file: model.fullname });
+                    Functions.fileSelect(model.fullname)
+//                    pageStack.push(Qt.resolvedUrl("FilePage.qml"),
+//                                   { file: model.fullname });
             }
 
             // delete file after remorse time
@@ -205,17 +213,23 @@ Page {
                          onClicked: Functions.goToFolder(model.absoluteDir)
                      }
                      MenuItem {
-                         text: qsTr("Cut")
-                         onClicked: engine.cutFiles([ model.fullname ]);
-                     }
-                     MenuItem {
-                         text: qsTr("Copy")
-                         onClicked: engine.copyFiles([ model.fullname ]);
-                     }
-                     MenuItem {
-                         text: qsTr("Delete")
-                         onClicked: deleteFile(model.fullname);
+                         text: qsTr("Properties")
+                         onClicked: {
+                            pageStack.push(Qt.resolvedUrl("FilePage.qml"), { file: model.fullname });
+                         }
                      }
+//                     MenuItem {
+//                         text: qsTr("Cut")
+//                         onClicked: engine.cutFiles([ model.fullname ]);
+//                     }
+//                     MenuItem {
+//                         text: qsTr("Copy")
+//                         onClicked: engine.copyFiles([ model.fullname ]);
+//                     }
+//                     MenuItem {
+//                         text: qsTr("Delete")
+//                         onClicked: deleteFile(model.fullname);
+//                     }
                  }
              }
         }