aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog34
-rw-r--r--addressbook/gui/component/addressbook-config.c3
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c2
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor-address.c2
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor-fullname.c2
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c2
-rw-r--r--addressbook/gui/contact-editor/e-contact-quick-add.c7
-rw-r--r--addressbook/gui/contact-editor/e-contact-save-as.c2
-rw-r--r--addressbook/gui/search/e-addressbook-search-dialog.c4
-rw-r--r--addressbook/gui/widgets/e-addressbook-util.c4
10 files changed, 48 insertions, 14 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 116e1dd395..cef06f0f64 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,39 @@
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
+ * gui/widgets/e-addressbook-util.c
+ (e_addressbook_prompt_save_dialog): Change dialog from
+ Yes/No/Cancel to Discard/Cancel/Save to match the HIG.
+
+ * gui/search/e-addressbook-search-dialog.c
+ (e_addressbook_search_dialog_init): Change dialog from OK/Cancel
+ to Cancel/OK to match the HIG.
+
+ * gui/contact-editor/e-contact-save-as.c (file_exists): Change
+ dialog from Overwrite/Cancel to Cancel/Overwrite to match the HIG.
+
+ * gui/contact-editor/e-contact-quick-add.c
+ (build_quick_add_dialog): Fix typo s/reponse/response/. Also
+ change the dialog to be Edit/Cancel/OK instead of OK/Edit/Cancel
+ to match the HIG.
+
+ * gui/contact-editor/e-contact-editor.c
+ (e_contact_editor_confirm_delete): Make alert cancel/delete
+ instead of delete/cancel to match the HIG.
+
+ * gui/contact-editor/e-contact-editor-fullname.c
+ (e_contact_editor_fullname_init): Make dialog Cancel/OK instead of
+ OK/Cancel to match the HIG.
+
+ * gui/contact-editor/e-contact-editor-address.c
+ (e_contact_editor_address_init): Make dialog Cancel/OK instead of
+ OK/Cancel to match the HIG.
+
+ * gui/component/select-names/e-select-names.c
+ (e_select_names_init): Make dialog Cancel/OK instead of OK/Cancel
+ to match the HIG.
+
+2003-01-14 Ettore Perazzoli <ettore@ximian.com>
+
* gui/component/Makefile.am (EXTRA_DIST): Add $(schema_DATA).
2003-01-09 Chris Toshok <toshok@ximian.com>
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index bee8261fb0..8bae268ced 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -703,7 +703,8 @@ static void
search_base_selection_model_changed (ESelectionModel *selection_model, GtkWidget *dialog)
{
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
- GTK_RESPONSE_OK, e_selection_model_selected_count (selection_model) == 1);
+ GTK_RESPONSE_OK,
+ e_selection_model_selected_count (selection_model) == 1);
}
static void
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 8b0531093b..f08afe10db 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -484,8 +484,8 @@ e_select_names_init (ESelectNames *e_select_names)
gtk_widget_unref(widget);
gtk_dialog_add_buttons (GTK_DIALOG (e_select_names),
- GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (e_select_names),
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index 8bb5a075f8..1839083f27 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -414,8 +414,8 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
char *icon_path;
gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_address),
- GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index aa06e66eae..08186d25b3 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -106,8 +106,8 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
char *icon_path;
gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_fullname),
- GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index e6385bb433..3cb855fcad 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -1047,8 +1047,8 @@ e_contact_editor_confirm_delete (GtkWindow *parent)
"to delete this contact?"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- _("Delete"), GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT,
NULL);
result = gtk_dialog_run(GTK_DIALOG (dialog));
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 69af7802b2..fc29fff1a6 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -299,13 +299,12 @@ build_quick_add_dialog (QuickAdd *qa)
dialog = gtk_dialog_new_with_buttons (_("Contact Quick-Add"),
NULL, /* XXX */
(GtkDialogFlags) 0,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- _("Edit Full"), QUICK_ADD_RESPONSE_EDIT_FULL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("Edit Full"), QUICK_ADD_RESPONSE_EDIT_FULL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
- g_signal_connect (dialog, "reponse",
- G_CALLBACK (clicked_cb), qa);
+ g_signal_connect (dialog, "response", G_CALLBACK (clicked_cb), qa);
qa->name_entry = gtk_entry_new ();
if (qa->name)
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
index f281b1925f..48abe98813 100644
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ b/addressbook/gui/contact-editor/e-contact-save-as.c
@@ -211,8 +211,8 @@ file_exists(GtkFileSelection *filesel, const char *filename)
_("%s already exists\nDo you want to overwrite it?"), filename);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- _("Overwrite"), GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ _("Overwrite"), GTK_RESPONSE_ACCEPT,
NULL);
response = gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
index 157d22cbad..443c30f6a5 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -120,9 +120,9 @@ e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
gtk_widget_show(view->search);
gtk_dialog_add_buttons (dialog,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- /*GTK_STOCK_SAVE, GTK_RESPONSE_APPLY,*/
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ /*GTK_STOCK_SAVE, GTK_RESPONSE_APPLY,*/
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
index 3d5ad8dc37..fa554b5dd2 100644
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ b/addressbook/gui/widgets/e-addressbook-util.c
@@ -73,9 +73,9 @@ e_addressbook_prompt_save_dialog (GtkWindow *parent)
GTK_BUTTONS_NONE,
_("Do you want to save changes?"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_YES, GTK_RESPONSE_YES,
- GTK_STOCK_NO, GTK_RESPONSE_NO,
+ _("_Discard"), GTK_RESPONSE_NO,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE, GTK_RESPONSE_YES,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);