Merge lp:~ahayzen/ubuntu-settings-components/add-job-model into lp:~phablet-team/ubuntu-settings-components/printer-components

[Andrew Hayzen]

* Add JobModel which lists the jobs for a certain printer
* Add JobRole to PrinterModel to access jobs
* Add JobState enum to track enums from cups
* Add example Queue which lists jobs for a printer with their name, id, status and allows you to cancel the job by clicking

* Add JobModel which lists the jobs for a certain printer
* Add JobRole to PrinterModel to access jobs
* Add JobState enum to track enums from cups
* Add example Queue which lists jobs for a printer with their name, id, status and allows you to cancel the job by clicking

[lp:~ahayzen/ubuntu-settings-components/add-job-model]

226. By Andrew Hayzen on 2017-02-02

* Remove some tracing

[Jonas G. Drange (jonas-drange)]

Added a couple of comments.

review: Needs Fixing

[lp:~ahayzen/ubuntu-settings-components/add-job-model]

227. By Andrew Hayzen on 2017-02-02

* Use QSharedPointer instead of raw pointers for PrinterJob
* Renamed Queue.qml to PrinterQueue.qml

[Jonas G. Drange (jonas-drange)]

THX! LGTM

review: Approve

=== added file 'examples/PrinterQueue.qml'
--- examples/PrinterQueue.qml	1970-01-01 00:00:00 +0000
+++ examples/PrinterQueue.qml	2017-02-02 17:23:30 +0000
@@ -0,0 +1,113 @@
+/*
+ * 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.Settings.Components 0.1
+import Ubuntu.Settings.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)
+                    ListItemLayout {
+                        id: modelLayout
+                        title.text: displayName
+                        subtitle.text: "Job: " + model.id + " State: " + model.state
+                    }
+                    onClicked: {
+                        console.debug("Cancel:", printer.name, model.id);
+                        Printers.cancelJob(printer.name, model.id);
+                    }
+                }
+                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 'plugins/Ubuntu/Settings/Printers/CMakeLists.txt'
--- plugins/Ubuntu/Settings/Printers/CMakeLists.txt	2017-01-26 21:47:06 +0000
+++ plugins/Ubuntu/Settings/Printers/CMakeLists.txt	2017-02-02 17:23:30 +0000
@@ -18,6 +18,7 @@
     enums.h
     i18n.cpp
     models/drivermodel.cpp
+    models/jobmodel.cpp
     models/printermodel.cpp
     printer/printer.cpp
     printer/printerjob.cpp

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend.cpp	2017-02-02 17:23:30 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend.cpp	2017-02-02 17:23:30 +0000
@@ -202,6 +202,13 @@
     return -1;
 }
 
+QList<QSharedPointer<PrinterJob>> PrinterBackend::printerGetJobs(const QString &name)
+{
+    Q_UNUSED(name);
+
+    return QList<QSharedPointer<PrinterJob>>{};
+}
+
 QString PrinterBackend::printerName() const
 {
     return QString();

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-02-02 17:23:30 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-02-02 17:23:30 +0000
@@ -118,6 +118,7 @@
     virtual int printFileToDest(const QString &filepath,
                                 const QString &title,
                                 const cups_dest_t *dest);
+    virtual QList<QSharedPointer<PrinterJob>> printerGetJobs(const QString &name);
 
     virtual QString printerName() const;
     virtual QString description() const;

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-02 17:23:30 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-02 17:23:30 +0000
@@ -210,6 +210,23 @@
     return m_cups->printFileToDest(filepath, title, dest);
 }
 
+QList<QSharedPointer<PrinterJob>> PrinterCupsBackend::printerGetJobs(const QString &name)
+{
+    auto jobs = m_cups->printerGetJobs(name);
+    QList<QSharedPointer<PrinterJob>> list;
+
+    Q_FOREACH(auto job, jobs) {
+        auto newJob = QSharedPointer<PrinterJob>(new PrinterJob(name, this, job->id));
+
+        newJob->setState(static_cast<PrinterEnum::JobState>(job->state));
+        newJob->setTitle(QString::fromLocal8Bit(job->title));
+
+        list.append(newJob);
+    }
+
+    return list;
+}
+
 QString PrinterCupsBackend::printerName() const
 {
     return m_info.printerName();

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.h	2017-02-02 17:23:30 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.h	2017-02-02 17:23:30 +0000
@@ -97,6 +97,7 @@
     virtual int printFileToDest(const QString &filepath,
                                 const QString &title,
                                 const cups_dest_t *dest) override;
+    virtual QList<QSharedPointer<PrinterJob>> printerGetJobs(const QString &name) override;
 
     virtual QString printerName() const override;
     virtual QString description() const override;

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-02 17:23:30 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-02 17:23:30 +0000
@@ -376,6 +376,24 @@
     }
 }
 
+QList<cups_job_t *> CupsFacade::printerGetJobs(const QString &name)
+{
+    QList<cups_job_t *> list;
+    cups_job_t *jobs;
+
+    // Get a list of the jobs that are 'mine' and only active ones
+    // https://www.cups.org/doc/api-cups.html#cupsGetJobs
+    int count = cupsGetJobs(&jobs, name.toLocal8Bit(), 1, CUPS_WHICHJOBS_ACTIVE);
+
+    for (int i=0; i < count; i++) {
+        list.append(&jobs[i]);
+    }
+
+    // FIXME: needs to run cupsFreeJobs();
+
+    return list;
+}
+
 int CupsFacade::printFileToDest(const QString &filepath, const QString &title,
                                 const cups_dest_t *dest)
 {

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-02-02 17:23:30 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-02-02 17:23:30 +0000
@@ -89,6 +89,7 @@
     QList<PrintQuality> printerGetSupportedQualities(const QString &name) const;
 
     void cancelJob(const QString &name, const int jobId);
+    QList<cups_job_t *> printerGetJobs(const QString &name);
     int printFileToDest(const QString &filepath, const QString &title,
                         const cups_dest_t *dest);
 

=== modified file 'plugins/Ubuntu/Settings/Printers/enums.h'
--- plugins/Ubuntu/Settings/Printers/enums.h	2017-01-19 21:00:28 +0000
+++ plugins/Ubuntu/Settings/Printers/enums.h	2017-02-02 17:23:30 +0000
@@ -93,6 +93,19 @@
     };
     Q_ENUM(ErrorPolicy)
 
+    // Match enums from ipp_jstate_t
+    enum class JobState
+    {
+        Pending = 3,
+        Held,
+        Processing,
+        Stopped,
+        Canceled,
+        Aborted,
+        Complete,
+    };
+    Q_ENUM(JobState)
+
     enum class OperationPolicy
     {
         DefaultOperation = 0,

=== added file 'plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp	2017-02-02 17:23:30 +0000
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#include "utils.h"
+
+#include "backend/backend_cups.h"
+#include "cups/cupsfacade.h"
+
+#include "models/jobmodel.h"
+
+#include <QDebug>
+
+JobModel::JobModel(const int updateIntervalMSecs, QObject *parent)
+    : JobModel(QStringLiteral(""), new PrinterCupsBackend, updateIntervalMSecs, 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);
+}
+
+JobModel::~JobModel()
+{
+}
+
+void JobModel::startUpdateTimer(const int &msecs)
+{
+    // 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);
+}
+
+void JobModel::update()
+{
+    // Store the old count and get the new printers
+    int oldCount = m_jobs.size();
+    QList<QSharedPointer<PrinterJob>> newJobs = m_backend->printerGetJobs(m_printer_name);
+
+    /* If any printers returned from the backend are irrelevant, we delete
+    them. This a list of indices that corresponds to printers scheduled for
+    deletion in newPrinters. */
+    QList<uint> forDeletion;
+
+    // Go through the old model
+    for (int i=0; i < m_jobs.count(); i++) {
+        // Determine if the old printer exists in the new model
+        bool exists = false;
+
+        Q_FOREACH(QSharedPointer<PrinterJob> p, newJobs) {
+            // TODO: update status here
+            if (p->jobId() == m_jobs.at(i)->jobId()) {
+                exists = true;
+                break;
+            }
+        }
+
+        // If it doesn't exist then remove it from the old model
+        if (!exists) {
+            beginRemoveRows(QModelIndex(), i, i);
+            QSharedPointer<PrinterJob> p = m_jobs.takeAt(i);
+            p->deleteLater();
+            endRemoveRows();
+
+            i--;  // as we have removed an item decrement
+        }
+    }
+
+    // Go through the new model
+    for (int i=0; i < newJobs.count(); i++) {
+        // Determine if the new printer exists in the old model
+        bool exists = false;
+        int j;
+
+        for (j=0; j < m_jobs.count(); j++) {
+            if (m_jobs.at(j)->jobId() == newJobs.at(i)->jobId()) {
+                exists = true;
+                forDeletion << i;
+                break;
+            }
+        }
+
+        if (exists) {
+            if (j == i) {  // New printer exists and in correct position
+                continue;
+            } else {
+                // New printer does exist but needs to be moved in old model
+                beginMoveRows(QModelIndex(), j, 1, QModelIndex(), i);
+                m_jobs.move(j, i);
+                endMoveRows();
+            }
+
+            // We can safely delete the newPrinter as it already exists.
+            forDeletion << i;
+        } else {
+            // New printer does not exist insert into model
+            beginInsertRows(QModelIndex(), i, i);
+            m_jobs.insert(i, newJobs.at(i));
+            endInsertRows();
+        }
+    }
+
+    Q_FOREACH(const int &index, forDeletion) {
+        newJobs.at(index)->deleteLater();
+    }
+
+    if (oldCount != m_jobs.size()) {
+        Q_EMIT countChanged();
+    }
+}
+
+int JobModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return m_jobs.size();
+}
+
+int JobModel::count() const
+{
+    return rowCount();
+}
+
+QVariant JobModel::data(const QModelIndex &index, int role) const
+{
+    QVariant ret;
+
+    if ((0<=index.row()) && (index.row()<m_jobs.size())) {
+
+        auto job = m_jobs[index.row()];
+
+        switch (role) {
+        case IdRole:
+            ret = job->jobId();
+            break;
+        case OwnerRole:
+            ret = m_printer_name;
+            break;
+        case StateRole:
+            // TODO: improve, for now have a switch
+            switch (job->state()) {
+            case PrinterEnum::JobState::Aborted:
+                ret = "Aborted";
+                break;
+            case PrinterEnum::JobState::Canceled:
+                ret = "Canceled";
+                break;
+            case PrinterEnum::JobState::Complete:
+                ret = "Compelete";
+                break;
+            case PrinterEnum::JobState::Held:
+                ret = "Held";
+                break;
+            case PrinterEnum::JobState::Pending:
+                ret = "Pending";
+                break;
+            case PrinterEnum::JobState::Processing:
+                ret = "Processing";
+                break;
+            case PrinterEnum::JobState::Stopped:
+                ret = "Stopped";
+                break;
+            }
+            break;
+        case Qt::DisplayRole:
+        case TitleRole:
+            ret = job->title();
+            break;
+        }
+    }
+
+    return ret;
+}
+
+QHash<int, QByteArray> JobModel::roleNames() const
+{
+    static QHash<int,QByteArray> names;
+
+    if (Q_UNLIKELY(names.empty())) {
+        names[Qt::DisplayRole] = "displayName";
+        names[IdRole] = "id";
+        names[OwnerRole] = "owner";
+        names[StateRole] = "state";
+        names[TitleRole] = "title";
+        names[LastStateMessageRole] = "lastStateMessage";
+    }
+
+    return names;
+}
+
+QVariantMap JobModel::get(const int row) const
+{
+    QHashIterator<int, QByteArray> iterator(roleNames());
+    QVariantMap result;
+    QModelIndex modelIndex = index(row, 0);
+
+    while (iterator.hasNext()) {
+        iterator.next();
+        result[iterator.value()] = modelIndex.data(iterator.key());
+    }
+
+    return result;
+}

