Merge lp:~jonas-drange/ubuntu-settings-components/quality-read-write into lp:~phablet-team/ubuntu-settings-components/printer-components

[Jonas G. Drange]

* Implements read/write of select Quality ppd settings
* Updates PrinterJob to use the correct quality setting
* Fixes broken ColorModel system, now reflects most ppds, and leaves the ppd implementation details in the ppd (colorspace, organization, etc)

[lp:~jonas-drange/ubuntu-settings-components/quality-read-write]

212. By Jonas G. Drange on 2017-01-19

reloads qualities

[Andrew Hayzen (ahayzen)]

For my HP printers I don't get any Quality values from them. I had to add "OutputMode" to the list of opts in CupsFacadeImpl::printerGetSupportedQualities. See a grep of my ppd file http://pastebin.ubuntu.com/23832630/ which shows that OutputMode and DefaultOutputMode should probably be used.

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

Also can the list of quality opts in CupsFacadeImpl::printerGetSupportedQualities and CupsFacadeImpl::printerGetOptions be combined so we don't have two repeated lists to maintain?

[lp:~jonas-drange/ubuntu-settings-components/quality-read-write]

213. By Jonas G. Drange on 2017-01-20

addresses comments from Andrew

214. By Jonas G. Drange on 2017-01-20

fixes warnings

[Andrew Hayzen (ahayzen)]

LGTM, thanks for the fixes :-)

review: Approve

=== modified file 'examples/Printers.qml'
--- examples/Printers.qml	2017-01-19 17:59:17 +0000
+++ examples/Printers.qml	2017-01-20 12:08:10 +0000
@@ -121,11 +121,25 @@
                             if (enabled)
                                 selectedIndex = printer.colorModel
                         }
+                    }
 
+                    ListItems.ValueSelector {
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+                        visible: printer.supportedPrintQualities.length
+                        text: "Quality"
+                        values: printer.supportedPrintQualities
+                        enabled: values.length > 1
+                        onSelectedIndexChanged: printer.printQuality = selectedIndex
+                        Component.onCompleted: {
+                            if (enabled)
+                                selectedIndex = printer.printQuality
+                        }
                     }
                 }
             }
-
         }
     }
 

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-01-17 16:21:54 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-01-20 12:08:10 +0000
@@ -96,6 +96,8 @@
 
     virtual QList<ColorModel> printerGetSupportedColorModels(
         const QString &name) const = 0;
