Merge lp:~fboucault/ubuntu-ui-extras/current_tab_visible_startup into lp:ubuntu-ui-extras

[Florian Boucault]

TabsBar: ensure selected tab is always visible when width changes, including at startup.

TabsBar: ensure selected tab is always visible when width changes, including at startup.

Unmerged revisions

136. By Florian Boucault on 2017-04-05

TabsBar: ensure selected tab is always visible when width changes, including at startup.

135. By Jonas G. Drange on 2017-04-04

* sets a default printer on provisioning if there is none

134. By Andrew Hayzen on 2017-04-03

* Fix changing of printer not loading defaults and add a test
* Improve colorModel struct to != when name or colorModelType are different

133. By Andrew Hayzen on 2017-03-31

* Set m_copies when using updateFrom and add test for updateFrom

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp	2017-03-21 13:01:42 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp	2017-04-05 13:31:06 +0000
@@ -410,6 +410,7 @@
     // Note: do not use loadAttributes otherwise can cause UI block
     m_acceptJobs = other->m_acceptJobs;
     m_backend = other->m_backend;
+    m_copies = other->m_copies;
     m_defaultColorModel = other->m_defaultColorModel;
     m_defaultPrintQuality = other->m_defaultPrintQuality;
     m_deviceUri = other->m_deviceUri;

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-03-16 15:47:11 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-04-05 13:31:06 +0000
@@ -215,13 +215,9 @@
         return;
     }
 
-    if (jobId() > 0) {
-        loadAttributes(
-            m_backend->printerGetJobAttributes(
-                printerName(), jobId()
-            )
-        );
-    } else {
+    // Only load the defaults if this isn't a job in the queue (one which has a
+    // jobId) as this is when user is making a job and has changed the printer
+    if (jobId() <= 0) {
         setColorModel(m_printer->supportedColorModels().indexOf(m_printer->defaultColorModel()));
         setDuplexMode(m_printer->supportedDuplexModes().indexOf(m_printer->defaultDuplexMode()));
         setQuality(m_printer->supportedPrintQualities().indexOf(m_printer->defaultPrintQuality()));
@@ -401,6 +397,9 @@
             Q_EMIT printerNameChanged();
         }
 
+        // When the printer changes ensure we update any defaults
+        loadDefaults();
+
         Q_EMIT printerChanged();
    }
 }

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-03-21 14:51:38 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-04-05 13:31:06 +0000
@@ -263,6 +263,8 @@
                           const QString &device, const QString &description,
                           const QString &location)
 {
+    bool setAsDefault = m_allPrinters.count() == 0;
+
     QString reply = m_backend->printerAdd(name, device, ppd, description,
                                           location);
     if (!reply.isEmpty()) {
@@ -270,7 +272,7 @@
         return false;
     }
 
-    provisionPrinter(name);
+    provisionPrinter(name, setAsDefault);
 
     return true;
 }
@@ -281,6 +283,8 @@
                                      const QString &description,
                                      const QString &location)
 {
+    bool setAsDefault = m_allPrinters.count() == 0;
+
     QString reply = m_backend->printerAddWithPpd(name, device, ppdFileName,
                                                  description, location);
     if (!reply.isEmpty()) {
@@ -288,16 +292,20 @@
         return false;
     }
 
-    provisionPrinter(name);
+    provisionPrinter(name, setAsDefault);
 
     return true;
 }
 
-void Printers::provisionPrinter(const QString &name)
+void Printers::provisionPrinter(const QString &name, const bool setAsDefault)
 {
     // We mimic what System Config Printer does here.
     m_backend->printerSetEnabled(name, true);
     m_backend->printerSetAcceptJobs(name, true);
+
+    if (setAsDefault) {
+        setDefaultPrinterName(name);
+    }
 }
 
 bool Printers::removePrinter(const QString &name)

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.h'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.h	2017-03-21 14:51:38 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.h	2017-04-05 13:31:06 +0000
@@ -108,7 +108,7 @@
     void driverFilterChanged();
 
 private:
-    void provisionPrinter(const QString &name);
+    void provisionPrinter(const QString &name, const bool setAsDefault);
     PrinterBackend *m_backend;
     DeviceModel m_devices;
     DriverModel m_drivers;

=== modified file 'modules/Ubuntu/Components/Extras/Printers/structs.h'
--- modules/Ubuntu/Components/Extras/Printers/structs.h	2017-03-16 15:34:02 +0000
+++ modules/Ubuntu/Components/Extras/Printers/structs.h	2017-04-05 13:31:06 +0000
@@ -36,13 +36,15 @@
 
     bool operator==(const ColorModel& a) const
     {
-        return (name == a.name && originalOption == a.originalOption);
+        return (name == a.name && originalOption == a.originalOption
+                && text == a.text && colorType == a.colorType);
     }
     bool operator!=(const ColorModel& a) const
     {
         return !(*this == a);
     }
     void operator=(const ColorModel &m) {
+        colorType = m.colorType;
         name = m.name;
         text = m.text;
         originalOption = m.originalOption;

=== modified file 'modules/Ubuntu/Components/Extras/TabsBar.qml'
--- modules/Ubuntu/Components/Extras/TabsBar.qml	2017-01-16 15:31:24 +0000
+++ modules/Ubuntu/Components/Extras/TabsBar.qml	2017-04-05 13:31:06 +0000
@@ -186,6 +186,8 @@
             UbuntuNumberAnimation { property: "x" }
         }
 