=== added file 'plugins/Ubuntu/Settings/Printers/models/jobmodel.h'
--- plugins/Ubuntu/Settings/Printers/models/jobmodel.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/models/jobmodel.h	2017-02-02 17:23:30 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#ifndef USC_JOB_MODEL_H
+#define USC_JOB_MODEL_H
+
+#include "printers_global.h"
+
+#include "printer/printer.h"
+
+#include <QAbstractListModel>
+#include <QByteArray>
+#include <QModelIndex>
+#include <QObject>
+#include <QSortFilterProxyModel>
+#include <QTimer>
+#include <QVariant>
+
+class PRINTERS_DECL_EXPORT JobModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    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,
+                      QObject *parent = Q_NULLPTR);
+    ~JobModel();
+
+    enum Roles
+    {
+        // Qt::DisplayRole holds job title
+        IdRole = Qt::UserRole,
+        OwnerRole,
+        StateRole,
+        TitleRole,
+        LastStateMessageRole,
+        LastRole = LastStateMessageRole,
+    };
+
+    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    virtual QHash<int, QByteArray> roleNames() const override;
+
+    int count() const;
+
+    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();
+
+Q_SIGNALS:
+    void countChanged();
+};
+
+#endif // USC_JOB_MODEL_H

=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-01-22 19:31:39 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-02-02 17:23:30 +0000
@@ -18,9 +18,11 @@
 
 #include "backend/backend_cups.h"
 #include "cups/cupsfacade.h"
