Merge lp:~ahayzen/ubuntu-printing-app/page-range-ignore-sheets-count into lp:ubuntu-printing-app

[Andrew Hayzen]

* Only show sheets count in print button when we are not performing a print range for now.
* Fix sheets text so that it shows singular and plural

* Only show sheets count in print button when we are not performing a print range for now.
* Fix sheets text so that it shows singular and plural

[lp:~ahayzen/ubuntu-printing-app/page-range-ignore-sheets-count]

67. By Andrew Hayzen on 2017-03-21

* Be explicit in the comparision

[Andrew Hayzen (ahayzen)]

For phase 1, if there is a page range we won't show the amount of sheets it will result in.

In phase 2 there will be full validation of the copies/printRange fields at this point we'll calculate the number of sheets.

[Michael Sheldon (michael-sheldon)]

Looks good!

review: Approve

=== modified file 'po/ubuntu-printing-app.pot'
--- po/ubuntu-printing-app.pot	2017-03-21 18:00:45 +0000
+++ po/ubuntu-printing-app.pot	2017-03-21 18:00:45 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-20 16:57+0000\n"
+"POT-Creation-Date: 2017-03-21 17:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -84,17 +84,6 @@
 msgid "Settings…"
 msgstr ""
 
-#: ../build/po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
-#: ../ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
-#: ../ubuntu-printing-app/components/PrintRow.qml:74
-msgid "Print"
-msgstr ""
-
-#: ../build/po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:2
-#: ../ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:2
-msgid "Print;Printing;"
-msgstr ""
-
 #. notifier
 #. printing
 #. ubuntu
@@ -106,30 +95,41 @@
 msgid "Queue;Paper;Print;Printing;"
 msgstr ""
 
-#: ../queue-dialog/pages/QueuePage.qml:41
+#. Only show the amount of sheets if they are above zero
+#: ../ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
+#: ../ubuntu-printing-app/components/PrintRow.qml:79
+#: ../ubuntu-printing-app/components/PrintRow.qml:82
+msgid "Print"
+msgstr ""
+
+#: ../ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:2
+msgid "Print;Printing;"
+msgstr ""
+
+#: ../queue-dialog/pages/QueuePage.qml:30
 msgid "%1 job"
 msgid_plural "%1 jobs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../queue-dialog/pages/QueuePage.qml:42
+#: ../queue-dialog/pages/QueuePage.qml:31
 #: ../queue-dialog/components/QueueDelegate.qml:48
 msgid "Printing"
 msgstr ""
 
-#: ../queue-dialog/pages/QueuePage.qml:79
+#: ../queue-dialog/pages/QueuePage.qml:76
 msgid "No printer jobs"
 msgstr ""
 
-#: ../queue-dialog/pages/QueuePage.qml:87
+#: ../queue-dialog/pages/QueuePage.qml:84
 msgid "Active"
 msgstr ""
 
-#: ../queue-dialog/pages/QueuePage.qml:95
+#: ../queue-dialog/pages/QueuePage.qml:92
 msgid "Queued"
 msgstr ""
 
-#: ../queue-dialog/pages/QueuePage.qml:103
+#: ../queue-dialog/pages/QueuePage.qml:100
 msgid "Paused"
 msgstr ""
 
@@ -249,10 +249,12 @@
 msgid "URL of PDF to print"
 msgstr ""
 
-#: ../ubuntu-printing-app/components/PrintRow.qml:74
+#: ../ubuntu-printing-app/components/PrintRow.qml:76
 msgid "Create PDF"
 msgstr ""
 
-#: ../ubuntu-printing-app/components/PrintRow.qml:74
-msgid "Sheets"
-msgstr ""
+#: ../ubuntu-printing-app/components/PrintRow.qml:80
+msgid "<u>%1</u> Sheet"
+msgid_plural "<u>%1</u> Sheets"
+msgstr[0] ""
+msgstr[1] ""

=== modified file 'ubuntu-printing-app/components/PrintRow.qml'
--- ubuntu-printing-app/components/PrintRow.qml	2017-03-07 13:46:02 +0000
+++ ubuntu-printing-app/components/PrintRow.qml	2017-03-21 18:00:45 +0000
@@ -71,7 +71,17 @@
             color: pressed ? Qt.lighter("#111") : "#111"
             enabled: canPrint
             Layout.fillWidth: true
-            text: pdfMode ? i18n.tr("Create PDF") : i18n.tr("Print") + " <u>" + sheets + "</u> " + i18n.tr("Sheets")
+            text: {
+                if (pdfMode) {
+                    i18n.tr("Create PDF")
+                } else if (sheets > 0) {
+                    // Only show the amount of sheets if they are above zero
+                    i18n.tr("Print") + " "
+                            + i18n.tr("<u>%1</u> Sheet", "<u>%1</u> Sheets", sheets).arg(sheets)
+                } else {
+                    i18n.tr("Print")
+                }
+            }
 
             onClicked: confirm()
         }

=== modified file 'ubuntu-printing-app/pages/PrintPage.qml'
--- ubuntu-printing-app/pages/PrintPage.qml	2017-03-07 13:46:02 +0000
+++ ubuntu-printing-app/pages/PrintPage.qml	2017-03-21 18:00:45 +0000
@@ -302,7 +302,15 @@
         pdfMode: printing.pdfMode
         // TODO: This should count the range not all pages
         // roundUp((pageCount * copies) / duplex)
-        sheets: Math.ceil((document.count * printing.printerJob.copies) / (printing.printerJob.isTwoSided ? 2 : 1))
+        sheets: {
+            // If range is selected and a value exists, then set the sheets to zero
+            // for now. Which results in not showing the number sheets
+            if (printing.printerJob.printRangeMode === PrinterEnum.PageRange && printing.printerJob.printRange.length > 0) {
+                0
+            } else {
+                Math.ceil((document.count * printing.printerJob.copies) / (printing.printerJob.isTwoSided ? 2 : 1))
+            }
+        }
 
         onCancel: page.cancel()
         onConfirm: page.confirm(document.url)

=== modified file 'ubuntu-printing-app/tests/qmltests/tst_PrintPage.qml'
--- ubuntu-printing-app/tests/qmltests/tst_PrintPage.qml	2017-03-21 18:00:45 +0000
+++ ubuntu-printing-app/tests/qmltests/tst_PrintPage.qml	2017-03-21 18:00:45 +0000
@@ -503,6 +503,12 @@
             mockPrinting.printerJob.isTwoSided = true;
 
             compare(printRow.sheets, 2);
+
+            // Enable page ranges, this results in zero sheets
+            mockPrinting.printerJob.printRange = "-3,5-7,9-";
+            mockPrinting.printerJob.printRangeMode = PrinterEnum.PageRange;
+
+            compare(printRow.sheets, 0);
         }
     }
 }