Merge lp:~jonas-drange/ubuntu-printing-app/soft-depend-on-printjob into lp:ubuntu-printing-app

[Jonas G. Drange]

* stops instantiating printerjob directly
* create printerjobs from Printers.createJob(printerName)

Unmerged revisions

67. By Jonas G. Drange on 2017-02-08

set job values before page is pushed

66. By Jonas G. Drange on 2017-02-08

update to latest usc printing api

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-13 23:40:36 +0000
+++ CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -17,52 +17,41 @@
 set(APP_HARDCODE ubuntu-printing-app)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")  # -fno-permissive -pedantic -Wall -Wextra")
-set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tell QtCreator the location and name o the manifest file")
 set(DESKTOP_FILE "${APP_NAME}.desktop")
 set(ICON_FILE ubuntu-printing-app.png)
 set(MAIN_QML Main.qml)
+set(RUNNER ${APP_HARDCODE})
+set(SNAP_DESKTOP_FILE setup/gui/${DESKTOP_FILE})
 
 # Set the options
-option(CLICK_MODE "Build as a click package" off)
+option(SNAP_MODE "Build as a snap package" off)
 
 # Find packages
-find_package(Qt5Core)
-find_package(Qt5Qml)
-find_package(Qt5Quick)
-find_package(Qt5PrintSupport)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Qml REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Qt5PrintSupport REQUIRED)
 
 include(GNUInstallDirs)
 
 
 # Set the path for the QML files and the backend
-if(CLICK_MODE)
-  message("CLICK_MODE is not supported at this time!")
-else(CLICK_MODE)
-  set(UBUNTU_PRINTING_APP_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE}")
-  execute_process(
-    COMMAND qmake -query QT_INSTALL_QML
-            OUTPUT_VARIABLE QT_IMPORTS_DIR
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
+set(UBUNTU_PRINTING_APP_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE}")
+execute_process(
+COMMAND qmake -query QT_INSTALL_QML
+        OUTPUT_VARIABLE QT_IMPORTS_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+set(MODULE_PATH ${QT_IMPORTS_DIR}/UbuntuPrintingApp)
+
+# Set the exec path
+if(SNAP_MODE)
+  set(EXEC "APP_ID=${APP_HARDCODE} qmlscene $@ -I $SNAP/${MODULE_PATH} $SNAP/${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${MAIN_QML}")
+  set(ICON "$SNAP/${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${ICON_FILE}")
+else(SNAP_MODE)
+  set(EXEC "APP_ID=${APP_HARDCODE} qmlscene $@ -I ${MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${MAIN_QML}")
   set(ICON ${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${ICON_FILE})
-  set(MODULE_PATH ${QT_IMPORTS_DIR}/Ubuntu_Printing_App)
-endif(CLICK_MODE)
-
-# Set the exec path
-if (CLICK_MODE)
-  message("CLICK_MODE is not supported at this time!")
-else(CLICK_MODE)
-  # FIXME should this point to the runner?
-  set(EXEC "qmlscene $@ -I ${MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${MAIN_QML}")
-endif(CLICK_MODE)
-
-
-# Find translatable files
-file(GLOB_RECURSE I18N_SRC_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
-     *.qml *.js *.cpp)
-list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
-list(SORT I18N_SRC_FILES)
+endif(SNAP_MODE)
 
 
 # Add subdirs
@@ -70,10 +59,21 @@
 add_subdirectory(runner)
 add_subdirectory(ubuntu-printing-app)
 
+# Setup gettext defs and include po directory
+set(GETTEXT_PACKAGE "ubuntu-printing-app")
+add_definitions(-DI18N_DOMAIN="${GETTEXT_PACKAGE}")
+
+add_subdirectory(po)
+
+# Add tests
+find_package(Qt5Test REQUIRED)
+enable_testing()
+add_subdirectory(tests)
+
 
 # Add run command for QtC
 add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/Main.qml
-                  DEPENDS Ubuntu_Printing_App Ubuntu_Printing_App_qmldir
+                  DEPENDS UbuntuPrintingApp UbuntuPrintingAppqmldir
                   WORKING_DIRECTORY ./ubuntu-printing-app)
 
 # Show files in QtC
 
=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2016-12-13 23:40:36 +0000
+++ backend/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -1,43 +1,34 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    /usr/include/cups/
     /usr/include/poppler/qt5/
-    ${Qt5PrintSupport_INCLUDE_DIRS}
 )
 
-#add_definitions(
-#  -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
-#  -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_LOCALEDIR}\"
-#)
-
-set(LIBNAME Ubuntu_Printing_Appbackend)
+set(LIBNAME UbuntuPrintingAppbackend)
 
 set(
-  Ubuntu_Printing_App_SRC
-  Ubuntu_Printing_App/backend.cpp
-  Ubuntu_Printing_App/document.cpp
-  Ubuntu_Printing_App/popplerimageprovider.cpp
-  Ubuntu_Printing_App/printer.cpp
-  Ubuntu_Printing_App/printerinfo.cpp
+  UbuntuPrintingAppSRC
+  UbuntuPrintingApp/backend.cpp
+  UbuntuPrintingApp/document.cpp
+  UbuntuPrintingApp/popplerimageprovider.cpp
+  UbuntuPrintingApp/pagehelper.cpp
 )
 
-add_library(${LIBNAME} SHARED ${Ubuntu_Printing_App_SRC})
+add_library(${LIBNAME} SHARED ${UbuntuPrintingAppSRC})
 
-qt5_use_modules(${LIBNAME} Core Gui Qml Quick PrintSupport)
+qt5_use_modules(${LIBNAME} Core Gui Qml Quick)
 target_link_libraries(${LIBNAME}
-    cups
     poppler-qt5
 )
 
 set_target_properties(${LIBNAME} PROPERTIES
-  LIBRARY_OUTPUT_DIRECTORY Ubuntu_Printing_App
+  LIBRARY_OUTPUT_DIRECTORY UbuntuPrintingApp
 )
 
 # Copy the qmldir file to the build dir
-add_custom_target(Ubuntu_Printing_App_qmldir ALL
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Ubuntu_Printing_App/qmldir ${CMAKE_CURRENT_BINARY_DIR}/Ubuntu_Printing_App
+add_custom_target(UbuntuPrintingApp_qmldir ALL
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/UbuntuPrintingApp/qmldir ${CMAKE_CURRENT_BINARY_DIR}/UbuntuPrintingApp
   DEPENDS ${QMLFILES})
 
 # Install the plugin file
 install(TARGETS ${LIBNAME} DESTINATION ${MODULE_PATH})
-install(FILES Ubuntu_Printing_App/qmldir DESTINATION ${MODULE_PATH})
+install(FILES UbuntuPrintingApp/qmldir DESTINATION ${MODULE_PATH})
 
=== renamed directory 'backend/Ubuntu_Printing_App' => 'backend/UbuntuPrintingApp'
=== modified file 'backend/UbuntuPrintingApp/backend.cpp'
--- backend/Ubuntu_Printing_App/backend.cpp	2016-12-13 12:37:45 +0000
+++ backend/UbuntuPrintingApp/backend.cpp	2017-02-08 21:32:20 +0000
@@ -1,30 +1,36 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
 #include <QtQml>
 #include <QtQml/QQmlContext>
 #include "backend.h"
 
 #include "document.h"
+#include "pagehelper.h"
 #include "popplerimageprovider.h"
-#include "printer.h"
-#include "printerinfo.h"
-
-
-#define MAKE_SINGLETON_FACTORY(type) \
-    static QObject* type##_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) { \
-        Q_UNUSED(engine); \
-        Q_UNUSED(scriptEngine); \
-        return new type(); \
-    }
-
-MAKE_SINGLETON_FACTORY(PrinterInfo)
-
 
 void BackendPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("Ubuntu_Printing_App"));
+    Q_ASSERT(uri == QLatin1String("UbuntuPrintingApp"));
 
     qmlRegisterType<Document>(uri, 1, 0, "Document");
-    qmlRegisterType<Printer>(uri, 1, 0, "Printer");
-    qmlRegisterSingletonType<PrinterInfo>(uri, 1, 0, "PrinterInfo", PrinterInfo_singleton_factory);
+    qmlRegisterType<PageHelper>(uri, 1, 0, "PageHelper");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 
=== modified file 'backend/UbuntuPrintingApp/backend.h'
--- backend/Ubuntu_Printing_App/backend.h	2016-12-13 12:37:45 +0000
+++ backend/UbuntuPrintingApp/backend.h	2017-02-08 21:32:20 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
 #ifndef BACKEND_PLUGIN_H
 #define BACKEND_PLUGIN_H
 
@@ -7,7 +26,7 @@
 /*
  ----8<-----
 
- import Ubuntu_Printing_App 1.0
+ import UbuntuPrintingApp 1.0
 
  Rectangle {
    width: 200
 
=== modified file 'backend/UbuntuPrintingApp/document.cpp'
--- backend/Ubuntu_Printing_App/document.cpp	2016-12-13 12:08:15 +0000
+++ backend/UbuntuPrintingApp/document.cpp	2017-02-08 21:32:20 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
 #include "document.h"
 
 #include <QtCore/QDebug>
@@ -18,7 +37,7 @@
     : QObject(parent),
       m_count(0),
       m_document(Q_NULLPTR),
-      m_url("")
+      m_url(QStringLiteral(""))
 {
 
 }
@@ -49,6 +68,21 @@
     return fmin(destDPI.width(), destDPI.height());
 }
 
+QSizeF Document::getPageSize(int pageNumber)
+{
+    QSizeF size;
+
+    if (m_document) {
+        Poppler::Page *page = m_document->page(pageNumber);
+
+        if (page) {
+            size = page->pageSizeF();
+        }
+    }
+
+    return size;
+}
+
 QImage Document::makeImage(QSizeF size, int pageNumber)
 {
     if (pageNumber < 0) {
@@ -61,8 +95,9 @@
         return QImage();
     }
 
-    // Splash backend has much better rendering
-    m_document->setRenderBackend(Poppler::Document::SplashBackend);
+    if (size == QSize(0, 0)) {
+        return QImage();
+    }
 
     Poppler::Page *page = m_document->page(pageNumber);
 
@@ -74,17 +109,16 @@
     // Calculate the DPI to render at
     float res = getDpi(page->pageSizeF(), size);
 
-    qDebug() << "Making image with res of" << res;
-
     // Make the image
     QImage image = page->renderToImage(res, res, 0, 0, size.width(), size.height());
 
+    delete page;
+
     if (image.isNull()) {
         qWarning() << "Image is null";
+        return QImage();
     }
 
-    delete page;
-
     return image;
 }
 
@@ -100,13 +134,10 @@
         return QImage();
     }
 
-    // Splash backend has much better rendering
-    m_document->setRenderBackend(Poppler::Document::SplashBackend);
-
     Poppler::Page *page = m_document->page(pageNumber);
 
     if (!page) {
-        qWarning() << "Invalid page";
+        qWarning() << "Invalid page:" << pageNumber;
         return QImage();
     }
 
@@ -120,17 +151,13 @@
 
     // Make the image
     QImage image = makeImage(scaledSize, pageNumber);
-//    image.setDotsPerMeterX(6000);
-//    image.setDotsPerMeterY(6000);
 
     if (!color) {
         image = image.convertToFormat(QImage::Format_Grayscale8);
     }
 
-    qDebug() << "i" << image.width() << scaledSize.width() << image.dotsPerMeterX();
-
     // Make a container then put the content image inside
-    QImage container(size.toSize(), QImage::Format_ARGB32_Premultiplied); //QImage::Format_Grayscale8); //QImage::Format_ARGB32);
+    QImage container(size.toSize(), QImage::Format_ARGB32_Premultiplied);
     QPainter painter;
 
     container.fill(QColor(0, 0, 0, 0));
@@ -141,6 +168,7 @@
         painter.drawImage((size.width() - scaledSize.width()) / 2, (size.height() - scaledSize.height()) / 2, image);
     } else {
         qWarning() << "Image is null";
+        return QImage();
     }
 
     painter.end();
@@ -148,197 +176,12 @@
     return container;
 }
 
-QPixmap Document::makePixmap(QSize size, int pageNumber)
-{
-    if (pageNumber < 0) {
-        qWarning() << "Invalid page number";
-    }
-
-    if (!m_document) {
-        qWarning() << "No document loaded";
-    }
-
-    // Splash backend has much better rendering
-    m_document->setRenderBackend(Poppler::Document::SplashBackend);
-
-    Poppler::Page *page = m_document->page(pageNumber);
-
-    if (!page) {
-        qWarning() << "Invalid page";
-    }
-
-    float res = getDpi(page->pageSizeF(), size);
-
-    qDebug() << "Making image with res of" << res;
-
-    // Make QPixmap
-    QPixmap pixmap(size);
-
-    // If using ArthurBackend can do
-    // QPainter painter(&pixmap);
-    // if (!page->renderToPainter(painter, res, res)) {
-    //     qWarning() << "Failed to render to painter";
-    // }
-
-    QImage image = page->renderToImage(res, res);
-
-    if (image.isNull()) {
-        qWarning() << "Image is null";
-    }
-
-    pixmap = QPixmap::fromImage(image);
-
-    delete page;
-
-    return pixmap;
-}
-
-QImage Document::renderImage(QSize size, int pageNumber)
-{
-    if (pageNumber < 0) {
-        qWarning() << "Invalid page number";
-    }
-
-    if (!m_document) {
-        qWarning() << "No document loaded";
-    }
-
-//    m_document->setRenderBackend(Poppler::Document::SplashBackend);
-
-    Poppler::Page *page = m_document->page(pageNumber);
-
-    if (!page) {
-        qWarning() << "Invalid page";
-    }
-
-    /*
-     * width / res    width / res
-     */
-
-//    int res = size.width() / (page->pageSize().width() / 72);
-
-//    qDebug() << "Res:" << res;
-
-
-
-    QSizeF sourceSizeInch(page->pageSizeF().width() / 72, page->pageSizeF().height() / 72);
-
-    QSizeF destDPI(size.width() / sourceSizeInch.width(), size.height()/ sourceSizeInch.height());
-
-    float res;
-
-    if (destDPI.width() > destDPI.height()) {
-        res = destDPI.height();
-    } else {
-        res = destDPI.width();
-    }
-
-    qDebug() << "Making image with res of" << res;
-
-    QImage image = page->renderToImage(res, res);
-
-    if (image.isNull()) {
-        qWarning() << "Image is null";
-    }
-
-    delete page;
-
-    return image;
-}
-
-bool Document::renderPage(QPainter *painter, int pageNumber)
-{
-    if (!painter) {
-        qWarning() << "Invalid painter";
-        return false;
-    }
-
-    if (pageNumber < 0) {
-        qWarning() << "Invalid page number";
-        return false;
-    }
-
-    if (!m_document) {
-        qWarning() << "No document loaded";
-        return false;
-    }
-
-    Poppler::Page *page = m_document->page(pageNumber);
-
-    m_document->setRenderBackend(Poppler::Document::ArthurBackend);
-
-    if (!page) {
-        qWarning() << "Invalid page";
-        return false;
-    }
-
-    /*
-A4
-DPI: 96 1200
-Device Size: 767 1097
-Doc Size: 595 842
-
-A5
-DPI: 96 1200
-Device Size: 534 767
-Doc Size: 595 842
-    */
-
-    QSizeF sourceSizeInch(page->pageSizeF().width() / 72, page->pageSizeF().height() / 72);
-
-    QSizeF destDPI(painter->device()->width() / sourceSizeInch.width(), painter->device()->height()/ sourceSizeInch.height());
-
-    float res;
-
-    if (destDPI.width() > destDPI.height()) {
-        res = destDPI.height();
-    } else {
-        res = destDPI.width();
-    }
-
-//    Poppler::PSConverter *psConv = m_document->psConverter();
-
-//    psConv->setLeftMargin(5);
-//    psConv->setRightMargin(1);
-//    psConv->setOutputFileName("/tmp/out.ps");
-//    psConv->setPaperHeight(painter->device()->height());
-//    psConv->setPaperWidth(painter->device()->width());
-
-//    QList<int> pages = { 1 };
-
-//    psConv->setPageList(pages);
-
-//    qDebug() << "PS" << psConv->convert();
-
-
-//    float res = painter->device()->width() / (page->pageSize().width() / 72);  //painter->device()->logicalDpiX());
-
-    //res = 70;
-
-    qDebug() << "DPI:" << painter->device()->logicalDpiX() << painter->device()->physicalDpiX() << res;
-
-    qDebug() << "Device Size:" << painter->device()->width() << painter->device()->height();
-    qDebug() << "Doc Size:" << page->pageSize().width() << page->pageSize().height();
-
-    // Create Image same dimensions as PageSize
-    // Render to the image
-    // Render the image to the printer
-    // Image can also be used for preview?
-
-    if (!page->renderToPainter(painter, res, res)) {
-//    if (!page->renderToPainter(painter, painter->device()->logicalDpiX(), painter->device()->logicalDpiY(),
-//                               0, 0, page->pageSize().width(), page->pageSize().height())) {
-        qWarning() << "Rendering failed";
-        return false;
-    }
-
-    delete page;
-
-    return true;
-}
-
 Document::Orientation Document::orientation() const
 {
+    if (!m_document) {
+        return Portrait;
+    }
+
     Poppler::Page *page = m_document->page(0);
 
     if (page) {
@@ -350,102 +193,64 @@
             return Portrait;
         }
 
-        qDebug() << "DOC" << page->orientation() << Portrait << Landscape;
-
-        if (page->orientation() == Poppler::Page::Landscape) {
-            return Landscape;
-        } else if (page->orientation() == Poppler::Page::Portrait) {
-            return Portrait;
-        } else {
-            qWarning() << "Other orientation:" << page->orientation() << "using Portrait";
-            return Portrait;
-        }
+        // TODO: page orientation seems to be wrong?
+//        qDebug() << "DOC" << page->orientation() << Portrait << Landscape;
+//        if (page->orientation() == Poppler::Page::Landscape) {
+//            return Landscape;
+//        } else if (page->orientation() == Poppler::Page::Portrait) {
+//            return Portrait;
+//        } else {
+//            qWarning() << "Other orientation:" << page->orientation() << "using Portrait";
+//            return Portrait;
+//        }
     } else {
         return Portrait;
     }
 }
 
