Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-impress-support-mp-review into lp:~mrqtros/ubuntu-docviewer-app/reboot-qsg-impress-support

[Stefano Verzegnassi]

Minor fixes

Just removed some deprecated code/comments, merged 'reboot' branch, updated translation template, fixed conflicts.

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-10-08 20:53:25 +0000
+++ po/com.ubuntu.docviewer.pot	2015-10-11 12:52:09 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-08 23:48+0300\n"
+"POT-Creation-Date: 2015-10-11 13:31+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"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../src/app/docviewer-application.cpp:162
-#: /home/qtros/dev/build-reboot-qsg-impress-support-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /tmp/build-reboot-qsg-impress-support-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
 msgid "Document Viewer"
 msgstr ""
 
@@ -63,7 +63,7 @@
 #: ../src/app/qml/common/RejectedImportDialog.qml:38
 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:32
 #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:79
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:78
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Close"
@@ -151,6 +151,7 @@
 
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:44
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:54
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
 msgid "Cancel"
 msgstr ""
@@ -253,7 +254,7 @@
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:79
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:78
 #: ../src/app/qml/loView/LOViewPage.qml:191
 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
@@ -305,42 +306,41 @@
 msgid "Reverse order"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:56
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
 #: ../src/app/qml/textView/TextView.qml:42
 msgid "Loading..."
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:60
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
 msgid "LibreOffice text document"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:62
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
 msgid "LibreOffice spread sheet"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:64
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
 msgid "LibreOffice presentation"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:66
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
 msgid "LibreOffice Draw document"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:68
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:67
 msgid "Unknown LibreOffice document"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:70
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:69
 msgid "Unknown type document"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:95
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:94
 msgid "Show zoom controls"
 msgstr ""
 
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:102
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
-msgid "Go to page..."
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:101
+msgid "Go to position..."
 msgstr ""
 
 #: ../src/app/qml/loView/LOViewDefaultHeader.qml:108
@@ -355,6 +355,19 @@
 msgid "Enable night mode"
 msgstr ""
 
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:27
+msgid "Go to position"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:28
+msgid "Choose a position between 1% and 100%"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:46
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
+msgid "GO!"
+msgstr ""
+
 #: ../src/app/qml/loView/LOViewPage.qml:34
 #: ../src/app/qml/loView/LOViewPage.qml:189
 msgid "Slides"
@@ -408,6 +421,10 @@
 msgid "Page %1 of %2"
 msgstr ""
 
+#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:85
+msgid "Go to page..."
+msgstr ""
+
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
 msgid "Go to page"
 msgstr ""
@@ -417,10 +434,6 @@
 msgid "Choose a page between 1 and %1"
 msgstr ""
 
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
-msgid "GO!"
-msgstr ""
-
 #. TRANSLATORS: This string is used for renaming a copied file,
 #. when a file with the same name already exists in user's
 #. Documents folder.
@@ -435,6 +448,6 @@
 msgid "copy %1"
 msgstr ""
 
-#: /home/qtros/dev/build-reboot-qsg-impress-support-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /tmp/build-reboot-qsg-impress-support-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'src/app/qml/loView/LOViewDefaultHeader.qml'
--- src/app/qml/loView/LOViewDefaultHeader.qml	2015-09-22 19:02:46 +0000
+++ src/app/qml/loView/LOViewDefaultHeader.qml	2015-10-11 12:52:09 +0000
@@ -16,64 +16,55 @@
 
 import QtQuick 2.3
 import Ubuntu.Components 1.1
-import QtQuick.Layouts 1.1
 import Ubuntu.Components.Popups 1.0
