Merge lp:~ahayzen/ubuntu-settings-components/add-fake-pdf-mode-and-other-fixes into lp:~phablet-team/ubuntu-settings-components/printer-components

[Andrew Hayzen]

* Fix colorModelType not emitting when it may have changed, causing QML to get out of sync
* Add a Printers::allPrintersWithPdf option which includes a fake pdf at the bottom
* Add a PrinterInfoAllImpl which combines PrinterInfoPdfImpl and PrinterInfoImpl for listing
* Add a PrinterInfoPdfImpl which implements a fake pdf printer (just a name in the list)
* Add isPdf role to PrinterModel
* Add filterOnPdf to PrinterModel to allow for only showing pdf printers
* Force pdf printers to bottom of the PrinterModel
* Inject a fake ColorModel in PrinterPrivate::loadColorModel for pdf printers
* Change PrinterJob::setPrinterName to use PrinterInfoAllImpl for retreiving the PrinterInfo
* Improve the UI names for the Duplex modes
* Improve detection of color models so that "black" is a greyscale type
* In the example disable duplex mode when there is only None

* Fix colorModelType not emitting when it may have changed, causing QML to get out of sync
* Add a Printers::allPrintersWithPdf option which includes a fake pdf at the bottom
* Add a PrinterInfoAllImpl which combines PrinterInfoPdfImpl and PrinterInfoImpl for listing
* Add a PrinterInfoPdfImpl which implements a fake pdf printer (just a name in the list)
* Add isPdf role to PrinterModel
* Add filterOnPdf to PrinterModel to allow for only showing pdf printers
* Force pdf printers to bottom of the PrinterModel
* Inject a fake ColorModel in PrinterPrivate::loadColorModel for pdf printers
* Change PrinterJob::setPrinterName to use PrinterInfoAllImpl for retreiving the PrinterInfo
* Improve the UI names for the Duplex modes
* Improve detection of color models so that "black" is a greyscale type
* In the example disable duplex mode when there is only None

[Jonas G. Drange (jonas-drange)]

looks good, minor comment!

review: Needs Fixing

[lp:~ahayzen/ubuntu-settings-components/add-fake-pdf-mode-and-other-fixes]

212. By Andrew Hayzen on 2017-01-19

* FIx for comment on filterOnPdf

[Jonas G. Drange (jonas-drange)]

Great stuff!

review: Approve

=== modified file 'examples/Printers.qml'
--- examples/Printers.qml	2017-01-18 16:25:02 +0000
+++ examples/Printers.qml	2017-01-19 20:06:10 +0000
@@ -85,11 +85,15 @@
                             left: parent.left
                             right: parent.right
                         }
+                        enabled: values.length > 1
                         text: "Duplex"
                         values: printer.supportedDuplexModes
                         onSelectedIndexChanged: printer.duplexMode = selectedIndex
-                        Component.onCompleted: selectedIndex = printer.duplexMode
-                        // TODO: should be disabled when duplex isn't supported
+                        Component.onCompleted: {
+                            if (enabled) {
+                                selectedIndex = printer.duplexMode
+                            }
+                        }
                     }
 
                     ListItems.ValueSelector {

=== modified file 'plugins/Ubuntu/Settings/Printers/CMakeLists.txt'
--- plugins/Ubuntu/Settings/Printers/CMakeLists.txt	2017-01-17 13:57:10 +0000
+++ plugins/Ubuntu/Settings/Printers/CMakeLists.txt	2017-01-19 20:06:10 +0000
@@ -15,10 +15,13 @@
     cups/cupspkhelper.cpp
     models/printermodel.cpp
     printer/printer.cpp
+    printer/printerinfo_allimpl.cpp
+    printer/printerinfo_pdfimpl.cpp
     printer/printerinfo_impl.cpp
     printer/printerjob.cpp
     printers/printers.cpp
     plugin.cpp
+    utils.h
 )
 
 target_link_libraries(UbuntuSettingsPrintersQml

=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-01-19 13:56:37 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.cpp	2017-01-19 20:06:10 +0000
@@ -19,7 +19,7 @@
 #include "cups/cupsfacade_impl.h"
 #include "models/printermodel.h"
 #include "models/printermodel_p.h"
-#include "printer/printerinfo_impl.h"
+#include "printer/printerinfo_allimpl.h"
 
 #include <QDebug>
 
@@ -41,7 +41,7 @@
 
 PrinterModelPrivate::PrinterModelPrivate(PrinterModel *q)
 {
-    this->info = new PrinterInfoImpl;
+    this->info = new PrinterInfoAllImpl;
     this->cups = new CupsFacadeImpl;
 }
 
@@ -225,6 +225,9 @@
             // TODO: figure out how crazy this is...
             ret = QVariant::fromValue(printer.data());
             break;
+        case IsPdfRole:
+            ret = printer->isPdf();
+            break;
         // case LastStateMessageRole:
         //     ret = printer->lastStateMessage();
         //     break;
@@ -301,6 +304,7 @@
         names[UsersRole] = "users";
         names[StateRole] = "state";
         names[PrinterRole] = "printer";
+        names[IsPdfRole] = "isPdf";
         names[LastStateMessageRole] = "lastStateMessage";
     }
 