+    virtual QList<PrintQuality> printerGetSupportedQualities(
+        const QString &name) const = 0;
     virtual int printFileToDest(const QString &filepath,
                                 const QString &title,
                                 const cups_dest_t *dest) = 0;

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.cpp	2017-01-18 14:35:30 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.cpp	2017-01-20 12:08:10 +0000
@@ -190,9 +190,9 @@
 QVariant CupsFacadeImpl::printerGetOption(const QString &name,
                                           const QString &option)
 {
-    Q_UNUSED(name);
-    Q_UNUSED(option);
-    return QVariant();
+    QStringList opts({option});
+    auto res = printerGetOptions(name, opts);
+    return res[option];
 }
 
 QMap<QString, QVariant> CupsFacadeImpl::printerGetOptions(
@@ -222,17 +222,31 @@
     Q_FOREACH(const QString &option, options) {
         if (option == "DefaultColorModel") {
             ColorModel model;
-
-            ppd_option_t *defCModel = ppdFindOption(ppd, option.toUtf8());
-            if (defCModel) {
-                model = Utils::parsePpdColorModel(defCModel->choices[0].choice);
-            } else {
-                ppd_option_t *cModel = ppdFindOption(ppd, "ColorModel");
-                if (cModel) {
-                    model = Utils::parsePpdColorModel(cModel->defchoice);
+            ppd_option_t *ppdColorModel = ppdFindOption(ppd, "ColorModel");
+            if (ppdColorModel) {
+                ppd_choice_t* def = ppdFindChoice(ppdColorModel,
+                                                  ppdColorModel->defchoice);
+                if (def) {
+                    model = Utils::parsePpdColorModel(def->choice,
+                                                      def->text,
+                                                      "ColorModel");
                 }
             }
             ret[option] = QVariant::fromValue(model);
+        } else if (option == "DefaultPrintQuality") {
+            PrintQuality quality;
+            Q_FOREACH(const QString opt, m_knownQualityOptions) {
+                ppd_option_t *ppdQuality = ppdFindOption(ppd, opt.toUtf8());
+                if (ppdQuality) {
+                    ppd_choice_t* def = ppdFindChoice(ppdQuality,
+                                                      ppdQuality->defchoice);
+                    if (def) {
+                        quality = Utils::parsePpdPrintQuality(def->choice,
+                                                              def->text, opt);
+                    }
+                }
+            }
+            ret[option] = QVariant::fromValue(quality);
         } else {
             ppd_option_t *val = ppdFindOption(ppd, option.toUtf8());
 
@@ -246,7 +260,6 @@
 
     ppdClose(ppd);
     cupsFreeDests(1, dest);
-
     return ret;
 }
 
@@ -264,8 +277,36 @@
 
     ppd_option_t *colorModels = ppdFindOption(ppd, "ColorModel");
     if (colorModels) {
-        for (int i = 0; i < colorModels->num_choices; ++i)
-            ret.append(Utils::parsePpdColorModel(colorModels->choices[i].choice));
+        for (int i = 0; i < colorModels->num_choices; ++i) {
+            ret.append(Utils::parsePpdColorModel(colorModels->choices[i].choice,
+                                                 colorModels->choices[i].text,
+                                                 "ColorModel"));
+        }
+    }
+
+    ppdClose(ppd);
+    return ret;
+}
+
+QList<PrintQuality> CupsFacadeImpl::printerGetSupportedQualities(const QString &name) const
+{
+    QList<PrintQuality> ret;
+    ppd_file_t* ppd;
+
+    ppd = helper.getPpdFile(getPrinterName(name), getPrinterInstance(name));
+    if (!ppd) {
+        qCritical() << "Could not get PPD for" << name;
+        return ret;
+    }
+
+    Q_FOREACH(const QString &opt, m_knownQualityOptions) {
+        ppd_option_t *qualityOpt = ppdFindOption(ppd, opt.toUtf8());
+        if (qualityOpt) {
+            for (int i = 0; i < qualityOpt->num_choices; ++i)
+                ret.append(Utils::parsePpdPrintQuality(qualityOpt->choices[i].choice,
+                                                       qualityOpt->choices[i].text,
+                                                       opt));
+        }
     }
 
     ppdClose(ppd);
@@ -310,23 +351,9 @@
         __CUPS_ADD_OPTION(dest, "page-ranges", options->printRange().toLocal8Bit());
     }
 
-    QString printQuality = "";
-    switch (options->quality()) {
-    case PrinterEnum::Quality::DraftQuality:
-        printQuality = "FastDraft";
-        break;
-    case PrinterEnum::Quality::BestQuality:
-        printQuality = "Best";
-        break;
-    case PrinterEnum::Quality::PhotoQuality:
-        printQuality = "Photo";
-        break;
-    case PrinterEnum::Quality::NormalQuality:
-    default:
-        printQuality = "Normal";
-        break;
-    }
-    __CUPS_ADD_OPTION(dest, "OutputMode", printQuality.toLocal8Bit());
+    PrintQuality quality = options->getPrintQuality();
+    __CUPS_ADD_OPTION(dest, quality.originalOption.toLocal8Bit(),
+                      quality.name.toLocal8Bit());
 
     return dest;
 }

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.h	2017-01-17 16:21:54 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.h	2017-01-20 12:08:10 +0000
@@ -76,7 +76,8 @@
     ) override;
     virtual QList<ColorModel> printerGetSupportedColorModels(
         const QString &name) const override;
-
+    virtual QList<PrintQuality> printerGetSupportedQualities(
+        const QString &name) const override;
     virtual cups_dest_t* makeDest(const QString &name,
                                   const PrinterJob *options) override;
 
@@ -87,6 +88,10 @@
     QString getPrinterName(const QString &name) const;
     QString getPrinterInstance(const QString &name) const;
     QStringList parsePpdColorModel(const QString &colorModel);
+    const QStringList m_knownQualityOptions = QStringList({
+        "Quality", "PrintQuality", "HPPrintQuality", "StpQuality",
+        "OutputMode",
+    });
     CupsPkHelper helper;
 };
 

