Merge lp:~ahayzen/ubuntu-settings-components/extract-job-attributes into lp:~phablet-team/ubuntu-settings-components/printer-components

[Andrew Hayzen]

* Expose many more properties of PrinterJob to the JobModel
* Load PrinterJob properties from the ipp job attributes when loading for the JobModel

* Expose many more properties of PrinterJob to the JobModel
* Load PrinterJob properties from the ipp job attributes when loading for the JobModel

[Jonas G. Drange (jonas-drange)]

Looks good, thanks! One small comment.

review: Approve

[lp:~ahayzen/ubuntu-settings-components/extract-job-attributes]

230. By Andrew Hayzen on 2017-02-07

* Fix missing READ in Q_PROPERTY

[Andrew Hayzen (ahayzen)]

Good catch, fixed the issue now :-)

=== modified file 'examples/PrinterQueue.qml'
--- examples/PrinterQueue.qml	2017-02-02 17:22:55 +0000
+++ examples/PrinterQueue.qml	2017-02-07 14:30:05 +0000
@@ -51,6 +51,11 @@
                         id: modelLayout
                         title.text: displayName
                         subtitle.text: "Job: " + model.id + " State: " + model.state
+                                       + " Color: " + model.colorModel + " CreationTime: "
+                                       + model.creationTime + " PageRange: "
+                                       + model.printRange + " Messages: " + model.messages;
+                        subtitle.wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                        subtitle.maximumLineCount: 3
                     }
                     onClicked: {
                         console.debug("Cancel:", printer.name, model.id);

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-06 13:58:14 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-07 14:30:05 +0000
@@ -20,6 +20,8 @@
 #include "utils.h"
 
 #include <QDBusConnection>
+#include <QLocale>
+#include <QTimeZone>
 
 PrinterCupsBackend::PrinterCupsBackend(QObject *parent)
     : PrinterCupsBackend(new CupsFacade(), QPrinterInfo(),
@@ -276,12 +278,86 @@
     QList<QSharedPointer<PrinterJob>> list;
 
     Q_FOREACH(auto job, jobs) {
-        auto newJob = QSharedPointer<PrinterJob>(new PrinterJob(name, this, job->id));
-
-        // TODO: needs to extract other properties like copies/duplex etc
-
+        QSharedPointer<PrinterJob> newJob = QSharedPointer<PrinterJob>(new PrinterJob(name, this, job->id));
+
+        // Extract the times
+        QDateTime completedTime;
+        completedTime.setTimeZone(QTimeZone::systemTimeZone());
+        completedTime.setTime_t(job->completed_time);
+
+        QDateTime creationTime;
+        creationTime.setTimeZone(QTimeZone::systemTimeZone());
+        creationTime.setTime_t(job->creation_time);
+
+        QDateTime processingTime;
+        processingTime.setTimeZone(QTimeZone::systemTimeZone());
+        processingTime.setTime_t(job->processing_time);
+
+        // Load the information from the cups struct
+        newJob->setCompletedTime(completedTime);
+        newJob->setCreationTime(creationTime);
+        newJob->setProcessingTime(processingTime);
+        newJob->setSize(job->size);
         newJob->setState(static_cast<PrinterEnum::JobState>(job->state));
         newJob->setTitle(QString::fromLocal8Bit(job->title));
+        newJob->setUser(QString::fromLocal8Bit(job->user));
+
+        // Load the extra attributes for the job
+        // NOTE: we don't need to type check them as they have been filtered for us
+        QMap<QString, QVariant> attributes = m_cups->printerGetJobAttributes(name, job->id);
+
+        newJob->setCollate(attributes.value("Collate").toBool());
+        newJob->setCopies(attributes.value("copies").toInt());
+
+        // No colorModel will result in PrinterJob using defaultColorModel
+        if (!newJob->printer()) {
+            QString colorModel = attributes.value("ColorModel").toString();
+
+            for (int i=0; i < newJob->printer()->supportedColorModels().length(); i++) {
+                if (newJob->printer()->supportedColorModels().at(i).originalOption == colorModel) {
+                    newJob->setColorModel(i);
+                }
+            }
+        }
+
+        // No duplexMode will result in PrinterJob using defaultDuplexMode
+        if (!newJob->printer()) {
+            QString duplex = attributes.value("Duplex").toString();
+            PrinterEnum::DuplexMode duplexMode = Utils::ppdChoiceToDuplexMode(duplex);
+
+            for (int i=0; i < newJob->printer()->supportedDuplexModes().length(); i++) {
+                if (newJob->printer()->supportedDuplexModes().at(i) == duplexMode) {
+                    newJob->setDuplexMode(i);
+                }
+            }
+        }
+
+        newJob->setLandscape(attributes.value("landscape").toBool());
+        newJob->setMessages(attributes.value("messages").toStringList());
+
+        QStringList pageRanges = attributes.value("page-ranges").toStringList();
+
+        if (pageRanges.isEmpty()) {
+            newJob->setPrintRangeMode(PrinterEnum::PrintRange::AllPages);
+            newJob->setPrintRange(QStringLiteral(""));
+        } else {
+            newJob->setPrintRangeMode(PrinterEnum::PrintRange::PageRange);
+            // Use groupSeparator as createSeparatedList adds "and" into the string
+            newJob->setPrintRange(pageRanges.join(QLocale::system().groupSeparator()));
+        }
+
+        // No quality will result in PrinterJob using defaultPrintQuality
+        if (!newJob->printer()) {
+            QString quality = attributes.value("quality").toString();
+
+            for (int i=0; i < newJob->printer()->supportedPrintQualities().length(); i++) {
+                if (newJob->printer()->supportedPrintQualities().at(i).name == quality) {
+                    newJob->setQuality(i);
+                }
+            }
+        }
+
+        newJob->setReverse(attributes.value("OutputOrder").toString() == "Reverse");
 
         list.append(newJob);
     }

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-03 12:04:46 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-07 14:30:05 +0000
@@ -28,6 +28,9 @@
 #define __CUPS_ADD_OPTION(dest, name, value) dest->num_options = \
     cupsAddOption(name, value, dest->num_options, &dest->options);
 
+#define __CUPS_ATTR_EXISTS(map, attr, type) map.contains(attr) \
+    && map.value(attr).canConvert<type>()
+
 CupsFacade::CupsFacade(QObject *parent) : QObject(parent)
 {
 }
@@ -394,6 +397,88 @@
     return list;
 }
 
+QMap<QString, QVariant> CupsFacade::printerGetJobAttributes(const QString &name, const int jobId)
+{
+    Q_UNUSED(name);
+    QMap<QString, QVariant> rawMap = helper.printerGetJobAttributes(jobId);
+    QMap<QString, QVariant> map;
+
+    // Filter attributes to know values
+    // Do this here so we can use things such as m_knownQualityOptions
+
+    if (__CUPS_ATTR_EXISTS(rawMap, "Collate", bool)) {
+        map.insert("Collate", rawMap.value("Collate"));
+    } else {
+        map.insert("Collate", QVariant(true));
+    }
+
+    if (__CUPS_ATTR_EXISTS(rawMap, "copies", int)) {
+        map.insert("copies", rawMap.value("copies"));
+    } else {
+        map.insert("copies", QVariant(1));
+    }
+
+    if (__CUPS_ATTR_EXISTS(rawMap, "ColorModel", QString)) {
+        map.insert("ColorModel", rawMap.value("ColorModel"));
+    } else {
+        map.insert("ColorModel", QVariant(""));
+    }
+
+    if (__CUPS_ATTR_EXISTS(rawMap, "Duplex", QString)) {
+        map.insert("Duplex", rawMap.value("Duplex"));
+    } else {
+        map.insert("Duplex", QVariant(""));
+    }
+
+    if (__CUPS_ATTR_EXISTS(rawMap, "landscape", bool)) {
+        map.insert("landscape", rawMap.value("landscape"));
+    } else {
+        map.insert("landscape", QVariant(false));
+    }
+
+    if (__CUPS_ATTR_EXISTS(rawMap, "page-ranges", QList<QVariant>)) {
+        QList<QVariant> range = rawMap.value("page-ranges").toList();
+        QStringList rangeStrings;
+
+        Q_FOREACH(QVariant var, range) {
+            rangeStrings << var.toString();
+        }
+
+        map.insert("page-ranges", QVariant(rangeStrings));
+    } else {
+        map.insert("page-ranges", QVariant(QStringList()));
+    }
+
+    Q_FOREACH(QString qualityOption, m_knownQualityOptions) {
+        if (rawMap.contains(qualityOption)
+                && rawMap.value(qualityOption).canConvert<QString>()) {
+            map.insert("quality", rawMap.value(qualityOption).toString());
+        }
+    }
+
+    if (!map.contains("quality")) {
+        map.insert("quality", QVariant(""));
+    }
+
+    if (__CUPS_ATTR_EXISTS(rawMap, "OutputOrder", QString)) {
+        map.insert("OutputOrder", rawMap.value("OutputOrder"));
+    } else {
+        map.insert("OutputOrder", "Normal");
+    }
+
+    // Generate a list of messages
+    // TODO: for now just using job-printer-state-message, are there others?
+    QStringList messages;
+
+    if (__CUPS_ATTR_EXISTS(rawMap, "job-printer-state-message", QString)) {
+        messages << rawMap.value("job-printer-state-message").toString();
+    }
+
+    map.insert("messages", QVariant(messages));
+
+    return map;
+}
+
 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-03 12:04:46 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-02-07 14:30:05 +0000
@@ -90,6 +90,7 @@
 
     void cancelJob(const QString &name, const int jobId);
     QList<cups_job_t *> printerGetJobs(const QString &name);
+    QMap<QString, QVariant> printerGetJobAttributes(const QString &name, const int jobId);
     int printFileToDest(const QString &filepath, const QString &title,
                         const cups_dest_t *dest);
     int createSubscription();

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp	2017-02-06 13:58:14 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp	2017-02-07 14:30:05 +0000
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2017 Canonical, Ltd.
  * Copyright (C) 2014 John Layt <[e-mail]>
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014 Red Hat, Inc.
  * Copyright (C) 2008 Novell, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,8 +23,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <QDebug>
+#include <QDateTime>
+#include <QTimeZone>
 #include <QUrl>
-#include <QDebug>
 
 CupsPkHelper::CupsPkHelper()
     : m_connection(httpConnectEncrypt(cupsServer(),
@@ -275,6 +277,46 @@
     return retval;
 }
 
+QMap<QString, QVariant> CupsPkHelper::printerGetJobAttributes(const int jobId)
+{
+    ipp_t *request;
+    QMap<QString, QVariant> map;
+
+    // Construct request
+    request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
+    QString uri = QStringLiteral("ipp://localhost/jobs/") + QString::number(jobId);
+    qDebug() << "URI:" << uri;
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri.toStdString().data());
+
+
+    // Send request and construct reply
+    ipp_t *reply;
+    const QString resourceChar = getResource(CphResourceRoot);
+    reply = cupsDoRequest(m_connection, request,
+                          resourceChar.toUtf8());
+
+    // Check if the reply is OK
+    if (isReplyOk(reply, false)) {
+        // Loop through the attributes
+        ipp_attribute_t *attr;
+
+        for (attr = ippFirstAttribute(reply); attr; attr = ippNextAttribute(reply)) {
+            QVariant value = getAttributeValue(attr);
+            map.insert(ippGetName(attr), value);
+        }
+    } else {
+        qWarning() << "Not able to get attributes of job:" << jobId;
+    }
+
+    // Destruct the reply if valid
+    if (reply) {
+        ippDelete(reply);
+    }
+
+    return map;
+}
+
 
 /* This function sets given options to specified values in file 'ppdfile'.
  * This needs to be done because of applications which use content of PPD files
@@ -798,3 +840,79 @@
 
     ippDelete(resp);
 }
+
+QVariant CupsPkHelper::getAttributeValue(ipp_attribute_t *attr, int index) const
+{
+    QVariant var;
+
+    if (ippGetCount(attr) > 1 && index < 0) {
+        QList<QVariant> list;
+
+        for (int i=0; i < ippGetCount(attr); i++) {
+            list.append(getAttributeValue(attr, i));
+        }
+
+        var = QVariant::fromValue<QList<QVariant>>(list);
+    } else {
+        if (index == -1) {
+            index = 0;
+        }
+
+        switch (ippGetValueTag(attr)) {
+        case IPP_TAG_NAME:
+        case IPP_TAG_TEXT:
+        case IPP_TAG_KEYWORD:
+        case IPP_TAG_URI:
+        case IPP_TAG_CHARSET:
+        case IPP_TAG_MIMETYPE:
+        case IPP_TAG_LANGUAGE:
+            var = QVariant::fromValue<QString>(ippGetString(attr, index, NULL));
+            break;
+        case IPP_TAG_INTEGER:
+        case IPP_TAG_ENUM:
+            var = QVariant::fromValue<int>(ippGetInteger(attr, index));
+            break;
+        case IPP_TAG_BOOLEAN:
+            var = QVariant::fromValue<bool>(ippGetBoolean(attr, index));
+            break;
+        case IPP_TAG_RANGE: {
+            QString range;
+            int upper;
+            int lower = ippGetRange(attr, index, &upper);
+
+            // Build a string similar to "1-3" "5-" "8" "-4"
+            if (lower != INT_MIN) {
+                range += QString::number(lower);
+            }
+
+            if (lower != upper) {
+                range += QStringLiteral("-");
+
+                if (upper != INT_MAX) {
+                    range += QString::number(upper);
+                }
+            }
+
+            var = QVariant(range);
+            break;
+        }
+        case IPP_TAG_NOVALUE:
+            var = QVariant();
+            break;
+        case IPP_TAG_DATE: {
+            time_t time = ippDateToTime(ippGetDate(attr, index));
+            QDateTime datetime;
+            datetime.setTimeZone(QTimeZone::systemTimeZone());
+            datetime.setTime_t(time);
+
+            var = QVariant::fromValue<QDateTime>(datetime);
+            break;
+        }
+        default:
+            qWarning() << "Unknown IPP value tab 0x" << ippGetValueTag(attr);
+            break;
+        }
+    }
+
+    return var;
+}

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h	2017-02-02 22:52:19 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h	2017-02-07 14:30:05 +0000
@@ -62,6 +62,8 @@
     ppd_file_t* getPpdFile(const QString &name, const QString &instance) const;
     cups_dest_t* getDest(const QString &name, const QString &instance) const;
 
+    QMap<QString, QVariant> printerGetJobAttributes(const int jobId);
+
     QString getLastError() const;
 
     // This response needs to be free by the caller.
@@ -110,6 +112,7 @@
     bool handleReply(ipp_t *reply);
     bool isReplyOk(ipp_t *reply, bool deleteIfReplyNotOk);
     void setErrorFromReply(ipp_t *reply);
+    QVariant getAttributeValue(ipp_attribute_t *attr, int index=-1) const;
 
     http_t *m_connection;
     ipp_status_t m_lastStatus = IPP_OK;

=== modified file 'plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp	2017-02-03 16:34:49 +0000
+++ plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp	2017-02-07 14:30:05 +0000
@@ -175,12 +175,72 @@
         auto job = m_jobs[index.row()];
 
         switch (role) {
+        case CollateRole:
+            ret = job->collate();
+            break;
+        case ColorModelRole: {
+            if (job->printer()) {
+                ret = job->printer()->supportedColorModels().at(job->colorModel()).text;
+            } else {
+                qWarning() << "Printer is undefined, no colorModel";
+                ret = "";
+            }
+            break;
+        }
+        case CompletedTimeRole:
+            ret = job->completedTime().toString(QLocale::system().dateTimeFormat());
+            break;
+        case CopiesRole:
+            ret = job->copies();
+            break;
+        case CreationTimeRole:
+            ret = job->creationTime().toString(QLocale::system().dateTimeFormat());
+            break;
+        case DuplexRole: {
+            if (job->printer()) {
+                ret = job->printer()->supportedDuplexStrings().at(job->duplexMode());
+            } else {
+                qWarning() << "Printer is undefined, no duplexMode";
+                ret = "";
+            }
+            break;
+        }
         case IdRole:
             ret = job->jobId();
             break;
+        case LandscapeRole:
+            ret = job->landscape();
+            break;
+        case MessagesRole:
+            ret = job->messages();
+            break;
         case OwnerRole:
             ret = m_printer_name;
             break;
+        case PrintRangeRole:
+            ret = job->printRange();
+            break;
+        case PrintRangeModeRole:
+            ret = QVariant::fromValue<PrinterEnum::PrintRange>(job->printRangeMode());
+            break;
+        case ProcessingTimeRole:
+            ret = job->processingTime().toString(QLocale::system().dateTimeFormat());
+            break;
+        case QualityRole: {
+            if (job->printer()) {
+                ret = job->printer()->supportedPrintQualities().at(job->quality()).text;
+            } else {
+                qWarning() << "Printer is undefined, no quality";
+                ret = "";
+            }
+            break;
+        }
+        case ReverseRole:
+            ret = job->reverse();
+            break;
+        case SizeRole:
+            ret = job->size();
+            break;
         case StateRole:
             // TODO: improve, for now have a switch
             switch (job->state()) {
@@ -211,6 +271,9 @@
         case TitleRole:
             ret = job->title();
             break;
+        case UserRole:
+            ret = job->user();
+            break;
         }
     }
 
@@ -224,9 +287,24 @@
     if (Q_UNLIKELY(names.empty())) {
         names[Qt::DisplayRole] = "displayName";
         names[IdRole] = "id";
+        names[CollateRole] = "collate";
+        names[ColorModelRole] = "colorModel";
+        names[CompletedTimeRole] = "completedTime";
+        names[CopiesRole] = "copies";
+        names[CreationTimeRole] = "creationTime";
+        names[DuplexRole] = "duplexMode";
+        names[LandscapeRole] = "landscape";
+        names[MessagesRole] = "messages";
         names[OwnerRole] = "owner";
+        names[PrintRangeRole] = "printRange";
+        names[PrintRangeModeRole] = "printRangeMode";
+        names[ProcessingTimeRole] = "processingTime";
+        names[QualityRole] = "quality";
+        names[ReverseRole] = "reverse";
+        names[SizeRole] = "size";
         names[StateRole] = "state";
         names[TitleRole] = "title";
+        names[UserRole] = "user";
         names[LastStateMessageRole] = "lastStateMessage";
     }
 

=== modified file 'plugins/Ubuntu/Settings/Printers/models/jobmodel.h'
--- plugins/Ubuntu/Settings/Printers/models/jobmodel.h	2017-02-03 16:34:49 +0000
+++ plugins/Ubuntu/Settings/Printers/models/jobmodel.h	2017-02-07 14:30:05 +0000
@@ -44,9 +44,24 @@
     {
         // Qt::DisplayRole holds job title
         IdRole = Qt::UserRole,
+        CollateRole,
+        ColorModelRole,
+        CompletedTimeRole,
+        CopiesRole,
+        CreationTimeRole,
+        DuplexRole,
+        LandscapeRole,
         OwnerRole,
+        MessagesRole,
+        PrintRangeRole,
+        PrintRangeModeRole,
+        ProcessingTimeRole,
+        QualityRole,
+        ReverseRole,
+        SizeRole,
         StateRole,
         TitleRole,
+        UserRole,
         LastStateMessageRole,
         LastRole = LastStateMessageRole,
     };

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-02-06 13:58:14 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-02-07 14:30:05 +0000
@@ -36,19 +36,25 @@
     : QObject(parent)
     , m_collate(true)
     , m_color_model(0)
+    , m_completed_time(QDateTime())
     , m_copies(1)
+    , m_creation_time(QDateTime())
     , m_backend(backend)
     , m_duplex_mode(0)
     , m_is_two_sided(false)
     , m_job_id(-1)
+    , m_messages(QStringList())
     , m_printer(printer)
     , m_printer_name(QStringLiteral(""))
     , m_print_range(QStringLiteral(""))
     , m_print_range_mode(PrinterEnum::PrintRange::AllPages)
+    , m_processing_time(QDateTime())
     , m_quality(0)
     , m_reverse(false)
+    , m_size(0)
     , m_state(PrinterEnum::JobState::Pending)
     , m_title(QStringLiteral(""))
+    , m_user("")
 {
     if (m_printer) {
         m_printer_name = printer->name();
@@ -88,11 +94,21 @@
     return getColorModel().colorType;
 }
 
+QDateTime PrinterJob::completedTime() const
+{
+    return m_completed_time;
+}
+
 int PrinterJob::copies() const
 {
     return m_copies;
 }
 
+QDateTime PrinterJob::creationTime() const
+{
+    return m_creation_time;
+}
+
 int PrinterJob::duplexMode() const
 {
     return m_duplex_mode;
@@ -150,10 +166,15 @@
     }
 }
 
-//Printer *PrinterJob::printer() const
-//{
-//    return m_printer;
-//}
+QStringList PrinterJob::messages() const
+{
+    return m_messages;
+}
+
+Printer *PrinterJob::printer() const
+{
+    return m_printer;
+}
 
 QString PrinterJob::printerName() const
 {
@@ -179,6 +200,11 @@
     return m_print_range_mode;
 }
 
+QDateTime PrinterJob::processingTime() const
+{
+    return m_processing_time;
+}
+
 int PrinterJob::quality() const
 {
     return m_quality;
@@ -189,6 +215,11 @@
     return m_reverse;
 }
 
+int PrinterJob::size() const
+{
+    return m_size;
+}
+
 PrinterEnum::JobState PrinterJob::state() const
 {
     return m_state;
@@ -218,6 +249,15 @@
     Q_EMIT colorModelTypeChanged();
 }
 
+void PrinterJob::setCompletedTime(const QDateTime &completedTime)
+{
+    if (m_completed_time != completedTime) {
+        m_completed_time = completedTime;
+
+        Q_EMIT completedTimeChanged();
+    }
+}
+
 void PrinterJob::setCopies(const int copies)
 {
     if (m_copies != copies) {
@@ -231,6 +271,15 @@
     }
 }
 
+void PrinterJob::setCreationTime(const QDateTime &creationTime)
+{
+    if (m_creation_time != creationTime) {
+        m_creation_time = creationTime;
+
+        Q_EMIT creationTimeChanged();
+    }
+}
+
 void PrinterJob::setDuplexMode(const int duplexMode)
 {
     if (m_duplex_mode != duplexMode) {
@@ -262,6 +311,15 @@
     }
 }
 
+void PrinterJob::setMessages(const QStringList &messages)
+{
+    if (m_messages != messages) {
+        m_messages = messages;
+
+        Q_EMIT messagesChanged();
+    }
+}
+
 //void PrinterJob::setPrinter(Printer *printer)
 //{
 //    qDebug() << "Attempting to set printer!" << printer;
@@ -309,6 +367,15 @@
     }
 }
 
+void PrinterJob::setProcessingTime(const QDateTime &processingTime)
+{
+    if (m_processing_time != processingTime) {
+        m_processing_time = processingTime;
+
+        Q_EMIT processingTimeChanged();
+    }
+}
+
 void PrinterJob::setQuality(const int quality)
 {
     if (m_quality != quality) {
@@ -327,6 +394,15 @@
     }
 }
 
+void PrinterJob::setSize(const int size)
+{
+    if (m_size != size) {
+        m_size = size;
+
+        Q_EMIT sizeChanged();
+    }
+}
+
 void PrinterJob::setState(const PrinterEnum::JobState &state)
 {
     if (m_state != state) {
@@ -345,6 +421,15 @@
     }
 }
 
+void PrinterJob::setUser(const QString &user)
+{
+    if (m_user != user) {
+        m_user = user;
+
+        Q_EMIT userChanged();
+    }
+}
+
 QString PrinterJob::title() const
 {
     return m_title;
@@ -386,3 +471,8 @@
     setState(newPrinterJob->state());
     setTitle(newPrinterJob->title());
 }
+
+QString PrinterJob::user() const
+{
+    return m_user;
+}

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-02-03 14:43:41 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-02-07 14:30:05 +0000
@@ -25,6 +25,7 @@
 #include "backend/backend.h"
 #include "printer/printer.h"
 
+#include <QtCore/QDateTime>
 #include <QtCore/QObject>
 
 class Printer;
@@ -37,18 +38,24 @@
     Q_PROPERTY(bool collate READ collate WRITE setCollate NOTIFY collateChanged)
     Q_PROPERTY(int colorModel READ colorModel WRITE setColorModel NOTIFY colorModelChanged)
     Q_PROPERTY(PrinterEnum::ColorModelType colorModelType READ colorModelType NOTIFY colorModelTypeChanged)
+    Q_PROPERTY(QDateTime completedTime READ completedTime NOTIFY completedTimeChanged)
     Q_PROPERTY(int copies READ copies WRITE setCopies NOTIFY copiesChanged)
+    Q_PROPERTY(QDateTime creationTime READ creationTime NOTIFY creationTimeChanged)
     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(QStringList messages READ messages NOTIFY messagesChanged)
 //    Q_PROPERTY(Printer *printer READ printer WRITE setPrinter NOTIFY printerChanged)
     Q_PROPERTY(QString printerName READ printerName WRITE setPrinterName NOTIFY printerNameChanged)
     Q_PROPERTY(QString printRange READ printRange WRITE setPrintRange NOTIFY printRangeChanged)
     Q_PROPERTY(PrinterEnum::PrintRange printRangeMode READ printRangeMode WRITE setPrintRangeMode NOTIFY printRangeModeChanged)
+    Q_PROPERTY(QDateTime processingTime READ processingTime NOTIFY processingTimeChanged)
     Q_PROPERTY(int quality READ quality WRITE setQuality NOTIFY qualityChanged)
     Q_PROPERTY(bool reverse READ reverse WRITE setReverse NOTIFY reverseChanged)
+    Q_PROPERTY(int size READ size NOTIFY sizeChanged)
     Q_PROPERTY(PrinterEnum::JobState state READ state NOTIFY stateChanged)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
+    Q_PROPERTY(QString user READ user NOTIFY userChanged)
 
     friend class PrinterCupsBackend;
 public:
@@ -62,19 +69,25 @@
     bool collate() const;
     int colorModel() const;
     PrinterEnum::ColorModelType colorModelType() const;
+    QDateTime completedTime() const;
     int copies() const;
+    QDateTime creationTime() const;
     int duplexMode() const;
     bool isTwoSided() const;
     int jobId() const;  // TODO: implement
     bool landscape() const;
-//    Printer *printer() const;
+    QStringList messages() const;
+    Printer* printer() const;
     QString printerName() const;
     QString printRange() const;
     PrinterEnum::PrintRange printRangeMode() const;
+    QDateTime processingTime() const;
     int quality() const;
     bool reverse() const;
+    int size() const;
     PrinterEnum::JobState state() const;
     QString title() const;
+    QString user() const;
 
     bool deepCompare(QSharedPointer<PrinterJob> other) const;
 public Q_SLOTS:
@@ -98,41 +111,59 @@
     void updateFrom(QSharedPointer<PrinterJob> newPrinterJob);
 private Q_SLOTS:
     void loadDefaults();
+    void setCompletedTime(const QDateTime &completedTime);
+    void setCreationTime(const QDateTime &creationTime);
     void setIsTwoSided(const bool isTwoSided);
+    void setMessages(const QStringList &messages);
+    void setProcessingTime(const QDateTime &processingTime);
+    void setSize(const int size);
     void setState(const PrinterEnum::JobState &state);
+    void setUser(const QString &user);
 Q_SIGNALS:
     void collateChanged();
     void colorModelChanged();
     void colorModelTypeChanged();
+    void completedTimeChanged();
     void copiesChanged();
+    void creationTimeChanged();
     void duplexModeChanged();
     void isTwoSidedChanged();
     void landscapeChanged();
+    void messagesChanged();
 //    void printerChanged();
     void printerNameChanged();
     void printRangeChanged();
     void printRangeModeChanged();
+    void processingTimeChanged();
     void qualityChanged();
     void reverseChanged();
+    void sizeChanged();
     void stateChanged();
     void titleChanged();
+    void userChanged();
 private:
     bool m_collate;
     int m_color_model;
+    QDateTime m_completed_time;
     int m_copies;
+    QDateTime m_creation_time;
     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;
+    QStringList m_messages;
     Printer *m_printer;
     QString m_printer_name;
     QString m_print_range;
     PrinterEnum::PrintRange m_print_range_mode;
+    QDateTime m_processing_time;
     int m_quality;
     bool m_reverse;
+    int m_size;
     PrinterEnum::JobState m_state;
     QString m_title;
+    QString m_user;
 };
 
 #endif // USC_PRINTERS_PRINTERJOB_H