Merge lp:~uriboni/camera-app/rotate-popovers into lp:camera-app/staging

[Ugo Riboni]

Correctly rotate the share and delete dialogs by parenting them to the views that trigger them

Correctly rotate the share and delete dialogs by parenting them to the views that trigger them

[Florian Boucault (fboucault)]

PopupUtils.open(sharePopoverComponent).parent = photogridView

2 non obvious things in one line, please make it 2 lines

review: Needs Fixing

[lp:~uriboni/camera-app/rotate-popovers]

614. By Ugo Riboni on 2015-11-26

Make code more readable

=== modified file 'DeleteDialog.qml'
--- DeleteDialog.qml	2015-11-17 10:38:00 +0000
+++ DeleteDialog.qml	2015-11-26 13:45:48 +0000
@@ -33,9 +33,7 @@
 
         text: i18n.tr("Delete")
         color: UbuntuColors.red
-        onClicked: {
-            PopupUtils.close(deleteDialog);
-        }
+        onClicked: PopupUtils.close(deleteDialog)
     }
 
     Button {

=== modified file 'GalleryView.qml'
--- GalleryView.qml	2015-10-26 13:19:14 +0000
+++ GalleryView.qml	2015-11-26 13:45:48 +0000
@@ -107,6 +107,7 @@
                     model.toggleSelected(index);
             }
             onExitUserSelectionMode: galleryView.exitUserSelectionMode()
+            onToggleHeader: header.toggle()
         }
 
         // FIXME: it would be better to use the standard header from the toolkit

=== modified file 'PhotogridView.qml'
--- PhotogridView.qml	2015-11-03 14:23:10 +0000
+++ PhotogridView.qml	2015-11-26 13:45:48 +0000
@@ -30,6 +30,7 @@
     signal photoPressAndHold(int index)
     signal photoSelectionAreaClicked(int index)
     signal exitUserSelectionMode
+    signal toggleHeader()
     property real headerHeight
     property bool inView
     property bool inSelectionMode
@@ -41,16 +42,20 @@
             iconName: "share"
             enabled: model.selectedFiles.length <= 1
             onTriggered: {
-                if (model.selectedFiles.length > 0)
-                    PopupUtils.open(sharePopoverComponent)
+                if (model.selectedFiles.length > 0) {
+                    var dialog = PopupUtils.open(sharePopoverComponent)
+                    dialog.parent = photogridView
+                }
             }
         },
         Action {
             text: i18n.tr("Delete")
             iconName: "delete"
             onTriggered: {
-                if (model.selectedFiles.length > 0)
-                    PopupUtils.open(deleteDialogComponent);
+                if (model.selectedFiles.length > 0) {
+                    var dialog = PopupUtils.open(deleteDialogComponent)
+                    dialog.parent = photogridView
+                }
             }
         }
     ]
@@ -194,6 +199,7 @@
             id: sharePopover
 
             onContentPeerSelected: photogridView.exitUserSelectionMode();
+            onVisibleChanged: photogridView.toggleHeader()
 
             transferContentType: MimeTypeMapper.mimeTypeToContentType(model.get(model.selectedFiles[0], "fileType"));
             transferItems: model.selectedFiles.map(function(row) {
@@ -216,6 +222,7 @@
                 model.deleteSelectedFiles();
                 photogridView.exitUserSelectionMode();
             }
+            onVisibleChanged: photogridView.toggleHeader()
         }
     }
 }

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2015-10-22 12:24:15 +0000
+++ SlideshowView.qml	2015-11-26 13:45:48 +0000
@@ -49,12 +49,18 @@
         Action {
             text: i18n.tr("Share")
             iconName: "share"
-            onTriggered: PopupUtils.open(sharePopoverComponent)
+            onTriggered: {
+                var dialog = PopupUtils.open(sharePopoverComponent)
+                dialog.parent = slideshowView
+            }
         },
         Action {
             text: i18n.tr("Delete")
             iconName: "delete"
-            onTriggered: PopupUtils.open(deleteDialogComponent)
+            onTriggered: {
+                var dialog = PopupUtils.open(deleteDialogComponent)
+                dialog.parent = slideshowView
+            }
         }
     ]
 
@@ -323,6 +329,7 @@
                 contentItem.url = slideshowView.model.get(slideshowView.currentIndex, "filePath");
                 transferItems = [contentItem];
             }
+            onVisibleChanged: toggleHeader()
 
             transferContentType: MimeTypeMapper.mimeTypeToContentType(slideshowView.model.get(slideshowView.currentIndex, "fileType"));
         }
@@ -350,6 +357,7 @@
                 var currentFilePath = slideshowView.model.get(toBeDeleted, "filePath");
                 fileOperations.remove(currentFilePath);
             }
+            onVisibleChanged: toggleHeader()
         }
     }