Merge lp:~fboucault/camera-app/desktop_better_responsiveness into lp:camera-app

[Florian Boucault]

Desktop convergence fixes:
- Fix viewfinder positioning.
- Resize window to follow viewfinder's aspect ratio.
- Made photo grid responsive.

[lp:~fboucault/camera-app/desktop_better_responsiveness]

588. By Florian Boucault on 2015-10-26

Added missing properties

589. By Florian Boucault on 2015-10-26

Reposition content appropriately when resizing window.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/camera-app-ci/441/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/137/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/137/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/137/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/282
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/764
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24565

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:589
http://jenkins.qa.ubuntu.com/job/camera-app-ci/442/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/138/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/283
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/765
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24579

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/camera-app/desktop_better_responsiveness]

590. By Florian Boucault on 2015-10-27

Fix viewfinder positioning properly.

591. By Florian Boucault on 2015-10-27

Fix positionContentAtRatio in INVERTED_LANDSCAPE

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:591
http://jenkins.qa.ubuntu.com/job/camera-app-ci/444/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/140/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/285
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/767
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24598

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

review: Needs Fixing (continuous-integration)

=== modified file 'PhotogridView.qml'
--- PhotogridView.qml	2015-10-22 12:24:01 +0000
+++ PhotogridView.qml	2015-10-27 10:36:20 +0000
@@ -25,7 +25,6 @@
 Item {
     id: photogridView
 
-    property int itemsPerRow: 3
     property var model
     signal photoClicked(int index)
     signal photoPressAndHold(int index)
@@ -63,7 +62,7 @@
     function exit() {
     }
 
-    GridView {
+    ResponsiveGridView {
         id: gridView
         anchors.fill: parent
         // FIXME: prevent the header from overlapping the beginning of the grid
@@ -73,7 +72,7 @@
             width: gridView.width
             height: headerHeight
         }
-        
+
         Component.onCompleted: {
             // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
             // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
@@ -82,16 +81,18 @@
             flickDeceleration = flickDeceleration * scaleFactor;
         }
 
-        cellWidth: width / photogridView.itemsPerRow
-        cellHeight: cellWidth
+        minimumHorizontalSpacing: units.dp(2)
+        maximumNumberOfColumns: 100
+        delegateWidth: units.gu(13)
+        delegateHeight: units.gu(13)
 
         model: photogridView.model
         delegate: Item {
             id: cellDelegate
             objectName: "mediaItem" + index
             
-            width: GridView.view.cellWidth
-            height: GridView.view.cellHeight
+            width: gridView.cellWidth
+            height: gridView.cellHeight
 
             property bool isVideo: MimeTypeMapper.mimeTypeToContentType(fileType) === ContentType.Videos
 
@@ -100,13 +101,13 @@
                 property real margin: units.dp(2)
                 anchors {
                     top: parent.top
-                    topMargin: index < photogridView.itemsPerRow ? 0 : margin/2
+                    topMargin: index < photogridView.columns ? 0 : margin/2
                     bottom: parent.bottom
                     bottomMargin: margin/2
                     left: parent.left
-                    leftMargin: index % photogridView.itemsPerRow == 0 ? 0 : margin/2
+                    leftMargin: index % photogridView.columns == 0 ? 0 : margin/2
                     right: parent.right
-                    rightMargin: index % photogridView.itemsPerRow == photogridView.itemsPerRow - 1 ? 0 : margin/2
+                    rightMargin: index % photogridView.columns == photogridView.columns - 1 ? 0 : margin/2
                 }
                 
                 asynchronous: true

=== added file 'ResponsiveGridView.qml'
--- ResponsiveGridView.qml	1970-01-01 00:00:00 +0000
+++ ResponsiveGridView.qml	2015-10-27 10:36:20 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.3
+import Ubuntu.Components 0.1
+
+// FIXME: this is a copy of Unity8's ResponsiveGridView
+
+/*
+   Essentially a GridView where you can specify the maximum number of columns it can have.
+ */
+Item {
+    property int minimumHorizontalSpacing: units.gu(0.5)
+    // property int minimumNumberOfColumns: 2 // FIXME: not implemented
+    property int maximumNumberOfColumns: 6
+    readonly property int columns: gridView.columns
+    property alias verticalSpacing: gridView.verticalSpacing
+    readonly property alias margins: gridView.margin
+    property int delegateWidth
+    property int delegateHeight
+    property alias model: gridView.model
+    property alias delegate: gridView.delegate
+    readonly property int cellWidth: gridView.cellWidth
+    readonly property int cellHeight: gridView.cellHeight
+    readonly property int totalContentHeight: {
+        if (gridView.model) {
+            return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)
+        } else {
+            return 0;
+        }
+    }
+    property alias interactive: gridView.interactive
+    readonly property alias flicking: gridView.flicking
+    readonly property alias moving: gridView.moving
+    readonly property alias pressDelay: gridView.pressDelay
+    readonly property alias originY: gridView.originY
+    property alias displayMarginBeginning: gridView.displayMarginBeginning
+    property alias displayMarginEnd: gridView.displayMarginEnd
+    property alias highlightIndex: gridView.highlightIndex
+    property alias cacheBuffer: gridView.cacheBuffer
+    readonly property alias currentItem: gridView.currentItem
+    property alias header: gridView.header
+    property alias maximumFlickVelocity: gridView.maximumFlickVelocity
+    property alias flickDeceleration: gridView.flickDeceleration
+
+    function contentHeightForRows(rows, height) {
+        return rows * height
+    }
+
+    function positionViewAtIndex(index, mode) {
+        gridView.positionViewAtIndex(index, mode);
+    }
+
+    GridView {
+        id: gridView
+        objectName: "responsiveGridViewGrid"
+        anchors {
+            fill: parent
+            leftMargin: margin/2
+            rightMargin: margin/2
+        }
+        clip: parent.height != totalContentHeight
+
+        function pixelToGU(value) {
+            return Math.floor(value / units.gu(1));
+        }
+
+        function spacingForColumns(columns) {
+            // spacing between columns as an integer number of GU, the remainder goes in the margins
+            var spacingGU = pixelToGU(allocatableHorizontalSpace / columns);
+            return units.gu(spacingGU);
+        }
+
+        function columnsForSpacing(spacing) {
+            // minimum margin is half of the spacing
+            return Math.max(1, Math.floor(parent.width / (delegateWidth + spacing)));
+        }
+
+        property real allocatableHorizontalSpace: parent.width - columns * delegateWidth
+        property int columns: Math.min(columnsForSpacing(minimumHorizontalSpacing), maximumNumberOfColumns)
+        property real horizontalSpacing: spacingForColumns(columns)
+        property real verticalSpacing: horizontalSpacing
+        property int margin: allocatableHorizontalSpace - columns * horizontalSpacing
+        property int highlightIndex: -1
+
+        cellWidth: delegateWidth + horizontalSpacing
+        cellHeight: delegateHeight + verticalSpacing
+
+        onHighlightIndexChanged: {
+            if (highlightIndex != -1) {
+                currentIndex = highlightIndex
+            }
+        }
+    }
+}

=== modified file 'ViewFinderGeometry.qml'
--- ViewFinderGeometry.qml	2015-10-22 12:21:14 +0000
+++ ViewFinderGeometry.qml	2015-10-27 10:36:20 +0000
@@ -18,6 +18,8 @@
 
 Item {
     property size cameraResolution;
+    property bool cameraResolutionValid: cameraResolution.width != -1
+                                         && cameraResolution.height != -1
     property int viewFinderHeight;
     property int viewFinderWidth;
     property int viewFinderOrientation;
@@ -30,6 +32,8 @@
     property real widthScale: viewFinderWidth / __cameraWidth
     property real heightScale: viewFinderHeight / __cameraHeight
 
-    width: (widthScale <= heightScale) ? viewFinderWidth : __cameraWidth * heightScale
-    height: (widthScale <= heightScale) ? __cameraHeight * widthScale : viewFinderHeight
+    width: cameraResolutionValid ? ((widthScale <= heightScale) ? viewFinderWidth : __cameraWidth * heightScale)
+                                 : viewFinderWidth
+    height: cameraResolutionValid ? ((widthScale <= heightScale) ? __cameraHeight * widthScale : viewFinderHeight)
+                                  : viewFinderHeight
 }

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2015-10-22 12:21:14 +0000
+++ ViewFinderView.qml	2015-10-27 10:36:20 +0000
@@ -29,6 +29,7 @@
     property bool touchAcquired: viewFinderOverlay.touchAcquired || camera.videoRecorder.recorderState == CameraRecorder.RecordingState
     property bool inView
     property alias captureMode: camera.captureMode
+    property real aspectRatio: viewFinder.sourceRect.width / viewFinder.sourceRect.height
     signal photoTaken(string filePath)
     signal videoShot(string filePath)
 

=== modified file 'camera-app.qml'
--- camera-app.qml	2015-10-26 13:19:14 +0000
+++ camera-app.qml	2015-10-27 10:36:20 +0000
@@ -23,13 +23,13 @@
 import Ubuntu.Content 0.1
 import CameraApp 0.1
 
-Item {
+Window {
     id: main
     objectName: "main"
-    width: units.gu(40)
-    height: units.gu(71)
-//    width: application.desktopMode ? units.gu(120) : (Screen.primaryOrientation === Qt.PortraitOrientation ? units.gu(40) : units.gu(80))
-//    height: application.desktopMode ? units.gu(60) : (Screen.primaryOrientation === Qt.PortraitOrientation ? units.gu(80) : units.gu(40))
+    width: height * viewFinderView.aspectRatio
+    height: units.gu(80)
+    color: "black"
+    title: "Camera"
 
     UnityActions.ActionManager {
         actions: [
@@ -63,6 +63,11 @@
 
     Component.onCompleted: {
         i18n.domain = "camera-app";
+        if (!application.desktopMode) {
+            main.showFullScreen();
+        } else {
+            main.show();
+        }
     }
 
 
@@ -91,7 +96,7 @@
                         galleryView.y = 0;
                         viewFinderView.x = 0;
                         viewFinderView.y = 0;
-                        viewSwitcher.contentX = viewSwitcher.ratio * viewSwitcher.contentWidth;
+                        viewSwitcher.positionContentAtRatio(viewSwitcher.ratio)
                         viewSwitcher.ratio = Qt.binding(function() { return viewSwitcher.contentX / viewSwitcher.contentWidth });
                     }
                 }
@@ -107,7 +112,7 @@
                         galleryView.y = Qt.binding(function() { return viewFinderView.height + viewSwitcher.panesMargin });
                         viewFinderView.x = 0;
                         viewFinderView.y = 0;
-                        viewSwitcher.contentY = viewSwitcher.ratio * viewSwitcher.contentHeight;
+                        viewSwitcher.positionContentAtRatio(viewSwitcher.ratio)
                         viewSwitcher.ratio = Qt.binding(function() { return viewSwitcher.contentY / viewSwitcher.contentHeight });
                     }
                 }
@@ -123,7 +128,7 @@
                         galleryView.y = 0;
                         viewFinderView.x = 0;
                         viewFinderView.y = Qt.binding(function() { return galleryView.height + viewSwitcher.panesMargin });
-                        viewSwitcher.contentY = (0.5 - viewSwitcher.ratio) * viewSwitcher.contentHeight;
+                        viewSwitcher.positionContentAtRatio(viewSwitcher.ratio)
                         viewSwitcher.ratio = Qt.binding(function() { return 0.5 - viewSwitcher.contentY / viewSwitcher.contentHeight });
                     }
                 }