+#include "models/jobmodel.h"
 #include "models/printermodel.h"
 
 #include <QDebug>
+#include <QQmlEngine>
 
 PrinterModel::PrinterModel(const int updateIntervalMSecs, QObject *parent)
     : PrinterModel(new PrinterCupsBackend, updateIntervalMSecs, parent)
@@ -76,7 +78,11 @@
         if (!exists) {
             beginRemoveRows(QModelIndex(), i, i);
             Printer *p = m_printers.takeAt(i);
+            JobModel *jobModel = m_job_models.take(p->name());
+
             p->deleteLater();
+            jobModel->deleteLater();
+
             endRemoveRows();
 
             i--;  // as we have removed an item decrement
@@ -112,7 +118,13 @@
         } else {
             // New printer does not exist insert into model
             beginInsertRows(QModelIndex(), i, i);
+
             m_printers.insert(i, newPrinters.at(i));
+
+            JobModel *model = new JobModel(newPrinters.at(i)->name(), m_backend, 5000, this);
+            QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);
+            m_job_models.insert(newPrinters.at(i)->name(), model);
+
             endInsertRows();
         }
     }
@@ -226,6 +238,10 @@
         case IsPdfRole:
             ret = printer->isPdf();
             break;
+        case JobRole: {
+            ret = QVariant::fromValue(m_job_models.value(printer->name()));
+            break;
+        }
         // case LastStateMessageRole:
         //     ret = printer->lastStateMessage();
         //     break;
