[frogr] Fixed wrong button layout in dialogs

[Mario Sanchez Prada <msanchez src gnome org>]

commit 0716aabdea3592abdfae6d926243f702fbec92d2
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Wed Dec 19 15:46:46 2012 +0100

    Fixed wrong button layout in dialogs
    
     * Changed the order of OK/Cancel buttons where they were misplaced
     * Written button labels as imperative verbs (e.g. 'Edit', 'Add', 'Close')
     * Use GTK_STOCK_SAVE instead of GTK_STOCK_OPEN for 'Save' dialogs
    
    https://bugzilla.gnome.org/show_bug.cgi?id=690415

 src/frogr-add-tags-dialog.c       |    6 +++---
 src/frogr-add-to-group-dialog.c   |    6 +++---
 src/frogr-add-to-set-dialog.c     |    6 +++---
 src/frogr-auth-dialog.c           |   10 +++++-----
 src/frogr-controller.c            |    4 ++--
 src/frogr-create-new-set-dialog.c |    6 +++---
 src/frogr-details-dialog.c        |    8 ++++----
 src/frogr-main-view.c             |    2 +-
 src/frogr-settings-dialog.c       |    8 ++++----
 9 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/src/frogr-add-tags-dialog.c b/src/frogr-add-tags-dialog.c
index bb14e4f..96acc52 100644
--- a/src/frogr-add-tags-dialog.c
+++ b/src/frogr-add-tags-dialog.c
@@ -69,7 +69,7 @@ _set_pictures (FrogrAddTagsDialog *self, const GSList *pictures)
 static void
 _dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