=== modified file 'plugins/Ubuntu/Settings/Printers/enums.h'
--- plugins/Ubuntu/Settings/Printers/enums.h	2017-01-18 14:35:30 +0000
+++ plugins/Ubuntu/Settings/Printers/enums.h	2017-01-20 12:08:10 +0000
@@ -107,15 +107,6 @@
     };
     Q_ENUM(PrintRange)
 
-    enum class Quality
-    {
-        DraftQuality = 0,
-        NormalQuality,
-        BestQuality,
-        PhotoQuality,
-    };
-    Q_ENUM(Quality)
-
     enum class State
     {
         IdleState = 0,

=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-01-19 20:05:56 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-01-20 12:08:10 +0000
@@ -190,10 +190,17 @@
         // case PdfModeRole:
         //     ret = printer->pdfMode();
         //     break;
-        // case QualityRole:
-        //     ret = printer->quality();
-        //     break;
-
+        case PrintQualityRole:
+            ret = printer->supportedPrintQualities().indexOf(printer->defaultPrintQuality());
+            break;
+        case SupportedPrintQualitiesRole: {
+                QStringList qualities;
+                Q_FOREACH(const PrintQuality &q, printer->supportedPrintQualities()) {
+                    qualities.append(q.text.isEmpty() ? q.name : q.text);
+                }
+                ret = qualities;
+            }
+            break;
         case DescriptionRole:
             ret = printer->description();
             break;
@@ -273,6 +280,14 @@
                 }
             }
             break;
+        case PrintQualityRole: {
+                int index = value.toInt();
+                QList<PrintQuality> quals = printer->supportedPrintQualities();
+                if (index >= 0 && quals.size() > index) {
+                    printer->setDefaultPrintQuality(quals.at(index));
+                }
+            }
+            break;
         }
     }
 
@@ -295,7 +310,8 @@
         names[PrintRangeRole] = "printRange";
         names[PrintRangeModeRole] = "printRangeMode";
         names[PdfModeRole] = "pdfMode";
-        names[QualityRole] = "quality";
+        names[PrintQualityRole] = "printQuality";
+        names[SupportedPrintQualitiesRole] = "supportedPrintQualities";
         names[DescriptionRole] = "description";
         names[PageSizeRole] = "pageSize";
         names[SupportedPageSizesRole] = "supportedPageSizes";

=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.h'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.h	2017-01-19 19:50:01 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.h	2017-01-20 12:08:10 +0000
@@ -53,7 +53,8 @@
         PrintRangeRole,
         PrintRangeModeRole,
         PdfModeRole,
-        QualityRole,
+        PrintQualityRole,
+        SupportedPrintQualitiesRole,
         DescriptionRole,
         PageSizeRole,
         SupportedPageSizesRole,

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printer.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printer.cpp	2017-01-19 17:59:17 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printer.cpp	2017-01-20 12:08:10 +0000
@@ -41,6 +41,7 @@
 PrinterPrivate::PrinterPrivate(Printer *q)
 {
     loadColorModel();
+    loadPrintQualities();
 }
 
 PrinterPrivate::PrinterPrivate(Printer *q, PrinterInfo *info, CupsFacade *cups)
@@ -49,6 +50,7 @@
     this->cups = cups;
 
     loadColorModel();
+    loadPrintQualities();
 }
 
 PrinterPrivate::~PrinterPrivate()
@@ -70,9 +72,7 @@
             m_supportedColorModels.append(m_defaultColorModel);
         }
     } else {
-        ColorModel rgb = ColorModel();
-        rgb.colorOrganization = PrinterEnum::ColorOrganization::UnknownOrganization;
-        rgb.colorSpace = PrinterEnum::ColorSpace::RGBSpace;
+        ColorModel rgb;
         rgb.colorType = PrinterEnum::ColorModelType::ColorType;
         rgb.name = "RGB";
         rgb.text = "Color";
@@ -82,6 +82,23 @@
     }
 }
 