@@ -379,6 +383,12 @@
     Q_UNUSED(recent);
 }
 
+void PrinterFilter::filterOnPdf(const bool pdf)
+{
+    m_pdfEnabled = true;
+    m_pdf = pdf;
+}
+
 bool PrinterFilter::filterAcceptsRow(int sourceRow,
                                      const QModelIndex &sourceParent) const
 {
@@ -389,6 +399,13 @@
         // TODO: implement recent
     }
 
+    // If pdfEnabled is false we only want real printers
+    if (accepts && m_pdfEnabled) {
+        bool isPdf = (bool) childIndex.model()->data(
+            childIndex, PrinterModel::IsPdfRole).toBool();
+        accepts = isPdf == m_pdf;
+    }
+
     if (accepts && m_stateEnabled) {
         const PrinterEnum::State state =
             (PrinterEnum::State) childIndex.model()->data(
@@ -405,7 +422,15 @@
     QVariant leftData = sourceModel()->data(left, sortRole());
     QVariant rightData = sourceModel()->data(right, sortRole());
     if ((QMetaType::Type) leftData.type() == QMetaType::Bool) {
-        return leftData.toInt() < rightData.toInt();
+        // FIXME: hack to put Pdf printer at the bottom
+        if (leftData.toInt() == rightData.toInt()) {
+            int leftPdf = sourceModel()->data(left, PrinterModel::IsPdfRole).toInt();
+            int rightPdf = sourceModel()->data(right, PrinterModel::IsPdfRole).toInt();
+
+            return leftPdf > rightPdf;
+        } else {
+            return leftData.toInt() < rightData.toInt();
+        }
     } else {
         return leftData < rightData;
     }

=== modified file 'plugins/Ubuntu/Settings/Printers/models/printermodel.h'
--- plugins/Ubuntu/Settings/Printers/models/printermodel.h	2017-01-19 13:56:37 +0000
+++ plugins/Ubuntu/Settings/Printers/models/printermodel.h	2017-01-19 20:06:10 +0000
@@ -63,6 +63,7 @@
         StateRole,
         PrinterRole,
         LastStateMessageRole,
+        IsPdfRole,
         LastRole = LastStateMessageRole,
     };
 
@@ -100,6 +101,7 @@
 
     void filterOnState(const PrinterEnum::State &state);
     void filterOnRecent(const bool recent);
+    void filterOnPdf(const bool pdf);
 
     int count() const;
 protected:
@@ -120,6 +122,8 @@
     bool m_stateEnabled = false;
     bool m_recent = false;
     bool m_recentEnabled = false;
+    bool m_pdfEnabled = false;
+    bool m_pdf = false;
 };
 
 #endif // USC_PRINTER_MODEL_H

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printer.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printer.cpp	2017-01-19 11:42:11 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printer.cpp	2017-01-19 20:06:10 +0000
@@ -58,15 +58,27 @@
 
 void PrinterPrivate::loadColorModel()
 {
-    QStringList opts({"DefaultColorModel"});
-    auto name = this->info->printerName();
-    auto vals = this->cups->printerGetOptions(name, opts);
-    m_defaultColorModel = vals["DefaultColorModel"].value<ColorModel>();
-
-    m_supportedColorModels = this->cups->printerGetSupportedColorModels(name);
-
-    if (m_supportedColorModels.size() == 0) {
-        m_supportedColorModels.append(m_defaultColorModel);
+    if (!this->info->isPdf()) {
+        QStringList opts({"DefaultColorModel"});
+        auto name = this->info->printerName();
+        auto vals = this->cups->printerGetOptions(name, opts);
+        m_defaultColorModel = vals["DefaultColorModel"].value<ColorModel>();
+
+        m_supportedColorModels = this->cups->printerGetSupportedColorModels(name);
+
+        if (m_supportedColorModels.size() == 0) {
+            m_supportedColorModels.append(m_defaultColorModel);
+        }
+    } else {
+        ColorModel rgb = ColorModel();
+        rgb.colorOrganization = PrinterEnum::ColorOrganization::UnknownOrganization;
+        rgb.colorSpace = PrinterEnum::ColorSpace::RGBSpace;
+        rgb.colorType = PrinterEnum::ColorModelType::ColorType;
+        rgb.name = "RGB";
+        rgb.text = "Color";
+
+        m_defaultColorModel = rgb;
+        m_supportedColorModels = QList<ColorModel>{rgb};
     }
 }
 
@@ -82,11 +94,6 @@
     return d->m_supportedColorModels;
 }
 