@@ -177,6 +182,19 @@
             }
         }
 
+        function positionContentAtRatio(ratio) {
+            if (state == "PORTRAIT") {
+                viewSwitcher.contentX = ratio * viewSwitcher.contentWidth;
+            } else if (state == "LANDSCAPE") {
+                viewSwitcher.contentY = ratio * viewSwitcher.contentHeight;
+            } else if (state == "INVERTED_LANDSCAPE") {
+                viewSwitcher.contentY = (0.5 - ratio) * viewSwitcher.contentHeight;
+            }
+        }
+
+        onContentWidthChanged: positionContentAtRatio(viewSwitcher.ratio)
+        onContentHeightChanged: positionContentAtRatio(viewSwitcher.ratio)
+
         onMovementEnded: {
             // go to a rest position as soon as user stops interacting with the Flickable
             settle();

=== modified file 'cameraapplication.cpp'
--- cameraapplication.cpp	2015-01-23 19:38:32 +0000
+++ cameraapplication.cpp	2015-10-27 10:36:20 +0000
@@ -85,23 +85,13 @@
                 Qt::InvertedPortraitOrientation |
                 Qt::InvertedLandscapeOrientation);
 
-    m_view.reset(new QQuickView());
-    m_view->setResizeMode(QQuickView::SizeRootObjectToView);
-    m_view->setTitle("Camera");
-    m_view->setColor("black");
-    m_view->rootContext()->setContextProperty("application", this);
-    m_view->engine()->setBaseUrl(QUrl::fromLocalFile(cameraAppDirectory()));
-    m_view->engine()->addImportPath(cameraAppImportDirectory());
+    m_engine.reset(new QQmlApplicationEngine());
+    m_engine->rootContext()->setContextProperty("application", this);
+    m_engine->setBaseUrl(QUrl::fromLocalFile(cameraAppDirectory()));
+    m_engine->addImportPath(cameraAppImportDirectory());
     qDebug() << "Import path added" << cameraAppImportDirectory();
     qDebug() << "Camera app directory" << cameraAppDirectory();
