Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/scaleMeBabyOneMoreTime into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Use resolved filename but add fragment

Use resolved filename but add fragment

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1793
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2683/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1409
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1407

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2683/rebuild

review: Approve (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/scaleMeBabyOneMoreTime]

1794. By Cris Dywan on 2015-12-23

Better test cases for scaling image provider

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1794
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2684/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1410
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1410/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1408

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2684/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/scaleMeBabyOneMoreTime]

1795. By Cris Dywan on 2015-12-23

Make scaling provider aware of fragments

[Tim Peeters (tpeeters)]

Looks good.

The only addition I like to suggest is to test explicitly the code branches for scaleFactor==1 and scaleFactor!=1.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1795
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2686/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1412
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1412/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1410

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2686/rebuild

review: Approve (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/scaleMeBabyOneMoreTime]

1796. By Cris Dywan on 2015-12-23

Fragment also needs to be kept in SciFi

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1796
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2687/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1413
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1413/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1411

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2687/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Thanks for adding the additional tests.

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/ucqquickimageextension.cpp'
--- src/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2015-12-18 12:33:35 +0000
+++ src/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2015-12-23 16:05:41 +0000
@@ -77,17 +77,19 @@
     int separatorPosition = resolved.indexOf("/");
     QString scaleFactor = resolved.left(separatorPosition);
     QString selectedFilePath = resolved.mid(separatorPosition+1);