+        // Ensures current item stays visible when width changes
+        onWidthChanged: tabs.positionViewAtIndex(currentIndex, ListView.Contain)
         currentIndex: tabsBar.model.selectedIndex
         model: tabsBar.model
         delegate: MouseArea {

=== modified file 'po/ubuntu-ui-extras.pot'
--- po/ubuntu-ui-extras.pot	2017-03-21 14:51:38 +0000
+++ po/ubuntu-ui-extras.pot	2017-04-05 13:31:06 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-ui-extras\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-21 15:33+0100\n"
+"POT-Creation-Date: 2017-04-04 12:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -99,7 +99,7 @@
 msgid "Stopped"
 msgstr ""
 
-#: modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp:387
+#: modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp:395
 msgid "Test page"
 msgstr ""
 

=== modified file 'tests/unittests/Printers/tst_printer.cpp'
--- tests/unittests/Printers/tst_printer.cpp	2017-03-20 13:31:55 +0000
+++ tests/unittests/Printers/tst_printer.cpp	2017-04-05 13:31:06 +0000
@@ -36,14 +36,17 @@
     void init()
     {
         m_backend = new MockPrinterBackend(m_printerName);
-        m_instance = new Printer(m_backend);
+        m_instance = QSharedPointer<Printer>(new Printer(m_backend));
     }
     void cleanup()
     {
-        QSignalSpy destroyedSpy(m_instance, SIGNAL(destroyed(QObject*)));
-        m_instance->deleteLater();
+        QSignalSpy destroyedSpy(m_instance.data(), SIGNAL(destroyed(QObject*)));
+        m_instance.clear();
         QTRY_COMPARE(destroyedSpy.count(), 1);
-        delete m_backend;
+
+        if (m_backend) {
+            delete m_backend;
+        }
     }
     void testName()
     {
@@ -370,10 +373,90 @@
         // Ideally, all QObjects in the Printer API needs to be tested here.
         QCOMPARE(p.jobs()->thread(), &thread);
     }
+
+    void testUpdateFrom()
+    {
+        // Setup any variables for flipped values
+        bool newAcceptJobs = !m_instance->acceptJobs();
+        int newCopies = m_instance->copies() + 1;
+        QString newDeviceUri = m_instance->deviceUri() + "/test";
+        bool newShared = !m_instance->shared();
+        QString newLastMessage = m_instance->lastMessage() + "test";
+
+        // Setup color model and quality models
+        ColorModel colorA;
+        colorA.text = "ColorA";
+
+        ColorModel defaultColorModel;
+        defaultColorModel.text = "ColorB";
+        QList<ColorModel> colorModels({colorA, defaultColorModel});
+
+        PrintQuality qualityA;
+        qualityA.name = "QualityA";
+
+        PrintQuality defaultPrintQuality;
+        defaultPrintQuality.name = "QualityB";
+        QList<PrintQuality> qualities({qualityA, defaultPrintQuality});
+
+        QList<PrinterEnum::DuplexMode> duplexModes({
+            PrinterEnum::DuplexMode::DuplexNone,
+            PrinterEnum::DuplexMode::DuplexLongSide,
+            PrinterEnum::DuplexMode::DuplexShortSide,
+            PrinterEnum::DuplexMode::DuplexShortSide
+        });
+
+        auto newDefaultDuplexMode = m_instance->defaultDuplexMode() == PrinterEnum::DuplexMode::DuplexNone
+                ? PrinterEnum::DuplexMode::DuplexShortSide
+                : PrinterEnum::DuplexMode::DuplexNone;
+
+        // Create a printer that has different settings to the default
+        QString printerName = "test-printer-b";
+
+        MockPrinterBackend *backend = new MockPrinterBackend(printerName);
+        backend->printerOptions[printerName].insert("AcceptJobs", newAcceptJobs);
+        backend->printerOptions[printerName].insert("Copies", QString::number(newCopies));
+        backend->printerOptions[printerName].insert("DefaultColorModel", QVariant::fromValue(defaultColorModel));
+        backend->printerOptions[printerName].insert("DefaultPrintQuality", QVariant::fromValue(defaultPrintQuality));
+        backend->printerOptions[printerName].insert(
+            "DeviceUri", newDeviceUri);
+        backend->printerOptions[printerName].insert("Shared", newShared);
+        backend->printerOptions[printerName].insert(
+            "StateMessage", newLastMessage);
+        backend->printerOptions[printerName].insert(
+            "SupportedColorModels", QVariant::fromValue(colorModels));
+        backend->printerOptions[printerName].insert(
+            "SupportedPrintQualities", QVariant::fromValue(qualities));
+
+        backend->m_supportedDuplexModes = duplexModes;
+        backend->printerOptions[printerName].insert(
+            "Duplex", Utils::duplexModeToPpdChoice(newDefaultDuplexMode));
+
+        QSharedPointer<Printer> p = QSharedPointer<Printer>(new Printer(backend));
+
+        // Update the default printer from this
+        m_instance->updateFrom(p);
+
+        // Check we have the new values
+        QCOMPARE(m_instance->acceptJobs(), newAcceptJobs);
+        QCOMPARE(m_instance->copies(), newCopies);
+        QCOMPARE(m_instance->defaultColorModel(), defaultColorModel);
+        QCOMPARE(m_instance->defaultPrintQuality(), defaultPrintQuality);
+        QCOMPARE(m_instance->deviceUri(), newDeviceUri);
+        QCOMPARE(m_instance->shared(), newShared);
+        QCOMPARE(m_instance->lastMessage(), newLastMessage);
+        QCOMPARE(m_instance->supportedColorModels(), colorModels);
+        QCOMPARE(m_instance->supportedPrintQualities(), qualities);
+
+        // We test that the duplexModes have changed to check that the backend
+        // has changed, as m_backend is private we can't check directly
+        QCOMPARE(m_instance->defaultDuplexMode(), newDefaultDuplexMode);
+        QCOMPARE(m_instance->supportedDuplexModes(), duplexModes);
+    }
+
 private:
     QString m_printerName = "my-printer";
     MockPrinterBackend *m_backend = nullptr;
-    Printer *m_instance = nullptr;
+    QSharedPointer<Printer> m_instance;
 };
 
 QTEST_GUILESS_MAIN(TestPrinter)

=== modified file 'tests/unittests/Printers/tst_printerjob.cpp'
--- tests/unittests/Printers/tst_printerjob.cpp	2017-03-14 14:47:54 +0000
+++ tests/unittests/Printers/tst_printerjob.cpp	2017-04-05 13:31:06 +0000
@@ -304,6 +304,43 @@
         QCOMPARE(m_instance->title(), title);
     }
 
