Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support into lp:ubuntu-docviewer-app

[Stefano Verzegnassi]

Better desktop/pocket-desktop support, by detecting the number of mice and touchpads connected to the device. This uses QInputInfo, available in the Qt snapshots - imported version from unity 8 trunk (rev.2080).

WORKAROUND: This makes new BottomEdge component fully working on desktop

Better desktop/pocket-desktop support, by detecting the number of mice and touchpads connected to the device. This uses QInputInfo, available in the Qt snapshots - imported version from unity 8 trunk (rev.2080).

WORKAROUND: This makes new BottomEdge component fully working on desktop

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:241
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/70/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/379/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/70/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support]

242. By Stefano Verzegnassi on 2016-01-14

Added translation committed in trunk, removed by mistake

243. By Stefano Verzegnassi on 2016-01-14

updated pot

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:243
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/71/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/380/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/71/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:243
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/80/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/407/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/80/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:243
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/85/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/427/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/85/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:243
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/210/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/535/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/210/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Text conflict in po/com.ubuntu.docviewer.pot
Conflict adding file po/ja.po. Moved existing file to po/ja.po.moved.
Conflict adding file po/ro.po. Moved existing file to po/ro.po.moved.
Text conflict in src/app/qml/loView/LOViewPage.qml
Text conflict in src/app/qml/pdfView/PdfView.qml
5 conflicts encountered.
bzr: ERROR: Conflicts from merge

review: Needs Fixing

[Stefano Verzegnassi (verzegnassi-stefano)]

I did some mistake when I merged trunk (.po conflicts). I will create a new branch for this and propose a new MP.

review: Disapprove

Unmerged revisions

243. By Stefano Verzegnassi on 2016-01-14

updated pot

242. By Stefano Verzegnassi on 2016-01-14

Added translation committed in trunk, removed by mistake

241. By Stefano Verzegnassi on 2016-01-14

Added 'mouseAttached' property so that BottomEdgeHint can properly work on desktop

240. By Stefano Verzegnassi on 2016-01-14

Merged trunk

239. By Stefano Verzegnassi on 2016-01-14

Added ConvergenceUtils singleton. Improved desktop/pocket desktop support.

=== modified file 'debian/control'
--- debian/control	2015-11-27 16:39:21 +0000
+++ debian/control	2016-01-14 17:54:32 +0000
@@ -17,7 +17,9 @@
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-private-dev,
                qtbase5-private-dev,
-               qtdeclarative5-test-plugin
+               qtdeclarative5-test-plugin,
+               libudev-dev,
+               libevdev-dev,
 Standards-Version: 3.9.6
 Section: misc
 Homepage: https://launchpad.net/ubuntu-docviewer-app

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2016-01-14 17:54:32 +0000
+++ po/com.ubuntu.docviewer.pot	2016-01-14 17:54:32 +0000
@@ -8,11 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< TREE
-"POT-Creation-Date: 2015-12-27 13:06+0100\n"
-=======
-"POT-Creation-Date: 2015-12-15 20:33+0100\n"
->>>>>>> MERGE-SOURCE
+"POT-Creation-Date: 2016-01-14 18:54+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"
@@ -46,7 +42,7 @@
 
 #: ../src/app/qml/common/DetailsPage.qml:26
 #: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:83
+#: ../src/app/qml/pdfView/PdfView.qml:224
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
 msgid "Details"
 msgstr ""
@@ -121,6 +117,7 @@
 #: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
 #: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfView.qml:177
 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
 msgid "Cancel"
 msgstr ""
@@ -193,33 +190,33 @@
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:100
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
 #, qt-format
 msgid "Today, %1"
 msgstr ""
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
 #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:105
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
 #, qt-format
 msgid "Yesterday, %1"
 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/DocumentListDelegate.qml:112
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:131
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
 msgid "yyyy/MM/dd 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/DocumentListDelegate.qml:125
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
 msgid "dddd, hh:mm"
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPage.qml:23
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
+#: /tmp/uitk-bottom-edge-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr ""
 
@@ -346,13 +343,13 @@
 msgstr ""
 
 #: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
+#: ../src/app/qml/pdfView/PdfView.qml:217
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
 msgid "Disable night mode"
 msgstr ""
 
 #: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
+#: ../src/app/qml/pdfView/PdfView.qml:217
 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
 msgid "Enable night mode"
 msgstr ""
@@ -396,31 +393,23 @@
 msgstr ""
 
 #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:30
-<<<<<<< TREE
-#: ../src/app/qml/pdfView/PdfView.qml:38
-=======
-#: ../src/app/qml/pdfView/PdfView.qml:40
->>>>>>> MERGE-SOURCE
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
+#: ../src/app/qml/pdfView/PdfView.qml:150
 msgid "Contents"
 msgstr ""
 
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:33
-msgid "Hide table of contents"
-msgstr ""
-
 #. 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.
-<<<<<<< TREE
-#: ../src/app/qml/pdfView/PdfView.qml:35
-=======
-#: ../src/app/qml/pdfView/PdfView.qml:32
->>>>>>> MERGE-SOURCE
+#: ../src/app/qml/pdfView/PdfView.qml:56
 #, qt-format
 msgid "Page %1 of %2"
 msgstr ""
 
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:71
+#: ../src/app/qml/pdfView/PdfView.qml:200
+msgid "Search"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfView.qml:210
 msgid "Go to page..."
 msgstr ""
 
@@ -433,7 +422,7 @@
 msgid "Choose a page between 1 and %1"
 msgstr ""
 
-#: ../src/app/qml/ubuntu-docviewer-app.qml:124
+#: ../src/app/qml/ubuntu-docviewer-app.qml:118
 msgid "File does not exist."
 msgstr ""
 
@@ -446,15 +435,15 @@
 #.
 #. where "2" is given by the argument "%1"
 #.
-#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
+#: ../src/plugin/file-qml-plugin/fileutils.cpp:101
 #, qt-format
 msgid "copy %1"
 msgstr ""
 
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /tmp/uitk-bottom-edge-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
 msgid "Document Viewer"
 msgstr ""
 
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /tmp/uitk-bottom-edge-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== removed file 'po/ja.po'
--- po/ja.po	2016-01-05 05:47:43 +0000
+++ po/ja.po	1970-01-01 00:00:00 +0000
@@ -1,448 +0,0 @@
-# Japanese translation for ubuntu-docviewer-app
-# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
-# This file is distributed under the same license as the ubuntu-docviewer-app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ubuntu-docviewer-app\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-12-27 13:06+0100\n"
-"PO-Revision-Date: 2016-01-03 18:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-01-05 05:47+0000\n"
-"X-Generator: Launchpad (build 17876)\n"
-
-#: ../src/app/qml/common/CommandLineProxy.qml:49
-msgid "Some of the provided arguments are not valid."
-msgstr ""
-
-#: ../src/app/qml/common/CommandLineProxy.qml:58
-msgid "Open ubuntu-docviewer-app displaying the selected file"
-msgstr ""
-
-#: ../src/app/qml/common/CommandLineProxy.qml:65
-msgid "Run fullscreen"
-msgstr ""
-
-#: ../src/app/qml/common/CommandLineProxy.qml:71
-msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
-msgstr ""
-
-#: ../src/app/qml/common/CommandLineProxy.qml:77
-msgid ""
-"Show documents from the given folder, instead of ~/Documents.\n"
-"The path must exist prior to running ubuntu-docviewer-app"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:26
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:83
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
-msgid "Details"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:42
-msgid "File"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:47
-msgid "Location"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:52
-msgid "Size"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:57
-msgid "Created"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:62
-msgid "Last modified"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:69
-msgid "MIME type"
-msgstr ""
-
-#: ../src/app/qml/common/ErrorDialog.qml:23
-msgid "Error"
-msgstr ""
-
-#: ../src/app/qml/common/ErrorDialog.qml:26
-#: ../src/app/qml/common/PickImportedDialog.qml:54
-#: ../src/app/qml/common/RejectedImportDialog.qml:38
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
-msgid "Close"
-msgstr ""
-
-#: ../src/app/qml/common/PickImportedDialog.qml:29
-msgid "Multiple documents imported"
-msgstr ""
-
-#: ../src/app/qml/common/PickImportedDialog.qml:30
-msgid "Choose which one to open:"
-msgstr ""
-
-#: ../src/app/qml/common/RejectedImportDialog.qml:28
-msgid "File not supported"
-msgid_plural "Files not supported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/app/qml/common/RejectedImportDialog.qml:29
-msgid "Following document has not been imported:"
-msgid_plural "Following documents have not been imported:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
-msgid "Unknown file type"
-msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:28
-msgid ""
-"This file is not supported.\n"
-"Do you want to open it as a plain text?"
-msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
-#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
-msgid "Cancel"
-msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:44
-msgid "Yes"
-msgstr ""
-
-#. TRANSLATORS: %1 is the size of a file, expressed in GB
-#: ../src/app/qml/common/utils.js:22
-#, qt-format
-msgid "%1 GB"
-msgstr ""
-
-#. TRANSLATORS: %1 is the size of a file, expressed in MB
-#: ../src/app/qml/common/utils.js:26
-#, qt-format
-msgid "%1 MB"
-msgstr ""
-
-#. TRANSLATORS: %1 is the size of a file, expressed in kB
-#: ../src/app/qml/common/utils.js:30
-#, qt-format
-msgid "%1 kB"
-msgstr ""
-
-#. TRANSLATORS: %1 is the size of a file, expressed in byte
-#: ../src/app/qml/common/utils.js:33
-#, qt-format
-msgid "%1 byte"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
-msgid "Delete file"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
-#, qt-format
-msgid "Delete %1 file"
-msgid_plural "Delete %1 files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
-msgid "Are you sure you want to permanently delete this file?"
-msgid_plural "Are you sure you want to permanently delete these files?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
-#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
-msgid "Delete"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
-msgid "Share"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:75
-msgid "No document found"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:84
-msgid ""
-"Connect your device to any computer and simply drag files to the Documents "
-"folder or insert removable media with documents."
-msgstr ""
-
-#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
-#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:100
-#, qt-format
-msgid "Today, %1"
-msgstr ""
-
-#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
-#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:105
-#, qt-format
-msgid "Yesterday, %1"
-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/DocumentListDelegate.qml:112
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:131
-msgid "yyyy/MM/dd 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/DocumentListDelegate.qml:125
-msgid "dddd, hh:mm"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPage.qml:23
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
-msgid "Documents"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
-msgid "Search..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
-msgid "Sorting settings..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
-msgid "Switch to single column list"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
-msgid "Switch to grid"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
-msgid "Pick"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-msgid "Back"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
-msgid "search in documents..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
-msgid "Select None"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
-msgid "Select All"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SearchEmptyState.qml:24
-msgid "No matching document found"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SearchEmptyState.qml:26
-msgid ""
-"Please ensure that your query is not misspelled and/or try a different query."
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:13
-msgid "Today"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:16
-msgid "Yesterday"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:19
-msgid "Earlier this week"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:22
-msgid "Earlier this month"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:24
-msgid "Even earlier..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/SharePage.qml:23
-msgid "Share to"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
-msgid "Sorting settings"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:31
-msgid "Sort by date (Latest first)"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:32
-msgid "Sort by name (A-Z)"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:33
-msgid "Sort by size (Smaller first)"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
-msgid "Reverse order"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
-#: ../src/app/qml/textView/TextView.qml:43
-msgid "Loading..."
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
-msgid "LibreOffice text document"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
-msgid "LibreOffice spread sheet"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
-msgid "LibreOffice presentation"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
-msgid "LibreOffice Draw document"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
-msgid "Unknown LibreOffice document"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
-msgid "Unknown type document"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
-msgid "Go to position..."
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
-msgid "Disable night mode"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
-msgid "Enable night mode"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
-msgid "Go to position"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
-msgid "Choose a position between 1% and 100%"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
-msgid "GO!"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewPage.qml:129
-msgid "LibreOffice binaries not found."
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewPage.qml:132
-msgid "Error while loading LibreOffice."
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewPage.qml:135
-msgid ""
-"Document not loaded.\n"
-"The requested document may be corrupt or protected by a password."
-msgstr ""
-
-#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
-#. Document Viewer for rendering LibreOffice/MS-Office documents.
-#. Ref. https://docs.libreoffice.org/libreofficekit.html
-#: ../src/app/qml/loView/Splashscreen.qml:45
-msgid "Powered by LibreOfficeKit"
-msgstr ""
-
-#: ../src/app/qml/loView/ZoomSelector.qml:110
-msgid "Fit width"
-msgstr ""
-
-#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:30
-#: ../src/app/qml/pdfView/PdfView.qml:38
-msgid "Contents"
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:36
-msgid "Hide table of contents"
-msgstr ""
-
-#. 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:35
-#, qt-format
-msgid "Page %1 of %2"
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:71
-msgid "Go to page..."
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
-msgid "Go to page"
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
-#, qt-format
-msgid "Choose a page between 1 and %1"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-docviewer-app.qml:118
-msgid "File does not exist."
-msgstr ""
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr ""
-
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
-msgid "documents;viewer;pdf;reader;"
-msgstr ""