-int Printer::copies() const
-{
-
-}
-
 QList<PrinterEnum::DuplexMode> Printer::supportedDuplexModes() const
 {
     Q_D(const Printer);
@@ -190,6 +197,12 @@
     return name() == d->info->defaultPrinterName();
 }
 
+bool Printer::isPdf()
+{
+    Q_D(Printer);
+    return d->info->isPdf();
+}
+
 void Printer::setDefaultColorModel(const ColorModel &colorModel)
 {
     Q_D(Printer);

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printer.h'
--- plugins/Ubuntu/Settings/Printers/printer/printer.h	2017-01-19 11:42:11 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printer.h	2017-01-19 20:06:10 +0000
@@ -64,7 +64,6 @@
     bool enabled() const;
     ColorModel defaultColorModel() const;
     QList<ColorModel> supportedColorModels() const;
-    int copies() const;
     QList<PrinterEnum::DuplexMode> supportedDuplexModes() const;
     QStringList supportedDuplexStrings() const;
     PrinterEnum::DuplexMode defaultDuplexMode() const;
@@ -79,6 +78,7 @@
     PrinterEnum::State state() const;
     QString lastStateMessage() const;
     bool isDefault();
+    bool isPdf();
 
     void setAccessControl(const PrinterEnum::AccessControl &accessControl);
     void setDefaultColorModel(const ColorModel &colorModel);

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerinfo.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerinfo.h	2017-01-19 11:42:11 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerinfo.h	2017-01-19 20:06:10 +0000
@@ -54,6 +54,8 @@
     virtual PrinterInfo* printerInfo(const QString &printerName) = 0;
     virtual QString defaultPrinterName() = 0;
 
+    virtual bool isPdf() const = 0;
+
     virtual void refresh() = 0;
 protected:
     const QString m_printerName;

=== added file 'plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.cpp	2017-01-19 20:06:10 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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 "printer/printerinfo_allimpl.h"
+
+#include "printer/printerinfo_impl.h"
+#include "printer/printerinfo_pdfimpl.h"
+
+PrinterInfoAllImpl::PrinterInfoAllImpl(const QString &name) : PrinterInfo(name)
+{
+    m_pdf_printers = new PrinterInfoPdfImpl();
+    m_qt_printers = new PrinterInfoImpl();
+}
+
+PrinterInfoAllImpl::~PrinterInfoAllImpl()
+{
+
+}
+
+QList<PrinterInfo*> PrinterInfoAllImpl::availablePrinters()
+{
+    QList<PrinterInfo*> list;
+    list += m_pdf_printers->availablePrinters();
+    list += m_qt_printers->availablePrinters();
+    return list;
+}

=== added file 'plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.h	2017-01-19 20:06:10 +0000
@@ -0,0 +1,58 @@
+/*
+ * 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_PRINTERS_PRINTERINFO_ALLIMPL_H
+#define USC_PRINTERS_PRINTERINFO_ALLIMPL_H
+
+#include "printer/printerinfo.h"
+
+class PrinterInfoAllImpl : public PrinterInfo
+{
+public:
+    explicit PrinterInfoAllImpl(const QString &name = QString::null);
+    virtual ~PrinterInfoAllImpl() override;
+
+    virtual bool holdsDefinition() const override {}
+
+    virtual QString printerName() const override {}
+    virtual QString description() const override {}
+    virtual QString location() const override {}
+    virtual QString makeAndModel() const override {}
+
+    virtual PrinterEnum::State state() const override {}
+    virtual QList<QPageSize> supportedPageSizes() const override {}
+    virtual QPageSize defaultPageSize() const override {}
+    virtual bool supportsCustomPageSizes() const override {}
+
+    virtual QPageSize minimumPhysicalPageSize() const override {}
+    virtual QPageSize maximumPhysicalPageSize() const override {}
+    virtual QList<int> supportedResolutions() const override {}
+    virtual PrinterEnum::DuplexMode defaultDuplexMode() const override {}
+    virtual QList<PrinterEnum::DuplexMode> supportedDuplexModes() const override {}
+    virtual QList<PrinterInfo*> availablePrinters() override;
+    virtual QStringList availablePrinterNames() override {}
+    virtual PrinterInfo* printerInfo(const QString &printerName) override {}
+    virtual QString defaultPrinterName() override {}
+
+    virtual bool isPdf() const override {}
+
+    virtual void refresh() override {}
+private:
+    PrinterInfo *m_pdf_printers;
+    PrinterInfo *m_qt_printers;
+};
+
+#endif // USC_PRINTERS_PRINTERINFO_ALLIMPL_H

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.cpp	2017-01-19 12:36:39 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.cpp	2017-01-19 20:06:10 +0000
@@ -137,6 +137,11 @@
     return QPrinterInfo::defaultPrinterName();
 }
 
+bool PrinterInfoImpl::isPdf() const
+{
+    return false;
+}
+
 void PrinterInfoImpl::refresh()
 {
     if (m_printerName.isEmpty()) {

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.h	2017-01-19 11:42:11 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.h	2017-01-19 20:06:10 +0000
@@ -51,6 +51,8 @@
     virtual PrinterInfo* printerInfo(const QString &printerName) override;
     virtual QString defaultPrinterName() override;
 
+    virtual bool isPdf() const override;
+
     virtual void refresh() override;
 
 private:

=== added file 'plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.cpp	2017-01-19 20:06:10 +0000
@@ -0,0 +1,91 @@
+/*
+ * 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 "printer/printerinfo_pdfimpl.h"
+
+#include <QPageSize>
+
+PrinterInfoPdfImpl::PrinterInfoPdfImpl(const QString &name) : PrinterInfo(name)
+{
+
+}
+
+PrinterInfoPdfImpl::~PrinterInfoPdfImpl()
+{
+
+}
+
+QList<PrinterInfo*> PrinterInfoPdfImpl::availablePrinters()
+{
+    QList<PrinterInfo*> list;
+    list.append(new PrinterInfoPdfImpl("Create PDF"));
+    return list;
+}
+
+PrinterEnum::DuplexMode PrinterInfoPdfImpl::defaultDuplexMode() const
+{
+    return PrinterEnum::DuplexMode::DuplexNone;
+}
+
+QPageSize PrinterInfoPdfImpl::defaultPageSize() const
+{
+    return QPageSize(QPageSize::A4);
+}
+
+QString PrinterInfoPdfImpl::defaultPrinterName()
+{
+    return "";
+}
+
+QString PrinterInfoPdfImpl::description() const
+{
+    return QStringLiteral("");
+}
+
+bool PrinterInfoPdfImpl::holdsDefinition() const
+{
+    return true;
+}
+
+bool PrinterInfoPdfImpl::isPdf() const
+{
+    return true;
+}
+
+QString PrinterInfoPdfImpl::location() const
+{
+    return QStringLiteral("");
+}
+
+QString PrinterInfoPdfImpl::makeAndModel() const
+{
+    return QStringLiteral("");
+}
+
+QString PrinterInfoPdfImpl::printerName() const
+{
+    return m_printerName;
+}
+
+QList<PrinterEnum::DuplexMode> PrinterInfoPdfImpl::supportedDuplexModes() const
+{
+    return QList<PrinterEnum::DuplexMode>{PrinterEnum::DuplexMode::DuplexNone};
+}
+
+QList<QPageSize> PrinterInfoPdfImpl::supportedPageSizes() const
+{
+    return QList<QPageSize>{QPageSize(QPageSize::A4)};
+}

=== added file 'plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.h	2017-01-19 20:06:10 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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_PRINTERS_PRINTERINFO_PDFIMPL_H
+#define USC_PRINTERS_PRINTERINFO_PDFIMPL_H
+
+#include "printer/printerinfo.h"
+
+class PrinterInfoPdfImpl : public PrinterInfo
+{
+public:
+    explicit PrinterInfoPdfImpl(const QString &name = QString::null);
+    virtual ~PrinterInfoPdfImpl() override;
+
+    virtual bool holdsDefinition() const override;
+
+    virtual QString printerName() const override;
+    virtual QString description() const override;
+    virtual QString location() const override;
+    virtual QString makeAndModel() const override;
+
+    virtual PrinterEnum::State state() const override {}
+    virtual QList<QPageSize> supportedPageSizes() const override;
+    virtual QPageSize defaultPageSize() const override;
+    virtual bool supportsCustomPageSizes() const override {}
+
+    virtual QPageSize minimumPhysicalPageSize() const override {}
+    virtual QPageSize maximumPhysicalPageSize() const override {}
+    virtual QList<int> supportedResolutions() const override {}
+    virtual PrinterEnum::DuplexMode defaultDuplexMode() const override;
+    virtual QList<PrinterEnum::DuplexMode> supportedDuplexModes() const override;
+    virtual QList<PrinterInfo*> availablePrinters() override;
+    virtual QStringList availablePrinterNames() override {}
+    virtual PrinterInfo* printerInfo(const QString &printerName) override {}
+    virtual QString defaultPrinterName() override;
+
+    virtual bool isPdf() const override;
+
+    virtual void refresh() override {}
+};
+
+#endif // USC_PRINTERS_PRINTERINFO_PDFIMPL_H

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-18 14:35:30 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-19 20:06:10 +0000
@@ -19,7 +19,7 @@
 #include "cups/cupsfacade_impl.h"
 #include "models/printermodel.h"
 #include "printer/printerjob.h"
-#include "printer/printerinfo_impl.h"
+#include "printer/printerinfo_allimpl.h"
 
 PrinterJob::PrinterJob(QObject *parent)
     : QObject(parent)
@@ -168,8 +168,13 @@
         m_color_model = colorModel;
 
         Q_EMIT colorModelChanged();
-        Q_EMIT colorModelTypeChanged();
     }
+
+    // Always emit colorModeType changed, as the underlying model could have
+    // changed but the int maybe the same
+    // eg if it was RGB, KGray and m_color_model was 1, then changing to
+    // KGray, RGB with m_color_model as 1, results in no change but colorModelType does.
+    Q_EMIT colorModelTypeChanged();
 }
 
 void PrinterJob::setCopies(const int copies)
@@ -217,9 +222,16 @@
 void PrinterJob::setPrinterName(const QString &printerName)
 {
     if (m_printer_name != printerName) {
-        PrinterInfo *info = new PrinterInfoImpl(printerName);
-
-        if (info->holdsDefinition()) {
+        PrinterInfo *printers = new PrinterInfoAllImpl();
+        PrinterInfo *info = Q_NULLPTR;
+
+        Q_FOREACH(PrinterInfo *printer, printers->availablePrinters()) {
+            if (printer->printerName() == printerName) {
+                info = printer;
+            }
+        }
+
+        if (info && info->holdsDefinition()) {
             m_printer_name = printerName;
             m_printer = new Printer(info, m_cups);
             loadDefaults();

=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.cpp'
--- plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-01-18 16:18:40 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-01-19 20:06:10 +0000
@@ -15,7 +15,7 @@
  */
 
 #include "cups/cupsfacade_impl.h"
-#include "printer/printerinfo_impl.h"
+#include "printer/printerinfo_allimpl.h"
 #include "printers/printers.h"
 #include "printers/printers_p.h"
 
@@ -39,7 +39,7 @@
 }
 
 PrintersPrivate::PrintersPrivate(Printers *q, int printerUpdateIntervalMSecs)
