Merge lp:~verzegnassi-stefano/+junk/new-pdf-plugin into lp:ubuntu-docviewer-app

[Stefano Verzegnassi]

[lp:~verzegnassi-stefano/+junk/new-pdf-plugin]

240. By Stefano Verzegnassi on 2016-01-10

* Export Poppler::Error to QML
* Added support for protected PDF documents

241. By Stefano Verzegnassi on 2016-02-25

Sync with trunk

242. By Stefano Verzegnassi on 2016-02-26

Sync PDF plugin with latest LOK-plugin changes:
- Pinch to zoom (not tested)
- Double tap to zoom (not tested)
- Use UITK 1.3 ScrollView
- Zoom settings as a separate object
- Use UCUnits for a better scaling strategy/support
- Zoom modes: manual, fit width, fit page and automatic (as gnome-evince)
- Don't remove QImage data in SGTileItem

And probably some other minor change. There's some chance I've introduced some new bug here and there. Anyway that's not yet relevant because of the current status of the plugin.

243. By Stefano Verzegnassi on 2016-02-28

Use uitk units for rendering the document

244. By Stefano Verzegnassi on 2016-04-07

* Changed LinkHint style
* OpenLinkDialog: fixed button text

245. By Stefano Verzegnassi on 2016-04-15

* Fixed an issue with pinch zooming in PDF viewer
* Removed tiled rendering from PdfPageItem
* Create PdfPageItem only for visible indices - stop creating all the pages on initialization
* Fixed VerticalView::positionAtIndex() as consequence of the change above

246. By Stefano Verzegnassi on 2016-04-15

Added rotation support - pt.1

247. By Stefano Verzegnassi on 2016-04-15

Added rotation support - pt.2

248. By Stefano Verzegnassi on 2016-04-15

* Added TODO and FIXME tasks
* Fixed a bug with VerticalView width when rotated

249. By Stefano Verzegnassi on 2016-04-15

* Fixed PDF link support
* Added touch support for links

250. By Stefano Verzegnassi on 2016-04-15

Fixed links rotation

251. By Stefano Verzegnassi on 2016-04-15

disable mouse/touch areas when the flickable is moving + code style

252. By Stefano Verzegnassi on 2016-04-15

Moved all the logic in VerticalView. Removed PdfPageItem class.

253. By Stefano Verzegnassi on 2016-04-15

Forgot to remove a last reference to PdfPageItem

254. By Stefano Verzegnassi on 2016-04-15

Don't show hints on touch gesture

255. By Stefano Verzegnassi on 2016-04-20

Fixed pdf viewer top margin

256. By Stefano Verzegnassi on 2016-04-20

[Fix] GoTo links returning wrong coordinates + typo

257. By Stefano Verzegnassi on 2016-04-20

[Fix] RenderTasks not removed from the queue when the viewport gets cleaned

258. By Stefano Verzegnassi on 2016-04-20

removed obsolete comments

259. By Stefano Verzegnassi on 2016-04-21

Pdf rotation as a separate class

260. By Stefano Verzegnassi on 2016-04-21

* Re-introduced PDF presentation support. Added a QML image provider to the PDF plugin.
* Minor changes to the RenderEngine tasks name.

NB: ImageProvider and paintThumbnail don't work properly yet (i.e. returning an image with a wrong size).

261. By Stefano Verzegnassi on 2016-04-21

TocModel is now filtered by node level, so we don't get a huge list of entries anymore. Also, this now fits with the UI design specifications.

262. By Stefano Verzegnassi on 2016-04-21

Change spacing value according to the current zoom value. Workaround for getting zoom properly working on QML.

263. By Stefano Verzegnassi on 2016-04-22

Fixed broken GoTo dialog

264. By Stefano Verzegnassi on 2016-04-22

Properly use zoomed spacing where required

Unmerged revisions

264. By Stefano Verzegnassi on 2016-04-22

Properly use zoomed spacing where required

263. By Stefano Verzegnassi on 2016-04-22

Fixed broken GoTo dialog

262. By Stefano Verzegnassi on 2016-04-21

Change spacing value according to the current zoom value. Workaround for getting zoom properly working on QML.

261. By Stefano Verzegnassi on 2016-04-21

TocModel is now filtered by node level, so we don't get a huge list of entries anymore. Also, this now fits with the UI design specifications.

260. By Stefano Verzegnassi on 2016-04-21

* Re-introduced PDF presentation support. Added a QML image provider to the PDF plugin.
* Minor changes to the RenderEngine tasks name.

NB: ImageProvider and paintThumbnail don't work properly yet (i.e. returning an image with a wrong size).

259. By Stefano Verzegnassi on 2016-04-21

Pdf rotation as a separate class

258. By Stefano Verzegnassi on 2016-04-20

removed obsolete comments

257. By Stefano Verzegnassi on 2016-04-20

[Fix] RenderTasks not removed from the queue when the viewport gets cleaned

256. By Stefano Verzegnassi on 2016-04-20

[Fix] GoTo links returning wrong coordinates + typo

255. By Stefano Verzegnassi on 2016-04-20

Fixed pdf viewer top margin

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2016-02-05 22:42:13 +0000
+++ po/com.ubuntu.docviewer.pot	2016-04-22 10:31:39 +0000
@@ -8,13 +8,13 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-05 23:40+0100\n"
+"POT-Creation-Date: 2016-04-07 00:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
@@ -42,7 +42,7 @@
 
 #: ../src/app/qml/common/DetailsPage.qml:26
 #: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
-#: ../src/app/qml/pdfView/PdfView.qml:235
+#: ../src/app/qml/pdfView/PdfView.qml:317
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
 msgid "Details"
 msgstr ""
@@ -117,7 +117,9 @@
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
 #: ../src/app/qml/loView/LOViewGotoDialog.qml:55
-#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/DocumentLockedDialog.qml:61
+#: ../src/app/qml/pdfView/OpenLinkDialog.qml:39
+#: ../src/app/qml/pdfView/PdfView.qml:261
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
 msgid "Cancel"
 msgstr ""
@@ -216,7 +218,7 @@
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPage.qml:23
-#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
+#: /tmp/temp-new-pdf-plugin-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr ""
 
@@ -228,15 +230,15 @@
 msgid "Sorting settings..."
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:44
 msgid "Switch to single column list"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:44
 msgid "Switch to grid"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:52
 msgid "Pick"
 msgstr ""
 
@@ -343,13 +345,13 @@
 msgstr ""
 
 #: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/pdfView/PdfView.qml:310
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
 msgid "Disable night mode"
 msgstr ""
 
 #: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfView.qml:228
+#: ../src/app/qml/pdfView/PdfView.qml:310
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
 msgid "Enable night mode"
 msgstr ""
@@ -400,6 +402,7 @@
 msgstr ""
 
 #: ../src/app/qml/loView/ZoomSelector.qml:122
+#: ../src/app/qml/pdfView/ZoomSelector.qml:119
 msgid "Fit width"
 msgstr ""
 
@@ -408,35 +411,87 @@
 msgstr ""
 
 #: ../src/app/qml/loView/ZoomSelector.qml:124
+#: ../src/app/qml/pdfView/ZoomSelector.qml:121
 msgid "Automatic"
 msgstr ""
 
+#: ../src/app/qml/pdfView/DocumentLockedDialog.qml:25
+msgid "Document is locked"
+msgstr ""
+
+#: ../src/app/qml/pdfView/DocumentLockedDialog.qml:26
+msgid "Please insert a password in order to unlock this document"
+msgstr ""
+
+#: ../src/app/qml/pdfView/DocumentLockedDialog.qml:48
+msgid "Entered password is not valid"
+msgstr ""
+
+#: ../src/app/qml/pdfView/DocumentLockedDialog.qml:67
+msgid "Unlock"
+msgstr ""
+
+#: ../src/app/qml/pdfView/LinkHint.qml:36
+#, qt-format
+msgid "Open link externally: %1"
+msgstr ""
+
+#: ../src/app/qml/pdfView/LinkHint.qml:37
+#: ../src/app/qml/pdfView/OpenLinkDialog.qml:28
+#, qt-format
+msgid "Go to page %1"
+msgstr ""
+
+#: ../src/app/qml/pdfView/OpenLinkDialog.qml:28
+msgid "Open link externally"
+msgstr ""
+
+#: ../src/app/qml/pdfView/OpenLinkDialog.qml:29
+msgid "Are you sure?"
+msgstr ""
+
+#: ../src/app/qml/pdfView/OpenLinkDialog.qml:45
+msgid "Open"
+msgstr ""
+
+#: ../src/app/qml/pdfView/OpenLinkDialog.qml:45
+msgid "Go to destination"
+msgstr ""
+
 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
 #: ../src/app/qml/pdfView/PdfContentsPage.qml:31
-#: ../src/app/qml/pdfView/PdfView.qml:153
+#: ../src/app/qml/pdfView/PdfView.qml:230
 msgid "Contents"
 msgstr ""
 
 #. TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
 #. while the second one (%2) refers to the total pages count.
 #: ../src/app/qml/pdfView/PdfPresentation.qml:51
-#: ../src/app/qml/pdfView/PdfView.qml:56
+#: ../src/app/qml/pdfView/PdfView.qml:49
 #, qt-format
 msgid "Page %1 of %2"
 msgstr ""
 
-#: ../src/app/qml/pdfView/PdfView.qml:203
+#: ../src/app/qml/pdfView/PdfView.qml:284
 msgid "Search"
 msgstr ""
 
-#: ../src/app/qml/pdfView/PdfView.qml:213
+#: ../src/app/qml/pdfView/PdfView.qml:294
 msgid "Go to page..."
 msgstr ""
 
-#: ../src/app/qml/pdfView/PdfView.qml:221
+#: ../src/app/qml/pdfView/PdfView.qml:303
 msgid "Presentation"
 msgstr ""
 
+#: ../src/app/qml/pdfView/PdfView.qml:324
+msgid "Rotate 90° right"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfView.qml:341
+msgid "Rotate 90° left"
+msgstr ""
+
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
 msgid "Go to page"
 msgstr ""
@@ -446,7 +501,11 @@
 msgid "Choose a page between 1 and %1"
 msgstr ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:114
+#: ../src/app/qml/pdfView/ZoomSelector.qml:120
+msgid "Fit page"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-docviewer-app.qml:117
 msgid "File does not exist."
 msgstr ""
 
@@ -464,10 +523,10 @@
 msgid "copy %1"
 msgstr ""
 
-#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /tmp/temp-new-pdf-plugin-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
 msgid "Document Viewer"
 msgstr ""
 
-#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /tmp/temp-new-pdf-plugin-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""
 
=== added file 'src/app/qml/pdfView/DocumentLockedDialog.qml'
--- src/app/qml/pdfView/DocumentLockedDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/pdfView/DocumentLockedDialog.qml	2016-04-22 10:31:39 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2016 Stefano Verzegnassi
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import QtQuick.Layouts 1.1
+
+Dialog {
+    id: unlockDialog
+
+    title: i18n.tr("Document is locked")
+    text: i18n.tr("Please insert a password in order to unlock this document")
+
+    TextField {
+        id: passwordField
+        width: parent.width
+
+        hasClearButton: true
+
+        Keys.onReturnPressed: tryUnlock()
+        onAccepted: tryUnlock()
+
+        Component.onCompleted: forceActiveFocus()
+
+        onTextChanged: {
+            if (text.length === 0) {
+                errorLabel.visible = false
+            }
+        }
+    }
+
+    Label {
+        id: errorLabel
+        text: i18n.tr("Entered password is not valid")
+        color: UbuntuColors.red
+        visible: false
+    }
+
+    RowLayout {
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(-1)
+        }
+
+        Button {
+            text: i18n.tr("Cancel")
+            onClicked: close()
+            Layout.fillWidth: true
+        }
+
+        Button {
+            text: i18n.tr("Unlock")
+            color: UbuntuColors.green
+            Layout.fillWidth: true
+
+            onClicked: goToPage()
+        }
+    }
+
+    function close() {
+         PopupUtils.close(unlockDialog)
+    }
+
+    function tryUnlock() {
+        var result = pdfView.unlock(passwordField.text, passwordField.text)
+
+        if (result) {
+            close()
+        } else {
+            errorLabel.visible = true
+        }
+    }
+}
 
=== added file 'src/app/qml/pdfView/LinkHint.qml'
--- src/app/qml/pdfView/LinkHint.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/pdfView/LinkHint.qml	2016-04-22 10:31:39 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 Stefano Verzegnassi
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+UbuntuShape {
+    id: rootItem
+
+    property var linkInfo
+
+    height: hintText.paintedHeight + units.gu(1)
+    width: hintText.paintedWidth + units.gu(2)
+
+    // TODO: Is .raised okay? https://developer.ubuntu.com/en/apps/qml/tutorials/ubuntu-ui-toolkit-palette/
+    color: theme.palette.normal.raised
+    aspect: UbuntuShape.DropShadow
+
+    Label {
+        id: hintText
+        anchors.centerIn: parent
+
+        // TODO: Is .raisedText okay? https://developer.ubuntu.com/en/apps/qml/tutorials/ubuntu-ui-toolkit-palette/
+        color: theme.palette.normal.raisedText
+        textSize: Label.Small
+        text: linkInfo.url ? i18n.tr("Open «%1»").arg(linkInfo.url)
+                           : i18n.tr("Go to page %1").arg(linkInfo.pageIndex + 1)
+    }
+
+    Timer {
+        interval: 2000
+        running: true
+        onTriggered: rootItem.destroy()
+    }
+}
 
=== added file 'src/app/qml/pdfView/OpenLinkDialog.qml'
--- src/app/qml/pdfView/OpenLinkDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/pdfView/OpenLinkDialog.qml	2016-04-22 10:31:39 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015, 2016 Stefano Verzegnassi
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import QtQuick.Layouts 1.1
+
+Dialog {
+    id: openLinkDialog
+    objectName:"PdfViewGotoDialog"
+
+    property var linkInfo
+
+    title: linkInfo.url ? i18n.tr("Open link externally") : i18n.tr("Go to page %1").arg(linkInfo.pageIndex + 1)
+    text: i18n.tr("Are you sure?")
+
+    RowLayout {
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(-1)
+        }
+
+        Button {
+            text: i18n.tr("Cancel")
+            onClicked: PopupUtils.close(openLinkDialog)
+            Layout.fillWidth: true
+        }
+
+        Button {
+            text: linkInfo.url ? i18n.tr("Open") : i18n.tr("Go")
+            color: UbuntuColors.green
+            Layout.fillWidth: true
+
+            onClicked: openLink()
+        }
+    }
+
+    function openLink() {
+        if (linkInfo.url) {
+            Qt.openUrlExternally(linkInfo.url)
+        } else {
+            pdfView.positionAtIndex(linkInfo.pageIndex, linkInfo.top, linkInfo.left)
+        }
+
+        PopupUtils.close(openLinkDialog)
+    }
+}
 