=== added file 'po/ro.po'
--- po/ro.po	1970-01-01 00:00:00 +0000
+++ po/ro.po	2016-01-14 17:54:32 +0000
@@ -0,0 +1,449 @@
+# Romanian translation for ubuntu-docviewer-app
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the ubuntu-docviewer-app package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-docviewer-app\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-12-27 13:06+0100\n"
+"PO-Revision-Date: 2015-12-23 20:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
+"== 0) && (n != 0))) ? 2: 1));\n"
+"X-Launchpad-Export-Date: 2016-01-05 05:47+0000\n"
+"X-Generator: Launchpad (build 17876)\n"
+
+#: ../src/app/qml/common/CommandLineProxy.qml:49
+msgid "Some of the provided arguments are not valid."
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:58
+msgid "Open ubuntu-docviewer-app displaying the selected file"
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:65
+msgid "Run fullscreen"
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:71
+msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
+msgstr ""
+
+#: ../src/app/qml/common/CommandLineProxy.qml:77
+msgid ""
+"Show documents from the given folder, instead of ~/Documents.\n"
+"The path must exist prior to running ubuntu-docviewer-app"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:26
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
+#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:83
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
+msgid "Details"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:42
+msgid "File"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:47
+msgid "Location"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:52
+msgid "Size"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:57
+msgid "Created"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:62
+msgid "Last modified"
+msgstr ""
+
+#: ../src/app/qml/common/DetailsPage.qml:69
+msgid "MIME type"
+msgstr ""
+
+#: ../src/app/qml/common/ErrorDialog.qml:23
+msgid "Error"
+msgstr ""
+
+#: ../src/app/qml/common/ErrorDialog.qml:26
+#: ../src/app/qml/common/PickImportedDialog.qml:54
+#: ../src/app/qml/common/RejectedImportDialog.qml:38
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
+msgid "Close"
+msgstr ""
+
+#: ../src/app/qml/common/PickImportedDialog.qml:29
+msgid "Multiple documents imported"
+msgstr ""
+
+#: ../src/app/qml/common/PickImportedDialog.qml:30
+msgid "Choose which one to open:"
+msgstr ""
+
+#: ../src/app/qml/common/RejectedImportDialog.qml:28
+msgid "File not supported"
+msgid_plural "Files not supported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/app/qml/common/RejectedImportDialog.qml:29
+msgid "Following document has not been imported:"
+msgid_plural "Following documents have not been imported:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:27
+msgid "Unknown file type"
+msgstr ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:28
+msgid ""
+"This file is not supported.\n"
+"Do you want to open it as a plain text?"
+msgstr ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:38
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
+msgid "Cancel"
+msgstr ""
+
+#: ../src/app/qml/common/UnknownTypeDialog.qml:44
+msgid "Yes"
+msgstr ""
+
+#. TRANSLATORS: %1 is the size of a file, expressed in GB
+#: ../src/app/qml/common/utils.js:22
+#, qt-format
+msgid "%1 GB"
+msgstr ""
+
+#. TRANSLATORS: %1 is the size of a file, expressed in MB
+#: ../src/app/qml/common/utils.js:26
+#, qt-format
+msgid "%1 MB"
+msgstr ""
+
+#. TRANSLATORS: %1 is the size of a file, expressed in kB
+#: ../src/app/qml/common/utils.js:30
+#, qt-format
+msgid "%1 kB"
+msgstr ""
+
+#. TRANSLATORS: %1 is the size of a file, expressed in byte
+#: ../src/app/qml/common/utils.js:33
+#, qt-format
+msgid "%1 byte"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
+msgid "Delete file"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
+#, qt-format
+msgid "Delete %1 file"
+msgid_plural "Delete %1 files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
+msgid "Are you sure you want to permanently delete this file?"
+msgid_plural "Are you sure you want to permanently delete these files?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
+msgid "Delete"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
+msgid "Share"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:75
+msgid "No document found"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:84
+msgid ""
+"Connect your device to any computer and simply drag files to the Documents "
+"folder or insert removable media with documents."
+msgstr ""
+
+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:100
+#, qt-format
+msgid "Today, %1"
+msgstr ""
+
+#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
+#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:105
+#, qt-format
+msgid "Yesterday, %1"
+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/DocumentListDelegate.qml:112
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:131
+msgid "yyyy/MM/dd 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/DocumentListDelegate.qml:125
+msgid "dddd, hh:mm"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
+msgid "Documents"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
+msgid "Search..."
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
+msgid "Sorting settings..."
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
+msgid "Switch to single column list"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
+msgid "Switch to grid"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
+msgid "Pick"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
+msgid "Back"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
+msgid "search in documents..."
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
+msgid "Select None"
+msgstr ""
+
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
+msgid "Select All"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SearchEmptyState.qml:24
+msgid "No matching document found"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SearchEmptyState.qml:26
+msgid ""
+"Please ensure that your query is not misspelled and/or try a different query."
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:13
+msgid "Today"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:16
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:19
+msgid "Earlier this week"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:22
+msgid "Earlier this month"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SectionHeader.qml:24
+msgid "Even earlier..."
+msgstr ""
+
+#: ../src/app/qml/documentPage/SharePage.qml:23
+msgid "Share to"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
+msgid "Sorting settings"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:31
+msgid "Sort by date (Latest first)"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:32
+msgid "Sort by name (A-Z)"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:33
+msgid "Sort by size (Smaller first)"
+msgstr ""
+
+#: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
+msgid "Reverse order"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
+#: ../src/app/qml/textView/TextView.qml:43
+msgid "Loading..."
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+msgid "LibreOffice text document"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+msgid "LibreOffice spread sheet"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+msgid "LibreOffice presentation"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+msgid "LibreOffice Draw document"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+msgid "Unknown LibreOffice document"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+msgid "Unknown type document"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+msgid "Go to position..."
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Disable night mode"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
+#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+msgid "Enable night mode"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
+msgid "Go to position"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
+msgid "Choose a position between 1% and 100%"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
+msgid "GO!"
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewPage.qml:129
+msgid "LibreOffice binaries not found."
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewPage.qml:132
+msgid "Error while loading LibreOffice."
+msgstr ""
+
+#: ../src/app/qml/loView/LOViewPage.qml:135
+msgid ""
+"Document not loaded.\n"
+"The requested document may be corrupt or protected by a password."
+msgstr ""
+
+#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
+#. Document Viewer for rendering LibreOffice/MS-Office documents.
+#. Ref. https://docs.libreoffice.org/libreofficekit.html
+#: ../src/app/qml/loView/Splashscreen.qml:45
+msgid "Powered by LibreOfficeKit"
+msgstr ""
+
+#: ../src/app/qml/loView/ZoomSelector.qml:110
+msgid "Fit width"
+msgstr ""
+
+#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:30
+#: ../src/app/qml/pdfView/PdfView.qml:38
+msgid "Contents"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfContentsPage.qml:36
+msgid "Hide table of contents"
+msgstr ""
+
+#. 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:35
+#, qt-format
+msgid "Page %1 of %2"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:71
+msgid "Go to page..."
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
+msgid "Go to page"
+msgstr ""
+
+#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
+#, qt-format
+msgid "Choose a page between 1 and %1"
+msgstr ""
+
+#: ../src/app/qml/ubuntu-docviewer-app.qml:118
+msgid "File does not exist."
+msgstr ""
+
+#. TRANSLATORS: This string is used for renaming a copied file,
+#. when a file with the same name already exists in user's
+#. Documents folder.
+#. 
+#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
+#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
+#. 
+#. where "2" is given by the argument "%1"
+#. 
+#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
+#, qt-format
+msgid "copy %1"
+msgstr ""
+
+#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+msgid "Document Viewer"
+msgstr ""
+
+#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+msgid "documents;viewer;pdf;reader;"
+msgstr ""