-bool Document::printFromImage(QPainter *painter, int pageNumber, QRect pageRect, double resolution)
-{
-    // Ensure we are using the right render hints
-    m_document->setRenderBackend(Poppler::Document::SplashBackend);
-
-    m_document->setRenderHint(Poppler::Document::Antialiasing, true);
-    m_document->setRenderHint(Poppler::Document::TextAntialiasing, true);
-    m_document->setRenderHint(Poppler::Document::TextHinting, true);
-
-    Poppler::Page *page = m_document->page(pageNumber);
-
-    if (!page) {
-        qWarning() << "Invalid page!";
-        return false;
-    }
-
-    // Render at given resolution
-    QImage image = page->renderToImage(resolution, resolution);
-
-    // Get the scalar for the image to fit within the pageRect
-    double ratioX = (double) image.width() / (double) pageRect.width();
-    double ratioY = (double) image.height() / (double) pageRect.height();
-
-    image.setDevicePixelRatio(fmax(ratioX, ratioY));
-
-    // Check that image isn't null
-    if (image.isNull()) {
-        return false;
-    }
-
-    // Draw the image to the painter, should we scale? the image should be correct aspect
-    // Here we should check if the image aspect is different and position in the centre?
-    painter->drawImage(0, 0, image);
-    //painter->drawImage(QRect(QPoint(0, 0), QSize(pageRect.width(), pageRect.height())), image, image.rect());
-
-    qDebug() << "Device Width:" << pageRect.width() << "LogicalDPI:" << painter->device()->logicalDpiX(); // << "RenderDPI:" << renderDPI.width();
-    qDebug() << "RatioX" << ratioX << "RatioY" << ratioY;
-
-    qDebug() << "PageRect:" << pageRect.width() << pageRect.height();
-    qDebug() << "Image:" << image.width() << image.height() << image.dotsPerMeterX();
-
-    return true;
-}
-
 void Document::setUrl(QUrl url)
 {
     if (m_url != url) {
         if (url.isLocalFile() && QFileInfo::exists(url.toLocalFile())) {
             if (QMimeDatabase().mimeTypeForUrl(url).name() == "application/pdf") {
-                m_url = url;
-
-                // Load document
-                m_document = Poppler::Document::load(m_url.toLocalFile());
-                m_document->setRenderBackend(Poppler::Document::ArthurBackend);
-
-                m_document->setRenderHint(Poppler::Document::Antialiasing, true);
-                m_document->setRenderHint(Poppler::Document::TextAntialiasing, true);
-                m_document->setRenderHint(Poppler::Document::TextHinting, true);
-//                m_document->setRenderHint(Poppler::Document::TextSlightHinting, true);
-//                m_document->setRenderHint(Poppler::Document::OverprintPreview, true);
-//                m_document->setRenderHint(Poppler::Document::ThinLineSolid, true);
-//                m_document->setRenderHint(Poppler::Document::ThinLineShape, true);
+                // Attempt to Load document
+                m_document = Poppler::Document::load(url.toLocalFile());
 
                 if (!m_document || m_document->isLocked()) {
                     qWarning() << "Invalid Document";
                     delete m_document;
                     m_document = Q_NULLPTR;
+
+                    Q_EMIT error(Errors::ErrorDocumentInvalid);
                 } else {
+                    m_url = url;
+
+                    m_document->setRenderBackend(Poppler::Document::SplashBackend);
+
+                    m_document->setRenderHint(Poppler::Document::Antialiasing, true);
+                    m_document->setRenderHint(Poppler::Document::TextAntialiasing, true);
+                    m_document->setRenderHint(Poppler::Document::TextHinting, true);
+                    m_document->setRenderHint(Poppler::Document::TextSlightHinting, true);
+
+                    Q_EMIT urlChanged();
+
                     if (m_count != m_document->numPages()) {
                         m_count = m_document->numPages();
 
                         Q_EMIT countChanged();
                     }
+
+                    Q_EMIT orientationChanged();
+                    Q_EMIT titleChanged();
                 }
-
-                Q_EMIT urlChanged();
             } else {
                 qWarning() << "File is not a PDF:" << url;
+                Q_EMIT error(Errors::ErrorNotPdf);
             }
         } else {
             qWarning() << "Url is not a local file:" << url;
+
+            Q_EMIT error(Errors::ErrorNotFound);
         }
     }
 }
@@ -455,7 +260,7 @@
     if (m_document) {
         return m_document->info("Title");
     } else {
-        return "";
+        return QStringLiteral("");
     }
 }
 
 
=== modified file 'backend/UbuntuPrintingApp/document.h'
--- backend/Ubuntu_Printing_App/document.h	2016-12-13 12:08:15 +0000
+++ backend/UbuntuPrintingApp/document.h	2017-02-08 21:32:20 +0000
@@ -1,7 +1,27 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
 #ifndef DOCUMENT_H
 #define DOCUMENT_H
 
 #include <QtCore/QObject>
+#include <QtCore/QSizeF>
 #include <QtCore/QUrl>
 
 #include <QtGui/QPainter>
@@ -13,30 +33,39 @@
     Q_OBJECT
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(Orientation orientation READ orientation NOTIFY orientationChanged)
+    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
 public:
+    enum class Errors {
+        ErrorDocumentInvalid,
+        ErrorNotFound,
+        ErrorNotPdf,
+    };
+
+    Q_ENUM(Errors)
+
     enum Orientation {
         Portrait,
         Landscape,
     };
+    Q_ENUM(Orientation)
 
     explicit Document(QObject *parent = 0);
     ~Document();
     int count() const;
+    QSizeF getPageSize(int pageNumber);
     Orientation orientation() const;
     QString title() const;
     QUrl url() const;
 
     QImage makeImage(QSizeF size, int pageNumber);
     QImage makeImageToFit(QSizeF size, int pageNumber, bool color);
-    QPixmap makePixmap(QSize size, int pageNumber);
-
-    Q_INVOKABLE QImage renderImage(QSize size, int pageNumber);
-    Q_INVOKABLE bool renderPage(QPainter *painter, int pageNumber);
-
-    bool printFromImage(QPainter *painter, int pageNumber, QRect pageRect, double resolution);
 signals:
     void countChanged();
+    void error(Document::Errors errorType);
+    void orientationChanged();
+    void titleChanged();
     void urlChanged();
 public slots:
     void setUrl(QUrl url);
 
=== added file 'backend/UbuntuPrintingApp/pagehelper.cpp'
--- backend/UbuntuPrintingApp/pagehelper.cpp	1970-01-01 00:00:00 +0000
+++ backend/UbuntuPrintingApp/pagehelper.cpp	2017-02-08 21:32:20 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+#include <QtCore/QSizeF>
+
+#include <poppler/qt5/poppler-qt5.h>
+
+#include "pagehelper.h"
+
+#define A4_ASPECT_RATIO 595.0 / 842.0
+
+PageHelper::PageHelper(QObject *parent)
+    : QObject(parent)
+    , m_aspect(A4_ASPECT_RATIO)
+    , m_document(Q_NULLPTR)
+    , m_page(0)
+{
+
+}
+
+double PageHelper::aspect() const
+{
+    return m_aspect;
+}
+
+Document *PageHelper::document() const
+{
+    return m_document;
+}
+
+void PageHelper::loadAspect()
+{
+    if (!m_document) {
+        setAspect(A4_ASPECT_RATIO);
+    }
+
+    QSizeF pageSize = m_document->getPageSize(m_page);
+
+    if (pageSize.isValid()) {
+        setAspect(pageSize.width() / pageSize.height());
+    } else {
+        setAspect(A4_ASPECT_RATIO);
+    }
+}
+
+int PageHelper::page() const
+{
+    return m_page;
+}
+
+void PageHelper::setAspect(double aspect)
+{
+    if (m_aspect != aspect) {
+        m_aspect = aspect;
+
+        Q_EMIT aspectChanged();
+    }
+}
+
+void PageHelper::setDocument(Document *document)
+{
+    if (m_document != document) {
+        if (m_document) {  // disconnect old signals
+            m_document->disconnect();
+        }
+
+        m_document = document;
+
+        // If the document URL changes reload the aspect
+        PageHelper::connect(m_document, SIGNAL(urlChanged()), this, SLOT(loadAspect()));
+
+        Q_EMIT documentChanged();
+
+        loadAspect();
+    }
+}
+
+void PageHelper::setPage(int page)
+{
+    if (m_page != page) {
+        m_page = page;
+
+        Q_EMIT pageChanged();
+
+        loadAspect();
+    }
+}
+
 
=== added file 'backend/UbuntuPrintingApp/pagehelper.h'
--- backend/UbuntuPrintingApp/pagehelper.h	1970-01-01 00:00:00 +0000
+++ backend/UbuntuPrintingApp/pagehelper.h	2017-02-08 21:32:20 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+#ifndef PAGEHELPER_H
+#define PAGEHELPER_H
+
+#include <QtCore/QObject>
+
+#include "document.h"
+
+class PageHelper : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(double aspect READ aspect NOTIFY aspectChanged)
+    Q_PROPERTY(Document *document READ document WRITE setDocument NOTIFY documentChanged)
+    Q_PROPERTY(int page READ page WRITE setPage NOTIFY pageChanged)
+public:
+    explicit PageHelper(QObject *parent = 0);
+    double aspect() const;
+    Document *document() const;
+    int page() const;
+signals:
+    void aspectChanged();
+    void documentChanged();
+    void pageChanged();
+public slots:
+    void setDocument(Document *document);
+    void setPage(int page);
+private slots:
+    void setAspect(double aspect);
+    void loadAspect();
+private:
+    double m_aspect;
+    Document *m_document;
+    int m_page;
+};
+
+#endif // PAGEGELPER_H
 
=== modified file 'backend/UbuntuPrintingApp/popplerimageprovider.cpp'
--- backend/Ubuntu_Printing_App/popplerimageprovider.cpp	2016-12-12 17:09:39 +0000
+++ backend/UbuntuPrintingApp/popplerimageprovider.cpp	2017-02-08 21:32:20 +0000
@@ -1,9 +1,27 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
 #include "popplerimageprovider.h"
 
 #include <QDebug>
 
 #include "document.h"
-#include "printer.h"
 
 PopplerImageProvider::PopplerImageProvider()
     : QQuickImageProvider(QQuickImageProvider::Image, QQuickImageProvider::ForceAsynchronousImageLoading)
@@ -14,35 +32,57 @@
 
 QImage PopplerImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {
-    qDebug() << "ID" << id << requestedSize.height() << requestedSize.width();
-
-    // Load id ( image://poppler/{pageNumber}/{colorMode}/{filePath} )
+    // Load id ( image://poppler/{pageNumber}/{color}/{filePath} )
     QStringList parts = id.split("/");
 
     bool colorOk, numberOk;
     int pageNumber = parts.takeFirst().toInt(&numberOk, 10);
-    int colorModeInt = parts.takeFirst().toInt(&colorOk, 10);
-
-    Printer::ColorMode colorMode = static_cast<Printer::ColorMode>(colorModeInt);
+    QString colorMode = QString::fromStdString(parts.takeFirst().toStdString());
+
+    bool color;
+
+    if (colorMode == "true") {
+        color = true;
+        colorOk = true;
+    } else if (colorMode == "false") {
+        color = false;
+        colorOk = true;
+    } else {
+        colorOk = false;
+    }
 
     QString url = parts.join("/");
 
+    // Check request size is valid
+    if (requestedSize.height() <= 0 || requestedSize.width() <= 0) {
+        qWarning() << "Invalid requestedSize given" << requestedSize;
+
+        // Requested size is invalid, return a 1x1 image to prevent QML errors
+        // when resizing the window really small
+        if (size) {
+            *size = QSize(1, 1);
+        }
+
+        return QImage(QSize(1, 1), QImage::Format_ARGB32_Premultiplied);
+    } else if (size) {
+        // Set the size of the 'orignal' image to the requestedSize
+        // as we generate an image dynamically
+        *size = requestedSize;
+    }
+
+    // Check all parts given were OK
     if (url.isEmpty() || !numberOk || !colorOk) {
+        qWarning() << "Invalid id given to poppler image provider:" << id;
         return QImage();
     }
 
-    // Fallback size if none is given for QImage
-    int width = 100;
-    int height = 50;
-
-    if (size)
-        *size = QSize(width, height);
-
-    qDebug() << "Url:" << url;
-    qDebug() << "Page:" << pageNumber;
-
+    // Build a Document and generate an image to fit the given requestedSize
     Document *doc = new Document();
     doc->setUrl(url);
 
-    return doc->makeImageToFit(requestedSize, pageNumber, colorMode == Printer::Color);
+    QImage image = doc->makeImageToFit(requestedSize, pageNumber, color);
+
+    doc->deleteLater();
+
+    return image;
 }
 
=== modified file 'backend/UbuntuPrintingApp/popplerimageprovider.h'
--- backend/Ubuntu_Printing_App/popplerimageprovider.h	2016-12-09 17:14:23 +0000
+++ backend/UbuntuPrintingApp/popplerimageprovider.h	2017-02-08 21:32:20 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
 #ifndef POPPLERIMAGEPROVIDER_H
 #define POPPLERIMAGEPROVIDER_H
 
 
=== modified file 'backend/UbuntuPrintingApp/qmldir'
--- backend/Ubuntu_Printing_App/qmldir	2016-12-13 12:37:45 +0000
+++ backend/UbuntuPrintingApp/qmldir	2017-02-08 21:32:20 +0000
@@ -1,2 +1,2 @@
-module Ubuntu_Printing_App
-plugin Ubuntu_Printing_Appbackend
+module UbuntuPrintingApp
+plugin UbuntuPrintingAppbackend
 