-    : PrintersPrivate(q, new PrinterInfoImpl, new CupsFacadeImpl,
+    : PrintersPrivate(q, new PrinterInfoAllImpl, new CupsFacadeImpl,
                       printerUpdateIntervalMSecs)
 {
 }
@@ -54,7 +54,12 @@
 
     allPrinters.setSourceModel(&model);
     allPrinters.setSortRole(PrinterModel::Roles::DefaultPrinterRole);
+    allPrinters.filterOnPdf(false);
     allPrinters.sort(0, Qt::DescendingOrder);
+
+    allPrintersWithPdf.setSourceModel(&model);
+    allPrintersWithPdf.setSortRole(PrinterModel::Roles::DefaultPrinterRole);
+    allPrintersWithPdf.sort(0, Qt::DescendingOrder);
 }
 
 PrintersPrivate::~PrintersPrivate()
@@ -71,6 +76,14 @@
     return ret;
 }
 
+QAbstractItemModel* Printers::allPrintersWithPdf()
+{
+    Q_D(Printers);
+    auto ret = &d->allPrintersWithPdf;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}
+
 QAbstractItemModel* Printers::recentPrinters()
 {
 

=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.h'
--- plugins/Ubuntu/Settings/Printers/printers/printers.h	2017-01-18 16:18:40 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.h	2017-01-19 20:06:10 +0000
@@ -37,6 +37,7 @@
     Q_OBJECT
     Q_DECLARE_PRIVATE(Printers)
     Q_PROPERTY(QAbstractItemModel* allPrinters READ allPrinters CONSTANT)
+    Q_PROPERTY(QAbstractItemModel* allPrintersWithPdf READ allPrintersWithPdf CONSTANT)
     Q_PROPERTY(QAbstractItemModel* recentPrinters READ recentPrinters CONSTANT)
     Q_PROPERTY(QAbstractItemModel* printJobs READ printJobs CONSTANT)
     Q_PROPERTY(QString defaultPrinterName READ defaultPrinterName WRITE setDefaultPrinterName NOTIFY defaultPrinterNameChanged)
@@ -53,6 +54,7 @@
     ~Printers();
 
     QAbstractItemModel* allPrinters();
+    QAbstractItemModel* allPrintersWithPdf();
     QAbstractItemModel* recentPrinters();
     QAbstractItemModel* printJobs();
     QString defaultPrinterName() const;

=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers_p.h'
--- plugins/Ubuntu/Settings/Printers/printers/printers_p.h	2017-01-18 16:18:40 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers_p.h	2017-01-19 20:06:10 +0000
@@ -32,6 +32,7 @@
     PrinterInfo *info;
     PrinterModel model;
     PrinterFilter allPrinters;
+    PrinterFilter allPrintersWithPdf;
     PrinterFilter recentPrinters;
 };
 