=== removed file 'po/ro.po'
--- po/ro.po	2016-01-05 05:47:43 +0000
+++ po/ro.po	1970-01-01 00:00:00 +0000
@@ -1,449 +0,0 @@
-# Romanian translation for ubuntu-docviewer-app
-# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
-# This file is distributed under the same license as the ubuntu-docviewer-app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ubuntu-docviewer-app\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-12-27 13:06+0100\n"
-"PO-Revision-Date: 2015-12-23 20:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
-"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2016-01-05 05:47+0000\n"
-"X-Generator: Launchpad (build 17876)\n"
-
-#: ../src/app/qml/common/CommandLineProxy.qml:49
-msgid "Some of the provided arguments are not valid."
-msgstr ""
-
-#: ../src/app/qml/common/CommandLineProxy.qml:58
-msgid "Open ubuntu-docviewer-app displaying the selected file"
-msgstr ""
-
-#: ../src/app/qml/common/CommandLineProxy.qml:65
-msgid "Run fullscreen"
-msgstr ""
-
-#: ../src/app/qml/common/CommandLineProxy.qml:71
-msgid "Open ubuntu-docviewer-app in pick mode. Used for tests only."
-msgstr ""
-
-#: ../src/app/qml/common/CommandLineProxy.qml:77
-msgid ""
-"Show documents from the given folder, instead of ~/Documents.\n"
-"The path must exist prior to running ubuntu-docviewer-app"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:26
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:83
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
-msgid "Details"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:42
-msgid "File"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:47
-msgid "Location"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:52
-msgid "Size"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:57
-msgid "Created"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:62
-msgid "Last modified"
-msgstr ""
-
-#: ../src/app/qml/common/DetailsPage.qml:69
-msgid "MIME type"
-msgstr ""
-
-#: ../src/app/qml/common/ErrorDialog.qml:23
-msgid "Error"
-msgstr ""
-
-#: ../src/app/qml/common/ErrorDialog.qml:26
-#: ../src/app/qml/common/PickImportedDialog.qml:54
-#: ../src/app/qml/common/RejectedImportDialog.qml:38
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
-msgid "Close"
-msgstr ""
-
-#: ../src/app/qml/common/PickImportedDialog.qml:29
-msgid "Multiple documents imported"
-msgstr ""
-
-#: ../src/app/qml/common/PickImportedDialog.qml:30
-msgid "Choose which one to open:"
-msgstr ""
-
-#: ../src/app/qml/common/RejectedImportDialog.qml:28
-msgid "File not supported"
-msgid_plural "Files not supported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/app/qml/common/RejectedImportDialog.qml:29
-msgid "Following document has not been imported:"
-msgid_plural "Following documents have not been imported:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:27
-msgid "Unknown file type"
-msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:28
-msgid ""
-"This file is not supported.\n"
-"Do you want to open it as a plain text?"
-msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:38
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
-#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
-msgid "Cancel"
-msgstr ""
-
-#: ../src/app/qml/common/UnknownTypeDialog.qml:44
-msgid "Yes"
-msgstr ""
-
-#. TRANSLATORS: %1 is the size of a file, expressed in GB
-#: ../src/app/qml/common/utils.js:22
-#, qt-format
-msgid "%1 GB"
-msgstr ""
-
-#. TRANSLATORS: %1 is the size of a file, expressed in MB
-#: ../src/app/qml/common/utils.js:26
-#, qt-format
-msgid "%1 MB"
-msgstr ""
-
-#. TRANSLATORS: %1 is the size of a file, expressed in kB
-#: ../src/app/qml/common/utils.js:30
-#, qt-format
-msgid "%1 kB"
-msgstr ""
-
-#. TRANSLATORS: %1 is the size of a file, expressed in byte
-#: ../src/app/qml/common/utils.js:33
-#, qt-format
-msgid "%1 byte"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39
-msgid "Delete file"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:40
-#, qt-format
-msgid "Delete %1 file"
-msgid_plural "Delete %1 files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:42
-msgid "Are you sure you want to permanently delete this file?"
-msgid_plural "Are you sure you want to permanently delete these files?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
-#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
-msgid "Delete"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:44
-msgid "Share"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:75
-msgid "No document found"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:84
-msgid ""
-"Connect your device to any computer and simply drag files to the Documents "
-"folder or insert removable media with documents."
-msgstr ""
-
-#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
-#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:100
-#, qt-format
-msgid "Today, %1"
-msgstr ""
-
-#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
-#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:105
-#, qt-format
-msgid "Yesterday, %1"
-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/DocumentListDelegate.qml:112
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:131
-msgid "yyyy/MM/dd 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/DocumentListDelegate.qml:125
-msgid "dddd, hh:mm"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPage.qml:23
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
-msgid "Documents"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
-msgid "Search..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
-msgid "Sorting settings..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
-msgid "Switch to single column list"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
-msgid "Switch to grid"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
-msgid "Pick"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-msgid "Back"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
-msgid "search in documents..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
-msgid "Select None"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
-msgid "Select All"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SearchEmptyState.qml:24
-msgid "No matching document found"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SearchEmptyState.qml:26
-msgid ""
-"Please ensure that your query is not misspelled and/or try a different query."
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:13
-msgid "Today"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:16
-msgid "Yesterday"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:19
-msgid "Earlier this week"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:22
-msgid "Earlier this month"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SectionHeader.qml:24
-msgid "Even earlier..."
-msgstr ""
-
-#: ../src/app/qml/documentPage/SharePage.qml:23
-msgid "Share to"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:26
-msgid "Sorting settings"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:31
-msgid "Sort by date (Latest first)"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:32
-msgid "Sort by name (A-Z)"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:33
-msgid "Sort by size (Smaller first)"
-msgstr ""
-
-#: ../src/app/qml/documentPage/SortSettingsDialog.qml:47
-msgid "Reverse order"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
-#: ../src/app/qml/textView/TextView.qml:43
-msgid "Loading..."
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
-msgid "LibreOffice text document"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
-msgid "LibreOffice spread sheet"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
-msgid "LibreOffice presentation"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
-msgid "LibreOffice Draw document"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
-msgid "Unknown LibreOffice document"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
-msgid "Unknown type document"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
-msgid "Go to position..."
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
-msgid "Disable night mode"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:77
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
-msgid "Enable night mode"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewGotoDialog.qml:30
-msgid "Go to position"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewGotoDialog.qml:31
-msgid "Choose a position between 1% and 100%"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewGotoDialog.qml:62
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:58
-msgid "GO!"
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewPage.qml:129
-msgid "LibreOffice binaries not found."
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewPage.qml:132
-msgid "Error while loading LibreOffice."
-msgstr ""
-
-#: ../src/app/qml/loView/LOViewPage.qml:135
-msgid ""
-"Document not loaded.\n"
-"The requested document may be corrupt or protected by a password."
-msgstr ""
-
-#. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
-#. Document Viewer for rendering LibreOffice/MS-Office documents.
-#. Ref. https://docs.libreoffice.org/libreofficekit.html
-#: ../src/app/qml/loView/Splashscreen.qml:45
-msgid "Powered by LibreOfficeKit"
-msgstr ""
-
-#: ../src/app/qml/loView/ZoomSelector.qml:110
-msgid "Fit width"
-msgstr ""
-
-#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:30
-#: ../src/app/qml/pdfView/PdfView.qml:38
-msgid "Contents"
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfContentsPage.qml:36
-msgid "Hide table of contents"
-msgstr ""
-
-#. 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:35
-#, qt-format
-msgid "Page %1 of %2"
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:71
-msgid "Go to page..."
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:26
-msgid "Go to page"
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:27
-#, qt-format
-msgid "Choose a page between 1 and %1"
-msgstr ""
-
-#: ../src/app/qml/ubuntu-docviewer-app.qml:118
-msgid "File does not exist."
-msgstr ""
-
-#. TRANSLATORS: This string is used for renaming a copied file,
-#. when a file with the same name already exists in user's
-#. Documents folder.
-#. 
-#. e.g. "Manual_Aquaris_E4.5_ubuntu_EN.pdf" will become
-#. "Manual_Aquaris_E4.5_ubuntu_EN (copy 2).pdf"
-#. 
-#. where "2" is given by the argument "%1"
-#. 
-#: ../src/plugin/file-qml-plugin/docviewerutils.cpp:111
-#, qt-format
-msgid "copy %1"
-msgstr ""
-
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
-msgid "Document Viewer"
-msgstr ""
-
-#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
-msgid "documents;viewer;pdf;reader;"
-msgstr ""