+void PrinterPrivate::loadPrintQualities()
+{
+    if (!this->info->isPdf()) {
+        QString name = this->info->printerName();
+        m_defaultPrintQuality = this->cups->printerGetOption(
+            name, "DefaultPrintQuality").value<PrintQuality>();
+        m_supportedPrintQualities = this->cups->printerGetSupportedQualities(name);
+    } else {
+        PrintQuality quality;
+        m_defaultPrintQuality = quality;
+        m_supportedPrintQualities = QList<PrintQuality>({quality});
+    }
+    if (m_supportedPrintQualities.size() == 0) {
+        m_supportedPrintQualities.append(m_defaultPrintQuality);
+    }
+}
+
 ColorModel Printer::defaultColorModel() const
 {
     Q_D(const Printer);
@@ -94,6 +111,18 @@
     return d->m_supportedColorModels;
 }
 
+PrintQuality Printer::defaultPrintQuality() const
+{
+    Q_D(const Printer);
+    return d->m_defaultPrintQuality;
+}
+
+QList<PrintQuality> Printer::supportedPrintQualities() const
+{
+    Q_D(const Printer);
+    return d->m_supportedPrintQualities;
+}
+
 QList<PrinterEnum::DuplexMode> Printer::supportedDuplexModes() const
 {
     Q_D(const Printer);
@@ -137,12 +166,6 @@
     return d->info->printerName();
 }
 
-PrinterEnum::Quality Printer::quality() const
-{
-    // FIXME: tmp return a valid quality
-    return PrinterEnum::Quality::NormalQuality;
-}
-
 QString Printer::description() const
 {
     Q_D(const Printer);
@@ -216,7 +239,7 @@
         return;
     }
 
-    QStringList vals({Utils::colorModelToPpdColorModel(colorModel)});
+    QStringList vals({colorModel.name});
     QString reply = d->cups->printerAddOption(name(), "ColorModel", vals);
     Q_UNUSED(reply);
 
@@ -273,9 +296,22 @@
 
 }
 
-void Printer::setQuality(const PrinterEnum::Quality &quality)
+void Printer::setDefaultPrintQuality(const PrintQuality &quality)
 {
-
+    Q_D(Printer);
+
+    if (defaultPrintQuality() == quality) {
+        return;
+    }
+
+    if (!supportedPrintQualities().contains(quality)) {
+        qWarning() << Q_FUNC_INFO << "quality not supported.";
+        return;
+    }
+
+    QStringList vals({quality.name});
+    QString reply = d->cups->printerAddOption(name(), quality.originalOption, vals);
+    d->loadPrintQualities();
 }
 
 void Printer::setDefaultPageSize(const QPageSize &pageSize)

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printer.h'
--- plugins/Ubuntu/Settings/Printers/printer/printer.h	2017-01-19 17:59:17 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printer.h	2017-01-20 12:08:10 +0000
@@ -45,7 +45,6 @@
     Q_PROPERTY(QStringList supportedDuplexStrings READ supportedDuplexStrings CONSTANT)
     Q_PROPERTY(PrinterEnum::DuplexMode defaultDuplexMode READ defaultDuplexMode WRITE setDefaultDuplexMode NOTIFY defaultDuplexModeChanged)
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(PrinterEnum::Quality quality READ quality WRITE setQuality NOTIFY qualityChanged)
     Q_PROPERTY(QString description READ description WRITE setDescription NOTIFY descriptionChanged)
     Q_PROPERTY(QPageSize defaultPageSize READ defaultPageSize WRITE setDefaultPageSize NOTIFY defaultPageSizeChanged)
     Q_PROPERTY(QList<QPageSize> supportedPageSizes READ supportedPageSizes CONSTANT)
@@ -68,7 +67,8 @@
     QStringList supportedDuplexStrings() const;
     PrinterEnum::DuplexMode defaultDuplexMode() const;
     QString name() const;
-    PrinterEnum::Quality quality() const;
+    PrintQuality defaultPrintQuality() const;
+    QList<PrintQuality> supportedPrintQualities() const;
     QString description() const;
     QPageSize defaultPageSize() const;
     QList<QPageSize> supportedPageSizes() const;
@@ -87,7 +87,7 @@
     void setEnabled(const bool enabled);
     void setErrorPolicy(const PrinterEnum::ErrorPolicy &errorPolicy);
     void setName(const QString &name);
