summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Martin <notmart@gmail.com>2015-08-03 12:23:38 (GMT)
committerMarco Martin <notmart@gmail.com>2015-08-03 12:23:38 (GMT)
commitf3698b6d69e4a2b66a17a6f7e30075d5a12ae958 (patch)
tree4dc4b6fea4ee8c729e328558ee602102d3143c71
parent13ad9aa53b8e9629658f2656b3ff3480eb103117 (diff)
port away from ViewSearch
-rw-r--r--CMakeLists.txt2
-rw-r--r--active/app/package/contents/ui/Documents.qml9
-rw-r--r--active/app/package/contents/ui/Thumbnails.qml12
3 files changed, 11 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59c98d6..1b4a7a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ add_subdirectory( shell )
add_subdirectory( generators )
add_subdirectory( autotests )
-add_subdirectory(doc)
+#add_subdirectory(doc)
include(OkularConfigureChecks.cmake)
diff --git a/active/app/package/contents/ui/Documents.qml b/active/app/package/contents/ui/Documents.qml
index 4902c0e..91886f4 100644
--- a/active/app/package/contents/ui/Documents.qml
+++ b/active/app/package/contents/ui/Documents.qml
@@ -36,14 +36,13 @@ PlasmaComponents.Page {
id: toolBarContent
width: root.width
height: searchField.height
- MobileComponents.ViewSearch {
+ PlasmaComponents.TextField {
id: searchField
enabled: documentItem.supportsSearch
anchors.centerIn: parent
- busy: documentItem.searchInProgress
- onSearchQueryChanged: {
- if (searchQuery.length > 2) {
- filterModel.filterRegExp = ".*" + searchQuery + ".*";
+ onTextChanged: {
+ if (text.length > 2) {
+ filterModel.filterRegExp = ".*" + text + ".*";
} else {
filterModel.filterRegExp = "";
}
diff --git a/active/app/package/contents/ui/Thumbnails.qml b/active/app/package/contents/ui/Thumbnails.qml
index 8260619..e755fbf 100644
--- a/active/app/package/contents/ui/Thumbnails.qml
+++ b/active/app/package/contents/ui/Thumbnails.qml
@@ -31,17 +31,17 @@ ThumbnailsBase {
id: toolBarContent
width: root.width
height: searchField.height
- MobileComponents.ViewSearch {
+ PlasmaComponents.TextField {
id: searchField
enabled: documentItem.supportsSearch
anchors.centerIn: parent
busy: documentItem.searchInProgress
- onSearchQueryChanged: {
- if (searchQuery.length > 2) {
- documentItem.searchText(searchQuery)
+ onTextChanged: {
+ if (text.length > 2) {
+ documentItem.searchText(text);
} else {
- view.currentIndex = pageArea.delegate.pageNumber
- documentItem.resetSearch()
+ view.currentIndex = pageArea.delegate.pageNumber;
+ documentItem.resetSearch();
}
}
}