=== modified file 'src/app/qml/common/ContentHubProxy.qml'
--- src/app/qml/common/ContentHubProxy.qml	2015-10-10 12:03:30 +0000
+++ src/app/qml/common/ContentHubProxy.qml	2016-01-14 17:54:32 +0000
@@ -53,11 +53,11 @@
                 for (var i=0; i<activeTransfer.items.length; i++) {
                     var sourcePath = internal.getPathFromUrl(activeTransfer.items[i].url)
 
-                    if (DocumentViewer.isFileSupported(sourcePath)) {
-                        var documentsLocation = DocumentViewer.getXdgDocumentsLocation()
+                    if (FileUtils.isFileSupported(sourcePath)) {
+                        var documentsLocation = FileUtils.getXdgDocumentsLocation()
 
                         // Check if we have already imported the same document in the past.
-                        var earlierImportedFile = DocumentViewer.checkIfFileAlreadyImported(sourcePath, [documentsLocation])
+                        var earlierImportedFile = FileUtils.checkIfFileAlreadyImported(sourcePath, [documentsLocation])
                         if (earlierImportedFile.length > 0) {
                             // Document has been already imported in the past.
                             // Append the path of the earlier copy of the
@@ -65,7 +65,7 @@
                             importedDocsModel.append({ path: earlierImportedFile })
                         } else {
                             // No document has been found, so we can safely copy it.
-                            var destPath = DocumentViewer.buildDestinationPath(documentsLocation, sourcePath);
+                            var destPath = FileUtils.buildDestinationPath(documentsLocation, sourcePath);
 
                             internal.importDocument(sourcePath, destPath)
                         }
@@ -120,7 +120,7 @@
         }
 
         function importDocument(sourcePath, destPath) {
-            DocumentViewer.copy(sourcePath, destPath)
+            FileUtils.copy(sourcePath, destPath)
             importedDocsModel.append({ path: destPath })
         }
 

=== modified file 'src/app/qml/common/DetailsPage.qml'
--- src/app/qml/common/DetailsPage.qml	2015-12-27 12:10:06 +0000
+++ src/app/qml/common/DetailsPage.qml	2016-01-14 17:54:32 +0000
@@ -40,12 +40,12 @@
 
             SubtitledListItem {
                 text: i18n.tr("File")
-                subText: DocumentViewer.getFileNameFromPath(file.path)
+                subText: FileUtils.getFileNameFromPath(file.path)
             }
 
             SubtitledListItem {
                 text: i18n.tr("Location")
-                subText: DocumentViewer.getCanonicalPath(file.path)
+                subText: FileUtils.getCanonicalPath(file.path)
             }
 
             SubtitledListItem {

=== modified file 'src/app/qml/common/PickImportedDialog.qml'
--- src/app/qml/common/PickImportedDialog.qml	2015-12-26 18:27:13 +0000
+++ src/app/qml/common/PickImportedDialog.qml	2016-01-14 17:54:32 +0000
@@ -40,7 +40,7 @@
             }
 
             Label {
-                text: DocumentViewer.getFileBaseNameFromPath(model.path)
+                text: FileUtils.getFileBaseNameFromPath(model.path)
                 anchors {
                     left: parent.left; right: parent.right
                     margins: units.gu(2)

=== modified file 'src/app/qml/loView/LOViewDefaultHeader.qml'
--- src/app/qml/loView/LOViewDefaultHeader.qml	2015-11-30 12:12:10 +0000
+++ src/app/qml/loView/LOViewDefaultHeader.qml	2016-01-14 17:54:32 +0000
@@ -73,7 +73,7 @@
             Layout.preferredHeight: units.gu(4)
 
             view: targetPage.contentItem.loView
-            visible: targetPage.contentItem && (DocumentViewer.desktopMode || mainView.wideWindow)
+            visible: targetPage.contentItem && (ConvergenceUtils.desktopMode || mainView.wideWindow)
         }
     }
 

=== modified file 'src/app/qml/loView/LOViewPage.qml'
--- src/app/qml/loView/LOViewPage.qml	2015-12-27 07:30:41 +0000
+++ src/app/qml/loView/LOViewPage.qml	2016-01-14 17:54:32 +0000
@@ -31,7 +31,7 @@
     property bool isPresentation: loPage.contentItem && (loPage.contentItem.loDocument.documentType === LibreOffice.Document.PresentationDocument)
     property bool isTextDocument: loPage.contentItem && (loPage.contentItem.loDocument.documentType === LibreOffice.Document.TextDocument)
 
-    title: DocumentViewer.getFileBaseNameFromPath(file.path);
+    title: FileUtils.getFileBaseNameFromPath(file.path);
     flickable: isTextDocument ? loPage.contentItem.loView : null
 
     splashScreen: Splashscreen { }

=== modified file 'src/app/qml/pdfView/PdfView.qml'
--- src/app/qml/pdfView/PdfView.qml	2016-01-14 17:54:32 +0000
+++ src/app/qml/pdfView/PdfView.qml	2016-01-14 17:54:32 +0000
@@ -16,12 +16,9 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-<<<<<<< TREE
-import DocumentViewer 1.0
-=======
 import Ubuntu.Components.Popups 1.3
 import QtQuick.Layouts 1.1
->>>>>>> MERGE-SOURCE
+import DocumentViewer 1.0
 import DocumentViewer.PDF 1.0 as PDF
 
 import "../common"
@@ -29,7 +26,7 @@
 
 Page {
     id: pdfPage
-    title: DocumentViewer.getFileBaseNameFromPath(file.path)
+    title: FileUtils.getFileBaseNameFromPath(file.path)
 
     header: PageHeader {
         flickable: pdfView

=== modified file 'src/app/qml/textView/TextView.qml'
--- src/app/qml/textView/TextView.qml	2015-12-26 18:27:13 +0000
+++ src/app/qml/textView/TextView.qml	2016-01-14 17:54:32 +0000
@@ -23,7 +23,7 @@
 
 Page {
     id: textPage
-    title: DocumentViewer.getFileBaseNameFromPath(file.path)
+    title: FileUtils.getFileBaseNameFromPath(file.path)
 
     // Reset night mode shader settings when closing the page
     // Component.onDestruction: mainView.nightModeEnabled = false

=== modified file 'src/app/qml/ubuntu-docviewer-app.qml'
--- src/app/qml/ubuntu-docviewer-app.qml	2015-11-30 12:12:10 +0000
+++ src/app/qml/ubuntu-docviewer-app.qml	2016-01-14 17:54:32 +0000
@@ -80,7 +80,7 @@
     onIsLandscapeChanged: {
         // If device orientation is landscape and screen width is limited,
         // force hiding Unity 8 indicators panel.
-        if (!DocumentViewer.desktopMode && mainView.isLandscape &&
+        if (!ConvergenceUtils.desktopMode && mainView.isLandscape &&
                 mainView.width < units.gu(51)) {
             mainView.fullscreen = true
             return;
@@ -202,6 +202,13 @@
         }
     }
 
+    // WORKAROUND: Not yet implemented in the SDK
+    Binding {
+        target: QuickUtils
+        property: "mouseAttached"
+        value: ConvergenceUtils.mouseAttached
+    }
+
     property bool nightModeEnabled: false
     layer.effect: NightModeShader {}
     layer.enabled: nightModeEnabled && (pageStack.depth > 1)

=== modified file 'src/plugin/file-qml-plugin/CMakeLists.txt'
--- src/plugin/file-qml-plugin/CMakeLists.txt	2015-10-21 13:16:12 +0000
+++ src/plugin/file-qml-plugin/CMakeLists.txt	2016-01-14 17:54:32 +0000
@@ -1,23 +1,48 @@
+# This includes a temporary snapshot of the WIP QInputInfo API as we
+# require this in docviewer now but upstream isn't finished yet.
+# Eventually this should be dropped in favor of the upstream
+# QInputInfo API.
+
 set(PLUGIN_DIR DocumentViewer)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 find_package(Qt5Core)
 find_package(Qt5Qml)
 find_package(Qt5Quick)
 
+pkg_check_modules(LIBUDEV REQUIRED libudev)
+pkg_check_modules(LIBEVDEV REQUIRED libevdev)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${LIBUDEV_INCLUDE_DIRS}
+    ${LIBEVDEV_INCLUDE_DIRS}
+    InputInfo/
+)
+
+# QInputInfo sources
+set(inputinfo_SRCS
+    InputInfo/qinputinfo.cpp
+    InputInfo/qinputinfo.h
+    InputInfo/linux/qinputdeviceinfo_linux.cpp
+    InputInfo/linux/qinputdeviceinfo_linux_p.h
+)
+
 #add the sources to compile
 set(fileqmlplugin_SRCS
     backend.cpp
     documentmodel.cpp
     fswatcher.cpp
     docviewerfile.cpp
-    docviewerutils.cpp
+    fileutils.cpp
+    ubuntuconvergenceutils.cpp
 )
 
 add_library(fileqmlplugin MODULE
+    ${inputinfo_SRCS}
     ${fileqmlplugin_SRCS}
 )
 
+target_link_libraries(fileqmlplugin ${LIBUDEV_LDFLAGS} ${LIBEVDEV_LDFLAGS} )
 qt5_use_modules(fileqmlplugin Qml Quick)
 
 # Copy the plugin, the qmldir file and other assets to the build dir for running in QtCreator

=== added directory 'src/plugin/file-qml-plugin/InputInfo'
=== added file 'src/plugin/file-qml-plugin/InputInfo/CMakeLists.txt'
--- src/plugin/file-qml-plugin/InputInfo/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/CMakeLists.txt	2016-01-14 17:54:32 +0000
@@ -0,0 +1,39 @@
+# This is a temporary snapshot of the WIP QInputInfo API as we
+# require this in unity now but upstream isn't finished yet.
+# Eventually this should be dropped in favor of the upstream
+# QInputInfo API.
+
+project(InputInfo)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Quick REQUIRED)
+
+pkg_check_modules(LIBUDEV REQUIRED libudev)
+pkg_check_modules(LIBEVDEV REQUIRED libevdev)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${LIBUDEV_INCLUDE_DIRS}
+    ${LIBEVDEV_INCLUDE_DIRS}
+)
+
+set(InputInfo_SOURCES
+    plugin.cpp
+    qinputinfo.cpp
+    qdeclarativeinputdevicemodel.cpp
+    linux/qinputdeviceinfo_linux.cpp
+)
+
+add_library(InputInfo SHARED
+    ${InputInfo_SOURCES}
+)
+
+target_link_libraries(InputInfo
+    ${LIBUDEV_LDFLAGS}
+    ${LIBEVDEV_LDFLAGS}
+)
+
+qt5_use_modules(InputInfo Core Qml Quick)
+
+add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo)

=== added directory 'src/plugin/file-qml-plugin/InputInfo/linux'
=== added file 'src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux.cpp'
--- src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux.cpp	2016-01-14 17:54:32 +0000
@@ -0,0 +1,288 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qinputdeviceinfo_linux_p.h"
+
+#include <libudev.h>
+#include <libevdev/libevdev.h>
+#include <fcntl.h>
+#include <QDebug>
+#include <QSocketNotifier>
+#include <QTimer>
+#include <QDir>
+
+QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :
+    QObject(parent),
+    currentFilter(QInputDevice::Unknown),
+    udevice(0)
+{
+    QTimer::singleShot(250,this,SLOT(init()));
+}
+
+QInputDeviceManagerPrivate::~QInputDeviceManagerPrivate()
+{
+    udev_unref(udevice);
+    udev_monitor_unref(udevMonitor);
+}
+
+void QInputDeviceManagerPrivate::init()
+{
+    if (!udevice)
+        udevice = udev_new();
+
+    udev_list_entry *devices;
+    udev_list_entry *dev_list_entry;
+    udev_device *dev;
+
+    QString subsystem = QStringLiteral("input");
+    struct udev_enumerate *enumerate = 0;
+
+    if (udevice) {
+
+        udevMonitor = udev_monitor_new_from_netlink(udevice, "udev");
+        udev_monitor_filter_add_match_subsystem_devtype(udevMonitor, subsystem.toLatin1(), NULL);
+        enumerate = udev_enumerate_new(udevice);
+        udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
+
+        udev_monitor_enable_receiving(udevMonitor);
+        notifierFd = udev_monitor_get_fd(udevMonitor);
+
+        notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
+        connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
+
+        udev_enumerate_scan_devices(enumerate);
+        devices = udev_enumerate_get_list_entry(enumerate);
+
+        udev_list_entry_foreach(dev_list_entry, devices) {
+            const char *path;
+            path = udev_list_entry_get_name(dev_list_entry);
+
+            dev = udev_device_new_from_syspath(udevice, path);
+            if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) {
+                QInputDevice *iDevice = addDevice(dev);
+                if (iDevice && !iDevice->devicePath().isEmpty()) {
+                    deviceMap.insert(iDevice->devicePath(),iDevice);
+                }
+            }
+            udev_device_unref(dev);
+        }
+        udev_enumerate_unref(enumerate);
+    }
+ //   udev_unref(udevice);
+    Q_FOREACH (const QString &devicePath, deviceMap.keys()) {
+        Q_EMIT deviceAdded(devicePath);
+    }
+    Q_EMIT ready();
+}
+
+QInputDevice::InputTypeFlags QInputDeviceManagerPrivate::getInputTypeFlags(struct udev_device *dev)
+{
+    QInputDevice::InputTypeFlags flags = QInputDevice::Unknown;
+    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEY"), "1") == 0 ) {
+        flags |= QInputDevice::Button;
+    }
+    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_MOUSE"), "1") == 0) {
+        flags |= QInputDevice::Mouse;
+    }
+    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD"), "1") == 0) {
+        flags |= QInputDevice::TouchPad;
+    }
+    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN"), "1") == 0
+            || qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TABLET"), "1") == 0) {
+        flags |= QInputDevice::TouchScreen;
+    }
+    if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 ) {
+        flags |= QInputDevice::Keyboard;
+    }
+    if (!QString::fromLatin1(udev_device_get_property_value(dev, "SW")).isEmpty()) {
+        flags |= QInputDevice::Switch;
+    }
+
+    return flags;
+}
+
+QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)
+{
+    QString eventPath = QString::fromLatin1(udev_device_get_sysname(udev));
+
+    if (eventPath.contains(QStringLiteral("event")))
+        eventPath.prepend(QStringLiteral("/dev/input/"));
+
+    if (deviceMap.contains(eventPath)) {
+        return Q_NULLPTR;
+    }
+    struct libevdev *dev = NULL;
+    int fd;
+    int rc = 1;
+    QInputDevice *inputDevice;
+    inputDevice = addUdevDevice(udev);
+    if (!inputDevice) {
+        return Q_NULLPTR;
+    }
+    eventPath = inputDevice->devicePath();
+
+    fd = open(eventPath.toLatin1(), O_RDONLY|O_NONBLOCK);
+    if (fd == -1) {
+        return inputDevice;
+    }
+    rc = libevdev_new_from_fd(fd, &dev);
+    if (rc < 0) {
+        qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";
+        return Q_NULLPTR;
+    }
+
+    for (int i = 0; i < EV_MAX; i++) {
+        if (i == EV_KEY || i == EV_SW || i == EV_REL
+                || i == EV_REL || i == EV_ABS) {
+            for (int j = 0; j <  libevdev_event_type_get_max(i); j++) {
+                if (libevdev_has_event_code(dev, i, j)) {
+                    switch (i) {
+                    case EV_KEY:
+                        inputDevice->addButton(j);
+                        break;
+                    case EV_SW:
+                        inputDevice->addSwitch(j);
+                        break;
+                    case EV_REL:
+                        inputDevice->addRelativeAxis(j);
+                        break;
+                    case EV_ABS:
+                        inputDevice->addAbsoluteAxis(j);
+                        break;
+                    };
+                }
+            }
+        }
+    }
+
+    return inputDevice;
+}
+
+void QInputDeviceManagerPrivate::addDetails(struct udev_device *)
+{
+}
+
+void QInputDeviceManagerPrivate::removeDevice(const QString &path)
+{
+    // this path is not a full evdev path
+    Q_FOREACH (const QString devicePath, deviceMap.keys()) {
+        if (devicePath.contains(path)) {
+            deviceMap.remove(devicePath);
+            Q_EMIT deviceRemoved(devicePath);
+        }
+    }
+}
+
+QInputDevice *QInputDeviceManagerPrivate::addUdevDevice(struct udev_device *udev)
+{
+    QInputDevice *iDevice;
+
+    struct udev_list_entry *list;
+    struct udev_list_entry *node;
+
+    list = udev_device_get_properties_list_entry (udev);
+    QString syspath = QString::fromLatin1(udev_device_get_syspath(udev));
+    QDir sysdir(syspath);
+
+    QStringList infoList = sysdir.entryList(QStringList() << QStringLiteral("event*"),QDir::Dirs);
+
+    if (infoList.count() > 0) {
+        QString token = infoList.at(0);
+
+        token.prepend(QStringLiteral("/dev/input/"));
+        iDevice = new QInputDevice(this);
+        iDevice->setDevicePath(token);
+    } else {
+        return Q_NULLPTR;
+    }
+    udev_list_entry_foreach (node, list) {
+
+        QString key = QString::fromLatin1(udev_list_entry_get_name(node));
+        QString value = QString::fromLatin1(udev_list_entry_get_value(node));
+
+        if (key == QStringLiteral("NAME")) {
+            iDevice->setName(value.remove(QStringLiteral("\"")));
+        }
+    }
+    iDevice->setType(getInputTypeFlags(udev));
+    return iDevice;
+}
+
+void QInputDeviceManagerPrivate::onUDevChanges()
+{
+    if (!udevMonitor)
+        return;
+
+    udev_device *dev = udev_monitor_receive_device(udevMonitor);
+
+    if (dev) {
+        if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) {
+            QString eventPath = QString::fromLatin1(udev_device_get_sysname(dev));
+
+            QString action = QString::fromStdString(udev_device_get_action(dev));
+
+            if (!eventPath.contains(QStringLiteral("/dev/input/")))
+                eventPath.prepend(QStringLiteral("/dev/input/"));
+
+            if (action == QStringLiteral("add")) {
+                if (deviceMap.contains(eventPath)){
+                    udev_device_unref(dev);
+                    return;
+                }
+
+                QInputDevice *iDevice = addDevice(dev);
+                if (!iDevice) {
+                    delete iDevice;
+                    return;
+                }
+                iDevice->setType(getInputTypeFlags(dev));
+                udev_device_unref(dev);
+
+                deviceMap.insert(eventPath,iDevice);
+
+                Q_EMIT deviceAdded(eventPath);
+
+            } else if (action == QStringLiteral("remove")) {
+                removeDevice(eventPath);
+            }
+        }
+    }
+}

