Merge lp:~jonas-drange/ubuntu-settings-components/printer-state into lp:~phablet-team/ubuntu-settings-components/printer-components

[Jonas G. Drange]

* adds read of printer state

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-01-22 19:31:39 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-01-23 20:10:22 +0000
@@ -224,7 +224,16 @@
 
 PrinterEnum::State PrinterCupsBackend::state() const
 {
-
+    switch (m_info.state()) {
+        case QPrinter::Idle:
+            return PrinterEnum::State::IdleState;
+        case QPrinter::Active:
+            return PrinterEnum::State::ActiveState;
+        case QPrinter::Aborted:
+            return PrinterEnum::State::AbortedState;
+        case QPrinter::Error:
+            return PrinterEnum::State::ErrorState;
+    }
 }
 
 QList<QPageSize> PrinterCupsBackend::supportedPageSizes() const
 
=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printer.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printer.cpp	2017-01-22 19:31:39 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printer.cpp	2017-01-23 20:10:22 +0000
@@ -153,7 +153,7 @@
 
 PrinterEnum::State Printer::state() const
 {
-
+    return m_backend->state();
 }
 
 QString Printer::lastStateMessage() const
 
=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-01-22 14:21:11 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-01-23 20:10:22 +0000
@@ -335,12 +335,6 @@
         Q_EMIT printerStateChanged(name);
     }
 
-public Q_SLOT:
-    virtual void refresh() override
-    {
-
-    }
-
     QString returnValue = QString::null;
 
     // Map from printer to key/val.
@@ -370,6 +364,10 @@
     QList<Printer*> m_availablePrinters;
     PrinterBackend::BackendType m_backendType;
 
+public Q_SLOT:
+    virtual void refresh() override
+    {
+    }
 };
 
 #endif // USC_PRINTERS_MOCK_BACKEND_H
 
=== modified file 'tests/unittests/Printers/tst_printer.cpp'
--- tests/unittests/Printers/tst_printer.cpp	2017-01-22 14:21:11 +0000
+++ tests/unittests/Printers/tst_printer.cpp	2017-01-23 20:10:22 +0000
@@ -220,7 +220,11 @@
         QCOMPARE(p.defaultPageSize(), QPageSize(QPageSize::A4));
         QCOMPARE(p.defaultDuplexMode(), PrinterEnum::DuplexMode::DuplexNone);
         QCOMPARE(p.isPdf(), true);
-
+    }
+    void testState()
+    {
+        getBackend()->m_state = PrinterEnum::State::AbortedState;
+        QCOMPARE(m_instance->state(), getBackend()->m_state);
     }
 private:
     QString m_printerName = "my-printer";