+    QString fragment(m_source.hasFragment() ? "#" + m_source.fragment() : QString(""));
 
     if (scaleFactor == "1") {
         if (qFuzzyCompare(qGuiApp->devicePixelRatio(), (qreal)1.0)
                 || selectedFilePath.endsWith(".svg") || selectedFilePath.endsWith(".svgz")) {
-            // No scaling necessary. Just pass the original file as is
-            // to keep the full url structure
-            m_image->setSource(m_source);
+            // Take care to pass the original fragment
+            QUrl selectedFileUrl(QUrl::fromLocalFile(selectedFilePath));
+            selectedFileUrl.setFragment(fragment);
+            m_image->setSource(selectedFileUrl);
         } else {
             // Need to scale the pixel-based image to suit the devicePixelRatio setting ourselves.
             // If we let Qt do it, Qt will not choose the UITK-supported "@gu" scaled images.
-            m_image->setSource(QUrl("image://scaling/1/" + selectedFilePath));
+            m_image->setSource(QUrl("image://scaling/1/" + selectedFilePath + fragment));
             // explicitly set the source size in the QQuickImageBase, this persuades it that the
             // supplied image is suitable for the current devicePixelRatio.
             m_image->setSourceSize(m_image->sourceSize());
@@ -96,7 +98,7 @@
         // Prepend "image://scaling" for the image to be loaded by UCScalingImageProvider.
         if (!m_source.path().endsWith(".sci")) {
             // Regular image file
-            m_image->setSource(QUrl("image://scaling/" + resolved));
+            m_image->setSource(QUrl("image://scaling/" + resolved + fragment));
         } else {
             // .sci image file. Rewrite the .sci file into a temporary file.
             bool rewritten = true;
@@ -125,7 +127,10 @@
             }
 
             if (rewritten) {
-                m_image->setSource(QUrl::fromLocalFile(rewrittenSciFile->fileName()));
+                // Take care to pass the original fragment
+                QUrl rewrittenSciFileUrl(QUrl::fromLocalFile(rewrittenSciFile->fileName()));
+                rewrittenSciFileUrl.setFragment(fragment);
+                m_image->setSource(rewrittenSciFileUrl);
             } else {
                 m_image->setSource(m_source);
             }

=== modified file 'src/Ubuntu/Components/plugin/ucscalingimageprovider.cpp'
--- src/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2014-09-30 12:10:46 +0000
+++ src/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2015-12-23 16:05:41 +0000
@@ -40,7 +40,9 @@
 {
     int separatorPosition = id.indexOf("/");
     float scaleFactor = id.left(separatorPosition).toFloat();
-    QString path = id.mid(separatorPosition+1);
+    int fragmentPosition = id.lastIndexOf("#");
+    int pathLength = fragmentPosition > -1 ? fragmentPosition - separatorPosition - 1 : -1;
+    QString path = id.mid(separatorPosition + 1, pathLength);
     QFile file(path);
 
     if (file.open(QIODevice::ReadOnly)) {

=== added file 'tests/unit_x11/tst_components/[e-mail]'
Binary files tests/unit_x11/tst_components/[e-mail]	1970-01-01 00:00:00 +0000 and tests/unit_x11/tst_components/[e-mail]	2015-12-23 16:05:41 +0000 differ
=== added file 'tests/unit_x11/tst_components/battery-100-charging.svg'
--- tests/unit_x11/tst_components/battery-100-charging.svg	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/battery-100-charging.svg	2015-12-23 16:05:41 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg4966" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="90" viewBox="0 0 139.00489 90.000001" width="139" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata4971">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(-149.78 -484.51)">
+  <g id="g5120" transform="translate(-433.79 125.71)">
+   <g id="g5124" transform="translate(409.57 223.43)">
+    <g id="g5126" style="fill:none" transform="matrix(2.1875 0 0 1.875 -456 -1657.8)">
+     <rect id="rect5128" style="opacity:.21171;fill:none" transform="translate(0 804.36)" height="48" width="48" y="152" x="288"/>
+    </g>
+    <path id="path5130" style="fill:#808080" transform="translate(174 135.36)" d="m86 15-75.156 0.012c-7.844-0.012-10.844 1.988-10.844 11.988v18 18c0 10 3 12 10.844 11.988l75.156 0.012c7.8438 0.01172 11-2.3633 11-12v-4.0117h8v-13.988-13.988h-8v-4.012c0-9.637-3.156-12.012-11-12zm-75 6c21.619 0.0096 48.956 0.0081 75 0 4 0 5 1 5 6v18 18c0 5-1 6-5 6-26.044-0.008-53.381-0.01-75 0-4 0-5-1-5-6v-18-18c0-5 1-6 5-6z"/>
+    <path id="path5132" style="fill:#38b44a" d="m1051 697c-3 0-4 0-4 5v26c0 5 1 5 4 5h65c3 0 4 0 4-5v-26c0-5-1-5-4-5z" transform="translate(-861 -534.64)"/>
+    <path id="path3847-0" style="fill:#808080" d="m299 150.36-13.996 35h14v25l14.005-35h-14z"/>
+   </g>
+  </g>
+ </g>
+</svg>

=== added file 'tests/unit_x11/tst_components/shape.svg'
--- tests/unit_x11/tst_components/shape.svg	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/shape.svg	2015-12-23 16:05:41 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg3336"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ushape.svg">
+  <defs
+     id="defs3338" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="113.3337"
+     inkscape:cy="-31.239507"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1871"
+     inkscape:window-height="1056"
+     inkscape:window-x="49"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     borderlayer="false"
+     showborder="true" />
+  <metadata
+     id="metadata3341">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <g
+       transform="matrix(0.92774742,0,0,0.92677598,0,190.60819)"
+       id="layer1-3"
+       inkscape:label="Layer 1"
+       style="fill:#000000;display:inline">
+      <g
+         style="fill:#000000"
+         inkscape:label="Layer 1"
+         id="layer1-2"
+         transform="translate(0,9.99998)">
+        <path
+           sodipodi:nodetypes="sssssssss"
+           inkscape:connector-curvature="0"
+           id="path3774"
+           d="m 66.770269,850.78408 72.334451,0 c 58.42399,0 66.77028,8.34623 66.77028,66.77022 l 0,58.03793 c 0,58.42377 -8.34629,66.76997 -66.77028,66.76997 l -72.334451,0 C 8.3462835,1042.3622 0,1034.016 0,975.59223 L 0,917.5543 c 0,-58.42399 8.3462835,-66.77022 66.770269,-66.77022 z"
+           style="fill:#000000;fill-opacity:1;stroke:none;display:inline" />
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'tests/unit_x11/tst_components/tst_imageprovider.qml'
--- tests/unit_x11/tst_components/tst_imageprovider.qml	2015-12-18 12:33:35 +0000
+++ tests/unit_x11/tst_components/tst_imageprovider.qml	2015-12-23 16:05:41 +0000
@@ -60,23 +60,34 @@
 
         // tests adjusted to reproduce bug #1401920
         function test_sourceChanged_bug1401920_data() {
-            var file = "file:///usr/share/icons/ubuntu-mobile/actions/scalable/delete.svg";
             return [
-                {rag: "Existing file", file: file},
-                {rag: "Url with fragment", file: file + "#" + Date.now()},
+                {tag: "Bitmap file", file: 'tst_icon-select.png'},
+                {tag: "Bitmap file(18gu)", gu: 18, file: 'tst_icon-select.png'},
+                {tag: "Bitmap with fragment", file: 'tst_icon-select.png#' + Date.now()},
+                {tag: "Bitmap with fragment(18gu)", gu: 18, file: '[e-mail]#' + Date.now()},
+                {tag: "Bitmap file with gu", file: '[e-mail]'},
+                {tag: "Bitmap file with gu(18gu)", gu: 18, file: '[e-mail]'},
+                {tag: "Bitmap with gu/ fragment", file: '[e-mail]#' + Date.now()},
+                {tag: "Bitmap with gu/ fragment(18gu)", gu: 18, file: '[e-mail]#' + Date.now()},
+                {tag: "Scalable file", file: 'battery-100-charging.svg'},
+                {tag: "Scalable file(18gu)", gu: 18, file: 'shape.svg'},
+                {tag: "Scalable with fragment", file: 'shape.svg#' + Date.now()},
+                {tag: "Scalable with fragment(18gu)", gu: 18, file: 'battery-100-charging.svg#' + Date.now()},
             ];
         }
 
         function test_sourceChanged_bug1401920(data) {
+            units.gridUnit = data.gu ? data.gu : 8;
             sourceChangeSpy.target = test;
-            test.source = data.file;
+            test.source = Qt.resolvedUrl(data.file);
             sourceChangeSpy.wait(400);
+            compare(test.source, Qt.resolvedUrl(data.file));
         }
 
         function test_sourceNOTIFYable() {
             /* Test source through visible to cover NOTIFYable errors */
             visibleChangedSpy.target = bindingTest;
-            bindingTest.source = "/usr/share/icons/ubuntu-mobile/actions/scalable/help.svg";
+            bindingTest.source = Qt.resolvedUrl('battery-100-charging.svg');
             visibleChangedSpy.wait();
         }
     }