=== removed file 'backend/Ubuntu_Printing_App/printer.cpp'
--- backend/Ubuntu_Printing_App/printer.cpp	2016-12-13 12:08:15 +0000
+++ backend/Ubuntu_Printing_App/printer.cpp	1970-01-01 00:00:00 +0000
@@ -1,355 +0,0 @@
-#include "printer.h"
-
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-
-#include <QtCore/QDebug>
-
-#include <cups/cups.h>
-#include <cups/ppd.h>
-
-#define __CUPS_ADD_OPTION(dest, name, value) dest->num_options = \
-    cupsAddOption(name, value, dest->num_options, &dest->options);
-
-Printer::Printer(QObject *parent)
-    : QObject(parent)
-    , m_color_mode(Color)
-    , m_copies(1)
-    , m_cups_dest(0)
-    , m_cups_instance(QStringLiteral(""))
-    , m_cups_name(QStringLiteral(""))
-    , m_duplex(false)
-    , m_duplex_modes({})
-    , m_duplex_supported(false)
-    , m_job_id(0)
-    , m_name("")
-    , m_ppd(0)
-    , m_pdf_mode(false)
-    , m_quality(Normal)
-{
-
-}
-
-Printer::~Printer()
-{
-    if (m_ppd) {
-        ppdClose(m_ppd);
-        m_ppd = 0;
-    }
-
-    if (m_cups_dest) {
-        cupsFreeDests(1, m_cups_dest);
-
-        m_cups_dest = 0;
-    }
-}
-
-Printer::ColorMode Printer::colorMode() const
-{
-    return m_color_mode;
-}
-
-int Printer::copies() const
-{
-    return m_copies;
-}
-
-bool Printer::duplex() const
-{
-    return m_duplex;
-}
-
-bool Printer::duplexSupported() const
-{
-    return m_duplex_supported;
-}
-
-void Printer::loadDuplexModes(const QString name)
-{
-    if (m_ppd) {
-        ppdClose(m_ppd);
-        m_ppd = 0;
-    }
-
-    const char *ppdFile = cupsGetPPD(name.toLocal8Bit().data());
-
-    if (ppdFile) {
-        m_ppd = ppdOpenFile(ppdFile);
-        unlink(ppdFile);
-
-        if (m_ppd) {
-            ppdMarkDefaults(m_ppd);
-        } else {
-            m_ppd = 0;
-            return;
-        }
-    }
-
-    ppd_option_t *duplexModes = ppdFindOption(m_ppd, "Duplex");
-    ppd_option_t *defaultDuplexModes = ppdFindOption(m_ppd, "DefaultDuplex");
-
-    // Build list of supported duplex modes
-    bool duplexSupported = false;
-    m_duplex_modes.clear();
-
-    for (int i=0; i < duplexModes->num_choices; i++) {
-        m_duplex_modes.append(QString::fromLocal8Bit(duplexModes->choices[i].choice));
-
-        if (QString::fromLocal8Bit(duplexModes->choices[i].choice) != "None") {
-            duplexSupported = true;
-        }
-    }
-
-    setDuplexSupported(duplexSupported);
-
-    // Load default duplex mode
-    // TODO: do we need as option gets disable?
-    if (defaultDuplexModes) {
-        if (QString::fromLocal8Bit(defaultDuplexModes->choices[0].choice) == "None") {
-            setDuplex(false);
-        } else {
-            setDuplex(true);
-        }
-    }
-}
-
-bool Printer::loadOptions(cups_dest_t *cups_dest, Document *doc)
-{
-    // Load options
-    // Copies
-    if (m_copies > 1) {
-        __CUPS_ADD_OPTION(cups_dest, "copies", QString::number(m_copies).toLocal8Bit());
-    }
-
-    // Colour mode
-    if (m_color_mode == GrayScale) {
-        __CUPS_ADD_OPTION(cups_dest, "ColorModel", "CMYGray");
-    }
-
-    // Duplex
-    if (m_duplex_supported && m_duplex) {
-        if (doc->orientation() == Document::Portrait && m_duplex_modes.contains("DuplexNoTumble")) {
-            __CUPS_ADD_OPTION(cups_dest, "Duplex", "DuplexNoTumble");
-//            __CUPS_ADD_OPTION(m_cups_dest, "sides", "two-sided-long-edge")
-        } else if (doc->orientation() == Document::Portrait && m_duplex_modes.contains("DuplexTumble")) {
-            __CUPS_ADD_OPTION(cups_dest, "Duplex", "DuplexTumble");
-//            __CUPS_ADD_OPTION(m_cups_dest, "sides", "two-sided-long-edge")
-        } else {
-            // Fallback to pick first found duplex mode
-            for (QString mode : m_duplex_modes) {
-                if (mode != "None") {
-                    __CUPS_ADD_OPTION(cups_dest, "Duplex", mode.toLocal8Bit().data());
-                    break;
-                }
-            }
-        }
-    } else {
-        __CUPS_ADD_OPTION(cups_dest, "Duplex", "None");
-    }
-
-    // Orientation
-    if (doc->orientation() == Document::Landscape) {
-        __CUPS_ADD_OPTION(cups_dest, "landscape", "");
-    }
-
-    // Page range
-//    __CUPS_ADD_OPTION(cups_dest, "number-up", "4");  // 1, 2, 4, 6, 9
-//    __CUPS_ADD_OPTION(cups_dest, "number-up-layout", "lrtb");  // "lrtb", "lrbt", "rlbt", "rltb", "btlr", "btrl", "tblr", "tbrl"
-//    __CUPS_ADD_OPTION(cups_dest, "page-ranges", "1-2");  // 3-5,7,10-20
-
-    // Print quality
-    QString printQuality = "";
-    switch (m_quality) {
-    case Draft:
-        printQuality = "FastDraft";
-        break;
-    case Best:
-        printQuality = "Best";
-        break;
-    case Photo:
-        printQuality = "Photo";
-        break;
-    case Normal:
-    default:
-        printQuality = "Normal";
-        break;
-    }
-    __CUPS_ADD_OPTION(cups_dest, "OutputMode", printQuality.toLocal8Bit());
-
-    return true;
-}
-
-QString Printer::makeOutputFilepath() const
-{
-    QDir dir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
-
-    if (!dir.exists()) {
-        dir.mkpath(".");
-    }
-
-    QFileInfo fileInfo(dir.path(), QDateTime::currentDateTime().toString(Qt::ISODate));
-    return fileInfo.absoluteFilePath();
-}
-
-QString Printer::name() const
-{
-    return m_name;
-}
-
-bool Printer::pdfMode() const
-{
-    return m_pdf_mode;
-}
-
-bool Printer::print(Document *doc)
-{
-    // TODO: PDF mode!
-    if (m_pdf_mode) {
-        Q_EMIT exportRequest(doc->url().toLocalFile());
-
-//        cupsTempFd();
-        return true;
-    }
-
-    // Get all the dests
-    int         num_dests;  Q_UNUSED(num_dests)
-    cups_dest_t *dests;
-
-    num_dests = cupsGetDests(&dests);  // FIXME: appear to need to run this first?
-
-    for (int i=0; i < num_dests; i++) {
-        qDebug() << "Dest" << dests[i].name;
-    }
-
-    cupsFreeDests(num_dests, dests);
-
-    // Ensure the destination is free
-    if (m_cups_dest) {
-        cupsFreeDests(1, m_cups_dest);
-
-        m_cups_dest = 0;
-    }
-
-    // Get the destination
-    // TODO: IPP, cupsGetDestWithURI()
-    m_cups_dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cups_name.toLocal8Bit().data(), m_cups_instance.toLocal8Bit().data());
-
-    if (!m_cups_dest) {
-        qWarning() << "Could not find printer:" << m_name;
-        return false;
-    }
-
-    // Load the printer options
-    loadOptions(m_cups_dest, doc);
-
-    // Load title
-    QString title = doc->title();
-
-    if (title.isEmpty()) {
-        title = doc->url().fileName();
-    }
-
-    // Send to the printer
-    m_job_id = cupsPrintFile(m_cups_dest->name,
-                             doc->url().toLocalFile().toLocal8Bit().data(),
-                             title.toLocal8Bit().data(),
-                             m_cups_dest->num_options, m_cups_dest->options);
-
-    if (m_job_id == 0) {
-        qWarning() << "Creating Job Failed:" << cupsLastErrorString();
-        return false;
-    } else {
-        qDebug() << "JobID" << m_job_id;
-        return true;
-    }
-}
-
-void Printer::setColorMode(Printer::ColorMode colorMode)
-{
-    if (m_color_mode != colorMode) {
-        m_color_mode = colorMode;
-
-        Q_EMIT colorModeChanged();
-    }
-}
-
-void Printer::setCopies(int copies)
-{
-    if (m_copies != copies) {
-        m_copies = copies;
-
-        Q_EMIT copiesChanged();
-    }
-}
-
-void Printer::setDuplex(bool duplex)
-{
-    if (m_duplex != duplex) {
-        m_duplex = duplex;
-
-        Q_EMIT duplexChanged();
-    }
-}
-
-void Printer::setDuplexSupported(bool duplexSupported)
-{
-    if (m_duplex_supported != duplexSupported) {
-        m_duplex_supported = duplexSupported;
-
-        Q_EMIT duplexSupportedChanged();
-    }
-}
-
-void Printer::setName(QString name)
-{
-    if (m_name != name) {
-        m_name = name;
-
-        if (m_pdf_mode) {
-            setDuplexSupported(false);
-        } else {
-            // Extract the cups name and instance from the m_name
-            QStringList split = m_name.split("/");
-
-            m_cups_name = split.takeFirst();
-            m_cups_instance = split.isEmpty() ? "" : split.takeFirst();
-
-            if (split.length() > 0) {
-                qWarning() << "Unknown printer name pattern:" << m_name;
-                return;
-            }
-
-            loadDuplexModes(m_cups_name);
-        }
-
-        Q_EMIT nameChanged();
-        Q_EMIT settingsChanged();
-    }
-}
-
-void Printer::setPdfMode(bool pdfMode)
-{
-    if (m_pdf_mode != pdfMode) {
-        m_pdf_mode = pdfMode;
-
-        Q_EMIT pdfModeChanged();
-    }
-}
-
-void Printer::setQuality(Quality quality)
-{
-    if (m_quality != quality) {
-        m_quality = quality;
-
-        Q_EMIT qualityChanged();
-    }
-}
-
-Printer::Quality Printer::quality() const
-{
-    return m_quality;
-}
 
=== removed file 'backend/Ubuntu_Printing_App/printer.h'
--- backend/Ubuntu_Printing_App/printer.h	2016-12-13 12:08:15 +0000
+++ backend/Ubuntu_Printing_App/printer.h	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-#ifndef PRINTER_H
-#define PRINTER_H
-
-#include <QtCore/QObject>
-
-#include <cups/cups.h>
-#include <cups/ppd.h>
-
-#include "document.h"
-
-class Printer : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(ColorMode colorMode READ colorMode WRITE setColorMode NOTIFY colorModeChanged)
-    Q_PROPERTY(int copies READ copies WRITE setCopies NOTIFY copiesChanged)
-    Q_PROPERTY(bool duplex READ duplex WRITE setDuplex NOTIFY duplexChanged)
-    Q_PROPERTY(bool duplexSupported READ duplexSupported NOTIFY duplexSupportedChanged)
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(bool pdfMode READ pdfMode WRITE setPdfMode NOTIFY pdfModeChanged)
-    Q_PROPERTY(Quality quality READ quality WRITE setQuality NOTIFY qualityChanged)
-public:
-    enum ColorMode
-    {
-        Color,
-        GrayScale,
-    };
-    Q_ENUMS(ColorMode)
-
-    enum Quality
-    {
-        Draft,
-        Normal,
-        Best,
-        Photo,
-    };
-    Q_ENUMS(Quality)
-
-    explicit Printer(QObject *parent = 0);
-    ~Printer();
-    ColorMode colorMode() const;
-    int copies() const;
-    bool duplex() const;
-    bool duplexSupported() const;
-    QString name() const;
-    bool pdfMode() const;
-    Quality quality() const;
-
-    Q_INVOKABLE bool print(Document *doc);
-signals:
-    void colorModeChanged();
-    void copiesChanged();
-    void duplexChanged();
-    void duplexSupportedChanged();
-    void nameChanged();
-    void settingsChanged();
-    void pdfModeChanged();
-    void qualityChanged();
-
-    void exportRequest(const QString &filepath);
-public slots:
-    void setColorMode(ColorMode colorMode);
-    void setCopies(int copies);
-    void setDuplex(bool duplex);
-    void setDuplexSupported(bool duplexSupported);
-    void setName(QString name);
-    void setPdfMode(bool pdfMode);
-    void setQuality(Quality quality);
-private:
-    void loadDuplexModes(const QString name);
-    bool loadOptions(cups_dest_t *cups_dest, Document *doc);
-    QString makeOutputFilepath() const;
-
-    ColorMode m_color_mode;
-    int m_copies;
-
-    cups_dest_t *m_cups_dest;
-    QString m_cups_instance;
-    QString m_cups_name;
-
-    bool m_duplex;
-    QList<QString> m_duplex_modes;
-    bool m_duplex_supported;
-    int m_job_id;
-    QString m_name;
-
-    ppd_file_t *m_ppd;
-
-    bool m_pdf_mode;
-    Quality m_quality;
-
-};
-
-#endif // PRINTER_H
 
=== removed file 'backend/Ubuntu_Printing_App/printerinfo.cpp'
--- backend/Ubuntu_Printing_App/printerinfo.cpp	2016-12-12 17:09:39 +0000
+++ backend/Ubuntu_Printing_App/printerinfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#include "printerinfo.h"
-
-#include <QtPrintSupport/QPrinterInfo>
-
-PrinterInfo::PrinterInfo(QObject *parent) : QObject(parent)
-{
-    m_available_printer_names = QStringList() << QPrinterInfo::availablePrinterNames() << "Create PDF";
-    m_default_printer_name = QPrinterInfo::defaultPrinterName();
-
-    // Watch printers for updates
-    m_timer_printers = new QTimer(this);
-    connect(m_timer_printers, SIGNAL(timeout()), this, SLOT(updatePrinters()));
-    m_timer_printers->start(5000);
-}
-
-QStringList PrinterInfo::availablePrinterNames() const
-{
-    return m_available_printer_names;
-}
-
-QString PrinterInfo::defaultPrinterName() const
-{
-    return m_default_printer_name;
-}
-
-void PrinterInfo::updatePrinters()
-{
-    if (m_available_printer_names != QStringList() << QPrinterInfo::availablePrinterNames() << "Create PDF") {
-        m_available_printer_names = QStringList() << QPrinterInfo::availablePrinterNames() << "Create PDF";
-
-        Q_EMIT availablePrinterNamesChanged();
-    }
-
-    if (m_default_printer_name != QPrinterInfo::defaultPrinterName()) {
-        m_default_printer_name = QPrinterInfo::defaultPrinterName();
-
-        Q_EMIT defaultPrinterNameChanged();
-    }
-}
 
=== removed file 'backend/Ubuntu_Printing_App/printerinfo.h'
--- backend/Ubuntu_Printing_App/printerinfo.h	2016-11-25 16:47:10 +0000
+++ backend/Ubuntu_Printing_App/printerinfo.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#ifndef PRINTERINFO_H
-#define PRINTERINFO_H
-
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
-
-class PrinterInfo : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QStringList availablePrinterNames READ availablePrinterNames NOTIFY availablePrinterNamesChanged)
-    Q_PROPERTY(QString defaultPrinterName READ defaultPrinterName NOTIFY defaultPrinterNameChanged)
-public:
-    explicit PrinterInfo(QObject *parent = 0);
-    QStringList availablePrinterNames() const;
-    QString defaultPrinterName() const;
-signals:
-    void availablePrinterNamesChanged();
-    void defaultPrinterNameChanged();
-private slots:
-    void updatePrinters();
-private:
-    QStringList m_available_printer_names;
-    QString m_default_printer_name;
-    QTimer *m_timer_printers;
-};
-
-#endif // PRINTERINFO_H
 
=== removed directory 'backend/tests'
=== removed directory 'backend/tests/unit'
=== removed file 'backend/tests/unit/tst_mytype.qml'
--- backend/tests/unit/tst_mytype.qml	2016-12-13 12:37:45 +0000
+++ backend/tests/unit/tst_mytype.qml	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-import QtQuick 2.4
-import QtTest 1.0
-import Ubuntu.Components 1.3
-import Ubuntu_Printing_App 1.0
-
-// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
-
-// Execute tests with:
-//   qmltestrunner
-
-Item {
-    // The objects
-    MyType {
-        id: objectUnderTest
-    }
-
-    TestCase {
-        name: "MyType"
-
-        function init() {
-            console.debug(">> init");
-            compare("",objectUnderTest.helloWorld,"text was not empty on init");
-            console.debug("<< init");
-        }
-
-        function cleanup() {
-            console.debug(">> cleanup");
-            console.debug("<< cleanup");
-        }
-
-        function initTestCase() {
-            console.debug(">> initTestCase");
-            console.debug("<< initTestCase");
-        }
-
-        function cleanupTestCase() {
-            console.debug(">> cleanupTestCase");
-            console.debug("<< cleanupTestCase");
-        }
-
-        function test_canReadAndWriteText() {
-            var expected = "Hello World 2";
-
-            objectUnderTest.helloWorld = expected;
-
-            compare(expected,objectUnderTest.helloWorld,"expected did not equal result");
-        }
-    }
-}
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-12-09 22:02:22 +0000
+++ debian/changelog	2017-02-08 21:32:20 +0000
@@ -2,4 +2,4 @@
 
   * Initial release
 
- -- Andrew Hayzen <[e-mail]>  Fri, 09 Dec 2016 21:54:12 +0000
+ -- Andrew Hayzen <[e-mail]>  Fri, 09 Dec 2016 21:54:12 +0000
 
=== modified file 'debian/control'
--- debian/control	2016-12-14 01:01:39 +0000
+++ debian/control	2017-02-08 21:32:20 +0000
@@ -1,27 +1,36 @@
 Source: ubuntu-printing-app
-Section: unknown
+Section: misc
 Priority: optional
-Maintainer: Andrew Hayzen <[e-mail]>
+Maintainer: Andrew Hayzen <[e-mail]>
 Build-Depends: cmake (>= 2.8.9),
                debhelper (>=9),
                dh-apparmor,
                dh-translations,
-               libcups2-dev,
                libpoppler-qt5-dev,
                qmlscene,
+               qml-module-qtquick2,
+               qml-module-qtquick-layouts,
+               qml-module-qttest,
+               qml-module-ubuntu-settings-components,
+               qml-module-ubuntu-test,
+               qtdeclarative5-ubuntu-content1,
+               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
                qt5-default,
                qt5-qmake,
                qtdeclarative5-dev,
-               ubuntu-sdk-qmake-extras
+               qtdeclarative5-dev-tools,
+               ubuntu-sdk-qmake-extras,
+               xvfb
 Standards-Version: 3.9.6
-Homepage: <insert the upstream URL, if relevant>
+Homepage: http://launchpad.net/ubuntu-printing-app
+Vcs-Bzr: https://code.launchpad.net/~phablet-team/ubuntu-printing-app/trunk
 
 Package: ubuntu-printing-app
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-         libcups2,
          qml-module-qtquick2,
          qml-module-qtquick-layouts,
+         qml-module-ubuntu-settings-components,
          qtdeclarative5-ubuntu-content1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
 Description: Printing app which consumes a PDF from content-hub
 
=== modified file 'debian/copyright'
--- debian/copyright	2016-12-09 22:02:22 +0000
+++ debian/copyright	2017-02-08 21:32:20 +0000
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ubuntu-printing-app
-Source: <url://example.com>
+Source: https://code.launchpad.net/ubuntu-printing-app
 
 Files: *
 Copyright: 2016 Canonical Ltd.
 
=== removed file 'manifest.json.in'
--- manifest.json.in	2016-12-13 23:08:52 +0000
+++ manifest.json.in	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-{
-    "name": "ubuntu-printing-app.ahayzen",
-    "description": "A basic printing app for Ubuntu",
-    "architecture": "@CLICK_ARCH@",
-    "title": "ubuntu-printing-app",
-    "hooks": {
-        "ubuntu-printing-app": {
-            "apparmor": "ubuntu-printing-app/ubuntu-printing-app.apparmor",
-            "content-hub": "ubuntu-printing-app/ubuntu-printing-app-content-hub.json",
-            "desktop": "ubuntu-printing-app/ubuntu-printing-app.desktop"
-        }
-    },
-    "version": "0.1",
-    "maintainer": "Andrew Hayzen <[e-mail]>",
-    "framework": "ubuntu-sdk-15.04.6"
-}
 
