[office] Add a toolbar to access pages and ToC.

dcaliste · Apr 23, 2015 · f273848 · f273848
1 parent 90ac1fb
commit f273848
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 4 deletions.
diff --git a/plugin/DocumentPage.qml b/plugin/DocumentPage.qml
@@ -37,10 +37,21 @@ Page {
 
     property url source;
     property int indexCount;
+    property bool _forceNavigation: false
 
     allowedOrientations: Orientation.All;
-    backNavigation: drawer.opened;
-    forwardNavigation: drawer.opened;
+    backNavigation: drawer.opened || _forceNavigation;
+    forwardNavigation: drawer.opened || _forceNavigation;
+
+    function pushAttachedPage() {
+        if (pageStack.nextPage(base) === null) {
+            pageStack.push(base.attachedPage)
+        } else {
+            _forceNavigation = true
+            pageStack.navigateForward()
+            _forceNavigation = false
+        }
+    }
 
     BusyIndicator { id: busyIndicator; anchors.centerIn: parent; size: BusyIndicatorSize.Large; }
 

diff --git a/plugin/PDFDocumentPage.qml b/plugin/PDFDocumentPage.qml
@@ -26,6 +26,7 @@ DocumentPage {
     attachedPage: Component {
         PDFDocumentToCPage {
             tocModel: pdfDocument.tocModel
+            pageCount: pdfDocument.pageCount
             onPageSelected: view.goToPage( pageNumber );
         }
     }
@@ -93,8 +94,39 @@ DocumentPage {
         // Toolbar contain.
         Row {
             id: row
-            width: parent.width
             height: parent.height
+
+            Item {
+                anchors.verticalCenter: parent.verticalCenter
+                width: pageCount.width
+                height: pageCount.height
+                Row {
+                    id: pageCount
+                    Image {
+                        source: "image://theme/icon-m-document"
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+                    Label {
+                        anchors.verticalCenter: parent.verticalCenter
+                        text: view.currentPage + " / " + view.document.pageCount
+                    }
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: base.pushAttachedPage()
+                }
+            }
+            Item {
+                // Spacer, to be replaced later with a search field.
+                width: toolbar.width - pageCount.width - pdfTOC.width
+                height: parent.height
+            }
+	    IconButton {
+		id: pdfTOC
+                anchors.verticalCenter: parent.verticalCenter
+		icon.source: "image://theme/icon-m-menu"
+		onClicked: base.pushAttachedPage()
+	    }
         }
     }
 

diff --git a/plugin/PDFDocumentToCPage.qml b/plugin/PDFDocumentToCPage.qml
@@ -23,13 +23,16 @@ Page {
     id: page;
     signal pageSelected(int pageNumber);
 
+    property int pageCount
     property alias tocModel: tocListView.model;
 
     allowedOrientations: Orientation.All;
 
     SilicaListView {
         id: tocListView
-        anchors.fill: parent;
+        width: parent.width
+        height: parent.height - gotoPage.height
+        clip: true
 
         //: Page with PDF index
         //% "Index"
@@ -68,4 +71,31 @@ Page {
             }
         }
     }
+
+    PanelBackground {
+        id: gotoPage
+        anchors.top: tocListView.bottom
+        width: parent.width
+        height: Theme.itemSizeMedium
+
+        TextField {
+            x: Theme.paddingLarge
+            width: parent.width - Theme.paddingMedium - Theme.paddingLarge
+            anchors.verticalCenter: parent.verticalCenter
+
+            //% "Go to page"
+            placeholderText: qsTrId("sailfish-office-lb-goto-page")
+            //% "document has %n pages"
+            label: qsTrId("sailfish-office-lb-%n-pages", page.pageCount)
+
+            // We enter page numbers
+            inputMethodHints: Qt.ImhDigitsOnly
+            EnterKey.enabled: text.length > 0 && Math.round(text) > 0 && Math.round(text) <= page.pageCount
+            EnterKey.iconSource: "image://theme/icon-m-enter-accept"
+            EnterKey.onClicked: {
+                page.pageSelected(Math.round(text) - 1);
+                pageStack.navigateBack(PageStackAction.Animated);
+            }
+        }
+    }
 }
diff --git a/plugin/PDFView.qml b/plugin/PDFView.qml
@@ -29,6 +29,7 @@ SilicaFlickable {
     property alias itemWidth: pdfCanvas.width;
     property alias itemHeight: pdfCanvas.height;
     property alias document: pdfCanvas.document;
+    property alias currentPage: pdfCanvas.currentPage
 
     property bool scaled: pdfCanvas.width != width;