-    void setQuality(const PrinterEnum::Quality &quality);
+    void setDefaultPrintQuality(const PrintQuality &quality);
     void setDefaultPageSize(const QPageSize &pageSize);
 
 public Q_SLOTS:

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printer_p.h'
--- plugins/Ubuntu/Settings/Printers/printer/printer_p.h	2017-01-17 15:14:25 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printer_p.h	2017-01-20 12:08:10 +0000
@@ -25,12 +25,17 @@
     explicit PrinterPrivate(Printer *q, PrinterInfo *info, CupsFacade *cups);
     ~PrinterPrivate();
     void loadColorModel();
+    void loadPrintQualities();
 
     CupsFacade *cups;
     Printer *q_ptr;
     PrinterInfo *info;
+
     ColorModel m_defaultColorModel;
     QList<ColorModel> m_supportedColorModels;
+
+    PrintQuality m_defaultPrintQuality;
+    QList<PrintQuality> m_supportedPrintQualities;
 };
 
 #endif // USC_PRINTERS_PRINTERPRIVATE_H

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-19 18:15:32 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-20 12:08:10 +0000
@@ -31,7 +31,7 @@
     , m_printer_name(QStringLiteral(""))
     , m_print_range(QStringLiteral(""))
     , m_print_range_mode(PrinterEnum::PrintRange::AllPages)
-    , m_quality(PrinterEnum::Quality::NormalQuality)
+    , m_quality(0)
     // TODO: Do we need a separate Job state?
     // NotStarted, InQueue, Processing, Complete, Error ?
     , m_state(PrinterEnum::State::IdleState)
@@ -88,11 +88,20 @@
 
 ColorModel PrinterJob::getColorModel() const
 {
+    ColorModel ret;
     if (m_printer && colorModel() > -1 && colorModel() < m_printer->supportedColorModels().count()) {
-        return m_printer->supportedColorModels().at(colorModel());
-    } else {
-        return ColorModel();
-    }
+        ret = m_printer->supportedColorModels().at(colorModel());
+    }
+    return ret;
+}
+
+PrintQuality PrinterJob::getPrintQuality() const
+{
+    PrintQuality ret;
+    if (m_printer && quality() > -1 && quality() < m_printer->supportedPrintQualities().count()) {
+        ret = m_printer->supportedPrintQualities().at(quality());
+    }
+    return ret;
 }
 
 PrinterEnum::DuplexMode PrinterJob::getDuplexMode() const
@@ -115,7 +124,7 @@
         // Load defaults from printer
         setColorModel(m_printer->supportedColorModels().indexOf(m_printer->defaultColorModel()));
         setDuplexMode(m_printer->supportedDuplexModes().indexOf(m_printer->defaultDuplexMode()));
-        setQuality(m_printer->quality());
+        setQuality(m_printer->supportedPrintQualities().indexOf(m_printer->defaultPrintQuality()));
     }
 }
 
@@ -152,7 +161,7 @@
     return m_print_range_mode;
 }
 
-PrinterEnum::Quality PrinterJob::quality() const
+int PrinterJob::quality() const
 {
     return m_quality;
 }
@@ -261,7 +270,7 @@
     }
 }
 