@@ -311,6 +327,7 @@
         names[StateRole] = "state";
         names[PrinterRole] = "printer";
         names[IsPdfRole] = "isPdf";
+        names[JobRole] = "jobs";
         names[LastStateMessageRole] = "lastStateMessage";
     }
 

=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.h'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.h	2017-01-22 14:21:11 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.h	2017-02-02 17:23:30 +0000
@@ -19,6 +19,7 @@
 
 #include "printers_global.h"
 
+#include "models/jobmodel.h"
 #include "printer/printer.h"
 
 #include <QAbstractListModel>
@@ -64,6 +65,7 @@
         PrinterRole,
         LastStateMessageRole,
         IsPdfRole,
+        JobRole,
         LastRole = LastStateMessageRole,
     };
 
@@ -84,6 +86,7 @@
     /* FIXME: there's currently no need to share the Printer obj with QML, so
     this should be normal pointers that are deletedLater. */
     QList<Printer*> m_printers;
+    QMap<QString, JobModel *> m_job_models;
 
 private Q_SLOTS:
     void startUpdateTimer(const int &msecs);

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-02-02 17:23:30 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-02-02 17:23:30 +0000
@@ -40,18 +40,33 @@
     , m_backend(backend)
     , m_duplex_mode(0)
     , m_is_two_sided(false)
+    , m_job_id(-1)
     , m_printer(printer)
     , m_printer_name(QStringLiteral(""))
     , m_print_range(QStringLiteral(""))
     , m_print_range_mode(PrinterEnum::PrintRange::AllPages)
     , m_quality(0)
-    , m_state(PrinterEnum::State::IdleState)
+    , m_state(PrinterEnum::JobState::Pending)
     , m_reverse(false)
     , m_title(QStringLiteral(""))
 {
+    if (m_printer) {
+        m_printer_name = printer->name();
+    }
+
     loadDefaults();
 }
 
+PrinterJob::PrinterJob(const QString &name, PrinterBackend *backend, int jobId, QObject *parent)
+    : QObject(parent)
+    , m_backend(backend)
+    , m_job_id(jobId)
+{
+    setPrinterName(name);
+
+    // TODO: load other options from job
+}
+
 
 PrinterJob::~PrinterJob()
 {
@@ -115,6 +130,11 @@
     return m_is_two_sided;
 }
 
