Merge lp:~ahayzen/ubuntu-settings-components/jobmodel-use-notifications into lp:~phablet-team/ubuntu-settings-components/printer-components

[Andrew Hayzen]

* Link notifications to JobModel - removing polling
* Fix compiler errors that appeared from the previous branch
* Fix logic change in last branch that was wrong way around

* Link notifications to JobModel - removing polling
* Fix compiler errors that appeared from the previous branch
* Fix logic change in last branch that was wrong way around

[Jonas G. Drange (jonas-drange)]

LGTM!

review: Approve

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-02-03 12:04:46 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-02-03 16:45:28 +0000
@@ -152,6 +152,45 @@
     void printerDriversLoaded(const QList<PrinterDriver> &drivers);
     void printerDriversFailedToLoad(const QString &errorMessage);
 
+    void jobCompleted(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs,
+        uint jobId,
+        uint jobState,
+        const QString &jobStateReason,
+        const QString &job_name,
+        uint jobImpressionsCompleted
+    );
+    void jobCreated(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs,
+        uint jobId,
+        uint jobState,
+        const QString &jobStateReason,
+        const QString &job_name,
+        uint jobImpressionsCompleted
+    );
+    void jobState(
+        const QString &text,
+        const QString &printerUri,
+        const QString &printerName,
+        uint printerState,
+        const QString &printerStateReason,
+        bool acceptingJobs,
+        uint jobId,
+        uint jobState,
+        const QString &jobStateReason,
+        const QString &job_name,
+        uint jobImpressionsCompleted
+    );
     void printerAdded(
         const QString &text,
         const QString &printerUri,

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-03 13:58:25 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-03 16:45:28 +0000
@@ -46,6 +46,30 @@
     connect(m_cups, SIGNAL(printerDriversFailedToLoad(const QString&)),
             this, SIGNAL(printerDriversFailedToLoad(const QString&)));
 
+    connect(m_notifier, SIGNAL(JobCompleted(const QString&, const QString&,
+                                            const QString&, uint,
+                                            const QString&, bool, uint, uint,
+                                            const QString&, const QString&, uint)),
+            this, SIGNAL(jobCompleted(const QString&, const QString&,
+                                      const QString&, uint, const QString&,
+                                      bool, uint, uint, const QString&,
+                                      const QString&, uint)));
+    connect(m_notifier, SIGNAL(JobCreated(const QString&, const QString&,
+                                          const QString&, uint, const QString&,
+                                          bool, uint, uint, const QString&,
+                                          const QString&, uint)),
+            this, SIGNAL(jobCreated(const QString&, const QString&,
+                                    const QString&, uint, const QString&, bool,
+                                    uint, uint, const QString&, const QString&,
+                                    uint)));
+    connect(m_notifier, SIGNAL(JobState(const QString&, const QString&,
+                                        const QString&, uint, const QString&,
+                                        bool, uint, uint, const QString&,
+                                        const QString&, uint)),
+            this, SIGNAL(jobState(const QString&, const QString&,
+                                  const QString&, uint, const QString&, bool,
+                                  uint, uint, const QString&, const QString&,
+                                  uint)));
     connect(m_notifier, SIGNAL(PrinterAdded(const QString&, const QString&,
                                             const QString&, uint,
                                             const QString&, bool)),

=== modified file 'plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp	2017-02-03 14:43:41 +0000
+++ plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp	2017-02-03 16:45:28 +0000
@@ -23,32 +23,51 @@
 
 #include <QDebug>
 
-JobModel::JobModel(const int updateIntervalMSecs, QObject *parent)
-    : JobModel(QStringLiteral(""), new PrinterCupsBackend, updateIntervalMSecs, parent)
+JobModel::JobModel(QObject *parent)
+    : JobModel(QStringLiteral(""), new PrinterCupsBackend, parent)
 {
 }
 
 JobModel::JobModel(const QString &printerName, PrinterBackend *backend,
-                   const int updateIntervalMSecs,
                    QObject *parent)
     : QAbstractListModel(parent)
     , m_backend(backend)
     , m_printer_name(printerName)
 {
     update();
-    startUpdateTimer(updateIntervalMSecs);
+
+    QObject::connect(m_backend, &PrinterBackend::jobCreated,
+                     this, &JobModel::jobSignalCatchAll);
+    QObject::connect(m_backend, &PrinterBackend::jobState,
+                     this, &JobModel::jobSignalCatchAll);
+    QObject::connect(m_backend, &PrinterBackend::jobCompleted,
+                     this, &JobModel::jobSignalCatchAll);
 }
 
 JobModel::~JobModel()
 {
 }
 
-void JobModel::startUpdateTimer(const int &msecs)
+void JobModel::jobSignalCatchAll(
+        const QString &text, const QString &printer_uri,
+        const QString &printer_name, uint printer_state,
+        const QString &printer_state_reasons, bool printer_is_accepting_jobs,
+        uint job_id, uint job_state, const QString &job_state_reasons,
+        const QString &job_name, uint job_impressions_completed)
 {
-    // Start a timer to poll for changes in the printers
-    m_update_timer.setParent(this);
-    connect(&m_update_timer, SIGNAL(timeout()), this, SLOT(update()));
-    m_update_timer.start(msecs);
+    Q_UNUSED(text);
+    Q_UNUSED(printer_uri);
+    Q_UNUSED(printer_name);
+    Q_UNUSED(printer_state);
+    Q_UNUSED(printer_state_reasons);
+    Q_UNUSED(printer_is_accepting_jobs);
+    Q_UNUSED(job_id);
+    Q_UNUSED(job_state);
+    Q_UNUSED(job_state_reasons);
+    Q_UNUSED(job_name);
+    Q_UNUSED(job_impressions_completed);
+
+    update();
 }
 
 void JobModel::update()

=== modified file 'plugins/Ubuntu/Settings/Printers/models/jobmodel.h'
--- plugins/Ubuntu/Settings/Printers/models/jobmodel.h	2017-02-02 17:22:55 +0000
+++ plugins/Ubuntu/Settings/Printers/models/jobmodel.h	2017-02-03 16:45:28 +0000
@@ -35,8 +35,8 @@
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 public:
-    explicit JobModel(const int updateIntervalMSecs=5000, QObject *parent = Q_NULLPTR);
-    explicit JobModel(const QString &printerName, PrinterBackend *backend, const int updateIntervalMSecs=5000,
+    explicit JobModel(QObject *parent = Q_NULLPTR);
+    explicit JobModel(const QString &printerName, PrinterBackend *backend,
                       QObject *parent = Q_NULLPTR);
     ~JobModel();
 
@@ -59,14 +59,19 @@
 
     Q_INVOKABLE QVariantMap get(const int row) const;
 private:
-    QTimer m_update_timer;
     PrinterBackend *m_backend;
     QString m_printer_name;
 
     QList<QSharedPointer<PrinterJob>> m_jobs;
 private Q_SLOTS:
-    void startUpdateTimer(const int &msecs);
     void update();
+    void jobSignalCatchAll(const QString &text, const QString &printer_uri,
+                           const QString &printer_name, uint printer_state,
+                           const QString &printer_state_reasons,
+                           bool printer_is_accepting_jobs, uint job_id,
+                           uint job_state, const QString &job_state_reasons,
+                           const QString &job_name,
+                           uint job_impressions_completed);
 
 Q_SIGNALS:
     void countChanged();

=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-02-03 14:43:41 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-02-03 16:45:28 +0000
@@ -139,7 +139,7 @@
 
             m_printers.insert(i, newPrinters.at(i));
 
-            JobModel *model = new JobModel(newPrinters.at(i)->name(), m_backend, 5000, this);
+            JobModel *model = new JobModel(newPrinters.at(i)->name(), m_backend, this);
             QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);
             m_job_models.insert(newPrinters.at(i)->name(), model);
 

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printer.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printer.cpp	2017-02-03 14:43:41 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printer.cpp	2017-02-03 16:45:28 +0000
@@ -280,7 +280,7 @@
 
 }
 
-void Printer::deepCompare(Printer *other) const
+bool Printer::deepCompare(Printer *other) const
 {
     bool changed = false;
 
@@ -295,7 +295,8 @@
     // TODO: enabled
     // TODO: errorPolicy
 
-    return changed;
+    // Return true if they are the same, so no change
+    return changed == false;
 }
 
 void Printer::updateFrom(Printer* newPrinter)

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-02-03 14:43:41 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-02-03 16:45:28 +0000
@@ -356,19 +356,20 @@
 
     bool changed = false;
 
-    changed |= collate() != newPrinterJob->collate();
-    changed |= colorModel() != newPrinterJob->colorModel();
-    changed |= copies() != newPrinterJob->copies();
-    changed |= duplexMode() != newPrinterJob->duplexMode();
-    changed |= landscape() != newPrinterJob->landscape();
-    changed |= printRange() != newPrinterJob->printRange();
-    changed |= printRangeMode() != newPrinterJob->printRangeMode();
-    changed |= quality() != newPrinterJob->quality();
-    changed |= reverse() != newPrinterJob->reverse();
-    changed |= state() != newPrinterJob->state();
-    changed |= title() != newPrinterJob->title();
+    changed |= collate() != other->collate();
+    changed |= colorModel() != other->colorModel();
+    changed |= copies() != other->copies();
+    changed |= duplexMode() != other->duplexMode();
+    changed |= landscape() != other->landscape();
+    changed |= printRange() != other->printRange();
+    changed |= printRangeMode() != other->printRangeMode();
+    changed |= quality() != other->quality();
+    changed |= reverse() != other->reverse();
+    changed |= state() != other->state();
+    changed |= title() != other->title();
 
-    return changed;
+    // Return true if they are the same, so no change
+    return changed == false;
 }
 
 void PrinterJob::updateFrom(QSharedPointer<PrinterJob> newPrinterJob)