Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/document-hub2 into lp:ubuntu-docviewer-app/trunk

[Stefano Verzegnassi]

List of changes:
 - Refactored project structure (too much QML files in the same folder)
 - Added full content-hub support
 - Uri handler support
 - In-app browser
 - Document Viewer has now rw permissions in HOME/Documents
 - Dropped support for Image and Other file type
 - Use new splash screen features

I'm sorry for the length of the diff: bzr move didn't recognise the folder changes.

In order to help with the review, here's some information:
    * All the C++ classes in src/app and src/app/quick needs a review.
    * Files in src/app/qml/upstreamComponents come from UCS or other core apps. The only "custom" files are MultipleSelectionGridView.qml (derived from MultipleSelectionListView.qml) and EmptyState.qml (allow wrapping of long subText)
    * All the files in src/app/qml/documentPage needs a deep review.
    * Other QML files had just minor changes.

CHANGES:
    - Refactored project structure (too much QML files in the same folder)
    - Added full content-hub support
    - Uri handler support
    - In-app browser
    - Document Viewer has now rw permissions in [HOME]/Documents
    - Dropped support for Image and Other file type
    - Use new splash screen features

MANUAL TESTING:
New features are still not covered by Autopilot tests. Before approving the MP, we need to manually execute some tests:

    - Check if all the documents in HOME/Documents are shown in DocumentPage (NOTE: Only PDFs and file with mimetype=text/* are supported)

    - Import content to the Document Viewer (browser-app and filemanager-app surely work, Dekko should also work)

    - Export content to 3rd party applications (e.g. PdfjsViewer)

    - Remove a document from user's Documents folder (tap-and-hold the list item, so the view switches to the selection mode).
      Two conditions should be satisfied: the document should be deleted from user's Documents folder and the view should not display "undefined" entries).

    - Add some document in the user's Documents folder while the application is running.
      Two conditions should be satisfied: new documents should be listed in the view, and no "undefined" entries are displayed.

    - Importing/exporting tests should be done with both the application running and closed.

    - Check if the DocumentPage correctly switches between the three states of the page: default, selectionMode, pickerMode.

    - Empty state: When Documents folder is empty, an empty state should be shown on the screen.

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

FAILED: Continuous integration, rev:88
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/173/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2139
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/76

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

review: Needs Fixing (continuous-integration)

[Stefano Verzegnassi (verzegnassi-stefano)]

Ok, got the issue.
In docviewer-application.cpp[1] we use the old code used to find out where the main qml file is located (from line 138).
Since in main.cpp[2] we set the ApplicationName (com.ubuntu.docviewer), the app looks for the qml file in the wrong folder:

"/usr/share/com.ubuntu.docviewer/qml/ubuntu-docviewer-app.qml"
instead of
"/usr/share/ubuntu-docviewer-app/qml/ubuntu-docviewer-app.qml"

I will fix it lately this night.

[1]: http://bazaar.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/document-hub2/view/head:/src/app/docviewer-application.cpp
[2]: http://bazaar.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/document-hub2/view/head:/src/app/main.cpp

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/document-hub2]

89. By Stefano Verzegnassi on 2015-02-27

Terribly bad-designed workaround for looking QML files path up in QStandardPaths::DataLocations

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

PASSED: Continuous integration, rev:89
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/174/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2151
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/71
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/77

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Not sure what I did wrong, but I built this with qtc and installed on my device and get this:-

File: qml/ubuntu-docviewer-app.qml does not exist at any of the standard paths!

Tried on vivid flo and rtm (utopic) krillin.

[Stefano Verzegnassi (verzegnassi-stefano)]

Definitely my fault! The "terribly bad-designed workaround" is really terribly bad-designed...

The folders used in debian packaging are different than the ones of the click package.
Should change the debian rules, so app files are installed in /usr/share/com.ubuntu.docviewer

I'll solve it ASAP!

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/document-hub2]

90. By Stefano Verzegnassi on 2015-02-27

Fixed revision 89

[Stefano Verzegnassi (verzegnassi-stefano)]

Ok, fixed my stupid mistake :-)
Tested on both desktop (14.10) and hammerhead (rtm)

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

PASSED: Continuous integration, rev:90
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/176/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2170
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/73
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/79

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

A few comments.

* Really like that documents just appear when I copy them into ~/Documents. Also like that deleting them removes them from disk. This helps with managing disk space! Nice one!

* If we only look in ~/Documents then it doesn't find files on my SD card which are in /media/phablet/2541-1C26/Documents - and as we no longer have the "+" button in the toolbar, I can't add them to the list using file manager.

* Long press to delete brings buttons in the toolbar which are not right-aligned. There is a gap (I assume where the list/grid toggle button was) in the toolbar. I think the buttons should appear on the right. http://people.canonical.com/~alan/screenshots/device-2015-02-28-155804.png

* Long press to delete is not easily discovered and doesn't match the rest of the platform which uses swipe right to delete (see music / contacts / alarms etc). Can we have long press for multi-select delete _and_ swipe right for single document delete?

[Stefano Verzegnassi (verzegnassi-stefano)]

> A few comments.
>
> * Really like that documents just appear when I copy them into ~/Documents.
> Also like that deleting them removes them from disk. This helps with managing
> disk space! Nice one!

Glad you like it!

> * If we only look in ~/Documents then it doesn't find files on my SD card
> which are in /media/phablet/2541-1C26/Documents - and as we no longer have the
> "+" button in the toolbar, I can't add them to the list using file manager.

Well, you can open files from the file manager itself: Document Viewer will be shown in the list of the available destinations for the trasfer, and a local copy will be created in ~/Documents.
ATM I prefer not to support external storages, since this MP is already huge for testing, and I still need to find out the best solution for being notified of changes in the list of removable medias.

> * Long press to delete brings buttons in the toolbar which are not right-
> aligned. There is a gap (I assume where the list/grid toggle button was) in
> the toolbar. I think the buttons should appear on the right.
> http://people.canonical.com/~alan/screenshots/device-2015-02-28-155804.png

I saw it some time ago. It seemed to me that it was unpredictable, and doesn't happen any time the headerState switches.
Sure I'll try to fix it.

> * Long press to delete is not easily discovered and doesn't match the rest of
> the platform which uses swipe right to delete (see music / contacts / alarms
> etc). Can we have long press for multi-select delete _and_ swipe right for
> single document delete?

Design reasons. I've already added a comment in the code in order to remember that I have to activate the swipe-to-delete gesture.
Sure we can have it, but I need to find equivalent action for the delegate in the grid view mode.
I'm open to any suggestions. :)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Ok, it's good for me then.

review: Approve

[Riccardo Padovani (rpadovani)]

I read the first 5000 lines of diff, and I left some comments.

Later I'll finish the diff, and then I'll test the app. Maybe I'll do another code review because it's huge

review: Needs Fixing (code)

[Riccardo Padovani (rpadovani)]

There is a problem with file importing.
You do a check to check if already exists a file with the same name. If there is, then you import the file adding a numb at the end of the name.

if(QFile::exists(destination))

But I think you should add another check: if the new file it's the same you already imported, then don't import it.

I think the best way to achieve this check is to use md5 function.

http://doc.qt.io/qt-5/qml-qtqml-qt.html#md5-method

[Riccardo Padovani (rpadovani)]

Last 2403 lines of diff (rev 90).
Unfortunately they aren't here on Launchpad. So I locally merged this branch in the trunk, then I used qdiff, I report here interesting pieces:

src/app/qml/pdfView/PdfViewGotoDialog.qml
+ Button {
+ objectName:"GOButton"
+ text: i18n.tr("GO!")
+ color: UbuntuColors.orange

Orange isn't anymore suggested by design guidelines[0]. I suggest to use green or gray

###
src/app/qml/textView/TextView.qml

Why do you use a TextArea with readOnly: true and not a Label?

###
src/app/quick/documentmodel.cpp

Could you please explain what are you trying to achieve with DocumentModel::_q_directoryChanged?
Seems improvable, but I'm not sure I understand how you want to use it

DocumentModel::parseDirectoryContent
item.dateDiff = 0;
Probably is better to add a ENUM for this

Great work Stefano, congrats!

All issues I pointed out are minor, and the improvement is huge :-)

I'm going to test it

[0]https://design.ubuntu.com/apps/building-blocks/buttons

review: Needs Fixing (code)

[Riccardo Padovani (rpadovani)]

Mhh, I tried to launch it on vivid desktop 64bit.

It compiles like a charm, but then the app doesn't start, both via CLI and via QtCreator.
It is stucked on

./src/app/ubuntu-docviewer-app
APP_ID isn't set, the handler can not be registered

I have all packages reported by the README.

What am I doing wrong?

[Stefano Verzegnassi (verzegnassi-stefano)]

Riccardo, there's also the “debug” policy issue that you spotted this morning.
Dunno why it's there, but I shall fix it before the branch is merged.

Sorry if I reply to the inline comments here, but it's for my brain sanity when I will fix them. :-)

> Line 734: QString filenameWithoutSuffix = filename.left(filename.size() - suffix.size());
It comes from gallery-app

> Line 740: filenameWithoutSuffix += ".";
Same as above.

> Line 757:
My fault here.

> Line 806: \brief ContentCommunicator::returnPhoto returns the given photos
Yes, it is. Forgot to change it (I did it the first time, but I lost the code) :P

> Line 849: return m_transfer->selectionType() == Transfer::SelectionType::single;
TBH dunno, it's the same in the upstream code (gallery-app). I need to check.

> Line 983: bool ok = m_cmdLineParser->processArguments(arguments());
Nice question! Why I did it? Need to fix! :-)

> Line 1069: m_view->setTitle("Document Viewer");
Sure! (Even if the string is replaced by QML Page title)

> Line 1706: QcoreApplication::setOrganizationDomain("com.ubuntu.docviewer");
Huh, I think I choose the wrong hint from QtCreator. :P

> Line 3558:
Yes, I agree with you! This dialog is part of the earlier code of the docviewer (before I adopted the project).
I didn't spent much time on it, but surely it's something I'd like to improve!

> Line 3690:
You're right!

> Line 3695:
As I told to Filippo some time ago, I followed the code style guidelines that has been chosen for the Core Apps project.
Probably it's too much orthodox as implementation.

> Line 3753: viewLoader.item.endSelection();
You're right again!

>Line 3783: not sure which line do you mean?
>> If (import "../upstreamComponents”)
The EmptyState item lives in ../upstreamComponents
>> If you mean the Item that contains the EmptyState, it's because of the alignment inside a QML Loader.

> Line 3837, 3840, 3843, 3845:
Again, you're right about translations!

> Line 3936:
Oops, I think there's another label earlier and I forgot to remove the RowLayout.

> Line 3937, 4107:
I will fix it!

> Line 4110:
Haha

> Line 4325:
Yep! Will fix it!

> Line 4442:
No reason!

> Line 4510:
Nope! As in gallery-app, the button is not enabled but still visible, to advice that the content transfer could not be done if no item has been selected.
IMHO it should be shown in any case.

> Line 4625:
Could be. Need to try.

> Line 4782:
IMHO “Page %1 of %2” in a docviewer is pretty unequivocal. Anyway, adding an hint for translators it's surely not a problem!

> There is a problem with file importing.
> You do a check to check if already exists a file with the same name. If there is, then > you import the file adding a numb at the end of the name.
> if(QFile:
> But I think you should add another check: if the new file it's the same you already > > imported, then don't import it.
> I think the best way to achieve this check is to use md5 function.
Again, same issue is in the gallery-app.

>src/app/qml/pdfView/PdfViewGotoDialog.qml
>+ Button {
>+ objectName:
>+ text: i18n.tr("GO!")
>+ color: UbuntuColors.orange
>Orange isn't anymore suggested by design guidelines[0]. I suggest to use green or gray
No problem, I'll change ...

[Riccardo Padovani (rpadovani)]

> Sorry if I reply to the inline comments here, but it's for my brain sanity
> when I will fix them. :-)

I completely understand :D

> >Line 3783: not sure which line do you mean?
> >> If (import "../upstreamComponents”)
> The EmptyState item lives in ../upstreamComponents

Oh, right, my fault here!

> > Line 4510:
> Nope! As in gallery-app, the button is not enabled but still visible, to
> advice that the content transfer could not be done if no item has been
> selected.
> IMHO it should be shown in any case.

You have a point here, I agree with you

> >src/app/qml/textView/TextView.qml
> >Why do you use a TextArea with readOnly: true and not a Label?
> Copy and paste! Even if the TextArea is read-only, they are still useful.

Aha, right! Didn't think about it, sorry

> > src/app/quick/documentMode.cpp
> > Could you please explain what are you trying to achieve with DocumentModel:
> > Seems improvable, but I'm not sure I understand how you want to use it
> When there's a change in the directory we're watching (e.g. document added or
> removed), we want to update the model according to the changes:
> The code in that slot just removes all the entries from that directory and re-
> parse its content.
> The two ints, n and m, are used to keep a note of the number of removed items,
> so that we can exactly remove the rows from the model (by doing so we avoid to
> have duplicated undefined rows).

Oh, I see, makes sense.
I think could be improvable, but atm works well, so it's ok

> About the ENUM, I will do in a next MP. At the moment it works, but I have no
> resources (most of all, time) for staying in-sync with the tasks I still need
> to do for the docviewer.
> The same observation is also valid for the issues you reported that are
> related to the gallery-app.

I fully understand that, there are simply too much work to do :-)

> For all the rest I will provide a fix hopefully today (max. tomorrow).

Ok, I'll do another quick review after then I'll approve it, thanks!

> Thank you Riccardo for the huge review.

Thanks to you for the amazing work!

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/document-hub2]

91. By Stefano Verzegnassi on 2015-03-03

Remove 'debug' policy from apparmor profile

92. By Stefano Verzegnassi on 2015-03-03

Fixes for the minor issues found in the last review

[Stefano Verzegnassi (verzegnassi-stefano)]

Just a note for Riccardo, when he will review the latest changes:
 * I've added some comment in the code for the things I didn't fix yet (e.g. issues related to the gallery-app).
 * Please double check translation changes (e.g. i18n.tr("dd MM yyyy, hh:mm"), since I'm not completely sure if I did it right)

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

FAILED: Continuous integration, rev:92
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/177/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2211
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2211/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/74
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/80

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

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

Now code looks good to me.

There are some FIXME, but they don't cause any error, they are only minor code refactoring you can do in a second moment.

Since this branch has a lot of improvements, I think is good enough to land, I'm sure you will do other branches for little fixes :-)

As we discussed yesterday, I'm not able to launch it on vivid desktop, but could be a my problem.
Anyway, I wasn't able to review the UI/UX. Code is good, but I leave to popey the top approving :-)

review: Approve (code)

[Stefano Verzegnassi (verzegnassi-stefano)]

Changing:
    QCoreApplication::setOrganizationDomain("com.ubuntu.docviewer")
to:
    QCoreApplication::setOrganizationName("com.ubuntu.docviewer")

makes the app look for the main QML file in the wrong path, since DataLocation is built as "/usr/share/<APPNAME>", where <APPNAME> (according to Qt docs) "is usually the organization name, the application name, or both, or a unique name generated at packaging."

In this case, it is both[1].

[1] "/usr/local/share/com.ubuntu.docviewer/com.ubuntu.docviewer/qml/ubuntu-docviewer-app.qml"

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/document-hub2]

93. By Stefano Verzegnassi on 2015-03-03

Revert 'setOrganizationName' change

[Stefano Verzegnassi (verzegnassi-stefano)]

I reverted to 'QCoreApplication::setOrganizationDomain".

Here's the reason of my choice: the code has been on testing for a few weeks, and even if the line was wrong, it used to work with no issue both on desktop and on devices.
Since I have no UT device at the moment - my brand new (a.k.a. "refurbished") hammerhead has been shipped today - I can't properly test if any further change will cause some regression.

Content-hub used to work, as all the rest of the application did.
Because of this, I assume that everything is ok for a release.

I should get my new Nexus 5 in max. 2-3 days: when it will happen, I'll be able to fix this part of the code.

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

PASSED: Continuous integration, rev:93
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/178/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2212
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/75
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/81

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Seems launching a pdf from another application via content hub broke.

* Open browser
* Search for pdf + weather
* Click a random pdf file
* Content hub popup, select docviewer
* Wait for download
* Wait for popup, choose 'Open'
* Docviewer launches, but document list is shown, the document doesn't load.

review: Needs Fixing

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I didn't realise this was an intentional design decision based on what the gallery uses.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-29 16:35:28 +0000
+++ CMakeLists.txt	2015-03-03 16:49:59 +0000
@@ -23,7 +23,7 @@
 
 set(APP_NAME ubuntu-docviewer-app)
 set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
-#set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
+set(URLS_FILE "${PROJECT_NAME}.url-dispatcher")
 set(LP_PROJECT ubuntu-docviewer-app)
 set(ICON_FILE [e-mail])
 set(AUTOPILOT_DIR ubuntu_docviewer_app)
@@ -67,7 +67,7 @@
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
     configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor docviewer-content.json
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor docviewer-content.json ${URLS_FILE}
             DESTINATION ${CMAKE_INSTALL_PREFIX})
     # Make the click files visible in Qt Creator
     file(GLOB CLICK_FILES

=== modified file 'com.ubuntu.docviewer.desktop.in.in'
--- com.ubuntu.docviewer.desktop.in.in	2014-09-24 05:06:10 +0000
+++ com.ubuntu.docviewer.desktop.in.in	2015-03-03 16:49:59 +0000
@@ -6,6 +6,8 @@
 Icon=@ICON@
 _Name=Document Viewer
 _Keywords=documents;viewer;pdf;reader;
-MimeType=text/plain;image/png;image/jpeg;image/svg+xml;application/pdf
+MimeType=text/plain;application/pdf
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
+X-Ubuntu-Splash-Show-Header=true
+_X-Ubuntu-Splash-Title=Document Viewer

=== added file 'com.ubuntu.docviewer.url-dispatcher'
--- com.ubuntu.docviewer.url-dispatcher	1970-01-01 00:00:00 +0000
+++ com.ubuntu.docviewer.url-dispatcher	2015-03-03 16:49:59 +0000
@@ -0,0 +1,5 @@
+[
+    {
+        "protocol": "document"
+    }
+]

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-04 19:30:22 +0000
+++ debian/changelog	2015-03-03 16:49:59 +0000
@@ -1,14 +1,24 @@
+ubuntu-docviewer-app (0.3.0) utopic; urgency=medium
+
+  * Improved content-hub support
+  * Added uri handler support
+  * Use the Unity 8 splash screen
+  * In-app browser for files stored in XDG Documents folder
+  * Support for images has been dropped
+
+ -- Stefano Verzegnassi <[e-mail]>  Mon, 23 Feb 2015 13:41:47 +0100
+
 ubuntu-docviewer-app (0.2.1) utopic; urgency=medium
 
   * Added Table of Content in the PDF viewer
 
- -- Stefano <[e-mail]>  Wed, 04 Feb 2015 20:26:58 +0100
+ -- Stefano Verzegnassi <[e-mail]>  Wed, 04 Feb 2015 20:26:58 +0100
 
 ubuntu-docviewer-app (0.2.0) utopic; urgency=medium
 
   * Enabled zoom in the PDF viewer
 
- -- Stefano <[e-mail]>  Wed, 04 Feb 2015 14:37:54 +0100
+ -- Stefano Verzegnassi <[e-mail]>  Wed, 04 Feb 2015 14:37:54 +0100
 
 ubuntu-docviewer-app (0.1.2) UNRELEASED; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2015-02-04 16:08:33 +0000
+++ debian/control	2015-03-03 16:49:59 +0000
@@ -4,6 +4,7 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                intltool,
+               libcontent-hub-dev (>= 0.0+13.10.20130930.1),
                libpoppler-qt5-dev,
                pep8,
                pkg-config,
@@ -27,7 +28,6 @@
 Architecture: any
 Depends: qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
-         qtdeclarative5-ubuntu-content1,
          ${misc:Depends}
 Description: Document Viewer application
  Core Document Viewer application

=== modified file 'docviewer-content.json'
--- docviewer-content.json	2014-10-31 16:25:17 +0000
+++ docviewer-content.json	2015-03-03 16:49:59 +0000
@@ -1,7 +1,8 @@
 {
     "destination": [
-        "pictures",
-        "documents",
-        "unknown"
+        "documents"
+    ],
+    "source": [
+        "documents"
     ]
 }

=== modified file 'docviewer.apparmor'
--- docviewer.apparmor	2014-10-31 16:25:17 +0000
+++ docviewer.apparmor	2015-03-03 16:49:59 +0000
@@ -1,6 +1,13 @@
 {
     "policy_groups": [
+        "content_exchange_source",
         "content_exchange"
     ],
+    "read_path": [
+        "@{HOME}/Documents/"
+    ],
+    "write_path": [
+        "@{HOME}/Documents/"
+    ],
     "policy_version": 1.2
 }

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-02-04 19:30:22 +0000
+++ manifest.json.in	2015-03-03 16:49:59 +0000
@@ -9,10 +9,11 @@
         "docviewer": {
             "apparmor": "docviewer.apparmor",
             "desktop": "com.ubuntu.docviewer.desktop",
-        "content-hub": "docviewer-content.json"
+            "content-hub": "docviewer-content.json",
+            "urls": "@URLS_FILE@"
         }
     },
-    "version": "0.2.1.@BZR_REVNO@",
+    "version": "0.3.@BZR_REVNO@",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-02-05 19:30:53 +0000
+++ po/com.ubuntu.docviewer.pot	2015-03-03 16:49:59 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-05 20:29+0100\n"
+"POT-Creation-Date: 2015-03-03 17:49+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"
@@ -17,136 +17,206 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/app/qml/ContentHubPicker.qml:23
-msgid "Open with..."
-msgstr ""
-
-#: ../src/app/qml/ContentHubPicker.qml:27
-msgid "Documents"
-msgstr ""
-
-#: ../src/app/qml/ContentHubPicker.qml:27
-msgid "Pictures"
-msgstr ""
-
-#: ../src/app/qml/ContentHubPicker.qml:27
-msgid "Other"
-msgstr ""
-
-#: ../src/app/qml/ContentHubPicker.qml:30
-#: ../src/app/qml/ImageViewDefaultHeader.qml:53
-#: ../src/app/qml/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/TextViewDefaultHeader.qml:61
-msgid "Back"
-msgstr ""
-
-#: ../src/app/qml/DetailsPage.qml:27
-#: ../src/app/qml/ImageViewDefaultHeader.qml:69
-#: ../src/app/qml/PdfViewDefaultHeader.qml:91
-#: ../src/app/qml/TextViewDefaultHeader.qml:77
+#: ../src/app/qml/common/DetailsPage.qml:27
+#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:91
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:77
 msgid "Details"
 msgstr ""
 
-#: ../src/app/qml/DetailsPage.qml:33
+#: ../src/app/qml/common/DetailsPage.qml:33
 msgid "Location"
 msgstr ""
 
-#: ../src/app/qml/DetailsPage.qml:37
+#: ../src/app/qml/common/DetailsPage.qml:37
 msgid "Size"
 msgstr ""
 
-#: ../src/app/qml/DetailsPage.qml:42
+#: ../src/app/qml/common/DetailsPage.qml:42
 msgid "Created"
 msgstr ""
 
-#: ../src/app/qml/DetailsPage.qml:47
+#: ../src/app/qml/common/DetailsPage.qml:47
 msgid "Last modified"
 msgstr ""
 
-#: ../src/app/qml/DetailsPage.qml:54
+#: ../src/app/qml/common/DetailsPage.qml:54
 msgid "MIME type"
 msgstr ""
 
-#: ../src/app/qml/ErrorDialog.qml:23
+#: ../src/app/qml/common/ErrorDialog.qml:24
 msgid "Error"
 msgstr ""
 
-#: ../src/app/qml/ErrorDialog.qml:24
+#: ../src/app/qml/common/ErrorDialog.qml:25
 msgid "File does not exist"
 msgstr ""
 
-#: ../src/app/qml/ErrorDialog.qml:27
-#: ../src/app/qml/ImageViewDefaultHeader.qml:53
-#: ../src/app/qml/PdfViewDefaultHeader.qml:61
-#: ../src/app/qml/TextViewDefaultHeader.qml:61
+#: ../src/app/qml/common/ErrorDialog.qml:28
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
+#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
 msgid "Close"
 msgstr ""
 
-#: ../src/app/qml/PdfContentsPage.qml:24 ../src/app/qml/PdfView.qml:33
+#: ../src/app/qml/common/UnknownTypeDialog.qml:26
+msgid "Unknown file type"
+msgstr ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+msgid ""
+"Sorry but we can't find a way to display this file. Do you want to open it "
+"as a plain text?"
+msgstr ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:29
+msgid "Yes"
+msgstr ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+msgid "No"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:27
+msgid "Delete file"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28
+#, qt-format
+msgid "Delete %1 files"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29
+msgid "Are you sure you want to permanently delete this file?"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30
+msgid "Are you sure you want to permanently delete these files?"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:33
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52
+msgid "Cancel"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:81
+msgid "Delete"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
+msgid "No document found"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
+msgid ""
+"Connect your device to any computer and simply drag files to the Documents "
+"folder."
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:33
+msgid "Today, "
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:36
+msgid "Yesterday, "
+msgstr ""
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:41
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:35
+msgid "dddd, hh:mm"
+msgstr ""
+
+#. TRANSLATORS: this is a datetime formatting string,
+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:39
+msgid "dd-MM-yyyy hh:mm"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentListView.qml:135
+msgid "Today"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentListView.qml:138
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentListView.qml:141
+msgid "Earlier this week"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentListView.qml:144
+msgid "Earlier this month"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentListView.qml:146
+msgid "Even more earlier..."
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPage.qml:25
+#: /home/stefano/Progetti/doc-viewer/build-document-hub2-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+msgid "Switch to single column list"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:28
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:35
+msgid "Switch to grid"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:43
+msgid "Pick"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:51
+msgid "Select None"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
+msgid "Select All"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:24
+#: ../src/app/qml/pdfView/PdfView.qml:36
 msgid "Contents"
 msgstr ""
 
-#: ../src/app/qml/PdfView.qml:31
+#. 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/PdfView.qml:34
 #, qt-format
 msgid "Page %1 of %2"
 msgstr ""
 
-#: ../src/app/qml/PdfViewGotoDialog.qml:25
+#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
+msgid "Back"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:25
 msgid "Go to page"
 msgstr ""
 
-#: ../src/app/qml/PdfViewGotoDialog.qml:26
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
 #, qt-format
 msgid "Choose a page between 1 and %1"
 msgstr ""
 
-#: ../src/app/qml/PdfViewGotoDialog.qml:44
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:44
 msgid "GO!"
 msgstr ""
 
-#: ../src/app/qml/PdfViewGotoDialog.qml:52
-msgid "Cancel"
-msgstr ""
-
-#: ../src/app/qml/TextView.qml:39
+#: ../src/app/qml/textView/TextView.qml:39
 msgid "Loading..."
 msgstr ""
 
-#: ../src/app/qml/UnknownTypeDialog.qml:26
-msgid "Unknown file type"
-msgstr ""
-
-#: ../src/app/qml/UnknownTypeDialog.qml:27
-msgid ""
-"Sorry but we can't find a way to display this file. Do you want to open it "
-"as a plain text?"
-msgstr ""
-
-#: ../src/app/qml/UnknownTypeDialog.qml:29
-msgid "Yes"
-msgstr ""
-
-#: ../src/app/qml/UnknownTypeDialog.qml:38
-msgid "No"
-msgstr ""
-
-#: ../src/app/qml/WelcomePage.qml:23
-#: /home/stefano/Progetti/doc-viewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr ""
-
-#: ../src/app/qml/WelcomePage.qml:27
-msgid "No opened documents"
-msgstr ""
-
-#: ../src/app/qml/WelcomePage.qml:28
-msgid "Tap the + icon to open a document"
-msgstr ""
-
-#: ../src/app/qml/WelcomePage.qml:37
-msgid "Open a file..."
-msgstr ""
-
-#: /home/stefano/Progetti/doc-viewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-document-hub2-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-10-21 13:23:11 +0000
+++ src/app/CMakeLists.txt	2015-03-03 16:49:59 +0000
@@ -1,13 +1,25 @@
 file(GLOB_RECURSE QML_SRCS *.qml *.js)
+file(GLOB_RECURSE IMAGE_FILES *.qml *.js)
+
+pkg_check_modules(CONTENTHUB REQUIRED libcontent-hub)
 
 set(docviewer_SRCS
     main.cpp
+    content-communicator.cpp
+    command-line-parser.cpp
+    docviewer-application.cpp
+    urlhandler.cpp
+    quick/documentmodel.cpp
     ${QML_SRCS}
 )
 
 add_executable(ubuntu-docviewer-app ${docviewer_SRCS})
 
-qt5_use_modules(ubuntu-docviewer-app Gui Qml Quick)
+qt5_use_modules(ubuntu-docviewer-app Widgets Gui Qml Quick DBus)
+
+target_link_libraries( ubuntu-docviewer-app
+    ${CONTENTHUB_LIBRARIES}
+)
 
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 add_custom_target(docviewer-qmlfiles ALL
@@ -16,7 +28,16 @@
 )
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+add_custom_target(docviewer-imagefiles ALL
+    COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/graphics ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${IMAGE_FILES}
+)
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
 install(DIRECTORY qml DESTINATION ${DATA_DIR})
+install(DIRECTORY graphics DESTINATION ${DATA_DIR})
+
 if(CLICK_MODE)
   install(TARGETS ubuntu-docviewer-app DESTINATION ${BIN_DIR})
 else()

=== added file 'src/app/command-line-parser.cpp'
--- src/app/command-line-parser.cpp	1970-01-01 00:00:00 +0000
+++ src/app/command-line-parser.cpp	2015-03-03 16:49:59 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Nicolas d'Offay <[e-mail]>
+ *
+ * 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 "command-line-parser.h"
+
+#include "urlhandler.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QStandardPaths>
+#include <QTextStream>
+#include <QUrl>
+
+CommandLineParser::CommandLineParser()
+    : m_pickMode(false),
+      m_testability(false),
+      m_documentFile("")
+{
+    m_urlHandler = new UrlHandler();
+}
+
+/*!
+ * @brief CommandLineParser::processArguments parsers our input commandline args and sets attributes accordingly.
+ * @param QStringList of commandline args to parse and set attributes.
+ * @return false if invalid parameter is input or -h/--help is called.
+ */
+bool CommandLineParser::processArguments(const QStringList& args)
+{
+    bool valid_args = true;
+
+    for (int i = 1; i < args.count(); ++i)
+    {
+        if (args[i] == "--help" || args[i] == "-h") {
+            usage();
+            return false;
+        }
+        else if (args[i] == "--pick-mode") {
+            m_pickMode = true;
+        }
+        else if (args[i] == "--testability") {
+            m_testability = true;
+        }
+        else {
+            if (args[i].startsWith("--desktop_file_hint")) {
+                // ignore this command line switch, hybris uses it to get application info
+            }
+            else if (!args.at(i).isEmpty()) {
+                QFileInfo fi(args.at(i));
+
+                if (fi.exists()) {
+                    m_documentFile = fi.absoluteFilePath();
+                }
+                else if (m_urlHandler->processUri(args.at(i))) {
+                    m_documentFile = m_urlHandler->documentFile();
+                }
+            }
+            else {
+                valid_args = !invalidArg(args[i]);
+            }
+        }
+    }
+
+    return valid_args;
+}
+
+/*!
+ * @brief CommandLineParser::usage() prints out our form factors.
+ */
+void CommandLineParser::usage()
+{
+    QTextStream out(stdout);
+    out << "Usage: ubuntu-docviewer-app [options] [file_path]" << endl;
+    out << "Options:" << endl;
+    out << "  --pick-mode\t\tEnable mode to pick photos" << endl;
+    out << "  file_path\t\tOpens ubuntu-docviewer-app displaying the selected file" << endl;
+}
+
+/*!
+ * @brief CommandLineParser::invalidArg() if an invalid argument is contained in our QStringList.
+ * @return returns true.
+ */
+bool CommandLineParser::invalidArg(QString arg)
+{
+    QTextStream(stderr) << "Invalid argument '" << arg << "'" << endl;
+    usage();
+
+    return true;
+}

=== added file 'src/app/command-line-parser.h'
--- src/app/command-line-parser.h	1970-01-01 00:00:00 +0000
+++ src/app/command-line-parser.h	2015-03-03 16:49:59 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Nicolas d'Offay <[e-mail]>
+ *
+ * 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 COMMANDLINEPARSER_H
+#define COMMANDLINEPARSER_H
+
+#include <QHash>
+#include <QSize>
+#include <QString>
+
+class UrlHandler;
+
+/*!
+ * @brief The CommandLineParser is used to parse our commandline inputs and set
+ * parameters accordingly.
+ */
+class CommandLineParser
+{
+public:
+    CommandLineParser();
+
+    bool processArguments(const QStringList& args);
+
+    bool pickModeEnabled() const { return m_pickMode; }
+    bool testability() const { return m_testability; }
+    const QString &documentFile() const { return m_documentFile; }
+
+private:
+    bool invalidArg(QString arg);
+    void usage();
+
+    UrlHandler *m_urlHandler;
+
+    bool m_pickMode;
+    bool m_testability;
+    QString m_documentFile;
+};
+
+#endif // COMMANDLINEPARSER_H

=== added file 'src/app/content-communicator.cpp'
--- src/app/content-communicator.cpp	1970-01-01 00:00:00 +0000
+++ src/app/content-communicator.cpp	2015-03-03 16:49:59 +0000
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2013 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/>.
+ *
+ */
+
+#include "content-communicator.h"
+
+#include <QApplication>
+#include <QStandardPaths>
+#include <QMimeDatabase>
+#include <QDebug>
+#include <QFileInfo>
+
+#include <com/ubuntu/content/hub.h>
+#include <com/ubuntu/content/item.h>
+#include <com/ubuntu/content/transfer.h>
+
+
+using namespace com::ubuntu::content;
+
+/*!
+ * \brief ContentCommunicator::ContentCommunicator
+ * \param parent
+ */
+ContentCommunicator::ContentCommunicator(QObject *parent)
+    : ImportExportHandler(parent),
+      m_transfer(nullptr)
+{
+}
+
+/*!
+ * \brief ContentCommunicator::registerWithHub Register the handlers provided
+ * by ContentCommunicator with the content hub
+ */
+void ContentCommunicator::registerWithHub()
+{
+    Hub *hub = Hub::Client::instance();
+    hub->register_import_export_handler(this);
+}
+
+/*!
+ * \brief \reimp
+ */
+void ContentCommunicator::handle_import(content::Transfer *transfer)
+{
+    // FIXME: If a file is imported from $HOME/Documents, a new copy of the file is created.
+    //   Could be use md5? http://doc.qt.io/qt-5/qml-qtqml-qt.html#md5-method
+    // FIXME: If there already a file called "filename.1.ext", the imported file won't be renamed as "filename.2.ext", but "filename.1.1.ext".
+    //  (This issue is in gallery-app too.)
+
+    QVector<Item> transferedItems = transfer->collect();
+    foreach (const Item &hubItem, transferedItems) {
+        QFileInfo fi(hubItem.url().toLocalFile());
+        QString filename = fi.fileName();
+        QString dir;
+        QMimeDatabase mdb;
+        QMimeType mt = mdb.mimeTypeForFile(hubItem.url().toLocalFile());
+        QString suffix = fi.completeSuffix();
+        // FIXME: Should we use fi.baseName()?
+        QString filenameWithoutSuffix = filename.left(filename.size() - suffix.size());
+        if(suffix.isEmpty()) {
+            // If the filename doesn't have an extension add one from the
+            // detected mimetype
+            if(!mt.preferredSuffix().isEmpty()) {
+                suffix = mt.preferredSuffix();
+                filenameWithoutSuffix += ".";
+            }
+        }
+        dir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + QDir::separator();
+
+        QString destination = QString("%1%2").arg(dir + filenameWithoutSuffix, suffix);
+        // If we already have a file of this name reformat to "filename.x.png"
+        // (where x is a number, incremented until we find an available filename)
+        if(QFile::exists(destination)) {
+            int append = 1;
+            do {
+                destination = QString("%1%2.%3").arg(dir + filenameWithoutSuffix, QString::number(append), suffix);
+                append++;
+            } while(QFile::exists(destination));
+        }
+        QFile::copy(hubItem.url().toLocalFile(), destination);
+    }
+
+    // Allow content-hub to clean up temporary files in .cache/ once we've
+    // moved them
+    transfer->finalize();
+
+    emit documentImported();
+}
+
+/*!
+ * \brief \reimp
+ */
+void ContentCommunicator::handle_export(content::Transfer *transfer)
+{
+    if (m_transfer != nullptr) {
+        qWarning() << "docviewer-app does only one content export at a time";
+        transfer->abort();
+        return;
+    }
+
+    m_transfer = transfer;
+    emit documentRequested();
+    emit selectionTypeChanged();
+    emit singleContentPickModeChanged();
+}
+
+/*!
+ * \brief \reimp
+ */
+void ContentCommunicator::handle_share(content::Transfer *)
+{
+    qDebug() << Q_FUNC_INFO << "docviewer does not share content";
+}
+
+/*!
+ * \brief ContentCommunicator::cancelTransfer aborts the current transfer
+ */
+void ContentCommunicator::cancelTransfer()
+{
+    if (!m_transfer) {
+        qWarning() << "No ongoing transfer to cancel";
+        return;
+    }
+
+    m_transfer->abort();
+    m_transfer = nullptr;
+}
+
+/*!
+ * \brief ContentCommunicator::returnSocuments returns the given documents
+ * via content hub to the requester
+ * \param urls
+ */
+void ContentCommunicator::returnDocuments(const QVector<QUrl> &urls)
+{
+    if (!m_transfer) {
+        qWarning() << "No ongoing transfer to return a document";
+        return;
+    }
+
+    QVector<Item> items;
+    items.reserve(urls.size());
+    foreach (const QUrl &url, urls) {
+        items.append(Item(url));
+    }
+
+    m_transfer->charge(items);
+    m_transfer = nullptr;
+}
+
+/*!
+ * \brief ContentCommunicator::selectionType return if the transfer requests
+ * one single item only, or multiple
+ * \return
+ */
+ContentCommunicator::SelectionType ContentCommunicator::selectionType() const
+{
+    if (!m_transfer)
+        return SingleSelect;
+
+    return static_cast<SelectionType>(m_transfer->selectionType());
+}
+
+/*!
+ * \brief ContentCommunicator::singleContentPickMode
+ * \return
+ */
+bool ContentCommunicator::singleContentPickMode() const
+{
+    if (!m_transfer)
+        return true;
+
+    // FIXME: Shouldn't be Transfer::SelectionType::SingleSelect?
+    return m_transfer->selectionType() == Transfer::SelectionType::single;
+}

=== added file 'src/app/content-communicator.h'
--- src/app/content-communicator.h	1970-01-01 00:00:00 +0000
+++ src/app/content-communicator.h	2015-03-03 16:49:59 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013 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/>.
+ *
+ */
+
+#ifndef CONTENTCOMMUNICATOR_H
+#define CONTENTCOMMUNICATOR_H
+
+#include <com/ubuntu/content/import_export_handler.h>
+#include <com/ubuntu/content/transfer.h>
+
+#include <QUrl>
+#include <QVector>
+
+using namespace com::ubuntu;
+
+/*!
+ * Class to handle the communication with the content manager
+ */
+class ContentCommunicator : public content::ImportExportHandler
+{
+    Q_OBJECT
+    Q_PROPERTY(bool singleContentPickMode READ singleContentPickMode NOTIFY singleContentPickModeChanged)
+    Q_PROPERTY(SelectionType selectionType READ selectionType NOTIFY selectionTypeChanged)
+    Q_ENUMS(SelectionType)
+
+public:
+    enum SelectionType {
+        SingleSelect = content::Transfer::single,
+        MultiSelect = content::Transfer::multiple
+    };
+
+    ContentCommunicator(QObject *parent = nullptr);
+
+    virtual void handle_import(content::Transfer*);
+    virtual void handle_export(content::Transfer *transfer);
+    virtual void handle_share(content::Transfer*);
+
+    void cancelTransfer();
+    void returnDocuments(const QVector<QUrl> &urls);
+
+    SelectionType selectionType() const;
+    bool singleContentPickMode() const;
+
+    void registerWithHub();
+
+signals:
+    void documentRequested();
+    void documentImported();
+    void selectionTypeChanged();
+    void singleContentPickModeChanged();
+
+private:
+    content::Transfer *m_transfer;
+};
+
+#endif // CONTENTCOMMUNICATOR_H

=== added file 'src/app/docviewer-application.cpp'
--- src/app/docviewer-application.cpp	1970-01-01 00:00:00 +0000
+++ src/app/docviewer-application.cpp	2015-03-03 16:49:59 +0000
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2012 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 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/>.
+ *
+ * Authors:
+ * Charles Lindsay <[e-mail]>
+ */
+
+#include "docviewer-application.h"
+#include "content-communicator.h"
+#include "command-line-parser.h"
+#include "urlhandler.h"
+#include "quick/documentmodel.h"
+
+#include <QQuickItem>
+#include <QStandardPaths>
+#include <QQuickView>
+#include <QtQml/QtQml>
+#include <QString>
+#include <QUrl>
+#include <QtGui/QGuiApplication>
+
+/*!
+ * \brief DocViewerApplication::DocViewerApplication
+ * \param argc
+ * \param argv
+ */
+DocViewerApplication::DocViewerApplication(int& argc, char** argv)
+    : QApplication(argc, argv),
+      m_view(new QQuickView()),
+      m_contentCommunicator(new ContentCommunicator(this)),
+      m_pickModeEnabled(false),
+      m_defaultUiMode(BrowseContentMode),
+      m_documentFile(""),
+      m_documentLoaded(false)
+{
+   //
+}
+
+bool DocViewerApplication::init()
+{
+    m_cmdLineParser = new CommandLineParser();
+
+    if (!m_cmdLineParser->processArguments(arguments()))
+        return false;
+
+    if (qgetenv("QT_LOAD_TESTABILITY") == "1" || m_cmdLineParser->testability()) {
+        QLibrary testLib(QLatin1String("qttestability"));
+        if (testLib.load()) {
+            typedef void (*TasInitialize)(void);
+            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
+            if (initFunction) {
+                initFunction();
+            } else {
+                qCritical("Library qttestability resolve failed!");
+            }
+        } else {
+            qCritical("Library qttestability load failed!");
+        }
+    }
+
+    m_urlHandler = new UrlHandler();
+
+    registerQML();
+
+    if (m_cmdLineParser->pickModeEnabled())
+        setDefaultUiMode(DocViewerApplication::PickContentMode);
+
+    QObject::connect(m_contentCommunicator, SIGNAL(documentRequested()),
+                     this, SLOT(switchToPickMode()));
+
+    QObject::connect(m_contentCommunicator, SIGNAL(documentImported()),
+                     this, SLOT(switchToBrowseMode()));
+
+    return true;
+}
+
+/*!
+ * \brief DocViewerApplication::~DocViewerApplication
+ */
+DocViewerApplication::~DocViewerApplication()
+{
+    delete m_view;
+    delete m_cmdLineParser;
+}
+
+/*!
+ * \brief DocViewerApplication::exec
+ * \return
+ */
+int DocViewerApplication::exec()
+{
+    createView();
+
+    return QApplication::exec();
+}
+
+/*!
+ * \brief DocViewerApplication::registerQML
+ */
+void DocViewerApplication::registerQML()
+{
+    // Set up import paths
+    QStringList importPathList = m_view->engine()->importPathList();
+    // Prepend the location of the plugin in the build dir,
+    // so that Qt Creator finds it there, thus overriding the one installed
+    // in the sistem if there is one
+    importPathList.prepend(QCoreApplication::applicationDirPath() + "/../plugin/");
+    m_view->engine()->setImportPathList(importPathList);
+
+    qmlRegisterType<SortFilterDocumentModel>("DocumentViewer", 1, 0, "DocumentsModel");
+}
+
+/*!
+ * \brief DocViewerApplication::getDocumentFile
+ * Returns the document file passed as a parameter
+ */
+const QString& DocViewerApplication::getDocumentFile() const
+{
+    return m_documentFile;
+}
+
+/*!
+ * \brief DocViewerApplication::createView
+ * Create the master QDeclarativeView that all the pages will operate within
+ */
+void DocViewerApplication::createView()
+{
+    m_view->setTitle(tr("Document Viewer"));
+
+    // Set ourselves up to expose functionality to run external commands from QML...
+    m_view->engine()->rootContext()->setContextProperty("DOC_VIEWER", this);
+    m_view->engine()->rootContext()->setContextProperty("PICKER_HUB", m_contentCommunicator);
+
+    QObject::connect(m_view->engine(), SIGNAL(quit()), this, SLOT(quit()));
+
+    QString qmlfile;
+    const QString filePath = QLatin1String("qml/ubuntu-docviewer-app.qml");
+    QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
+    paths.prepend(QDir::currentPath());
+    paths.prepend(QCoreApplication::applicationDirPath());
+    Q_FOREACH (const QString &path, paths) {
+        QString myPath = path + QLatin1Char('/') + filePath;
+
+        if (QFile::exists(myPath)) {
+            qmlfile = myPath;
+            break;
+        } else {
+            myPath.replace(QCoreApplication::applicationName(), "ubuntu-docviewer-app");
+
+            if (QFile::exists(myPath)) {
+                qmlfile = myPath;
+                break;
+            }
+        }
+    }
+    // sanity check
+    if (qmlfile.isEmpty()) {
+        qFatal("File: %s does not exist at any of the standard paths!", qPrintable(filePath));
+    }
+
+    registerHub();
+    m_view->setSource(QUrl::fromLocalFile(qmlfile));
+    setDocumentFile(m_cmdLineParser->documentFile());
+
+    m_view->setResizeMode(QQuickView::SizeRootObjectToView);
+    m_view->show();
+}
+
+/*!
+ * \brief DocViewerApplication::setDefaultUiMode set the default UI mode. This might
+ * get overridden during the lifetime
+ * \param mode
+ */
+void DocViewerApplication::setDefaultUiMode(DocViewerApplication::UiMode mode)
+{
+    m_defaultUiMode = mode;
+    setUiMode(mode);
+}
+
+/*!
+ * \brief DocViewerApplication::setUiMode set's the current UI mode
+ * \param mode
+ */
+void DocViewerApplication::setUiMode(DocViewerApplication::UiMode mode)
+{
+    bool enablePickMode = (mode == PickContentMode);
+
+    if (enablePickMode != m_pickModeEnabled) {
+        m_pickModeEnabled = enablePickMode;
+        Q_EMIT pickModeEnabledChanged();
+    }
+}
+
+/*!
+ * \brief DocViewerApplication::pickModeEnabled returns true if the current UI
+ * mode should be for picking acontent
+ * \return
+ */
+bool DocViewerApplication::pickModeEnabled() const
+{
+    return m_pickModeEnabled;
+}
+
+/*!
+ * \brief DocViewerApplication::switchToPickMode
+ */
+void DocViewerApplication::switchToPickMode()
+{
+    setUiMode(PickContentMode);
+}
+
+/*!
+ * \brief DocViewerApplication::switchToBrowseMode
+ */
+void DocViewerApplication::switchToBrowseMode()
+{
+    Q_EMIT browseModeRequested();
+}
+
+void DocViewerApplication::setDocumentFile(const QString &documentFile)
+{
+    if(!documentFile.isEmpty()) {
+        if (m_documentFile != documentFile) {
+            m_documentFile = "file://" + documentFile;
+            Q_EMIT documentFileChanged();;
+        }
+    }
+}
+
+/*!
+ * \brief DocViewerApplication::returnPickedContent passes the selcted items to the
+ * content manager
+ * \param variant
+ */
+void DocViewerApplication::returnPickedContent(QList<QString> paths)
+{
+    QVector<QUrl> selectedMedias;
+    selectedMedias.reserve(paths.size());
+    foreach (const QString path, paths) {
+        // We handle paths without "file://" prefix, so we need to add it when exporting to content-hub.
+        selectedMedias.append(QUrl("file://" + path));
+    }
+    m_contentCommunicator->returnDocuments(selectedMedias);
+
+    if (m_defaultUiMode == BrowseContentMode) {
+        setUiMode(BrowseContentMode);
+    } else {
+        // give the app and content-hub some time to finish taks (run the event loop)
+        QTimer::singleShot(10, this, SLOT(quit()));
+    }
+}
+
+/*!
+ * \brief DocViewerApplication::contentPickingCanceled tell the content manager, that
+ * the picking was canceled
+ */
+void DocViewerApplication::contentPickingCanceled()
+{
+    m_contentCommunicator->cancelTransfer();
+
+    if (m_defaultUiMode == BrowseContentMode) {
+        setUiMode(BrowseContentMode);
+    } else {
+        // give the app and content-hub some time to finish taks (run the event loop)
+        QTimer::singleShot(10, this, SLOT(quit()));
+    }
+}
+
+void DocViewerApplication::registerHub()
+{
+    m_contentCommunicator->registerWithHub();
+}
+
+void DocViewerApplication::parseUri(const QString &arg)
+{
+    if (m_urlHandler->processUri(arg)) {
+        setDocumentFile(m_urlHandler->documentFile());
+    }
+}
+
+void DocViewerApplication::releaseResources()
+{
+    if (m_view) {
+        m_view->releaseResources();
+    }
+}

=== added file 'src/app/docviewer-application.h'
--- src/app/docviewer-application.h	1970-01-01 00:00:00 +0000
+++ src/app/docviewer-application.h	2015-03-03 16:49:59 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2012 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 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/>.
+ *
+ * Authors:
+ * Charles Lindsay <[e-mail]>
+ */
+
+#ifndef DOCVIEWERAPPLICATION_H
+#define DOCVIEWERAPPLICATION_H
+
+#include <QApplication>
+#include <QElapsedTimer>
+#include <QFileInfo>
+#include <QTimer>
+
+class CommandLineParser;
+class UrlHandler;
+class ContentCommunicator;
+
+class QQuickView;
+
+/*!
+ * \brief The DocViewerApplication class
+ */
+class DocViewerApplication : public QApplication
+{
+    Q_OBJECT
+    Q_PROPERTY(bool pickModeEnabled READ pickModeEnabled NOTIFY pickModeEnabledChanged)
+    Q_PROPERTY(QString documentFile READ getDocumentFile WRITE setDocumentFile NOTIFY documentFileChanged)
+
+public:
+    enum UiMode{
+        BrowseContentMode,
+        PickContentMode
+    };
+
+    explicit DocViewerApplication(int& argc, char** argv);
+    virtual ~DocViewerApplication();
+
+    bool init();
+    int exec();
+
+    void setDefaultUiMode(UiMode mode);
+    UiMode defaultUiMode() const;
+    void setUiMode(UiMode mode);
+    bool pickModeEnabled() const;
+    const QString &getDocumentFile() const;
+
+    Q_INVOKABLE void returnPickedContent(QList<QString> paths);
+    Q_INVOKABLE void contentPickingCanceled();
+    Q_INVOKABLE void parseUri(const QString &arg);
+    Q_INVOKABLE void releaseResources();
+
+signals:
+    void pickModeEnabledChanged();
+    void documentFileChanged();
+    void browseModeRequested();
+
+private slots:
+    void switchToPickMode();
+    void switchToBrowseMode();
+    void setDocumentFile(const QString &documentFile);
+
+private:
+    void registerHub();
+    void registerQML();
+    void createView();
+
+    QQuickView *m_view;
+    CommandLineParser* m_cmdLineParser;
+    UrlHandler *m_urlHandler;
+    ContentCommunicator *m_contentCommunicator;
+
+    bool m_pickModeEnabled;
+    UiMode m_defaultUiMode;
+    QString m_documentFile;
+    bool m_documentLoaded;
+};
+
+#endif // DOCVIEWERAPPLICATION_H

=== added directory 'src/app/graphics'
=== added file 'src/app/graphics/select-none.svg'
--- src/app/graphics/select-none.svg	1970-01-01 00:00:00 +0000
+++ src/app/graphics/select-none.svg	2015-03-03 16:49:59 +0000
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="select-none.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.434498"
+     inkscape:cx="10.237647"
+     inkscape:cy="53.078139"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1311"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         transform="matrix(0,-1,-1,0,567.36222,615.36221)"
+         id="g1311"
+         inkscape:export-filename="envelope02.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <g
+           id="g1313"
+           transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
+          <rect
+             transform="translate(0,804.3622)"
+             y="152"
+             x="288"
+             height="48"
+             width="48"
+             id="rect1315"
+             style="opacity:0.21171169;fill:none;stroke:none" />
+        </g>
+        <path
+           style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+           d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
+           transform="translate(174,135.36222)"
+           id="path4098" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/app/graphics/select.svg'
--- src/app/graphics/select.svg	1970-01-01 00:00:00 +0000
+++ src/app/graphics/select.svg	2015-03-03 16:49:59 +0000
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r12833"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="select.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.434498"
+     inkscape:cx="30.343002"
+     inkscape:cy="53.600878"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1311"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         transform="matrix(0,-1,-1,0,567.36222,615.36221)"
+         id="g1311"
+         inkscape:export-filename="envelope02.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <g
+           id="g1313"
+           transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
+          <rect
+             transform="translate(0,804.3622)"
+             y="152"
+             x="288"
+             height="48"
+             width="48"
+             id="rect1315"
+             style="opacity:0.21171169;fill:none;stroke:none" />
+        </g>
+        <path
+           style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+           d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
+           transform="translate(174,135.36222)"
+           id="path4098" />
+        <path
+           style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+           d="m 242.00422,161.6591 -0.375,0.32812 -26.94727,23.60352 -15.79687,-13.55079 -4.77539,5.4004 20.57617,21.64843 31.30078,-32.9375 -3.98242,-4.49218 z"
+           id="path4041-9"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2015-01-30 18:52:42 +0000
+++ src/app/main.cpp	2015-03-03 16:49:59 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright: 2013 - 2015 Canonical, Ltd
+ * Copyright: 2015 Canonical Ltd.
  *
  * This file is part of docviewer
  *
@@ -14,111 +14,23 @@
  * 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: Michael Zanetti <[e-mail]>
- *          Riccardo Padovani <[e-mail]>
- *          David Planella <[e-mail]>
- *          Stefano Verzegnassi <[e-mail]>
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  */
 
 // Uncomment if you need to use QML analyzer
 // #define QT_QML_DEBUG
 
-#include <QtGui/QGuiApplication>
-#include <QtQuick/QQuickView>
-#include <QtQml/QtQml>
-#include <QLibrary>
-#include <QDir>
-
+#include "docviewer-application.h"
 #include <QDebug>
 
 int main(int argc, char *argv[])
 {
-    QGuiApplication a(argc, argv);
-    QQuickView view;
-    view.setResizeMode(QQuickView::SizeRootObjectToView);
-
-    view.setPersistentOpenGLContext(false);
-    view.setPersistentSceneGraph(false);
-    view.engine()->rootContext()->setContextProperty("QQuickView", &view);
-
-    // Set up import paths
-    QStringList importPathList = view.engine()->importPathList();
-    // Prepend the location of the plugin in the build dir,
-    // so that Qt Creator finds it there, thus overriding the one installed
-    // in the sistem if there is one
-    importPathList.prepend(QCoreApplication::applicationDirPath() + "/../plugin/");
-
-    QStringList args = a.arguments();
-    if (args.contains("-h") || args.contains("--help")) {
-        qDebug() << "usage: " + args.at(0) + " [-h|--help] <path>";
-        qDebug() << "    -h|--help     Print this help.";
-        qDebug() << "    <path>        Path of the document to load.";
+    QCoreApplication::setApplicationName("com.ubuntu.docviewer");
+    QCoreApplication::setOrganizationDomain("com.ubuntu.docviewer");
+
+    DocViewerApplication app(argc, argv);
+    if (!app.init())
         return 0;
-    }
-
-    // Check if the path of the document has been specified.
-    QString docPath;
-    for (int i = 1; i < args.count(); i++) {
-        if (args.at(i) != "-h" && args.at(i) != "--h") {
-            docPath = args.at(i);
-        }
-    }
-    view.engine()->rootContext()->setContextProperty("documentPath", docPath);
-
-    if (args.contains(QLatin1String("-testability")) || getenv("QT_LOAD_TESTABILITY")) {
-        QLibrary testLib(QLatin1String("qttestability"));
-        if (testLib.load()) {
-            typedef void (*TasInitialize)(void);
-            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
-            if (initFunction) {
-                initFunction();
-            } else {
-                qCritical("Library qttestability resolve failed!");
-            }
-        } else {
-            qCritical("Library qttestability load failed!");
-        }
-    }
-
-    view.engine()->setImportPathList(importPathList);
-
-    QString qmlfile;
-    const QString filePath = QLatin1String("qml/ubuntu-docviewer-app.qml");
-    QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
-    paths.prepend(QDir::currentPath());
-    paths.prepend(QCoreApplication::applicationDirPath());
-    Q_FOREACH (const QString &path, paths) {
-        QString myPath = path + QLatin1Char('/') + filePath;
-        if (QFile::exists(myPath)) {
-            qmlfile = myPath;
-            break;
-        }
-    }
-    // sanity check
-    if (qmlfile.isEmpty()) {
-        qFatal("File: %s does not exist at any of the standard paths!", qPrintable(filePath));
-    }
-
-    // Make sure our cache dir exists. It'll be used all over in this app.
-    // We need to set the applicationName for that.
-    // It'll be overwritten again when qml loads but we need it already now.
-    // So if you want to change it, make sure to find all the places where it is set, not just here :D
-    QCoreApplication::setApplicationName("com.ubuntu.docviewer");
-
-    QDir cacheDir(QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first());
-    if (!cacheDir.exists()) {
-        qDebug() << "creating cacheDir:" << cacheDir.absolutePath();
-        cacheDir.mkpath(cacheDir.absolutePath());
-    }
-
-    // Expose quit() signal to QML
-    QObject::connect(view.engine(), SIGNAL(quit()), &a, SLOT(quit()));
-
-    qDebug() << "using main qml file from:" << qmlfile;
-    view.setSource(QUrl::fromLocalFile(qmlfile));
-    view.show();
-
-    return a.exec();
+
+    app.exec();
 }

=== removed file 'src/app/qml/ContentHubPicker.qml'
--- src/app/qml/ContentHubPicker.qml	2015-01-29 16:24:50 +0000
+++ src/app/qml/ContentHubPicker.qml	1970-01-01 00:00:00 +0000
@@ -1,71 +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 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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Content 1.1
-
-Page {
-    id: picker
-    title: i18n.tr("Open with...")
-
-    property var activeTransfer
-
-    head.sections.model: [i18n.tr("Documents"), i18n.tr("Pictures"), i18n.tr("Other")]
-    head.backAction: Action {
-        iconName: "back"
-        text: i18n.tr("Back")
-        onTriggered: pageStack.pop()
-    }
-
-    ContentPeerPicker {
-        // Do not show ContentPeerPicker header, since we need head.sections.
-        showTitle: false
-
-        contentType: {
-            switch (picker.head.sections.selectedIndex) {
-            case 0:
-                return ContentType.Documents
-            case 1:
-                return ContentType.Pictures
-            case 2:
-                return ContentType.Unknown
-            }
-        }
-        handler: ContentHandler.Source
-
-        onPeerSelected: picker.activeTransfer = peer.request();
-    }
-
-    ContentTransferHint {
-        id: transferHint
-        anchors.fill: parent
-        activeTransfer: picker.activeTransfer
-    }
-
-    Connections {
-        target: picker.activeTransfer ? picker.activeTransfer : null
-        onStateChanged: {
-            if (picker.activeTransfer.state === ContentTransfer.Charged) {
-                // Close ContentHubPicker page.
-                pageStack.pop();
-
-                file.path = picker.activeTransfer.items[0].url.toString().replace("file://", "")
-                console.log("[CONTENT-HUB] Content imported!")
-            }
-        }
-    }
-}

=== removed file 'src/app/qml/ContentHubProxy.qml'
--- src/app/qml/ContentHubProxy.qml	2014-11-04 18:54:38 +0000
+++ src/app/qml/ContentHubProxy.qml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2012-2014 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.Content 1.1 as ContentHub
-
-QtObject {
-    property QtObject pageStack: null
-    property list<QtObject> objects: [
-        Connections {
-            target: ContentHub.ContentHub
-
-            onImportRequested: {
-                if (transfer.state === ContentHub.ContentTransfer.Charged) {
-                    // We have no signals to know if an import was requested before Component.completed signal
-                    //  is emitted. So clear the stack when this occurs.
-                    pageStack.clear()
-
-                    console.log("[CONTENT-HUB] Incoming Import Request")
-                    file.path = transfer.items[0].url.toString().replace("file://", "");
-                }
-            }
-        }
-    ]
-}

=== removed file 'src/app/qml/DetailsPage.qml'
--- src/app/qml/DetailsPage.qml	2015-01-29 16:24:50 +0000
+++ src/app/qml/DetailsPage.qml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2013-2014 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.ListItems 1.0 as ListItem
-
-import "utils.js" as Utils
-
-Page {
-    id: detailsPage
-    objectName: "detailsPage"
-
-    title: i18n.tr("Details")
-
-    Column {
-        width: parent.width
-
-        ListItem.Subtitled {
-            text: i18n.tr("Location")
-            subText: file.path
-        }
-        ListItem.Subtitled {
-            text: i18n.tr("Size")
-            subText: Utils.printSize(file.size)
-        }
-
-        ListItem.Subtitled {
-            text: i18n.tr("Created")
-            subText: file.creationTime.toLocaleString(Qt.locale())
-        }
-
-        ListItem.Subtitled {
-            text: i18n.tr("Last modified")
-            subText: file.lastModified.toLocaleString(Qt.locale())
-        }
-
-        ListItem.Subtitled {
-            id: mimetypeItem
-            objectName: "mimetypeItem"
-            text: i18n.tr("MIME type")
-            subText: file.mimetype
-        }
-    }
-}

=== removed file 'src/app/qml/EmptyState.qml'
--- src/app/qml/EmptyState.qml	2015-01-16 16:46:46 +0000
+++ src/app/qml/EmptyState.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This file is part of Ubuntu Clock App
- *
- * Ubuntu Clock App 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.
- *
- * Ubuntu Clock App 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
-
-/*
- Component which displays an empty state (approved by design). It offers an
- icon, title and subtitle to describe the empty state.
-*/
-
-Item {
-    id: emptyState
-
-    // Public APIs
-    property alias iconName: emptyIcon.name
-    property alias title: emptyLabel.text
-    property alias subTitle: emptySublabel.text
-
-    height: childrenRect.height
-
-    Icon {
-        id: emptyIcon
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: units.gu(10)
-        width: height
-        color: "#BBBBBB"
-    }
-
-    Label {
-        id: emptyLabel
-        anchors.top: emptyIcon.bottom
-        anchors.topMargin: units.gu(5)
-        anchors.horizontalCenter: parent.horizontalCenter
-        fontSize: "large"
-        font.bold: true
-    }
-
-    Label {
-        id: emptySublabel
-        anchors.top: emptyLabel.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-}

=== removed file 'src/app/qml/ErrorDialog.qml'
--- src/app/qml/ErrorDialog.qml	2015-01-29 19:14:08 +0000
+++ src/app/qml/ErrorDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,32 +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 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
-
-Dialog {
-    id: errorDialog
-    title: i18n.tr("Error")
-    text: i18n.tr("File does not exist")
-
-    Button {
-        text: i18n.tr("Close")
-        color: UbuntuColors.red
-
-        onClicked: Qt.quit();
-    }
-}

=== removed file 'src/app/qml/ImageView.qml'
--- src/app/qml/ImageView.qml	2015-02-03 21:11:52 +0000
+++ src/app/qml/ImageView.qml	1970-01-01 00:00:00 +0000
@@ -1,48 +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.3
-import Ubuntu.Components 1.1
-
-import "utils.js" as Utils
-
-Page {
-    id: imagePage
-    title: Utils.getNameOfFile(file.path);
-
-    Rectangle {
-        anchors.fill: parent
-        color: "#221E1C"    // SuruDark.Palette.Normal.Background
-    }
-
-    ZoomableImage {
-        id: zoomableImage
-        anchors.fill: parent
-
-        zoomable: true
-        source: file.path
-    }
-
-    // *** HEADER ***
-    state: "default"
-    states: [
-        ImageViewDefaultHeader {
-            name: "default"
-            targetPage: imagePage
-            activityRunning: zoomableImage.imageStatus == Image.Loading
-        }
-    ]
-}

=== removed file 'src/app/qml/ImageViewDefaultHeader.qml'
--- src/app/qml/ImageViewDefaultHeader.qml	2015-02-03 21:11:52 +0000
+++ src/app/qml/ImageViewDefaultHeader.qml	1970-01-01 00:00:00 +0000
@@ -1,74 +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 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 QtQuick.Layouts 1.1
-import Ubuntu.Components.Popups 1.0
-
-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
-            }
-        }
-    }
-
-    backAction: Action {
-        iconName: "back"
-        text: (pageStack.depth > 1) ? i18n.tr("Back") : i18n.tr("Close")
-        onTriggered: {
-            if (pageStack.depth > 1) {
-                // Go back to Welcome page
-                pageStack.pop();
-            } else {
-                // File has been imported through Content Hub (or was not chosen through WelcomePage)
-                // Close the application and show our source app (e.g. ubuntu-filemanager-app, if used to open a document)
-                Qt.quit()
-            }
-        }
-    }
-
-    actions: [
-        Action {
-            objectName: "detailsAction"
-            text: i18n.tr("Details")
-            iconName: "info"
-            onTriggered: pageStack.push(Qt.resolvedUrl("DetailsPage.qml"))
-        }
-    ]
-}

