Merge lp:~ahayzen/ubuntu-settings-components/printer-components-is-two-sided into lp:~phablet-team/ubuntu-settings-components/printer-components

[Andrew Hayzen]

* Add isTwoSided read-only property to PrinterJob which allows the QML to know if the selected duplexMode is actually going to print double sided

* Add isTwoSided read-only property to PrinterJob which allows the QML to know if the selected duplexMode is actually going to print double sided

[Jonas G. Drange (jonas-drange)]

LGTM! Thanks

review: Approve

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-25 15:37:42 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-26 16:21:27 +0000
@@ -38,6 +38,7 @@
     , m_copies(1)
     , m_backend(backend)
     , m_duplex_mode(0)
+    , m_is_two_sided(false)
     , m_printer(printer)
     , m_printer_name(QStringLiteral(""))
     , m_print_range(QStringLiteral(""))
@@ -113,6 +114,11 @@
     }
 }
 
+bool PrinterJob::isTwoSided() const
+{
+    return m_is_two_sided;
+}
+
 bool PrinterJob::landscape() const
 {
     return m_landscape;
@@ -220,6 +226,19 @@
 
         Q_EMIT duplexModeChanged();
     }
+
+    // Always try to set the duplexMode as this was an int and the underlying
+    // model may be in a different order resulting in the same int being given
+    setIsTwoSided(getDuplexMode() != PrinterEnum::DuplexMode::DuplexNone);
+}
+
+void PrinterJob::setIsTwoSided(const bool isTwoSided)
+{
+    if (m_is_two_sided != isTwoSided) {
+        m_is_two_sided = isTwoSided;
+
+        Q_EMIT isTwoSidedChanged();
+    }
 }
 
 void PrinterJob::setLandscape(const bool landscape)

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-01-25 15:37:42 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-01-26 16:21:27 +0000
@@ -39,6 +39,7 @@
     Q_PROPERTY(PrinterEnum::ColorModelType colorModelType READ colorModelType NOTIFY colorModelTypeChanged)
     Q_PROPERTY(int copies READ copies WRITE setCopies NOTIFY copiesChanged)
     Q_PROPERTY(int duplexMode READ duplexMode WRITE setDuplexMode NOTIFY duplexModeChanged)
+    Q_PROPERTY(bool isTwoSided READ isTwoSided NOTIFY isTwoSidedChanged)
     Q_PROPERTY(bool landscape READ landscape WRITE setLandscape NOTIFY landscapeChanged)
 //    Q_PROPERTY(Printer *printer READ printer WRITE setPrinter NOTIFY printerChanged)
     Q_PROPERTY(QString printerName READ printerName WRITE setPrinterName NOTIFY printerNameChanged)
@@ -60,6 +61,7 @@
     PrinterEnum::ColorModelType colorModelType() const;
     int copies() const;
     int duplexMode() const;
+    bool isTwoSided() const;
     bool landscape() const;
 //    Printer *printer() const;
     QString printerName() const;
@@ -89,6 +91,7 @@
     void setTitle(const QString &title);
 private Q_SLOTS:
     void loadDefaults();
+    void setIsTwoSided(const bool isTwoSided);
     void setState(const PrinterEnum::State &state);
 Q_SIGNALS:
     void collateChanged();
@@ -96,6 +99,7 @@
     void colorModelTypeChanged();
     void copiesChanged();
     void duplexModeChanged();
+    void isTwoSidedChanged();
     void landscapeChanged();
 //    void printerChanged();
     void printerNameChanged();
@@ -111,6 +115,7 @@
     int m_copies;
     PrinterBackend *m_backend; // TODO: Maybe use the printer's backend?
     int m_duplex_mode;
+    bool m_is_two_sided;
     bool m_landscape;
     Printer *m_printer;
     QString m_printer_name;

=== modified file 'tests/unittests/Printers/tst_printerjob.cpp'
--- tests/unittests/Printers/tst_printerjob.cpp	2017-01-25 15:37:42 +0000
+++ tests/unittests/Printers/tst_printerjob.cpp	2017-01-26 16:21:27 +0000
@@ -135,6 +135,34 @@
         QCOMPARE(m_instance->getDuplexMode(), PrinterEnum::DuplexMode::DuplexLongSide);
     }
 
+    void testIsTwoSided()
+    {
+        QList<PrinterEnum::DuplexMode> modes = {
+                PrinterEnum::DuplexMode::DuplexNone,
+                PrinterEnum::DuplexMode::DuplexLongSide,
+                PrinterEnum::DuplexMode::DuplexShortSide
+        };
+        ((MockPrinterBackend *) m_backend)->m_supportedDuplexModes = modes;
+
+        ((MockPrinterBackend *) m_backend)->m_defaultDuplexMode = PrinterEnum::DuplexMode::DuplexNone;
+        refreshInstance();
+        QCOMPARE(m_instance->duplexMode(), modes.indexOf(PrinterEnum::DuplexMode::DuplexNone));
+        QCOMPARE(m_instance->getDuplexMode(), PrinterEnum::DuplexMode::DuplexNone);
+        QCOMPARE(m_instance->isTwoSided(), false);
+
+        m_instance->setDuplexMode(modes.indexOf(PrinterEnum::DuplexMode::DuplexLongSide));
+
+        QCOMPARE(m_instance->duplexMode(), modes.indexOf(PrinterEnum::DuplexMode::DuplexLongSide));
+        QCOMPARE(m_instance->getDuplexMode(), PrinterEnum::DuplexMode::DuplexLongSide);
+        QCOMPARE(m_instance->isTwoSided(), true);
+
+        m_instance->setDuplexMode(modes.indexOf(PrinterEnum::DuplexMode::DuplexShortSide));
+
+        QCOMPARE(m_instance->duplexMode(), modes.indexOf(PrinterEnum::DuplexMode::DuplexShortSide));
+        QCOMPARE(m_instance->getDuplexMode(), PrinterEnum::DuplexMode::DuplexShortSide);
+        QCOMPARE(m_instance->isTwoSided(), true);
+    }
+
     void testPrintFile()
     {
         QSKIP("Not implemented yet!");