Merge lp:~artmello/camera-app/camera-app-fix_1416043 into lp:camera-app

[Arthur Mello]

Enable viewing full screen picture while in selection mode
Remove actions from the slide show header if we are in selection mode
Make it possible to toggle selection when on slide show view
Scroll the last seem picture from slideshow into view when returning to the grid photo roll

Enable viewing full screen picture while in selection mode
Remove actions from the slide show header if we are in selection mode
Make it possible to toggle selection when on slide show view
Scroll the last seem picture from slideshow into view when returning to the grid photo roll

[lp:~artmello/camera-app/camera-app-fix_1416043]

445. By Arthur Mello on 2015-02-12

Fix to display the photo fullscreen when in content hub mode
Fix to do not display slideshow toolbar options when in selection mode

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:444
http://jenkins.qa.ubuntu.com/job/camera-app-ci/385/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/81/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/148
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/618/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/319
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18030
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/728/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'GalleryView.qml'
--- GalleryView.qml	2015-01-27 17:36:46 +0000
+++ GalleryView.qml	2015-02-12 19:25:49 +0000
@@ -37,7 +37,7 @@
         singleSelectionOnly: main.transfer.selectionType === ContentTransfer.Single
     }
 
-    property bool gridMode: false
+    property bool gridMode: main.contentExportMode
     property bool showLastPhotoTakenPending: false
 
     function showLastPhotoTaken() {
@@ -52,13 +52,9 @@
     }
 
     function exitUserSelectionMode() {
-        if (gridMode) {
-            model.clearSelection();
-            model.singleSelectionOnly = true;
-            userSelectionMode = false;
-        } else {
-            gridMode = true;
-        }
+        model.clearSelection();
+        model.singleSelectionOnly = true;
+        userSelectionMode = false;
     }
 
     onExit: {
@@ -75,6 +71,8 @@
             model: galleryView.model
             visible: opacity != 0.0
             inView: galleryView.inView && galleryView.currentView == slideshowView
+            inSelectionMode: main.contentExportMode || galleryView.userSelectionMode
+            onToggleSelection: model.toggleSelected(currentIndex)
             onToggleHeader: header.toggle();
         }
 
@@ -110,11 +108,15 @@
         GalleryViewHeader {
             id: header
             actions: currentView.actions
-            gridMode: galleryView.gridMode || main.contentExportMode
-            validationVisible: main.contentExportMode && model.selectedFiles.length > 0
+            gridMode: galleryView.gridMode
+            validationVisible: main.contentExportMode && model.selectedFiles.length > 0 && galleryView.gridMode
             userSelectionMode: galleryView.userSelectionMode
             onExit: {
-                if (userSelectionMode) {
+                if ((main.contentExportMode || userSelectionMode) && !galleryView.gridMode) {
+                    galleryView.gridMode = true;
+                    // position grid view so that the current photo in slideshow view is visible
+                    photogridView.showPhotoAtIndex(slideshowView.currentIndex);
+                } else if (userSelectionMode) {
                     galleryView.exitUserSelectionMode();
                 } else {
                     galleryView.exit()
@@ -224,7 +226,7 @@
         }
     }
 
-    state: galleryView.gridMode || main.contentExportMode ? "GRID" : "SLIDESHOW"
+    state: galleryView.gridMode ? "GRID" : "SLIDESHOW"
     states: [
         State {
             name: "SLIDESHOW"

=== modified file 'GalleryViewHeader.qml'
--- GalleryViewHeader.qml	2014-12-09 10:52:01 +0000
+++ GalleryViewHeader.qml	2015-02-12 19:25:49 +0000
@@ -75,7 +75,7 @@
         }
 
         Label {
-            text: userSelectionMode ? i18n.tr("Select") :
+            text: main.contentExportMode || userSelectionMode ? i18n.tr("Select") :
                   (editMode ? i18n.tr("Edit Photo") : i18n.tr("Photo Roll"))
             fontSize: "x-large"
             color: Theme.palette.normal.foregroundText
@@ -106,13 +106,24 @@
         }
 
         IconButton {
+            objectName: "singleActionButton"
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+            }
+            action: actionsDrawer.actions[0]
+            visible: actionsDrawer.actions.length == 1 && !editMode
+            onTriggered: if (action) action.triggered()
+        }
+
+        IconButton {
             objectName: "additionalActionsButton"
             anchors {
                 top: parent.top
                 bottom: parent.bottom
             }
             iconName: "contextual-menu"
-            visible: actionsDrawer.actions.length > 0 && !editMode
+            visible: actionsDrawer.actions.length > 1 && !editMode
             onClicked: actionsDrawer.opened = !actionsDrawer.opened
         }
 

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2015-02-12 19:25:49 +0000
+++ SlideshowView.qml	2015-02-12 19:25:49 +0000
@@ -32,8 +32,20 @@
                                                         editor.active : false
     property bool inView
     property bool editingAvailable: false
+    property bool inSelectionMode: false
     signal toggleHeader
-    property list<Action> actions: [
+    signal toggleSelection
+    property var actions: inSelectionMode ? slideShowSelectionActions : slideShowActions
+
+    property list<Action> slideShowSelectionActions: [
+        Action {
+            text: i18n.tr("Select")
+            iconName: listView.currentItem.isSelected ? "close" : "ok"
+            onTriggered: slideshowView.toggleSelection()
+        }
+    ]
+
+    property list<Action> slideShowActions: [
         Action {
             text: i18n.tr("Share")
             iconName: "share"
@@ -61,9 +73,9 @@
 
         editingAvailable = true;
         var newActions = [];
-        for (var i = 0; i < actions.length; i++) newActions.push(actions[i]);
+        for (var i = 0; i < slideShowActions.length; i++) newActions.push(slideShowActions[i]);
         newActions.push(editAction);
-        actions = newActions;
+        slideShowActions = newActions;
     }
 
     function showPhotoAtIndex(index) {
@@ -123,6 +135,7 @@
             id: delegate
             property bool pinchInProgress: zoomPinchArea.active
             property string url: fileURL
+            property bool isSelected: selected
 
             function zoomIn(centerX, centerY, factor) {
                 flickable.scaleCenterX = centerX / (flickable.sizeScale * flickable.width);