=== modified file 'src/app/qml/pdfView/PdfContentsPage.qml'
--- src/app/qml/pdfView/PdfContentsPage.qml	2016-03-22 19:31:22 +0000
+++ src/app/qml/pdfView/PdfContentsPage.qml	2016-04-22 10:31:39 +0000
@@ -17,27 +17,33 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import QtQuick.Layouts 1.1
+
+import "../common"
 
 Page {
     id: pdfContents
     objectName: "pdfcontents"
 
+    property var tocModel: pdfView.document.tocModel
+
     // this property will have to be removed when bug #1341671 will be fixed.
     property string testProperty: "for page name issue"
 
     header: PageHeader {
         // TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
-        title: i18n.tr("Contents")
+        title: sortedModel.parentNode == -1
+               ? i18n.tr("Contents")
+               : tocModel.get(sortedModel.parentNode).title
         flickable: view
     }
 
+    // FIXME
     onActiveChanged: {
         // Find out the current page position in the ToC index
-        for (var i=0; i<poppler.tocModel.count; i++) {
-            if (i+1 < poppler.tocModel.count) {
-                if (pdfView.currentPageIndex >= poppler.tocModel.get(i).pageIndex &&
-                        pdfView.currentPageIndex < poppler.tocModel.get(i+1).pageIndex) {
+        for (var i=0; i<tocModel.count; i++) {
+            if (i+1 < tocModel.count) {
+                if (pdfView.currentPageIndex >= tocModel.get(i).pageIndex &&
+                        pdfView.currentPageIndex < tocModel.get(i+1).pageIndex) {
                     break;
                 }
             }
@@ -52,6 +58,7 @@
 
     ScrollView {
         anchors.fill: parent
+<<<<<<< TREE
 
         ListView {
             id: view
@@ -115,6 +122,118 @@
                         color: __isCurrentIndex ? theme.palette.selected.backgroundText
                                                 : theme.palette.normal.backgroundText
                     }
+=======
+
+        ListView {
+            id: view
+            objectName: "view"
+            anchors.fill: parent
+            clip: true
+
+            model: SortFilterModel {
+                id: sortedModel
+
+                property int parentNode: -1
+
+                model: tocModel
+                filter.property: "parentNodeIndex"
+                filter.pattern: new RegExp(parentNode)
+            }
+
+            // Count changes when we change the current parent node.
+            onCountChanged: view.positionViewAtBeginning()
+
+            header: ListItem {
+                visible: sortedModel.parentNode > -1
+                height: visible ? units.gu(6) : 0
+                onClicked: sortedModel.parentNode = -1
+
+                ListItemLayout {
+                    anchors.centerIn: parent
+                    title.text: i18n.tr("Back to parent node")
+
+                    Icon {
+                        SlotsLayout.position: SlotsLayout.Leading
+                        width: units.gu(2); height: width
+                        name: "go-previous"
+                    }
+                }
+            }
+
+            delegate: ListItem {
+                id: delegate
+                objectName: "delegate" + index
+
+                onClicked: {
+                    pdfView.positionAtIndex(model.pageIndex);
+                    contentsBottomEdge.collapse();
+                }
+
+                // Highlighted property of ListItem is read-only. In order to
+                // provide an highlight for the current page, we need to duplicate
+                // the overlay.
+                Rectangle {
+                    anchors.fill: parent
+                    color: Qt.rgba(0, 0, 0, 0.05)
+                    visible: view.currentIndex == model.index
+                }
+
+                ListItemLayout {
+                    id: listItemLayout
+                    objectName: "listItemLayout" + index
+                    anchors.fill: parent
+
+                    Label {
+                        objectName: "pageindex"
+                        SlotsLayout.position: SlotsLayout.Leading
+                        text: model.pageIndex + 1
+                    }
+
+                    title {
+                        text: model.title
+                        elide: Text.ElideRight
+                    }
+
+                    Icon {
+                        SlotsLayout.position: SlotsLayout.Trailing
+                        width: units.gu(2); height: width
+                        name: "tick"
+                        color: UbuntuColors.green
+                        visible: view.currentIndex == model.index
+                    }
+
+                    AbstractButton  {
+                        SlotsLayout.position: SlotsLayout.Last
+                        width: units.gu(4); height: units.gu(8)
+                        opacity: model.hasChildNodes ? 1.0 : 0.0
+
+                        // We use 'nodeIndex' because model.index from SortFilterModel is not
+                        // the one provided in the Toc model
+                        onClicked: sortedModel.parentNode = model.nodeIndex
+
+                        Rectangle {
+                            anchors.fill: parent
+                            anchors.rightMargin: units.gu(-2)
+                            color: theme.palette.highlighted.background
+                            visible: parent.pressed
+                        }
+
+                        VerticalDivider {
+                            anchors {
+                                left: parent.left
+                                top: parent.top
+                                bottom: parent.bottom
+                            }
+                        }
+
+                        Icon {
+                            anchors.centerIn: parent
+                            anchors.horizontalCenterOffset: units.gu(1)
+                            width: units.gu(2); height: width
+                            name: "go-next"
+                        }
+                    }
+>>>>>>> MERGE-SOURCE
                 }
             }
         }
 
=== modified file 'src/app/qml/pdfView/PdfPresentation.qml'
--- src/app/qml/pdfView/PdfPresentation.qml	2016-03-26 18:44:53 +0000
+++ src/app/qml/pdfView/PdfPresentation.qml	2016-04-22 10:31:39 +0000
@@ -17,14 +17,12 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import DocumentViewer 1.0
-import DocumentViewer.PDF 1.0 as PDF
+import DocumentViewer.PDF 2.0 as PDF
 
 Page {
-    id: pdfPage
+    id: pdfPres
     property var poppler
     property bool isPresentationMode: true
-    anchors.fill: parent
-    title: DocumentViewer.getFileBaseNameFromPath(poppler.path)
     focus: true
 
     header: PageHeader {
@@ -41,15 +39,15 @@
             title {
                 font.weight: Font.DemiBold
                 textSize: Label.Large
-                text: pdfPage.title
-                color: pdfPage.header.__styleInstance.foregroundColor
+                text: DocumentViewer.getFileBaseNameFromPath(file.path)
+                color: pdfPres.header.__styleInstance.foregroundColor
             }
             subtitle {
                 textSize: Label.Medium
                 // TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
                 // while the second one (%2) refers to the total pages count.
-                text: i18n.tr("Page %1 of %2").arg(pdfView.currentIndex + 1).arg(pdfView.count)
-                color: pdfPage.header.__styleInstance.foregroundColor
+                text: i18n.tr("Page %1 of %2").arg(view.currentIndex + 1).arg(poppler.pagesCount)
+                color: pdfPres.header.__styleInstance.foregroundColor
             }
         }
 
@@ -61,7 +59,7 @@
     }
 
     ListView {
-        id: pdfView
+        id: view
         anchors.fill: parent
         focus: true
 
@@ -73,25 +71,32 @@
         boundsBehavior: Flickable.StopAtBounds
         cacheBuffer: width
 
-        model: poppler
-        delegate: PdfViewDelegate {
-            presentationMode: true
-            width: pdfPage.width
-            height: pdfPage.height
+        model: poppler.pagesCount
+        delegate: Rectangle {
+            width: pdfPres.width
+            height: pdfPres.height
             color: "black"
-            Component.onDestruction: window.releaseResources()
+
+            Image {
+                anchors.fill: parent
+                source: "image://poppler/page/" + model.index + "/" + poppler.rotation
+                sourceSize.width: pdfPres.width
+                sourceSize.height: pdfPres.height
+                fillMode: Image.PreserveAspectFit   //Image.Pad
+                cache: false
+            }
         }
-        Component.onCompleted: pdfPage.forceActiveFocus()
+        Component.onCompleted: pdfPres.forceActiveFocus()
 
         MouseArea {
             anchors.fill: parent
-            onDoubleClicked: pdfPage.header.visible = !pdfPage.header.visible
+            onDoubleClicked: pdfPres.header.visible = !pdfPres.header.visible
 
             // Hide mouse curson when there's no on-going mouse event
             hoverEnabled: true
             // Flickable can steal mouse handling from MouseArea,
             // so check for any on-going dragging too
-            cursorShape: (showCursorTimer.running || pdfView.dragging) ? Qt.ArrowCursor : Qt.BlankCursor
+            cursorShape: (showCursorTimer.running || view.dragging) ? Qt.ArrowCursor : Qt.BlankCursor
             onPositionChanged: {
                 showCursorTimer.restart()
             }
@@ -104,15 +109,15 @@
 
     Keys.onPressed: {
         if (event.key == Qt.Key_Escape) { pageStack.pop(); return; }
-        if (event.key == Qt.Key_Home) { pdfView.positionViewAtBeginning(); return; }
-        if (event.key == Qt.Key_End) { pdfView.positionViewAtEnd(); return; }
+        if (event.key == Qt.Key_Home) { view.positionViewAtBeginning(); return; }
+        if (event.key == Qt.Key_End) { view.positionViewAtEnd(); return; }
 
         if (event.key == Qt.Key_Right || event.key == Qt.Key_PageDown) {
-            pdfView.incrementCurrentIndex();
+            view.incrementCurrentIndex();
             return;
         }
         if (event.key == Qt.Key_Left || event.key == Qt.Key_PageUp) {
-            pdfView.decrementCurrentIndex();
+            view.decrementCurrentIndex();
             return;
         }
     }
 
=== modified file 'src/app/qml/pdfView/PdfView.qml'
--- src/app/qml/pdfView/PdfView.qml	2016-03-26 18:44:53 +0000
+++ src/app/qml/pdfView/PdfView.qml	2016-04-22 10:31:39 +0000
@@ -17,13 +17,14 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
-import QtQuick.Layouts 1.1
+import DocumentViewer.PDF 2.0 as PDF
 import DocumentViewer 1.0
-import DocumentViewer.PDF 1.0 as PDF
 
 import "../common"
 import "../common/utils.js" as Utils
 
+// FIXME: After a resizing of the window, keep the current page visible.
+
 Page {
     id: pdfPage
     title: DocumentViewer.getFileBaseNameFromPath(file.path)
@@ -31,19 +32,15 @@
     header: PageHeader {
         flickable: pdfView
 
+<<<<<<< TREE
         trailingActionBar.actions: [ goToPage, startPresentation, nightModeToggle, fileDetails ]
+=======
+        trailingActionBar.actions: [ goToPage, startPresentation, nightModeToggle, fileDetails, rotateRight, rotateLeft ]
+>>>>>>> MERGE-SOURCE
 
         contents: ListItemLayout {
             anchors.centerIn: parent
 
-            ActivityIndicator {
-                SlotsLayout.position: SlotsLayout.Leading
-                SlotsLayout.overrideVerticalPositioning: true
-                y: (parent.height - height) * 0.5
-                running: pdfView.currentPageItem.status == Image.Loading || poppler.isLoading
-                visible: running
-            }
-
             title {
                 font.weight: Font.DemiBold
                 text: pdfPage.title
@@ -53,7 +50,13 @@
                 textSize: Label.Small
                 // TRANSLATORS: the first argument (%1) refers to the page currently shown on the screen,
                 // while the second one (%2) refers to the total pages count.
-                text: i18n.tr("Page %1 of %2").arg(pdfView.currentPageIndex + 1).arg(pdfView.count)
+                text: i18n.tr("Page %1 of %2").arg(pdfView.currentPageIndex + 1).arg(pdfView.pagesCount)
+            }
+
+            ZoomSelector {
+                SlotsLayout.position: SlotsLayout.Trailing
+                view: pdfView
+                visible: DocumentViewer.desktopMode || mainView.wideWindow
             }
         }
     }
@@ -62,6 +65,7 @@
     // Component.onDestruction: mainView.nightModeEnabled = false
 
     Keys.onPressed: {
+<<<<<<< TREE
         if (event.key == Qt.Key_F5) { pageStack.push(Qt.resolvedUrl("./PdfPresentation.qml"), {'poppler': poppler}); }
     }
     Rectangle {
@@ -136,6 +140,152 @@
         }
     }
 
+=======
+        if (event.key == Qt.Key_F5) { pageStack.push(Qt.resolvedUrl("PdfPresentation.qml"), {'poppler': pdfView}); }
+    }
+
+
+    ScalingPinchArea {
+        id: pinchArea
+        objectName: "pinchArea"
+        anchors.fill: parent
+
+        clip: true
+
+        enabled: !pdfView.moving
+
+        targetFlickable: pdfView
+        onTotalScaleChanged: targetFlickable.updateContentSize(totalScale)
+
+        maximumZoom: pdfView.zoomSettings.maximumZoom
+        minimumZoom: {
+            if (DocumentViewer.desktopMode || mainView.wideWindow)
+                return pdfView.zoomSettings.minimumZoom
+
+
+            return pdfView.zoomSettings.valueAutomaticZoom
+        }
+
+        Binding {
+            when: !pinchArea.pinch.active
+            target: pinchArea
+            property: "zoomValue"
+            value: pdfView.zoomSettings.zoomFactor
+        }
+
+        Rectangle {
+            // Since UITK 1.3, the MainView background is white.
+            // We need to set a different color, otherwise pages
+            // boundaries are not visible.
+            anchors.fill: parent
+            color: "#f5f5f5"
+        }
+
+        ScrollView {
+            anchors.fill: parent
+
+            PDF.Viewer {
+                id: pdfView
+                objectName: "pdfView"
+                anchors.fill: parent
+
+                function updateContentSize(tgtScale) {
+                    zoomSettings.zoomFactor = tgtScale
+                }
+
+                renderHints: PDF.Document.Antialiasing | PDF.Document.TextAntialiasing
+
+                linkHighlightColor: UbuntuColors.orange
+
+                spacing: units.gu(4)
+
+                documentPath: file.path
+                clip: false
+
+                Component.onCompleted: {
+                    // WORKAROUND: Fix for wrong grid unit size
+                    flickDeceleration = 1500 * units.gridUnit / 8
+                    maximumFlickVelocity = 2500 * units.gridUnit / 8
+
+                    var t = pdfView.document.documentInfo(PDF.Document.Title);
+                    if (t) {
+                        pdfPage.title = t
+                    }
+                }
+
+                onErrorChanged: {
+                    // TODO: Error management
+                    console.log(pdfView.error)
+
+                    switch(pdfView.error) {
+                    case PDF.Error.DocumentLocked:
+                        PopupUtils.open(Qt.resolvedUrl("DocumentLockedDialog.qml"), pdfPage)
+                        break;
+                    }
+                }
+
+                // FIXME: TODO: Not the best management for this. See if/how it can be improved.
+                property var hint
+                onLinkHovered: {
+                    if (!hint) {
+                        var hintComponent = Qt.createComponent("LinkHint.qml");
+                        hint = hintComponent.createObject(pdfView, { "x": mouseX, "y": mouseY - units.gu(3), "linkInfo": linkInfo })
+                    }
+                }
+                onIsLinkHoveredChanged: {
+                    if (!isLinkHovered && hint)
+                        hint.destroy()
+                }
+
+                onLinkClicked: {
+                    if (!isTouch) {
+                        if (linkInfo.url) {
+                            Qt.openUrlExternally(linkInfo.url)
+                        } else {
+                            pdfView.positionAtIndex(linkInfo.pageIndex, linkInfo.top, linkInfo.left)
+                        }
+                    }
+                }
+
+                onLinkPressAndHold: {
+                    if (isTouch) {
+                        PopupUtils.open(Qt.resolvedUrl("OpenLinkDialog.qml"), pdfPage, { linkInfo: linkInfo })
+                    }
+                }
+
+                ScalingMouseArea {
+                    id: mouseArea
+                    anchors.fill: parent
+                    enabled: !pdfView.moving
+
+                    targetFlickable: pdfView
+                    onTotalScaleChanged: targetFlickable.updateContentSize(totalScale)
+
+                    thresholdZoom: minimumZoom + (maximumZoom - minimumZoom) * 0.75
+                    maximumZoom: {
+                        if (DocumentViewer.desktopMode || mainView.wideWindow)
+                            return 3.0
+
+                        return minimumZoom * 3
+                    }
+                    minimumZoom: {
+                        if (DocumentViewer.desktopMode || mainView.wideWindow)
+                            return pdfView.zoomSettings.minimumZoom
+
+
+                        return pdfView.zoomSettings.valueAutomaticZoom
+                    }
+
+                    Binding {
+                        target: mouseArea
+                        property: "zoomValue"
+                        value: pdfView.zoomSettings.zoomFactor
+                    }
+                }
+            }
+        }
+    }
+>>>>>>> MERGE-SOURCE
 
     BottomEdge {
         id: contentsBottomEdge
@@ -166,7 +316,7 @@
             children: contentsBottomEdge._realPage
         }
 
-        enabled: poppler.tocModel.count > 0
+        enabled: pdfView.document.tocModel.count > 0
         visible: enabled
 
         onCollapseCompleted: {
@@ -192,21 +342,29 @@
             PdfContentsPage {
                 width: contentsBottomEdge.width
                 height: contentsBottomEdge.height
-                enabled: contentsBottomEdge.status === BottomEdge.Committed
-                active: contentsBottomEdge.status === BottomEdge.Committed
-                visible: contentsBottomEdge.status !== BottomEdge.Hidden
+                enabled: contentsBottomEdge.status == BottomEdge.Committed
+                active: contentsBottomEdge.status == BottomEdge.Committed
+                visible: contentsBottomEdge.status != BottomEdge.Hidden
             }
         }
     }
 
     /*** ACTIONS ***/
+<<<<<<< TREE
 
     Action {
+=======
+    Action {
+>>>>>>> MERGE-SOURCE
         id: goToPage
         objectName:"gotopage"
         iconName: "browser-tabs"
         text: i18n.tr("Go to page...")
+<<<<<<< TREE
         onTriggered: PopupUtils.open(Qt.resolvedUrl("PdfViewGotoDialog.qml"), pdfPage)
+=======
+        onTriggered: PopupUtils.open(Qt.resolvedUrl("PdfViewGotoDialog.qml"))
+>>>>>>> MERGE-SOURCE
     }
 
     Action {
@@ -214,7 +372,7 @@
         objectName:"presentationmode"
         iconName: "slideshow"
         text: i18n.tr("Presentation")
-        onTriggered: pageStack.push(Qt.resolvedUrl("./PdfPresentation.qml"), {'poppler': poppler})
+        onTriggered: pageStack.push(Qt.resolvedUrl("PdfPresentation.qml"), { poppler: pdfView })
     }
 
     Action {
@@ -231,4 +389,38 @@
         iconName: "info"
         onTriggered: pageStack.push(Qt.resolvedUrl("../common/DetailsPage.qml"))
     }
+
+    Action {
+        id: rotateRight
+        text: i18n.tr("Rotate 90° right")
+        iconName: "rotate-right"
+        onTriggered: {
+            var r = pdfView.rotation
+            r += 1
+
+            if (r > 3)
+                r = 0
+            else if (r < 0)
+                r = 3
+
+            pdfView.rotation = r
+        }
+    }
+
+    Action {
+        id: rotateLeft
+        text: i18n.tr("Rotate 90° left")
+        iconName: "rotate-left"
+        onTriggered: {
+            var r = pdfView.rotation
+            r -= 1
+
+            if (r > 3)
+                r = 0
+            else if (r < 0)
+                r = 3
+
+            pdfView.rotation = r
+        }
+    }
 }
 
=== removed file 'src/app/qml/pdfView/PdfViewDelegate.qml'
--- src/app/qml/pdfView/PdfViewDelegate.qml	2016-01-29 12:23:24 +0000
+++ src/app/qml/pdfView/PdfViewDelegate.qml	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-Rectangle {
-    id: pdfPage
-
-    property int index: model.index
-    property bool _previewFetched: false
-    property bool presentationMode: false
-
-    property alias status: pageImg.status
-
-    width: parent.width
-    height: width * (model.height / model.width)
-    color: "#E6E6E6"
-
-    // Preview page rendering. Used as placeholder while zooming the page.
-    // We generate the low resolution preview from the texture of the PDF page,
-    // so that we can keep page rendering as fast as possible.
-    ShaderEffectSource {
-        id: previewImg
-        anchors.fill: parent
-
-        // We cannot change its opacity or visibility, otherwise the texture will be refreshed,
-        // even if live is false.
-        live: false
-        textureSize: Qt.size(256, 256 * (model.height / model.width))
-    }
-
-    Image {
-        id: pageImg
-        anchors.fill: parent
-
-        cache: false
-        source: "image://poppler" + (index % poppler.providersNumber) + "/page/" + index;
-        sourceSize.width: pdfPage.width
-        fillMode: Image.PreserveAspectFit
-
-        onStatusChanged: {
-            if (presentationMode)
-                return;
-
-            // This is supposed to run the first time PdfViewDelegate gets the page rendering.
-            if (!_previewFetched) {
-                if (status == Image.Ready) {
-                    previewImg.sourceItem = pageImg
-                    // Re-assign sourceItem property, so the texture is not updated when Image status changes.
-                    previewImg.sourceItem = pdfPage
-                }
-            }
-        }
-
-        // Request a new page rendering. The order, which pages are requested with, depends on the distance from the currentPage
-        Timer {
-            id: _zoomTimer
-            interval: {
-                var diff = Math.abs(pdfView.currentPageIndex - model.index)
-                var prov = poppler.providersNumber * 0.5
-
-                if (diff < prov)
-                    return 0
-                else
-                    return (diff - prov) * 10
-            }
-
-            onTriggered: {
-                pageImg.sourceSize.width = pdfPage.width;
-            }
-        }
-    }
-
-    // Page rendering depends on the width of PdfViewDelegate.
-    // Because of this, we have multiple callings to ImageProvider while zooming.
-    // Just avoid it.
-    Connections {
-        target: !presentationMode ? pinchy : null
-
-        onPinchStarted: _zoomTimer.stop();
-        onPinchUpdated: {
-            // This ensures that page image is not reloaded when the maximumScale or minimumScale has already been reached.
-            if ( !(_zoomHelper.scale >= 2.5 && pinch.scale > 1.0) && !(_zoomHelper.scale <= 1.0 && pinch.scale < 1.0) )
-                pageImg.sourceSize.width = 0;
-        }
-        onPinchFinished: _zoomTimer.restart();
-    }
-}
 
=== modified file 'src/app/qml/pdfView/PdfViewGotoDialog.qml'
--- src/app/qml/pdfView/PdfViewGotoDialog.qml	2016-03-26 18:44:53 +0000
+++ src/app/qml/pdfView/PdfViewGotoDialog.qml	2016-04-22 10:31:39 +0000
@@ -24,7 +24,7 @@
     objectName:"PdfViewGotoDialog"
 
     title: i18n.tr("Go to page")
-    text: i18n.tr("Choose a page between 1 and %1").arg(pdfView.count)
+    text: i18n.tr("Choose a page between 1 and %1").arg(pdfView.pagesCount)
 
     TextField {
         id: goToPageTextField
@@ -34,7 +34,7 @@
 
         hasClearButton: true
         inputMethodHints: Qt.ImhFormattedNumbersOnly
-        validator: IntValidator{ bottom: 1; top: pdfView.count }
+        validator: IntValidator{ bottom: 1; top: pdfView.pagesCount }
 
         onAccepted: goToPage()
         Component.onCompleted: forceActiveFocus()
 
=== added file 'src/app/qml/pdfView/ZoomSelector.qml'
--- src/app/qml/pdfView/ZoomSelector.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/pdfView/ZoomSelector.qml	2016-04-22 10:31:39 +0000
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2015 Stefano Verzegnassi
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import QtQuick.Layouts 1.1
+import DocumentViewer.PDF 2.0 as PDF
+
+import "../common"
+
+TextFieldWithButton {
+    id: textField
+    anchors.verticalCenter: parent.verticalCenter
+    width: units.gu(12)
+
+    property var view
+
+    hasClearButton: true
+    inputMethodHints: Qt.ImhFormattedNumbersOnly
+    validator: IntValidator { bottom: 50; top: 400 }
+
+    onAccepted: {
+        textField.view.setZoom(parseInt(text) / 100)
+        focus = false
+    }
+
+    onHighlightedChanged: {
+        if (highlighted) {
+            text = parseInt(textField.view.zoomSettings.zoomFactor * 100)
+        } else text = ""
+    }
+
+    Label {
+        anchors.centerIn: parent
+        visible: !textField.highlighted
+        text: "%1%".arg(parseInt(textField.view.zoomSettings.zoomFactor*100))
+    }
+
+    popover: TextFieldButtonPopover {
+        id: zoomSelectorDialogue
+
+        /************************************
+        *    Zoom in - Zoom out controls    *
+        ************************************/
+
+        RowLayout {
+            anchors { left: parent.left; right: parent.right }
+            height: units.gu(4)
+            spacing: units.gu(1)
+
+            ListItem {
+                divider.visible: false
+                Layout.fillHeight: true
+                Layout.fillWidth: true
+
+                onClicked: textField.view.setZoom(textField.view.zoomSettings.zoomFactor + 0.1)
+
+                Icon {
+                    width: units.gu(2); height: width
+                    anchors.centerIn: parent
+                    name: "zoom-in"
+                }
+            }
+
+            VerticalDivider {
+                Layout.fillHeight: true
+                Layout.preferredWidth: units.dp(2)
+            }
+
+            ListItem {
+                divider.visible: false
+                Layout.fillHeight: true
+                Layout.fillWidth: true
+
+                onClicked: textField.view.setZoom(textField.view.zoomSettings.zoomFactor - 0.1)
+
+                Icon {
+                    width: units.gu(2); height: width
+                    anchors.centerIn: parent
+                    name: "zoom-out"
+                }
+            }
+        }   // RowLayout
+
+        HorizontalDivider { anchors { left: parent.left; right: parent.right } }
+
+        /************************************
+        *       Zoom modes controls         *
+        ************************************/
+
+        Repeater {
+            id: zoomModesRepeater
+
+            function delegate_onClicked(mode) {
+                if (mode === PDF.Zoom.FitWidth)
+                    textField.view.adjustZoomToWidth()
+
+                if (mode === PDF.Zoom.FitPage)
+                    textField.view.adjustZoomToPage()
+
+                if (mode === PDF.Zoom.Automatic)
+                    textField.view.adjustAutomaticZoom()
+            }
+
+            model: [
+                { text: i18n.tr("Fit width"),  mode: PDF.Zoom.FitWidth  },
+                { text: i18n.tr("Fit page"),   mode: PDF.Zoom.FitPage   },
+                { text: i18n.tr("Automatic"),  mode: PDF.Zoom.Automatic }
+            ]
+
+            ListItem {
+                height: units.gu(4)
+                divider.visible: false
+
+                onClicked: {
+                    zoomSelectorDialogue.close()
+                    zoomModesRepeater.delegate_onClicked(modelData.mode)
+                }
+
+                /* UITK 1.3 specs: Two slot layout (A-B) */
+                ListItemLayout {
+                    anchors.centerIn: parent
+
+                    /* UITK 1.3 specs: Slot A */
+                    title.text: modelData.text
+
+                    /* UITK 1.3 specs: Slot B */
+                    Icon {
+                        SlotsLayout.position: SlotsLayout.Last
+                        width: units.gu(2); height: width
+                        name: "tick"
+                        color: UbuntuColors.green
+                        visible: textField.view.zoomSettings.zoomMode == modelData.mode
+                    }
+                }
+            }   // ListItem
+        }
+
+        HorizontalDivider { visible: zoomModesRepeater.visible; anchors { left: parent.left; right: parent.right } }
+
+        /************************************
+        *   Default zoom values controls    *
+        ************************************/
+
+        Repeater {
+            model: [
+                { text: "50%",  value: 0.50 },
+                { text: "70%",  value: 0.70 },
+                { text: "85%",  value: 0.85 },
+                { text: "100%", value: 1.00 },
+                { text: "125%", value: 1.25 },
+                { text: "150%", value: 1.50 },
+                { text: "175%", value: 1.75 },
+                { text: "200%", value: 2.00 },
+                { text: "300%", value: 3.00 },
+                { text: "400%", value: 4.00 }
+            ]
+
+            ListItem {
+                divider.visible: false
+                height: units.gu(4)
+
+                onClicked: {
+                    textField.view.setZoom(modelData.value)
+                    zoomSelectorDialogue.close()
+                }
+
+                Label {
+                    text: modelData.text
+                    anchors {
+                        left: parent.left; leftMargin: units.gu(1)
+                        verticalCenter: parent.verticalCenter
+                    }
+                }
+            }
+        }   // Repeater
+    }   // zoomSelectorDialogue
+}   // textField
 
=== modified file 'src/app/qml/ubuntu-docviewer-app.qml'
--- src/app/qml/ubuntu-docviewer-app.qml	2016-04-05 09:33:28 +0000
+++ src/app/qml/ubuntu-docviewer-app.qml	2016-04-22 10:31:39 +0000
@@ -115,9 +115,14 @@
     }
 
     Component.onCompleted: {
+<<<<<<< TREE
         // WORKAROUND: Mouse detection is not included in the SDK yet
         QuickUtils.mouseAttached = true
 
+=======
+        QuickUtils.mouseAttached = true;
+
+>>>>>>> MERGE-SOURCE
         pageStack.push(Qt.resolvedUrl("documentPage/DocumentPage.qml"));
 
         // Open the document, if one has been specified.
 
=== modified file 'src/app/renderengine.cpp'
--- src/app/renderengine.cpp	2016-01-17 20:33:06 +0000
+++ src/app/renderengine.cpp	2016-04-22 10:31:39 +0000
@@ -18,6 +18,7 @@
 
 void RenderEngine::enqueueTask(AbstractRenderTask *task)
 {
+    dequeueTask(task->id()); // TODO Rethink.
     m_queue.enqueue(task);
     doNextTask();
 }
 
=== modified file 'src/app/renderengine.h'
--- src/app/renderengine.h	2016-01-17 16:17:02 +0000
+++ src/app/renderengine.h	2016-04-22 10:31:39 +0000
@@ -27,7 +27,6 @@
     void dequeueTask(int id);
 
 public:
-
     static RenderEngine* instance() {
         if(!s_instance)
             s_instance = new RenderEngine();
 
=== modified file 'src/app/rendertask.h'
--- src/app/rendertask.h	2016-01-17 16:25:30 +0000
+++ src/app/rendertask.h	2016-04-22 10:31:39 +0000
@@ -13,9 +13,10 @@
 enum RenderTaskType
 {
     RttUnknown = 0x0,
-    RttTile = 0x1,
-    RttImpressThumbnail = 0x2,
-    RttPdfPage = 0x3
+    RttLibreofficeTile = 0x1,
+    RttLibreofficeThumbnail = 0x2,
+    RttPdfTile = 0x3,
+    RttPdfThumbnail = 0x4
 };
 
 class AbstractRenderTask
 
=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/lopartsimageresponse.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/lopartsimageresponse.cpp	2016-01-24 20:27:40 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/lopartsimageresponse.cpp	2016-04-22 10:31:39 +0000
@@ -32,7 +32,7 @@
 
     connect(RenderEngine::instance(), &RenderEngine::taskRenderFinished,
             this, [&](AbstractRenderTask *task, QImage img) {
-        if (m_taskId == task->id() && task->type() == RttImpressThumbnail) {
+        if (m_taskId == task->id() && task->type() == RttLibreofficeThumbnail) {
             m_image = img;
             Q_EMIT finished();
         }
 
=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/lorendertask.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/lorendertask.cpp	2016-01-17 17:42:34 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/lorendertask.cpp	2016-04-22 10:31:39 +0000
@@ -3,7 +3,7 @@
 bool LoRenderTask::canBeRunInParallel(AbstractRenderTask* prevTask)
 {
     Q_ASSERT(prevTask != nullptr);
-    if (prevTask->type() == RttTile || prevTask->type() == RttImpressThumbnail) {
+    if (prevTask->type() == RttLibreofficeTile || prevTask->type() == RttLibreofficeThumbnail) {
         LoRenderTask* loTask = static_cast<LoRenderTask*>(prevTask);
 
         // Another document or the same part in the same document can be run parallel.
 
=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/lorendertask.h'
--- src/plugin/libreofficetoolkit-qml-plugin/lorendertask.h	2016-01-17 17:42:34 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/lorendertask.h	2016-04-22 10:31:39 +0000
@@ -30,7 +30,7 @@
 class TileRenderTask : public LoRenderTask
 {
 public:
-    virtual RenderTaskType type() { return RttTile; }
+    virtual RenderTaskType type() { return RttLibreofficeTile; }
     virtual QImage doWork();
 
     QRect area() { return m_area; }
@@ -45,7 +45,7 @@
 class ThumbnailRenderTask : public LoRenderTask
 {
 public:
-    virtual RenderTaskType type() { return RttImpressThumbnail; }
+    virtual RenderTaskType type() { return RttLibreofficeThumbnail; }
     virtual QImage doWork();
 
     QSize size() const { return m_size; }
 
=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/loview.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/loview.cpp	2016-02-05 22:42:13 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/loview.cpp	2016-04-22 10:31:39 +0000
@@ -343,7 +343,7 @@
 
 void LOView::slotTaskRenderFinished(AbstractRenderTask* task, QImage img)
 {
-    if (task->type() == RttTile) {
+    if (task->type() == RttLibreofficeTile) {
         int id = task->id();
 
         for (auto i = m_tiles.begin(); i != m_tiles.end(); ++i) {
 
=== modified file 'src/plugin/poppler-qml-plugin/CMakeLists.txt'
--- src/plugin/poppler-qml-plugin/CMakeLists.txt	2015-10-21 13:16:12 +0000
+++ src/plugin/poppler-qml-plugin/CMakeLists.txt	2016-04-22 10:31:39 +0000
@@ -8,24 +8,43 @@
 find_package(Qt5Concurrent)
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_BINARY_DIR}
-	${Qt5Quick_PRIVATE_INCLUDE_DIRS}
-	${Qt5Qml_PRIVATE_INCLUDE_DIRS}
-)
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+file(GLOB_RECURSE QML_SRCS
+    qml/*.qml
+    qml/*.js
+)
+
 
 #add the sources to compile
 set(popplerqmlplugin_SRCS
     plugin.cpp
     pdfdocument.cpp
-    pdfimageprovider.cpp
-    pdfitem.cpp
     verticalview.cpp
     pdftocmodel.cpp
+    pdfrendertask.cpp
+    sgtileitem.cpp
+    pagedecoration.cpp
+    pageoverlay.cpp
+    pdfzoom.cpp
+    ucunits.cpp
+    touchdetectionarea.cpp
+    pdfimageprovider.cpp
+    pdfimageresponse.cpp
+    ${QML_SRCS}
+)
+
+set(popplerqmlplugin_HDRS
+    pdferror.h
+    twips.h
+    config.h
 )
 
 add_library(popplerqmlplugin MODULE
     ${popplerqmlplugin_SRCS}
+    ${popplerqmlplugin_HDRS}
 )
 
 target_link_libraries(popplerqmlplugin poppler-qt5)
@@ -38,9 +57,11 @@
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:popplerqmlplugin> ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy ${QML_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
 )
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
 # Install plugin file
 install(TARGETS popplerqmlplugin DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
 install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
+install(FILES ${QML_SRCS} DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
 
=== added file 'src/plugin/poppler-qml-plugin/config.h'
--- src/plugin/poppler-qml-plugin/config.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/config.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,13 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+// Uncomment it if you want to see tiles boundaries
+//#define DEBUG_SHOW_TILE_BORDER
+
+// Uncomment for benchmarking tile rendering performance
+//#define DEBUG_TILE_BENCHMARK
+
+// Uncomment if you want more verbose application output
+//#define DEBUG_VERBOSE
+
+#endif // CONFIG_H
 
=== added file 'src/plugin/poppler-qml-plugin/pagedecoration.cpp'
--- src/plugin/poppler-qml-plugin/pagedecoration.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pagedecoration.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,48 @@
+#include "pagedecoration.h"
+
+#include <QDebug>
+#include <QSGSimpleRectNode>
+
+#define PAGEDECORATION_BORDER_WIDTH 1
+
+PageDecoration::PageDecoration(QQuickItem *parent)
+    : QQuickItem(parent)
+{
+    setFlag(ItemHasContents, true);
+}
+
+PageDecoration::~PageDecoration()
+{ }
+
+QSGNode *PageDecoration::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
+{
+    QSGSimpleRectNode* node = static_cast<QSGSimpleRectNode*>(oldNode);
+    QQuickWindow* wnd = window();
+
+    QRectF outterRect = boundingRect().adjusted(
+                PAGEDECORATION_BORDER_WIDTH * -1,
+                PAGEDECORATION_BORDER_WIDTH * -1,
+                PAGEDECORATION_BORDER_WIDTH,
+                PAGEDECORATION_BORDER_WIDTH);
+
+    if (!node && wnd) {
+        node = new QSGSimpleRectNode();
+        node->setColor(QColor::fromRgb(0, 0, 0, 12));
+
+        auto whitePaperNode = new QSGSimpleRectNode();
+        whitePaperNode->setColor(Qt::white);
+        whitePaperNode->setRect(boundingRect());
+
+        node->appendChildNode(whitePaperNode);
+    }
+
+    node->setRect(outterRect);
+
+    return node;
+}
+
+void PageDecoration::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    update();
+}
 
=== added file 'src/plugin/poppler-qml-plugin/pagedecoration.h'
--- src/plugin/poppler-qml-plugin/pagedecoration.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pagedecoration.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,19 @@
+#ifndef PAGEDECORATION_H
+#define PAGEDECORATION_H
+
+#include <QQuickItem>
+
+class PageDecoration: public QQuickItem
+{
+    Q_OBJECT
+
+public:
+    PageDecoration(QQuickItem *parent);
+    ~PageDecoration();
+
+protected:
+    virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
+    virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+
+};
+#endif // PAGEDECORATION_H
 
=== added file 'src/plugin/poppler-qml-plugin/pageoverlay.cpp'
--- src/plugin/poppler-qml-plugin/pageoverlay.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pageoverlay.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,172 @@
+#include "pageoverlay.h"
+#include "pdfdocument.h"
+#include "verticalview.h"
+
+#include <QDebug>
+
+// scenegraph painting
+#include <QSGNode>
+#include <QSGSimpleRectNode>
+
+// mouse cursor
+//#include <QCursor>
+
+// Poppler Qt5
+#include <poppler/qt5/poppler-qt5.h>
+
+PageOverlay::PageOverlay(VerticalView *view, int pageIndex, QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_view(view)
+    , m_pageIndex(pageIndex)
+{
+    setFlag(ItemHasContents, true);
+    //setAcceptHoverEvents(true);
+
+    connect(m_view, &VerticalView::showLinkHighlightChanged, this, &PageOverlay::update);
+    connect(m_view, &VerticalView::linkHighlightColorChanged, this, &PageOverlay::update);
+}
+
+PageOverlay::~PageOverlay()
+{ }
+
+QSGNode *PageOverlay::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
+{
+    QSGNode* node = static_cast<QSGNode*>(oldNode);
+    QQuickWindow* wnd = window();
+
+    if (!node && wnd) {
+        node = new QSGNode();
+    }
+
+    if (m_view->showLinkHighlight() && boundingRect().isValid()) {
+        QList<Poppler::Link *> links = m_view->document()->pageLinks(m_pageIndex);
+
+        Q_FOREACH(Poppler::Link *link, links) {
+            if (link->linkType() == Poppler::Link::Goto ||
+                    link->linkType() == Poppler::Link::Browse) {
+
+                bool rotatedBy90 = (m_view->rotation() == PdfRotation::Rotate90 ||
+                                    m_view->rotation() == PdfRotation::Rotate270);
+
+                QRectF linkRect;
+                int x1 = (!rotatedBy90 ? width() : height()) * link->linkArea().left();
+                int y1 = (!rotatedBy90 ? height() : width()) * link->linkArea().top();
+                int x2 = (!rotatedBy90 ? width() : height()) * link->linkArea().right();
+                int y2 = (!rotatedBy90 ? height() : width()) * link->linkArea().bottom();
+                int w  = this->width();
+                int h  = this->height();
+
+                switch (m_view->rotation()) {
+                case PdfRotation::Rotate0:
+                    linkRect.setLeft   ( x1 );
+                    linkRect.setTop    ( y1 );
+                    linkRect.setRight  ( x2 );
+                    linkRect.setBottom ( y2 );
+                    break;
+                case PdfRotation::Rotate90:
+                    linkRect.setLeft   ( w - y2 );
+                    linkRect.setTop    ( x1     );
+                    linkRect.setRight  ( w - y1 );
+                    linkRect.setBottom ( x2     );
+                    break;
+                case PdfRotation::Rotate180:
+                    linkRect.setLeft   ( w - x2 );
+                    linkRect.setTop    ( h - y2 );
+                    linkRect.setRight  ( w - x1 );
+                    linkRect.setBottom ( h - y1 );
+                    break;
+                case PdfRotation::Rotate270:
+                    linkRect.setLeft   ( y1     );
+                    linkRect.setTop    ( h - x2 );
+                    linkRect.setRight  ( y2     );
+                    linkRect.setBottom ( h - x1 );
+                    break;
+                }
+
+                auto linkNode = new QSGSimpleRectNode();
+
+                const QColor &linkColor = m_view->linkHighlightColor();
+                linkNode->setColor(QColor::fromRgb(linkColor.red(), linkColor.green(), linkColor.blue(), 8));
+                linkNode->setRect(linkRect);
+
+                drawLinkBorders(linkNode);
+
+                node->appendChildNode(linkNode);
+            }
+        }
+    }
+
+    return node;
+}
+
+void PageOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    update();
+}
+
+/*
+ *  QML MouseArea overwrite any attempt to set this from C++
+ *  Disable this code and do it through QML (see Viewer.qml).
+ *  TODO: Check performance of the QML code that handles this.
+ *
+void PageOverlay::hoverMoveEvent(QHoverEvent *event)
+{
+    // We only handle what's strictly necessary for changing the cursor aspect.
+    // Any other mouse event is handled directly through QML.
+    const QPointF &curPos = event->posF();
+
+    QList<Poppler::Link *> links = m_view->document()->pageLinks(m_pageIndex);
+    Q_FOREACH (Poppler::Link *link, links) {
+        QRectF linkRect(link->linkArea().x() * this->width(),
+                        link->linkArea().y() * this->height(),
+                        link->linkArea().width() * this->width(),
+                        link->linkArea().height() * this->height());
+
+        if (linkRect.contains(curPos)) {
+            setCursor(QCursor(Qt::PointingHandCursor));
+            return;
+        }
+    }
+
+    // Not hovering a link. Restore default cursor.
+    unsetCursor();
+}
+*/
+
+void PageOverlay::drawLinkBorders(QSGSimpleRectNode *parentNode)
+{
+    auto node = parentNode;
+
+    auto linkBorderGeometry = new QSGGeometry(QSGGeometry::defaultAttributes_Point2D(), 8);
+    linkBorderGeometry->setDrawingMode(GL_LINES);
+    linkBorderGeometry->setLineWidth(1);
+
+    QSGGeometry::Point2D* vertex = linkBorderGeometry->vertexDataAsPoint2D();
+    vertex[0].set(node->rect().left(), node->rect().top());
+    vertex[1].set(node->rect().left(), node->rect().bottom());
+
+    vertex[2].set(node->rect().right(), node->rect().top());
+    vertex[3].set(node->rect().right(), node->rect().bottom());
+
+    vertex[4].set(vertex[0].x, vertex[0].y);
+    vertex[5].set(vertex[2].x, vertex[2].y);
+
+    vertex[6].set(vertex[1].x, vertex[1].y);
+    vertex[7].set(vertex[3].x, vertex[3].y);
+
+    auto linkBorderMaterial = new QSGFlatColorMaterial;
+
+    const QColor &linkColor = m_view->linkHighlightColor();
+    linkBorderMaterial->setColor(QColor::fromRgb(linkColor.red(), linkColor.green(), linkColor.blue(), 64));
+
+    auto linkBorderNode = new QSGGeometryNode;
+
+    linkBorderNode->setGeometry(linkBorderGeometry);
+    linkBorderNode->setFlag(QSGNode::OwnsGeometry);
+
+    linkBorderNode->setMaterial(linkBorderMaterial);
+    linkBorderNode->setFlag(QSGNode::OwnsMaterial);
+
+    node->appendChildNode(linkBorderNode);
+}
 
=== added file 'src/plugin/poppler-qml-plugin/pageoverlay.h'
--- src/plugin/poppler-qml-plugin/pageoverlay.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pageoverlay.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,35 @@
+#ifndef PAGEOVERLAY_H
+#define PAGEOVERLAY_H
+
+#include <QQuickItem>
+
+class VerticalView;
+class QSGSimpleRectNode;
+
+class PageOverlay: public QQuickItem
+{
+    Q_OBJECT
+
+public:
+    PageOverlay(VerticalView *view, int pageIndex, QQuickItem *parent);
+    ~PageOverlay();
+
+    bool showLinkHighlight() const;
+    void setShowLinkHighlight(bool show);
+
+    QColor linkHighlightColor() const;
+    void setLinkHightlightColor(const QColor &color);
+
+protected:
+    virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
+    virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+    //virtual void hoverMoveEvent(QHoverEvent * event);
+
+private:
+    void drawLinkBorders(QSGSimpleRectNode *parentNode);
+
+private:
+    VerticalView* m_view;
+    int m_pageIndex;
+};
+#endif // PAGEOVERLAY_H
 
=== modified file 'src/plugin/poppler-qml-plugin/pdfdocument.cpp'
--- src/plugin/poppler-qml-plugin/pdfdocument.cpp	2015-07-14 15:43:11 +0000
+++ src/plugin/poppler-qml-plugin/pdfdocument.cpp	2016-04-22 10:31:39 +0000
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Anthony Granger <[e-mail]>
- *          Stefano Verzegnassi <[e-mail]>
- */
-
 #include "pdfdocument.h"
-#include "pdfimageprovider.h"
+#include "twips.h"
 
 #include <poppler/qt5/poppler-qt5.h>
 #include <QDebug>
@@ -27,47 +8,18 @@
 
 #include <QtConcurrent/QtConcurrent>
 
-PdfDocument::PdfDocument(QAbstractListModel *parent):
-    QAbstractListModel(parent)
-  , m_path("")
-  , m_providersNumber(1)
+// TODO: Add QQuickAsyncImageProvider for thumbnails
+
+PdfDocument::PdfDocument():
+    m_path("")
   , m_tocModel(nullptr)
-{
-    qRegisterMetaType<PdfPagesList>("PdfPagesList");
-}
-
-QHash<int, QByteArray> PdfDocument::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[WidthRole] = "width";
-    roles[HeightRole] = "height";
-    return roles;
-}
-
-int PdfDocument::rowCount(const QModelIndex & parent) const
-{
-    Q_UNUSED(parent)
-    return m_pages.count();
-}
-
-QVariant PdfDocument::data(const QModelIndex & index, int role) const
-{
-    if (index.row() < 0 || index.row() > m_pages.count())
-        return QVariant();
-
-    const PdfItem &pdfItem = m_pages.at(index.row());
-
-    switch (role) {
-    case WidthRole:
-        return pdfItem.width();
-    case HeightRole:
-        return pdfItem.height();
-    default:
-        return 0;
-    }
-}
-
-void PdfDocument::setPath(QString &pathName)
+  , m_error(PopplerError::NoError)
+  , m_renderHints(0)
+{
+    connect(this, &PdfDocument::renderHintsChanged, this, &PdfDocument::updateRenderHints);
+}
+
+void PdfDocument::setPath(const QString &pathName)
 {
     if (pathName.isEmpty())
         return;
@@ -75,131 +27,277 @@
     m_path = pathName;
     Q_EMIT pathChanged();
 
-    if (!loadDocument(m_path))
-        return;
-
-    // Init toc model
-    m_tocModel = new PdfTocModel;
-    m_tocModel->setDocument(m_document);
-    Q_EMIT tocModelChanged();
-
-    loadPages();
-    loadProvider();
-}
-
-bool PdfDocument::loadDocument(QString &pathName)
-{
-    qDebug() << "Loading document...";
-
-    if (pathName.isEmpty()) {
-        qDebug() << "Can't load the document, path is empty.";
-        return false;
-    }
-
-    m_document = Poppler::Document::load(pathName);
-
-    if (!m_document || m_document->isLocked()) {
-        qDebug() << "ERROR : Can't open the document located at " + pathName;
-        Q_EMIT error("Can't open the document located at " + pathName);
-
-        delete m_document;
-        return false;
-    }
-
-    qDebug() << "Document loaded successfully !";
-
-    m_document->setRenderHint(Poppler::Document::Antialiasing, true);
-    m_document->setRenderHint(Poppler::Document::TextAntialiasing, true);
-
-    return true;
+    loadDocument();
+}
+
+bool PdfDocument::isLocked()
+{
+    if (!m_popDocument)
+        return true;
+
+    return m_popDocument.data()->isLocked();
+}
+
+int PdfDocument::pageCount()
+{
+    if (!m_popDocument)
+        return 0;
+
+    return m_popDocument.data()->numPages();
 }
 
 QDateTime PdfDocument::getDocumentDate(QString data)
 {
-    if (!m_document)
+    if (!m_popDocument)
         return QDateTime();
 
     if (data == "CreationDate" || data == "ModDate")
-        return m_document->date(data);
+        return m_popDocument->date(data);
     else
         return QDateTime();
 }
 
 QString PdfDocument::getDocumentInfo(QString data)
 {
-    if (!m_document)
+    if (!m_popDocument)
         return QString("");
 
     if (data == "Title" || data == "Subject" || data == "Author" || data == "Creator" || data == "Producer")
-        return m_document->info(data);
+        return m_popDocument->info(data);
     else
         return QString("");
 }
 
-bool PdfDocument::loadPages()
-{
-    qDebug() << "Populating model...";
-
-    m_pages.clear();
-
-    if (!m_document)
-        return false;
-
-    Poppler::Document* document = m_document;
-    QtConcurrent::run( [=] {
-        PdfPagesList pages;
-
-        for( int i = 0; i < document->numPages(); ++i )
-            pages.append(document->page(i));
-
-        QMetaObject::invokeMethod(this, "_q_populate", Qt::QueuedConnection, Q_ARG(PdfPagesList, pages));
-    });
+QVariant PdfDocument::documentInfo(PdfDocument::DocumentInfo info)
+{
+    if (!m_popDocument)
+        return QVariant();
+
+    switch (info) {
+    case Title:
+        return m_popDocument->info("Title");
+    case Subject:
+        return m_popDocument->info("Subject");
+    case Author:
+        return m_popDocument->info("Author");
+    case Creator:
+        return m_popDocument->info("Creator");
+    case Producer:
+        return m_popDocument->info("Producer");
+    case CreationDate:
+        return m_popDocument->date("CreationDate");
+    case ModifiedDate:
+        return m_popDocument->date("ModDate");
+    default:
+        return QVariant();
+    }
+}
+
+bool PdfDocument::unlock(const QString &ownerPassword, const QString &userPassword)
+{
+    bool result = false;
+
+    m_popDocument.data()->unlock(ownerPassword.toLatin1(), userPassword.toLatin1());
+
+    // It seems that Poppler::Document::unlock() returns true even with the wrong password :/
+    result = !isLocked();
+
+    if (result) {
+        completeIntialization();
+    }
+
+    return result;
+}
+
+QObject *PdfDocument::tocModel() const
+{
+    return m_tocModel;
+}
+
+QSize PdfDocument::pageSize(int index) const
+{
+    QSize s;
+
+    if (m_popDocument) {
+        Poppler::Page* page = m_popDocument.data()->page(index);
+
+        s = page->pageSize();
+
+        delete page;
+    }
+
+    return s;
+}
+
+PopplerError::Error PdfDocument::error() const
+{
+    return m_error;
+}
+
+PdfDocument::RenderHints PdfDocument::renderHints() const
+{
+    return m_renderHints;
+}
+
+void PdfDocument::setRenderHints(const RenderHints hints)
+{
+    if (m_renderHints == hints)
+        return;
+
+    m_renderHints = hints;
+    Q_EMIT renderHintsChanged();
+}
+
+void PdfDocument::updateRenderHints()
+{
+    if (!m_popDocument)
+        return;
+
+    Poppler::Document* doc = m_popDocument.data();
+
+    doc->setRenderHint(Poppler::Document::RenderHint::Antialiasing,      m_renderHints & PdfDocument::Antialiasing);
+    doc->setRenderHint(Poppler::Document::RenderHint::TextAntialiasing,  m_renderHints & PdfDocument::TextAntialiasing);
+    doc->setRenderHint(Poppler::Document::RenderHint::TextHinting,       m_renderHints & PdfDocument::TextHinting);
+    doc->setRenderHint(Poppler::Document::RenderHint::TextSlightHinting, m_renderHints & PdfDocument::TextSlightHinting);
+    doc->setRenderHint(Poppler::Document::RenderHint::OverprintPreview,  m_renderHints & PdfDocument::OverprintPreview);
+    doc->setRenderHint(Poppler::Document::RenderHint::ThinLineSolid,     m_renderHints & PdfDocument::ThinLineSolid);
+    doc->setRenderHint(Poppler::Document::RenderHint::ThinLineShape,     m_renderHints & PdfDocument::ThinLineShape);
+}
+
+QImage PdfDocument::paintTile(int pageIndex, const qreal &zoom, QRect rect, PdfRotation::Rotation rotate) const
+{
+    QImage result;
+
+    if (m_popDocument) {
+        if (pageIndex >= 0 || pageIndex < m_popDocument.data()->numPages()) {
+            Poppler::Page* page = m_popDocument.data()->page(pageIndex);
+
+            result = page->renderToImage(
+                        DEFAULT_DPI * Twips::getUnitsRatio() * zoom,
+                        DEFAULT_DPI * Twips::getUnitsRatio() * zoom,
+                        rect.x(), rect.y(), rect.width(), rect.height(),
+                        Poppler::Page::Rotation(rotate));
+
+            delete page;
+        }
+    }
+
+    return result;
+}
+
+//FIXME: Not perfect!
+QImage PdfDocument::paintThumbnail(int pageIndex, const QSize &size, PdfRotation::Rotation rotate) const
+{
+    QImage result;
+
+    if (m_popDocument) {
+        if (pageIndex >= 0 || pageIndex < m_popDocument.data()->numPages()) {
+            Poppler::Page* page = m_popDocument.data()->page(pageIndex);
+
+            QSize resultSize;
+            QSize pageSize = page->pageSize();
+
+            if (pageSize.width() > pageSize.height()) {
+                resultSize.setWidth(size.width());
+                resultSize.setHeight(size.width() * pageSize.height() / pageSize.width());
+            } else {
+                resultSize.setHeight(size.height());
+                resultSize.setWidth(size.height() * pageSize.width() / pageSize.height());
+            }
+
+            result = page->renderToImage(
+                        resultSize.width() / (pageSize.width() / 72),
+                        resultSize.height() / (pageSize.height() / 72),
+                        -1, -1, -1, -1,
+                        Poppler::Page::Rotation(rotate));
+
+            delete page;
+        }
+    }
+
+    return result;
+}
+
+QList<Poppler::Link *> PdfDocument::pageLinks(int pageIndex) const
+{
+    QList<Poppler::Link *> result;
+
+    if (!m_links.empty())
+        result = m_links.value(pageIndex);
+
+    return result;
+}
+
+bool PdfDocument::loadDocument()
+{
+    qDebug() << "Loading document...";
+
+    if (m_path.isEmpty()) {
+        qDebug() << "Can't load the document, path is empty.";
+        setError(PopplerError::FileNotFound);
+        return false;
+    }
+
+    Poppler::Document* doc = Poppler::Document::load(m_path);
+    m_popDocument = QSharedPointer<Poppler::Document>(doc);
+
+    if (!doc || doc->isLocked()) {
+        qDebug() << "ERROR : Can't open the document located at " + m_path;
+        setError(PopplerError::DocumentLocked);
+
+        return false;
+    }
+
+    setError(PopplerError::NoError);
+    qDebug() << "Document loaded successfully !";
+
+    completeIntialization();
 
     return true;
-}
-
-void PdfDocument::_q_populate(PdfPagesList pagesList)
-{
-    qDebug() << "Number of pages:" << pagesList.count();
-
-    Q_FOREACH (Poppler::Page *page, pagesList) {
-        beginInsertRows(QModelIndex(), rowCount(), rowCount());
-        m_pages << page;
-        endInsertRows();
-    }
-
-    qDebug() << "Model has been successfully populated!";
-    Q_EMIT pagesLoaded();
-}
-
-void PdfDocument::loadProvider()
-{
-    // WORKAROUND: QQuickImageProvider should create multiple threads to load more images at the same time.
-    // [QTBUG-37998] QQuickImageProvider can block its separate thread with ForceAsynchronousImageLoading
-    // Link: https://bugreports.qt.io/browse/QTBUG-37988
-
-    // WORKAROUND: ARM SoCs can disable some of their cores when the load is not particulary high.
-    // This causes a wrong value for the "newProvidersNumber" variable.
-    // We hard-code its value to 4 (which is the number of available core on all the supported devices).
-//    int newProvidersNumber = QThread::idealThreadCount();
-    int newProvidersNumber = 4;
-
-    if (newProvidersNumber != m_providersNumber) {
-        m_providersNumber = newProvidersNumber;
-        Q_EMIT providersNumberChanged();
-    }
-
-    qDebug() << "Ideal number of image providers is:" << m_providersNumber;
-
-    qDebug() << "Loading image provider(s)...";
-    QQmlEngine *engine = QQmlEngine::contextForObject(this)->engine();
-
-    for (int i=0; i<m_providersNumber; i++)
-        engine->addImageProvider(QLatin1String("poppler" + QByteArray::number(i)), new PdfImageProvider(m_document));
-
-    qDebug() << "Image provider(s) loaded successfully !";
+
+}
+
+void PdfDocument::setError(const PopplerError::Error &error)
+{
+    if (m_error == error)
+        return;
+
+    m_error = error;
+    Q_EMIT errorChanged();
+}
+
+void PdfDocument::completeIntialization()
+{
+    updateRenderHints();
+
+    // Init toc model
+    m_tocModel = new PdfTocModel;
+    m_tocModel->setDocument(m_popDocument);
+    Q_EMIT tocModelChanged();
+
+    Q_EMIT pageCountChanged();
+
+    // WORKAROUND: Getting links from pages seems a bit trivial and causes SIGFAULTs.
+    // Do it once at document initialization and cache them for any future request.
+    for (int i=0; i<m_popDocument->numPages(); ++i) {
+        Poppler::Page* page = m_popDocument->page(i);
+
+        QList<Poppler::Link *> l = page->links();
+        m_links.insert(i, l);
+
+        delete page;
+    }
 }
 
 PdfDocument::~PdfDocument()
 {
+    Q_FOREACH(QList<Poppler::Link *> list, m_links)
+        qDeleteAll(list);
+
+    delete m_tocModel;
+}
+
+QString PdfDocument::path() const
+{
+    return m_path;
 }
 
=== modified file 'src/plugin/poppler-qml-plugin/pdfdocument.h'
--- src/plugin/poppler-qml-plugin/pdfdocument.h	2015-02-04 19:19:21 +0000
+++ src/plugin/poppler-qml-plugin/pdfdocument.h	2016-04-22 10:31:39 +0000
@@ -1,85 +1,117 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Anthony Granger <[e-mail]>
- *         Stefano Verzegnassi <[e-mail]>
- */
-
 #ifndef PDFDOCUMENT_H
 #define PDFDOCUMENT_H
 
-#include <QAbstractListModel>
+#include <QObject>
+#include <QSharedPointer>
 #include <poppler/qt5/poppler-qt5.h>
-#include "pdfitem.h"
+
+#include "../../app/renderengine.h"
 #include "pdftocmodel.h"
-
-typedef QList<Poppler::Page*> PdfPagesList;
-
-class PdfDocument : public QAbstractListModel
+#include "pdferror.h"
+
+class PdfRotation : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(Rotation)
+
+public:
+    enum Rotation {
+        Rotate0 = Poppler::Page::Rotate0,
+        Rotate90 = Poppler::Page::Rotate90,
+        Rotate180 = Poppler::Page::Rotate180,
+        Rotate270 = Poppler::Page::Rotate270,
+    };
+};
+
+class PdfDocument : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY(PdfDocument)
+    Q_ENUMS(DocumentInfo)
+    Q_ENUMS(RenderHint)
+    Q_FLAGS(RenderHints)
     Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(int providersNumber READ providersNumber NOTIFY providersNumberChanged)
+    Q_PROPERTY(int pageCount READ pageCount NOTIFY pageCountChanged)
     Q_PROPERTY(QObject* tocModel READ tocModel NOTIFY tocModelChanged)
+    Q_PROPERTY(PopplerError::Error error READ error NOTIFY errorChanged)
+    Q_PROPERTY(RenderHints renderHints READ renderHints WRITE setRenderHints NOTIFY renderHintsChanged)
 
 public:
-    enum Roles {
-        WidthRole = Qt::UserRole + 1,
-        HeightRole
-    };
-
-    explicit PdfDocument(QAbstractListModel *parent = 0);
-    virtual ~PdfDocument();
-
-    QString path() const { return m_path; }
-    void setPath(QString &pathName);
-
-    int providersNumber() const { return m_providersNumber; }
-
-    QHash<int, QByteArray> roleNames() const;
-
-    int rowCount(const QModelIndex & parent = QModelIndex()) const;
-    QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
+    explicit PdfDocument();
+    ~PdfDocument();
+
+    enum DocumentInfo {
+        Title,
+        Subject,
+        Author,
+        Creator,
+        Producer,
+        CreationDate,
+        ModifiedDate
+    };
+
+    enum RenderHint {
+        Antialiasing  = 0x00000001,
+        TextAntialiasing = 0x00000002,
+        TextHinting = 0x00000004,
+        TextSlightHinting = 0x00000008,
+        OverprintPreview = 0x00000010,
+        ThinLineSolid = 0x00000020,
+        ThinLineShape = 0x00000040
+    };
+    Q_DECLARE_FLAGS(RenderHints, RenderHint)
+
+    QString path() const;
+    void setPath(const QString &pathName);
+
+    bool isLocked();
+
+    int pageCount();
+
+    QImage paintTile(int pageIndex, const qreal &zoom, QRect rect, PdfRotation::Rotation rotate = PdfRotation::Rotate0) const;
+    QImage paintThumbnail(int pageIndex, const QSize &size, PdfRotation::Rotation rotate = PdfRotation::Rotate0) const;
+
+    QList<Poppler::Link *> pageLinks(int pageIndex) const;
 
     Q_INVOKABLE QDateTime getDocumentDate(QString data);
     Q_INVOKABLE QString getDocumentInfo(QString data);
-
-    QObject *tocModel() const { return m_tocModel; }
+    Q_INVOKABLE QVariant documentInfo(DocumentInfo info);
+
+    Q_INVOKABLE bool unlock(const QString &ownerPassword, const QString &userPassword);
+
+    QObject *tocModel() const;
+
+    QSize pageSize(int index) const;
+
+    PopplerError::Error error() const;
+
+    RenderHints renderHints() const;
+    void setRenderHints(const RenderHints hints);
 
 Q_SIGNALS:
     void pathChanged();
-    void error(const QString& errorMessage);
-    void pagesLoaded();
-    void providersNumberChanged();
+    void pageCountChanged();
     void tocModelChanged();
-
-private slots:
-    void _q_populate(PdfPagesList pagesList);
+    void errorChanged();
+    void renderHintsChanged();
+
+private Q_SLOTS:
+    void updateRenderHints();
+
+private:
+    bool loadDocument();
+    void setError(const PopplerError::Error &error);
+    void completeIntialization();
 
 private:
     QString m_path;
-    int m_providersNumber;
-
-    bool loadDocument(QString &pathNAme);
-    void loadProvider();
-    bool loadPages();
-
-    Poppler::Document *m_document;
-    QList<PdfItem> m_pages;
     PdfTocModel* m_tocModel;
+    PopplerError::Error m_error;
+    RenderHints m_renderHints;
+
+    QHash<int, QList<Poppler::Link *>> m_links;
+
+    QSharedPointer<Poppler::Document> m_popDocument;
 };
 
 #endif // PDFDOCUMENT_H
 
=== added file 'src/plugin/poppler-qml-plugin/pdferror.h'
--- src/plugin/poppler-qml-plugin/pdferror.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdferror.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,19 @@
+#ifndef PDFERROR_H
+#define PDFERROR_H
+
+#include <QObject>
+
+class PopplerError : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(Error)
+
+public:
+    enum Error {
+        NoError                   = 0,
+        FileNotFound              = 1,
+        DocumentLocked            = 2
+    };
+};
+
+#endif // PDFERROR_H
 
=== added file 'src/plugin/poppler-qml-plugin/pdfimageprovider.cpp'
--- src/plugin/poppler-qml-plugin/pdfimageprovider.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdfimageprovider.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2015, 2016 Stefano Verzegnassi
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "pdfimageprovider.h"
+#include "pdfimageresponse.h"
+
+#include "pdfdocument.h"
+
+#include "../../app/renderengine.h"
+#include "pdfrendertask.h"
+
+#include <QDebug>
+
+PdfImageProvider::PdfImageProvider(const QSharedPointer<PdfDocument>& d)
+    : QQuickAsyncImageProvider()
+    , m_document(d)
+{ }
+
+QQuickImageResponse *PdfImageProvider::requestImageResponse(const QString & id, const QSize & requestedSize)
+{
+    QString type = id.section("/", 0, 0);
+    int part = id.section("/", 1, 1).toInt();
+    int rotation = id.section("/", 2, 2).toInt();
+    bool isValid = bool(!requestedSize.isNull() && type == "page");
+
+    auto response = new PdfImageResponse(isValid);
+
+    if (isValid) {
+        int taskId = RenderEngine::getNextId();
+        response->setTaskId(taskId);
+        RenderEngine::instance()->enqueueTask(createTask(part, rotation, requestedSize, taskId));
+    }
+
+    return response;
+}
+
+PdfThumbnailRenderTask* PdfImageProvider::createTask(int pageIndex, int rotation, const QSize &size, int id) const
+{
+    auto task = new PdfThumbnailRenderTask();
+    task->setId(id);
+    task->setPage(pageIndex);
+    task->setDocument(m_document);
+    task->setRotation(rotation);
+    task->setSize(size.isEmpty() ? QSize(256, 256) : size);
+
+    return task;
+}
 
=== removed file 'src/plugin/poppler-qml-plugin/pdfimageprovider.cpp'
--- src/plugin/poppler-qml-plugin/pdfimageprovider.cpp	2015-02-03 18:50:36 +0000
+++ src/plugin/poppler-qml-plugin/pdfimageprovider.cpp	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Anthony Granger <[e-mail]>
- *         Stefano Verzegnassi <[e-mail]
- */
-
-#include <poppler/qt5/poppler-qt5.h>
-#include <QQuickImageProvider>
-#include <QDebug>
-
-#include "pdfimageprovider.h"
-
-PdfImageProvider::PdfImageProvider(Poppler::Document *pdfDocument)
-    : QQuickImageProvider(QQuickImageProvider::Image, QQuickImageProvider::ForceAsynchronousImageLoading)
-{
-    this->document = pdfDocument;
-}
-
-QImage PdfImageProvider::requestImage(const QString & id, QSize * size, const QSize & requestedSize)
-{
-    Q_UNUSED(size)
-
-    // If the requestedSize.width is 0, avoid Poppler rendering
-    // FIXME: Actually it works correctly, but an error is anyway shown in the application output.
-    if (requestedSize.width() > 0) {
-        QString type = id.section("/", 0, 0);
-        QImage result;
-        QSizeF pageSize;
-        QSizeF pageSizePhys;
-        float res = 0;
-        Poppler::Page *page;
-
-        if (type == "page")
-        {
-            int numPage = id.section("/", 1, 1).toInt();
-
-            // Useful for debugging, keep commented unless you need it.
-            //  qDebug() << "Page" << numPage + 1 << "requested";
-
-            page = document->page(numPage);
-
-            pageSize = page->pageSizeF();
-            pageSizePhys.setWidth(pageSize.width() / 72);
-            res = requestedSize.width() / pageSizePhys.width();
-
-            // Useful for debugging, keep commented unless you need it.
-            /*
-            qDebug() << "Requested size :" << requestedSize.width() << ";" << requestedSize.height();
-            qDebug() << "Size :" << pageSizePhys.width() << ";" << pageSizePhys.height();
-            qDebug() << "Resolution :" << res;
-            */
-
-            // Render the page to QImage
-            result = page->renderToImage(res, res);
-        }
-
-        return result;
-    }
-
-    // Requested size is 0, so return a null image.
-    return QImage();
-}
 
=== added file 'src/plugin/poppler-qml-plugin/pdfimageprovider.h'
--- src/plugin/poppler-qml-plugin/pdfimageprovider.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdfimageprovider.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015, 2016 Stefano Verzegnassi
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef PDFIMAGEPROVIDER_H
+#define PDFIMAGEPROVIDER_H
+
+// For QQuickAsyncImageProvider
+#include <qquickimageprovider.h>
+#include <QSharedPointer>
+
+class PdfDocument;
+class PdfThumbnailRenderTask;
+
+class PdfImageProvider : public QQuickAsyncImageProvider
+{
+public:
+    PdfImageProvider(const QSharedPointer<PdfDocument>& d);
+    QQuickImageResponse* requestImageResponse(const QString & id, const QSize & requestedSize);
+
+private:
+    PdfThumbnailRenderTask* createTask(int pageIndex, int rotation, const QSize &size, int id) const;
+
+private:
+    QSharedPointer<PdfDocument> m_document;
+};
+
+#endif // PDFIMAGEPROVIDER_H
 
=== removed file 'src/plugin/poppler-qml-plugin/pdfimageprovider.h'
--- src/plugin/poppler-qml-plugin/pdfimageprovider.h	2015-01-30 18:05:22 +0000
+++ src/plugin/poppler-qml-plugin/pdfimageprovider.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Anthony Granger <[e-mail]>
- *         Stefano Verzegnassi <[e-mail]>
- */
-
-#ifndef PDFIMAGEPROVIDER_H
-#define PDFIMAGEPROVIDER_H
-
-#include <QQuickImageProvider>
-#include <poppler/qt5/poppler-qt5.h>
-
-class PdfImageProvider : public QQuickImageProvider
-{
-public:
-    PdfImageProvider(Poppler::Document *pdfDocument);
-    QImage requestImage(const QString & id, QSize * size, const QSize & requestedSize);
-
-private:
-    Poppler::Document *document;
-};
-
-#endif // PDFIMAGEPROVIDER_H
 
=== added file 'src/plugin/poppler-qml-plugin/pdfimageresponse.cpp'
--- src/plugin/poppler-qml-plugin/pdfimageresponse.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdfimageresponse.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 Roman Shchekin
+ * Copyright (C) 2015, 2016 Stefano Verzegnassi
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "pdfimageresponse.h"
+#include "pdfdocument.h"
+
+#include "../../app/renderengine.h"
+
+PdfImageResponse::PdfImageResponse(bool isRequestValid)
+    : m_taskId(0)
+{
+    if (!isRequestValid) {
+        m_errorString = "Requested size or id are not valid.";
+
+        QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
+        return;
+    }
+
+    connect(RenderEngine::instance(), &RenderEngine::taskRenderFinished,
+            this, [&](AbstractRenderTask *task, QImage img)
+    {
+        if (m_taskId == task->id() && task->type() == RttPdfThumbnail) {
+            m_image = img;
+            Q_EMIT finished();
+        }
+    }, Qt::BlockingQueuedConnection);
+}
+
+PdfImageResponse::~PdfImageResponse()
+{
+    disconnect(this);
+
+    QMetaObject::invokeMethod(RenderEngine::instance(), "dequeueTask",
+                              Qt::QueuedConnection,
+                              Q_ARG(int, m_taskId));
+}
+
+QQuickTextureFactory * PdfImageResponse::textureFactory() const
+{
+    return QQuickTextureFactory::textureFactoryForImage(m_image);
+}
 
=== added file 'src/plugin/poppler-qml-plugin/pdfimageresponse.h'
--- src/plugin/poppler-qml-plugin/pdfimageresponse.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdfimageresponse.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015, 2016 Stefano Verzegnassi
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef PDFIMAGERESPONSE_H
+#define PDFIMAGERESPONSE_H
+
+// For QQuickImageResponse
+#include <qquickimageprovider.h>
+
+class PdfImageResponse : public QQuickImageResponse
+{
+public:
+    PdfImageResponse(bool isRequestValid);
+    ~PdfImageResponse();
+
+    void setTaskId(const int id) { m_taskId = id; }
+    QString errorString() const override { return m_errorString; }
+    QQuickTextureFactory * textureFactory() const override;
+
+private:
+    QString m_errorString;
+    QImage m_image;
+    int m_taskId;
+};
+
+
+#endif // PDFIMAGERESPONSE_H
 
=== removed file 'src/plugin/poppler-qml-plugin/pdfitem.cpp'
--- src/plugin/poppler-qml-plugin/pdfitem.cpp	2015-01-30 18:10:21 +0000
+++ src/plugin/poppler-qml-plugin/pdfitem.cpp	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Stefano Verzegnassi <[e-mail]>
- */
-
-#include "pdfitem.h"
-#include <poppler/qt5/poppler-qt5.h>
-
-PdfItem::PdfItem(Poppler::Page *page)
-{
-    m_width = page->pageSize().width();
-    m_height = page->pageSize().height();
-}
-
-int PdfItem::width() const
-{
-    return m_width;
-}
-
-int PdfItem::height() const
-{
-    return m_height;
-}
 
=== removed file 'src/plugin/poppler-qml-plugin/pdfitem.h'
--- src/plugin/poppler-qml-plugin/pdfitem.h	2015-01-30 18:10:21 +0000
+++ src/plugin/poppler-qml-plugin/pdfitem.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Stefano Verzegnassi <[e-mail]>
- */
-
-#ifndef PDFITEM_H
-#define PDFITEM_H
-
-#include <poppler/qt5/poppler-qt5.h>
-
-class PdfItem
-{
-public:
-    PdfItem(Poppler::Page *page);
-    int width() const;
-    int height() const;
-
-private:
-    int m_width;
-    int m_height;
-};
-
-#endif // PDFITEM_H
 
=== added file 'src/plugin/poppler-qml-plugin/pdfrendertask.cpp'
--- src/plugin/poppler-qml-plugin/pdfrendertask.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdfrendertask.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,18 @@
+#include "pdfrendertask.h"
+
+bool PdfRenderTask::canBeRunInParallel(AbstractRenderTask* prevTask)
+{
+    Q_ASSERT(prevTask != nullptr);
+    return true;
+}
+
+QImage PdfTileRenderTask::doWork()
+{
+    return m_document.data()->paintTile(m_page, m_zoom, m_area, PdfRotation::Rotation(m_rotation));
+}
+
+QImage PdfThumbnailRenderTask::doWork()
+{
+    return m_document.data()->paintThumbnail(m_page, m_size, PdfRotation::Rotation(m_rotation));
+}
+
 
=== added file 'src/plugin/poppler-qml-plugin/pdfrendertask.h'
--- src/plugin/poppler-qml-plugin/pdfrendertask.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdfrendertask.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,66 @@
+#ifndef LORENDERTASK_H
+#define LORENDERTASK_H
+
+#include <QObject>
+#include <QDebug>
+#include <QImage>
+#include <QSharedPointer>
+#include <QHash>
+#include <QQueue>
+#include <QAtomicInt>
+
+#include "../../app/rendertask.h"
+#include <QSharedPointer>
+#include "pdfdocument.h"
+
+class PdfRenderTask : public AbstractRenderTask
+{
+public:
+    virtual bool canBeRunInParallel(AbstractRenderTask* prevTask);
+    virtual void prepare() { }
+
+    int rotation() { return m_rotation; }
+    void setRotation(int r) { m_rotation = r; }
+
+    int page() { return m_page; }
+    void setPage(int p) { m_page = p; }
+
+    QSharedPointer<PdfDocument> document() { return m_document; }
+    void setDocument(QSharedPointer<PdfDocument> d) { m_document = d; }
+
+protected:
+    int m_page;
+    int m_rotation;
+    QSharedPointer<PdfDocument> m_document;
+};
+
+
+class PdfTileRenderTask : public PdfRenderTask
+{
+public:
+    virtual RenderTaskType type() { return RttPdfTile; }
+    virtual QImage doWork();
+
+    QRect area() { return m_area; }
+    void setArea(const QRect& a) { m_area = a; }
+    qreal zoom() { return m_zoom; }
+    void setZoom(qreal z) { m_zoom = z; }
+protected:
+    QRect m_area;
+    qreal m_zoom;
+};
+
+class PdfThumbnailRenderTask : public PdfRenderTask
+{
+public:
+    virtual RenderTaskType type() { return RttPdfThumbnail; }
+    virtual QImage doWork();
+
+    QSize size() const { return m_size; }
+    void setSize(const QSize & s) { m_size = s; }
+protected:
+    QSize m_size;
+};
+
+
+#endif // LORENDERTASK_H
 
=== modified file 'src/plugin/poppler-qml-plugin/pdftocmodel.cpp'
--- src/plugin/poppler-qml-plugin/pdftocmodel.cpp	2015-04-16 12:58:29 +0000
+++ src/plugin/poppler-qml-plugin/pdftocmodel.cpp	2016-04-22 10:31:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015
+ * Copyright (C) 2015, 2016
  *          Stefano Verzegnassi <[e-mail]>
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -26,16 +26,12 @@
 
 PdfTocModel::PdfTocModel(QAbstractListModel *parent):
     QAbstractListModel(parent)
-{
-    connect(this, SIGNAL(documentChanged()), this, SLOT(fillModel()));
-}
+{ }
 
-void PdfTocModel::setDocument(Poppler::Document *document)
+void PdfTocModel::setDocument(const QSharedPointer<Poppler::Document>& document)
 {
-    if (document != m_document) {
-        m_document = document;
-        Q_EMIT documentChanged();
-    }
+    m_document = document;
+    fillModel();
 }
 
 QHash<int, QByteArray> PdfTocModel::roleNames() const
@@ -43,6 +39,9 @@
     QHash<int, QByteArray> roles;
     roles[TitleRole] = "title";
     roles[PageIndexRole] = "pageIndex";
+    roles[NodeIndexRole] = "nodeIndex";
+    roles[ParentNodeIndexRole] = "parentNodeIndex";
+    roles[HasChildNodesRole] = "hasChildNodes";
     roles[LevelRole] = "level";
     return roles;
 }
@@ -65,6 +64,12 @@
         return tocEntry.title;
     case PageIndexRole:
         return tocEntry.pageIndex;
+    case NodeIndexRole:
+        return tocEntry.nodeIndex;
+    case ParentNodeIndexRole:
+        return tocEntry.parentNodeIndex;
+    case HasChildNodesRole:
+        return tocEntry.hasChildNodes;
     case LevelRole:
         return tocEntry.level;
     default:
@@ -84,6 +89,8 @@
     QVariantMap map;
     map["title"] = item.title;
     map["pageIndex"] = item.pageIndex;
+    map["nodeIndex"] = item.nodeIndex;
+    map["parentNodeIndex"] = item.parentNodeIndex;
     map["level"] = item.level;
 
     return map;
@@ -91,7 +98,10 @@
 
 void PdfTocModel::fillModel() {
     if (m_entries.count() != 0) {
+        beginResetModel();
         m_entries.clear();
+        endResetModel();
+
         Q_EMIT countChanged();
     }
 
@@ -104,13 +114,16 @@
     }
 }
 
-void PdfTocModel::recursiveGetEntries(QDomNode node, int nodeLevel)
+void PdfTocModel::recursiveGetEntries(QDomNode node, int nodeLevel, int parentNodeIndex)
 {
     while(!node.isNull()) {
         QDomNode child = node.firstChild();
 
         TocEntry entry;
         entry.title = node.toElement().tagName();
+        entry.nodeIndex = m_entries.count();
+        entry.parentNodeIndex = parentNodeIndex;
+        entry.hasChildNodes = node.hasChildNodes();
         entry.level = nodeLevel;
 
         QString dest = node.toElement().attribute("Destination");
@@ -125,11 +138,14 @@
             }
         }
 
+        beginInsertRows(QModelIndex(), rowCount(), rowCount());
         m_entries.append(entry);
+        endInsertRows();
+
         Q_EMIT countChanged();
 
         // Look for children entries
-        recursiveGetEntries(child, nodeLevel + 1);
+        recursiveGetEntries(child, nodeLevel + 1, m_entries.count() - 1);
 
         // Go to the next entry at the same level.
         node = node.nextSibling();
@@ -137,5 +153,4 @@
 }
 
 PdfTocModel::~PdfTocModel()
-{
-}
+{ }
 
=== modified file 'src/plugin/poppler-qml-plugin/pdftocmodel.h'
--- src/plugin/poppler-qml-plugin/pdftocmodel.h	2015-04-08 14:11:02 +0000
+++ src/plugin/poppler-qml-plugin/pdftocmodel.h	2016-04-22 10:31:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015
+ * Copyright (C) 2015, 2016
  *          Stefano Verzegnassi <[e-mail]>
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -20,6 +20,7 @@
 #define PDFTOCMODEL_H
 
 #include <QAbstractListModel>
+#include <QSharedPointer>
 #include <poppler/qt5/poppler-qt5.h>
 #include <QDomNode>
 
@@ -28,6 +29,9 @@
 public:
     QString title;
     int pageIndex = 0;
+    int nodeIndex = 0;
+    int parentNodeIndex = 0;
+    bool hasChildNodes = false;
     int level = 0;
 };
 
@@ -41,13 +45,16 @@
     enum Roles {
         TitleRole = Qt::UserRole + 1,
         PageIndexRole,
+        NodeIndexRole,
+        ParentNodeIndexRole,
+        HasChildNodesRole,
         LevelRole
     };
 
     explicit PdfTocModel(QAbstractListModel *parent = 0);
     virtual ~PdfTocModel();
 
-    void setDocument(Poppler::Document* document);
+    void setDocument(const QSharedPointer<Poppler::Document>& document);
 
     QHash<int, QByteArray> roleNames() const;
 
@@ -57,18 +64,16 @@
     Q_INVOKABLE QVariantMap get(int index) const;
 
 Q_SIGNALS:
-    void documentChanged();
     void countChanged();
 
 private slots:
     void fillModel();
 
 private:
-    Poppler::Document* m_document;
+    QSharedPointer<Poppler::Document> m_document;
     QList<TocEntry> m_entries;
 
-    void recursiveGetEntries(QDomNode node, int nodeLevel);
-
+    void recursiveGetEntries(QDomNode node, int nodeLevel, int parentNodeIndex = -1);
 };
 
 #endif // PDFTOCMODEL_H
 
=== added file 'src/plugin/poppler-qml-plugin/pdfzoom.cpp'
--- src/plugin/poppler-qml-plugin/pdfzoom.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdfzoom.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,232 @@
+/*
+ * Copyright (C) 2016 Stefano Verzegnassi
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "pdfzoom.h"
+#include "verticalview.h"
+#include "pdfdocument.h"
+#include "twips.h"
+
+static qreal getZoomToFitWidth(const qreal &width, int documentWidth)
+{
+    return qreal(width / Twips::convertPointsToPixels(documentWidth, 1.0));
+}
+
+static qreal getZoomToFitHeight(const qreal &height, int documentHeight)
+{
+    return qreal(height / Twips::convertPointsToPixels(documentHeight, 1.0));
+}
+
+PdfZoom::PdfZoom(VerticalView *view)
+    : QObject(view)
+    , m_view(view)
+    , m_zoomMode(ZoomMode::Manual)
+    , m_zoomFactor(1.0)
+    , m_minimumZoom(0.25)
+    , m_maximumZoom(4.0)
+{   }
+
+PdfZoom::~PdfZoom()
+{   }
+
+PdfZoom::ZoomMode PdfZoom::zoomMode() const
+{
+    return m_zoomMode;
+}
+
+void PdfZoom::setZoomMode(const PdfZoom::ZoomMode zoomMode)
+{
+    if (m_zoomMode == zoomMode)
+        return;
+
+    m_zoomMode = zoomMode;
+    Q_EMIT zoomModeChanged();
+}
+
+void PdfZoom::updateZoomValues()
+{
+    int maxWidth = 0;
+    int maxHeight = 0;
+    for (int i=0; i<m_view->document()->pageCount(); ++i) {
+        int w, h;
+        if (m_view->rotation() == PdfRotation::Rotate0 || m_view->rotation() == PdfRotation::Rotate180) {
+            h = m_view->document()->pageSize(i).height();
+            w = m_view->document()->pageSize(i).width();
+        } else {
+            w = m_view->document()->pageSize(i).height();
+            h = m_view->document()->pageSize(i).width();
+        }
+
+        if (h > maxHeight)
+            maxHeight = h;
+
+        if (w > maxWidth)
+            maxWidth = w;
+    }
+
+    // Maximum zoom value to fit the width of the flickable
+    m_valueFitWidthZoom = getZoomToFitWidth(m_view->parentFlickable()->width(), maxWidth);
+
+    // Maximum zoom value that ensures that each page is fully visible in the view (without any
+    // need for scrolling)
+    m_valueFitPageZoom = qMin(getZoomToFitHeight(m_view->parentFlickable()->height(), maxHeight),
+                              m_valueFitWidthZoom);
+
+    // Like ZoomMode::FitWidth, but its maximum value is limited to a 1.0x factor
+    m_valueAutomaticZoom = qMin(1.0, m_valueFitWidthZoom);
+
+    Q_EMIT valueFitWidthZoomChanged();
+    Q_EMIT valueFitPageZoomChanged();
+    Q_EMIT valueAutomaticZoomChanged();
+}
+
+qreal PdfZoom::zoomFactor() const
+{
+    return m_zoomFactor;
+}
+
+void PdfZoom::setZoomFactor(const qreal zoom)
+{
+    if (m_zoomFactor == zoom || zoom < m_minimumZoom || zoom > m_maximumZoom)
+        return;
+
+    m_zoomFactor = zoom;
+
+    if (m_zoomFactor != m_valueFitWidthZoom
+            && m_zoomFactor != m_valueFitPageZoom
+            && m_zoomFactor != m_valueAutomaticZoom)
+        setZoomMode(PdfZoom::Manual);
+
+    Q_EMIT zoomFactorChanged();
+}
+
+qreal PdfZoom::minimumZoom() const
+{
+    return m_minimumZoom;
+}
+
+/*
+void PdfZoom::setMinimumZoom(const qreal newValue)
+{
+    if (m_minimumZoom == newValue)
+        return;
+
+    m_minimumZoom = newValue;
+    Q_EMIT minimumZoomChanged();
+}
+*/
+
+qreal PdfZoom::maximumZoom() const
+{
+    return m_maximumZoom;
+}
+
+/*
+void PdfZoom::setMaximumZoom(const qreal newValue)
+{
+    if (m_maximumZoom == newValue)
+        return;
+
+    m_maximumZoom = newValue;
+    Q_EMIT maximumZoomChanged();
+}
+*/
+
+qreal PdfZoom::valueFitWidthZoom() const
+{
+    return m_valueFitWidthZoom;
+}
+
+qreal PdfZoom::valueFitPageZoom() const
+{
+    return m_valueFitPageZoom;
+}
+
+qreal PdfZoom::valueAutomaticZoom() const
+{
+    return m_valueAutomaticZoom;
+}
+
+bool PdfZoom::adjustZoomToWidth(bool changeMode)
+{
+    if (!m_view->document())
+        return false;
+
+    if (changeMode)
+        setZoomMode(PdfZoom::FitWidth);
+
+    int maxWidth = 0;
+    for (int i=0; i<m_view->document()->pageCount(); ++i) {
+        int w = m_view->document()->pageSize(i).width();
+        if (w > maxWidth)
+            maxWidth = w;
+    }
+
+    updateZoomValues();
+
+    if (m_zoomFactor != m_valueFitWidthZoom) {
+        setZoomFactor(m_valueFitWidthZoom);
+
+        qDebug() << Q_FUNC_INFO << "- value:" << m_zoomFactor << "- changeMode:" << changeMode;
+        return true;
+    }
+
+    return false;
+}
+
+bool PdfZoom::adjustZoomToPage(bool changeMode)
+{
+    if (!m_view->document())
+        return false;
+
+    if (changeMode)
+        setZoomMode(PdfZoom::FitPage);
+
+    updateZoomValues();
+
+    if (m_zoomFactor != m_valueFitPageZoom) {
+        setZoomFactor(m_valueFitPageZoom);
+
+        qDebug() << Q_FUNC_INFO << "- value:" << m_zoomFactor << "- changeMode:" << changeMode;
+        return true;
+    }
+
+    return false;
+}
+
+bool PdfZoom::adjustAutomaticZoom(bool changeMode)
+{
+    if (!m_view->document())
+        return false;
+
+    if (changeMode)
+        setZoomMode(PdfZoom::Automatic);
+
+    updateZoomValues();
+
+    if (m_zoomFactor != m_valueAutomaticZoom) {
+        setZoomFactor(m_valueAutomaticZoom);
+
+        qDebug() << Q_FUNC_INFO << "- value:" << m_zoomFactor << "- changeMode:" << changeMode;
+        return true;
+    }
+
+    return false;
+}
+
+void PdfZoom::init()
+{
+    setZoomMode(ZoomMode::Automatic);
+}
 
=== added file 'src/plugin/poppler-qml-plugin/pdfzoom.h'
--- src/plugin/poppler-qml-plugin/pdfzoom.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/pdfzoom.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2016 Stefano Verzegnassi
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PDFZOOM_H
+#define PDFZOOM_H
+
+#include <QObject>
+#include <QSharedPointer>
+
+class VerticalView;
+
+class PdfZoom : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(ZoomMode)
+    Q_PROPERTY(ZoomMode zoomMode READ zoomMode NOTIFY zoomModeChanged)
+    Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
+    Q_PROPERTY(qreal minimumZoom READ minimumZoom CONSTANT)     //WRITE setMinimumZoom NOTIFY minimumZoomChanged)
+    Q_PROPERTY(qreal maximumZoom READ maximumZoom CONSTANT)     //WRITE setMaximumZoom NOTIFY maximumZoomChanged)
+    Q_PROPERTY(qreal valueFitWidthZoom READ valueFitWidthZoom NOTIFY valueFitWidthZoomChanged)
+    Q_PROPERTY(qreal valueFitPageZoom READ valueFitPageZoom NOTIFY valueFitPageZoomChanged)
+    Q_PROPERTY(qreal valueAutomaticZoom READ valueAutomaticZoom NOTIFY valueAutomaticZoomChanged)
+
+public:
+    PdfZoom(VerticalView *view);
+    ~PdfZoom();
+
+    enum ZoomMode {
+        Manual = 0x0,
+        FitWidth = 0x1,
+        FitPage = 0x2,
+        Automatic = 0x4
+    };
+
+    ZoomMode    zoomMode() const;
+    qreal       zoomFactor() const;
+    void        setZoomFactor(const qreal zoom);
+
+    qreal       minimumZoom() const;
+//    void        setMinimumZoom(const qreal newValue);
+
+    qreal       maximumZoom() const;
+//    void        setMaximumZoom(const qreal newValue);
+
+    qreal       valueFitWidthZoom() const;
+    qreal       valueFitPageZoom() const;
+    qreal       valueAutomaticZoom() const;
+
+    bool adjustZoomToWidth(bool changeMode = true);
+    bool adjustZoomToPage(bool changeMode = true);
+    bool adjustAutomaticZoom(bool changeMode = true);
+
+    void init();
+
+Q_SIGNALS:
+    void zoomModeChanged();
+    void zoomModesAvailableChanged();
+    void zoomFactorChanged();
+//    void minimumZoomChanged();
+//    void maximumZoomChanged();
+    void valueFitWidthZoomChanged();
+    void valueFitPageZoomChanged();
+    void valueAutomaticZoomChanged();
+
+private:
+    VerticalView* m_view;
+
+    ZoomMode m_zoomMode;
+
+    qreal m_zoomFactor;
+
+    qreal m_minimumZoom;
+    qreal m_maximumZoom;
+
+    qreal m_valueFitWidthZoom;
+    qreal m_valueFitPageZoom;
+    qreal m_valueAutomaticZoom;
+
+private:
+    void setZoomMode(const ZoomMode zoomMode);
+    void updateZoomValues();
+};
+
+#endif // PDFZOOM_H
 
=== modified file 'src/plugin/poppler-qml-plugin/plugin.cpp'
--- src/plugin/poppler-qml-plugin/plugin.cpp	2015-04-15 14:47:28 +0000
+++ src/plugin/poppler-qml-plugin/plugin.cpp	2016-04-22 10:31:39 +0000
@@ -20,15 +20,22 @@
 
 #include "plugin.h"
 #include "pdfdocument.h"
+#include "pdfzoom.h"
+#include "pdferror.h"
 #include "verticalview.h"
+#include "touchdetectionarea.h"
 
 void PopplerPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("DocumentViewer.PDF"));
     
     //@uri DocumentViewer.PDF
-    qmlRegisterType<PdfDocument>(uri, 1, 0, "Document");
-    qmlRegisterType<VerticalView>(uri, 1, 0, "VerticalView");
+    qmlRegisterType<PdfDocument>(uri, 2, 0, "Document");
+    qmlRegisterUncreatableType<PdfZoom>(uri, 2, 0, "Zoom", "Not creatable as an object, use only to retrieve error enums (e.g. PDF.Zoom.Manual)");
+    qmlRegisterType<VerticalView>(uri, 2, 0, "VerticalView");
+    qmlRegisterType<TouchDetectionArea>(uri, 2, 0, "TouchDetectionArea");
+    qmlRegisterUncreatableType<PopplerError>(uri, 2, 0, "Error", "Not creatable as an object, use only to retrieve error enums (e.g. PDF.Error.FileNotFound)");
+    qmlRegisterUncreatableType<PdfRotation>(uri, 2, 0, "Rotation", "Not creatable as an object, use only to set rotation (e.g. PDF.Rotation.Rotate180)");
 }
 
 void PopplerPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 
=== added directory 'src/plugin/poppler-qml-plugin/qml'
=== added file 'src/plugin/poppler-qml-plugin/qml/Viewer.qml'
--- src/plugin/poppler-qml-plugin/qml/Viewer.qml	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/qml/Viewer.qml	2016-04-22 10:31:39 +0000
@@ -0,0 +1,186 @@
+import QtQuick 2.4
+import DocumentViewer.PDF 2.0 as PDF
+
+Flickable {
+    id: rootFlickable
+
+    property alias document:    view.document
+    property alias zoomSettings: view.zoomSettings
+    property alias cacheBuffer: view.cacheBuffer
+    property alias error:       view.error
+    property alias currentPageIndex: view.currentPageIndex
+    property alias pagesCount: view.pagesCount
+    property alias spacing: view.spacing
+    property alias renderHints: view.renderHints
+    property alias showLinkHighlight: view.showLinkHighlight
+    property alias linkHighlightColor: view.linkHighlightColor
+    property alias rotation: view.rotation
+
+    property string documentPath: ""
+
+    property bool isLinkHovered: false
+    signal linkHovered(var linkInfo, var mouseX, var mouseY)    // mouseX and mouseY are relative to rootFlickable
+    signal linkClicked(var isTouch, var linkInfo)
+    signal linkDoubleClicked(var isTouch, var linkInfo)
+    signal linkPressAndHold(var isTouch, var linkInfo)
+
+    function adjustZoomToWidth()
+    {
+        var oldZoom = view.zoomSettings.zoomFactor
+        view.adjustZoomToWidth()
+
+        var zoomScale = view.zoomSettings.zoomFactor / oldZoom
+        rootFlickable.contentX *= zoomScale
+        rootFlickable.contentY *= zoomScale
+    }
+
+    function adjustZoomToPage()
+    {
+        var oldZoom = view.zoomSettings.zoomFactor
+        view.adjustZoomToPage()
+
+        var zoomScale = view.zoomSettings.zoomFactor / oldZoom
+        rootFlickable.contentX *= zoomScale
+        rootFlickable.contentY *= zoomScale
+    }
+
+    function adjustAutomaticZoom()
+    {
+        var oldZoom = view.zoomSettings.zoomFactor
+        view.adjustAutomaticZoom()
+
+        var zoomScale = view.zoomSettings.zoomFactor / oldZoom
+        rootFlickable.contentX *= zoomScale
+        rootFlickable.contentY *= zoomScale
+    }
+
+    function setZoom(newValue)
+    {
+        var zoomScale = newValue / view.zoomSettings.zoomFactor;
+        view.zoomSettings.zoomFactor = newValue;
+
+        rootFlickable.contentX *= zoomScale;
+        rootFlickable.contentY *= zoomScale;
+    }
+
+    function moveView(axis, diff)
+    {
+        if (axis == "vertical") {
+            var maxContentY = Math.max(0, rootFlickable.contentHeight - rootFlickable.height)
+            rootFlickable.contentY = Math.max(0, Math.min(rootFlickable.contentY + diff, maxContentY ))
+        } else {
+            var maxContentX = Math.max(0, rootFlickable.contentWidth - rootFlickable.width)
+            rootFlickable.contentX = Math.max(0, Math.min(rootFlickable.contentX + diff, maxContentX ))
+        }
+    }
+
+    function positionAtBeginning() {
+        view.positionAtBeginning()
+    }
+
+    function positionAtIndex(index, top, left) {
+        if (typeof(top) === "undefined") top = 0
+        if (typeof(left) === "undefined") left = 0
+
+        view.positionAtIndex(index, top, left)
+    }
+
+    function positionAtEnd() {
+        view.positionAtEnd()
+    }
+
+    function unlock(ownerPassword, userPassword) {
+        return view.unlock(ownerPassword, userPassword)
+    }
+
+    onDocumentPathChanged: {
+        if (documentPath)
+            view.initializeDocument(documentPath)
+    }
+
+    // zoomFactor is not used here to set contentSize, since it's all managed
+    // internally, in the LibreOffice.View component.
+    contentHeight: Math.max(rootFlickable.height, view.height)
+    contentWidth: Math.max(rootFlickable.width, view.width)
+
+    boundsBehavior: Flickable.StopAtBounds
+
+    PDF.VerticalView {
+        id: view
+
+        x: Math.max(0, (rootFlickable.width - view.width) * 0.5)
+        y: Math.max(0, (rootFlickable.height - view.height) * 0.5)
+
+        parentFlickable: rootFlickable
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        // Explicitely set rootFlickable as parent, otherwise it's rootFlickable.contentItem
+        parent: rootFlickable
+        enabled: !rootFlickable.moving
+
+        acceptedButtons: Qt.LeftButton
+
+        hoverEnabled: true
+        onPositionChanged: {
+            var linkInfo = view.linkAtPosition(rootFlickable.contentX + mouse.x - view.x,
+                                               rootFlickable.contentY + mouse.y - view.y);
+
+            // Don't emit linkHovered() if it's a touch event.
+            // Hover boxes are a mouse-related thing.
+            if (touchArea.touchPressed)
+                return
+
+            if (linkInfo.pageIndex || linkInfo.url) {
+                cursorShape = Qt.PointingHandCursor
+                rootFlickable.linkHovered(linkInfo, mouse.x, mouse.y)
+                rootFlickable.isLinkHovered = true
+            } else {
+                cursorShape = Qt.ArrowCursor
+                rootFlickable.isLinkHovered = false
+            }
+        }
+
+        onClicked: {
+            var isTouch = touchArea.touchPressed
+            var linkInfo = view.linkAtPosition(rootFlickable.contentX + mouse.x - view.x,
+                                               rootFlickable.contentY + mouse.y - view.y);
+
+            if (linkInfo.pageIndex || linkInfo.url) {
+                rootFlickable.linkClicked(isTouch, linkInfo)
+            }
+        }
+
+        onDoubleClicked: {
+            var isTouch = touchArea.touchPressed
+            var linkInfo = view.linkAtPosition(rootFlickable.contentX + mouse.x - view.x,
+                                               rootFlickable.contentY + mouse.y - view.y);
+
+            if (linkInfo.pageIndex || linkInfo.url) {
+                rootFlickable.linkDoubleClicked(isTouch, linkInfo)
+            }
+        }
+
+        onPressAndHold: {
+            var isTouch = touchArea.touchPressed
+            var linkInfo = view.linkAtPosition(rootFlickable.contentX + mouse.x - view.x,
+                                               rootFlickable.contentY + mouse.y - view.y);
+
+            if (linkInfo.pageIndex || linkInfo.url) {
+                rootFlickable.linkPressAndHold(isTouch, linkInfo)
+            }
+        }
+
+        // QML MultiPointTouchArea does not propagate events to its parent items. That
+        // would have led to a more complex logic.
+        // However, events returned by QML MouseArea signals don't inherit QEvent, so
+        // we can not check for the type event.
+        // We need to create our own component then.
+        PDF.TouchDetectionArea {
+            id: touchArea
+            anchors.fill: parent
+            enabled: !rootFlickable.moving
+        }
+    }
+}
 
=== modified file 'src/plugin/poppler-qml-plugin/qmldir'
--- src/plugin/poppler-qml-plugin/qmldir	2015-04-15 14:47:28 +0000
+++ src/plugin/poppler-qml-plugin/qmldir	2016-04-22 10:31:39 +0000
@@ -1,2 +1,4 @@
 module DocumentViewer.PDF
 plugin popplerqmlplugin
+
+Viewer 2.0 Viewer.qml
 
=== added file 'src/plugin/poppler-qml-plugin/sgtileitem.cpp'
--- src/plugin/poppler-qml-plugin/sgtileitem.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/sgtileitem.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,89 @@
+#include "sgtileitem.h"
+#include "pdfdocument.h"
+
+#include <QQuickWindow>
+#include <QSGSimpleTextureNode>
+
+#ifdef DEBUG_SHOW_TILE_BORDER
+#include <QSGGeometryNode>
+#include <QSGFlatColorMaterial>
+#endif
+
+SGTileItem::SGTileItem(const QRect& area, qreal zoom, int id, QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_area(area)
+    , m_zoomFactor(zoom)
+    , m_id (id)
+{
+    setFlag(ItemHasContents, true);
+
+    setX(m_area.x());
+    setY(m_area.y());
+    setWidth(m_area.width());
+    setHeight(m_area.height());
+}
+
+SGTileItem::~SGTileItem()
+{ }
+
+QSGNode *SGTileItem::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
+{
+    QSGSimpleTextureNode* node = static_cast<QSGSimpleTextureNode*>(oldNode);
+    QQuickWindow* wnd = window();
+
+    if (!node && wnd && !m_data.isNull()) {
+        auto texture = wnd->createTextureFromImage(m_data);
+        node = new QSGSimpleTextureNode();
+        node->setTexture(texture);
+        node->setOwnsTexture(true);
+
+        node->setRect(QRect(0, 0, width(), height()));
+
+#ifdef DEBUG_SHOW_TILE_BORDER
+        drawTileBorders(node);
+#endif
+    }
+
+    return node;
+}
+
+void SGTileItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+#ifdef DEBUG_SHOW_TILE_BORDER
+void SGTileItem::drawTileBorders(QSGSimpleTextureNode* parentNode)
+{
+    auto node = parentNode;
+    auto tileBorderGeometry = new QSGGeometry(QSGGeometry::defaultAttributes_Point2D(), 8);
+    tileBorderGeometry->setDrawingMode(GL_LINES);
+    tileBorderGeometry->setLineWidth(4);
+
+    QSGGeometry::Point2D* vertex = tileBorderGeometry->vertexDataAsPoint2D();
+    vertex[0].set(node->rect().left(), node->rect().top());
+    vertex[1].set(node->rect().left(), node->rect().bottom());
+
+    vertex[2].set(node->rect().right(), node->rect().top());
+    vertex[3].set(node->rect().right(), node->rect().bottom());
+
+    vertex[4].set(vertex[0].x, vertex[0].y);
+    vertex[5].set(vertex[2].x, vertex[2].y);
+
+    vertex[6].set(vertex[1].x, vertex[1].y);
+    vertex[7].set(vertex[3].x, vertex[3].y);
+
+    auto tileBorderMaterial = new QSGFlatColorMaterial;
+    tileBorderMaterial->setColor(Qt::red);
+
+    auto tileBorderNode = new QSGGeometryNode;
+
+    tileBorderNode->setGeometry(tileBorderGeometry);
+    tileBorderNode->setFlag(QSGNode::OwnsGeometry);
+
+    tileBorderNode->setMaterial(tileBorderMaterial);
+    tileBorderNode->setFlag(QSGNode::OwnsMaterial);
+
+    node->appendChildNode(tileBorderNode);
+}
+#endif
 
=== added file 'src/plugin/poppler-qml-plugin/sgtileitem.h'
--- src/plugin/poppler-qml-plugin/sgtileitem.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/sgtileitem.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,48 @@
+#ifndef SGTILEITEM_H
+#define SGTILEITEM_H
+
+#include <QQuickItem>
+#include <QImage>
+
+class PdfDocument;
+
+//#ifdef DEBUG_SHOW_TILE_BORDER
+class QSGSimpleTextureNode;
+//#endif
+
+class SGTileItem : public QQuickItem
+{
+    Q_OBJECT
+public:
+    SGTileItem(const QRect& area, qreal zoom, int id, QQuickItem *parent = 0);
+    ~SGTileItem();
+
+    inline const QRect& area() { return m_area; }
+    inline void setArea(const QRect& rect) { m_area = rect; }
+
+    inline const qreal& zoomFactor() const { return m_zoomFactor; }
+    inline void setZoomFactor(const qreal &zoom) { m_zoomFactor = zoom; }
+
+    inline int id() { return m_id; }
+    inline void setId(int id) { m_id = id; }
+
+    inline QImage data() { return m_data; }
+    inline void setData(QImage data) { m_data = data; update(); }
+
+protected:
+    virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
+    virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+
+private:
+#ifdef DEBUG_SHOW_TILE_BORDER
+    void drawTileBorders(QSGSimpleTextureNode *parentNode);
+#endif
+
+private:
+    QRect m_area;
+    qreal m_zoomFactor;
+    QImage m_data;
+    int m_id;
+};
+
+#endif // SGTILEITEM_H
 
=== added file 'src/plugin/poppler-qml-plugin/touchdetectionarea.cpp'
--- src/plugin/poppler-qml-plugin/touchdetectionarea.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/touchdetectionarea.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,21 @@
+#include "touchdetectionarea.h"
+
+#include <QDebug>
+
+TouchDetectionArea::TouchDetectionArea(QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_touchPressed(false)
+{ }
+
+void TouchDetectionArea::touchEvent(QTouchEvent *event)
+{
+    if (event->type() == QEvent::TouchBegin) {
+        m_touchPressed = true;
+        Q_EMIT touchPressedChanged();
+    } else if (event->type() == QEvent::TouchEnd) {
+        m_touchPressed = false;
+        Q_EMIT touchPressedChanged();
+    }
+
+    event->ignore();
+}
 
=== added file 'src/plugin/poppler-qml-plugin/touchdetectionarea.h'
--- src/plugin/poppler-qml-plugin/touchdetectionarea.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/touchdetectionarea.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,24 @@
+#ifndef TOUCHDETECTIONAREA_H
+#define TOUCHDETECTIONAREA_H
+
+#include <QQuickItem>
+
+class TouchDetectionArea : public QQuickItem
+{
+    Q_OBJECT
+    Q_PROPERTY(bool touchPressed READ touchPressed NOTIFY touchPressedChanged)
+public:
+    TouchDetectionArea(QQuickItem *parent = 0);
+    bool touchPressed() const { return m_touchPressed; }
+
+Q_SIGNALS:
+    void touchPressedChanged();
+
+protected:
+    virtual void touchEvent(QTouchEvent *event);
+
+private:
+    bool m_touchPressed;
+};
+
+#endif // TOUCHDETECTIONAREA_H
 
=== added file 'src/plugin/poppler-qml-plugin/twips.h'
--- src/plugin/poppler-qml-plugin/twips.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/twips.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2015, 2016 Stefano Verzegnassi
+ * Copyright (C) 2015 Roman Shchekin
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef TWIPS_H
+#define TWIPS_H
+
+#include <QtGlobal>
+#include <QtWidgets/QApplication>
+#include <QScreen>
+
+#include "ucunits.h"
+
+#define DEFAULT_DPI 96
+#define DEFAULT_GRID_UNIT_PX 8
+
+class Twips
+{
+public:
+    enum ConvertionMode {
+        UseDPI = 0,
+        UseUnits = 1
+    };
+
+    static inline int convertPointsToPixels(int points, qreal zoom = 1.0,
+                                            ConvertionMode mode = ConvertionMode::UseUnits)
+    {
+            return convertTwipsToPixels(points * 20, zoom, mode);
+    }
+
+    static inline int convertPixelsToPoints(int pixels, qreal zoom = 1.0,
+                                            ConvertionMode mode = ConvertionMode::UseUnits)
+    {
+            return convertPixelsToTwips(pixels / 20, zoom, mode);
+    }
+
+    static inline int convertTwipsToPixels(int twips, qreal zoom = 1.0,
+                                           ConvertionMode mode = ConvertionMode::UseUnits)
+    {
+        if (mode == ConvertionMode::UseUnits) {
+            qreal ratio = getUnitsRatio();
+            return int(twips / 1440.0 * (DEFAULT_DPI * ratio) * zoom);
+        } else {
+            qreal dpi = getLogicalDotsPerInch();
+            return int(twips / 1440.0 * (dpi ? dpi : DEFAULT_DPI) * zoom);
+        }
+    }
+
+    static inline int convertPixelsToTwips(int pixels, qreal zoom = 1.0,
+                                           ConvertionMode mode = ConvertionMode::UseUnits)
+    {
+        if (mode == ConvertionMode::UseUnits) {
+            qreal ratio = getUnitsRatio();
+            return int(pixels * 1440.0 / (DEFAULT_DPI * ratio) / zoom);
+        } else {
+            qreal dpi = getLogicalDotsPerInch();
+            return int(pixels * 1440.0 / (dpi ? dpi : DEFAULT_DPI) / zoom);
+        }
+    }
+
+    static inline qreal getLogicalDotsPerInch()
+    {
+        static qreal value = 0;
+        if (!value) {
+            QList<QScreen*> screens = QGuiApplication::screens();
+            if (screens.size()) {
+                QScreen *screen = screens.at(0);
+                // Subscribe for changing signal (just to make caching rock-solid).
+                QObject::connect(screen, &QScreen::logicalDotsPerInchChanged,
+                                 [] (const qreal newValue) { value = newValue; } );
+                value = screen->logicalDotsPerInch();
+            }
+        }
+
+        return value;
+    }
+
+    static inline qreal getUnitsRatio()
+    {
+        return UCUnits::instance().gridUnit() / DEFAULT_GRID_UNIT_PX;
+    }
+};
+
+#endif // TWIPS_H
 
=== added file 'src/plugin/poppler-qml-plugin/ucunits.cpp'
--- src/plugin/poppler-qml-plugin/ucunits.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/ucunits.cpp	2016-04-22 10:31:39 +0000
@@ -0,0 +1,241 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Florian Boucault <[e-mail]>
+ */
+
+#include "ucunits.h"
+
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QRegularExpression>
+#include <QtCore/qmath.h>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+
+#define ENV_GRID_UNIT_PX "GRID_UNIT_PX"
+#define DEFAULT_GRID_UNIT_PX 8
+
+static float getenvFloat(const char* name, float defaultValue)
+{
+    QByteArray stringValue = qgetenv(name);
+    bool ok;
+    float value = stringValue.toFloat(&ok);
+    return ok ? value : defaultValue;
+}
+
+
+/*!
+    \qmltype Units
+    \instantiates UCUnits
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup resolution-independence
+    \brief Units of measurement for sizes, spacing, margin, etc.
+
+    Units provides facilities for measuring UI elements in a variety
+    of units other than just pixels.
+
+    A global instance of Units is exposed as the \b{units} context property.
+    Example usage:
+
+    \qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
+
+    Item {
+        width: units.gu(2)
+        height: units.gu(5)
+    }
+    \endqml
+
+    \sa {Resolution Independence}
+*/
+
+/*
+ * Note on the interaction between GRID_UNIT_PX and QT_DEVICE_PIXEL_RATIO
+ *
+ * In Qt5.4 there is a single means to scale the UI: the QT_DEVICE_PIXEL_RATIO environment
+ * variable. This accepts only integer values, thus allowing a x2 or x3 scaling of any
+ * Qt-based UI, that includes QWidget as well as any QML UI.
+ *
+ * Setting QT_DEVICE_PIXEL_RATIO=2 implies one density-independent pixel corresponds to 2
+ * physical pixels. Developers describe their UI in terms of density-independent pixels.
+ * Qt scales accordingly.
+ *
+ * The Ubuntu UI Toolkit has solved the scaling problem with the GRID_UNIT_PX variable.
+ * It offers more flexibility, but only scales QML applications written to use the UITK
+ * (since it uses this Units class) as it is built on top of QML.
+ *
+ * There are additional areas in Qt where QT_DEVICE_PIXEL_RATIO causes correct scaling which
+ * GRID_UNIT_PX cannot, for example:
+ *   1. cacheBuffer for ListView/GridViews - specified in density-independent pixels
+ *   2. gesture recognition  matches what is on screen better, as it is density-independent
+ *      pixel aware
+ *
+ * In order to get the best of both worlds, Ubuntu will set both GRID_UNIT_PX and
+ * QT_DEVICE_PIXEL_RATIO. Thus all Qt apps will scale reasonably well, with UITK-based apps
+ * scaling perfectly for any desired scale (i.e. non-integer scales).
+ *
+ * However UITK developers can just use this Units class as usual, and will be almost totally
+ * isolated from Qt's own scaling concept.
+ */
+
+UCUnits::UCUnits(QObject *parent) :
+    QObject(parent),
+    m_devicePixelRatio(qGuiApp->devicePixelRatio())
+{
+    // If GRID_UNIT_PX set, always use it. If not, 1GU := DEFAULT_GRID_UNIT_PX * m_devicePixelRatio
+    if (qEnvironmentVariableIsSet(ENV_GRID_UNIT_PX)) {
+        m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX);
+    } else {
+        m_gridUnit = DEFAULT_GRID_UNIT_PX * m_devicePixelRatio;
+    }
+}
+
+/*!
+    \qmlproperty real Units::gridUnit
+
+    The number of pixels 1 grid unit corresponds to.
+*/
+float UCUnits::gridUnit()
+{
+    return m_gridUnit;
+}
+
+void UCUnits::setGridUnit(float gridUnit)
+{
+    m_gridUnit = gridUnit;
+    Q_EMIT gridUnitChanged();
+}
+
+/*!
+    \qmlmethod real Units::dp(real value)
+
+    Returns the number of pixels \a value density independent pixels correspond to.
+*/
+// Density-independent pixels (and not physical pixels) because Qt sizes in terms of density-independent pixels.
+float UCUnits::dp(float value)
+{
+    const float ratio = m_gridUnit / DEFAULT_GRID_UNIT_PX;
+    if (value <= 2.0) {
+        // for values under 2dp, return only multiples of the value
+        return qRound(value * qFloor(ratio)) / m_devicePixelRatio;
+    } else {
+        return qRound(value * ratio) / m_devicePixelRatio;
+    }
+}
+
+/*!
+    \qmlmethod real Units::gu(real value)
+
+    Returns the number of pixels \a value grid units correspond to.
+*/
+// Density-independent pixels (and not physical pixels) because Qt sizes in terms of density-independent pixels.
+
+float UCUnits::gu(float value)
+{
+    return qRound(value * m_gridUnit) / m_devicePixelRatio;
+}
+
+QString UCUnits::resolveResource(const QUrl& url)
+{
+    if (url.isEmpty()) {
+        return QString();
+    }
+
+    QString path = QQmlFile::urlToLocalFileOrQrc(url);
+
+    if (path.isEmpty()) {
+        return QString();
+    }
+
+    QFileInfo fileInfo(path);
+    if (fileInfo.exists() && !fileInfo.isFile()) {
+        return QString();
+    }
+
+    QString prefix = fileInfo.dir().absolutePath() + QDir::separator() + fileInfo.baseName();
+    QString suffix = "." + fileInfo.completeSuffix();
+
+    /* Use file with expected grid unit suffix if it exists.
+       For example, if m_gridUnit = 10, look for [e-mail].
+    */
+
+    path = prefix + suffixForGridUnit(m_gridUnit) + suffix;
+    if (QFile::exists(path)) {
+        return QString("1") + "/" + path;
+    }
+
+    /* No file with expected grid unit suffix exists.
+       List all the files of the form fileBaseName@[0-9]*.fileSuffix and select
+       the most appropriate one privileging downscaling high resolution assets
+       over upscaling low resolution assets.
+
+       The most appropriate file has a grid unit suffix greater than the target
+       grid unit (m_gridUnit) yet as small as possible.
+       If no file with a grid unit suffix greater than the target grid unit
+       exists, then select one with a grid unit suffix as close as possible to
+       the target grid unit.
+
+       For example, if m_gridUnit = 10 and the available files are
+       [e-mail], [e-mail] and [e-mail], the most appropriate
+       file would be [e-mail] since it is above 10 and smaller
+       than [e-mail].
+    */
+    QStringList nameFilters;
+    nameFilters << fileInfo.baseName() + "@[0-9]*" + suffix;
+    QStringList files = fileInfo.dir().entryList(nameFilters, QDir::Files);
+
+    if (!files.empty()) {
+        float selectedGridUnitSuffix = gridUnitSuffixFromFileName(files.first());
+
+        Q_FOREACH (const QString& fileName, files) {
+            float gridUnitSuffix = gridUnitSuffixFromFileName(fileName);
+            if ((selectedGridUnitSuffix >= m_gridUnit && gridUnitSuffix >= m_gridUnit && gridUnitSuffix < selectedGridUnitSuffix)
+                || (selectedGridUnitSuffix < m_gridUnit && gridUnitSuffix > selectedGridUnitSuffix)) {
+                selectedGridUnitSuffix = gridUnitSuffix;
+            }
+        }
+
+        path = prefix + suffixForGridUnit(selectedGridUnitSuffix) + suffix;
+        float scaleFactor = m_gridUnit / selectedGridUnitSuffix;
+        return QString::number(scaleFactor) + "/" + path;
+    }
+
+    path = prefix + suffix;
+    if (QFile::exists(path)) {
+        return QString("1") + "/" + path;
+    }
+
+    return QString();
+}
+
+QString UCUnits::suffixForGridUnit(float gridUnit)
+{
+    return "@" + QString::number(gridUnit);
+}
+
+float UCUnits::gridUnitSuffixFromFileName(const QString& fileName)
+{
+    QRegularExpression re("^.*@([0-9]*).*$");
+    QRegularExpressionMatch match = re.match(fileName);
+    if (match.hasMatch()) {
+        return match.captured(1).toFloat();
+    } else {
+        return 0;
+    }
+}
 
=== added file 'src/plugin/poppler-qml-plugin/ucunits.h'
--- src/plugin/poppler-qml-plugin/ucunits.h	1970-01-01 00:00:00 +0000
+++ src/plugin/poppler-qml-plugin/ucunits.h	2016-04-22 10:31:39 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Florian Boucault <[e-mail]>
+ */
+
+#ifndef UBUNTU_COMPONENTS_UNITS_H
+#define UBUNTU_COMPONENTS_UNITS_H
+
+#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QUrl>
+
+class UCUnits : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(float gridUnit READ gridUnit WRITE setGridUnit NOTIFY gridUnitChanged)
+
+public:
+    static UCUnits& instance() {
+        static UCUnits instance;
+        return instance;
+    }
+
+    explicit UCUnits(QObject *parent = 0);
+    Q_INVOKABLE float dp(float value);
+    Q_INVOKABLE float gu(float value);
+    QString resolveResource(const QUrl& url);
+
+    // getters
+    float gridUnit();
+
+    // setters
+    void setGridUnit(float gridUnit);
+
+Q_SIGNALS:
+    void gridUnitChanged();
+
+protected:
+    QString suffixForGridUnit(float gridUnit);
+    float gridUnitSuffixFromFileName(const QString &fileName);
+
+private:
+    float m_devicePixelRatio;
+    float m_gridUnit;
+};
+
+#endif // UBUNTU_COMPONENTS_UNITS_H
 
=== modified file 'src/plugin/poppler-qml-plugin/verticalview.cpp'
--- src/plugin/poppler-qml-plugin/verticalview.cpp	2015-04-26 14:39:20 +0000
+++ src/plugin/poppler-qml-plugin/verticalview.cpp	2016-04-22 10:31:39 +0000
@@ -1,187 +1,117 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Some documentation on how this thing works:
- *
- * A flickable has two very important concepts that define the top and
- * height of the flickable area.
- * The top is returned in minYExtent()
- * The height is set using setContentHeight()
- * By changing those two values we can make the list grow up or down
- * as needed. e.g. if we are in the middle of the list
- * and something that is above the viewport grows, since we do not
- * want to change the viewport because of that we just adjust the
- * minYExtent so that the list grows up.
- *
- * The implementation on the list relies on the delegateModel doing
- * most of the instantiation work. You call createItem() when you
- * need to create an item asking for it async or not. If returns null
- * it means the item will be created async and the model will call the
- * itemCreated slot with the item.
- *
- * updatePolish is the central point of dispatch for the work of the
- * class. It is called by the scene graph just before drawing the class.
- * In it we:
- *  * Make sure all items are positioned correctly
- *  * Add/Remove items if needed
- *  * Update the content height if it was dirty
- *
- * m_visibleItems contains all the items we have created at the moment.
- * Actually not all of them are visible since it includes the ones
- * in the cache area we create asynchronously to help performance.
- * The first item in m_visibleItems has the m_firstVisibleIndex in
- * the model. If you actually want to know what is the first
- * item in the viewport you have to find the first non culled element
- * in m_visibleItems
- *
- * The first item of m_visibleItems is the one that defines the
- * positions of all the rest of items (see updatePolish()) and
- * this is why sometimes we move it even if it's not the item
- * that has triggered the function (i.e. in itemGeometryChanged())
- *
- * m_visibleItems is a list of ListItem. Each ListItem
- * will contain a item and potentially a sectionItem. The sectionItem
- * is only there when the list is using sectionDelegate+sectionProperty
- * and this is the first item of the section. Each ListItem is vertically
- * layouted with the sectionItem first and then the item.
- *
- * Note that minYExtent and height are not always totally accurate, since
- * we don't have the items created we can't guess their heights
- * so we can only guarantee the values are correct when the first/last
- * items of the list are visible, otherwise we just live with good enough
- * values that make the list scrollable
- *
- * There are a few things that are not really implemented or tested properly
- * which we don't use at the moment like changing the model, etc.
- * The known missing features are marked with TODOs along the code.
- */
-
 #include "verticalview.h"
-
-#include <QCoreApplication>
-#include <QDebug>
-#include <qqmlinfo.h>
-#include <qqmlengine.h>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-pedantic"
-#include <private/qqmldelegatemodel_p.h>
-#include <private/qqmlglobal_p.h>
-#include <private/qquickitem_p.h>
-#include <private/qquickanimation_p.h>
-#pragma GCC diagnostic pop
-
-qreal VerticalView::ListItem::height() const
-{
-    return m_item->height();
-}
-
-qreal VerticalView::ListItem::y() const
-{
-    return m_item->y();
-}
-
-void VerticalView::ListItem::setY(qreal newY)
-{
-    m_item->setY(newY);
-}
-
-bool VerticalView::ListItem::culled() const
-{
-    return QQuickItemPrivate::get(m_item)->culled;
-}
-
-void VerticalView::ListItem::setCulled(bool culled)
-{
-    QQuickItemPrivate::get(m_item)->setCulled(culled);
-}
-
-VerticalView::VerticalView()
- : m_delegateModel(nullptr)
- , m_asyncRequestedIndex(-1)
- , m_delegateValidated(false)
- , m_firstVisibleIndex(-1)
- , m_currentPageIndex(-1)
- , m_minYExtent(0)
- , m_contentHeightDirty(false)
- , m_previousContentY(0)
- , m_inLayout(false)
- , m_cacheBuffer(0)
- , m_spacing(0)
-{
-    connect(this, SIGNAL(heightChanged()), this, SLOT(_q_heightChanged()));
-    connect(this, SIGNAL(contentYChanged()), this, SLOT(_q_updateCurrentPageIndex()));
-
-    setFlickableDirection(QQuickFlickable::HorizontalAndVerticalFlick);
+//#include "pdfdocument.h"
+#include "pdfzoom.h"
+#include "twips.h"
+#include "sgtileitem.h"
+#include "pagedecoration.h"
+#include "pageoverlay.h"
+
+#include "config.h"
+
+#include <QImage>
+#include <QtCore/qmath.h>
+
+// FIXME: Sometimes layout is not created when a document is opened
+// TODO: Check if everything works as expected when zooming
+
+#define UPDATE_TIMER_MSECS 20
+
+VerticalView::VerticalView(QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_parentFlickable(nullptr)
+    , m_document(nullptr)
+    , m_zoomSettings(new PdfZoom(this))
+    , m_cacheBuffer(200)
+    , m_spacing(12)
+    , m_rotation(PdfRotation::Rotate0)
+    , m_currentPageIndex(-1)
+    , m_visibleArea(0, 0, 0, 0)
+    , m_bufferArea(0, 0, 0, 0)
+    , m_renderHints(0)
+    , m_showLinkHighlight(true)
+    , m_linkHighlightColor(Qt::red)
+    , m_error(PopplerError::NoError)
+    , m_hasZoomChanged(false)
+    , m_hasRotationChanged(false)
+    , m_hasFlickableBeenScrolled(false)
+    , m_hasFlickableBeenResized(false)
+    , m_hasRenderHintsChanged(false)
+{
+    // Connect signals
+    connect(this, &VerticalView::documentChanged, this, &VerticalView::updateLayout);
+    connect(this, &VerticalView::parentFlickableChanged, this, &VerticalView::updateLayout);
+    connect(this, &VerticalView::cacheBufferChanged, this, &VerticalView::updateLayout);
+    connect(this, &VerticalView::spacingChanged, this, &VerticalView::updateLayout);
+    connect(this, &VerticalView::renderHintsChanged, this, &VerticalView::onRenderHintsChanged);
+
+    connect(RenderEngine::instance(), &RenderEngine::taskRenderFinished,
+            this, &VerticalView::slotTaskRenderFinished);
+
+    connect(&m_updateTimer, &QTimer::timeout, this, &VerticalView::updateLayout);
+
+    connect(m_zoomSettings, &PdfZoom::zoomFactorChanged, [&]() {
+        m_hasZoomChanged = true;
+        updateLayout();
+    });
+
+    connect(this, &VerticalView::rotationChanged, [&]() {
+        m_hasRotationChanged = true;
+        updateLayout();
+    });
 }
 
 VerticalView::~VerticalView()
 {
-}
-
-QAbstractItemModel *VerticalView::model() const
-{
-    return m_delegateModel ? m_delegateModel->model().value<QAbstractItemModel *>() : nullptr;
-}
-
-void VerticalView::setModel(QAbstractItemModel *model)
-{
-    if (model != this->model()) {
-        if (!m_delegateModel) {
-            createDelegateModel();
-        } else {
-            disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(_q_modelUpdated(QQmlChangeSet,bool)));
-        }
-        m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));
-        connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(_q_modelUpdated(QQmlChangeSet,bool)));
-        Q_EMIT modelChanged();
-        polish();
-        // TODO?
-//         Q_EMIT contentHeightChanged();
-//         Q_EMIT contentYChanged();
-    }
-}
-
-QQmlComponent *VerticalView::delegate() const
-{
-    return m_delegateModel ? m_delegateModel->delegate() : nullptr;
-}
-
-void VerticalView::setDelegate(QQmlComponent *delegate)
-{
-    if (delegate != this->delegate()) {
-        if (!m_delegateModel) {
-            createDelegateModel();
-        }
-
-        // Cleanup the existing items
-        Q_FOREACH(ListItem *item, m_visibleItems)
-            releaseItem(item);
-        m_visibleItems.clear();
-        m_firstVisibleIndex = -1;
-        adjustMinYExtent();
-        setContentY(0);
-
-        m_delegateModel->setDelegate(delegate);
-
-        Q_EMIT delegateChanged();
-        m_delegateValidated = false;
-        m_contentHeightDirty = true;
-        polish();
-    }
+    disconnect(RenderEngine::instance(), &RenderEngine::taskRenderFinished,
+            this, &VerticalView::slotTaskRenderFinished);
+
+    qDeleteAll(m_decorations);
+    qDeleteAll(m_overlays);
+    qDeleteAll(m_pages);
+}
+
+// Returns the parent QML Flickable
+QQuickItem* VerticalView::parentFlickable() const
+{
+    return m_parentFlickable;
+}
+
+// Set the parent QML Flickable
+void VerticalView::setParentFlickable(QQuickItem *flickable)
+{
+    if (m_parentFlickable == flickable)
+        return;
+
+    if (m_parentFlickable)
+        m_parentFlickable->disconnect(this);
+
+    m_parentFlickable = flickable;
+
+    connect(m_parentFlickable, &QQuickItem::widthChanged, this, &VerticalView::onFlickableSizeChanged);
+    connect(m_parentFlickable, &QQuickItem::heightChanged, this, &VerticalView::onFlickableSizeChanged);
+
+    connect(m_parentFlickable, SIGNAL(contentXChanged()), this, SLOT(onFlickableScrolled()));
+    connect(m_parentFlickable, SIGNAL(contentYChanged()), this, SLOT(onFlickableScrolled()));
+
+    Q_EMIT parentFlickableChanged();
+}
+
+PdfDocument* VerticalView::document() const
+{
+    return m_document.data();
+}
+
+PdfZoom *VerticalView::zoomSettings() const
+{
+    return m_zoomSettings;
+}
+void VerticalView::setCurrentPageIndex(int currentPageIndex)
+{
+    if (m_currentPageIndex == currentPageIndex)
+        return;
+
+    m_currentPageIndex = currentPageIndex;
+    Q_EMIT currentPageIndexChanged();
 }
 
 int VerticalView::cacheBuffer() const
@@ -191,43 +121,25 @@
 
 void VerticalView::setCacheBuffer(int cacheBuffer)
 {
-    if (cacheBuffer < 0) {
-        qmlInfo(this) << "Cannot set a negative cache buffer";
+    if (m_cacheBuffer == cacheBuffer)
         return;
-    }
 
-    if (cacheBuffer != m_cacheBuffer) {
-        m_cacheBuffer = cacheBuffer;
-        Q_EMIT cacheBufferChanged();
-        polish();
-    }
+    m_cacheBuffer = cacheBuffer;
+    Q_EMIT cacheBufferChanged();
 }
 
-qreal VerticalView::spacing() const
+int VerticalView::spacing() const
 {
     return m_spacing;
 }
 
-void VerticalView::setSpacing(qreal spacing)
+void VerticalView::setSpacing(int spacing)
 {
-    if (spacing < 0) {
-        qmlInfo(this) << "Cannot set a negative spacing";
+    if (m_spacing == spacing)
         return;
-    }
-
-    if (spacing != m_spacing) {
-        m_spacing = spacing;
-        Q_EMIT spacingChanged();
-        polish();
-    }
-}
-
-int VerticalView::count() const
-{
-    if (m_delegateModel)
-        return m_delegateModel->count();
-    else
-        return 0;
+
+    m_spacing = spacing;
+    Q_EMIT spacingChanged();
 }
 
 int VerticalView::currentPageIndex() const
@@ -235,659 +147,583 @@
     return m_currentPageIndex;
 }
 
-QQuickItem *VerticalView::currentPageItem() const
-{
-    return itemAt(m_currentPageIndex);
-}
-
-void VerticalView::_q_updateCurrentPageIndex()
-{
-    if (!m_visibleItems.isEmpty()) {
-        qreal pos = this->contentY() + (this->height() * 0.5);
-
-        int oldCurrentPageIndex = m_currentPageIndex;
-        int i = 0;
-
-        Q_FOREACH(ListItem * item, m_visibleItems) {
-            if (item->y() < pos && item->y() + item->height() > pos)
-                break;
-
-            i++;
-        }
-
-        // If spacing is set, there may be no page on posY position,
-        // and the Q_FOREACH loop keep on running until the end.
-        if (i != m_visibleItems.length())
-            m_currentPageIndex = m_firstVisibleIndex + i;
-
-        if (m_currentPageIndex != oldCurrentPageIndex) {
-            Q_EMIT currentPageIndexChanged();
-            Q_EMIT currentPageItemChanged();
-        }
-
+int VerticalView::pagesCount() const
+{
+    if (!m_document || m_document.data()->isLocked())
+        return 0;
+
+    return m_document.data()->pageCount();
+}
+
+PdfRotation::Rotation VerticalView::rotation() const
+{
+    return m_rotation;
+}
+
+void VerticalView::setRotation(PdfRotation::Rotation rotation)
+{
+    if (m_rotation == rotation)
+        return;
+
+    m_rotation = rotation;
+    Q_EMIT rotationChanged();
+}
+
+PopplerError::Error VerticalView::error() const
+{
+    return m_error;
+}
+
+PdfDocument::RenderHints VerticalView::renderHints() const
+{
+    return m_renderHints;
+}
+
+void VerticalView::setRenderHints(const PdfDocument::RenderHints hints)
+{
+    if (m_renderHints == hints)
+        return;
+
+    m_renderHints = hints;
+    Q_EMIT renderHintsChanged();
+}
+
+bool VerticalView::showLinkHighlight() const
+{
+    return m_showLinkHighlight;
+}
+
+void VerticalView::setShowLinkHighlight(bool show)
+{
+    if (m_showLinkHighlight == show)
+        return;
+
+    m_showLinkHighlight = show;
+    Q_EMIT showLinkHighlightChanged();
+}
+
+QColor VerticalView::linkHighlightColor() const
+{
+    return m_linkHighlightColor;
+}
+
+void VerticalView::setLinkHighlightColor(const QColor &color)
+{
+    if (m_linkHighlightColor == color)
+        return;
+
+    m_linkHighlightColor = color;
+    Q_EMIT linkHighlightColorChanged();
+}
+
+void VerticalView::setError(const PopplerError::Error &error)
+{
+    if (m_error == error)
+        return;
+
+    m_error = error;
+    Q_EMIT errorChanged();
+}
+
+void VerticalView::initializeDocument(const QString &path)
+{
+    if (m_document)
+        m_document->disconnect(this);
+
+    setError(PopplerError::NoError);
+
+    m_document = QSharedPointer<PdfDocument>(new PdfDocument());
+    m_document->setPath(path);
+
+    /* A lot of things happens when we set the path property in
+     * m_document. Need to check if an error has been emitted. */
+    setError(m_document->error());
+
+    if (m_error != PopplerError::NoError && m_error != PopplerError::DocumentLocked) {
+        m_document.clear();
+
+        // Stop doing anything below.
+        return;
     }
+
+    m_document.data()->setRenderHints(m_renderHints);
+
+    // --------------------------------------------------
+    QQmlEngine *engine = QQmlEngine::contextForObject(this)->engine();
+    if (engine->imageProvider("poppler"))
+        engine->removeImageProvider("poppler");
+
+    m_imageProvider = new PdfImageProvider(m_document);
+    engine->addImageProvider("poppler", m_imageProvider);
+    // --------------------------------------------------
+
+    Q_EMIT documentChanged();
+
+    // Init zoom settings
+    m_zoomSettings->init();
+}
+
+bool VerticalView::adjustZoomToWidth()
+{
+    if (!m_zoomSettings)
+        return false;
+
+    bool result;
+
+    result = m_zoomSettings->adjustZoomToWidth();
+    m_hasZoomChanged = result;
+
+    return result;
+}
+
+bool VerticalView::adjustZoomToPage()
+{
+    if (!m_zoomSettings)
+        return false;
+
+    bool result;
+
+    result = m_zoomSettings->adjustZoomToPage();
+    m_hasZoomChanged = result;
+
+    return result;
+}
+
+bool VerticalView::adjustAutomaticZoom()
+{
+    if (!m_zoomSettings)
+        return false;
+
+    bool result;
+
+    result = m_zoomSettings->adjustAutomaticZoom();
+    m_hasZoomChanged = result;
+
+    return result;
 }
 
 void VerticalView::positionAtBeginning()
 {
-    if (m_delegateModel->count() <= 0)
-        return;
-
-    if (m_firstVisibleIndex != 0) {
-        // TODO This could be optimized by trying to reuse the interesection
-        // of items that may end up intersecting between the existing
-        // m_visibleItems and the items we are creating in the next loop
-        Q_FOREACH(ListItem *item, m_visibleItems)
-            releaseItem(item);
-        m_visibleItems.clear();
-        m_firstVisibleIndex = -1;
-
-        // Create the item 0, it will be already correctly positioned at createItem()
-        ListItem *item = createItem(0, false);
-        // Create the subsequent items
-        int modelIndex = 1;
-        qreal pos = item->y() + item->height();
-        const qreal bufferTo = height() + m_cacheBuffer;
-        while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {
-            if (!(item = createItem(modelIndex, false)))
+    m_parentFlickable->setProperty("contentY", 0);
+}
+
+void VerticalView::positionAtIndex(int index, qreal top, qreal left)
+{
+    SGTileItem* page = m_pages.value(index);
+
+    if (!page) {
+        PdfDocument* doc = m_document.data();
+
+        const qreal &zoomFactor = m_zoomSettings->zoomFactor();
+        qreal totalHeight = 0;
+
+        for (int j=0; j < doc->pageCount(); ++j) {
+            const QSize &s = doc->pageSize(j);
+            QRect pageRect;
+
+            if (m_rotation == PdfRotation::Rotate0 || m_rotation == PdfRotation::Rotate180) {
+                pageRect = QRect(
+                            (this->width() - Twips::convertPointsToPixels(s.width(), zoomFactor)) * 0.5,
+                            totalHeight,
+                            Twips::convertPointsToPixels(s.width(), zoomFactor),
+                            Twips::convertPointsToPixels(s.height(), zoomFactor)
+                            );
+            } else {
+                pageRect = QRect(
+                            (this->width() - Twips::convertPointsToPixels(s.height(), zoomFactor)) * 0.5,
+                            totalHeight,
+                            Twips::convertPointsToPixels(s.height(), zoomFactor),
+                            Twips::convertPointsToPixels(s.width(), zoomFactor)
+                            );
+            }
+
+            if (j == index) {
+                page = createPage(j, pageRect);
                 break;
-            pos += item->height();