-  if (response == GTK_RESPONSE_OK)
+  if (response == GTK_RESPONSE_ACCEPT)
     {
       FrogrAddTagsDialog *self = NULL;
       FrogrAddTagsDialogPrivate *priv = NULL;
@@ -195,10 +195,10 @@ frogr_add_tags_dialog_init (FrogrAddTagsDialog *self)
 
   /* Create widgets */
   gtk_dialog_add_buttons (GTK_DIALOG (self),
-                          GTK_STOCK_OK,
-                          GTK_RESPONSE_OK,
                           GTK_STOCK_CANCEL,
                           GTK_RESPONSE_CANCEL,
+                          GTK_STOCK_ADD,
+                          GTK_RESPONSE_ACCEPT,
                           NULL);
   gtk_container_set_border_width (GTK_CONTAINER (self), 6);
 
diff --git a/src/frogr-add-to-group-dialog.c b/src/frogr-add-to-group-dialog.c
index 1ae3fcf..bd03322 100644
--- a/src/frogr-add-to-group-dialog.c
+++ b/src/frogr-add-to-group-dialog.c
@@ -421,7 +421,7 @@ _update_pictures (FrogrAddToGroupDialog *self)
 static void
 _dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
-  if (response == GTK_RESPONSE_OK)
+  if (response == GTK_RESPONSE_ACCEPT)
     {
       FrogrAddToGroupDialog *self = NULL;
 
@@ -547,10 +547,10 @@ frogr_add_to_group_dialog_init (FrogrAddToGroupDialog *self)
 
   /* Create widgets */
   gtk_dialog_add_buttons (GTK_DIALOG (self),
-                          GTK_STOCK_OK,
-                          GTK_RESPONSE_OK,
                           GTK_STOCK_CANCEL,
                           GTK_RESPONSE_CANCEL,
+                          GTK_STOCK_ADD,
+                          GTK_RESPONSE_ACCEPT,
                           NULL);
   gtk_container_set_border_width (GTK_CONTAINER (self), 6);
 
diff --git a/src/frogr-add-to-set-dialog.c b/src/frogr-add-to-set-dialog.c
index ab300a0..27b0b75 100644
--- a/src/frogr-add-to-set-dialog.c
+++ b/src/frogr-add-to-set-dialog.c
@@ -422,7 +422,7 @@ _update_pictures (FrogrAddToSetDialog *self)
 static void
 _dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
-  if (response == GTK_RESPONSE_OK)
+  if (response == GTK_RESPONSE_ACCEPT)
     {
       FrogrAddToSetDialog *self = NULL;
 
@@ -548,10 +548,10 @@ frogr_add_to_set_dialog_init (FrogrAddToSetDialog *self)
 
   /* Create widgets */
   gtk_dialog_add_buttons (GTK_DIALOG (self),
-                          GTK_STOCK_OK,
-                          GTK_RESPONSE_OK,
                           GTK_STOCK_CANCEL,
                           GTK_RESPONSE_CANCEL,
+                          GTK_STOCK_ADD,
+                          GTK_RESPONSE_ACCEPT,
                           NULL);
   gtk_container_set_border_width (GTK_CONTAINER (self), 6);
 
diff --git a/src/frogr-auth-dialog.c b/src/frogr-auth-dialog.c
index a1075f2..830db49 100644
--- a/src/frogr-auth-dialog.c
+++ b/src/frogr-auth-dialog.c
@@ -55,7 +55,7 @@ _ask_for_authorization (GtkWindow *parent)
   dialog = gtk_message_dialog_new (parent,
                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_OK,
+                                   GTK_BUTTONS_CLOSE,
                                    _(unauth_txt),
                                    APP_SHORTNAME);
 
@@ -72,7 +72,7 @@ _ask_for_authorization (GtkWindow *parent)
 static void
 _ask_for_authorization_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
-  if (response == GTK_RESPONSE_OK)
+  if (response == GTK_RESPONSE_CLOSE)
     {
       FrogrController *controller = frogr_controller_get_instance();
       frogr_controller_open_auth_url (controller);
@@ -148,8 +148,8 @@ _ask_for_auth_confirmation (GtkWindow *parent)
   dialog = gtk_dialog_new_with_buttons (title,
                                         parent,
                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_STOCK_OK,
-                                        GTK_RESPONSE_OK,
+                                        GTK_STOCK_CLOSE,
+                                        GTK_RESPONSE_CLOSE,
                                         NULL);
   g_free (title);
 
@@ -192,7 +192,7 @@ _ask_for_auth_confirmation_response_cb (GtkDialog *dialog, gint response, gpoint
 {
   gboolean valid = FALSE;
 
-  if (response == GTK_RESPONSE_OK)
+  if (response == GTK_RESPONSE_CLOSE)
     {
       const gchar *vercode_part1 = NULL;
       const gchar *vercode_part2 = NULL;
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index 9d55033..82d21df 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -627,7 +627,7 @@ _show_auth_failed_dialog (GtkWindow *parent, const gchar *message, gboolean auto
   dialog = gtk_message_dialog_new (parent,
                                    GTK_DIALOG_MODAL,
                                    GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
+                                   GTK_BUTTONS_CLOSE,
                                    "%s", message);
   gtk_window_set_title (GTK_WINDOW (dialog), APP_SHORTNAME);
 
@@ -660,7 +660,7 @@ static void
 _auth_failed_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
   gboolean auto_retry = (gboolean)GPOINTER_TO_INT (data);
-  if (auto_retry && response == GTK_RESPONSE_OK)
+  if (auto_retry && response == GTK_RESPONSE_CLOSE)
     {
       frogr_controller_show_auth_dialog (frogr_controller_get_instance ());
       DEBUG ("%s", "Showing the authorization dialog once again...");
diff --git a/src/frogr-create-new-set-dialog.c b/src/frogr-create-new-set-dialog.c
index 47b1a87..4d637ee 100644
--- a/src/frogr-create-new-set-dialog.c
+++ b/src/frogr-create-new-set-dialog.c
@@ -208,7 +208,7 @@ _dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
 
   /* Try to save data if response is OK */
   self = FROGR_CREATE_NEW_SET_DIALOG (dialog);
-  if (response == GTK_RESPONSE_OK && _save_data (self) == FALSE)
+  if (response == GTK_RESPONSE_ACCEPT && _save_data (self) == FALSE)
     return;
 
   /* Destroy the dialog */
@@ -325,10 +325,10 @@ frogr_create_new_set_dialog_init (FrogrCreateNewSetDialog *self)
 
   /* Create widgets */
   gtk_dialog_add_buttons (GTK_DIALOG (self),
-                          GTK_STOCK_OK,
-                          GTK_RESPONSE_OK,
                           GTK_STOCK_CANCEL,
                           GTK_RESPONSE_CANCEL,
+                          GTK_STOCK_ADD,
+                          GTK_RESPONSE_ACCEPT,
                           NULL);
   gtk_container_set_border_width (GTK_CONTAINER (self), 6);
 
diff --git a/src/frogr-details-dialog.c b/src/frogr-details-dialog.c
index 1f562da..0b3f7d4 100644
--- a/src/frogr-details-dialog.c
+++ b/src/frogr-details-dialog.c
@@ -1076,13 +1076,13 @@ _dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
   FrogrDetailsDialog *self = FROGR_DETAILS_DIALOG (dialog);
 
   /* Try to save data if response is OK */
-  if (response == GTK_RESPONSE_OK && _save_data (self) == FALSE)
+  if (response == GTK_RESPONSE_ACCEPT && _save_data (self) == FALSE)
     return;
 
   gtk_widget_destroy (GTK_WIDGET (self));
 
   /* Ensure pictures are reordered on OK */
-  if (response == GTK_RESPONSE_OK)
+  if (response == GTK_RESPONSE_ACCEPT)
     frogr_controller_reorder_pictures (frogr_controller_get_instance ());
 }
 
@@ -1191,7 +1191,7 @@ frogr_details_dialog_init (FrogrDetailsDialog *self)
 
   gtk_dialog_add_buttons (GTK_DIALOG (self),
                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                          GTK_STOCK_OK, GTK_RESPONSE_OK,
+                          GTK_STOCK_EDIT, GTK_RESPONSE_ACCEPT,
                           NULL);
   gtk_container_set_border_width (GTK_CONTAINER (self), 6);
 
@@ -1199,7 +1199,7 @@ frogr_details_dialog_init (FrogrDetailsDialog *self)
                     G_CALLBACK (_dialog_response_cb), NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG (self),
-                                   GTK_RESPONSE_OK);
+                                   GTK_RESPONSE_ACCEPT);
 }
 
 
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index aec0b51..7389ae8 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -1333,7 +1333,7 @@ _save_project_as_dialog (FrogrMainView *self)
                                         GTK_WINDOW (self),
                                         GTK_FILE_CHOOSER_ACTION_SAVE,
                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                        GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
                                         NULL);
 
   gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), _("Untitled Project.frogr"));
diff --git a/src/frogr-settings-dialog.c b/src/frogr-settings-dialog.c
index ac8b5c7..7b860d7 100644
--- a/src/frogr-settings-dialog.c
+++ b/src/frogr-settings-dialog.c
@@ -864,7 +864,7 @@ static void _dialog_response_cb (GtkDialog *dialog, gint response, gpointer data
   FrogrSettingsDialog *self = FROGR_SETTINGS_DIALOG (dialog);
   FrogrSettingsDialogPrivate *priv = FROGR_SETTINGS_DIALOG_GET_PRIVATE (self);
 
-  if (response == GTK_RESPONSE_OK)
+  if (response == GTK_RESPONSE_CLOSE)
     {
       /* Try to save data if response is OK */
       if (!_save_data (self))
@@ -992,10 +992,10 @@ frogr_settings_dialog_init (FrogrSettingsDialog *self)
 
   /* Create widgets */
   gtk_dialog_add_buttons (GTK_DIALOG (self),
-                          GTK_STOCK_OK,
-                          GTK_RESPONSE_OK,
                           GTK_STOCK_CANCEL,
                           GTK_RESPONSE_CANCEL,
+                          GTK_STOCK_CLOSE,
+                          GTK_RESPONSE_CLOSE,
                           NULL);
   gtk_container_set_border_width (GTK_CONTAINER (self), 6);
 
@@ -1018,7 +1018,7 @@ frogr_settings_dialog_init (FrogrSettingsDialog *self)
                     NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG (self),
-                                   GTK_RESPONSE_OK);
+                                   GTK_RESPONSE_CLOSE);
 }