-void PrinterJob::setQuality(const PrinterEnum::Quality &quality)
+void PrinterJob::setQuality(const int quality)
 {
     if (m_quality != quality) {
         m_quality = quality;

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-01-18 14:35:30 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-01-20 12:08:10 +0000
@@ -43,7 +43,7 @@
     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(PrinterEnum::Quality quality READ quality WRITE setQuality NOTIFY qualityChanged)
+    Q_PROPERTY(int quality READ quality WRITE setQuality NOTIFY qualityChanged)
     Q_PROPERTY(PrinterEnum::State state READ state NOTIFY stateChanged)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
 public:
@@ -60,13 +60,14 @@
     QString printerName() const;
     QString printRange() const;
     PrinterEnum::PrintRange printRangeMode() const;
-    PrinterEnum::Quality quality() const;
+    int quality() const;
     PrinterEnum::State state() const;
     QString title() const;
 public Q_SLOTS:
     Q_INVOKABLE void cancel();
     PrinterEnum::DuplexMode getDuplexMode() const;
     ColorModel getColorModel() const;
+    PrintQuality getPrintQuality() const;
     Q_INVOKABLE void printFile(const QUrl &url);
     void setColorModel(const int colorModel);
     void setCopies(const int copies);
@@ -76,7 +77,7 @@
     void setPrinterName(const QString &printerName);
     void setPrintRange(const QString &printRange);
     void setPrintRangeMode(const PrinterEnum::PrintRange printRangeMode);
-    void setQuality(const PrinterEnum::Quality &quality);
+    void setQuality(const int quality);
     void setTitle(const QString &title);
 private Q_SLOTS:
     void loadDefaults();
@@ -104,7 +105,7 @@
     QString m_printer_name;
     QString m_print_range;
     PrinterEnum::PrintRange m_print_range_mode;
-    PrinterEnum::Quality m_quality;
+    int m_quality;
     PrinterEnum::State m_state;
     QString m_title;
 };

=== modified file 'plugins/Ubuntu/Settings/Printers/structs.h'
--- plugins/Ubuntu/Settings/Printers/structs.h	2017-01-17 16:21:54 +0000
+++ plugins/Ubuntu/Settings/Printers/structs.h	2017-01-20 12:08:10 +0000
@@ -36,18 +36,12 @@
     QString text = QString::null;
     PrinterEnum::ColorModelType colorType
         = PrinterEnum::ColorModelType::UnknownType;
-    PrinterEnum::ColorSpace colorSpace
-        = PrinterEnum::ColorSpace::UnknownSpace;
-    PrinterEnum::ColorOrganization colorOrganization
-        = PrinterEnum::ColorOrganization::UnknownOrganization;
-    QString compressionMode = QString::null;
+
+    QString originalOption = QString::null;
 
     bool operator==(const ColorModel& a) const
     {
-        return (name == a.name && text == a.text && colorType == a.colorType &&
-                colorSpace == a.colorSpace &&
-                colorOrganization == a.colorOrganization &&
-                compressionMode == a.compressionMode);
+        return (name == a.name && originalOption == a.originalOption);
     }
     bool operator!=(const ColorModel& a) const
     {
@@ -56,16 +50,31 @@
     void operator=(const ColorModel &m) {
         name = m.name;
         text = m.text;
-        colorType = m.colorType;
-        colorSpace = m.colorSpace;
-        colorOrganization = m.colorOrganization;
-        compressionMode = m.compressionMode;
+        originalOption = m.originalOption;
+    }
+};
+
+// [1] https://www.cups.org/doc/ppd-compiler.html#COLOR
+
+struct PrintQuality
+{
+public:
+    QString name = "Normal"; // TODO: translate
+    QString text = QString::null;
+
+    // PrintQuality, StpQuality, HPPrintQuality, etc.
+    QString originalOption = QString::null;
+
+    bool operator==(const PrintQuality& a) const
+    {
+        return (name == a.name && originalOption == a.originalOption);
     }
 };
 
 Q_DECLARE_TYPEINFO(ColorModel, Q_PRIMITIVE_TYPE);
 Q_DECLARE_METATYPE(ColorModel)
 
-// [1] https://www.cups.org/doc/ppd-compiler.html#COLOR
+Q_DECLARE_TYPEINFO(PrintQuality, Q_PRIMITIVE_TYPE);
+Q_DECLARE_METATYPE(PrintQuality)
 
 #endif // USC_PRINTERS_STRUCTS_H

=== modified file 'plugins/Ubuntu/Settings/Printers/utils.h'
--- plugins/Ubuntu/Settings/Printers/utils.h	2017-01-19 17:59:17 +0000
+++ plugins/Ubuntu/Settings/Printers/utils.h	2017-01-20 12:08:10 +0000
@@ -76,137 +76,31 @@
         }
     }
 