-    QObject::connect(m_view->engine(), SIGNAL(quit()), this, SLOT(quit()));
-    m_view->setSource(QUrl::fromLocalFile(sourceQml()));
-
-    //run fullscreen if specified at command line or not in DESKTOP_MODE (i.e. on a device)
-    if (arguments().contains(QLatin1String("--fullscreen")) || !isDesktopMode()) 
-      m_view->showFullScreen();
-    else 
-      m_view->show();
+    m_engine->load(QUrl::fromLocalFile(sourceQml()));
 
     return true;
 }

=== modified file 'cameraapplication.h'
--- cameraapplication.h	2014-11-13 09:39:37 +0000
+++ cameraapplication.h	2015-10-27 10:36:20 +0000
@@ -20,7 +20,7 @@
 #ifndef CAMERAAPPLICATION_H
 #define CAMERAAPPLICATION_H
 
-#include <QtQuick/QQuickView>
+#include <QtQml/QQmlApplicationEngine>
 #include <QGuiApplication>
 
 class QDate;
@@ -54,7 +54,7 @@
     void removableStoragePresentChanged();
 
 private:
-    QScopedPointer<QQuickView> m_view;
+    QScopedPointer<QQmlApplicationEngine> m_engine;
 };
 
 #endif // CAMERAAPPLICATION_H

=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2015-05-15 07:40:37 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2015-10-27 10:36:20 +0000
@@ -18,7 +18,7 @@
 
     def get_qml_view(self):
         """Get the main QML view"""
-        return self.app.wait_select_single("QQuickView")
+        return self.get_root()
 
     def get_root(self):
         """Returns the root QML Item"""