=== removed file 'src/app/qml/PageWithBottomEdge.qml'
--- src/app/qml/PageWithBottomEdge.qml	2015-02-04 19:19:21 +0000
+++ src/app/qml/PageWithBottomEdge.qml	1970-01-01 00:00:00 +0000
@@ -1,407 +0,0 @@
-/*
- * Copyright (C) 2014 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/>.
- */
-
-/*
-    Example:
-
-    MainView {
-        objectName: "mainView"
-
-        applicationName: "com.ubuntu.developer.boiko.bottomedge"
-
-        width: units.gu(100)
-        height: units.gu(75)
-
-        Component {
-            id: pageComponent
-
-            PageWithBottomEdge {
-                id: mainPage
-                title: i18n.tr("Main Page")
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: "white"
-                }
-
-                bottomEdgePageComponent: Page {
-                    title: "Contents"
-                    anchors.fill: parent
-                    //anchors.topMargin: contentsPage.flickable.contentY
-
-                    ListView {
-                        anchors.fill: parent
-                        model: 50
-                        delegate: ListItems.Standard {
-                            text: "One Content Item: " + index
-                        }
-                    }
-                }
-                bottomEdgeTitle: i18n.tr("Bottom edge action")
-            }
-        }
-
-        PageStack {
-            id: stack
-            Component.onCompleted: stack.push(pageComponent)
-        }
-    }
-
-*/
-
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-
-Page {
-    id: page
-
-    property alias bottomEdgePageComponent: edgeLoader.sourceComponent
-    property alias bottomEdgePageSource: edgeLoader.source
-    property alias bottomEdgeTitle: tipLabel.text
-    property bool bottomEdgeEnabled: true
-    property int bottomEdgeExpandThreshold: page.height * 0.2
-    property int bottomEdgeExposedArea: bottomEdge.state !== "expanded" ? (page.height - bottomEdge.y - bottomEdge.tipHeight) : _areaWhenExpanded
-    property bool reloadBottomEdgePage: true
-
-    readonly property alias bottomEdgePage: edgeLoader.item
-    readonly property bool isReady: ((bottomEdge.y === 0) && bottomEdgePageLoaded && edgeLoader.item.active)
-    readonly property bool isCollapsed: (bottomEdge.y === page.height)
-    readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
-
-    property bool _showEdgePageWhenReady: false
-    property int _areaWhenExpanded: 0
-
-    signal bottomEdgeReleased()
-    signal bottomEdgeDismissed()
-
-
-    function showBottomEdgePage(source, properties)
-    {
-        edgeLoader.setSource(source, properties)
-        _showEdgePageWhenReady = true
-    }
-
-    function setBottomEdgePage(source, properties)
-    {
-        edgeLoader.setSource(source, properties)
-    }
-
-    function _pushPage()
-    {
-        if (edgeLoader.status === Loader.Ready) {
-            edgeLoader.item.active = true
-            page.pageStack.push(edgeLoader.item)
-            if (edgeLoader.item.flickable) {
-                edgeLoader.item.flickable.contentY = -page.header.height
-                edgeLoader.item.flickable.returnToBounds()
-            }
-            if (edgeLoader.item.ready)
-                edgeLoader.item.ready()
-        }
-    }
-
-
-    Component.onCompleted: {
-        // avoid a binding on the expanded height value
-        var expandedHeight = height;
-        _areaWhenExpanded = expandedHeight;
-    }
-
-    onActiveChanged: {
-        if (active) {
-            bottomEdge.state = "collapsed"
-        }
-    }
-
-    onBottomEdgePageLoadedChanged: {
-        if (_showEdgePageWhenReady && bottomEdgePageLoaded) {
-            bottomEdge.state = "expanded"
-            _showEdgePageWhenReady = false
-        }
-    }
-
-    Rectangle {
-        id: bgVisual
-
-        color: "black"
-        anchors.fill: page
-        opacity: 0.7 * ((page.height - bottomEdge.y) / page.height)
-        z: 1
-    }
-
-    UbuntuShape {
-        id: tip
-        objectName: "bottomEdgeTip"
-
-        property bool hidden: (activeFocus === false) || ((bottomEdge.y - units.gu(1)) < tip.y)
-
-        enabled: mouseArea.enabled
-        visible: page.bottomEdgeEnabled
-        anchors {
-            bottom: parent.bottom
-            horizontalCenter: bottomEdge.horizontalCenter
-            bottomMargin: hidden ? - height + units.gu(1) : -units.gu(1)
-            Behavior on bottomMargin {
-                SequentialAnimation {
-                    // wait some msecs in case of the focus change again, to avoid flickering
-                    PauseAnimation {
-                        duration: 300
-                    }
-                    UbuntuNumberAnimation {
-                        duration: UbuntuAnimation.SnapDuration
-                    }
-                }
-            }
-        }
-
-        z: 1
-        width: tipLabel.paintedWidth + units.gu(6)
-        height: bottomEdge.tipHeight + units.gu(1)
-        color: Theme.palette.normal.overlay
-        Label {
-            id: tipLabel
-
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-            }
-            height: bottomEdge.tipHeight
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            opacity: tip.hidden ? 0.0 : 1.0
-            Behavior on opacity {
-                UbuntuNumberAnimation {
-                    duration: UbuntuAnimation.SnapDuration
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        id: shadow
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: units.gu(1)
-        z: 1
-        opacity: 0.0
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "transparent" }
-            GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        property real previousY: -1
-        property string dragDirection: "None"
-
-        preventStealing: true
-        drag {
-            axis: Drag.YAxis
-            target: bottomEdge
-            minimumY: bottomEdge.pageStartY
-            maximumY: page.height
-        }
-        enabled: edgeLoader.status == Loader.Ready
-        visible: page.bottomEdgeEnabled
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-
-        }
-        height: bottomEdge.tipHeight
-        z: 1
-
-        onReleased: {
-            page.bottomEdgeReleased()
-            if ((dragDirection === "BottomToTop") &&
-                bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
-                bottomEdge.state = "expanded"
-            } else {
-                bottomEdge.state = "collapsed"
-            }
-            previousY = -1
-            dragDirection = "None"
-        }
-
-        onPressed: {
-            previousY = mouse.y
-            tip.forceActiveFocus()
-        }
-
-        onMouseYChanged: {
-            var yOffset = previousY - mouseY
-            // skip if was a small move
-            if (Math.abs(yOffset) <= units.gu(2)) {
-                return
-            }
-            previousY = mouseY
-            dragDirection = yOffset > 0 ? "BottomToTop" : "TopToBottom"
-        }
-    }
-
-    Rectangle {
-        id: bottomEdge
-        objectName: "bottomEdge"
-
-        readonly property int tipHeight: units.gu(3)
-        readonly property int pageStartY: 0
-
-        z: 1
-        color: Theme.palette.normal.background
-        clip: true
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        height: page.height
-        y: height
-        visible: !page.isCollapsed
-        state: "collapsed"
-        states: [
-            State {
-                name: "collapsed"
-                PropertyChanges {
-                    target: bottomEdge
-                    y: bottomEdge.height
-                }
-            },
-            State {
-                name: "expanded"
-                PropertyChanges {
-                    target: bottomEdge
-                    y: bottomEdge.pageStartY
-                }
-            },
-            State {
-                name: "floating"
-                when: mouseArea.drag.active
-                PropertyChanges {
-                    target: shadow
-                    opacity: 1.0
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                to: "expanded"
-                SequentialAnimation {
-                    alwaysRunToEnd: true
-
-                    SmoothedAnimation {
-                        target: bottomEdge
-                        property: "y"
-                        duration: UbuntuAnimation.FastDuration
-                        easing.type: Easing.Linear
-                    }
-                    SmoothedAnimation {
-                        target: edgeLoader
-                        property: "anchors.topMargin"
-                        to: - units.gu(4)
-                        duration: UbuntuAnimation.FastDuration
-                        easing.type: Easing.Linear
-                    }
-                    SmoothedAnimation {
-                        target: edgeLoader
-                        property: "anchors.topMargin"
-                        to: 0
-                        duration: UbuntuAnimation.FastDuration
-                        easing: UbuntuAnimation.StandardEasing
-                    }
-                    ScriptAction {
-                        script: page._pushPage()
-                    }
-                }
-            },
-            Transition {
-                from: "expanded"
-                to: "collapsed"
-                SequentialAnimation {
-                    alwaysRunToEnd: true
-
-                    ScriptAction {
-                        script: {
-                            Qt.inputMethod.hide()
-                            edgeLoader.item.parent = edgeLoader
-                            edgeLoader.item.anchors.fill = edgeLoader
-                            edgeLoader.item.active = false
-                        }
-                    }
-                    SmoothedAnimation {
-                        target: bottomEdge
-                        property: "y"
-                        duration: UbuntuAnimation.SlowDuration
-                    }
-                    ScriptAction {
-                        script: {
-                            // destroy current bottom page
-                            if (page.reloadBottomEdgePage) {
-                                edgeLoader.active = false
-                                // tip will receive focus on page active true
-                            } else {
-                                tip.forceActiveFocus()
-                            }
-
-                            // notify
-                            page.bottomEdgeDismissed()
-
-                            edgeLoader.active = true
-                        }
-                    }
-                }
-            },
-            Transition {
-                from: "floating"
-                to: "collapsed"
-                SmoothedAnimation {
-                    target: bottomEdge
-                    property: "y"
-                    duration: UbuntuAnimation.FastDuration
-                }
-            }
-        ]
-
-        Loader {
-            id: edgeLoader
-
-            asynchronous: true
-            anchors.fill: parent
-            //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
-            Binding {
-                target: edgeLoader.status === Loader.Ready ? edgeLoader : null
-                property: "anchors.topMargin"
-                value:  edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
-                when: !page.isReady
-            }
-
-            onLoaded: {
-                tip.forceActiveFocus()
-                if (page.isReady && edgeLoader.item.active !== true) {
-                    page._pushPage()
-                }
-            }
-        }
-    }
-}

=== removed file 'src/app/qml/PdfContentsPage.qml'
--- src/app/qml/PdfContentsPage.qml	2015-02-05 16:40:16 +0000
+++ src/app/qml/PdfContentsPage.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2014, 2015
- *                  Stefano Verzegnassi <[e-mail]>
- *
- * 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.0
-import Ubuntu.Components 1.1
-import QtQuick.Layouts 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-Page {
-    title: i18n.tr("Contents")
-
-    ListView {
-        anchors.fill: parent
-
-        model: poppler.tocModel
-
-        delegate: ListItem.Base {
-            showDivider: model.level == 0
-
-            onClicked: {
-                pdfView.positionAtIndex(model.pageIndex);
-                pageStack.pop();
-            }
-
-            RowLayout {
-                anchors.fill: parent
-                anchors.leftMargin: units.gu(2) * model.level
-
-                spacing: units.gu(1)
-
-                Label {
-                    Layout.fillWidth: true
-
-                    text: (typeof model.title === "undefined") ? "" : model.title;
-                    elide: Text.ElideRight
-                    Component.onCompleted: { if (model.level === 0); font.weight = Font.DemiBold; }
-                }
-
-                Label {
-                    text: (typeof model.pageIndex === "undefined") ? "" : model.pageIndex + 1;
-                    Component.onCompleted: { if (model.level === 0); font.weight = Font.DemiBold; }
-                }
-            }
-        }
-    }
-}

=== removed file 'src/app/qml/PdfView.qml'
--- src/app/qml/PdfView.qml	2015-02-09 12:00:58 +0000
+++ src/app/qml/PdfView.qml	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2013-2014 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 com.ubuntu.popplerqmlplugin 1.0 as PDF
-
-import "utils.js" as Utils
-
-PageWithBottomEdge {
-    id: pdfPage
-    title: Utils.getNameOfFile(file.path);
-
-    // Disable header auto-hide.
-    // TODO: Show/hide header if a user taps the page
-    flickable: null
-
-    property string currentPage: i18n.tr("Page %1 of %2").arg(pdfView.currentPageIndex + 1).arg(pdfView.count)
-
-    bottomEdgeTitle: i18n.tr("Contents")
-    bottomEdgePageComponent: PdfContentsPage {}
-    bottomEdgeEnabled: poppler.tocModel.count > 0
-
-    PDF.VerticalView {
-        id: pdfView
-        objectName: "pdfView"
-        anchors.fill: parent
-        spacing: units.gu(2)
-
-        clip: true
-        boundsBehavior: Flickable.StopAtBounds
-        flickDeceleration: 1500 * units.gridUnit / 8
-        maximumFlickVelocity: 2500 * units.gridUnit / 8
-
-        contentWidth: parent.width * _zoomHelper.scale
-        cacheBuffer: height * poppler.providersNumber * _zoomHelper.scale * 0.5
-        interactive: !pinchy.pinch.active
-
-        model: poppler
-        delegate: PdfViewDelegate {
-            Component.onDestruction: QQuickView.releaseResources()
-        }
-
-        // FIXME: On zooming, keep the same content position.
-        PinchArea {
-            id: pinchy
-            anchors.fill: parent
-
-            pinch {
-                target: _zoomHelper
-                minimumScale: 1.0
-                maximumScale: 2.5
-            }
-
-            onPinchFinished: {
-                pdfView.returnToBounds();
-
-                // This is a bit expensive, so it's safer to put it here.
-                // It won't be called on desktop (where PinchArea is not used),
-                // but it's not a problem at the moment (our target is phone).
-                QQuickView.releaseResources();
-            }
-        }
-
-        Item { id: _zoomHelper }
-    }
-
-    Scrollbar { flickableItem: pdfView }
-    Scrollbar { flickableItem: pdfView; align: Qt.AlignBottom }
-
-    PDF.Document {
-        id: poppler
-
-        property bool isLoading: true
-
-        Component.onCompleted: path = file.path
-        onPagesLoaded: {
-            isLoading = false;
-
-            var title = getDocumentInfo("Title")
-            if (title !== "")
-                pdfPage.title = title
-        }
-    }
-
-
-    // *** HEADER ***
-    state: "default"
-    states: PdfViewDefaultHeader {
-        name: "default"
-        targetPage: pdfPage
-        activityRunning: pdfView.currentPageItem.status == Image.Loading || poppler.isLoading
-    }
-}

=== removed file 'src/app/qml/PdfViewDefaultHeader.qml'
--- src/app/qml/PdfViewDefaultHeader.qml	2015-02-03 21:11:52 +0000
+++ src/app/qml/PdfViewDefaultHeader.qml	1970-01-01 00:00:00 +0000
@@ -1,96 +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 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 QtQuick.Layouts 1.1
-import Ubuntu.Components.Popups 1.0
-
-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: targetPage.currentPage
-            }
-        }
-    }
-
-    backAction: Action {
-        iconName: "back"
-        text: (pageStack.depth > 1) ? i18n.tr("Back") : i18n.tr("Close")
-        onTriggered: {
-            if (pageStack.depth > 1) {
-                // Go back to Welcome page
-                pageStack.pop();
-            } else {
-                // File has been imported through Content Hub (or was not chosen through WelcomePage)
-                // Close the application and show our source app (e.g. ubuntu-filemanager-app, if used to open a document)
-                Qt.quit()
-            }
-        }
-    }
-
-    actions: [
-        Action {
-            iconName: "search"
-            // onTriggered: pageMain.state = "search"
-            //Disable it until we provide search in Poppler plugin.
-            enabled: false
-        },
-
-        Action {
-            objectName:"gotopage"
-            iconName: "browser-tabs"
-            text: "Go to page..."
-            onTriggered: PopupUtils.open(Qt.resolvedUrl("PdfViewGotoDialog.qml"), targetPage)
-        },
-
-        Action {
-            objectName: "detailsAction"
-            text: i18n.tr("Details")
-            iconName: "info"
-            onTriggered: pageStack.push(Qt.resolvedUrl("DetailsPage.qml"))
-        }
-    ]
-}