=== added file 'src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux_p.h'
--- src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux_p.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux_p.h	2016-01-14 17:54:32 +0000
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QINPUTDEVICEINFO_LINUX_P_H
+#define QINPUTDEVICEINFO_LINUX_P_H
+
+#include <QObject>
+#include "qinputinfo.h"
+#include <libudev.h>
+
+class QInputDevicePrivate : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QInputDevicePrivate(QObject *parent = 0);
+
+    QString name;
+    QString devicePath;
+    QList <int> buttons; //keys
+    QList <int> switches;
+    QList <int> relativeAxis;
+    QList <int> absoluteAxis;
+    QInputDevice::InputTypeFlags type;
+};
+
+class QInputDeviceManagerPrivate : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QInputDeviceManagerPrivate(QObject *parent = 0);
+    ~QInputDeviceManagerPrivate();
+    QVector <QInputDevice *> deviceList;
+    QMap <QString, QInputDevice *> deviceMap;
+    static QInputDeviceManagerPrivate * instance();
+    QInputDevice::InputType currentFilter;
+
+Q_SIGNALS:
+    void deviceAdded(const QString &);
+    void deviceRemoved(const QString &);
+    void ready();
+
+private:
+    QInputDevice *addDevice(struct udev_device *udev);
+    QInputDevice *addUdevDevice(struct udev_device *);
+
+    QInputDevice *addDevice(const QString &path);
+    void removeDevice(const QString &path);
+    QSocketNotifier *notifier;
+    int notifierFd;
+    struct udev_monitor *udevMonitor;
+    QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
+    struct udev *udevice;
+    void addDetails(struct udev_device *);
+
+private Q_SLOTS:
+    void onUDevChanges();
+    void init();
+};
+
+#endif // QINPUTDEVICEINFO_LINUX_P_H

=== added file 'src/plugin/file-qml-plugin/InputInfo/plugin.cpp'
--- src/plugin/file-qml-plugin/InputInfo/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/plugin.cpp	2016-01-14 17:54:32 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Qt
+#include <QtQml/qqml.h>
+
+// self
+#include "plugin.h"
+
+// local
+#include "qdeclarativeinputdevicemodel_p.h"
+
+void InputInfoPlugin::registerTypes(const char *uri)
+{
+    int major = 0;
+    int minor = 1;
+    qmlRegisterType<QDeclarativeInputDeviceModel>(uri, major, minor, "InputDeviceModel");
+    qmlRegisterType<QInputDevice>(uri, major, minor, "InputInfo");
+}