=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -0,0 +1,44 @@
+project(ubuntu-printing-app-translations)
+
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+file(RELATIVE_PATH DESKTOP_FILE_IN_IN ${CMAKE_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/${DESKTOP_FILE}.in.in)
+file(RELATIVE_PATH DESKTOP_FILE_IN_IN_H ${CMAKE_SOURCE_DIR}
+     ${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_FILE_IN_IN}.h)
+
+file(GLOB_RECURSE I18N_SRC_FILES
+     RELATIVE ${CMAKE_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/**.qml)
+list(SORT I18N_SRC_FILES)
+
+set(DOMAIN ${GETTEXT_PACKAGE})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+add_custom_target(${POT_FILE} ALL
+                  COMMENT "Generating translation template"
+                  COMMAND touch ${POT_FILE}
+                  COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+                          --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE_IN_IN}
+                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+                          -D ${CMAKE_SOURCE_DIR}
+                          --from-code=UTF-8
+                          --c++ --qt --add-comments=TRANSLATORS
+                          --keyword=tr --keyword=tr:1,2 --keyword=N_
+                          -j
+                          --package-name=ubuntu-printing-app
+                          --copyright-holder='Canonical Ltd.'
+                          -D ${CMAKE_SOURCE_DIR} ${I18N_SRC_FILES}
+                          -D ${CMAKE_BINARY_DIR} ${DESKTOP_FILE_IN_IN_H}
+                  COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
+
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)
 
=== added file 'po/ubuntu-printing-app.pot'
--- po/ubuntu-printing-app.pot	1970-01-01 00:00:00 +0000
+++ po/ubuntu-printing-app.pot	2017-02-08 21:32:20 +0000
@@ -0,0 +1,122 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the ubuntu-printing-app package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-printing-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-08 21:19+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ubuntu-printing-app/Main.qml:55
+msgid "Document is invalid"
+msgstr ""
+
+#: ubuntu-printing-app/Main.qml:58
+msgid "Document not found"
+msgstr ""
+
+#: ubuntu-printing-app/Main.qml:61
+msgid "Not a PDF document"
+msgstr ""
+
+#: ubuntu-printing-app/Main.qml:64
+msgid "An unknown error occurred"
+msgstr ""
+
+#: ubuntu-printing-app/Main.qml:76
+msgid "Error"
+msgstr ""
+
+#: ubuntu-printing-app/Main.qml:96
+msgid "URL of PDF to print"
+msgstr ""
+
+#: ubuntu-printing-app/components/AlertDialog.qml:28
+msgid "OK"
+msgstr ""
+
+#: ubuntu-printing-app/components/PrintRow.qml:56
+msgid "Cancel"
+msgstr ""
+
+#: ubuntu-printing-app/components/PrintRow.qml:69
+msgid "Create PDF"
+msgstr ""
+
+#: ubuntu-printing-app/components/PrintRow.qml:69
+msgid "Print"
+msgstr ""
+
+#: ubuntu-printing-app/components/PrintRow.qml:69
+msgid "Sheets"
+msgstr ""
+
+#: ubuntu-printing-app/pages/ContentPeerPickerPage.qml:43
+msgid "Open With..."
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:47
+msgid "Page Setup"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:47
+msgid "Printer Options"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:85
+msgid "Printer"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:97
+msgid "Copies"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:120
+msgid "Collate"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:140
+msgid "Reverse"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:163
+msgid "Two-sided"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:182
+msgid "All"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:182
+msgid "Range"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:186
+msgid "Pages"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:228
+msgid "eg 1-3,8"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:237
+msgid "Color"
+msgstr ""
+
+#: ubuntu-printing-app/pages/PrintPage.qml:258
+msgid "Quality"
+msgstr ""
+
+#: po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
+msgid "ubuntu-printing-app"
+msgstr ""
 
=== modified file 'runner/CMakeLists.txt'
--- runner/CMakeLists.txt	2016-12-13 23:08:52 +0000
+++ runner/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -1,6 +1,9 @@
 
 # Install runner
-install(FILES "ubuntu-printing-app" DESTINATION ${CMAKE_INSTALL_BINDIR})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-printing-app.in ${CMAKE_CURRENT_BINARY_DIR}/${RUNNER})
+
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RUNNER} DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 
 # Show in QtC
-add_custom_target(ubuntu_printing_app_runner_files ALL SOURCES ubuntu-printing-app)
+add_custom_target(ubuntu_printing_app_runner_files ALL SOURCES ubuntu-printing-app.in)
 
=== removed file 'runner/ubuntu-printing-app'
--- runner/ubuntu-printing-app	2016-12-13 14:23:08 +0000
+++ runner/ubuntu-printing-app	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-qmlscene -qt5 /usr/share/ubuntu-printing-app/Main.qml
 
=== added file 'runner/ubuntu-printing-app.in'
--- runner/ubuntu-printing-app.in	1970-01-01 00:00:00 +0000
+++ runner/ubuntu-printing-app.in	2017-02-08 21:32:20 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+@EXEC@
 
=== added directory 'setup'
=== added directory 'setup/gui'
=== added file 'setup/gui/ubuntu-printing-app.desktop'
--- setup/gui/ubuntu-printing-app.desktop	1970-01-01 00:00:00 +0000
+++ setup/gui/ubuntu-printing-app.desktop	2017-02-08 21:32:20 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=ubuntu-printing-app
+Exec=ubuntu-printing-app
+Icon=${SNAP}/meta/gui/ubuntu-printing-app.png
+Terminal=false
+Type=Application
+X-Ubuntu-Touch=true
+X-Ubuntu-Touch-Single-Instance=false
 
=== added file 'setup/gui/ubuntu-printing-app.png'
 Binary files setup/gui/ubuntu-printing-app.png	1970-01-01 00:00:00 +0000 and setup/gui/ubuntu-printing-app.png	2017-02-08 21:32:20 +0000 differ
=== added directory 'snap'
=== added directory 'snap/ubuntu-app-platform'
=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,75 @@
+name: ubuntu-printing-app
+version: "0.1"
+summary: "Printing app which consumes a PDF from content-hub"
+description: Printing app which consumes a PDF document from
+  content-hub, allows for basic configuration and
+  then sends to a CUPS printer.
+confinement: strict
+
+apps:
+  ubuntu-printing-app:
+    command: desktop-launch $SNAP/usr/bin/ubuntu-printing-app --desktop_file_hint=unity8
+    plugs:
+     - cups-control
+     - home
+     - network
+     - opengl
+     - platform
+     - unity7
+     - unity8
+
+plugs:
+  platform:
+    interface: content
+    content: ubuntu-app-platform1
+    target: ubuntu-app-platform
+    default-provider: ubuntu-app-platform
+
+parts:
+  ubuntu-printing-app:
+    build-packages:
+     - intltool
+     - libpoppler-qt5-dev
+     - qml-module-qttest
+     - qml-module-ubuntu-test
+     - qt5-default
+     - qt5-qmake
+     - qtdeclarative5-dev
+     - ubuntu-sdk-qmake-extras
+     - xvfb
+    configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DSNAP_MODE=on]
+    plugin: cmake
+    source: .
+    after: [printer-components, desktop-ubuntu-app-platform]
+
+  printer-components:
+    plugin: cmake
+    configflags: [-DCMAKE_INSTALL_PREFIX=/usr]
+    source: https://code.launchpad.net/~phablet-team/ubuntu-settings-components/printer-components
+    source-type: bzr
+    build-packages:
+     - cmake-extras
+     - libcups2-dev
+     - libqt5printsupport5
+     - debhelper
+     - gettext
+     - pkg-config
+     - python3
+     - qml-module-qt-labs-folderlistmodel
+     - qml-module-qtquick-layouts
+     - qml-module-qtquick2
+     - qml-module-qttest
+     - qml-module-ubuntu-components
+     - qml-module-ubuntu-thumbnailer0.1
+     - qtbase5-dev
+     - qtbase5-private-dev
+     - qtdeclarative5-dev
+     - qtdeclarative5-dev-tools
+     - suru-icon-theme
+    stage-packages:
+     - libcups2
+     - libqt5printsupport5
+
+  environment:
+    source: snap/
+    plugin: dump
 
=== added directory 'tests'
=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -0,0 +1,3 @@
+add_subdirectory(resources)
+add_subdirectory(qmltests)
+add_subdirectory(unittests)
 
=== added directory 'tests/qmltests'
=== added file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmltests/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -0,0 +1,46 @@
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Qml REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Qt5QuickTest REQUIRED)
+
+find_program(XVFBRUN xvfb-run)
+if(NOT XVFBRUN)
+  message(FATAL_ERROR "Could not find xvfb-run, please install the xvfb package")
+endif()
+set(XVFB_COMMAND ${XVFBRUN} -s "-screen 0 640x480x24" -a)
+
+find_program(QMLTESTRUNNER qmltestrunner)
+if(NOT QMLTESTRUNNER)
+    message(FATAL_ERROR "Could not find qmltestrunner, please install the package qtdeclarative5-dev-tools")
+endif()
+
+set(TEST tst_QmlTests)
+add_test(${TEST} ${XVFB_COMMAND} ${QMLTESTRUNNER}
+         -input ${CMAKE_CURRENT_SOURCE_DIR}
+         -import ${CMAKE_BINARY_DIR}/backend)
+
+
+# Add the qml test files to build dir
+set(QMLTEST_FILES
+    tst_CheckBoxRow.qml
+    tst_LabelRow.qml
+    tst_PreviewRow.qml
+    tst_PrintRow.qml
+    tst_PrintPage.qml
+    tst_SelectorRow.qml
+    tst_TextFieldRow.qml
+)
+
+add_custom_target(qmltest_copyFiles ALL
+  COMMENT "Copying files: ${QMLTEST_FILES}")
+
+foreach(FILENAME ${QMLTEST_FILES})
+  add_custom_command(
+    TARGET qmltest_copyFiles
+    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" "${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}"
+    )
+endforeach(FILENAME)
+
+# Show in QtC
+add_custom_target(qmltest_files ALL SOURCES ${QMLTEST_FILES})
 
=== added file 'tests/qmltests/tst_CheckBoxRow.qml'
--- tests/qmltests/tst_CheckBoxRow.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/tst_CheckBoxRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtTest 1.1
+import Ubuntu.Test 1.0
+import "../../ubuntu-printing-app/components"
+
+Item {
+    width: units.gu(100)
+    height: units.gu(75)
+
+    CheckBoxRow {
+        id: checkBoxRow
+    }
+
+    UbuntuTestCase {
+        name: "CheckBoxRowTestCase"
+        when: windowShown
+
+        readonly property bool dataChecked: false
+        readonly property string dataCheckboxText: "checkboxText"
+        readonly property bool dataEnabled: true
+        readonly property string dataText: "text"
+
+        function init() {
+            checkBoxRow.checked = dataChecked;
+            checkBoxRow.checkboxText = dataCheckboxText;
+            checkBoxRow.enabled = dataEnabled;
+            checkBoxRow.text = dataText;
+
+            waitForRendering(checkBoxRow);
+        }
+
+        function test_checked() {
+            // Check checkbox checked state is starting value
+            var checkbox = findChild(checkBoxRow, "checkbox");
+            compare(checkBoxRow.checked, dataChecked);
+
+            // Click on the checkbox
+            mouseClick(checkbox);
+
+            // Check that the checked state flips
+            tryCompare(checkBoxRow, "checked", !dataChecked);
+        }
+
+        function test_checkboxText() {
+            // Check that the checkbox label is correct
+            var label = findChild(checkBoxRow, "checkboxLabel");
+            compare(label.text, dataCheckboxText);
+        }
+
+        function test_enabled() {
+            // Check checkbox enabled state is starting value
+            var checkbox = findChild(checkBoxRow, "checkbox");
+            compare(checkBoxRow.enabled, dataEnabled);
+
+            // Flip the enabled state
+            checkBoxRow.enabled = !dataEnabled;
+
+            // Check that the enabled state changes
+            tryCompare(checkbox, "enabled", !dataEnabled);
+        }
+
+        function test_text() {
+            // Check that the text is correct
+            var label = findChild(checkBoxRow, "label");
+            compare(label.text, dataText);
+        }
+    }
+}
 
=== added file 'tests/qmltests/tst_LabelRow.qml'
--- tests/qmltests/tst_LabelRow.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/tst_LabelRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtTest 1.1
+import Ubuntu.Test 1.0
+import "../../ubuntu-printing-app/components"
+
+Item {
+    width: units.gu(100)
+    height: units.gu(75)
+
+    LabelRow {
+        id: labelRow
+    }
+
+    UbuntuTestCase {
+        name: "LabelRowTestCase"
+        when: windowShown
+
+        readonly property bool dataEnabled: true
+        readonly property string dataPrimaryText: "Primary"
+        readonly property string dataSecondaryText: "Secondary"
+
+        function init() {
+            labelRow.enabled = dataEnabled;
+            labelRow.primaryText = dataPrimaryText;
+            labelRow.secondaryText = dataSecondaryText;
+
+            waitForRendering(labelRow);
+        }
+
+        function test_enabled() {
+            // Check that label enabled state is at the starting state
+            var secondary = findChild(labelRow, "secondary");
+            compare(labelRow.enabled, dataEnabled);
+
+            // Flip the enabled state
+            labelRow.enabled = !dataEnabled;
+
+            // Check that the label enabled state changes
+            tryCompare(secondary, "enabled", !dataEnabled);
+        }
+
+        function test_primaryText() {
+            // Check primary text is correct
+            var primary = findChild(labelRow, "primary");
+            compare(primary.text, dataPrimaryText);
+        }
+
+        function test_secondaryText() {
+            // Check secondary text is correct
+            var secondary = findChild(labelRow, "secondary");
+            compare(secondary.text, dataSecondaryText);
+        }
+    }
+}
 
=== added file 'tests/qmltests/tst_PreviewRow.qml'
--- tests/qmltests/tst_PreviewRow.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/tst_PreviewRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,316 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtTest 1.1
+import Ubuntu.Test 1.0
+import "../../ubuntu-printing-app/components"
+
+import UbuntuPrintingApp 1.0
+import Ubuntu.Settings.Printers 0.1
+
+Item {
+    id: root
+    width: units.gu(100)
+    height: units.gu(75)
+
+    Document {
+        id: testDocument
+        url: Qt.resolvedUrl("../resources/pdf/a4_portrait.pdf")
+    }
+
+    QtObject {
+        id: mockPrinterJob
+
+        property int colorModelType: PrinterEnum.ColorType
+    }
+
+    Item {
+        id: mockView
+        height: units.gu(100)
+        width: units.gu(100)
+    }
+
+    PreviewRow {
+        id: previewRow
+        document: testDocument
+        printerJob: mockPrinterJob
+        view: mockView
+    }
+
+    SignalSpy {
+        id: documentCountSpy
+        signalName: "onCountChanged"
+        target: testDocument
+    }
+
+    SignalSpy {
+        id: activityIndicatorSpy
+        signalName: "onRunningChanged"
+        // Target is set at runtime
+    }
+
+    UbuntuTestCase {
+        name: "PreviewRowTestCase"
+        when: windowShown
+
+        function init() {
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/a4_portrait.pdf");
+
+            mockPrinterJob.colorModelType = PrinterEnum.ColorType;
+
+            activityIndicatorSpy.target = null;
+            activityIndicatorSpy.clear();
+            documentCountSpy.clear();
+
+            waitForRendering(previewRow);
+        }
+
+        function test_activityIndicator() {
+            var image = findChild(previewRow, "previewImage");
+            var activityIndicator = findChild(previewRow, "activityIndicator");
+            activityIndicatorSpy.target = activityIndicator;
+
+            // Change the document and wait for image to finish loading
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+            tryCompare(image, "status", Image.Ready);
+
+            // Check that the running state changed twice false=>true=>falase
+            compare(activityIndicatorSpy.count, 2);
+        }
+
+        function test_document_image() {
+            var image = findChild(previewRow, "previewImage");
+
+            // Change the document
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+
+            // Ensure that the image has a valid state
+            tryCompare(image, "status", Image.Ready);
+        }
+
+        function test_document_image_invalid() {
+            var image = findChild(previewRow, "previewImage");
+
+            // Change the document to an invalid doc
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/text.txt");
+
+            // Ensure that the image has a valid state
+            // This is because the poppler renderer always generates a valid image
+            tryCompare(image, "status", Image.Ready);
+        }
+
+        function test_document_change_page_reset() {
+            var next = findChild(previewRow, "nextButton");
+            var pageHelper = previewRow.pageHelper;
+
+            // Load a multi page document and change to 2nd page
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+
+            documentCountSpy.wait();
+            compare(documentCountSpy.count, 1);
+            compare(testDocument.count, 3);
+
+            mouseClick(next);
+            tryCompare(pageHelper, "page", 1);
+
+            // Load a single page document, check we go back to page 0
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/a4_portrait.pdf");
+
+            documentCountSpy.wait();
+            compare(documentCountSpy.count, 2);
+            compare(testDocument.count, 1);
+            compare(pageHelper.page, 0);
+        }
+
+        function test_overlay() {
+            var label = findChild(previewRow, "overlayLabel");
+            var pageHelper = previewRow.pageHelper;
+            var textParts = label.text.split("/");
+
+            // Check text starts with 1/1
+            compare(textParts.length, 2);
+            compare(textParts[0], "1");
+            compare(textParts[1], "1");
+
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+
+            waitForRendering(previewRow);
+            textParts = label.text.split("/");
+
+            // Check it has changed to 1/3
+            compare(textParts.length, 2);
+            compare(textParts[0], "1");
+            compare(textParts[1], "3");
+
+            pageHelper.page++;
+
+            waitForRendering(previewRow);
+            textParts = label.text.split("/");
+
+            // Check it has changed to 2/3
+            compare(textParts.length, 2);
+            compare(textParts[0], "2");
+            compare(textParts[1], "3");
+        }
+
+        function test_page_single() {
+            var next = findChild(previewRow, "nextButton");
+            var previous = findChild(previewRow, "previousButton");
+
+            // Check with a single page doc navigation controls are disabled
+            compare(next.enabled, false);
+            compare(previous.enabled, false);
+        }
+
+        function test_page_next() {
+            var image = findChild(previewRow, "previewImage");
+            var next = findChild(previewRow, "nextButton");
+            var pageHelper = previewRow.pageHelper;
+
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+
+            documentCountSpy.wait();
+            compare(documentCountSpy.count, 1);
+
+            // Check with multi page doc, next button becomes enabled
+            compare(testDocument.count, 3);
+            compare(next.enabled, true);
+            compare(pageHelper.page, 0);
+
+            // Check the requested image page is 0
+            // image://poppler/0/true/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 17), "image://poppler/0");
+
+            // Click to the next page, check still enabled
+            mouseClick(next);
+            tryCompare(pageHelper, "page", 1);
+            compare(next.enabled, true);
+
+            // Check the requested image page is 1
+            // image://poppler/1/true/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 17), "image://poppler/1");
+
+            // Click to the last page, check next becomes diabled
+            mouseClick(next);
+
+            // Change the document
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+
+            // Ensure that the image has a valid state
+            tryCompare(image, "status", Image.Ready);
+            tryCompare(pageHelper, "page", 2);
+            compare(next.enabled, false);
+
+            // Check the requested image page is 2
+            // image://poppler/2/true/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 17), "image://poppler/2");
+        }
+
+        function test_page_previous() {
+            var image = findChild(previewRow, "previewImage");
+            var previous = findChild(previewRow, "previousButton");
+            var pageHelper = previewRow.pageHelper;
+
+            testDocument.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+
+            documentCountSpy.wait();
+            compare(documentCountSpy.count, 1);
+
+            // Check with mulit page doc, previous is still disabled when on 1st
+            compare(testDocument.count, 3);
+            compare(previous.enabled, false);
+            compare(pageHelper.page, 0)
+
+            // Check the requested image page is 0
+            // image://poppler/0/true/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 17), "image://poppler/0");
+
+            // Check when changing to the last page, previous is enabled
+            pageHelper.page = 2;
+            tryCompare(pageHelper, "page", 2);
+            compare(previous.enabled, true);
+
+            // Check the requested image page is 2
+            // image://poppler/2/true/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 17), "image://poppler/2");
+
+            // Click to the previous page, check still enabled
+            mouseClick(previous);
+            tryCompare(pageHelper, "page", 1);
+            compare(previous.enabled, true);
+
+            // Check the requested image page is 1
+            // image://poppler/1/true/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 17), "image://poppler/1");
+
+            // Click to the first page, check previous becomes disabled
+            mouseClick(previous);
+            tryCompare(pageHelper, "page", 0);
+            compare(previous.enabled, false);
+
+            // Check the requested image page is 0
+            // image://poppler/0/true/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 17), "image://poppler/0");
+        }
+
+        function test_printerJob_color() {
+            var image = findChild(previewRow, "previewImage");
+            mockPrinterJob.colorModelType = PrinterEnum.ColorType;
+
+            waitForRendering(image);
+
+            // Check the image requested is color
+            // image://poppler/0/true/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 22), "image://poppler/0/true");
+        }
+
+        function test_printerJob_grayscale() {
+            var image = findChild(previewRow, "previewImage");
+            mockPrinterJob.colorModelType = PrinterEnum.GrayType;
+
+            waitForRendering(image);
+
+            // Check the image requested is grayscale
+            // image://poppler/0/false/file:///path/to/file.pdf
+            compare(image.source.toString().slice(0, 23), "image://poppler/0/false");
+        }
+
+        function test_view() {
+            // test that the implicitHeight is set from the view height
+            var pageHelper = previewRow.pageHelper;
+
+            // min((WIDTH - 10) / ASPECT, HEIGHT / 1.5)
+
+            // height/width of 100GU, aspect is 0.71
+            // min((100 - 10) / 0.71, 100 / 1.5)
+            // min(126.76, 66.66)
+            fuzzyCompare(previewRow.implicitHeight, units.gu(66.66), units.gu(1));
+
+            // Change the view to have a short width
+            mockView.width = units.gu(50);
+            waitForRendering(previewRow);
+
+            // width 50GU, height 100GU, aspect is 0.71
+            // min((50 - 10) / 0.71, 100 / 1.5)
+            // min(56.33, 66.66)
+            fuzzyCompare(previewRow.implicitHeight, units.gu(56.33), units.gu(1));
+        }
+    }
+}
 
=== added file 'tests/qmltests/tst_PrintPage.qml'
--- tests/qmltests/tst_PrintPage.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/tst_PrintPage.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,437 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtTest 1.1
+import Ubuntu.Test 1.0
+import "../../ubuntu-printing-app/pages"
+
+import UbuntuPrintingApp 1.0
+import Ubuntu.Settings.Printers 0.1
+
+Item {
+    width: units.gu(100)
+    height: units.gu(75)
+
+    // Mock the PrintingHelper
+    QtObject {
+        id: mockPrinting
+
+        property ListModel model: ListModel {
+
+        }
+        property bool pdfMode: false
+        property var printer: QtObject {
+            property string name: "PrinterA"
+            property var supportedColorModels: []
+            property var supportedDuplexModes: []
+            property var supportedPrintQualities: []
+        }
+        property var printerJob: QtObject {
+            property bool collate: true
+            property int colorModel: 0
+            property int copies: 1
+            property int duplexMode: 0
+            property bool isTwoSided: false
+            property string printRange: ""
+            property var printRangeMode: 0  // var as it needs to be enum
+            property int quality: 0
+            property bool reverse: false
+        }
+        property int printerSelectedIndex: 0
+    }
+
+    Document {
+        id: document
+        url: Qt.resolvedUrl("../resources/pdf/a4_portrait.pdf")
+    }
+
+    PrintPage {
+        id: printPage
+        anchors {
+            fill: parent
+        }
+        currentDocument: document
+        printing: mockPrinting
+    }
+
+    SignalSpy {
+        id: cancelSpy
+        signalName: "cancel"
+        target: printPage
+    }
+
+    SignalSpy {
+        id: confirmSpy
+        signalName: "confirm"
+        target: printPage
+    }
+
+    UbuntuTestCase {
+        name: "PrintPageTestCase"
+
+        when: windowShown
+
+        property var dataColorModels: ["A", "B", "C"]
+        property var dataDuplexModes: ["A", "B", "C"]
+        property var dataPrinters: [
+            {name: "PrinterA"},
+            {name: "PrinterB"},
+        ]
+        property var dataPrintQualities: ["A", "B", "C"]
+        readonly property int timeout: 1000
+
+        function init() {
+            document.url = Qt.resolvedUrl("../resources/pdf/a4_portrait.pdf");
+
+            mockPrinting.model.clear();
+            for (var i=0; i < dataPrinters.length; i++) {
+                mockPrinting.model.append(dataPrinters[i]);
+            }
+
+            mockPrinting.pdfMode = false;
+
+            mockPrinting.printer.supportedColorModels = dataColorModels;
+            mockPrinting.printer.supportedDuplexModes = dataDuplexModes;
+            mockPrinting.printer.supportedPrintQualities = dataPrintQualities;
+
+            mockPrinting.printerJob.collate = true;
+            mockPrinting.printerJob.copies = 1;
+            mockPrinting.printerJob.printRangeMode = PrinterEnum.AllPages;
+            mockPrinting.printerJob.reverse = false;
+
+            mockPrinting.printerSelectedIndex = 0;
+
+            cancelSpy.clear();
+            confirmSpy.clear();
+
+            waitForRendering(printPage, timeout);
+        }
+
+        function test_cancelButton() {
+            var cancel = findChild(printPage, "cancel");
+
+            // Click the cancel button
+            mouseClick(cancel);
+
+            // Check that cancel signal was emitted
+            cancelSpy.wait();
+            compare(cancelSpy.count, 1);
+        }
+
+        function test_cancelHeader() {
+            // Note SDK adds _button to objectNames in ActionBar
+            var cancel = findChild(printPage, "headerBack_button");
+
+            // Click cancel in the header
+            mouseClick(cancel);
+
+            // Check that cancel signal was emitted
+            cancelSpy.wait();
+            compare(cancelSpy.count, 1);
+        }
+
+        function test_collate() {
+            // Set copies to 2, so collate is enabled
+            mockPrinting.printerJob.copies = 2;
+            tryCompare(mockPrinting.printerJob, "copies", 2);
+
+            // Check starting value of collate is correct
+            var collate = findChild(printPage, "collateCheckBox");
+            compare(collate.enabled, true);
+            compare(collate.checked, true);
+
+            // Click on the checkbox
+            mouseClick(collate);
+
+            // Check that the value of collate has flipped
+            tryCompare(collate, "checked", false, timeout);
+            compare(mockPrinting.printerJob.collate, false);
+        }
+
+        function test_collate_disabled() {
+            // Check collate is disabled when copies is 1
+            var collate = findChild(printPage, "collateCheckBox");
+            compare(mockPrinting.printerJob.copies, 1);
+            compare(collate.enabled, false);
+
+            // Check that is becomes enabled when there are two copies
+            mockPrinting.printerJob.copies = 2;
+            tryCompare(collate, "enabled", true);
+        }
+
+        function test_colorModel() {
+            var colorModel = findChild(printPage, "colorModelSelector");
+
+            // Check color model length is correct
+            compare(colorModel.model.length, dataColorModels.length);
+
+            // Check each of the options has the correct text
+            for (var i=0; i < dataColorModels.length; i++) {
+                var option = findChild(colorModel, "option" + i);
+                compare(option.text, dataColorModels[i]);
+            }
+        }
+
+        function test_colorModelEmptyModels() {
+            // Set the colorModel to empty
+            var colorModel = findChild(printPage, "colorModelSelector");
+            mockPrinting.printer.supportedColorModels = [];
+
+            waitForRendering(colorModel, timeout)
+
+            // Check that the selector becomes disabled
+            compare(colorModel.enabled, false);
+        }
+
+        function test_colorModelSingleModel() {
+            // Set the colorModel to a single entry
+            var colorModel = findChild(printPage, "colorModelSelector");
+            mockPrinting.printer.supportedColorModels = ["A"];
+
+            waitForRendering(colorModel, timeout)
+
+            // Check that the selector becomes disabled
+            compare(colorModel.enabled, false);
+        }
+
+        function test_confirm() {
+            var confirm = findChild(printPage, "confirm");
+
+            // Click the confirm button
+            mouseClick(confirm);
+
+            // Check that the confirm signal was emitted
+            confirmSpy.wait();
+            compare(confirmSpy.count, 1);
+            compare(confirmSpy.signalArguments.length, 1);
+
+            // Check the arg in the signal was the document url
+            var arg = confirmSpy.signalArguments.pop();
+            compare(arg.length, 1);
+            compare(arg[0], document.url);
+        }
+
+        function test_copies() {
+            // Check copies starting value is correct
+            var copies = findChild(printPage, "copiesTextField");
+            compare(copies.value, "1");
+
+            // Change the copies value and check the textField changes
+            mockPrinting.printerJob.copies = 5;
+            tryCompare(copies, "value", "5", timeout, "Copies value did not change");
+        }
+
+        function test_copiesKeyClick() {
+            // Check copies starting value is correct
+            var copies = findChild(printPage, "copiesTextField");
+            compare(copies.value, "1");
+
+            // Click on the textField
+            mouseClick(copies);
+
+            // Clear the current text and enter "2"
+            keyClick(Qt.Key_Backspace);
+            keyClick(Qt.Key_2);
+
+            // Check that "2" is set to the backend
+            tryCompare(copies, "value", "2", timeout, "Copies value did not change");
+            compare(mockPrinting.printerJob.copies, 2);
+        }
+
+        function test_duplex() {
+            var duplex = findChild(printPage, "duplexSelector");
+
+            // Check the duplex model length is correct
+            compare(duplex.model.length, dataDuplexModes.length);
+
+            // Check each of the options has the correct text
+            for (var i=0; i < dataDuplexModes.length; i++) {
+                var option = findChild(duplex, "option" + i);
+                compare(option.text, dataDuplexModes[i]);
+            }
+        }
+
+        function test_duplexEmptyModes() {
+            // Set the duplexModes to empty and with a multipage doc
+            var duplex = findChild(printPage, "duplexSelector");
+            document.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+            mockPrinting.printer.supportedDuplexModes = [];
+
+            // Check the selector becomes disabled
+            waitForRendering(duplex, timeout)
+            compare(duplex.enabled, false);
+        }
+        function test_duplexEnabledMultiPage() {
+            var duplex = findChild(printPage, "duplexSelector");
+
+            // Check that with single page doc duplex is disabled
+            document.url = Qt.resolvedUrl("../resources/pdf/a4_portrait.pdf");
+            compare(duplex.enabled, false);
+
+            // Check with multi page doc, duplex becomes enabled
+            document.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+            tryCompare(duplex, "enabled", true, timeout,
+                       "Duplex selected didn't become enabled when document changed");
+        }
+        function test_duplexSingleMode() {
+            // Set the duplexModes to a single entry and with a multipage doc
+            var duplex = findChild(printPage, "duplexSelector");
+            document.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+            mockPrinting.printer.supportedDuplexModes = ["A"];
+
+            // Check the selector becomes disabled
+            waitForRendering(duplex, timeout)
+            compare(duplex.enabled, false);
+        }
+
+        function testPdfMode() {
+            var objects = ["collateCheckBox", "copiesTextField",
+                           "duplexSelector", "pageRangeSelector",
+                           "pageRangeTextField", "pageRangeLabel",
+                           "colorModelSelector", "qualitySelector",
+                           "reverseCheckBox"];
+            var pageTitle = printPage.title;
+
+            // Enable pdf mode
+            mockPrinting.pdfMode = true;
+            waitForRendering(printPage, timeout);
+
+            // Check that all the selectors become disabled
+            for (var obj in objects) {
+                compare(findChild(printPage, obj).enabled, false);
+            }
+
+            // Check that the page title changes
+            verify(pageTitle !== printPage.title, "Page title did not change");
+        }
+
+        function test_printers() {
+            var printers = findChild(printPage, "printerSelector");
+
+            // Check that the printers model length is correct
+            compare(printers.model.count, dataPrinters.length);
+
+            // Check each of the options has the correct text
+            for (var i=0; i < dataPrinters.length; i++) {
+                var option = findChild(printers, "option" + i);
+                compare(option.text, dataPrinters[i]["name"]);
+            }
+        }
+
+        function test_printRangeMode() {
+            var printRangeMode = findChild(printPage, "pageRangeSelector");
+            var printRange = findChild(printPage, "pageRangeTextField");
+
+            // Check that with AllPages, printRange is not visible
+            compare(mockPrinting.printerJob.printRangeMode, PrinterEnum.AllPages);
+            compare(printRange.visible, false);
+
+            // Change to PageRange mode
+            mockPrinting.printerJob.printRangeMode = PrinterEnum.PageRange;
+
+            // Check that printRange becomes visible
+            compare(mockPrinting.printerJob.printRangeMode, PrinterEnum.PageRange);
+            tryCompare(printRange, "visible", true, timeout);
+        }
+
+        function test_quality() {
+            var quality = findChild(printPage, "qualitySelector");
+
+            // Check that the qualities model length is correct
+            compare(quality.model.length, dataPrintQualities.length);
+
+            // Check each of the options has the correct text
+            for (var i=0; i < dataPrintQualities.length; i++) {
+                var option = findChild(quality, "option" + i);
+                compare(option.text, dataPrintQualities[i]);
+            }
+        }
+
+        function test_qualityEmptyModels() {
+            // Set the qualities model to empty
+            var quality = findChild(printPage, "qualitySelector");
+            mockPrinting.printer.supportedPrintQualities = [];
+
+            // Check that the selector becomes disabled
+            waitForRendering(quality, timeout)
+            compare(quality.enabled, false);
+        }
+
+        function test_qualitySingleModel() {
+            // Set the colorModel to a single entry
+            var quality = findChild(printPage, "qualitySelector");
+            mockPrinting.printer.supportedPrintQualities = ["A"];
+
+            // Check that the selector becomes disabled
+            waitForRendering(quality, timeout)
+            compare(quality.enabled, false);
+        }
+
+        function test_reverse() {
+            // Check starting value of reverse is correct
+            var reverse = findChild(printPage, "reverseCheckBox");
+            compare(reverse.checked, false);
+
+            // Click on the checkbox
+            mouseClick(reverse);
+
+            // Check that the value of reverse has flipped
+            tryCompare(reverse, "checked", true);
+            compare(mockPrinting.printerJob.reverse, true);
+        }
+
+        function test_sheets() {
+            var printRow = findChild(printPage, "printRow");
+            compare(document.count, 1);
+            compare(mockPrinting.printerJob.copies, 1);
+            compare(mockPrinting.printerJob.isTwoSided, false);
+            compare(printRow.sheets, 1);
+
+            // Enable twoSided, we should get 0.5 rounded to 1 sheet
+            mockPrinting.printerJob.isTwoSided = true;
+
+            compare(mockPrinting.printerJob.isTwoSided, true);
+            compare(printRow.sheets, 1);
+
+            // Enable two copies, we should get 2 copies with duplex, so 1 sheet
+            mockPrinting.printerJob.copies = 2;
+
+            compare(mockPrinting.printerJob.copies, 2);
+            compare(printRow.sheets, 1);
+
+            // Disable two sided, so 2 copies and 2 sheets
+            mockPrinting.printerJob.isTwoSided = false;
+
+            compare(mockPrinting.printerJob.isTwoSided, false);
+            compare(printRow.sheets, 2);
+
+            // Change to a multi page document (3 pages, 2 copies so 6 sheets)
+            document.url = Qt.resolvedUrl("../resources/pdf/mixed_portrait.pdf");
+
+            compare(printRow.sheets, 6);
+
+            // Enable two sided, and 1 copy, check we have 3 pages, duplex so 2 sheets
+            mockPrinting.printerJob.copies = 1;
+            mockPrinting.printerJob.isTwoSided = true;
+
+            compare(printRow.sheets, 2);
+        }
+    }
+}
 
=== added file 'tests/qmltests/tst_PrintRow.qml'
--- tests/qmltests/tst_PrintRow.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/tst_PrintRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtTest 1.1
+import Ubuntu.Test 1.0
+import "../../ubuntu-printing-app/components"
+
+Item {
+    width: units.gu(100)
+    height: units.gu(75)
+
+    PrintRow {
+        id: printRow
+        anchors {
+            fill: parent
+        }
+    }
+
+    SignalSpy {
+        id: cancelSignal
+        signalName: "cancel"
+        target: printRow
+    }
+
+    SignalSpy {
+        id: confirmSignal
+        signalName: "confirm"
+        target: printRow
+    }
+
+    UbuntuTestCase {
+        name: "PrintRowTestCase"
+
+        when: windowShown
+
+
+        function init() {
+            printRow.pdfMode = false;
+            printRow.sheets = 0;
+
+            cancelSignal.clear();
+            confirmSignal.clear();
+        }
+
+        function test_clickCancel() {
+            var button = findChild(printRow, "cancel");
+            var buttonCenter = centerOf(button);
+            compare(cancelSignal.count, 0)
+
+            // Click on the cancel button
+            mouseClick(button);
+
+            // Check that the cancel signal is emitted
+            cancelSignal.wait();
+            compare(cancelSignal.count, 1)
+        }
+
+        function test_clickConfirm() {
+            var button = findChild(printRow, "confirm");
+            var buttonCenter = centerOf(button);
+            compare(confirmSignal.count, 0)
+
+            // Click on the confirm button
+            mouseClick(button);
+
+            // Check that the confirm signal is emitted
+            confirmSignal.wait();
+            compare(confirmSignal.count, 1)
+        }
+
+        function test_pdfMode() {
+            var button = findChild(printRow, "confirm");
+            var originalText = button.text;
+
+            // Change to Pdf mode
+            printRow.pdfMode = true;
+
+            // Check that the confirm button text changes
+            verify(button.text !== originalText, 1000, "Text did not change when entering PDF Mode");
+        }
+
+        function test_sheets() {
+            var button = findChild(printRow, "confirm");
+            var originalText = button.text;
+
+            // Change the number of sheets
+            printRow.sheets = 10;
+
+            // Check that the confirm button text changes
+            verify(button.text !== originalText, 1000, "Text did not change when changing sheets");
+        }
+    }
+}
 
=== added file 'tests/qmltests/tst_SelectorRow.qml'
--- tests/qmltests/tst_SelectorRow.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/tst_SelectorRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtTest 1.1
+import Ubuntu.Test 1.0
+import "../../ubuntu-printing-app/components"
+
+Item {
+    width: units.gu(100)
+    height: units.gu(75)
+
+    SelectorRow {
+        id: selectorRow
+        model: []
+    }
+
+    SignalSpy {
+        id: expansionCompletedSpy
+        signalName: "expansionCompleted"
+        target: selectorRow
+    }
+
+    SignalSpy {
+        id: selectedIndexSpy
+        signalName: "onSelectedIndexChanged"
+        target: selectorRow
+    }
+
+    SignalSpy {
+        id: selectedValueSpy
+        signalName: "onSelectedValueChanged"
+        target: selectorRow
+    }
+
+    UbuntuTestCase {
+        name: "SelectorRowTestCase"
+        when: windowShown
+
+        readonly property string dataLabelText: "Text"
+        readonly property var dataModel: ["A", "B", "C"]
+        readonly property int dataSelectedIndex: 0
+        readonly property int dataSecondarySelectedIndex: 1
+
+        function init() {
+            selectorRow.model = dataModel;
+            selectorRow.selectedIndex = dataSelectedIndex;
+            selectorRow.text = dataLabelText;
+
+            expansionCompletedSpy.clear();
+            selectedIndexSpy.clear();
+            selectedValueSpy.clear();
+
+            waitForRendering(selectorRow);
+        }
+
+        function test_changeOption() {
+            // Check selectedIndex is the starting index
+            compare(selectorRow.selectedIndex, dataSelectedIndex);
+
+            // Expand the selector
+            mouseClick(selectorRow);
+            expansionCompletedSpy.wait();
+            compare(expansionCompletedSpy.count, 1);
+
+            // Click on the secondary index
+            var option1 = findChild(selectorRow, "option" + dataSecondarySelectedIndex);
+            mouseClick(option1);
+
+            // Check that the selectedIndex is the secondaryIndex
+            selectedIndexSpy.wait();
+            compare(selectedIndexSpy.count, 1);
+            compare(selectorRow.selectedIndex, dataSecondarySelectedIndex);
+        }
+
+        function test_label() {
+            // Check that the label is correct
+            var label = findChild(selectorRow, "label");
+            compare(label.text, dataLabelText);
+        }
+
+        function test_model() {
+            // Check the model length is the starting value
+            compare(selectorRow.model.length, dataModel.length);
+
+            // Remove the last entry from the model
+            var tmpModel = dataModel;
+            tmpModel.pop();
+            selectorRow.model = tmpModel;
+
+            // Check the model length changed
+            compare(selectorRow.model.length, tmpModel.length);
+        }
+
+        function test_selectedIndex() {
+            // Check selectedIndex is the starting index
+            compare(selectorRow.selectedIndex, dataSelectedIndex);
+
+            // Change the index to the secondaryIndex
+            selectorRow.selectedIndex = dataSecondarySelectedIndex;
+
+            // Check the index changed
+            selectedIndexSpy.wait();
+            compare(selectedIndexSpy.count, 1);
+            compare(selectorRow.selectedIndex, dataSecondarySelectedIndex);
+        }
+
+        function test_selectedValue() {
+            // Check that selectedValue is the starting value
+            compare(selectorRow.selectedValue, dataModel[dataSelectedIndex]);
+
+            // Change to the secondaryIndex
+            selectorRow.selectedIndex = dataSecondarySelectedIndex;
+
+            // Check that the selectedValue changes
+            selectedValueSpy.wait();
+            compare(selectorRow.selectedValue, dataModel[dataSecondarySelectedIndex]);
+        }
+    }
+}
 
=== added file 'tests/qmltests/tst_TextFieldRow.qml'
--- tests/qmltests/tst_TextFieldRow.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/tst_TextFieldRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtTest 1.1
+import Ubuntu.Test 1.0
+import "../../ubuntu-printing-app/components"
+
+Item {
+    width: units.gu(100)
+    height: units.gu(75)
+
+    TextFieldRow {
+        id: textFieldRow
+    }
+
+    IntValidator {
+        id: intValidator
+        bottom: 1
+        top: 9
+    }
+
+    SignalSpy {
+        id: acceptableInputSpy
+        signalName: "onAcceptableInputChanged"
+        target: textFieldRow
+    }
+
+    SignalSpy {
+        id: valueSpy
+        signalName: "onValueChanged"
+        target: textFieldRow
+    }
+
+    UbuntuTestCase {
+        name: "TextFieldRowTestCase"
+        when: windowShown
+
+        readonly property bool dataEnabled: true
+        readonly property string dataPlaceholderText: "placeholder"
+
+        function init() {
+            textFieldRow.enabled = dataEnabled;
+            textFieldRow.inputMethodHints = Qt.ImhNone;
+            textFieldRow.placeholderText = dataPlaceholderText;
+            textFieldRow.text = "test";
+            textFieldRow.validator = null;
+            textFieldRow.value = "";
+
+            acceptableInputSpy.clear();
+            valueSpy.clear();
+
+            waitForRendering(textFieldRow);
+        }
+
+        function test_acceptableInput() {
+            var textField = findChild(textFieldRow, "textField");
+
+            // Set the validator to int (1-9)
+            textFieldRow.validator = intValidator;
+
+            // Set the value to an invalid value
+            textFieldRow.value = "99";
+
+            valueSpy.wait();
+            acceptableInputSpy.wait();
+
+            compare(valueSpy.count, 1);
+            compare(acceptableInputSpy.count, 1);
+
+            // Check the value was not acceptable
+            compare(textFieldRow.acceptableInput, false);
+            compare(textField.acceptableInput, false);
+
+            // Set the value to a valid value
+            textFieldRow.value = "2";
+
+            valueSpy.wait();
+            acceptableInputSpy.wait();
+
+            compare(valueSpy.count, 2);
+            compare(acceptableInputSpy.count, 2);
+
+            // Check the value was acceptable
+            compare(textFieldRow.acceptableInput, true);
+            compare(textField.acceptableInput, true);
+        }
+
+        function test_enabled() {
+            // Check textField enabled state is starting value
+            var textField = findChild(textFieldRow, "textField");
+            compare(textFieldRow.enabled, dataEnabled);
+
+            // Flip the enabled state
+            textFieldRow.enabled = !dataEnabled;
+
+            // Check that the enabled state changes
+            tryCompare(textField, "enabled", !dataEnabled);
+        }
+
+        function test_inputMethodHints() {
+            // Check that inputMethodHints is starting value
+            var textField = findChild(textFieldRow, "textField");
+            compare(textFieldRow.inputMethodHints, Qt.ImhNone);
+            compare(textField.inputMethodHints, Qt.ImhNone);
+
+            // Change the inputMethodHints mode
+            textFieldRow.inputMethodHints = Qt.ImhDigitsOnly;
+
+            // Check it changes in the textField
+            compare(textField.inputMethodHints, Qt.ImhDigitsOnly);
+        }
+
+        function test_placeholderText() {
+            // Check the placeholder text is correct
+            var textField = findChild(textFieldRow, "textField");
+            compare(textField.placeholderText, dataPlaceholderText);
+            compare(textFieldRow.placeholderText, dataPlaceholderText);
+
+            // Check that the value is not the placeholder
+            verify(textField.text !== dataPlaceholderText);
+            verify(textFieldRow.value !== dataPlaceholderText);
+        }
+
+        function test_text() {
+            // Check that the text is the correct value
+            var label = findChild(textFieldRow, "label");
+            compare(label.text, textFieldRow.text);
+        }
+
+        function test_validator() {
+            // Check that a validator can be set
+            var textField = findChild(textFieldRow, "textField");
+            textFieldRow.validator = intValidator;
+
+            compare(textField.validator, intValidator);
+        }
+
+        function test_value() {
+            // Check that the value is the starting value
+            var textField = findChild(textFieldRow, "textField");
+            compare(textFieldRow.value, "");
+            compare(textField.text, "");
+
+            // Click on the text field
+            mouseClick(textField);
+
+            // Enter "a"
+            keyPress(Qt.Key_A);
+
+            // Check that "a" is set to the value
+            valueSpy.wait();
+            compare(valueSpy.count, 1);
+            compare(textField.text, "a");
+            compare(textFieldRow.value, "a");
+        }
+    }
+}
 
=== added directory 'tests/resources'
=== added file 'tests/resources/CMakeLists.txt'
--- tests/resources/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/resources/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -0,0 +1,6 @@
+add_subdirectory(pdf)
+
+# Copy the test pdf files to the build dir
+add_custom_target(test_pdf_copyFiles ALL
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/pdf ${CMAKE_CURRENT_BINARY_DIR}/pdf
+  DEPENDS ${PDF_TEST_FILES})
 
=== added directory 'tests/resources/pdf'
=== added file 'tests/resources/pdf/CMakeLists.txt'
--- tests/resources/pdf/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/resources/pdf/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -0,0 +1,3 @@
+# Show files in QtC
+file(GLOB PDF_TEST_FILES *.pdf *.txt)
+add_custom_target(test_pdf_files ALL SOURCES ${PDF_TEST_FILES})
 
=== added file 'tests/resources/pdf/a4_portrait.pdf'
 Binary files tests/resources/pdf/a4_portrait.pdf	1970-01-01 00:00:00 +0000 and tests/resources/pdf/a4_portrait.pdf	2017-02-08 21:32:20 +0000 differ
=== added file 'tests/resources/pdf/a5_landscape.pdf'
 Binary files tests/resources/pdf/a5_landscape.pdf	1970-01-01 00:00:00 +0000 and tests/resources/pdf/a5_landscape.pdf	2017-02-08 21:32:20 +0000 differ
=== added file 'tests/resources/pdf/color.pdf'
 Binary files tests/resources/pdf/color.pdf	1970-01-01 00:00:00 +0000 and tests/resources/pdf/color.pdf	2017-02-08 21:32:20 +0000 differ
=== added file 'tests/resources/pdf/corrupt.pdf'
--- tests/resources/pdf/corrupt.pdf	1970-01-01 00:00:00 +0000
+++ tests/resources/pdf/corrupt.pdf	2017-02-08 21:32:20 +0000
@@ -0,0 +1,3 @@
+%PDF-1.4
+%äüöß
+%%EOF
 
=== added file 'tests/resources/pdf/mixed_landscape.pdf'
 Binary files tests/resources/pdf/mixed_landscape.pdf	1970-01-01 00:00:00 +0000 and tests/resources/pdf/mixed_landscape.pdf	2017-02-08 21:32:20 +0000 differ
=== added file 'tests/resources/pdf/mixed_portrait.pdf'
 Binary files tests/resources/pdf/mixed_portrait.pdf	1970-01-01 00:00:00 +0000 and tests/resources/pdf/mixed_portrait.pdf	2017-02-08 21:32:20 +0000 differ
=== added file 'tests/resources/pdf/test_title.pdf'
 Binary files tests/resources/pdf/test_title.pdf	1970-01-01 00:00:00 +0000 and tests/resources/pdf/test_title.pdf	2017-02-08 21:32:20 +0000 differ
=== added file 'tests/resources/pdf/text.txt'
=== added directory 'tests/unittests'
=== added file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(backend)
 
=== added directory 'tests/unittests/backend'
=== added file 'tests/unittests/backend/CMakeLists.txt'
--- tests/unittests/backend/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/backend/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -0,0 +1,19 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/backend/
+)
+
+find_package(Qt5Test REQUIRED)
+
+add_executable(testDocument tst_document.cpp ${PDF_TEST_FILES})
+target_link_libraries(testDocument UbuntuPrintingAppbackend Qt5::Test Qt5::Gui)
+add_test(tst_document testDocument)
+
+add_executable(testPageHelper tst_pagehelper.cpp ${PDF_TEST_FILES})
+target_link_libraries(testPageHelper UbuntuPrintingAppbackend Qt5::Test Qt5::Gui)
+add_test(tst_pagehelper testPageHelper)
+
+add_executable(testPopplerImageProvider tst_popplerimageprovider.cpp ${PDF_TEST_FILES})
+target_link_libraries(testPopplerImageProvider UbuntuPrintingAppbackend Qt5::Test Qt5::Gui)
+add_test(tst_popplerimageprovider testPopplerImageProvider)
 
=== added file 'tests/unittests/backend/tst_document.cpp'
--- tests/unittests/backend/tst_document.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/backend/tst_document.cpp	2017-02-08 21:32:20 +0000
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+
+#include <QDebug>
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+#include "UbuntuPrintingApp/document.h"
+
+#define A4_PORTRAIT_SIZE QSize(595, 842)
+#define A4_LANDSCAPE_SIZE QSize(842, 595)
+#define A5_LANDSCAPE_SIZE QSize(595, 420)
+
+#define INVALID_IMAGE_SIZE QSize(0, 0)
+#define VALID_IMAGE_SIZE QSize(100, 100)
+
+Q_DECLARE_METATYPE(Document::Errors)
+
+class TestDocument : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void init()
+    {
+        qRegisterMetaType<Document::Errors>("Errors");
+
+        m_document = new Document();
+    }
+    void cleanup()
+    {
+        QSignalSpy destroyedSpy(m_document, SIGNAL(destroyed(QObject*)));
+        m_document->deleteLater();
+        QTRY_COMPARE(destroyedSpy.count(), 1);
+    }
+    QUrl getResourceUrl(const QString &resource) const
+    {
+        return QUrl("file://" + QDir::currentPath() + "/../../resources/pdf/" + resource);
+    }
+
+    void testInit()
+    {
+        QCOMPARE(m_document->count(), 0);
+        QCOMPARE(m_document->getPageSize(0), QSizeF());
+        QCOMPARE(m_document->getPageSize(0).isValid(), false);
+        QCOMPARE(m_document->orientation(), Document::Portrait);
+        QCOMPARE(m_document->title(), QStringLiteral(""));
+        QCOMPARE(m_document->url(), QUrl(QStringLiteral("")));
+    }
+
+    void testCountSinglePage()
+    {
+        QSignalSpy countSpy(m_document, SIGNAL(countChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(countSpy.count(), 1);
+        QCOMPARE(m_document->count(), 1);
+    }
+    void testCountMultiPage()
+    {
+        QSignalSpy countSpy(m_document, SIGNAL(countChanged()));
+        m_document->setUrl(getResourceUrl("mixed_portrait.pdf"));
+        QTRY_COMPARE(countSpy.count(), 1);
+        QCOMPARE(m_document->count(), 3);
+    }
+
+    void testGetPageSizeA4()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+        // Use QSize to compare otherwise double's will be slightly different
+        QCOMPARE(m_document->getPageSize(0).toSize(), A4_PORTRAIT_SIZE);
+    }
+    void testGetPageSizeMixed()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("mixed_portrait.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+        // Use QSize to compare otherwise double's will be slightly different
+        QCOMPARE(m_document->getPageSize(0).toSize(), A4_PORTRAIT_SIZE);
+
+        // Check that second page size is landscape as this is a mixed document
+        QCOMPARE(m_document->getPageSize(1).toSize(), A4_LANDSCAPE_SIZE);
+    }
+    void testGetPageSizeA5Landscape()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a5_landscape.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+        // Use QSize to compare otherwise double's will be slightly different
+        QCOMPARE(m_document->getPageSize(0).toSize(), A5_LANDSCAPE_SIZE);
+    }
+
+    void testMakeImage()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+
+        QImage image = m_document->makeImage(VALID_IMAGE_SIZE, 0);
+        QCOMPARE(image.isNull(), false);
+        QCOMPARE(image.size(), VALID_IMAGE_SIZE);
+    }
+    void testMakeImageInvalidDocument()
+    {
+        QImage image = m_document->makeImage(VALID_IMAGE_SIZE, 0);
+        QCOMPARE(image.isNull(), true);
+    }
+    void testMakeImageInvalidPage()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+
+        QImage image = m_document->makeImage(VALID_IMAGE_SIZE, 1000);
+        QCOMPARE(image.isNull(), true);
+    }
+    void testMakeImageInvalidSize()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+
+        QImage image = m_document->makeImage(INVALID_IMAGE_SIZE, 0);
+        QCOMPARE(image.isNull(), true);
+    }
+    void testMakeImageNegativePage()
+    {
+        QImage image = m_document->makeImage(VALID_IMAGE_SIZE, -1);
+        QCOMPARE(image.isNull(), true);
+    }
+    void testMakeImageInvalidRenderToImage()
+    {
+        QSKIP("TODO: need to have a test to hit the case where renderToImage returns a null image");
+    }
+
+
+    void testMakeImageToFit()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+
+        QImage image = m_document->makeImageToFit(VALID_IMAGE_SIZE, 0, true);
+        QCOMPARE(image.isNull(), false);
+        QCOMPARE(image.size(), VALID_IMAGE_SIZE);
+    }
+    void testMakeImageToFitColor()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("color.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+
+        QImage image = m_document->makeImageToFit(VALID_IMAGE_SIZE, 0, true);
+        QCOMPARE(image.isNull(), false);
+        QCOMPARE(image.size(), VALID_IMAGE_SIZE);
+        QCOMPARE(image.isGrayscale(), false);
+    }
+    void testMakeImageToFitGrayscale()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("color.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+
+        QImage image = m_document->makeImageToFit(VALID_IMAGE_SIZE, 0, false);
+        QCOMPARE(image.isNull(), false);
+        QCOMPARE(image.size(), VALID_IMAGE_SIZE);
+        QCOMPARE(image.isGrayscale(), true);
+    }
+    void testMakeImageToFitInvalidDocument()
+    {
+        QImage image = m_document->makeImageToFit(VALID_IMAGE_SIZE, 0, true);
+        QCOMPARE(image.isNull(), true);
+    }
+    void testMakeImageToFitInvalidPage()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+
+        QImage image = m_document->makeImageToFit(VALID_IMAGE_SIZE, 1000, true);
+        QCOMPARE(image.isNull(), true);
+    }
+    void testMakeImageToFitInvalidSize()
+    {
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+
+        QImage image = m_document->makeImageToFit(INVALID_IMAGE_SIZE, 0, true);
+        QCOMPARE(image.isNull(), true);
+    }
+    void testMakeImageToFitNegativePage()
+    {
+        QImage image = m_document->makeImageToFit(VALID_IMAGE_SIZE, -1, true);
+        QCOMPARE(image.isNull(), true);
+    }
+
+
+    void testOrientationPortrait()
+    {
+        QSignalSpy orientationSpy(m_document, SIGNAL(orientationChanged()));
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(orientationSpy.count(), 1);
+        QCOMPARE(m_document->orientation(), Document::Orientation::Portrait);
+    }
+    void testOrientationLandscape()
+    {
+        QSignalSpy orientationSpy(m_document, SIGNAL(orientationChanged()));
+        m_document->setUrl(getResourceUrl("a5_landscape.pdf"));
+        QTRY_COMPARE(orientationSpy.count(), 1);
+        QCOMPARE(m_document->orientation(), Document::Orientation::Landscape);
+    }
+    void testOrientationMixedPortrait()
+    {
+        QSignalSpy orientationSpy(m_document, SIGNAL(orientationChanged()));
+        m_document->setUrl(getResourceUrl("mixed_portrait.pdf"));
+        QTRY_COMPARE(orientationSpy.count(), 1);
+        QCOMPARE(m_document->orientation(), Document::Orientation::Portrait);
+    }
+    void testOrientationMixedLandscape()
+    {
+        QSignalSpy orientationSpy(m_document, SIGNAL(orientationChanged()));
+        m_document->setUrl(getResourceUrl("mixed_landscape.pdf"));
+        QTRY_COMPARE(orientationSpy.count(), 1);
+        QCOMPARE(m_document->orientation(), Document::Orientation::Landscape);
+    }
+
+    void testTitle()
+    {
+        QSignalSpy titleSpy(m_document, SIGNAL(titleChanged()));
+        m_document->setUrl(getResourceUrl("test_title.pdf"));
+        QTRY_COMPARE(titleSpy.count(), 1);
+        QCOMPARE(m_document->title(), QStringLiteral("Test Title Document"));
+    }
+
+    void testUrl()
+    {
+        QSignalSpy errorSpy(m_document, SIGNAL(error(Document::Errors)));
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+
+        QUrl resource = getResourceUrl("a4_portrait.pdf");
+
+        m_document->setUrl(resource);
+        QTRY_COMPARE(urlSpy.count(), 1);
+        QCOMPARE(errorSpy.count(), 0);
+        QCOMPARE(m_document->url(), resource);
+    }
+    void testUrlNotFound()
+    {
+        QSignalSpy errorSpy(m_document, SIGNAL(error(Document::Errors)));
+        m_document->setUrl(getResourceUrl("notfound.pdf"));
+        QTRY_COMPARE(errorSpy.count(), 1);
+        QCOMPARE(m_document->url(), QUrl(QStringLiteral("")));
+
+        QList<QVariant> args = errorSpy.takeFirst();
+        QCOMPARE(args.at(0).toInt(), (int) Document::Errors::ErrorNotFound);
+    }
+    void testUrlNotPdf()
+    {
+        QSignalSpy errorSpy(m_document, SIGNAL(error(Document::Errors)));
+        m_document->setUrl(getResourceUrl("text.txt"));
+        QTRY_COMPARE(errorSpy.count(), 1);
+        QCOMPARE(m_document->url(), QUrl(QStringLiteral("")));
+
+        QList<QVariant> args = errorSpy.takeFirst();
+        QCOMPARE(args.at(0).toInt(), (int) Document::Errors::ErrorNotPdf);
+    }
+    void testUrlInvalidDocument()
+    {
+        QSignalSpy errorSpy(m_document, SIGNAL(error(Document::Errors)));
+        m_document->setUrl(getResourceUrl("corrupt.pdf"));
+        QTRY_COMPARE(errorSpy.count(), 1);
+        QCOMPARE(m_document->url(), QUrl(QStringLiteral("")));
+
+        QList<QVariant> args = errorSpy.takeFirst();
+        QCOMPARE(args.at(0).toInt(), (int) Document::Errors::ErrorDocumentInvalid);
+    }
+private:
+    Document *m_document;
+};
+
+QTEST_GUILESS_MAIN(TestDocument)
+#include "tst_document.moc"
 
=== added file 'tests/unittests/backend/tst_pagehelper.cpp'
--- tests/unittests/backend/tst_pagehelper.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/backend/tst_pagehelper.cpp	2017-02-08 21:32:20 +0000
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+
+#include <QDebug>
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+#include "UbuntuPrintingApp/document.h"
+#include "UbuntuPrintingApp/pagehelper.h"
+
+#define A4_PORTRAIT_ASPECT_RATIO 595.0 / 842.0
+#define A4_LANDSCAPE_ASPECT_RATIO 842.0 / 595.0
+#define A5_LANDSCAPE_ASPECT_RATIO 595.0 / 420.0
+
+class TestPageHelper : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void init()
+    {
+        m_document = new Document();
+        m_page_helper = new PageHelper();
+        m_page_helper->setDocument(m_document);
+    }
+    void cleanup()
+    {
+        QSignalSpy destroyedPageHelperSpy(m_page_helper, SIGNAL(destroyed(QObject*)));
+        m_page_helper->deleteLater();
+        QTRY_COMPARE(destroyedPageHelperSpy.count(), 1);
+
+        QSignalSpy destroyedDocumentSpy(m_document, SIGNAL(destroyed(QObject*)));
+        m_document->deleteLater();
+        QTRY_COMPARE(destroyedDocumentSpy.count(), 1);
+    }
+    QUrl getResourceUrl(const QString &resource) const
+    {
+        return QUrl("file://" + QDir::currentPath() + "/../../resources/pdf/" + resource);
+    }
+
+    void testInit()
+    {
+        QCOMPARE(m_page_helper->aspect(), A4_PORTRAIT_ASPECT_RATIO);
+        QCOMPARE(m_page_helper->document(), m_document);
+        QCOMPARE(m_page_helper->page(), 0);
+    }
+
+    void testAspect()
+    {
+        QSignalSpy aspectSpy(m_page_helper, SIGNAL(aspectChanged()));
+        m_document->setUrl(getResourceUrl("a5_landscape.pdf"));
+        QTRY_COMPARE(aspectSpy.count(), 1);
+        QCOMPARE(m_page_helper->aspect(), A5_LANDSCAPE_ASPECT_RATIO);
+    }
+    void testAspectA4Document()
+    {
+        QSignalSpy aspectSpy(m_page_helper, SIGNAL(aspectChanged()));
+        m_document->setUrl(getResourceUrl("a5_landscape.pdf"));
+        QTRY_COMPARE(aspectSpy.count(), 1);
+        QCOMPARE(m_page_helper->aspect(), A5_LANDSCAPE_ASPECT_RATIO);
+
+        m_document->setUrl(getResourceUrl("a4_portrait.pdf"));
+        QTRY_COMPARE(aspectSpy.count(), 2);
+        QCOMPARE(m_page_helper->aspect(), A4_PORTRAIT_ASPECT_RATIO);
+    }
+    void testAspectFallsBack()
+    {
+        QSignalSpy aspectSpy(m_page_helper, SIGNAL(aspectChanged()));
+        m_document->setUrl(getResourceUrl("a5_landscape.pdf"));
+        QTRY_COMPARE(aspectSpy.count(), 1);
+        QCOMPARE(m_page_helper->aspect(), A5_LANDSCAPE_ASPECT_RATIO);
+
+        // Test when set to a new document that it goes back to A4
+        Document *newDoc = new Document();
+        m_page_helper->setDocument(newDoc);
+        QTRY_COMPARE(aspectSpy.count(), 2);
+        QCOMPARE(m_page_helper->aspect(), A4_PORTRAIT_ASPECT_RATIO);
+
+        newDoc->deleteLater();
+    }
+
+    void testDocument()
+    {
+        QSignalSpy documentSpy(m_page_helper, SIGNAL(documentChanged()));
+        Document *newDoc = new Document();
+        m_page_helper->setDocument(newDoc);
+        QTRY_COMPARE(documentSpy.count(), 1);
+        QCOMPARE(m_page_helper->document(), newDoc);
+    }
+    void testDocumentDisconnect()
+    {
+        QSignalSpy documentSpy(m_page_helper, SIGNAL(documentChanged()));
+        Document *newDoc = new Document();
+        m_page_helper->setDocument(newDoc);
+        QTRY_COMPARE(documentSpy.count(), 1);
+        QCOMPARE(m_page_helper->document(), newDoc);
+
+        // Check that changing the old document doesn't cause signals that were
+        // linked to be fired - eg loading of aspect
+        QSignalSpy aspectSpy(m_page_helper, SIGNAL(aspectChanged()));
+        QSignalSpy urlSpy(m_document, SIGNAL(urlChanged()));
+        m_document->setUrl(getResourceUrl("a5_landscape.pdf"));
+        QTRY_COMPARE(urlSpy.count(), 1);
+        QCOMPARE(aspectSpy.count(), 0);
+
+        newDoc->deleteLater();
+    }
+
+    void testDocumentUrlChange()
+    {
+        QSignalSpy aspectSpy(m_page_helper, SIGNAL(aspectChanged()));
+        m_document->setUrl(getResourceUrl("a5_landscape.pdf"));
+        QTRY_COMPARE(aspectSpy.count(), 1);
+
+        QCOMPARE(m_page_helper->aspect(), A5_LANDSCAPE_ASPECT_RATIO);
+    }
+
+    void testPageMixedLandscape()
+    {
+        QSignalSpy aspectSpy(m_page_helper, SIGNAL(aspectChanged()));
+        QSignalSpy pageSpy(m_page_helper, SIGNAL(pageChanged()));
+        m_document->setUrl(getResourceUrl("mixed_landscape.pdf"));
+        QTRY_COMPARE(aspectSpy.count(), 1);
+        QCOMPARE(m_page_helper->page(), 0);
+        QCOMPARE(m_page_helper->aspect(), A4_LANDSCAPE_ASPECT_RATIO);
+
+        m_page_helper->setPage(1);
+        QTRY_COMPARE(pageSpy.count(), 1);
+        QCOMPARE(m_page_helper->page(), 1);
+        QTRY_COMPARE(aspectSpy.count(), 2);
+        QCOMPARE(m_page_helper->aspect(), A4_PORTRAIT_ASPECT_RATIO);
+    }
+    void testPageMixedPortrait()
+    {
+        QSignalSpy aspectSpy(m_page_helper, SIGNAL(aspectChanged()));
+        QSignalSpy pageSpy(m_page_helper, SIGNAL(pageChanged()));
+        m_document->setUrl(getResourceUrl("mixed_portrait.pdf"));
+        QCOMPARE(aspectSpy.count(), 0);
+        QCOMPARE(m_page_helper->aspect(), A4_PORTRAIT_ASPECT_RATIO);
+
+        m_page_helper->setPage(1);
+        QTRY_COMPARE(pageSpy.count(), 1);
+        QCOMPARE(m_page_helper->page(), 1);
+        QTRY_COMPARE(aspectSpy.count(), 1);
+        QCOMPARE(m_page_helper->aspect(), A4_LANDSCAPE_ASPECT_RATIO);
+    }
+
+private:
+    Document *m_document;
+    PageHelper *m_page_helper;
+};
+
+QTEST_GUILESS_MAIN(TestPageHelper)
+#include "tst_pagehelper.moc"
 
=== added file 'tests/unittests/backend/tst_popplerimageprovider.cpp'
--- tests/unittests/backend/tst_popplerimageprovider.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/backend/tst_popplerimageprovider.cpp	2017-02-08 21:32:20 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+
+#include <QDebug>
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+#include "UbuntuPrintingApp/popplerimageprovider.h"
+
+class TestPopplerImageProvider : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void init()
+    {
+        m_provider = new PopplerImageProvider();
+    }
+    void cleanup()
+    {
+        delete m_provider;
+    }
+    QUrl getResourceUrl(const QString &resource) const
+    {
+        return QUrl("file://" + QDir::currentPath() + "/../../resources/pdf/" + resource);
+    }
+
+    void testRequestImage()
+    {
+        QString id = "0/true/" + getResourceUrl("color.pdf").toString();
+        QSize *size = new QSize();
+        QSize requestedSize(250, 250);
+
+        QImage result = m_provider->requestImage(id, size, requestedSize);
+
+        QCOMPARE(result.isNull(), false);
+        QCOMPARE(result.size(), requestedSize);
+        QCOMPARE(*size, requestedSize);
+        QCOMPARE(result.isGrayscale(), false);
+    }
+    void testRequestImageGrayscale()
+    {
+        QString id = "0/false/" + getResourceUrl("color.pdf").toString();
+        QSize *size = new QSize();
+        QSize requestedSize(250, 250);
+
+        QImage result = m_provider->requestImage(id, size, requestedSize);
+
+        QCOMPARE(result.isNull(), false);
+        QCOMPARE(result.size(), requestedSize);
+        QCOMPARE(*size, requestedSize);
+        QCOMPARE(result.isGrayscale(), true);
+    }
+    void testRequestImageMultiPage()
+    {
+        // TODO: is there a way we can confirm that the image is showing the 2nd page?
+        QString id = "1/true/" + getResourceUrl("mixed_portrait.pdf").toString();
+        QSize *size = new QSize();
+        QSize requestedSize(250, 250);
+
+        QImage result = m_provider->requestImage(id, size, requestedSize);
+
+        QCOMPARE(result.isNull(), false);
+        QCOMPARE(result.size(), requestedSize);
+        QCOMPARE(*size, requestedSize);
+        QCOMPARE(result.isGrayscale(), true);
+    }
+
+    void testRequestImageInvalidColor()
+    {
+        QString id = "0/abc/" + getResourceUrl("a4_portrait.pdf").toString();
+        QSize *size = new QSize();
+        QSize requestedSize(250, 250);
+
+        QImage result = m_provider->requestImage(id, size, requestedSize);
+
+        QCOMPARE(result.isNull(), true);
+        QCOMPARE((*size), requestedSize);
+    }
+    void testRequestImageInvalidPage()
+    {
+        QString id = "1000/true/" + getResourceUrl("a4_portrait.pdf").toString();
+        QSize *size = new QSize();
+        QSize requestedSize(250, 250);
+
+        QImage result = m_provider->requestImage(id, size, requestedSize);
+
+        QCOMPARE(result.isNull(), true);
+        QCOMPARE((*size), requestedSize);
+    }
+    void testRequestImageInvalidRequestedSize()
+    {
+        QString id = "0/true/" + getResourceUrl("a4_portrait.pdf").toString();
+        QSize *size = new QSize();
+        QSize requestedSize(-100, -50);
+
+        QImage result = m_provider->requestImage(id, size, requestedSize);
+
+        // An invalid request size returns a size of 1,1 otherwise QML errors occur
+        QCOMPARE(result.isNull(), false);
+        QCOMPARE(result.size(), QSize(1, 1));
+        QCOMPARE((*size), QSize(1, 1));
+    }
+
+private:
+    PopplerImageProvider *m_provider;
+};
+
+QTEST_GUILESS_MAIN(TestPopplerImageProvider)
+#include "tst_popplerimageprovider.moc"
 
=== modified file 'ubuntu-printing-app/CMakeLists.txt'
--- ubuntu-printing-app/CMakeLists.txt	2016-12-13 23:08:52 +0000
+++ ubuntu-printing-app/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -1,4 +1,5 @@
 add_subdirectory(components)
+add_subdirectory(pages)
 
 # Install Main.qml and icon
 install(FILES ${MAIN_QML} DESTINATION ${UBUNTU_PRINTING_APP_DATA_DIR})
@@ -23,6 +24,6 @@
 
 # Show in QtCreator
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  file(GLOB MAIN_QML_JS_FILES *.qml *.js)
+  file(GLOB MAIN_QML_JS_FILES *.apparmor *.js *.json *.qml)
   add_custom_target(ubuntu_printing_app_main_qml_js_files ALL SOURCES ${MAIN_QML_JS_FILES})
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
=== modified file 'ubuntu-printing-app/Main.qml'
--- ubuntu-printing-app/Main.qml	2016-12-13 12:37:45 +0000
+++ ubuntu-printing-app/Main.qml	2017-02-08 21:32:20 +0000
@@ -1,10 +1,31 @@
+/*
+ * Copyright 2016, 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: 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.Content 0.1
-import Ubuntu_Printing_App 1.0
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Content 1.1
+import UbuntuPrintingApp 1.0
+import Ubuntu.Settings.Printers 0.1
 
 import "components"
 
@@ -18,295 +39,106 @@
     objectName: "mainView"
 
     // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "ubuntu-printing-app.ahayzen"
-
-    width: units.gu(40)
-    height: units.gu(60)
-
-    Connections {
-        target: ContentHub
-
-        onImportRequested: {
-            console.debug("State:", transfer.state)
-            console.debug("Transfer:", transfer)
-            console.debug("Items:", transfer.items)
-
-            for (var i=0; i < transfer.items.length; i++) {
-                var item = transfer.items[i];
-
-                document.url = item.url;
-                console.debug("Item URL:", item.url);
-            }
-        }
-    }
-
-    Printer {
-        id: printer
-        name: PrinterInfo.defaultPrinterName
-
-        // TODO: status ?
-
-        onExportRequest: console.debug("Export requested!", filepath)
-    }
+    applicationName: "ubuntu-printing-app"
+
+    width: units.gu(45)
+    height: units.gu(70)
 
     Document {
         id: document
-    }
-
-    /*
-    PrinterInfo.availablePrinterNames
-
-    PrinterInfo.defaultName
-
-    Printer {
-      error: false
-      errorString: ""
-      name: PrinterInfo.defaultName
-
-      colorMode: ColorModes.greyscale
-      copies: 2
-
-      print(Document document)  // async
-
-      status: {Null,Rendering,SentToPrinter,Error}
-      progress: 0.6  // progress of print
-    }
-
-    Document {
-        error: false
-        errorString: ""
-        url: "/tmp/my.pdf"
-    }
-
-    */
-
-    Page {
-        id: page
+
+        onError: {
+            var errorString;
+
+            switch (errorType) {
+            case Document.ErrorDocumentInvalid:
+                errorString = i18n.tr("Document is invalid");
+                break;
+            case Document.ErrorNotFound:
+                errorString = i18n.tr("Document not found");
+                break;
+            case Document.ErrorNotPdf:
+                errorString = i18n.tr("Not a PDF document");
+                break;
+            default:
+                errorString = i18n.tr("An unknown error occurred");
+                break;
+            }
+
+            // Empty the Url so user cannot print
+            url = "";
+
+            PopupUtils.open(
+                Qt.resolvedUrl("components/AlertDialog.qml"),
+                pageStack.currentPage,
+                {
+                    "text": errorString,
+                    "title": i18n.tr("Error"),
+                }
+            )
+        }
+    }
+
+    property PrintingHelper printing: PrintingHelper {}
+    property Page printPage: null
+
+    PageStack {
+        id: pageStack
         anchors {
             fill: parent
         }
-        width: mainView.width
-
-        header: PageHeader {
-            id: pageHeader
-            leadingActionBar {
-                actions: [
-                    Action {
-                        iconName: "back"
-
-                        onTriggered: Qt.quit()
-                    }
-                ]
-            }
-
-            title: printer.pdfMode ? i18n.tr("Page Setup") : i18n.tr("Printer Options")
-        }
-
-        ScrollView {
-            anchors {
-                bottom: printRow.top
-                left: parent.left
-                right: parent.right
-                top: page.header.bottom
-            }
-
-            Item {
-                height: columnLayout.height + units.gu(2)
-                width: mainView.width - units.gu(2)
-                x: units.gu(1)
-                y: x
-
-                ColumnLayout {
-                    id: columnLayout
-                    spacing: units.gu(1)
-                    width: parent.width
-
-                    Rectangle {
-                        anchors {
-                            left: parent.left
-                            right: parent.right
-                        }
-                        color: "#EEE"
-                        implicitHeight: units.gu(25)
-
-                        RowLayout {
-                            anchors.fill: parent
-
-                            Button {
-                                enabled: previewImage.pageNumber > 0
-                                Layout.preferredWidth: units.gu(4)
-                                color: "#000"
-                                text: "<"
-
-                                onClicked: previewImage.pageNumber--
-                            }
-
-                            Item {
-                                Layout.fillWidth: true
-                                Layout.preferredHeight: units.gu(25)
-
-                                Image {
-                                    id: previewImage
-                                    anchors {
-                                        fill: parent
-                                    }
-
-                                    asynchronous: true
-                                    source: document.url.toString() !== "" ? "image://poppler/" + pageNumber + "/" + printer.colorMode + "/" + document.url : ""
-                                    sourceSize {
-                                        height: units.gu(25)
-                                        width: previewImage.width
-                                    }
-
-                                    property int pageNumber: 0
-                                }
-
-                                ActivityIndicator {
-                                    anchors {
-                                        centerIn: parent
-                                    }
-                                    running: previewImage.status == Image.Loading
-                                }
-                            }
-
-                            Button {
-                                color: "#000"
-                                enabled: previewImage.pageNumber < document.count - 1
-                                Layout.preferredWidth: units.gu(4)
-                                text: ">"
-
-                                onClicked: previewImage.pageNumber++
-                            }
-                        }
-                    }
-
-
-                    SelectorRow {
-                        model: PrinterInfo.availablePrinterNames
-                        selectedIndex: model.indexOf(printer.name)
-                        text: i18n.tr("Printer")
-
-                        onSelectedIndexChanged: {
-                            printer.pdfMode = selectedIndex === model.length - 1
-                            printer.name = model[selectedIndex]
-                        }
-                    }
-
-                    RowLayout {
-                        Label {
-                            Layout.preferredWidth: units.gu(10)
-                            text: i18n.tr("Copies")
-                        }
-
-                        TextField {
-                            enabled: !printer.pdfMode
-                            inputMethodHints: Qt.ImhDigitsOnly
-                            Layout.fillWidth: true
-                            Layout.preferredWidth: units.gu(5)
-                            text: printer.copies
-                            validator: IntValidator {
-                                bottom: 1
-                                top: 999
-                            }
-
-                            // TODO: acceptableInput is False show hint
-
-                            onTextChanged: {
-                                if (acceptableInput) {
-                                    printer.copies = Number(text);
-                                }
-                            }
-                        }
-                    }
-
-                    RowLayout {
-                        Item {
-                            Layout.preferredWidth: units.gu(10)
-                        }
-
-                        MouseArea {
-                            enabled: checkbox.enabled
-                            Layout.fillWidth: true
-                            Layout.preferredHeight: units.gu(3)
-                            Layout.preferredWidth: units.gu(10)
-
-                            onClicked: checkbox.checked = !checkbox.checked
-
-                            Row {
-                                anchors {
-                                    fill: parent
-                                }
-                                spacing: units.gu(1)
-
-                                CheckBox {
-                                    id: checkbox
-                                    anchors {
-                                        verticalCenter: parent.verticalCenter
-                                    }
-                                    checked: printer.duplex
-                                    enabled: document.count > 1 && printer.duplexSupported
-
-                                    onCheckedChanged: printer.duplex = checked
-                                }
-
-                                Label {
-                                    enabled: document.count > 1
-                                    height: parent.height
-                                    text: i18n.tr("Two-Sided")
-                                    verticalAlignment: Text.AlignVCenter
-                                }
-                            }
-
-                        }
-                    }
-
-                    SelectorRow {
-                        enabled: !printer.pdfMode
-                        model: [i18n.tr("Black & White"), i18n.tr("Color")]
-                        selectedIndex: modelValue.indexOf(printer.colorMode)
-                        text: i18n.tr("Color")
-
-                        property var modelValue: [Printer.GrayScale, Printer.Color]
-
-                        onSelectedIndexChanged: printer.colorMode = modelValue[selectedIndex]
-                    }
-
-                    SelectorRow {
-                        enabled: !printer.pdfMode
-                        model: [i18n.tr("Draft"), i18n.tr("Normal"), i18n.tr("Best"), i18n.tr("Photo")]
-                        selectedIndex: modelValue.indexOf(printer.quality)
-                        text: i18n.tr("Quality")
-
-                        property var modelValue: [Printer.Draft, Printer.Normal, Printer.Best, Printer.Photo]
-
-                        onSelectedIndexChanged: printer.quality = modelValue[selectedIndex]
-                    }
-                }
-            }
-        }
-
-        PrintRow {
-            id: printRow
-            anchors {
-                bottom: parent.bottom
-                left: parent.left
-                leftMargin: units.gu(1)
-                right: parent.right
-                rightMargin: units.gu(1)
-            }
-            pdfMode: printer.pdfMode
-            sheets: document.count
-
-            onCancel: Qt.quit()
-            onConfirm: printer.print(document);  // TODO: check document is valid raise error if not?
+    }
+
+    Arguments {
+        id: args
+        Argument {
+            name: "url"
+            help: i18n.tr("URL of PDF to print")
+            required: false
+            valueNames: ["url"]
+        }
+    }
+
+    Connections {
+        target: ContentHub
+
+        onImportRequested: {
+            // FIXME: Only uses the first item given over content-hub
+            // do we need to support multiple items in the future?
+            if (transfer.items.length > 0) {
+                document.url = transfer.items[0].url;
+            }
+        }
+    }
+
+    Connections {
+        target: printPage
+
+        onCancel: Qt.quit()
+        onConfirm: {
+            if (printing.pdfMode) {
+                pageStack.push(Qt.resolvedUrl("pages/ContentPeerPickerPage.qml"), {"url": url});
+            } else {
+                printing.printerJob.printFile(url);
+                Qt.quit();
+            }
         }
     }
 
     Component.onCompleted: {
-//        document.url = Qt.resolvedUrl("/home/andy/Workspace/Work/Canonical/dump/2016-11-17T12:00:08");
-        document.url = Qt.resolvedUrl("/home/andrew/Downloads/UbuntuPhone.pdf");
-//        document.url = Qt.resolvedUrl("/home/andrew/Documents/test.pdf");
-        console.debug("Printers:", PrinterInfo.availablePrinterNames);
+        printing.printerJob.landscape = document.orientation === Document.Landscape;
+        printing.printerJob.title = document.title || document.url.toString().split("/").pop();
+        printPage = pageStack.push(
+            Qt.resolvedUrl("pages/PrintPage.qml"),
+            {
+                "currentDocument": document,
+                "printing": printing,
+            }
+        );
+
+        if (args.values.url) {
+            document.url = Qt.resolvedUrl(args.values.url);
+        }
     }
 }
 
 
=== added file 'ubuntu-printing-app/components/AlertDialog.qml'
--- ubuntu-printing-app/components/AlertDialog.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-printing-app/components/AlertDialog.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+Dialog {
+    id: dialog
+
+    Button {
+        text: i18n.tr("OK")
+
+        onClicked: PopupUtils.close(dialog)
+    }
+}
 
=== modified file 'ubuntu-printing-app/components/CMakeLists.txt'
--- ubuntu-printing-app/components/CMakeLists.txt	2016-12-13 23:08:52 +0000
+++ ubuntu-printing-app/components/CMakeLists.txt	2017-02-08 21:32:20 +0000
@@ -1,7 +1,12 @@
 set(COMPONENT_QML_JS_FILES
-    ExpandableListItem.qml
+    AlertDialog.qml
+    CheckBoxRow.qml
+    LabelRow.qml
+    PreviewRow.qml
     PrintRow.qml
+    PrintingHelper.qml
     SelectorRow.qml
+    TextFieldRow.qml
 )
 
 install(FILES ${COMPONENT_QML_JS_FILES} DESTINATION ${UBUNTU_PRINTING_APP_DATA_DIR}/components)
 
=== added file 'ubuntu-printing-app/components/CheckBoxRow.qml'
--- ubuntu-printing-app/components/CheckBoxRow.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-printing-app/components/CheckBoxRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+
+import Ubuntu.Components 1.3
+
+RowLayout {
+    anchors {
+        left: parent.left
+        leftMargin: units.gu(2)
+        right: parent.right
+        rightMargin: units.gu(2)
+    }
+    Layout.maximumWidth: width
+
+    property alias checked: checkbox.checked
+    property alias checkboxText: checkboxLabel.text
+    property alias enabled: checkbox.enabled
+    property alias text: label.text
+
+    Label {
+        id: label
+        Layout.preferredWidth: units.gu(10)
+        objectName: "label"
+    }
+
+    MouseArea {
+        enabled: checkbox.enabled
+        Layout.fillWidth: true
+        Layout.preferredHeight: units.gu(3)
+        Layout.preferredWidth: units.gu(10)
+
+        onClicked: checkbox.checked = !checkbox.checked
+
+        Row {
+            anchors {
+                fill: parent
+            }
+            spacing: units.gu(1)
+
+            CheckBox {
+                id: checkbox
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                }
+                objectName: "checkbox"
+            }
+
+            Label {
+                id: checkboxLabel
+                enabled: checkbox.enabled
+                height: parent.height
+                objectName: "checkboxLabel"
+                verticalAlignment: Text.AlignVCenter
+            }
+        }
+    }
+}
 
=== removed file 'ubuntu-printing-app/components/ExpandableListItem.qml'
--- ubuntu-printing-app/components/ExpandableListItem.qml	2016-11-25 16:47:10 +0000
+++ ubuntu-printing-app/components/ExpandableListItem.qml	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2015-2016 Canonical Ltd
- *
- * This file is part of Ubuntu Weather App
- *
- * Ubuntu Weather App is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Ubuntu Weather App 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-/*
- Component which extends the SDK Expandable list item and provides a easy
- to use component where the title, subtitle and a listview can be displayed. It
- matches the design specification provided for clock.
-*/
-
-ListItem {
-    id: expandableListItem
-
-    // Public APIs
-    property ListModel model
-    property Component delegate
-    property alias title: expandableHeader.title
-    property alias subText: expandableHeader.subtitle
-    property alias listViewHeight: expandableList.height
-
-    highlightColor: "Transparent"
-    height: expandableHeader.height + divider.height
-    expansion.height: contentColumn.height
-    onClicked: expansion.expanded = !expansion.expanded
-
-    Column {
-        id: contentColumn
-
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-
-        ListItem {
-            height: expandableHeader.height + divider.height
-            ListItemLayout {
-                id: expandableHeader
-
-                Icon {
-                    id: arrow
-
-                    width: units.gu(2)
-                    height: width
-                    SlotsLayout.position: SlotsLayout.Trailing
-                    SlotsLayout.overrideVerticalPositioning: true
-                    anchors.verticalCenter: parent.verticalCenter
-                    name: "go-down"
-                    rotation: expandableListItem.expansion.expanded ? 180 : 0
-
-                    Behavior on rotation {
-                        UbuntuNumberAnimation {}
-                    }
-                }
-            }
-        }
-
-        ListView {
-            id: expandableList
-            width: parent.width
-            interactive: false
-            model: expandableListItem.model
-            delegate: expandableListItem.delegate
-        }
-    }
-}
 
=== added file 'ubuntu-printing-app/components/LabelRow.qml'
--- ubuntu-printing-app/components/LabelRow.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-printing-app/components/LabelRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+
+import Ubuntu.Components 1.3
+
+RowLayout {
+    anchors {
+        left: parent.left
+        leftMargin: units.gu(2)
+        right: parent.right
+        rightMargin: units.gu(2)
+    }
+    Layout.maximumWidth: width
+
+    property alias enabled: secondaryLabel.enabled
+    property alias primaryText: primaryLabel.text
+    property alias secondaryText: secondaryLabel.text
+
+    Label {
+        id: primaryLabel
+        Layout.preferredWidth: units.gu(10)
+        objectName: "primary"
+    }
+
+    Label {
+        id: secondaryLabel
+        Layout.fillWidth: true
+        Layout.preferredHeight: units.gu(3)
+        Layout.preferredWidth: units.gu(10)
+        objectName: "secondary"
+        verticalAlignment: Text.AlignVCenter
+    }
+}
 
=== added file 'ubuntu-printing-app/components/PreviewRow.qml'
--- ubuntu-printing-app/components/PreviewRow.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-printing-app/components/PreviewRow.qml	2017-02-08 21:32:20 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of ubuntu-printing-app.
+ *
+ * ubuntu-printing-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-printing-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored-by: Andrew Hayzen <[e-mail]>
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+import UbuntuPrintingApp 1.0
+import Ubuntu.Settings.Printers 0.1
+
+Rectangle {
+    id: previewRow
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+    // Use foreground as this element is ontop of the background
+    color: theme.palette.normal.foreground
+    // Height is smallest of
+    // - calc'd height using aspect and width of image
+    // - 2/3 height of the view
+    implicitHeight: Math.min((view.width - units.gu(10)) / pageHelper.aspect, view.height / 1.5)
+
+    property Document document
+    property var printerJob