=== removed file 'src/app/qml/PdfViewDelegate.qml'
--- src/app/qml/PdfViewDelegate.qml	2015-02-03 21:05:26 +0000
+++ src/app/qml/PdfViewDelegate.qml	1970-01-01 00:00:00 +0000
@@ -1,95 +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.3
-import Ubuntu.Components 1.1
-
-Rectangle {
-    id: pdfPage
-
-    property int index: model.index
-    property bool _previewFetched: 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
-
-        source: "image://poppler" + (index % poppler.providersNumber) + "/page/" + index;
-        sourceSize.width: pdfPage.width
-
-        onStatusChanged: {
-            // 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: pinchy
-
-        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();
-    }
-}

=== removed file 'src/app/qml/PdfViewGotoDialog.qml'
--- src/app/qml/PdfViewGotoDialog.qml	2015-01-30 19:37:00 +0000
+++ src/app/qml/PdfViewGotoDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +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 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
-
-Dialog {
-    id: goToPageDialog
-    objectName:"PdfViewGotoDialog"
-
-    title: i18n.tr("Go to page")
-    text: i18n.tr("Choose a page between 1 and %1").arg(pdfView.count)
-
-    TextField {
-        id: goToPageTextField
-        objectName:"goToPageTextField"
-
-        width: parent.width
-
-        hasClearButton: true
-        inputMethodHints: Qt.ImhFormattedNumbersOnly
-        validator: IntValidator{ bottom: 1; top: pdfView.count }
-
-        Keys.onReturnPressed: goToPage()
-        Component.onCompleted: forceActiveFocus()
-    }
-
-    Button {
-        objectName:"GOButton"
-        text: i18n.tr("GO!")
-        color: UbuntuColors.orange
-
-        enabled: goToPageTextField.acceptableInput
-        onClicked: goToPage()
-    }
-
-    Button {
-        text: i18n.tr("Cancel")
-        onClicked: PopupUtils.close(goToPageDialog)
-    }
-
-    function goToPage() {
-        pdfView.positionAtIndex((goToPageTextField.text - 1))
-        PopupUtils.close(goToPageDialog)
-    }
-}