+import DocumentViewer.LibreOffice 1.0 as LibreOffice
 
 PageHeadState {
     id: rootItem
 
     property Page targetPage
-    property alias activityRunning: activity.running
-
     head: targetPage.head
 
-    contents: RowLayout {
-        anchors.fill: parent
-        spacing: units.gu(1)
-
-        ActivityIndicator { id: activity }
-
-        Column {
-            id: layout
-            Layout.fillWidth: true
-
-            Label {
-                width: parent.width
-                //horizontalAlignment: Text.AlignHCenter
-                elide: Text.ElideMiddle
-
-                font.weight: Font.DemiBold
-                text: targetPage.title
-            }
-            Label {
-                width: parent.width
-                //horizontalAlignment: Text.AlignHCenter
-                elide: Text.ElideMiddle
-
-                fontSize: "small"
-                text: {
-                    if (!loPageContentLoader.item)
-                        return i18n.tr("Loading...")
-
-                    switch(loPageContentLoader.item.loDocument.documentType) {
-                    case 0:
-                        return i18n.tr("LibreOffice text document")
-                    case 1:
-                        return i18n.tr("LibreOffice spread sheet")
-                    case 2:
-                        return i18n.tr("LibreOffice presentation")
-                    case 3:
-                        return i18n.tr("LibreOffice Draw document")
-                    case 4:
-                        return i18n.tr("Unknown LibreOffice document")
-                    default:
-                        return i18n.tr("Unknown type document")
-                    }
+    contents: Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            elide: Text.ElideMiddle
+            font.weight: Font.DemiBold
+            text: targetPage.title
+        }
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            elide: Text.ElideMiddle
+            fontSize: "small"
+            text: {
+                if (!loPageContentLoader.item)
+                    return i18n.tr("Loading...")
+
+                switch(loPageContentLoader.item.loDocument.documentType) {
+                case 0:
+                    return i18n.tr("LibreOffice text document")
+                case 1:
+                    return i18n.tr("LibreOffice spread sheet")
+                case 2:
+                    return i18n.tr("LibreOffice presentation")
+                case 3:
+                    return i18n.tr("LibreOffice Draw document")
+                case 4:
+                    return i18n.tr("Unknown LibreOffice document")
+                default:
+                    return i18n.tr("Unknown type document")
                 }
             }
         }
     }
 
+
     backAction: Action {
         iconName: "back"
         text: (pageStack.depth > 1) ? i18n.tr("Back") : i18n.tr("Close")
@@ -97,10 +88,11 @@
         },
 
         Action {
-            objectName:"gotopage"
+            objectName: "gotopage"
             iconName: "browser-tabs"
-            text: i18n.tr("Go to page...")
-            enabled: false
+            text: i18n.tr("Go to position...")
+            onTriggered: PopupUtils.open(Qt.resolvedUrl("LOViewGotoDialog.qml"), targetPage)
+            visible: loPageContentLoader.item.loDocument.documentType == LibreOffice.Document.TextDocument
         },
 
         Action {

=== added file 'src/app/qml/loView/LOViewGotoDialog.qml'
--- src/app/qml/loView/LOViewGotoDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/loView/LOViewGotoDialog.qml	2015-10-11 12:52:09 +0000
@@ -0,0 +1,64 @@
+/*
+ * 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 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+
+// TODO: Use page breaks detection, when LibreOfficeKit will support it.
+
+Dialog {
+    id: goToPageDialog
+    objectName: "LOViewGotoDialog"
+
+    title: i18n.tr("Go to position")
+    text: i18n.tr("Choose a position between 1% and 100%")
+
+    TextField {
+        id: goToPageTextField
+        objectName:"goToPageTextField"
+
+        width: parent.width
+
+        hasClearButton: true
+        inputMethodHints: Qt.ImhFormattedNumbersOnly
+        validator: IntValidator{ bottom: 1; top: 100 }
+
+        Keys.onReturnPressed: goToPage()
+        Component.onCompleted: forceActiveFocus()
+    }
+
+    Button {
+        objectName:"GOButton"
+        text: i18n.tr("GO!")
+        color: UbuntuColors.green
+
+        enabled: goToPageTextField.acceptableInput
+        onClicked: goToPage()
+    }
+
+    Button {
+        text: i18n.tr("Cancel")
+        onClicked: PopupUtils.close(goToPageDialog)
+    }
+
+    function goToPage() {
+        var pos = loView.contentHeight * parseInt(goToPageTextField.text) / 100
+
+        loView.contentY = Math.min(pos, (loView.contentHeight - loView.height))
+        PopupUtils.close(goToPageDialog)
+    }
+}

=== modified file 'src/app/qml/loView/LOViewPage.qml'
--- src/app/qml/loView/LOViewPage.qml	2015-10-05 06:42:33 +0000
+++ src/app/qml/loView/LOViewPage.qml	2015-10-11 12:52:09 +0000
@@ -99,8 +99,8 @@
                                     left: parent.left
                                 }
 
-                                model: loView.partsModel //LO.PartsModel { document: loPageContent.loDocument }
-                                visible: /*loView.partsModel &&*/ loDocument.documentType == LO.Document.PresentationDocument
+                                model: loView.partsModel
+                                visible: loDocument.documentType == LO.Document.PresentationDocument
                                 width: visible ? units.gu(40) : 0
                             }
 
@@ -198,7 +198,7 @@
                     PartsView {
                         property bool belongsToNestedPage: true
                         anchors.fill: parent
-                        model: loView.partsModel //LO.PartsModel { document: loPageContent.loDocument }
+                        model: loView.partsModel
                     }
                 }
             }