=== added file 'src/plugin/file-qml-plugin/InputInfo/plugin.h'
--- src/plugin/file-qml-plugin/InputInfo/plugin.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/plugin.h	2016-01-14 17:54:32 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INPUTINFO_PLUGIN_H
+#define INPUTINFO_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class InputInfoPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // INPUTINFO_PLUGIN_H

=== added file 'src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel.cpp'
--- src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel.cpp	2016-01-14 17:54:32 +0000
@@ -0,0 +1,196 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Jolla.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "qdeclarativeinputdevicemodel_p.h"
+#include "qinputinfo.h"
+
+QDeclarativeInputDeviceModel::QDeclarativeInputDeviceModel(QObject *parent) :
+    QAbstractListModel(parent),
+    deviceInfo(new QInputDeviceManager),
+    currentFilter(QInputDevice::Unknown)
+{
+    connect(deviceInfo,SIGNAL(ready()),this,SLOT(updateDeviceList()));
+    connect(deviceInfo, &QInputDeviceManager::deviceAdded,this,&QDeclarativeInputDeviceModel::addedDevice);
+    connect(deviceInfo, &QInputDeviceManager::deviceRemoved,this,&QDeclarativeInputDeviceModel::removedDevice);
+}
+
+QDeclarativeInputDeviceModel::~QDeclarativeInputDeviceModel()
+{
+    delete deviceInfo;
+}
+
+QVariant QDeclarativeInputDeviceModel::data(const QModelIndex &index, int role) const
+{
+    switch (role) {
+    case ServiceRole:
+        return QVariant::fromValue(static_cast<QObject *>(inputDevices.value(index.row())));
+        break;
+    case NameRole:
+        return QVariant::fromValue(static_cast<QString>(inputDevices.value(index.row())->name()));
+        break;
+    case DevicePathRole:
+        return QVariant::fromValue(static_cast<QString>(inputDevices.value(index.row())->devicePath()));
+        break;
+    case ButtonsRole:
+        return QVariant::fromValue(static_cast<QList <int> >(inputDevices.value(index.row())->buttons()));
+        break;
+    case SwitchesRole:
+        return QVariant::fromValue(static_cast<QList <int> >(inputDevices.value(index.row())->switches()));
+        break;
+    case RelativeAxisRole:
+        return QVariant::fromValue(static_cast<QList <int> >(inputDevices.value(index.row())->relativeAxis()));
+        break;
+    case AbsoluteAxisRole:
+        return QVariant::fromValue(static_cast<QList <int> >(inputDevices.value(index.row())->absoluteAxis()));
+        break;
+    case TypesRole:
+        return QVariant::fromValue(static_cast<int>(inputDevices.value(index.row())->type()));
+        break;
+    };
+
+    return QVariant();
+}
+
+int QDeclarativeInputDeviceModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+
+    return inputDevices.count();
+}
+
+int QDeclarativeInputDeviceModel::indexOf(const QString &devicePath) const
+{
+    int idx(-1);
+    Q_FOREACH (QInputDevice *device, inputDevices) {
+        idx++;
+        if (device->devicePath() == devicePath) return idx;
+    }
+
+    return -1;
+}
+
+QInputDevice *QDeclarativeInputDeviceModel::get(int index) const
+{
+    if (index < 0 || index > inputDevices.count())
+        return 0;
+    return inputDevices.value(index);
+}
+
+void QDeclarativeInputDeviceModel::updateDeviceList()
+{
+    QVector <QInputDevice *> newDevices = deviceInfo->deviceListOfType(currentFilter);
+
+    int numNew = newDevices.count();
+
+    for (int i = 0; i < numNew; i++) {
+        int j = inputDevices.indexOf(newDevices.value(i));
+
+        if (j == -1) {
+            beginInsertRows(QModelIndex(), i, i);
+            inputDevices.insert(i, newDevices.value(i));
+            endInsertRows();
+            Q_EMIT countChanged();
+        } else if (i != j) {
+            // changed its position -> move it
+            QInputDevice* device = inputDevices.value(j);
+            beginMoveRows(QModelIndex(), j, j, QModelIndex(), i);
+            inputDevices.remove(j);
+            inputDevices.insert(i, device);
+            endMoveRows();
+            Q_EMIT countChanged();
+        } //else {
+        QModelIndex changedIndex(this->index(j, 0, QModelIndex()));
+        Q_EMIT dataChanged(changedIndex, changedIndex);
+    }
+
+    int numOld = inputDevices.count();
+    if (numOld > numNew) {
+        beginRemoveRows(QModelIndex(), numNew, numOld - 1);
+        inputDevices.remove(numNew, numOld - numNew);
+        endRemoveRows();
+        Q_EMIT countChanged();
+    }
+}
+
+void QDeclarativeInputDeviceModel::addedDevice(const QString &devicePath)
+{
+    updateDeviceList();
+    Q_EMIT deviceAdded(devicePath);
+}
+
+void QDeclarativeInputDeviceModel::removedDevice(const QString &devicePath)
+{
+    updateDeviceList();
+    Q_EMIT deviceRemoved(devicePath);
+}
+
+QHash<int,QByteArray> QDeclarativeInputDeviceModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[NameRole] = "name";
+    roles[DevicePathRole] = "devicePath";
+    roles[ButtonsRole] = "buttons";
+    roles[SwitchesRole] = "switches";
+    roles[RelativeAxisRole] = "rAxis";
+    roles[AbsoluteAxisRole] = "aAxis";
+    roles[TypesRole] = "types";
+    return roles;
+}
+
+/*
+ * Returns the currently set device filter.
+ * */
+QInputDevice::InputType QDeclarativeInputDeviceModel::deviceFilter()
+{
+    return currentFilter;
+}
+
+/*
+ * Sets the current  input device filter to filter.
+ * */
+void QDeclarativeInputDeviceModel::setDeviceFilter(QInputDevice::InputType filter)
+{
+    if (filter != currentFilter) {
+        deviceInfo->setDeviceFilter(filter);
+        currentFilter = filter;
+        updateDeviceList();
+        Q_EMIT deviceFilterChanged(filter);
+    }
+}

=== added file 'src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel_p.h'
--- src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel_p.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel_p.h	2016-01-14 17:54:32 +0000
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Jolla.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEINPUTDEVICEMODEL_H
+#define QDECLARATIVEINPUTDEVICEMODEL_H
+
+#include <QObject>
+#include <QAbstractListModel>
+#include "qinputinfo.h"
+
+class QDeclarativeInputDeviceModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(QDeclarativeInputDeviceModel)
+    Q_PROPERTY(QInputDevice::InputType deviceFilter READ deviceFilter WRITE setDeviceFilter NOTIFY deviceFilterChanged)
+
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+
+public:
+    enum ItemRoles {
+        ServiceRole = Qt::UserRole + 1,
+        NameRole,
+        DevicePathRole,
+        ButtonsRole,
+        SwitchesRole,
+        RelativeAxisRole,
+        AbsoluteAxisRole,
+        TypesRole
+    };
+
+    explicit QDeclarativeInputDeviceModel(QObject *parent = 0);
+    virtual ~QDeclarativeInputDeviceModel();
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+
+    void setDeviceFilter(QInputDevice::InputType filter);
+    QInputDevice::InputType deviceFilter();
+
+    Q_INVOKABLE int indexOf(const QString &devicePath) const;
+
+    Q_INVOKABLE QInputDevice *get(int index) const;
+    QHash<int, QByteArray> roleNames() const;
+
+Q_SIGNALS:
+    void deviceAdded(const QString &devicePath);
+    void deviceRemoved(const QString &devicePath);
+    void deviceFilterChanged(const QInputDevice::InputType filter);
+    void countChanged();
+
+public Q_SLOTS:
+    void updateDeviceList();
+private:
+    QInputDeviceManager *deviceInfo;
+    QVector<QInputDevice *> inputDevices;
+    QInputDevice::InputType currentFilter;
+
+private Q_SLOTS:
+    void addedDevice(const QString &);
+    void removedDevice(const QString &path);
+
+};
+
+#endif // QDECLARATIVEINPUTDEVICEMODEL_H

