Merge lp:~ahayzen/ubuntu-printing-app/additional-fixes into lp:ubuntu-printing-app

[Andrew Hayzen]

* Set max width of options
* Set NoDisplay=true to hide the app in unity
* Hide left/right buttons when they are disabled
* Change the default height of the preview to 40%
* Set a minimum height of 15GU for the preview
* Allow use of a separator to resize the preview height and workaround ScrollView limitations
* Move collate and reverse to the bottom
* Set the content-hub json as this to be a share of content-hub
* Add tests for new separate resize and minimum height

* Set max width of options
* Set NoDisplay=true to hide the app in unity
* Hide left/right buttons when they are disabled
* Change the default height of the preview to 40%
* Set a minimum height of 15GU for the preview
* Allow use of a separator to resize the preview height and workaround ScrollView limitations
* Move collate and reverse to the bottom
* Set the content-hub json as this to be a share of content-hub
* Add tests for new separate resize and minimum height

[lp:~ahayzen/ubuntu-printing-app/additional-fixes]

86. By Andrew Hayzen on 2017-03-08

* Change the default preview height to be 40% of the height
* Set a minimum height of 15GU for the preview
* Update tests

[Michael Sheldon (michael-sheldon)]

Looks good :)

review: Approve

[Ken VanDine (ken-vandine)]

Packaging changes in rev 85 look fine

review: Approve (packaging)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-08 13:00:13 +0000
+++ CMakeLists.txt	2017-03-08 13:00:14 +0000
@@ -37,12 +37,7 @@
 
 # Set the path for the QML files and the backend
 set(UBUNTU_PRINTING_APP_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE}")
-execute_process(
-COMMAND qmake -qt=qt5 -query QT_INSTALL_QML
-        OUTPUT_VARIABLE QT_IMPORTS_DIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-set(MODULE_PATH ${QT_IMPORTS_DIR}/UbuntuPrintingApp)
+set(MODULE_PATH ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${APP_HARDCODE})
 
 # Set the exec path
 if(SNAP_MODE)

=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2017-03-08 13:00:13 +0000
+++ backend/CMakeLists.txt	2017-03-08 13:00:14 +0000
@@ -30,5 +30,5 @@
   DEPENDS ${QMLFILES})
 
 # Install the plugin file
-install(TARGETS ${LIBNAME} DESTINATION ${MODULE_PATH})
-install(FILES UbuntuPrintingApp/qmldir DESTINATION ${MODULE_PATH})
+install(TARGETS ${LIBNAME} DESTINATION ${MODULE_PATH}/UbuntuPrintingApp)
+install(FILES UbuntuPrintingApp/qmldir DESTINATION ${MODULE_PATH}/UbuntuPrintingApp)

=== modified file 'debian/control'
--- debian/control	2017-03-08 13:00:13 +0000
+++ debian/control	2017-03-08 13:00:14 +0000
@@ -15,10 +15,8 @@
                qtdeclarative5-ubuntu-content1,
                qtdeclarative5-ubuntu-ui-extras0.2,
                qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
-               qt5-qmake,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
-               ubuntu-sdk-qmake-extras,
                xvfb
 Standards-Version: 3.9.7
 Homepage: http://launchpad.net/ubuntu-printing-app

=== modified file 'setup/gui/ubuntu-printing-app.desktop'
--- setup/gui/ubuntu-printing-app.desktop	2017-03-08 13:00:13 +0000
+++ setup/gui/ubuntu-printing-app.desktop	2017-03-08 13:00:14 +0000
@@ -2,6 +2,7 @@
 Name=ubuntu-printing-app
 Exec=ubuntu-printing-app
 Icon=${SNAP}/meta/gui/ubuntu-printing-app.svg
+NoDisplay=true
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2017-03-08 13:00:13 +0000
+++ snapcraft.yaml	2017-03-08 13:00:14 +0000
@@ -32,10 +32,8 @@
      - libpoppler-qt5-dev
      - qml-module-qttest
      - qml-module-ubuntu-test
-     - qt5-default
-     - qt5-qmake
      - qtdeclarative5-dev
-     - ubuntu-sdk-qmake-extras
+     - qtdeclarative5-dev-tools
      - xvfb
     configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DSNAP_MODE=on]
     plugin: cmake