-    static PrinterEnum::ColorSpace ppdColorSpaceToColorSpace(const ppd_cs_t &space)
-    {
-        switch (space) {
-        case PPD_CS_CMY:
-            return PrinterEnum::ColorSpace::CMYSpace;
-        case PPD_CS_CMYK:
-            return PrinterEnum::ColorSpace::CMYKSpace;
-        case PPD_CS_GRAY:
-            return PrinterEnum::ColorSpace::GraySpace;
-        case PPD_CS_N:
-            return PrinterEnum::ColorSpace::NSpace;
-        case PPD_CS_RGB:
-            return PrinterEnum::ColorSpace::RGBSpace;
-        case PPD_CS_RGBK:
-            return PrinterEnum::ColorSpace::RGBKSpace;
-        }
-    }
-
-    /* For information about this method, please see
-    <https://www.cups.org/doc/ref-ppdcfile.html#ColorModel>. */
-    static ColorModel parsePpdColorModel(const QString &colorModel)
+    static ColorModel parsePpdColorModel(const QString &name, const QString &text,
+                                         const QString &optionName)
     {
         ColorModel ret;
-        QStringList vals = colorModel.split(" ");
-
-        if (vals.size() == 1) {
-            if (vals[0].contains("/")) {
-                QStringList nameText = vals[0].split("/");
-                ret.name = nameText[0];
-                ret.text = nameText[1];
-            } else {
-                ret.name = vals[0];
-            }
-        }
+        ret.name = name;
+        ret.text = text;
+        ret.originalOption = optionName;
 
         if (ret.name.contains("Gray") || ret.name.contains("Black")) {
             ret.colorType = PrinterEnum::ColorModelType::GrayType;
         } else {
             ret.colorType = PrinterEnum::ColorModelType::ColorType;
         }
-
-        if (vals.size() == 2) {
-            QString s = vals[1].toLower();
-            if (s == "cmy") ret.colorSpace = PrinterEnum::ColorSpace::CMYSpace;
-            else if (s == "cmyk") ret.colorSpace = PrinterEnum::ColorSpace::CMYKSpace;
-            else if (s == "n") ret.colorSpace = PrinterEnum::ColorSpace::NSpace;
-            else if (s == "rgb") ret.colorSpace = PrinterEnum::ColorSpace::RGBSpace;
-            else if (s == "rgbk") ret.colorSpace = PrinterEnum::ColorSpace::RGBKSpace;
-            else ret.colorSpace = PrinterEnum::ColorSpace::GraySpace;
-        }
-
-        // ColorOrganization
-        if (vals.size() == 3) {
-            QString o = vals[2].toLower();
-            PrinterEnum::ColorOrganization org = ret.colorOrganization;
-            if (vals[2] == "chunky") {
-                org = PrinterEnum::ColorOrganization::ChunkyOrganization;
-            } else if (vals[2] == "banded") {
-                org = PrinterEnum::ColorOrganization::BandedOrganization;
-            } else if (vals[3] == "planar") {
-                org = PrinterEnum::ColorOrganization::PlanarOrganization;
-            }
-            ret.colorOrganization = org;
-        }
-
-        // Compression
-        if (vals.size() == 4) {
-            ret.compressionMode = vals[3];
-        }
         return ret;
     }
 
-    static QString colorModelToPpdColorModel(const ColorModel &model)
+    static PrintQuality parsePpdPrintQuality(const QString &choice,
+                                             const QString &text,
+                                             const QString &optionName)
     {
-        QString nameText = model.name;
-        if (!model.text.isEmpty()) nameText += QString("/%1").arg(model.text);
-
-        QString colorSpace;
-        if (model.colorSpace != PrinterEnum::ColorSpace::UnknownSpace) {
-            switch (model.colorSpace) {
-            case PrinterEnum::ColorSpace::CMYSpace:
-                colorSpace = "cmy";
-                break;
-            case PrinterEnum::ColorSpace::CMYKSpace:
-                colorSpace = "cmyk";
-                break;
-            case PrinterEnum::ColorSpace::NSpace:
-                colorSpace = "n";
-                break;
-            case PrinterEnum::ColorSpace::RGBSpace:
-                colorSpace = "rgb";
-                break;
-            case PrinterEnum::ColorSpace::RGBKSpace:
-                colorSpace = "rgbk";
-                break;
-            case PrinterEnum::ColorSpace::GraySpace:
-            case PrinterEnum::ColorSpace::UnknownSpace:
-                break;
-            }
-        }
-
-        if (colorSpace.isEmpty()) {
-            return nameText;
-        }
-
-        QString colorOrg;
-        if (model.colorOrganization != PrinterEnum::ColorOrganization::UnknownOrganization) {
-            switch (model.colorOrganization) {
-            case PrinterEnum::ColorOrganization::ChunkyOrganization:
-                colorOrg = "chunky";
-                break;
-            case PrinterEnum::ColorOrganization::BandedOrganization:
-                colorOrg = "banded";
-                break;
-            case PrinterEnum::ColorOrganization::PlanarOrganization:
-                colorOrg = "planar";
-                break;
-            case PrinterEnum::ColorOrganization::UnknownOrganization:
-                break;
-            }
-        }
-
-        if (colorOrg.isEmpty()) {
-            return QString("%1 %2").arg(nameText).arg(colorSpace);
-        }
-
-        if (model.compressionMode.isEmpty()) {
-            return QString("%1 %2 %3").arg(nameText).arg(colorSpace).arg(colorOrg);
-        }
-
-        return QString("%1 %2 %3 %4").arg(nameText).arg(colorSpace).arg(colorOrg).arg(model.compressionMode);
+        PrintQuality quality;
+        quality.name = choice;
+        quality.text = text;
+        quality.originalOption = optionName;
+        return quality;
     }
 };
 