+int PrinterJob::jobId() const
+{
+    return m_job_id;
+}
+
 bool PrinterJob::landscape() const
 {
     return m_landscape;
@@ -143,11 +163,7 @@
 void PrinterJob::printFile(const QUrl &url)
 {
     if (m_printer) {
-        int jobId = m_printer->printFile(url.toLocalFile(), this);
-
-        // TODO: should we track the job and state of it here?
-        // so then we can do cancel() and show in the UI when the job is done?
-        Q_UNUSED(jobId);
+        m_job_id = m_printer->printFile(url.toLocalFile(), this);
     } else {
         qWarning() << "No valid printer in PrinterJob";
     }
@@ -173,7 +189,7 @@
     return m_reverse;
 }
 
-PrinterEnum::State PrinterJob::state() const
+PrinterEnum::JobState PrinterJob::state() const
 {
     return m_state;
 }
@@ -311,7 +327,7 @@
     }
 }
 
-void PrinterJob::setState(const PrinterEnum::State &state)
+void PrinterJob::setState(const PrinterEnum::JobState &state)
 {
     if (m_state != state) {
         m_state = state;

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-02-02 17:23:30 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-02-02 17:23:30 +0000
@@ -47,13 +47,16 @@
     Q_PROPERTY(PrinterEnum::PrintRange printRangeMode READ printRangeMode WRITE setPrintRangeMode NOTIFY printRangeModeChanged)
     Q_PROPERTY(int quality READ quality WRITE setQuality NOTIFY qualityChanged)
     Q_PROPERTY(bool reverse READ reverse WRITE setReverse NOTIFY reverseChanged)
-    Q_PROPERTY(PrinterEnum::State state READ state NOTIFY stateChanged)
+    Q_PROPERTY(PrinterEnum::JobState state READ state NOTIFY stateChanged)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
+
+    friend class PrinterCupsBackend;
 public:
     explicit PrinterJob(QObject *parent=Q_NULLPTR);
     explicit PrinterJob(Printer *printer, QObject *parent=Q_NULLPTR);
     explicit PrinterJob(Printer *printer, PrinterBackend *backend,
                         QObject *parent=Q_NULLPTR);
+    explicit PrinterJob(const QString &name, PrinterBackend *backend, int jobId, QObject *parent=Q_NULLPTR);
     ~PrinterJob();
 
     bool collate() const;
@@ -62,6 +65,7 @@
     int copies() const;
     int duplexMode() const;
     bool isTwoSided() const;
+    int jobId() const;  // TODO: implement
     bool landscape() const;
 //    Printer *printer() const;
     QString printerName() const;
@@ -69,7 +73,7 @@
     PrinterEnum::PrintRange printRangeMode() const;
     int quality() const;
     bool reverse() const;
-    PrinterEnum::State state() const;
+    PrinterEnum::JobState state() const;
     QString title() const;
 public Q_SLOTS:
     PrinterEnum::DuplexMode getDuplexMode() const;
@@ -91,7 +95,7 @@
 private Q_SLOTS:
     void loadDefaults();
     void setIsTwoSided(const bool isTwoSided);
-    void setState(const PrinterEnum::State &state);
+    void setState(const PrinterEnum::JobState &state);
 Q_SIGNALS:
     void collateChanged();
     void colorModelChanged();
@@ -115,6 +119,7 @@
     PrinterBackend *m_backend; // TODO: Maybe use the printer's backend?
     int m_duplex_mode;
     bool m_is_two_sided;
+    int m_job_id;
     bool m_landscape;
     Printer *m_printer;
     QString m_printer_name;
@@ -122,7 +127,7 @@
     PrinterEnum::PrintRange m_print_range_mode;
     int m_quality;
     bool m_reverse;
-    PrinterEnum::State m_state;
+    PrinterEnum::JobState m_state;
     QString m_title;
 };
 

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-02-02 17:23:30 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-02-02 17:23:30 +0000
@@ -222,6 +222,11 @@
 
     }
 
+    virtual QList<QSharedPointer<PrinterJob>> printerGetJobs(const QString &name) override
+    {
+
+    }
+
 
     virtual QString printerName() const override
     {