=== removed file 'src/app/qml/TextView.qml'
--- src/app/qml/TextView.qml	2015-01-30 19:44:52 +0000
+++ src/app/qml/TextView.qml	1970-01-01 00:00:00 +0000
@@ -1,70 +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.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.Ambiance 0.1
-
-import "utils.js" as Utils
-
-Page {
-    id: textPage
-    title: Utils.getNameOfFile(file.path);
-
-    TextArea {
-        id: textAreaMain
-        objectName: "textAreaMain"
-
-        property bool isLoading: true
-
-        anchors.fill: parent
-
-        // FIXME: If set to true, some of the keyboard hooks are disabled
-        // And it's not possible to move the cursor with arrow keys.
-        readOnly: true
-
-        text: i18n.tr("Loading...")
-        font.family: "UbuntuMono"
-
-        Component.onCompleted: {
-            var xhr = new XMLHttpRequest;
-
-            xhr.open("GET", file.path);
-            xhr.onreadystatechange = function() {
-                if (xhr.readyState === XMLHttpRequest.DONE) {
-                    textAreaMain.text = xhr.responseText;
-                    textAreaMain.isLoading = false
-                }
-            };
-
-            xhr.send();
-        }
-
-        style: TextAreaStyle {
-            background: Rectangle { color: "white" }
-        }
-    }
-
-    // *** HEADER ***
-    state: "default"
-    states: [
-        TextViewDefaultHeader {
-            name: "default"
-            targetPage: textPage
-            activityRunning: textAreaMain.isLoading
-        }
-    ]
-}

