diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(okular VERSION 1.6.${KDE_APPLICATIONS_VERSION_MICRO}) set(QT_REQUIRED_VERSION "5.8.0") -set(KF5_REQUIRED_VERSION "5.44.0") +set(KF5_REQUIRED_VERSION "5.56.0") find_package(ECM 5.33.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) diff --git a/mobile/app/package/contents/ui/TableOfContents.qml b/mobile/app/package/contents/ui/TableOfContents.qml --- a/mobile/app/package/contents/ui/TableOfContents.qml +++ b/mobile/app/package/contents/ui/TableOfContents.qml @@ -20,7 +20,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.3 import QtQuick.Controls 2.0 as QQC2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.7 as Kirigami Kirigami.Page { id: root @@ -35,9 +35,21 @@ id: toolBarContent width: root.width height: searchField.height - QQC2.TextField { + Kirigami.ActionTextField { id: searchField anchors.centerIn: parent + rightActions: [ + Kirigami.Action { + iconName: "edit-clear" + visible: searchField.text != "" + onTriggered: { + searchField.text = "" + searchField.accepted() + } + } + ] + focusSequence: "Ctrl+F" + placeholderText: i18n("Search...") } } ScrollView { diff --git a/mobile/app/package/contents/ui/Thumbnails.qml b/mobile/app/package/contents/ui/Thumbnails.qml --- a/mobile/app/package/contents/ui/Thumbnails.qml +++ b/mobile/app/package/contents/ui/Thumbnails.qml @@ -19,7 +19,7 @@ import QtQuick 2.1 import QtQuick.Controls 2.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.7 as Kirigami ThumbnailsBase { id: root @@ -29,10 +29,22 @@ id: toolBarContent width: root.width height: searchField.height - TextField { + Kirigami.ActionTextField { id: searchField - enabled: documentItem ? documentItem.supportsSearching : false anchors.centerIn: parent + rightActions: [ + Kirigami.Action { + iconName: "edit-clear" + visible: searchField.text != "" + onTriggered: { + searchField.text = "" + searchField.accepted() + } + } + ] + enabled: documentItem ? documentItem.supportsSearching : false + placeholderText: documentItem && documentItem.supportsSearching ? i18n("Search...") : i18n("This document isn't searchable.") + focusSequence: "Ctrl+F" onTextChanged: { if (text.length > 2) { documentItem.searchText(text);