diff options
| -rw-r--r-- | shell/ChangeLog | 14 | ||||
| -rw-r--r-- | shell/e-shell-folder-selection-dialog.c | 10 | ||||
| -rw-r--r-- | shell/e-shell-importer.c | 5 | ||||
| -rw-r--r-- | shell/glade/e-shell-folder-creation-dialog.glade | 12 |
4 files changed, 28 insertions, 13 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index fd490490f5..fb8c4a757c 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,19 @@ 2003-01-14 Ettore Perazzoli <ettore@ximian.com> + * e-shell-folder-selection-dialog.c + (e_shell_folder_selection_dialog_construct): Make dialog + New/Cancel/OK to match HIG. + + * glade/e-shell-folder-creation-dialog.glade: Swap Cancel/OK + buttons to match HIG. + + * e-shell-importer.c (choose_importer_from_list): Make dialog + Cancel/OK to match HIG. + + * e-shell-folder-selection-dialog.c + (e_shell_folder_selection_dialog_construct): Make dialog Cancel/OK + to match HIG. + * e-shell-view.c: Do not #include "e-bonobo-widget.h". 2003-01-14 Ettore Perazzoli <ettore@ximian.com> diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c index 381278327f..c744f237c9 100644 --- a/shell/e-shell-folder-selection-dialog.c +++ b/shell/e-shell-folder-selection-dialog.c @@ -405,16 +405,16 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s g_signal_connect (folder_selection_dialog, "delete_event", G_CALLBACK (delete_event_cb), folder_selection_dialog); - gtk_dialog_add_buttons (GTK_DIALOG (folder_selection_dialog), - GTK_STOCK_OK, GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - NULL); - if (allow_creation) gtk_dialog_add_buttons (GTK_DIALOG (folder_selection_dialog), GTK_STOCK_NEW, 1, NULL); + gtk_dialog_add_buttons (GTK_DIALOG (folder_selection_dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL); + gtk_dialog_set_response_sensitive (GTK_DIALOG (folder_selection_dialog), GTK_RESPONSE_OK, FALSE); /* Make sure we get destroyed if the shell gets destroyed. */ diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 64e9db22e3..7a2dd3f5a9 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -350,8 +350,8 @@ choose_importer_from_list (GList *importer_list) char *iid; dialog = gtk_dialog_new_with_buttons(_("Select importer"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_OK, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); clist = gtk_clist_new (1); for (p = importer_list; p; p = p->next) { @@ -514,7 +514,8 @@ start_import (const char *folderpath, icd = g_new (ImporterComponentData, 1); icd->stop = FALSE; icd->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons(_("Importing"), NULL, 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL)); + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + NULL)); g_signal_connect (icd->dialog, "response", G_CALLBACK (dialog_response_cb), icd); g_object_weak_ref (G_OBJECT(icd->dialog), dialog_destroy_notify, icd); diff --git a/shell/glade/e-shell-folder-creation-dialog.glade b/shell/glade/e-shell-folder-creation-dialog.glade index 504bdf1029..206f982aa0 100644 --- a/shell/glade/e-shell-folder-creation-dialog.glade +++ b/shell/glade/e-shell-folder-creation-dialog.glade @@ -27,26 +27,26 @@ <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="ok_button"> + <widget class="GtkButton" id="cancel_button"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> - <property name="label">gtk-ok</property> + <property name="label">gtk-cancel</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="response_id">-5</property> + <property name="response_id">-6</property> </widget> </child> <child> - <widget class="GtkButton" id="cancel_button"> + <widget class="GtkButton" id="ok_button"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> + <property name="label">gtk-ok</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="response_id">-6</property> + <property name="response_id">-5</property> </widget> </child> </widget> |