=== removed file 'src/app/qml/TextViewDefaultHeader.qml'
--- src/app/qml/TextViewDefaultHeader.qml	2015-02-03 21:11:52 +0000
+++ src/app/qml/TextViewDefaultHeader.qml	1970-01-01 00:00:00 +0000
@@ -1,82 +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 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 QtQuick.Layouts 1.1
-import Ubuntu.Components.Popups 1.0
-
-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: file.description
-            }
-        }
-    }
-
-    backAction: Action {
-        iconName: "back"
-        text: (pageStack.depth > 1) ? i18n.tr("Back") : i18n.tr("Close")
-        onTriggered: {
-            if (pageStack.depth > 1) {
-                // Go back to Welcome page
-                pageStack.pop();
-            } else {
-                // File has been imported through Content Hub (or was not chosen through WelcomePage)
-                // Close the application and show our source app (e.g. ubuntu-filemanager-app, if used to open a document)
-                Qt.quit()
-            }
-        }
-    }
-
-    actions: [
-        Action {
-            objectName: "detailsAction"
-            text: i18n.tr("Details")
-            iconName: "info"
-            onTriggered: pageStack.push(Qt.resolvedUrl("DetailsPage.qml"))
-        }
-    ]
-}

=== removed file 'src/app/qml/UnknownTypeDialog.qml'
--- src/app/qml/UnknownTypeDialog.qml	2015-01-29 18:09:26 +0000
+++ src/app/qml/UnknownTypeDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +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.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
-
-import "loadComponent.js" as LoadComponent
-
-Dialog {
-    id: unknownDialog
-    objectName: "unknownDialog"
-    title: i18n.tr("Unknown file type")
-    text: i18n.tr("Sorry but we can't find a way to display this file. Do you want to open it as a plain text?")
-    Button {
-        text: i18n.tr("Yes")
-        color: UbuntuColors.green
-
-        onClicked: {
-            LoadComponent.load("text/plain");
-            PopupUtils.close(unknownDialog)
-        }
-    }
-    Button {
-        text: i18n.tr("No")
-        color: UbuntuColors.red
-        onClicked: PopupUtils.close(unknownDialog)
-    }
-}
-

