Merge lp:~doflah/gallery-app/reuse_delete_dialog into lp:gallery-app

[Dennis O'Flaherty]

One of the delete dialogs didn't have the correct color scheme. This patch fixes it: ok -> orange, cancel -> gray.

[Arthur Mello (artmello)]

We now have two delete dialog options, the old one changed by this MR and a new one, for when the photo is inside an album. Would be good to update both of them to have this feature.

review: Needs Fixing

[Sebastien Bacher (seb128)]

the issue is resolved, rejecting the change it's not needed

Unmerged revisions

955. By Dennis O'Flaherty on 2014-04-26

Use the DeleteDialog in the PhotoViewer for consistency

=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml	2014-04-23 14:24:04 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml	2014-05-07 02:45:34 +0000
@@ -280,34 +280,17 @@
 
         Component {
             id: deleteDialog
-            Dialog {
-                id: dialogue
-                objectName: "deletePhotoDialog"
+            DeleteDialog {
                 title: i18n.tr("Delete a photo")
 
-                function finishRemove() {
+                onDeleteClicked: {
+                    viewerWrapper.model.destroyMedia(galleryPhotoViewer.media, true);
+                    galleryPhotoViewer.currentIndexChanged();
                     if (!album === undefined)
                         return;
                     if (model.count === 0)
                         galleryPhotoViewer.closeRequested();
                 }
-
-                Button {
-                    objectName: "deletePhotoDialogYes"
-                    text: i18n.tr("Yes")
-                    color: Gallery.HIGHLIGHT_BUTTON_COLOR
-                    onClicked: {
-                        PopupUtils.close(dialogue)
-                        viewerWrapper.model.destroyMedia(galleryPhotoViewer.media, true);
-                        galleryPhotoViewer.currentIndexChanged();
-                        dialogue.finishRemove();
-                    }
-                }
-                Button {
-                    objectName: "deletePhotoDialogNo"
-                    text: i18n.tr("No")
-                    onClicked: PopupUtils.close(dialogue)
-                }
             }
         }
 

=== modified file 'tests/autopilot/gallery_app/emulators/photo_viewer.py'
--- tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-05-01 15:27:13 +0000
+++ tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-05-07 02:45:34 +0000
@@ -14,16 +14,6 @@
         super(PhotoViewer, self).__init__(self)
         self.app = app
 
-    def get_delete_dialog(self):
-        """Returns the photo viewer delete dialog."""
-        return self.app.wait_select_single("Dialog",
-                                           objectName="deletePhotoDialog")
-
-    def delete_dialog_shown(self):
-        dialog = self.app.select_many("Dialog",
-                                      objectName="deletePhotoDialog")
-        return len(dialog) >= 1
-
     def get_popup_album_picker(self):
         """Returns the photo viewer album pickers."""
         return self.app.wait_select_single("PopupAlbumPicker",
@@ -75,18 +65,6 @@
         """Returns the 'auto enhance' menu item in the edit dialog."""
         return self.app.select_single("Standard", objectName='enhanceListItem')
 
-    def get_delete_popover_delete_item(self):
-        """Returns the delete button of the delete popover."""
-        return self.app.select_single("Button",
-                                      objectName="deletePhotoDialogYes",
-                                      visible=True)
-
-    def get_delete_popover_cancel_item(self):
-        """Returns the cancel button of the delete popover."""
-        return self.app.select_single("Button",
-                                      objectName="deletePhotoDialogNo",
-                                      visible=True)
-
     def get_opened_photo(self):
         """Returns the first opened photo."""
         return self.app.wait_select_single("ZoomablePhotoComponent",

=== modified file 'tests/autopilot/gallery_app/tests/test_photo_viewer.py'
--- tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-05-01 15:27:13 +0000
+++ tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-05-07 02:45:34 +0000
@@ -112,7 +112,7 @@
     def delete_one_picture(self):
         self.main_view.open_toolbar().click_button("deleteButton")
         self.get_delete_dialog()
-        delete_item = self.photo_viewer.get_delete_popover_delete_item()
+        delete_item = self.gallery_utils.get_delete_dialog_delete_button()
         self.click_item(delete_item)
         self.ensure_closed_delete_dialog()
 
@@ -123,7 +123,7 @@
 
         photo_viewer = self.photo_viewer.get_main_photo_viewer()
 
-        cancel_item = self.photo_viewer.get_delete_popover_cancel_item()
+        cancel_item = self.photo_viewer.get_delete_dialog_cancel_button()
         self.click_item(cancel_item)
         self.ensure_closed_delete_dialog()