=== modified file 'tests/qmltests/tst_PreviewRow.qml'
--- tests/qmltests/tst_PreviewRow.qml	2017-03-08 13:00:13 +0000
+++ tests/qmltests/tst_PreviewRow.qml	2017-03-08 13:00:14 +0000
@@ -50,10 +50,20 @@
     PreviewRow {
         id: previewRow
         document: testDocument
+        monitorMouseArea: globalMouseArea
         printerJob: mockPrinterJob
         view: mockView
     }
 
+    MouseArea {
+        id: globalMouseArea
+        anchors {
+            fill: parent
+        }
+        acceptedButtons: Qt.NoButton
+        hoverEnabled: true
+    }
+
     SignalSpy {
         id: documentCountSpy
         signalName: "onCountChanged"
@@ -75,6 +85,11 @@
 
             mockPrinterJob.colorModelType = PrinterEnum.ColorType;
 
+            mockView.width = units.gu(100);
+
+            // Reset the separator y position
+            findChild(root, "separator").resizer.y = 0;
+
             activityIndicatorSpy.target = null;
             activityIndicatorSpy.clear();
             documentCountSpy.clear();
@@ -192,6 +207,7 @@
             // Check with multi page doc, next button becomes enabled
             compare(testDocument.count, 3);
             compare(next.enabled, true);
+            compare(next.visible, true);
             compare(pageHelper.page, 0);
 
             // Check the requested image page is 0
@@ -202,6 +218,7 @@
             mouseClick(next);
             tryCompare(pageHelper, "page", 1);
             compare(next.enabled, true);
+            compare(next.visible, true);
 
             // Check the requested image page is 1
             // image://poppler/1/true/file:///path/to/file.pdf
@@ -217,6 +234,7 @@
             tryCompare(image, "status", Image.Ready);
             tryCompare(pageHelper, "page", 2);
             compare(next.enabled, false);
+            compare(next.visible, false);
 
             // Check the requested image page is 2
             // image://poppler/2/true/file:///path/to/file.pdf
@@ -236,6 +254,7 @@
             // Check with mulit page doc, previous is still disabled when on 1st
             compare(testDocument.count, 3);
             compare(previous.enabled, false);
+            compare(previous.visible, false);
             compare(pageHelper.page, 0)
 
             // Check the requested image page is 0
@@ -246,6 +265,7 @@
             pageHelper.page = 2;
             tryCompare(pageHelper, "page", 2);
             compare(previous.enabled, true);
+            compare(previous.visible, true);
 
             // Check the requested image page is 2
             // image://poppler/2/true/file:///path/to/file.pdf
@@ -255,6 +275,7 @@
             mouseClick(previous);
             tryCompare(pageHelper, "page", 1);
             compare(previous.enabled, true);
+            compare(previous.visible, true);
 
             // Check the requested image page is 1
             // image://poppler/1/true/file:///path/to/file.pdf
@@ -264,6 +285,7 @@
             mouseClick(previous);
             tryCompare(pageHelper, "page", 0);
             compare(previous.enabled, false);
+            compare(previous.visible, false);
 
             // Check the requested image page is 0
             // image://poppler/0/true/file:///path/to/file.pdf
@@ -296,21 +318,61 @@
             // test that the implicitHeight is set from the view height
             var pageHelper = previewRow.pageHelper;
 
-            // min((WIDTH - 10) / ASPECT, HEIGHT / 1.5)
+            // min((WIDTH - 10) / ASPECT, HEIGHT * 0.4)
 
             // height/width of 100GU, aspect is 0.71
-            // min((100 - 10) / 0.71, 100 / 1.5)
-            // min(126.76, 66.66)
-            fuzzyCompare(previewRow.implicitHeight, units.gu(66.66), units.gu(1));
+            // min((100 - 10) / 0.71, 100 * 0.4)
+            // min(126.76, 40.00)
+            fuzzyCompare(previewRow.implicitHeight, units.gu(40), units.gu(1));
 
             // Change the view to have a short width
-            mockView.width = units.gu(50);
-            waitForRendering(previewRow);
-
-            // width 50GU, height 100GU, aspect is 0.71
-            // min((50 - 10) / 0.71, 100 / 1.5)
-            // min(56.33, 66.66)
-            fuzzyCompare(previewRow.implicitHeight, units.gu(56.33), units.gu(1));
+            mockView.width = units.gu(20);
+            waitForRendering(previewRow);
+
+            // width 20GU, height 100GU, aspect is 0.71
+            // min((20 - 10) / 0.71, 100 * 0.4)
+            // min(14.08, 40.00)
+            fuzzyCompare(previewRow.implicitHeight, units.gu(14.08), units.gu(1));
+        }
+
+        function test_view_heightDiff() {
+            // Test that changing the heightDiff changes the view height
+            var pageHelper = previewRow.pageHelper;
+
+            // min((WIDTH - 10) / ASPECT, HEIGHT * 0.4)  +  heightDiff
+
+            // height/width of 100GU, aspect is 0.71
+            // min((100 - 10) / 0.71, 100 * 0.4)
+            // min(126.76, 40.00)
+            fuzzyCompare(previewRow.implicitHeight, units.gu(40), units.gu(1));
+
+            var sepearator = findChild(root, "separator");
+            sepearator.resizer.y = units.gu(10);
+
+            waitForRendering(previewRow);
+
+            // min(126.76, 40.00) + units.gu(10)
+            fuzzyCompare(previewRow.implicitHeight, units.gu(50), units.gu(1));
+        }
+
+        function test_view_heightDiff_minimum() {
+            // Test that changing the heightDiff cannot go below the minimum
+            var pageHelper = previewRow.pageHelper;
+
+            // min((WIDTH - 10) / ASPECT, HEIGHT * 0.4)  +  heightDiff
+
+            // height/width of 100GU, aspect is 0.71
+            // min((100 - 10) / 0.71, 100 * 0.4)
+            // min(126.76, 40.00)
+            fuzzyCompare(previewRow.implicitHeight, units.gu(40), units.gu(1));
+
+            var sepearator = findChild(root, "separator");
+            sepearator.resizer.y = -units.gu(1000);
+
+            waitForRendering(previewRow);
+
+            // min(126.76, 40.00) - units.gu(1000)
+            fuzzyCompare(previewRow.implicitHeight, previewRow.minimumHeight, units.gu(1));
         }
     }
 }

