Merge lp:~artmello/gallery-app/gallery-app-avoid_reload_fullscreen_toggle into lp:gallery-app

[Arthur Mello]

Request only one thumbnail to be displayed at SingleMediaViewer to avoid reloading at fullscreen toggle

Request only one thumbnail to be displayed at SingleMediaViewer to avoid reloading at fullscreen toggle

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1234
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/116
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/269
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/741
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22873

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1188/rebuild

review: Needs Fixing (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-avoid_reload_fullscreen_toggle]

1235. By Arthur Mello on 2015-09-03

Handle photoviewer resize on desktop

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1235
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/118/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/118/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/118/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/922
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/744
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23037

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1190/rebuild

review: Needs Fixing (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-avoid_reload_fullscreen_toggle]

1236. By Arthur Mello on 2015-09-03

Only change the thumbnailer size for resizes bigger than 5%

1237. By Arthur Mello on 2015-09-03

Set both attributes of size

[Florian Boucault (fboucault)]

'overview' cannot be referred to as it is not defined in this file. Instead viewer.width and viewer.height should probably be used.

review: Needs Fixing

[Florian Boucault (fboucault)]

It might be more reliable (and more succint) to do:

    property size thumbSize: Qt.size(overview.width, overview.height)

instead of:

    Component.onCompleted: {
        thumbSize = Qt.size(overview.width, overview.height)
    }

review: Needs Fixing

[Florian Boucault (fboucault)]

Don't forget ';' a the end of JS lines.

review: Needs Fixing

[lp:~artmello/gallery-app/gallery-app-avoid_reload_fullscreen_toggle]

1238. By Arthur Mello on 2015-09-03

Does not use overview
Remove unnecessary onCompleted method

1239. By Arthur Mello on 2015-09-03

Always set thumbSize with a 5% margin

[Florian Boucault (fboucault)]

Good to go

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1237
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/119
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/272
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/923
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/745
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23046

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1191/rebuild

review: Needs Fixing (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-avoid_reload_fullscreen_toggle]

1240. By Arthur Mello on 2015-09-15

Remove wrong test for video thumbnails

=== modified file 'rc/qml/MediaViewer/SingleMediaViewer.qml'
--- rc/qml/MediaViewer/SingleMediaViewer.qml	2015-07-28 22:02:49 +0000
+++ rc/qml/MediaViewer/SingleMediaViewer.qml	2015-09-15 17:13:43 +0000
@@ -28,7 +28,7 @@
     id: viewer
     property bool pinchInProgress: zoomPinchArea.active
     property var mediaSource
-    property real maxDimension: overview.height
+    property size thumbSize: Qt.size(viewer.width * 1.05, viewer.height * 1.05)
     property bool showThumbnail: true
 
     property bool isVideo: mediaSource.type === MediaSource.Video
@@ -43,6 +43,22 @@
 
     signal clicked()
 
+    onWidthChanged: {
+        // Only change thumbSize if width increases more than 5%
+        // that way we do not reload image for small resizes
+        if (width > thumbSize.width) {
+            thumbSize = Qt.size(width * 1.05, height * 1.05);
+        }
+    }
+
+    onHeightChanged: {
+        // Only change thumbSize if height increases more than 5%
+        // that way we do not reload image for small resizes
+        if (height > thumbSize.height) {
+            thumbSize = Qt.size(width * 1.05, height * 1.05);
+        }
+    }
+
     function zoomIn(centerX, centerY, factor) {
         flickable.scaleCenterX = centerX / (flickable.sizeScale * flickable.width);
         flickable.scaleCenterY = centerY / (flickable.sizeScale * flickable.height);
@@ -145,16 +161,14 @@
                     cache: false
                     source: {
                         if (viewer.isVideo) {
-                            if (viewer.maxDimension > 0) {
-                                return "image://thumbnailer/" + mediaSource.path
-                            }
+                            return "image://thumbnailer/" + mediaSource.path
                         } else {
                             return "image://photo/" + mediaSource.path
                         }
                     }
                     sourceSize {
-                        width: viewer.maxDimension
-                        height: viewer.maxDimension
+                        width: viewer.thumbSize.width
+                        height: viewer.thumbSize.height
                     }
                     fillMode: Image.PreserveAspectFit
                     visible: viewer.showThumbnail