=== removed file 'src/app/qml/WelcomePage.qml'
--- src/app/qml/WelcomePage.qml	2015-01-29 16:24:50 +0000
+++ src/app/qml/WelcomePage.qml	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 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.0
-import Ubuntu.Components 1.1
-
-Page {
-    id: welcomePage
-
-    title: i18n.tr("Document Viewer")
-    head.actions: [ openAction ]
-
-    EmptyState {
-        title: i18n.tr("No opened documents")
-        subTitle: i18n.tr("Tap the + icon to open a document")
-
-        iconName: "edit-copy"
-
-        anchors.centerIn: parent
-    }
-
-    Action {
-        id: openAction
-        text: i18n.tr("Open a file...")
-        iconName: "add"
-
-        onTriggered: pageStack.push(Qt.resolvedUrl("ContentHubPicker.qml"))
-    }
-}

=== removed file 'src/app/qml/ZoomableImage.qml'
--- src/app/qml/ZoomableImage.qml	2014-11-08 10:59:51 +0000
+++ src/app/qml/ZoomableImage.qml	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2014 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.0
-import Ubuntu.Components 0.1
-
-/*! \brief Zoomable for image.
-
-    This widget shows image contained in source,
-    can be zoomable accordingly with zoomable.
- */
-
-Item {
-    id: root
-    property alias source: imageRenderer.source
-    property var zoomable: false
-    property alias imageStatus: imageRenderer.status
-    property alias asynchronous: imageRenderer.asynchronous
-
-    Flickable {
-        id: flickable
-        objectName: "flickable"
-        clip: true // FIXME maybe we can remove this, or just not clip in few cases
-        contentHeight: imageContainer.height
-        contentWidth: imageContainer.width
-
-        onHeightChanged: image.resetScale()
-        onWidthChanged: image.resetScale()
-        anchors.fill: parent
-
-        Item {
-            id: imageContainer
-            objectName: "imageContainer"
-            width: Math.max(image.width * image.scale, flickable.width)
-            height: Math.max(image.height * image.scale, flickable.height)
-
-            Item {
-                id: image
-                objectName: "image"
-                property alias imageStatus: imageRenderer.status
-                property var prevScale
-                anchors.centerIn: parent
-
-                signal imageReloaded
-
-                Image {
-                    id: imageRenderer
-                    objectName: "imageRenderer"
-                    smooth: !flickable.movingVertically
-                    anchors.fill: parent
-                    fillMode: Image.PreserveAspectFit
-
-                    readonly property int sourceSizeMultiplier: 3
-
-                    sourceSize.width: root.width * sourceSizeMultiplier <= root.height * sourceSizeMultiplier ? root.width * sourceSizeMultiplier : 0
-                    sourceSize.height: root.height * sourceSizeMultiplier <= root.width * sourceSizeMultiplier ? root.height * sourceSizeMultiplier : 0
-
-                    onStatusChanged: {
-                        if (status === Image.Ready) {
-                            image.imageReloaded();
-                        }
-                    }
-                }
-
-                onImageReloaded: {
-                    image.height = imageRenderer.implicitHeight
-                    image.width = imageRenderer.implicitWidth
-                    image.resetScale();
-                }
-
-                function resetScale() {
-                    image.scale = Math.min(flickable.width / image.width, flickable.height / image.height);
-                    pinchArea.minScale = image.scale;
-                    prevScale = Math.min(image.scale, 1);
-                }
-
-                onScaleChanged: {
-                    var currentWidth = width * scale
-                    var currentHeight = height * scale
-                    var scaleRatio = scale / prevScale
-                    if (currentWidth > flickable.width) {
-                        var xpos = flickable.width / 2 + flickable.contentX;
-                        var xoff = xpos * scaleRatio;
-                        flickable.contentX = xoff - flickable.width / 2;
-                    }
-                    if (currentHeight > flickable.height) {
-                        var ypos = flickable.height / 2 + flickable.contentY;
-                        var yoff = ypos * scaleRatio;
-                        flickable.contentY = yoff - flickable.height / 2;
-                    }
-                    prevScale = scale;
-                }
-            }
-        }
-
-        PinchArea {
-            id: pinchArea
-            objectName: "pinchArea"
-            property real minScale: 1.0
-            anchors.fill: parent
-            enabled: zoomable ? zoomable : false
-
-            pinch.target: image
-            pinch.minimumScale: minScale
-            pinch.maximumScale: 10
-
-            onPinchFinished: flickable.returnToBounds()
-        }
-
-        MouseArea {
-            id: mouseArea
-            objectName: "mouseArea"
-
-            anchors.fill: parent
-            enabled: zoomable ? zoomable : false
-
-            onWheel: {
-                var startScale = image.scale;
-                if (wheel.angleDelta.y > 0) {
-                    image.scale = startScale + 0.1;
-                } else if (wheel.angleDelta.y < 0) {
-                    if (image.scale > 0.1 && image.scale > pinchArea.minScale) {
-                        image.scale = startScale - 0.1;
-                    }
-                }
-                wheel.accepted = true;
-            }
-
-            onPressed: {
-                mouse.accepted = false;
-            }
-
-            onReleased: {
-                mouse.accepted = false;
-            }
-
-            onClicked: {
-                mouse.accepted = false;
-            }
-        }
-    }
-}

=== added directory 'src/app/qml/common'
=== added file 'src/app/qml/common/DetailsPage.qml'
--- src/app/qml/common/DetailsPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/common/DetailsPage.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2013-2014 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.ListItems 1.0 as ListItem
+
+import "utils.js" as Utils
+
+Page {
+    id: detailsPage
+    objectName: "detailsPage"
+
+    title: i18n.tr("Details")
+
+    Column {
+        width: parent.width
+
+        ListItem.Subtitled {
+            text: i18n.tr("Location")
+            subText: file.path
+        }
+        ListItem.Subtitled {
+            text: i18n.tr("Size")
+            subText: Utils.printSize(file.size)
+        }
+
+        ListItem.Subtitled {
+            text: i18n.tr("Created")
+            subText: file.creationTime.toLocaleString(Qt.locale())
+        }
+
+        ListItem.Subtitled {
+            text: i18n.tr("Last modified")
+            subText: file.lastModified.toLocaleString(Qt.locale())
+        }
+
+        ListItem.Subtitled {
+            id: mimetypeItem
+            objectName: "mimetypeItem"
+            text: i18n.tr("MIME type")
+            subText: file.mimetype
+        }
+    }
+}