=== modified file 'tests/unittests/Printers/mockcupsfacade.h'
--- tests/unittests/Printers/mockcupsfacade.h	2017-01-17 16:21:54 +0000
+++ tests/unittests/Printers/mockcupsfacade.h	2017-01-20 12:08:10 +0000
@@ -195,6 +195,12 @@
         return printerOptions[name].value("ColorModels").value<QList<ColorModel>>();
     }
 
+    virtual QList<PrintQuality> printerGetSupportedQualities(
+        const QString &name) const override
+    {
+        return printerOptions[name].value("PrintQualities").value<QList<PrintQuality>>();
+    }
+
     virtual cups_dest_t* makeDest(const QString &name,
                                   const PrinterJob *options) override
     {

=== modified file 'tests/unittests/Printers/tst_printer.cpp'
--- tests/unittests/Printers/tst_printer.cpp	2017-01-18 16:25:02 +0000
+++ tests/unittests/Printers/tst_printer.cpp	2017-01-20 12:08:10 +0000
@@ -67,12 +67,12 @@
         QTest::addColumn<QStringList>("strings");
         {
             QList<PrinterEnum::DuplexMode> modes({PrinterEnum::DuplexMode::DuplexNone});
-            QStringList strings({"None"});
+            QStringList strings({"One Sided"});
             QTest::newRow("one") << modes << strings;
         }
         {
             QList<PrinterEnum::DuplexMode> modes({PrinterEnum::DuplexMode::DuplexNone, PrinterEnum::DuplexMode::DuplexLongSide});
-            QStringList strings({"None", "Long edge (standard)"});
+            QStringList strings({"One Sided", "Long Edge (Standard)"});
             QTest::newRow("multiple") << modes << strings;
         }
     }
@@ -164,9 +164,6 @@
     void testDefaultColorMode()
     {
         ColorModel colorModel;
-        ((MockCupsFacade*) m_mockcups)->printerOptions[m_printerName].insert(
-            "DefaultColorModel", QVariant::fromValue(colorModel));
-
         QCOMPARE(m_instance->defaultColorModel(), colorModel);
     }
     void testSupportedColorModels()
@@ -185,6 +182,27 @@
         Printer p(info, cups);
         QCOMPARE(p.supportedColorModels(), models);
     }
+    void testDefaultPrintQuality()
+    {
+        PrintQuality quality;
+        QCOMPARE(m_instance->defaultPrintQuality(), quality);
+    }
+    void testSupportedQualities()
+    {
+        PrintQuality a;
+        a.name = "Poor";
+
+        PrintQuality b;
+        b.name = "Worse";
+        QList<PrintQuality> qualities({a, b});
+
+        PrinterInfo *info = new MockPrinterInfo(m_printerName);
+        CupsFacade *cups = new MockCupsFacade;
+        ((MockCupsFacade*) cups)->printerOptions[m_printerName].insert(
+            "PrintQualities", QVariant::fromValue(qualities));
+        Printer p(info, cups);
+        QCOMPARE(p.supportedPrintQualities(), qualities);
+    }
     void testIsDefault_data()
     {
         QTest::addColumn<bool>("isDefault");