Merge lp:~dpm/ubuntu-docviewer-app/toolbar-fix into lp:ubuntu-docviewer-app/trunk

[Daniel Holm]

Updated Toolbar API

Why is this not already proposed? The app doesn't run with the old toolbar code.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:21
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/1/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/418/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-precise-amd64-ci/1/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-quantal-amd64-ci/1/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-raring-amd64-ci/1/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-saucy-amd64-ci/1/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[Anthony Granger (chocanto)]

It's ok, I have fix the bug in the "file-qml" branch !

Thank you !

review: Disapprove

Unmerged revisions

21. By David Planella on 2013-09-06

Merged from Anthony Granger's branch

20. By David Planella on 2013-09-06

Migrated to the new Toolbar API

=== modified file 'ImageView.qml'
--- ImageView.qml	2013-06-30 15:10:38 +0000
+++ ImageView.qml	2013-09-19 10:49:09 +0000
@@ -11,7 +11,7 @@
         id: image
 		objectName: "imageItem"
 
-        source: file.getPath()
+        source: file.path
         smooth: true
         fillMode: Image.PreserveAspectFit
         width: parent.width

=== modified file 'PdfView.qml'
--- PdfView.qml	2013-08-09 12:55:12 +0000
+++ PdfView.qml	2013-09-19 10:49:09 +0000
@@ -11,7 +11,7 @@
 
     Poppler {
         id: popplerProp
-        path: file.getPath()
+        path: file.path
     }
 
     Column {

=== modified file 'TextView.qml'
--- TextView.qml	2013-06-28 22:42:59 +0000
+++ TextView.qml	2013-09-19 10:49:09 +0000
@@ -34,7 +34,7 @@
             Component.onCompleted: {
                 var xhr = new XMLHttpRequest;
 
-                xhr.open("GET", file.getPath());
+                xhr.open("GET", file.path);
                 xhr.onreadystatechange = function() {
                     if (xhr.readyState === XMLHttpRequest.DONE) {
                         textAreaMain.text = xhr.responseText;

=== modified file 'ubuntu-docviewer-app.qml'
--- ubuntu-docviewer-app.qml	2013-06-28 23:01:02 +0000
+++ ubuntu-docviewer-app.qml	2013-09-19 10:49:09 +0000
@@ -3,6 +3,8 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
+import org.docviewer.file 1.0
+
 import "utils.js" as Utils
 import "loadComponent.js" as LoadComponent
 
@@ -21,6 +23,23 @@
     Component.onDestruction: {
 
     }
+
+    Arguments {
+        id: args
+
+        defaultArgument.help: "Path of the document"
+        defaultArgument.valueNames: ["path"]
+    }
+
+    File {
+        id: file
+        path: args.defaultArgument.at(0)
+
+        onMimetypeChanged: {
+            mimetypeItem.value = file.mimetype;
+            LoadComponent.load(file.mimetype);
+        }
+    }
     
     Tabs {
         id: tabs
@@ -30,12 +49,12 @@
             objectName: "tabViewer"
             id: tabViewer;
             
-            title: Utils.getNameOfFile(file.getPath());
+            title: Utils.getNameOfFile(file.path);
             
             page: Page {
                 id: pageMain
 
-                tools: ToolbarActions {
+                tools: ToolbarItems {
                     back {
                         visible: true
                     }
@@ -55,31 +74,23 @@
                     width: units.gu(50)
                     ListItem.SingleValue {
                         text: i18n.tr("Location")
-                        value: file.getPath()
+                        value: file.path
                     }
                     ListItem.SingleValue {
                         text: i18n.tr("Size")
-                        value: Utils.printSize(file.getSize())
+                        value: Utils.printSize(file.size)
                     }
 
                     ListItem.SingleValue {
                         text: i18n.tr("Last modified")
-                        value: qsTr("%1").arg(file.getLastModified().toLocaleString(Qt.locale()))
+                        value: qsTr("%1").arg(file.lastModified.toLocaleString(Qt.locale()))
                     }
 
                     ListItem.SingleValue {
                         id: mimetypeItem
 						objectName: "mimetypeItem"
                         text: i18n.tr("Mimetype")
-                        value: file.getMimetype()
-                    }
-
-                    Connections {
-                        target: file
-                        onMimetypeChanged: {
-                            mimetypeItem.value = file.getMimetype();
-                            LoadComponent.load(file.getMimetype());
-                        }
+                        value: "none"
                     }
                 }
             }