From b0f826ba589fb4950a75bded2762b6747cea4f75 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 22 May 2011 12:58:40 -0400 Subject: Bug 537691 - Account editor window HIG Change the OK button to Apply, and fix the padding around the window edges. People already bitching about the window being too tall are just gonna bitch louder now, but it does look better on normal size screens. --- e-util/e-config.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/e-util/e-config.c b/e-util/e-config.c index 0f2a13f00b..42b33e26c3 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -1135,33 +1135,40 @@ ec_dialog_response (GtkWidget *d, gint id, EConfig *ec) GtkWidget * e_config_create_window (EConfig *emp, GtkWindow *parent, const gchar *title) { - GtkWidget *w; + GtkWidget *window; e_config_create_widget (emp); if (emp->type == E_CONFIG_BOOK) { - w = gtk_dialog_new_with_buttons (title, parent, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - g_signal_connect(w, "response", G_CALLBACK(ec_dialog_response), emp); - - gtk_widget_ensure_style (w); - gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (w))), 0); - gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (w))), 12); - - gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area (((GtkDialog *) w)), emp->widget, TRUE, TRUE, 0); + GtkWidget *content_area; + + window = gtk_dialog_new_with_buttons ( + title, parent, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_APPLY, GTK_RESPONSE_OK, + NULL); + g_signal_connect ( + window, "response", + G_CALLBACK (ec_dialog_response), emp); + + gtk_container_set_border_width (GTK_CONTAINER (window), 5); + gtk_container_set_border_width (GTK_CONTAINER (emp->widget), 5); + + content_area = + gtk_dialog_get_content_area (GTK_DIALOG (window)); + gtk_box_pack_start ( + GTK_BOX (content_area), emp->widget, TRUE, TRUE, 0); } else { /* response is handled directly by the assistant stuff */ - w = emp->widget; - gtk_window_set_title ((GtkWindow *) w, title); + window = emp->widget; + gtk_window_set_title (GTK_WINDOW (window), title); } - emp->window = w; - gtk_widget_show (w); + emp->window = window; + gtk_widget_show (window); - return w; + return window; } static void -- cgit