=== modified file 'src/app/qml/loView/PartsView.qml'
--- src/app/qml/loView/PartsView.qml	2015-10-06 19:12:28 +0000
+++ src/app/qml/loView/PartsView.qml	2015-10-11 12:52:09 +0000
@@ -38,7 +38,7 @@
         height: units.gu(16)
 
         color: (loView.document.currentPart === model.index) ? Theme.palette.selected.background
-                                                                 : "transparent"
+                                                             : "transparent"
 
         AbstractButton {
             objectName: "abstractbutton"

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp	2015-10-08 20:53:25 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp	2015-10-11 12:52:09 +0000
@@ -134,16 +134,11 @@
     return QSize(pWidth, pHeight);
 }
 
-// Paint a tile, with size=canvasSize, of the part of the document defined by
-// the rect tileSize.
 QImage LODocument::paintTile(const QSize& canvasSize, const QRect& tileSize, const qreal &zoom)
 {
     if (!m_document)
         return QImage();
 
-//    if (m_currentPart != m_document->getPart())
-//        m_document->setPart(m_currentPart);
-
     QImage result = QImage(canvasSize.width(), canvasSize.height(),  QImage::Format_RGB32);
 
 #ifdef DEBUG_TILE_BENCHMARK
@@ -215,12 +210,6 @@
     return QString::fromUtf8(m_document->getPartName(index));
 }
  
-/* Export the file in a given format:
- *  - url is a mandatory argument.
- *  - format is optional. If not specified, lok will try to get it from the file
- *    extension given at the 'url' argument.
- *  - filerOptions is also optional.
- */
 // TODO: Is there some documentation on safe formats or filterOptions that can
 // be used?
 bool LODocument::saveAs(QString url, QString format = QString(), QString filterOptions = QString())

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.cpp	2015-10-06 20:11:45 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.cpp	2015-10-11 12:52:09 +0000
@@ -19,12 +19,8 @@
 #include "lodocument.h"
 #include "lopartsimageprovider.h"
 
-#include <QQmlContext>
-#include <QQmlEngine>
 #include <QDebug>
 
-
-
 LOPartsModel::LOPartsModel(const QSharedPointer<LODocument>& document, QAbstractListModel *parent):
     QAbstractListModel(parent)
 {   

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.h'
--- src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.h	2015-10-06 19:12:28 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.h	2015-10-11 12:52:09 +0000
@@ -19,7 +19,6 @@
 #define LOPARTSMODEL_H
 
 #include <QAbstractListModel>
-#include <QImage>
 #include <QHash>
 #include <QSharedPointer>
 
@@ -46,7 +45,6 @@
 {
     Q_OBJECT
     Q_DISABLE_COPY(LOPartsModel)
-    // Q_PROPERTY(LODocument* document READ document WRITE setDocument NOTIFY documentChanged)
     Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
 
 public:
@@ -60,9 +58,6 @@
     explicit LOPartsModel(const QSharedPointer<LODocument>& document, QAbstractListModel *parent = 0);
     ~LOPartsModel();
 
-    // LODocument* document() { return m_document; }
-    //void setDocument(LODocument* document);
-
     QHash<int, QByteArray> roleNames() const;
 
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
@@ -73,7 +68,6 @@
     void notifyAboutChanges(int id);
 
 Q_SIGNALS:
-    // void documentChanged();
     void countChanged();
 
 private slots:

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/loview.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/loview.cpp	2015-10-06 20:11:45 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/loview.cpp	2015-10-11 12:52:09 +0000
@@ -20,7 +20,6 @@
 #include "twips.h"
 #include "config.h"
 
-#include <QPainter>
 #include <QImage>
 #include <QTimer>
 #include <QtCore/qmath.h>
@@ -196,7 +195,6 @@
     return false;
 }
 
-// Update the size of LOView, according to the size of the loaded document.
 void LOView::updateViewSize()
 {
     if (!m_document)
@@ -207,13 +205,9 @@
     this->setWidth(Twips::convertTwipsToPixels(docSize.width(), m_zoomFactor));
     this->setHeight(Twips::convertTwipsToPixels(docSize.height(), m_zoomFactor));
 
-    // TODO: Consider to use connections to widthChanged and heightChanged
-    this->updateVisibleRect();
+    updateVisibleRect();
 }
 
-// Update the informations of the currently visible area of the parent
-// Flickable, then generate/delete all the required tiles, according to these
-// informations.
 void LOView::updateVisibleRect()
 {
     if (!m_parentFlickable)
@@ -251,10 +245,10 @@
                           m_parentFlickable->height());
 
     // Update information about the buffer area
-    m_bufferArea.setRect(qMax(0, m_visibleArea.x() - this->cacheBuffer()),
-                         qMax(0, m_visibleArea.y() - this->cacheBuffer()),
-                         qMin(int(this->width() - m_bufferArea.x()), m_visibleArea.width() + (this->cacheBuffer() * 2)),
-                         qMin(int(this->height() - m_bufferArea.y()), m_visibleArea.height() + (this->cacheBuffer() * 2)));
+    m_bufferArea.setRect(qMax(0, m_visibleArea.x() - m_cacheBuffer),
+                         qMax(0, m_visibleArea.y() - m_cacheBuffer),
+                         qMin(int(this->width() - m_bufferArea.x()), m_visibleArea.width() + (m_cacheBuffer * 2)),
+                         qMin(int(this->height() - m_bufferArea.y()), m_visibleArea.height() + (m_cacheBuffer * 2)));
 
     // Delete tiles that are outside the loading area
     if (!m_tiles.isEmpty()) {
@@ -323,7 +317,6 @@
     }
 }
 