=== added file 'src/app/qml/common/ErrorDialog.qml'
--- src/app/qml/common/ErrorDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/common/ErrorDialog.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,32 @@
+/*
+ * 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: We may want to make it more generic and useful.
+Dialog {
+    id: errorDialog
+    title: i18n.tr("Error")
+    text: i18n.tr("File does not exist")
+
+    Button {
+        text: i18n.tr("Close")
+        color: UbuntuColors.red
+        onClicked: PopupUtils.close(errorDialog)
+    }
+}

=== added file 'src/app/qml/common/UnknownTypeDialog.qml'
--- src/app/qml/common/UnknownTypeDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/common/UnknownTypeDialog.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+
+import "loadComponent.js" as LoadComponent
+
+Dialog {
+    id: unknownDialog
+    objectName: "unknownDialog"
+    title: i18n.tr("Unknown file type")
+    text: i18n.tr("Sorry but we can't find a way to display this file. Do you want to open it as a plain text?")
+    Button {
+        text: i18n.tr("Yes")
+        color: UbuntuColors.green
+
+        onClicked: {
+            LoadComponent.load("text/plain");
+            PopupUtils.close(unknownDialog)
+        }
+    }
+    Button {
+        text: i18n.tr("No")
+        color: UbuntuColors.red
+        onClicked: PopupUtils.close(unknownDialog)
+    }
+}
+

=== added file 'src/app/qml/common/loadComponent.js'
--- src/app/qml/common/loadComponent.js	1970-01-01 00:00:00 +0000
+++ src/app/qml/common/loadComponent.js	2015-03-03 16:49:59 +0000
@@ -0,0 +1,38 @@
+/*
+ * 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/>.
+ */
+
+function load(mimetype) {
+    var qmlToLoad = "";
+
+    // Open all text files in text editor
+    // With that fix it is possible to open LICENSE file
+    // which was recognised as text/x-pascal
+    if (mimetype.substring(0, 5) === "text/")
+        qmlToLoad = Qt.resolvedUrl("../textView/TextView.qml");
+
+    // Check if PDF document
+    if (mimetype === "application/pdf")
+        qmlToLoad = Qt.resolvedUrl("../pdfView/PdfView.qml");
+
+    if (qmlToLoad != "") {
+       pageStack.push(qmlToLoad);
+    } else {
+        console.debug("Unknown MIME type: "+ mimetype);
+        runUnknownTypeDialog();
+    }
+
+    return mimetype;
+}

=== added file 'src/app/qml/common/utils.js'
--- src/app/qml/common/utils.js	1970-01-01 00:00:00 +0000
+++ src/app/qml/common/utils.js	2015-03-03 16:49:59 +0000
@@ -0,0 +1,34 @@
+/*
+ * 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/>.
+ */
+
+.pragma library
+
+function printSize(size) {
+    if (size >= 1073741824)
+        return (size / 1073741824).toFixed(2) + qsTr(" GiB");
+
+    if (size >= 1048576)
+        return (size / 1048576).toFixed(2) + qsTr(" MiB");
+
+    if (size >= 1024)
+        return parseInt(size / 1024) + qsTr(" KiB");
+
+    return size + qsTr(" byte");
+}
+
+function getNameOfFile(path) {
+    return path.toString().substring(path.lastIndexOf('/') + 1);
+}

=== added directory 'src/app/qml/documentPage'
=== added file 'src/app/qml/documentPage/DeleteFileDialog.qml'
--- src/app/qml/documentPage/DeleteFileDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DeleteFileDialog.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,58 @@
+/*
+  Copyright (C) 2013-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 3 as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+    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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+
+Dialog {
+    id: deleteFileDialog
+
+    property string path
+
+    title: path ? i18n.tr("Delete file") :
+                  i18n.tr("Delete %1 files").arg(documentPage.view.item.selectedItems.count)
+    text: path ? i18n.tr("Are you sure you want to permanently delete this file?") :
+                 i18n.tr("Are you sure you want to permanently delete these files?")
+
+    Button {
+        text: i18n.tr("Cancel")
+        onClicked: PopupUtils.close(deleteFileDialog)
+    }
+
+    Button {
+        text: i18n.tr("Delete")
+        color: UbuntuColors.red
+
+        onClicked: {
+            if (deleteFileDialog.path) {
+                folderModel.rm(path)
+            } else {
+                var items = documentPage.view.item.selectedItems;
+
+                for (var i=0; i < items.count; i++) {
+                    console.log("Removing:", items.get(i).model.path);
+                    folderModel.rm(items.get(i).model.path);
+                }
+            }
+
+            viewLoader.item.endSelection();
+            PopupUtils.close(deleteFileDialog)
+        }
+    }
+}
+

=== added file 'src/app/qml/documentPage/DocumentEmptyState.qml'
--- src/app/qml/documentPage/DocumentEmptyState.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentEmptyState.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,34 @@
+/*
+  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 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 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.0
+import "../upstreamComponents"
+
+Item {
+    anchors.fill: parent
+
+    EmptyState {
+        title: i18n.tr("No document found")
+
+        // TODO: Add "or insert removable media with documents." to subTitle when
+        // the support for SD card will be implemented.
+        subTitle: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder.")
+        iconName: "edit-copy"
+
+        anchors.centerIn: parent
+        width: parent.width
+    }
+}

=== added file 'src/app/qml/documentPage/DocumentGridDelegate.qml'
--- src/app/qml/documentPage/DocumentGridDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentGridDelegate.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,178 @@
+/*
+  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 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 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.0
+import Ubuntu.Components 1.1
+import QtQuick.Layouts 1.1
+
+import "../common/utils.js" as Utils
+
+AbstractButton {
+    id: root
+    property bool selected: false
+    property bool selectionMode: false
+
+    function formattedDateTime() {
+        var date = new Date(model.date)
+        var diff = model.dateDiff
+
+        if (diff < 1)
+            return i18n.tr("Today, ") + Qt.formatTime(date, Qt.locale().timeFormat(Locale.ShortFormat))
+
+        if (diff < 2)
+            return i18n.tr("Yesterday, ") + Qt.formatDateTime(date, Qt.locale().timeFormat(Locale.ShortFormat))
+
+        if (diff < 7)
+            // TRANSLATORS: this is a datetime formatting string,
+            // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+            return Qt.formatDateTime(date, i18n.tr("dddd, hh:mm"))
+
+        // TRANSLATORS: this is a datetime formatting string,
+        // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+        return Qt.formatDateTime(date, i18n.tr("dd-MM-yyyy hh:mm"))
+    }
+
+    Rectangle {
+        anchors { fill: parent; margins: units.gu(0.5) }
+
+        color: Qt.lighter(UbuntuColors.lightGrey)
+        clip: true
+
+        Loader {
+            id: selectionIcon
+
+            anchors {
+                right: parent.right
+                top: parent.top
+            }
+
+            z: 10
+
+            width: (status === Loader.Ready) ? item.implicitWidth : 0
+            visible: (status === Loader.Ready) && (item.width === item.implicitWidth)
+            Behavior on opacity {
+                NumberAnimation {
+                    duration: UbuntuAnimation.SnapDuration
+                }
+            }
+        }
+
+        // Document mimetype icon
+        Icon {
+            anchors.centerIn: parent
+            anchors.verticalCenterOffset: - units.gu(2)
+
+            width: units.gu(8); height: width
+
+            // At the moment the suru icon theme doesn't have much icons.
+            // Just some note for the future:
+            // TODO: Add icons for Office/ODF documents
+            // TODO: Whenever there will be icons for source code files, add them.
+            name: {
+                if (model.mimetype.substring(0, 5) === "text/")
+                    return "text-x-generic-symbolic"
+
+                if (model.mimetype.substring(0, 5) === "image")
+                    return "image-x-generic-symbolic"
+
+                if (model.mimetype === "application/pdf")
+                    return "application-pdf-symbolic"
+
+                return "package-x-generic-symbolic"
+            }
+        }
+
+        // Cover
+       /* Image {
+            anchors.fill: parent
+
+            source: {
+                if (model.cover !== "" && typeof model.cover !== "undefined")
+                    return model.cover
+
+                if (model.mimetype.toString().indexOf("image") !== -1)
+                    return model.path
+
+                return ""
+            }
+
+            sourceSize.width: width
+            fillMode: Image.PreserveAspectCrop
+        }*/
+
+        // Document info overlay
+        Rectangle {
+            id: overlay
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+
+            height: units.gu(6)
+
+            color: UbuntuColors.darkGrey
+            opacity: 0.75
+        }
+
+        // Document info
+        Column {
+            anchors { fill: overlay; margins: units.gu(0.5) }
+
+            Label {
+                text: model.name
+                color: "white"
+
+                elide: Text.ElideRight
+                font.weight: Font.DemiBold
+                fontSize: "small"
+
+                anchors { left: parent.left; right: parent.right }
+            }
+
+            RowLayout {
+                anchors { left: parent.left; right: parent.right }
+
+                Label {
+                    text: formattedDateTime()
+                    color: "white"                  
+                    fontSize: "small"
+
+                    Layout.fillWidth: true
+                }
+
+                Label {
+                    text: Utils.printSize(model.size)
+                    color: "white"
+                    fontSize: "small"
+                }
+            }
+        }   // Document info end
+
+        states: [
+            State {
+                name: "select"
+                when: selectionMode || selected
+                PropertyChanges {
+                    target: selectionIcon
+                    source: Qt.resolvedUrl("../upstreamComponents/ListItemWithActionsCheckBox.qml")
+                    anchors.margins: units.gu(1)
+                }
+            }
+        ]
+    }
+}

=== added file 'src/app/qml/documentPage/DocumentGridView.qml'
--- src/app/qml/documentPage/DocumentGridView.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentGridView.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,76 @@
+/*
+  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 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 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.0
+import Ubuntu.Components 1.1
+
+import "../upstreamComponents"
+
+MultipleSelectionGridView {
+    id: documentGridView
+
+    // We use mainView.width to calculate the size and the spacing of elements.
+    // That's because this GridView always fills (and always will) the whole size of MainView.
+    // By this way, we can avoid binding loops, keeping the code pretty simple.
+    anchors {
+        fill: parent
+        margins: units.gu(0.5)
+        leftMargin: (mainView.width % cellWidth) * 0.5
+        rightMargin: (mainView.width % cellWidth) * 0.5
+    }
+    clip: true
+
+    cellHeight: cellWidth
+    cellWidth: (mainView.width > units.gu(50)) ? units.gu(24)
+                                               : (mainView.width - units.gu(2)) * 0.5
+
+    listDelegate: DocumentGridDelegate {
+        id: delegate
+        width: cellWidth
+        height: cellHeight
+
+        selectionMode: documentGridView.isInSelectionMode
+        selected: documentGridView.isSelected(delegate)
+
+        onClicked: {
+            if(documentGridView.isInSelectionMode) {
+                if(!documentGridView.selectItem(delegate)) {
+                    documentGridView.deselectItem(delegate)
+                }
+                return
+            }
+            else {
+                file.path = model.path
+            }
+        }
+
+        onPressAndHold: {
+            if (!documentGridView.isInSelectionMode) {
+                documentGridView.startSelection()
+                documentGridView.selectItem(delegate)
+            }
+        }
+    }
+
+    listModel: folderModel
+
+    Scrollbar {
+        flickableItem: documentGridView
+        parent: documentGridView.parent
+    }
+
+    Component.onCompleted: { if (DOC_VIEWER.pickModeEnabled) documentGridView.startSelection(); }
+}

=== added file 'src/app/qml/documentPage/DocumentListDelegate.qml'
--- src/app/qml/documentPage/DocumentListDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentListDelegate.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,108 @@
+/*
+  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 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 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.0
+import Ubuntu.Components 1.1
+import QtQuick.Layouts 1.1
+
+import "../common/utils.js" as Utils
+import "../upstreamComponents"
+
+ListItemWithActions {
+    function formattedDateTime() {
+        var date = new Date(model.date)
+        var diff = model.dateDiff
+
+        if (diff < 2)
+            return Qt.formatDateTime(date, Qt.locale().timeFormat(Locale.ShortFormat))
+
+        if (diff < 7)
+            // TRANSLATORS: this is a datetime formatting string,
+            // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+            return Qt.formatDateTime(date, i18n.tr("dddd, hh:mm"))
+
+        // TRANSLATORS: this is a datetime formatting string,
+        // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
+        return Qt.formatDateTime(date, i18n.tr("dd-MM-yyyy hh:mm"))
+    }
+
+    anchors { left: parent.left; right: parent.right }
+    height: units.gu(8)
+
+    locked: documentPage.state == "pickMode"
+
+    // TODO: NEEDS-DESIGN: Enable left action. Still need to find an equivalent for GridDelegate.
+   /* leftSideAction: Action {
+        iconName: "delete"
+        text: i18n.tr("Delete")
+        onTriggered: {
+            PopupUtils.open(Qt.resolvedUrl("DeleteFileDialog.qml"),
+                            documentPage, { path: model.filePath })
+        }
+    }*/
+
+    contents: RowLayout {
+        anchors.fill: parent
+        spacing: units.gu(2)
+
+        Icon {
+            width: height
+            height: units.gu(5)
+
+            // At the moment the suru icon theme doesn't have much icons.
+            name: {
+                if (model.mimetype.substring(0, 5) === "text/")
+                    return "text-x-generic-symbolic"
+
+                if (model.mimetype.substring(0, 5) === "image")
+                    return "image-x-generic-symbolic"
+
+                if (model.mimetype === "application/pdf")
+                    return "application-pdf-symbolic"
+
+                return "package-x-generic-symbolic"
+            }
+        }
+
+        Column {
+            Layout.fillWidth: true
+
+            Label {
+                text: model.name
+                wrapMode: Text.Wrap
+                width: parent.width
+
+                color: UbuntuColors.midAubergine
+            }
+
+            RowLayout {
+                width: parent.width
+
+                Label {
+                    text: formattedDateTime()
+                    fontSize: "small"
+
+                    Layout.fillWidth: true
+                }
+
+                Label {
+                    text: Utils.printSize(model.size)
+                    fontSize: "small"
+                }
+            }
+        }
+    }
+}

