Merge lp:~vikoadi/pantheon-photos/fix-dialog-button-order into lp:~pantheon-photos/pantheon-photos/trunk

[Viko Adi Rahmawan]

arrange Dialog response button to conform elementary HIG

arrange Dialog response button to conform elementary HIG

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2014-09-27 09:20:58 +0000
+++ src/AppWindow.vala	2015-02-13 14:22:48 +0000
@@ -633,6 +633,27 @@
         return (Gtk.ResponseType) response;
     }
 
+    public static Gtk.ResponseType affirm_cancel_negate_question (string message,
+            string affirmative, string negative,
+            string? title = null, Gtk.Window? parent = null) {
+        Gtk.MessageDialog dialog = new Gtk.MessageDialog.with_markup ((parent != null) ? parent : get_instance (),
+                Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.NONE, "%s", build_alert_body_text (title, message));
+
+        dialog.add_buttons (affirmative, Gtk.ResponseType.YES,
+                            _ ("_Cancel"), Gtk.ResponseType.CANCEL,
+                            negative, Gtk.ResponseType.NO);
+
+        // Occasionally, with_markup doesn't actually enable markup, but set_markup always works.
+        dialog.set_markup (build_alert_body_text (title, message));
+        dialog.use_markup = true;
+
+        int response = dialog.run ();
+
+        dialog.destroy ();
+
+        return (Gtk.ResponseType) response;
+    }
+
     public static Gtk.ResponseType affirm_cancel_question (string message, string affirmative,
             string? title = null, Gtk.Window? parent = null) {
         Gtk.MessageDialog dialog = new Gtk.MessageDialog.with_markup ((parent != null) ? parent : get_instance (),
@@ -651,6 +672,24 @@
         return (Gtk.ResponseType) response;
     }
 
+    public static Gtk.ResponseType cancel_affirm_question (string message, string affirmative,
+            string? title = null, Gtk.Window? parent = null) {
+        Gtk.MessageDialog dialog = new Gtk.MessageDialog.with_markup ((parent != null) ? parent : get_instance (),
+                Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.NONE, "%s", message);
+        // Occasionally, with_markup doesn't actually enable markup...? Force the issue.
+        dialog.set_markup (message);
+        dialog.use_markup = true;
+        dialog.title = (title != null) ? title : _ (Resources.APP_TITLE);
+        dialog.add_buttons (_("_Cancel"), Gtk.ResponseType.CANCEL,
+                            affirmative, Gtk.ResponseType.YES);
+
+        int response = dialog.run ();
+
+        dialog.destroy ();
+
+        return (Gtk.ResponseType) response;
+    }
+
     public static Gtk.ResponseType negate_affirm_all_cancel_question (string message,
             string negative, string affirmative, string affirmative_all, string? title = null,
             Gtk.Window? parent = null) {
@@ -925,4 +964,4 @@
         return base.configure_event (event);
     }
 
-}
\ No newline at end of file
+}

=== modified file 'src/Dialogs.vala'
--- src/Dialogs.vala	2015-01-18 18:50:45 +0000
+++ src/Dialogs.vala	2015-02-13 14:22:48 +0000
@@ -128,7 +128,7 @@
 
     if (photos_remaining) {
         message += _ ("\n\nWould you like to continue exporting?");
-        response = AppWindow.affirm_cancel_question (message, _ ("Con_tinue"));
+        response = AppWindow.cancel_affirm_question (message, _ ("Con_tinue"));
     } else {
         AppWindow.error_message (message);
     }

=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2014-09-13 03:34:09 +0000
+++ src/direct/DirectPhotoPage.vala	2015-02-13 14:22:48 +0000
@@ -405,9 +405,10 @@
         bool is_writeable = get_photo ().get_file_format ().can_write ();
         string save_option = is_writeable ? _ ("_Save") : _ ("_Save a Copy");
 
-        Gtk.ResponseType response = AppWindow.negate_affirm_cancel_question (
-                                        _ ("Lose changes to %s?").printf (photo.get_basename ()), save_option,
-                                        _ ("Close _without Saving"));
+        Gtk.ResponseType response = AppWindow.affirm_cancel_negate_question (
+                                        _("Lose changes to %s?").printf (photo.get_basename ()),
+                                        _("Close _without Saving"),
+                                        save_option);
 
         if (response == Gtk.ResponseType.YES)
             photo.remove_all_transformations ();
@@ -557,4 +558,4 @@
         // direct.ui.
         ui_filenames.add ("direct_context.ui");
     }
-}
\ No newline at end of file
+}

=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2014-12-14 14:53:26 +0000
+++ src/library/LibraryWindow.vala	2015-02-13 14:22:48 +0000
@@ -848,7 +848,7 @@
 
     private void dispatch_import_jobs (GLib.SList<string> uris, string job_name, bool copy_to_library) {
         if (AppDirs.get_import_dir ().get_path () == Environment.get_home_dir () && notify_library_is_home_dir) {
-            Gtk.ResponseType response = AppWindow.affirm_cancel_question (
+            Gtk.ResponseType response = AppWindow.cancel_affirm_question (
                                             _ ("Shotwell is configured to import photos to your home directory.\n" +
                                                "We recommend changing this in <span weight=\"bold\">Edit %s Preferences</span>.\n" +
                                                "Do you want to continue importing photos?").printf ("▸"),
@@ -1559,4 +1559,4 @@
 
         return false;
     }
-}
\ No newline at end of file
+}