-// FIXME: Just for the moment. In zoom branch we have all we need :)
 void LOView::invalidateAllTiles()
 {
     clearView();

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/loview.h'
--- src/plugin/libreofficetoolkit-qml-plugin/loview.h	2015-10-06 20:11:45 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/loview.h	2015-10-11 12:52:09 +0000
@@ -17,7 +17,6 @@
 #ifndef LOVIEW_H
 #define LOVIEW_H
 
-#include <QQuickPaintedItem>
 #include <QQuickItem>
 #include <QTimer>
 #include <QSharedPointer>

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/renderengine.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/renderengine.cpp	2015-10-05 22:27:07 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/renderengine.cpp	2015-10-11 12:52:09 +0000
@@ -83,11 +83,5 @@
             QMetaObject::invokeMethod(this, "internalRenderCallback",
                                       Q_ARG(int, task.id), Q_ARG(QImage, img), Q_ARG(bool, task.isThumbnail));
         }
-//        QImage img = task.isThumbnail ?
-//                    //task.document->paintThumbnail(task.size) :
-//                    task.document->paintTile(task.area.size(), task.area, task.zoom) :
-//                    task.document->paintTile(task.area.size(), task.area, task.zoom);
-//        QMetaObject::invokeMethod(this, "internalRenderCallback",
-//                                  Q_ARG(int, task.id), Q_ARG(QImage, img), Q_ARG(bool, task.isThumbnail));
     });
 }

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp	2015-10-05 06:42:33 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp	2015-10-11 12:52:09 +0000
@@ -1,15 +1,15 @@
 #include "sgtileitem.h"
-
 #include "lodocument.h"
 #include "config.h"
 
+#include <QQuickWindow>
+#include <QSGSimpleTextureNode>
+
 #ifdef DEBUG_SHOW_TILE_BORDER
 #include <QSGGeometryNode>
 #include <QSGFlatColorMaterial>
 #endif
 
-//int SGTileItem::s_idCounter = 0xDEAD0000;
-
 SGTileItem::SGTileItem(const QRect& area, qreal zoom, int id, QQuickItem *parent)
     : QQuickItem(parent)
     , m_area(area)

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h'
--- src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h	2015-10-05 06:42:33 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h	2015-10-11 12:52:09 +0000
@@ -2,11 +2,7 @@
 #define SGTILEITEM_H
 
 #include <QQuickItem>
-#include <QQuickWindow>
-#include <QSGSimpleTextureNode>
 #include <QImage>
-#include <QtConcurrent/QtConcurrent>
-#include <QAtomicInteger>
 
 class LODocument;
 
@@ -43,8 +39,6 @@
     qreal m_zoomFactor;
     QImage m_data;
     int m_id;
-
-    // static int s_idCounter;
 };
 
 #endif // SGTILEITEM_H