=== added file 'src/plugin/file-qml-plugin/InputInfo/qinputinfo.cpp'
--- src/plugin/file-qml-plugin/InputInfo/qinputinfo.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qinputinfo.cpp	2016-01-14 17:54:32 +0000
@@ -0,0 +1,270 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qinputinfo.h"
+
+#if defined(UNITY_MOCKS)
+#include "qinputdeviceinfo_mock_p.h"
+#elif defined(Q_OS_LINUX)
+#include "linux/qinputdeviceinfo_linux_p.h"
+#endif
+
+Q_GLOBAL_STATIC(QInputDeviceManagerPrivate, inputDeviceManagerPrivate)
+
+QT_BEGIN_NAMESPACE
+
+QInputDeviceManagerPrivate * QInputDeviceManagerPrivate::instance()
+{
+    QInputDeviceManagerPrivate *priv = inputDeviceManagerPrivate();
+    return priv;
+}
+
+QInputDevicePrivate::QInputDevicePrivate(QObject *parent) :
+    QObject(parent),
+    type(QInputDevice::Unknown)
+{
+}
+
+QInputDevice::QInputDevice(QObject *parent) :
+    QObject(parent),
+    d_ptr(new QInputDevicePrivate(this))
+{
+}
+
+/*
+ * Returns the name of this input device.
+ */
+QString QInputDevice::name() const
+{
+    return d_ptr->name;
+}
+
+/*
+ * Sets the name of this input device to \b name.
+ */
+void QInputDevice::setName(const QString &name)
+{
+    d_ptr->name = name;
+}
+
+/*
+ * Returns the device path of this device.
+ */
+QString QInputDevice::devicePath() const
+{
+    return d_ptr->devicePath;
+}
+
+/*
+ * Sets the device ppath of this device to /b path.
+ */
+void QInputDevice::setDevicePath(const QString &path)
+{
+    d_ptr->devicePath = path;
+}
+
+/*
+ * Returns the number of buttons this device has.
+ */
+QList <int> QInputDevice::buttons() const
+{
+    return d_ptr->buttons;
+}
+
+/*
+ * Adds a button
+ */
+void QInputDevice::addButton(int buttonCode)
+{
+    d_ptr->buttons.append(buttonCode);
+}
+
+/*
+ * Returns the number of switch of this device.
+ */
+QList <int> QInputDevice::switches() const
+{
+    return d_ptr->switches;
+}
+
+/*
+ * Adds a switch
+ */
+void QInputDevice::addSwitch(int switchCode)
+{
+    d_ptr->switches.append(switchCode);
+}
+
+/*
+ * Returns a list of the relative axis of this device
+ */
+QList <int> QInputDevice::relativeAxis() const
+{
+    return d_ptr->relativeAxis;
+}
+
+/*
+ */
+void QInputDevice::addRelativeAxis(int axisCode)
+{
+    d_ptr->relativeAxis.append(axisCode);
+}
+
+/*
+ * Returns a list of the absolute axis of this device
+ */
+QList <int> QInputDevice::absoluteAxis() const
+{
+    return d_ptr->absoluteAxis;
+}
+
+/*
+ */
+void QInputDevice::addAbsoluteAxis(int axisCode)
+{
+    d_ptr->absoluteAxis.append(axisCode);
+}
+
+/*
+ * Returns a QInputDevice::InputTypeFlags of all the types of types.
+ */
+QInputDevice::InputTypeFlags QInputDevice::type() const
+{
+    return d_ptr->type;
+}
+
+/*
+ */
+void QInputDevice::setType(QInputDevice::InputTypeFlags type) //? setTypes?
+{
+    d_ptr->type = type;
+}
+
+QInputDeviceManager::QInputDeviceManager(QObject *parent) :
+    QObject(parent),
+    d_ptr(inputDeviceManagerPrivate)
+{
+    connect(d_ptr, &QInputDeviceManagerPrivate::deviceAdded,this,&QInputDeviceManager::addedDevice);
+    connect(d_ptr, &QInputDeviceManagerPrivate::deviceRemoved,this,&QInputDeviceManager::deviceRemoved);
+
+    connect(d_ptr,SIGNAL(ready()),this,SIGNAL(ready()));
+}
+
+/*
+ * Returns a QMap of known input devices.
+ */
+QMap <QString, QInputDevice *> QInputDeviceManager::deviceMap()
+{
+    return d_ptr->deviceMap;
+}
+
+/*
+ */
+void QInputDeviceManager::addedDevice(const QString & devicePath)
+{
+    Q_EMIT deviceAdded(devicePath);
+}
+
+/*
+ * Returns a QVector of InputDevices of type filter
+ * */
+QVector <QInputDevice *> QInputDeviceManager::deviceListOfType(QInputDevice::InputType filter)
+{
+    QVector <QInputDevice *> dList;
+    QMapIterator<QString, QInputDevice *> i(d_ptr->deviceMap);
+    while (i.hasNext()) {
+        i.next();
+        if (i.value()->type().testFlag(filter) || filter == QInputDevice::Unknown) {
+            dList.append(i.value());
+        }
+    }
+    return dList;
+}
+
+/*
+ * Returns the number of input devices with the currently set QInputDevice::InputType filter.
+ * If no device filter has been set, returns number of all available input devices.
+ * If filter has not been set, returns all available input devices
+ */
+int QInputDeviceManager::deviceCount() const
+{
+    return deviceCount(static_cast< QInputDevice::InputType >(d_ptr->currentFilter));
+}
+
+/*
+ * Returns the number of input devices of the type filter.
+ */
+int QInputDeviceManager::deviceCount(const QInputDevice::InputType filter) const
+{
+    int dList = 0;
+    QMapIterator<QString, QInputDevice *> i(d_ptr->deviceMap);
+    while (i.hasNext()) {
+        i.next();
+//        qDebug() << i.value()->name() << i.value()->devicePath();
+//        qDebug() << i.value()->type() << i.value()->type().testFlag(filter);
+
+        if (i.value()->type().testFlag(filter)) {
+            dList++;
+        }
+    }
+    return dList;
+}
+
+/*
+ * Returns the currently set device filter.
+ * */
+QInputDevice::InputType QInputDeviceManager::deviceFilter()
+{
+    return d_ptr->currentFilter;
+}
+
+/*
+ * Sets the current  input device filter to filter.
+ * */
+void QInputDeviceManager::setDeviceFilter(QInputDevice::InputType filter)
+{
+    if (filter !=  d_ptr->currentFilter) {
+     d_ptr->currentFilter = filter;
+     Q_EMIT deviceFilterChanged(filter);
+    }
+}
+
+QT_END_NAMESPACE

=== added file 'src/plugin/file-qml-plugin/InputInfo/qinputinfo.h'
--- src/plugin/file-qml-plugin/InputInfo/qinputinfo.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qinputinfo.h	2016-01-14 17:54:32 +0000
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSystems module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QINPUTINFO_H
+#define QINPUTINFO_H
+
+#include <QObject>
+#include <QVector>
+#include <QMap>
+#include <QSocketNotifier>
+#include <QDebug>
+
+class QInputDeviceManagerPrivate;
+class QInputDevicePrivate;
+class QInputDevice;
+
+class QInputDeviceManager;
+
+class QInputDevice : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(InputType)
+    Q_FLAGS(InputType InputTypeFlags)
+    friend class QInputDeviceManagerPrivate;
+
+public:
+
+    enum InputType {
+        Unknown = 0,
+        Button = 1,
+        Mouse = 2,
+        TouchPad = 4,
+        TouchScreen = 8,
+        Keyboard = 16,
+        Switch = 32
+    };
+    Q_ENUMS(InputType)
+    Q_DECLARE_FLAGS(InputTypeFlags, InputType)
+
+    explicit QInputDevice(QObject *parent = 0);
+    QString name() const;
+    QString devicePath() const;
+    QList <int> buttons() const; //keys event code
+    QList <int> switches() const;
+    QList <int> relativeAxis() const;
+    QList <int> absoluteAxis() const;
+    QInputDevice::InputTypeFlags type() const;
+
+private:
+
+    QInputDevicePrivate *d_ptr;
+    void setName(const QString &);
+    void setDevicePath(const QString &);
+    void addButton(int);
+    void addSwitch(int);
+    void addRelativeAxis(int);
+    void addAbsoluteAxis(int);
+    void setType(QInputDevice::InputTypeFlags flags);
+
+};
+
+Q_DECLARE_METATYPE(QInputDevice::InputType)
+Q_DECLARE_METATYPE(QInputDevice::InputTypeFlags)
+
+class QInputDeviceManagerPrivate;
+
+class QInputDeviceManager : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int deviceCount READ deviceCount NOTIFY deviceCountChanged)
+    Q_PROPERTY(QInputDevice::InputType deviceFilter READ deviceFilter WRITE setDeviceFilter NOTIFY deviceFilterChanged)
+public:
+
+    explicit QInputDeviceManager(QObject *parent = 0);
+
+    int deviceCount() const;
+    int deviceCount(const QInputDevice::InputType filter) const;
+
+    void setDeviceFilter(QInputDevice::InputType filter);
+    QInputDevice::InputType deviceFilter();
+
+    QMap <QString, QInputDevice *> deviceMap();
+    Q_INVOKABLE QVector <QInputDevice *> deviceListOfType(QInputDevice::InputType filter);
+
+Q_SIGNALS:
+
+    void deviceAdded(const QString & devicePath);
+    void deviceRemoved(const QString & devicePath);
+
+    void ready();
+    void deviceCountChanged(int count);
+    void deviceFilterChanged(const QInputDevice::InputType filter);
+
+public Q_SLOTS:
+    void addedDevice(const QString & devicePath);
+
+private:
+    Q_DISABLE_COPY(QInputDeviceManager)
+#if !defined(QT_SIMULATOR)
+    QInputDeviceManagerPrivate *const d_ptr;
+    Q_DECLARE_PRIVATE(QInputDeviceManager)
+#endif
+};
+
+#endif // QINPUTINFO_H

=== added file 'src/plugin/file-qml-plugin/InputInfo/qmldir'
--- src/plugin/file-qml-plugin/InputInfo/qmldir	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/InputInfo/qmldir	2016-01-14 17:54:32 +0000
@@ -0,0 +1,3 @@
+module Unity.InputInfo
+plugin InputInfo
+typeinfo InputInfo.qmltypes

=== modified file 'src/plugin/file-qml-plugin/backend.cpp'
--- src/plugin/file-qml-plugin/backend.cpp	2015-09-19 15:40:22 +0000
+++ src/plugin/file-qml-plugin/backend.cpp	2016-01-14 17:54:32 +0000
@@ -21,15 +21,25 @@
 #include "backend.h"
 #include "documentmodel.h"
 #include "docviewerfile.h"
