Merge lp:~ahayzen/ubuntu-ui-extras/examples-merge-printers-printerqueue into lp:~phablet-team/ubuntu-ui-extras/printer-staging

[Andrew Hayzen]

* Remove PrinterQueue.qml example and add missing job methods to Printers.qml example, so we have only one example

* Remove PrinterQueue.qml example and add missing job methods to Printers.qml example, so we have only one example

[lp:~ahayzen/ubuntu-ui-extras/examples-merge-printers-printerqueue]

150. By Andrew Hayzen on 2017-03-10

* Merge of upstream

151. By Andrew Hayzen on 2017-03-16

* Pull of upstream

[Jonas G. Drange (jonas-drange)]

LGTM! If you're seeing freezes due to QML changes, then we have a bug somewhere (not in the QML) :)

I'm not seeing the freeze on printer/job deletion, and the code looks fine.

review: Approve

=== removed file 'modules/Ubuntu/Components/Extras/Example/PrinterQueue.qml'
--- modules/Ubuntu/Components/Extras/Example/PrinterQueue.qml	2017-03-09 15:44:19 +0000
+++ modules/Ubuntu/Components/Extras/Example/PrinterQueue.qml	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-/*
- * Copyright 2017 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/>.
- *
- * Authored by Jonas G. Drange <[e-mail]>
- *             Andrew Hayzen <[e-mail]>
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItems
-import Ubuntu.Components.Extras.Printers 0.1
-
-MainView {
-    width: units.gu(50)
-    height: units.gu(90)
-
-    Component {
-        id: queuePage
-
-        Page {
-            header: PageHeader {
-                title: "Queue: " + printer.name
-                flickable: queueView
-            }
-            visible: false
-
-            property var printer
-
-            ListView {
-                id: queueView
-                anchors {
-                    fill: parent
-                }
-                delegate: ListItem {
-                    height: modelLayout.height + (divider.visible ? divider.height : 0)
-                    trailingActions: ListItemActions {
-                        actions: [
-                            Action {
-                                iconName: model.held ? "media-playback-start" : "media-playback-pause"
-                                text: model.held ? "Release" : "Hold"
-
-                                onTriggered: {
-                                    if (model.held) {
-                                        Printers.releaseJob(printer.name, model.id);
-                                    } else {
-                                        Printers.holdJob(printer.name, model.id);
-                                    }
-                                }
-                            },
-                            Action {
-                                iconName: "cancel"
-                                text: "Cancel"
-
-                                onTriggered: Printers.cancelJob(printer.name, model.id);
-                            }
-                        ]
-                    }
-
-                    ListItemLayout {
-                        id: modelLayout
-                        title.text: displayName
-                        subtitle.text: model.title + " (" + model.id + ")\nPrinting " + model.impressionsCompleted + " pages"
-                        subtitle.wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                        subtitle.maximumLineCount: 3
-                    }
-                }
-                model: printer.jobs
-
-                Label {
-                    anchors {
-                        centerIn: parent
-                    }
-                    text: "Empty queue"
-                    visible: queueView.count === 0
-                }
-            }
-        }
-    }
-
-    PageStack {
-        id: pageStack
-
-        Page {
-            id: printersPage
-            header: PageHeader {
-                title: "Printers"
-                flickable: printerList
-            }
-            visible: false
-
-            ListView {
-                id: printerList
-                anchors { fill: parent }
-                model: Printers.allPrintersWithPdf
-                delegate: ListItem {
-                    height: modelLayout.height + (divider.visible ? divider.height : 0)
-                    ListItemLayout {
-                        id: modelLayout
-                        title.text: displayName
-                        title.font.bold: model.default
-                        subtitle.text: description
-
-                        Icon {
-                            id: icon
-                            width: height
-                            height: units.gu(2.5)
-                            name: "printer-symbolic"
-                            SlotsLayout.position: SlotsLayout.First
-                        }
-
-                        ProgressionSlot {}
-                    }
-                    onClicked: pageStack.push(queuePage, { printer: model })
-                }
-            }
-        }
-
-        Component.onCompleted: push(printersPage)
-    }
-}
 
=== modified file 'modules/Ubuntu/Components/Extras/Example/Printers.qml'
--- modules/Ubuntu/Components/Extras/Example/Printers.qml	2017-03-10 13:15:27 +0000
+++ modules/Ubuntu/Components/Extras/Example/Printers.qml	2017-03-16 15:49:26 +0000
@@ -277,6 +277,44 @@
     }
 
     Component {
+        id: jobDelegate
+
+        ListItem {
+            height: modelLayout.height + (divider.visible ? divider.height : 0)
+            trailingActions: ListItemActions {
+                actions: [
+                    Action {
+                        iconName: model.held ? "media-playback-start" : "media-playback-pause"
+                        text: model.held ? "Release" : "Hold"
+
+                        onTriggered: {
+                            if (model.held) {
+                                Printers.releaseJob(model.printerName, model.id);
+                            } else {
+                                Printers.holdJob(model.printerName, model.id);
+                            }
+                        }
+                    },
+                    Action {
+                        iconName: "cancel"
+                        text: "Cancel"
+
+                        onTriggered: Printers.cancelJob(model.printerName, model.id);
+                    }
+                ]
+            }
+
+            ListItemLayout {
+                id: modelLayout
+                title.text: displayName
+                subtitle.text: "Printing " + model.impressionsCompleted + " pages" + "\n" + model.printerName
+                subtitle.wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                subtitle.maximumLineCount: 3
+            }
+        }
+    }
+
+    Component {
         id: jobPage
         Page {
             property var printer
@@ -290,26 +328,11 @@
                 id: jobList
                 anchors.fill: parent
                 model: printer.jobs
-                delegate: ListItem {
-                    height: jobLayout.height + (divider.visible ? divider.height : 0)
-                    ListItemLayout {
-                        id: jobLayout
-                        title.text: displayName
-
-                        Icon {
-                            id: icon
-                            width: height
-                            height: units.gu(2.5)
-                            name: "stock_document"
-                            SlotsLayout.position: SlotsLayout.First
-                        }
-                    }
-                }
+                delegate: jobDelegate
             }
         }
     }
 
-
     Component {
         id: allJobsPage
         Page {
@@ -323,21 +346,7 @@
                 id: jobsList
                 anchors.fill: parent
                 model: Printers.printJobs
-                delegate: ListItem {
-                    height: jobsLayout.height + (divider.visible ? divider.height : 0)
-                    ListItemLayout {
-                        id: jobsLayout
-                        title.text: displayName
-
-                        Icon {
-                            id: icon
-                            width: height
-                            height: units.gu(2.5)
-                            name: "stock_document"
-                            SlotsLayout.position: SlotsLayout.First
-                        }
-                    }
-                }
+                delegate: jobDelegate
             }
         }
     }