Update some files to QQC2 and fix minor bug

Summary: The bug was that the Drawer use the `drawerOpen` properties now instead of just `open`. Also fix deprecation Kirigami.Label -> QQC2.Label.

Test Plan: Tested on my computer with the touchpad. I could potentialy try with my android phone, if needed.

Subscribers: okular-devel

Tags: #okular

Differential Revision: https://phabricator.kde.org/D18637
remotes/origin/Applications/19.04
Carl Schwan 7 years ago
parent 014b97fd96
commit 2d568acd7d
No known key found for this signature in database
GPG Key ID: 2E102E8C54ED43DC
  1. 2
      mobile/app/package/contents/ui/Thumbnails.qml
  2. 2
      mobile/app/package/contents/ui/ThumbnailsBase.qml
  3. 7
      mobile/app/package/contents/ui/TreeDelegate.qml

@ -41,7 +41,7 @@ ThumbnailsBase {
} }
} }
} }
Kirigami.Label { Label {
anchors { anchors {
left: searchField.right left: searchField.right
verticalCenter: searchField.verticalCenter verticalCenter: searchField.verticalCenter

@ -82,7 +82,7 @@ Kirigami.Page {
bottom: parent.bottom bottom: parent.bottom
right: parent.right right: parent.right
} }
Kirigami.Label { Label {
text: modelData + 1 text: modelData + 1
} }
} }

@ -18,6 +18,7 @@
*/ */
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 2.0
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.kirigami 2.0 as Kirigami import org.kde.kirigami 2.0 as Kirigami
@ -45,7 +46,7 @@ Column {
onClicked: { onClicked: {
documentItem.currentPage = page-1 documentItem.currentPage = page-1
contextDrawer.opened = false contextDrawer.drawerOpen = false
} }
QIconItem { QIconItem {
@ -56,7 +57,7 @@ Column {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
x: units.largeSpacing x: units.largeSpacing
} }
Kirigami.Label { Label {
id: label id: label
text: display text: display
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
@ -73,7 +74,7 @@ Column {
right: pageNumber.left right: pageNumber.left
} }
} }
Kirigami.Label { Label {
id: pageNumber id: pageNumber
text: pageLabel ? pageLabel : page text: pageLabel ? pageLabel : page
anchors.right: parent.right anchors.right: parent.right

Loading…
Cancel
Save