+    void testSetPrinterLoadDefaults()
+    {
+        ColorModel a;
+        a.colorType = PrinterEnum::ColorModelType::GrayType;
+        a.text = "Gray";
+
+        ColorModel b;
+        b.colorType = PrinterEnum::ColorModelType::ColorType;
+        b.text = "RGB";
+        QList<ColorModel> models({a, b});
+
+
+        MockPrinterBackend *backend1 = new MockPrinterBackend("printer1");
+        backend1->printerOptions["printer1"].insert("SupportedColorModels", QVariant::fromValue(models));
+        backend1->printerOptions["printer1"].insert("DefaultColorModel", QVariant::fromValue(a));
+        QSharedPointer<Printer> printer1 = QSharedPointer<Printer>(new Printer(backend1));
+
+        MockPrinterBackend *backend2 = new MockPrinterBackend("printer2");
+        backend2->printerOptions["printer2"].insert("SupportedColorModels", QVariant::fromValue(models));
+        backend2->printerOptions["printer2"].insert("DefaultColorModel", QVariant::fromValue(b));
+        QSharedPointer<Printer> printer2 = QSharedPointer<Printer>(new Printer(backend2));
+
+        // Base case
+        m_instance->setPrinter(printer1);
+        qDebug() << m_instance->colorModel() << models.indexOf(a);
+        QCOMPARE(m_instance->colorModel(), models.indexOf(a));
+        QCOMPARE(m_instance->getColorModel().text, a.text);
+        QCOMPARE(m_instance->colorModelType(), a.colorType);
+
+        // Change to a different printer and check the default updates
+        m_instance->setPrinter(printer2);
+        qDebug() << m_instance->colorModel() << models.indexOf(b);
+        QCOMPARE(m_instance->colorModel(), models.indexOf(b));
+        QCOMPARE(m_instance->getColorModel().text, b.text);
+        QCOMPARE(m_instance->colorModelType(), b.colorType);
+    }
+
     void testState()
     {
         QCOMPARE(m_instance->state(), PrinterEnum::JobState::Pending);

=== modified file 'tests/unittests/Printers/tst_printers.cpp'
--- tests/unittests/Printers/tst_printers.cpp	2017-03-15 17:30:21 +0000
+++ tests/unittests/Printers/tst_printers.cpp	2017-04-05 13:31:06 +0000
@@ -327,6 +327,30 @@
         QList<QVariant> args = printFileSpy.takeFirst();
         QCOMPARE(args.at(0).toString(), target);
     }
+
+    /* Test that a printer is 1) enabled and 2) set to accepting jobs upon
+    creation. Also, if the printer is the only printer, make it the default. */
+    void testPrinterProvisioning()
+    {
+        MockPrinterBackend *backend = new MockPrinterBackend;
+        Printers p(backend);
+        p.addPrinter("printer-a", "some-ppd", "ipp://foo/bar", "", "");
+
+        // Create the printer, and make it appear in the printer model.
+        MockPrinterBackend *printerBackend = new MockPrinterBackend("printer-a");
+        auto printer = QSharedPointer<Printer>(new Printer(printerBackend));
+        backend->mockPrinterLoaded(printer);
+        p.loadPrinter("printer-a");
+
+        QVERIFY(backend->enableds.contains("printer-a"));
+        QVERIFY(backend->printerOptions["printer-a"].value("AcceptJobs").toBool());
+        QCOMPARE(backend->m_defaultPrinterName, (QString) "printer-a");
+
+        p.addPrinter("printer-b", "some-ppd", "ipp://bar/baz", "", "");
+        QVERIFY(backend->enableds.contains("printer-b"));
+        QVERIFY(backend->printerOptions["printer-b"].value("AcceptJobs").toBool());
+        QCOMPARE(backend->m_defaultPrinterName, (QString) "printer-a");
+    }
 };
 
 QTEST_GUILESS_MAIN(TestPrinters)