=== modified file 'plugins/Ubuntu/Settings/Printers/utils.h'
--- plugins/Ubuntu/Settings/Printers/utils.h	2017-01-18 15:22:02 +0000
+++ plugins/Ubuntu/Settings/Printers/utils.h	2017-01-19 20:06:10 +0000
@@ -55,11 +55,11 @@
         // TODO: translate
         switch (mode) {
         case PrinterEnum::DuplexMode::DuplexNone:
-            return "None";
+            return "One Sided";
         case PrinterEnum::DuplexMode::DuplexShortSide:
-            return "Short edge (flip)";
+            return "Short Edge (Flip)";
         case PrinterEnum::DuplexMode::DuplexLongSide:
-            return "Long edge (standard)";
+            return "Long Edge (Standard)";
         }
     }
 
@@ -111,7 +111,7 @@
             }
         }
 
-        if (ret.name.contains("Gray")) {
+        if (ret.name.contains("Gray") || ret.name.contains("Black")) {
             ret.colorType = PrinterEnum::ColorModelType::GrayType;
         } else {
             ret.colorType = PrinterEnum::ColorModelType::ColorType;

=== modified file 'tests/unittests/Printers/mockprinterinfo.h'
--- tests/unittests/Printers/mockprinterinfo.h	2017-01-19 11:42:11 +0000
+++ tests/unittests/Printers/mockprinterinfo.h	2017-01-19 20:06:10 +0000
@@ -129,6 +129,11 @@
         return m_defaultPrinterName;
     }
 
+    virtual bool isPdf() const override
+    {
+        return false;
+    }
+
     virtual void refresh() override
     {