=== modified file 'tests/qmltests/tst_PrintPage.qml'
--- tests/qmltests/tst_PrintPage.qml	2017-03-08 13:00:13 +0000
+++ tests/qmltests/tst_PrintPage.qml	2017-03-08 13:00:14 +0000
@@ -27,7 +27,8 @@
 
 Item {
     width: units.gu(100)
-    height: units.gu(75)
+    // use a large height so all options are visible to click
+    height: units.gu(150)
 
     // Mock the PrintingHelper
     QtObject {

=== modified file 'tests/qmltests/tst_SelectorRow.qml'
--- tests/qmltests/tst_SelectorRow.qml	2017-03-08 13:00:13 +0000
+++ tests/qmltests/tst_SelectorRow.qml	2017-03-08 13:00:14 +0000
@@ -71,11 +71,13 @@
         }
 
         function test_changeOption() {
+            var selector = findChild(selectorRow, "selector");
+
             // Check selectedIndex is the starting index
             compare(selectorRow.selectedIndex, dataSelectedIndex);
 
             // Expand the selector
-            mouseClick(selectorRow);
+            mouseClick(selector);
             expansionCompletedSpy.wait();
             compare(expansionCompletedSpy.count, 1);
 

=== modified file 'ubuntu-printing-app/Main.qml'
--- ubuntu-printing-app/Main.qml	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/Main.qml	2017-03-08 13:00:14 +0000
@@ -23,7 +23,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Components.Popups 1.3
-import Ubuntu.Content 1.1
+import Ubuntu.Content 1.3
 import UbuntuPrintingApp 1.0
 import Ubuntu.Components.Extras.Printers 0.1
 

=== added file 'ubuntu-printing-app/components/BaseRowLayout.qml'
--- ubuntu-printing-app/components/BaseRowLayout.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-printing-app/components/BaseRowLayout.qml	2017-03-08 13:00:14 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+
+RowLayout {
+    anchors {
+        horizontalCenter: parent.horizontalCenter
+    }
+    Layout.maximumWidth: Math.min(units.gu(60), parent.width - units.gu(4))
+}

=== modified file 'ubuntu-printing-app/components/CMakeLists.txt'
--- ubuntu-printing-app/components/CMakeLists.txt	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/components/CMakeLists.txt	2017-03-08 13:00:14 +0000
@@ -1,5 +1,6 @@
 set(COMPONENT_QML_JS_FILES
     AlertDialog.qml
+    BaseRowLayout.qml
     CheckBoxRow.qml
     LabelRow.qml
     PreviewRow.qml

=== modified file 'ubuntu-printing-app/components/CheckBoxRow.qml'
--- ubuntu-printing-app/components/CheckBoxRow.qml	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/components/CheckBoxRow.qml	2017-03-08 13:00:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Canonical Ltd.
+ * Copyright 2016, 2017 Canonical Ltd.
  *
  * This file is part of ubuntu-printing-app.
  *
@@ -22,15 +22,7 @@
 
 import Ubuntu.Components 1.3
 
-RowLayout {
-    anchors {
-        left: parent.left
-        leftMargin: units.gu(2)
-        right: parent.right
-        rightMargin: units.gu(2)
-    }
-    Layout.maximumWidth: width
-
+BaseRowLayout {
     property alias checked: checkbox.checked
     property alias checkboxText: checkboxLabel.text
     property alias enabled: checkbox.enabled

=== modified file 'ubuntu-printing-app/components/LabelRow.qml'
--- ubuntu-printing-app/components/LabelRow.qml	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/components/LabelRow.qml	2017-03-08 13:00:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Canonical Ltd.
+ * Copyright 2016, 2017 Canonical Ltd.
  *
  * This file is part of ubuntu-printing-app.
  *
@@ -22,15 +22,7 @@
 
 import Ubuntu.Components 1.3
 
-RowLayout {
-    anchors {
-        left: parent.left
-        leftMargin: units.gu(2)
-        right: parent.right
-        rightMargin: units.gu(2)
-    }
-    Layout.maximumWidth: width
-
+BaseRowLayout {
     property alias enabled: secondaryLabel.enabled
     property alias primaryText: primaryLabel.text
     property alias secondaryText: secondaryLabel.text

=== modified file 'ubuntu-printing-app/components/PreviewRow.qml'
--- ubuntu-printing-app/components/PreviewRow.qml	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/components/PreviewRow.qml	2017-03-08 13:00:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Canonical Ltd.
+ * Copyright 2016, 2017 Canonical Ltd.
  *
  * This file is part of ubuntu-printing-app.
  *
@@ -31,12 +31,21 @@
     }
     // Use foreground as this element is ontop of the background
     color: theme.palette.normal.foreground
-    // Height is smallest of
+
+    // Height is the calculated height + the difference given by the separator
+    // but also has a minimumHeight, otherwise it can be resized too small
+    implicitHeight: Math.max(separator.heightDiff + calcHeight, minimumHeight)
+
+    // Calculated height is smallest of
     // - calc'd height using aspect and width of image
-    // - 2/3 height of the view
-    implicitHeight: Math.min((view.width - units.gu(10)) / pageHelper.aspect, view.height / 1.5)
+    // - 40% height of the view
+    readonly property double calcHeight: Math.min((view.width - units.gu(10)) / pageHelper.aspect, view.height * 0.4)
 
     property Document document
+    property double minimumHeight: units.gu(15)
+    // This is the MouseArea that the separator uses to monitor when to change
+    // the cursorShape
+    property MouseArea monitorMouseArea: null
     property var printerJob
     property var view
 
@@ -65,6 +74,7 @@
         objectName: "previousButton"
         text: "<"
         width: units.gu(4)
+        visible: enabled
 
         onClicked: pageHelper.page--
     }
@@ -110,6 +120,7 @@
         objectName: "nextButton"
         text: ">"
         width: units.gu(4)
+        visible: enabled
 
         onClicked: pageHelper.page++
     }
@@ -117,7 +128,7 @@
     Rectangle {
         id: pageOverlay
         anchors {
-            bottom: parent.bottom
+            bottom: separator.top
             left: previewImage.left
             right: previewImage.right
         }
@@ -139,4 +150,68 @@
             width: parent.width
         }
     }
+
+    Item {
+        id: separator
+        anchors {
+            bottom: parent.bottom
+        }
+        height: units.gu(1)
+        objectName: "separator"
+        width: parent.width
+
+        readonly property alias heightDiff: resizer.y
+
+        // So that qmltests can find the resizer (it has no parent)
+        readonly property var resizer: resizer
+
+        Rectangle {
+            anchors {
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+            }
+            color: theme.palette.normal.base
+            height: 1
+        }
+
+        Item {
+            id: resizer
+            parent: null
+        }
+
+        MouseArea {
+            id: mouseArea
+            anchors {
+                fill: parent
+            }
+            cursorShape: Qt.SizeVerCursor
+            drag {
+                axis: Drag.YAxis
+                // Prevent the view being resized smaller than minimumHeight
+                // otherwise you cannot resize it back
+                minimumY: -calcHeight + previewRow.minimumHeight
+                target: resizer
+            }
+
+            // ScrollView has a MouseArea which doesn't propagate hover events
+            // down to us. So instead we have a global MouseArea that is above
+            // the ScrollView and passed to us as monitorMouseArea
+            //
+            // monitorContainsMouse then tells us if the mouse in the global
+            // MouseArea is also inside this MouseArea
+            readonly property bool monitorContainsMouse: {
+                var relativePos = mapFromItem(monitorMouseArea, monitorMouseArea.mouseX, monitorMouseArea.mouseY);
+                return contains(Qt.point(relativePos.x, relativePos.y));
+            }
+
+            // When the mouse is inside this MouseArea set the global MouseArea
+            // cursorShape to be the cursor we want
+            Binding {
+                target: monitorMouseArea
+                property: "cursorShape"
+                value: mouseArea.monitorContainsMouse ? Qt.SizeVerCursor : Qt.ArrowCursor
+            }
+        }
+    }
 }

=== modified file 'ubuntu-printing-app/components/PrintRow.qml'
--- ubuntu-printing-app/components/PrintRow.qml	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/components/PrintRow.qml	2017-03-08 13:00:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Canonical Ltd.
+ * Copyright 2016, 2017 Canonical Ltd.
  *
  * This file is part of ubuntu-printing-app.
  *
@@ -45,9 +45,12 @@
     RowLayout {
         id: rowLayout
         anchors {
-            fill: parent
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+            top: parent.top
         }
         spacing: units.gu(1)
+        width: Math.min(units.gu(60), parent.width)
 
         Button {
             objectName: "cancel"

=== modified file 'ubuntu-printing-app/components/SelectorRow.qml'
--- ubuntu-printing-app/components/SelectorRow.qml	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/components/SelectorRow.qml	2017-03-08 13:00:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Canonical Ltd.
+ * Copyright 2016, 2017 Canonical Ltd.
  *
  * This file is part of ubuntu-printing-app.
  *
@@ -23,17 +23,9 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 
-RowLayout {
+BaseRowLayout {
     id: rowLayout
-    anchors {
-        left: parent.left
-        leftMargin: units.gu(2)
-        right: parent.right
-        rightMargin: units.gu(2)
-    }
-
     implicitHeight: selector.implicitHeight
-    Layout.maximumWidth: width
 
     property alias delegate: selector.delegate
     property alias model: selector.model
@@ -62,6 +54,7 @@
         }
         Layout.fillWidth: true
         Layout.preferredWidth: units.gu(5)
+        objectName: "selector"
         selectedIndex: 0
 
         onExpansionCompleted: rowLayout.expansionCompleted()

=== modified file 'ubuntu-printing-app/components/TextFieldRow.qml'
--- ubuntu-printing-app/components/TextFieldRow.qml	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/components/TextFieldRow.qml	2017-03-08 13:00:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Canonical Ltd.
+ * Copyright 2016, 2017 Canonical Ltd.
  *
  * This file is part of ubuntu-printing-app.
  *
@@ -22,15 +22,7 @@
 
 import Ubuntu.Components 1.3
 
-RowLayout {
-    anchors {
-        left: parent.left
-        leftMargin: units.gu(2)
-        right: parent.right
-        rightMargin: units.gu(2)
-    }
-    Layout.maximumWidth: width
-
+BaseRowLayout {
     property alias acceptableInput: textField.acceptableInput
     property alias enabled: textField.enabled
     property alias inputMethodHints: textField.inputMethodHints

=== modified file 'ubuntu-printing-app/pages/PrintPage.qml'
--- ubuntu-printing-app/pages/PrintPage.qml	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/pages/PrintPage.qml	2017-03-08 13:00:14 +0000
@@ -69,6 +69,7 @@
 
             PreviewRow {
                 document: currentDocument
+                monitorMouseArea: globalMouseArea
                 Layout.fillHeight: true
                 printerJob: printing.printerJob
                 view: scrollView
@@ -124,46 +125,6 @@
                 }
             }
 
-            CheckBoxRow {
-                id: checkboxSelector
-                checkboxText: i18n.tr("Collate")
-                enabled: printing.printerJob.copies > 1 && printing.isLoaded && !printing.pdfMode
-                objectName: "collateCheckBox"
-
-                onCheckedChanged: {
-                    if (printing.printerJob.collate !== checked) {
-                        printing.printerJob.collate = checked
-                    }
-                }
-
-                Binding {
-                    target: checkboxSelector
-                    property: "checked"
-                    when: printing.printerJob
-                    value: printing.printerJob.collate
-                }
-            }
-
-            CheckBoxRow {
-                id: reverseSelector
-                checkboxText: i18n.tr("Reverse")
-                enabled: printing.isLoaded && !printing.pdfMode
-                objectName: "reverseCheckBox"
-
-                onCheckedChanged: {
-                    if (printing.printerJob.reverse !== checked) {
-                        printing.printerJob.reverse = checked
-                    }
-                }
-
-                Binding {
-                    target: reverseSelector
-                    property: "checked"
-                    when: printing.printerJob
-                    value: printing.printerJob.reverse
-                }
-            }
-
             SelectorRow {
                 id: pageRangeSelector
                 enabled: printing.isLoaded && !printing.pdfMode
@@ -280,6 +241,46 @@
                 }
             }
 
+            CheckBoxRow {
+                id: checkboxSelector
+                checkboxText: i18n.tr("Collate")
+                enabled: printing.printerJob.copies > 1 && printing.isLoaded && !printing.pdfMode
+                objectName: "collateCheckBox"
+
+                onCheckedChanged: {
+                    if (printing.printerJob.collate !== checked) {
+                        printing.printerJob.collate = checked
+                    }
+                }
+
+                Binding {
+                    target: checkboxSelector
+                    property: "checked"
+                    when: printing.printerJob
+                    value: printing.printerJob.collate
+                }
+            }
+
+            CheckBoxRow {
+                id: reverseSelector
+                checkboxText: i18n.tr("Reverse")
+                enabled: printing.isLoaded && !printing.pdfMode
+                objectName: "reverseCheckBox"
+
+                onCheckedChanged: {
+                    if (printing.printerJob.reverse !== checked) {
+                        printing.printerJob.reverse = checked
+                    }
+                }
+
+                Binding {
+                    target: reverseSelector
+                    property: "checked"
+                    when: printing.printerJob
+                    value: printing.printerJob.reverse
+                }
+            }
+
             Item {
                 height: units.gu(2)
                 width: parent.width
@@ -306,4 +307,15 @@
         onCancel: page.cancel()
         onConfirm: page.confirm(document.url)
     }
+
+    // ScrollView has a MouseArea which doesn't propagate hover events
+    // so this is used to monitor for these events
+    MouseArea {
+        id: globalMouseArea
+        anchors {
+            fill: parent
+        }
+        acceptedButtons: Qt.NoButton
+        hoverEnabled: true
+    }
 }

=== modified file 'ubuntu-printing-app/ubuntu-printing-app-content-hub.json'
--- ubuntu-printing-app/ubuntu-printing-app-content-hub.json	2016-12-13 23:08:52 +0000
+++ ubuntu-printing-app/ubuntu-printing-app-content-hub.json	2017-03-08 13:00:14 +0000
@@ -1,5 +1,8 @@
 {
     "destination": [
         "documents"
+    ],
+    "share": [
+        "documents"
     ]
 }

=== modified file 'ubuntu-printing-app/ubuntu-printing-app.desktop.in.in'
--- ubuntu-printing-app/ubuntu-printing-app.desktop.in.in	2017-03-08 13:00:13 +0000
+++ ubuntu-printing-app/ubuntu-printing-app.desktop.in.in	2017-03-08 13:00:14 +0000
@@ -3,6 +3,7 @@
 Exec=@RUNNER@
 Icon=@ICON@
 _Keywords=Print;Printing;
+NoDisplay=true
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true