=== added file 'src/app/qml/documentPage/DocumentListView.qml'
--- src/app/qml/documentPage/DocumentListView.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentListView.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,156 @@
+/*
+  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 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 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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+import "../upstreamComponents"
+
+MultipleSelectionListView {
+    id: documentListView
+
+    anchors { fill: parent; margins: units.gu(0.5) }
+    clip: true
+
+    property var _currentSwipedItem: null
+
+    function _updateSwipeState(item)
+    {
+        if (item.swipping) {
+            return
+        }
+
+        if (item.swipeState !== "Normal") {
+            if (documentListView._currentSwipedItem !== item) {
+                if (documentListView._currentSwipedItem) {
+                    documentListView._currentSwipedItem.resetSwipe()
+                }
+                documentListView._currentSwipedItem = item
+            }
+        } else if (item.swipeState !== "Normal"
+                   && documentListView._currentSwipedItem === item) {
+            documentListView._currentSwipedItem = null
+        }
+    }
+
+    listDelegate: DocumentListDelegate {
+        id: delegate
+
+        property var removalAnimation
+
+        function remove() {
+            removalAnimation.start()
+        }
+
+        selectionMode: documentListView.isInSelectionMode
+        selected: documentListView.isSelected(delegate)
+
+        onSwippingChanged: {
+            _updateSwipeState(delegate)
+        }
+
+        onSwipeStateChanged: {
+            _updateSwipeState(delegate)
+        }
+
+        ListView.onRemove: ScriptAction {
+            script: {
+                if (_currentSwipedItem
+                        === delegate) {
+                    _currentSwipedItem = null
+                }
+            }
+        }
+
+        removalAnimation: SequentialAnimation {
+            alwaysRunToEnd: true
+
+            PropertyAction {
+                target: delegate
+                property: "ListView.delayRemove"
+                value: true
+            }
+
+            UbuntuNumberAnimation {
+                target: delegate
+                property: "height"
+                to: 0
+            }
+
+            PropertyAction {
+                target: delegate
+                property: "ListView.delayRemove"
+                value: false
+            }
+
+            ScriptAction {
+                script: {
+                    var filePath = d.folderModel.get(index, "filePath")
+                    Storage.rm(filePath)
+                }
+            }
+        }
+
+        onItemClicked: {
+            if(documentListView.isInSelectionMode) {
+                if(!documentListView.selectItem(delegate)) {
+                    documentListView.deselectItem(delegate)
+                }
+                return
+            }
+
+            else {
+                file.path = model.path
+            }
+        }
+
+        onItemPressAndHold: {
+            if (!documentListView.isInSelectionMode) {
+                documentListView.startSelection()
+                documentListView.selectItem(delegate)
+            }
+        }
+    }
+
+    listModel: folderModel
+
+    section.property: "dateDiff"
+    section.delegate: ListItem.Header {
+        text: {
+            if (section == 0)
+                return i18n.tr("Today")
+
+            if (section == 1)
+                return i18n.tr("Yesterday")
+
+            if (section == 2)
+                return i18n.tr("Earlier this week")
+
+            if (section == 3)
+                return i18n.tr("Earlier this month")
+
+            return i18n.tr("Even more earlier...")
+        }
+    }
+
+    Scrollbar {
+        flickableItem: documentListView
+        parent: documentListView.parent
+    }
+
+    Component.onCompleted: { if (DOC_VIEWER.pickModeEnabled) documentListView.startSelection(); }
+}

=== added file 'src/app/qml/documentPage/DocumentPage.qml'
--- src/app/qml/documentPage/DocumentPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentPage.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+import Qt.labs.settings 1.0
+
+Page {
+    id: documentPage
+
+    title: i18n.tr("Document Viewer")
+    flickable: null
+
+    property bool useGridView: false
+
+    Settings {
+        property alias useGridView: documentPage.useGridView
+    }
+
+    property alias view: viewLoader
+    Loader {
+        id: viewLoader
+        anchors.fill: parent
+
+        source: (folderModel.count === 0) ? Qt.resolvedUrl("./DocumentEmptyState.qml")
+                                     : useGridView ? Qt.resolvedUrl("./DocumentGridView.qml")
+                                                   : Qt.resolvedUrl("./DocumentListView.qml")
+    }
+
+    // *** HEADER ***
+    states: [
+        DocumentPageDefaultHeader {
+            name: "default"
+            targetPage: documentPage
+            when: !mainView.pickMode && !viewLoader.item.isInSelectionMode
+        },
+
+        DocumentPagePickModeHeader {
+            name: "pickMode"
+            targetPage: documentPage
+            when: mainView.pickMode
+        },
+
+        DocumentPageSelectionModeHeader {
+            name: "selection"
+            targetPage: documentPage
+            when: !mainView.pickMode && viewLoader.item.isInSelectionMode
+        }
+    ]
+
+    Connections {
+        target: DOC_VIEWER
+
+        onPickModeEnabledChanged: {
+            if (DOC_VIEWER.pickModeEnabled) {
+                viewLoader.item.startSelection()
+            } else {
+                viewLoader.item.cancelSelection()
+            }
+        }
+    }
+}

=== added file 'src/app/qml/documentPage/DocumentPageDefaultHeader.qml'
--- src/app/qml/documentPage/DocumentPageDefaultHeader.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentPageDefaultHeader.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,34 @@
+/*
+ * 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
+
+PageHeadState {
+    id: rootItem
+
+    property Page targetPage
+    head: targetPage.head
+
+    actions:  Action {
+        id: switchView
+        text: targetPage.useGridView ? i18n.tr("Switch to single column list") : i18n.tr("Switch to grid")
+        iconName: targetPage.useGridView ? "view-list-symbolic" : "view-grid-symbolic"
+        onTriggered: targetPage.useGridView = !targetPage.useGridView
+
+        visible: folderModel.count !== 0
+    }
+}

=== added file 'src/app/qml/documentPage/DocumentPagePickModeHeader.qml'
--- src/app/qml/documentPage/DocumentPagePickModeHeader.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentPagePickModeHeader.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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
+
+PageHeadState {
+    id: rootItem
+
+    property Page targetPage
+    head: targetPage.head
+
+    backAction: Action {
+        text: i18n.tr("Cancel")
+        objectName: "cancelButton"
+        iconName: "close"
+        onTriggered: DOC_VIEWER.contentPickingCanceled()
+    }
+
+    actions: [
+        Action {
+            text: targetPage.useGridView ? i18n.tr("Switch to single column list") : i18n.tr("Switch to grid")
+            iconName: targetPage.useGridView ? "view-list-symbolic" : "view-grid-symbolic"
+            onTriggered: targetPage.useGridView = !targetPage.useGridView
+
+            visible: folderModel.count !== 0
+        },
+
+        Action {
+            text: i18n.tr("Pick")
+            objectName: "pickButton"
+            enabled: viewLoader.item.selectedItems.count > 0
+            iconName: "ok"
+            onTriggered: {
+                if (!enabled)
+                    return;
+
+                var urlList = []
+                var items = documentPage.view.item.selectedItems;
+
+                for (var i=0; i < items.count; i++) {
+                    urlList.push(items.get(i).model.path);
+                }
+
+                DOC_VIEWER.returnPickedContent(urlList);
+            }
+        }
+    ]
+}
+

=== added file 'src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml'
--- src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,94 @@
+/*
+ * 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 "../upstreamComponents"
+
+PageHeadState {
+    id: rootItem
+
+    property Page targetPage
+
+    head: targetPage.head
+
+    backAction: Action {
+        iconName: "close"
+        text: i18n.tr("Close")
+        onTriggered: {
+            viewLoader.item.cancelSelection()
+        }
+    }
+
+    contents: Loader {
+        id: selectionStateLoader
+        active: documentPage.state === "selection"
+        sourceComponent: Item {
+            HeaderButton {
+                id: selectButton
+
+                anchors {
+                    right: deleteButton.left
+                    rightMargin: units.gu(1)
+                }
+
+                text: {
+                    if(viewLoader.item.selectedItems.count === viewLoader.item.count) {
+                        return i18n.tr("Select None")
+                    } else {
+                        return i18n.tr("Select All")
+                    }
+                }
+
+                iconSource: {
+                    if(viewLoader.item.selectedItems.count === viewLoader.item.count) {
+                        return Qt.resolvedUrl("../../graphics/select-none.svg")
+                    } else {
+                        return Qt.resolvedUrl("../../graphics/select.svg")
+                    }
+                }
+
+                onTriggered: {
+                    if(viewLoader.item.selectedItems.count === viewLoader.item.count) {
+                        viewLoader.item.clearSelection()
+                    } else {
+                        viewLoader.item.selectAll()
+                    }
+                }
+            }
+
+            HeaderButton {
+                id: deleteButton
+
+                anchors.right: parent.right
+                anchors.rightMargin: units.gu(2)
+
+                iconName: "delete"
+                text: i18n.tr("Delete")
+                enabled: viewLoader.item.selectedItems.count !== 0
+
+                onTriggered: {
+                    PopupUtils.open(Qt.resolvedUrl("DeleteFileDialog.qml"), documentPage)
+                }
+            }
+        }
+
+        height: parent ? parent.height : undefined
+        anchors.right: parent ? parent.right: undefined
+    }
+
+}

=== removed file 'src/app/qml/loadComponent.js'
--- src/app/qml/loadComponent.js	2015-01-29 18:45:21 +0000
+++ src/app/qml/loadComponent.js	1970-01-01 00:00:00 +0000
@@ -1,45 +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/>.
- */
-
-function load(mimetype) {
-    var qmlToLoad = "";
-
-    // Open all text files in text editor
-    // With that fix it is possible to open LICENSE file
-    // which was recognised as text/x-pascal
-    if (mimetype.substring(0, 5) === "text/")
-        qmlToLoad = "TextView";
-
-    // Check if image
-    if (mimetype === "image/jpeg" || mimetype === "image/png" ||
-            mimetype === "image/gif" || mimetype === "image/tiff" ||
-            mimetype === "image/x-icon" || mimetype === "image/x-ms-bmp" ||
-            mimetype === "image/svg+xml")
-        qmlToLoad = "ImageView";
-
-    // Check if PDF document
-    if (mimetype === "application/pdf")
-        qmlToLoad = "PdfView";
-
-    if (qmlToLoad != "") {
-       pageStack.push(Qt.resolvedUrl(qmlToLoad + ".qml"));
-    } else {
-        console.debug("Unknown MIME type: "+ mimetype);
-        runUnknownTypeDialog();
-    }
-
-    return mimetype;
-}

=== added directory 'src/app/qml/pdfView'
=== added file 'src/app/qml/pdfView/PdfContentsPage.qml'
--- src/app/qml/pdfView/PdfContentsPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/pdfView/PdfContentsPage.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014, 2015
+ *                  Stefano Verzegnassi <[e-mail]>
+ *
+ * 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.0
+import Ubuntu.Components 1.1
+import QtQuick.Layouts 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Page {
+    title: i18n.tr("Contents")
+
+    ListView {
+        anchors.fill: parent
+
+        model: poppler.tocModel
+
+        delegate: ListItem.Base {
+            showDivider: model.level == 0
+
+            onClicked: {
+                pdfView.positionAtIndex(model.pageIndex);
+                pageStack.pop();
+            }
+
+            RowLayout {
+                anchors.fill: parent
+                anchors.leftMargin: units.gu(2) * model.level
+
+                spacing: units.gu(1)
+
+                Label {
+                    Layout.fillWidth: true
+
+                    text: (typeof model.title === "undefined") ? "" : model.title;
+                    elide: Text.ElideRight
+                    Component.onCompleted: { if (model.level === 0); font.weight = Font.DemiBold; }
+                }
+
+                Label {
+                    text: (typeof model.pageIndex === "undefined") ? "" : model.pageIndex + 1;
+                    Component.onCompleted: { if (model.level === 0); font.weight = Font.DemiBold; }
+                }
+            }
+        }
+    }
+}

=== added file 'src/app/qml/pdfView/PdfView.qml'
--- src/app/qml/pdfView/PdfView.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/pdfView/PdfView.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2013-2014 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 com.ubuntu.popplerqmlplugin 1.0 as PDF
+
+import "../common/utils.js" as Utils
+import "../upstreamComponents"
+
+PageWithBottomEdge {
+    id: pdfPage
+    title: Utils.getNameOfFile(file.path);
+
+    // Disable header auto-hide.
+    // TODO: Show/hide header if a user taps the page
+    flickable: null
+
+    // 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.
+    property string currentPage: i18n.tr("Page %1 of %2").arg(pdfView.currentPageIndex + 1).arg(pdfView.count)
+
+    bottomEdgeTitle: i18n.tr("Contents")
+    bottomEdgePageComponent: PdfContentsPage {}
+    bottomEdgeEnabled: poppler.tocModel.count > 0
+
+    PDF.VerticalView {
+        id: pdfView
+        objectName: "pdfView"
+        anchors.fill: parent
+        spacing: units.gu(2)
+
+        clip: true
+        boundsBehavior: Flickable.StopAtBounds
+        flickDeceleration: 1500 * units.gridUnit / 8
+        maximumFlickVelocity: 2500 * units.gridUnit / 8
+
+        contentWidth: parent.width * _zoomHelper.scale
+        cacheBuffer: height * poppler.providersNumber * _zoomHelper.scale * 0.5
+        interactive: !pinchy.pinch.active
+
+        model: poppler
+        delegate: PdfViewDelegate {
+            Component.onDestruction: DOC_VIEWER.releaseResources()
+        }
+
+        // FIXME: On zooming, keep the same content position.
+        PinchArea {
+            id: pinchy
+            anchors.fill: parent
+
+            pinch {
+                target: _zoomHelper
+                minimumScale: 1.0
+                maximumScale: 2.5
+            }
+
+            onPinchFinished: {
+                pdfView.returnToBounds();
+
+                // This is a bit expensive, so it's safer to put it here.
+                // It won't be called on desktop (where PinchArea is not used),
+                // but it's not a problem at the moment (our target is phone).
+                DOC_VIEWER.releaseResources();
+            }
+        }
+
+        Item { id: _zoomHelper }
+    }
+
+    Scrollbar { flickableItem: pdfView }
+    Scrollbar { flickableItem: pdfView; align: Qt.AlignBottom }
+
+    PDF.Document {
+        id: poppler
+
+        property bool isLoading: true
+
+        Component.onCompleted: path = file.path
+        onPagesLoaded: {
+            isLoading = false;
+
+            var title = getDocumentInfo("Title")
+            if (title !== "")
+                pdfPage.title = title
+        }
+    }
+
+    // *** HEADER ***
+    state: "default"
+    states: PdfViewDefaultHeader {
+        name: "default"
+        targetPage: pdfPage
+        activityRunning: pdfView.currentPageItem.status == Image.Loading || poppler.isLoading
+    }
+}

=== added file 'src/app/qml/pdfView/PdfViewDefaultHeader.qml'
--- src/app/qml/pdfView/PdfViewDefaultHeader.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/pdfView/PdfViewDefaultHeader.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,96 @@
+/*
+ * 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 QtQuick.Layouts 1.1
+import Ubuntu.Components.Popups 1.0
+
+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: targetPage.currentPage
+            }
+        }
+    }
+
+    backAction: Action {
+        iconName: "back"
+        text: (pageStack.depth > 1) ? i18n.tr("Back") : i18n.tr("Close")
+        onTriggered: {
+            if (pageStack.depth > 1) {
+                // Go back to Welcome page
+                pageStack.pop();
+            } else {
+                // File has been imported through Content Hub (or was not chosen through WelcomePage)
+                // Close the application and show our source app (e.g. ubuntu-filemanager-app, if used to open a document)
+                Qt.quit()
+            }
+        }
+    }
+
+    actions: [
+        Action {
+            iconName: "search"
+            // onTriggered: pageMain.state = "search"
+            //Disable it until we provide search in Poppler plugin.
+            enabled: false
+        },
+
+        Action {
+            objectName:"gotopage"
+            iconName: "browser-tabs"
+            text: "Go to page..."
+            onTriggered: PopupUtils.open(Qt.resolvedUrl("PdfViewGotoDialog.qml"), targetPage)
+        },
+
+        Action {
+            objectName: "detailsAction"
+            text: i18n.tr("Details")
+            iconName: "info"
+            onTriggered: pageStack.push(Qt.resolvedUrl("../common/DetailsPage.qml"))
+        }
+    ]
+}

=== added file 'src/app/qml/pdfView/PdfViewDelegate.qml'
--- src/app/qml/pdfView/PdfViewDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/pdfView/PdfViewDelegate.qml	2015-03-03 16:49:59 +0000
@@ -0,0 +1,95 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+
+Rectangle {
+    id: pdfPage
+
+    property int index: model.index
+    property bool _previewFetched: false
+
+    property alias status: pageImg.status
+