Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/loview-fullscreen-presentation-mode into lp:ubuntu-docviewer-app

[Stefano Verzegnassi]

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/loview-fullscreen-presentation-mode]

245. By Stefano Verzegnassi on 2016-01-17

Merged parent branch lp:~verzegnassi-stefano/ubuntu-docviewer-app/lok-qml-async-imageprovider

Unmerged revisions

245. By Stefano Verzegnassi on 2016-01-17

Merged parent branch lp:~verzegnassi-stefano/ubuntu-docviewer-app/lok-qml-async-imageprovider

244. By Stefano Verzegnassi on 2016-01-17

Added a full-screen mode for LO presentation docs

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2016-01-17 21:20:01 +0000
+++ po/com.ubuntu.docviewer.pot	2016-01-17 21:20:01 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-07 12:16+0100\n"
+"POT-Creation-Date: 2016-01-17 14:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -41,7 +41,7 @@
 msgstr ""
 
 #: ../src/app/qml/common/DetailsPage.qml:26
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:115
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:83
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
 msgid "Details"
@@ -341,13 +341,17 @@
 msgid "Go to position..."
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:101
+msgid "Presentation"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:108
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
 msgid "Disable night mode"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:108
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
 msgid "Enable night mode"
@@ -380,6 +384,13 @@
 "The requested document may be corrupt or protected by a password."
 msgstr ""
 
+#. TRANSLATORS: the first argument (%1) refers to the slide currently shown on the screen,
+#. while the second one (%2) refers to the total slides count.
+#: ../src/app/qml/loView/LoPresentation.qml:50
+#, qt-format
+msgid "Slide %1 of %2"
+msgstr ""
+
 #. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
 #. Document Viewer for rendering LibreOffice/MS-Office documents.
 #. Ref. https://docs.libreoffice.org/libreofficekit.html
 
=== modified file 'src/app/qml/loView/LOViewDefaultHeader.qml'
--- src/app/qml/loView/LOViewDefaultHeader.qml	2015-11-30 12:12:10 +0000
+++ src/app/qml/loView/LOViewDefaultHeader.qml	2016-01-17 21:20:01 +0000
@@ -96,6 +96,14 @@
         },
 
         Action {
+            objectName:"presentationmode"
+            iconName: "slideshow"
+            text: i18n.tr("Presentation")
+            visible: targetPage.contentItem.loDocument.documentType == LibreOffice.Document.PresentationDocument
+            onTriggered: pageStack.push(Qt.resolvedUrl("./LoPresentation.qml"), {'view': targetPage.contentItem.loView})
+        },
+
+        Action {
             iconName: "night-mode"
             text: mainView.nightModeEnabled ? i18n.tr("Disable night mode") : i18n.tr("Enable night mode")
 
 
=== added file 'src/app/qml/loView/LoPresentation.qml'
--- src/app/qml/loView/LoPresentation.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/loView/LoPresentation.qml	2016-01-17 21:20:01 +0000
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2013-2016 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
+import DocumentViewer 1.0
+
+Page {
+    id: loPresentationPage
+    property var view
+
+    anchors.fill: parent
+    title: DocumentViewer.getFileBaseNameFromPath(view.documentPath)
+    focus: true
+
+    header: PageHeader {
+        visible: false
+        leadingActionBar.actions: [
+            Action {
+                iconName: "back"
+                text: "Back"
+                onTriggered: pageStack.pop()
+            }
+        ]
+        contents: ListItemLayout {
+            anchors.centerIn: parent
+            title {
+                font.weight: Font.DemiBold
+                textSize: Label.Large
+                text: loPresentationPage.title
+                color: loPresentationPage.header.__styleInstance.foregroundColor
+            }
+            subtitle {
+                textSize: Label.Medium
+                // TRANSLATORS: the first argument (%1) refers to the slide currently shown on the screen,
+                // while the second one (%2) refers to the total slides count.
+                text: i18n.tr("Slide %1 of %2").arg(loPresentationView.currentIndex + 1).arg(loPresentationView.count)
+                color: loPresentationPage.header.__styleInstance.foregroundColor
+            }
+        }
+
+        StyleHints {
+            backgroundColor: "#BF000000"
+            foregroundColor: "white"
+        }
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+    }
+
+    ListView {
+        id: loPresentationView
+        anchors.fill: parent
+        focus: true
+
+        currentIndex: view.currentPart
+        orientation: Qt.Horizontal;
+        snapMode: ListView.SnapOneItem
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        highlightFollowsCurrentItem: true
+        highlightMoveDuration: 0
+        boundsBehavior: Flickable.StopAtBounds
+        cacheBuffer: width
+
+        model: view.partsModel
+        delegate: Image {
+            height: loPresentationPage.height; width: loPresentationPage.width
+            fillMode: Image.PreserveAspectFit
+            cache: false
+            source: "image://lok/part/%1".arg(model.index)
+            sourceSize {
+                width: loPresentationPage.height
+                height: loPresentationPage.width
+            }
+        }
+
+        Component.onCompleted: loPresentationPage.forceActiveFocus()
+
+        MouseArea {
+            anchors.fill: parent
+            onDoubleClicked: loPresentationPage.header.visible = !loPresentationPage.header.visible
+        }
+    }
+
+    Keys.onPressed: {
+        if (event.key == Qt.Key_Escape) { pageStack.pop(); return; }
+        if (event.key == Qt.Key_Home) { loPresentationView.positionViewAtBeginning(); return; }
+        if (event.key == Qt.Key_End) { loPresentationView.positionViewAtEnd(); return; }
+
+        if (event.key == Qt.Key_Right || event.key == Qt.Key_PageDown) {
+            loPresentationView.incrementCurrentIndex();
+            return;
+        }
+        if (event.key == Qt.Key_Left || event.key == Qt.Key_PageUp) {
+            loPresentationView.decrementCurrentIndex();
+            return;
+        }
+    }
+}
+