Merge lp:~ahayzen/ubuntu-system-settings/printers-use-header-sections into lp:~jonas-drange/ubuntu-system-settings/printers

[Andrew Hayzen]

* Change subPageSelector to be header sections
* Disable automatic height of the standard and search headers
* Fix Printers list and Describe Printer not being scrollable

* Change subPageSelector to be header sections
* Disable automatic height of the standard and search headers
* Fix Printers list and Describe Printer not being scrollable

[lp:~ahayzen/ubuntu-system-settings/printers-use-header-sections]

1777. By Andrew Hayzen on 2017-03-22

* Fix scrolling not functioning on the printer list page

1778. By Andrew Hayzen on 2017-03-22

* Fix for AddPrinterDetails.qml not scrolling

[Jonas G. Drange (jonas-drange)]

LGTM! Thanks!

review: Approve

=== modified file 'plugins/printing/AddPrinterDetails.qml'
=== modified file 'plugins/printing/PageComponent.qml'
--- plugins/printing/PageComponent.qml	2017-03-21 14:53:48 +0000
+++ plugins/printing/PageComponent.qml	2017-03-22 17:35:37 +0000
@@ -84,10 +84,14 @@
     Flickable {
         id: printerList
         anchors.fill: parent
+        contentHeight: contentItem.childrenRect.height
         clip: true
 
         Column {
-            anchors.fill: parent
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
 
             ListView {
                 id: allPrintersList

=== modified file 'plugins/printing/Printer.qml'
--- plugins/printing/Printer.qml	2017-03-06 16:12:37 +0000
+++ plugins/printing/Printer.qml	2017-03-22 17:35:37 +0000
@@ -28,6 +28,33 @@
     header: PageHeader {
         title: printer.name
         flickable: printerFlickable
+        extension: Loader {
+            active: printer.isLoaded
+            anchors {
+                bottom: parent.bottom
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            sourceComponent: Sections {
+                model: [
+                    i18n.tr("Printer status"),
+                    i18n.tr("General settings"),
+                    i18n.tr("Policies"),
+                    /* i18n.tr("Allowed users"), */
+                    /* i18n.tr("Installable options"), */
+                    i18n.tr("Copies and pages"),
+                ]
+
+                Component.onCompleted: {
+                    // If we're asked for specific category, show it immediately.
+                    if (pluginOptions && pluginOptions["category"]) {
+                        categoryToSelectorIndex(pluginOptions["category"]);
+                    }
+                }
+            }
+        }
     }
 
     function categoryToSelectorIndex(category) {
@@ -84,55 +111,28 @@
                 right: parent.right
             }
 
-            OptionSelector {
-                id: subPageSelector
-                anchors {
-                    left: parent.left
-                    leftMargin: units.gu(2)
-                }
-                width: units.gu(30)
-                model: [
-                    i18n.tr("Printer status"),
-                    i18n.tr("General settings"),
-                    i18n.tr("Policies"),
-                    /* i18n.tr("Allowed users"), */
-                    /* i18n.tr("Installable options"), */
-                    i18n.tr("Copies and pages"),
-                ]
-                onSelectedIndexChanged: {
-                    var uri = printerSubPageLoader.defaultUri;
-                    switch (selectedIndex) {
-                    case 1:
-                        uri = Qt.resolvedUrl("GeneralSettings.qml");
-                        break;
-                    case 2:
-                        uri = Qt.resolvedUrl("Policies.qml");
-                        break;
-                    case 3:
-                        uri = Qt.resolvedUrl("CopiesAndPages.qml");
-                        break;
-                    }
-                    printerSubPageLoader.setSource(uri);
-                }
-            }
-
             Loader {
                 id: printerSubPageLoader
                 anchors { left: parent.left; right: parent.right }
-                property string defaultUri: Qt.resolvedUrl("Status.qml")
-
-                Component.onCompleted: {
-                    // If we're asked for specific category, show it immediately.
-                    var category = pluginOptions ? pluginOptions['category'] : null;
-                    var index = 0;
-                    if (pluginOptions && category) {
-                        index = categoryToSelectorIndex(category);
-                    }
-
-                    if (index == 0) {
-                        printerSubPageLoader.setSource(defaultUri);
+                source: {
+                    if (printerPage.header.extension.item) {
+                        switch (printerPage.header.extension.item.selectedIndex) {
+                        case 1:
+                            Qt.resolvedUrl("GeneralSettings.qml");
+                            break;
+                        case 2:
+                            Qt.resolvedUrl("Policies.qml");
+                            break;
+                        case 3:
+                            Qt.resolvedUrl("CopiesAndPages.qml");
+                            break;
+                        case 0:
+                        default:
+                            Qt.resolvedUrl("Status.qml");
+                            break;
+                        }
                     } else {
-                        subPageSelector.selectedIndex = index;
+                        null
                     }
                 }
             }

=== modified file 'src/qml/MainWindow.qml'
--- src/qml/MainWindow.qml	2016-12-14 13:37:49 +0000
+++ src/qml/MainWindow.qml	2017-03-22 17:35:37 +0000
@@ -167,6 +167,9 @@
             PageHeader {
                 id: standardHeader
                 objectName: "standardHeader"
+                // turn off automatic height
+                // so when in APL the height doesn't change
+                automaticHeight: false
                 visible: mainPage.header === standardHeader
                 title: i18n.tr("System Settings")
                 flickable: mainFlickable
@@ -186,6 +189,9 @@
             PageHeader {
                 id: searchHeader
                 objectName: "searchHeader"
+                // turn off automatic height
+                // so when in APL the height doesn't change
+                automaticHeight: false
                 visible: mainPage.header === searchHeader
                 flickable: mainFlickable
                 contents: TextField {