-#include "docviewerutils.h"
-
-static QObject *registerDocviewerUtils (QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-
-    DocviewerUtils *ch = new DocviewerUtils();
-    return ch;
+#include "fileutils.h"
+#include "ubuntuconvergenceutils.h"
+
+static QObject *registerFileUtils (QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    DocviewerFileUtils *f = new DocviewerFileUtils();
+    return f;
+}
+
+static QObject *registerConvergenceUtils (QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    UbuntuConvergenceUtils *c = new UbuntuConvergenceUtils();
+    return c;
 }
 
 void BackendPlugin::registerTypes(const char *uri)
@@ -41,7 +51,8 @@
     qmlRegisterType<DocumentModel>(uri, 1, 0, "DocumentsModel");
     qmlRegisterType<DocviewerFile>(uri, 1, 0, "File");
 
-    qmlRegisterSingletonType<DocviewerUtils>(uri, 1, 0, "DocumentViewer", registerDocviewerUtils);
+    qmlRegisterSingletonType<DocviewerFileUtils>(uri, 1, 0, "FileUtils", registerFileUtils);
+    qmlRegisterSingletonType<UbuntuConvergenceUtils>(uri, 1, 0, "ConvergenceUtils", registerConvergenceUtils);
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/plugin/file-qml-plugin/documentmodel.cpp'
--- src/plugin/file-qml-plugin/documentmodel.cpp	2015-09-19 15:40:22 +0000
+++ src/plugin/file-qml-plugin/documentmodel.cpp	2016-01-14 17:54:32 +0000
@@ -17,7 +17,7 @@
 
 #include "documentmodel.h"
 #include "fswatcher.h"
-#include "docviewerutils.h"
+#include "fileutils.h"
 
 #include <QStandardPaths>
 #include <QDir>
@@ -115,7 +115,7 @@
 
 bool DocumentModel::isFileSupported(const QString &path)
 {
-    return DocviewerUtils::isFileSupported(path);
+    return DocviewerFileUtils::isFileSupported(path);
 }
 
 QHash<int, QByteArray> DocumentModel::roleNames() const

=== renamed file 'src/plugin/file-qml-plugin/docviewerutils.cpp' => 'src/plugin/file-qml-plugin/fileutils.cpp'
--- src/plugin/file-qml-plugin/docviewerutils.cpp	2015-12-27 12:10:06 +0000
+++ src/plugin/file-qml-plugin/fileutils.cpp	2016-01-14 17:54:32 +0000
@@ -14,7 +14,7 @@
   along with this program. If not, see http://www.gnu.org/licenses/.
 */
 
-#include "docviewerutils.h"
+#include "fileutils.h"
 
 #include <QFileInfo>
 #include <QDir>
@@ -22,18 +22,8 @@
 #include <QStandardPaths>
 #include <QDirIterator>
 #include <QDateTime>
-#include <QtGui/QGuiApplication>
-
-bool DocviewerUtils::desktopMode() const
-{
-    // Assume that platformName (QtUbuntu) with ubuntu
-    // in name means it's running on device
-    // TODO: replace this check with SDK call for formfactor
-    QString platform = QGuiApplication::platformName();
-    return !((platform == "ubuntu") || (platform == "ubuntumirclient"));
-}
-
-bool DocviewerUtils::exists(const QString &path)
+
+bool DocviewerFileUtils::exists(const QString &path)
 {
     QFileInfo fi(path);
 
@@ -44,12 +34,12 @@
     return QDir(path).exists();
 }
 
-bool DocviewerUtils::copy(const QString &source, const QString &destination)
+bool DocviewerFileUtils::copy(const QString &source, const QString &destination)
 {
     return QFile::copy(source, destination);
 }
 
-bool DocviewerUtils::isFileSupported(const QString &path)
+bool DocviewerFileUtils::isFileSupported(const QString &path)
 {
     QMimeDatabase mdb;
     const QString mimetype = mdb.mimeTypeForFile(path).name();
@@ -65,12 +55,12 @@
             || mimetype == "application/vnd.ms-powerpoint";
 }
 
-QString DocviewerUtils::getXdgDocumentsLocation()
+QString DocviewerFileUtils::getXdgDocumentsLocation()
 {
     return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
 }
 
-QString DocviewerUtils::buildDestinationPath(const QString &destinationDir, const QString &sourcePath)
+QString DocviewerFileUtils::buildDestinationPath(const QString &destinationDir, const QString &sourcePath)
 {
     QFileInfo fi(sourcePath);
 
@@ -135,7 +125,7 @@
 // Return the path of the file, if found in the storageLocation paths,
 // otherwise return an empty string.
 // Used for prevent importing of a second copy of a file through ContentHub.
-QString DocviewerUtils::checkIfFileAlreadyImported(const QString &filePath, const QStringList &storageLocationList)
+QString DocviewerFileUtils::checkIfFileAlreadyImported(const QString &filePath, const QStringList &storageLocationList)
 {
     QFileInfo fi(filePath);
     QStringList files;
@@ -168,17 +158,17 @@
     return QString();
 }
 
-QString DocviewerUtils::getFileBaseNameFromPath(const QString &filePath)
+QString DocviewerFileUtils::getFileBaseNameFromPath(const QString &filePath)
 {
     return QFileInfo(filePath).completeBaseName();
 }
 
-QString DocviewerUtils::getFileNameFromPath(const QString &filePath)
+QString DocviewerFileUtils::getFileNameFromPath(const QString &filePath)
 {
     return QFileInfo(filePath).fileName();
 }
 
-QString DocviewerUtils::getCanonicalPath(const QString &filePath)
+QString DocviewerFileUtils::getCanonicalPath(const QString &filePath)
 {
     return QFileInfo(filePath).canonicalPath();
 }

=== renamed file 'src/plugin/file-qml-plugin/docviewerutils.h' => 'src/plugin/file-qml-plugin/fileutils.h'
--- src/plugin/file-qml-plugin/docviewerutils.h	2015-12-27 12:10:06 +0000
+++ src/plugin/file-qml-plugin/fileutils.h	2016-01-14 17:54:32 +0000
@@ -14,19 +14,16 @@
   along with this program. If not, see http://www.gnu.org/licenses/.
 */
 
-#ifndef DOCVIEWERUTILS_H
-#define DOCVIEWERUTILS_H
+#ifndef DOCVIEWER_FILEUTILS_H
+#define DOCVIEWER_FILEUTILS_H
 
 #include <QObject>
 
-class DocviewerUtils : public QObject
+class DocviewerFileUtils : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(bool desktopMode READ desktopMode CONSTANT)
 
 public:
-    bool desktopMode() const;
-
     Q_INVOKABLE static bool exists(const QString &path);
     Q_INVOKABLE static bool copy(const QString &source, const QString &destination);
 
@@ -42,4 +39,4 @@
     Q_INVOKABLE static QString getCanonicalPath(const QString &filePath);
 };
 
-#endif // DOCVIEWERUTILS_H
+#endif // DOCVIEWER_FILEUTILS_H

=== added file 'src/plugin/file-qml-plugin/ubuntuconvergenceutils.cpp'
--- src/plugin/file-qml-plugin/ubuntuconvergenceutils.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/ubuntuconvergenceutils.cpp	2016-01-14 17:54:32 +0000
@@ -0,0 +1,82 @@
+/*
+  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/.
+*/
+
+#include "ubuntuconvergenceutils.h"
+#include "InputInfo/qinputinfo.h"
+
+#include <QtGui/QGuiApplication>
+
+bool isUnity8Env()
+{
+    // Assume that platformName (QtUbuntu) with ubuntu
+    // in name means it's running on device
+    QString platform = QGuiApplication::platformName();
+    return (platform == "ubuntu") || (platform == "ubuntumirclient");
+}
+
+UbuntuConvergenceUtils::UbuntuConvergenceUtils(QObject *parent) :
+    QObject(parent),
+    m_desktopMode(false),
+    m_mouseAttached(false),
+    m_inputDevicesWatcher(new QInputDeviceManager())
+{
+    // Initialize signals when the watcher is ready.
+    // QInputDeviceManager() emits deviceAdded() signal multiple times during its
+    // initializations.
+    connect(m_inputDevicesWatcher, &QInputDeviceManager::ready,
+            this, &UbuntuConvergenceUtils::init);
+}
+
+void UbuntuConvergenceUtils::init()
+{
+    // Connect signals
+    connect(m_inputDevicesWatcher, SIGNAL(deviceAdded(QString)), this, SLOT(checkPointersCount()));
+    connect(m_inputDevicesWatcher, SIGNAL(deviceRemoved(QString)), this, SLOT(checkPointersCount()));
+
+    checkPointersCount();
+}
+
+void UbuntuConvergenceUtils::checkPointersCount()
+{
+    int mouseCount = m_inputDevicesWatcher->deviceCount(QInputDevice::Mouse);
+    int touchPadCount = m_inputDevicesWatcher->deviceCount(QInputDevice::TouchPad);
+
+    setMouseAttached(mouseCount || touchPadCount);
+    setDesktopMode(isUnity8Env() || m_mouseAttached);
+}
+
+void UbuntuConvergenceUtils::setDesktopMode(bool desktopMode)
+{
+    if (m_desktopMode == desktopMode)
+        return;
+
+    m_desktopMode = desktopMode;
+    Q_EMIT desktopModeChanged();
+}
+
+void UbuntuConvergenceUtils::setMouseAttached(bool mouseAttached)
+{
+    if (m_mouseAttached == mouseAttached)
+        return;
+
+    m_mouseAttached = mouseAttached;
+    Q_EMIT mouseAttachedChanged();
+}
+
+UbuntuConvergenceUtils::~UbuntuConvergenceUtils()
+{
+    delete m_inputDevicesWatcher;
+}

=== added file 'src/plugin/file-qml-plugin/ubuntuconvergenceutils.h'
--- src/plugin/file-qml-plugin/ubuntuconvergenceutils.h	1970-01-01 00:00:00 +0000
+++ src/plugin/file-qml-plugin/ubuntuconvergenceutils.h	2016-01-14 17:54:32 +0000
@@ -0,0 +1,56 @@
+/*
+  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/.
+*/
+
+#ifndef DOCVIEWER_CONVERGENCEUTILS_H
+#define DOCVIEWER_CONVERGENCEUTILS_H
+
+#include <QObject>
+
+class QInputDeviceManager;
+
+class UbuntuConvergenceUtils : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool desktopMode READ desktopMode NOTIFY desktopModeChanged)
+    Q_PROPERTY(bool mouseAttached READ mouseAttached NOTIFY mouseAttachedChanged)
+
+public:
+    UbuntuConvergenceUtils(QObject *parent = 0);
+    ~UbuntuConvergenceUtils();
+
+    bool desktopMode() const { return m_desktopMode; }
+    bool mouseAttached() const { return m_mouseAttached; }
+
+Q_SIGNALS:
+    void desktopModeChanged();
+    void mouseAttachedChanged();
+
+private slots:
+    void checkPointersCount();
+    void init();
+
+private:
+    bool m_desktopMode;
+    bool m_mouseAttached;
+
+private:
+    QInputDeviceManager* m_inputDevicesWatcher;
+
+    void setDesktopMode(bool desktopMode);
+    void setMouseAttached(bool mouseAttached);
+};
+
+#endif // DOCVIEWER_CONVERGENCEUTILS_H