From 331fe02266408da756dcde94702a23c2bee5162a Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Wed, 31 Mar 2004 17:05:52 +0000 Subject: Remove dialog separators Change the border with of the dialog's vbox and 2004-03-31 Rodney Dawes * e-shell-importer.c (choose_importer_from_list): (start_import): (prepare_intelligent_page): Remove dialog separators * e-shell-offline-handler.c (pop_up_confirmation_dialog): Change the border with of the dialog's vbox and action area to be HIG-compliant * e-shell-settings-dialog.c (init): Remove the dialog separator * e-shell-startup-wizard.c (prepare_importer_page): Remove the dialog separator to be more HIG-compliant (key_press_event_callback): Fix compile warnings and cast to the correct widget types for calling various gtk api Remove the dialog separator to be more HIG-compliant * main.c (show_development_warning): Make the devel warning dialog that pops up for unstable versions be HIG-compliant * glade/e-active-connection-dialog.glade: Make the active connection dialog for going off-line be HIG-compliant * importer/intelligent.c (create_gui): Remove the dialog separator and set the dialog's vbox and action area border widths to be more compliant with the HIG svn path=/trunk/; revision=25267 --- shell/ChangeLog | 23 ++++- shell/e-shell-importer.c | 3 + shell/e-shell-offline-handler.c | 2 + shell/e-shell-settings-dialog.c | 1 + shell/e-shell-startup-wizard.c | 11 ++- shell/glade/e-active-connection-dialog.glade | 129 ++++++++++++++++++--------- shell/importer/intelligent.c | 4 + shell/main.c | 31 ++++--- 8 files changed, 149 insertions(+), 55 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index b36a4950c3..4fe778ac9a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,4 +1,25 @@ -2004-03-26 Rodney Dawes +2004-03-31 Rodney Dawes + + * e-shell-importer.c (choose_importer_from_list): + (start_import): + (prepare_intelligent_page): Remove dialog separators + * e-shell-offline-handler.c (pop_up_confirmation_dialog): Change the + border with of the dialog's vbox and action area to be HIG-compliant + * e-shell-settings-dialog.c (init): Remove the dialog separator + * e-shell-startup-wizard.c (prepare_importer_page): Remove the dialog + separator to be more HIG-compliant + (key_press_event_callback): Fix compile warnings and cast to the + correct widget types for calling various gtk api + Remove the dialog separator to be more HIG-compliant + * main.c (show_development_warning): Make the devel warning dialog + that pops up for unstable versions be HIG-compliant + * glade/e-active-connection-dialog.glade: Make the active connection + dialog for going off-line be HIG-compliant + * importer/intelligent.c (create_gui): Remove the dialog separator + and set the dialog's vbox and action area border widths to be more + compliant with the HIG + +2004-03-26 Rodney Dawes * e-shell-settings-dialog.c (impl_realize): We don't need this really (class_init): We don't need to have our own realize impl for setting diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 0eba8d593d..d81bd0a456 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -333,6 +333,7 @@ choose_importer_from_list (GList *importer_list) GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); clist = gtk_clist_new (1); @@ -456,6 +457,7 @@ start_import (gpointer parent, const char *filename, EvolutionImporterClient *cl icd->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons(_("Importing"), NULL, 0, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL)); + gtk_dialog_set_has_separator (icd->dialog, FALSE); g_signal_connect (icd->dialog, "response", G_CALLBACK (dialog_response_cb), icd); g_object_weak_ref (G_OBJECT(icd->dialog), dialog_destroy_notify, icd); @@ -717,6 +719,7 @@ prepare_intelligent_page (GnomeDruidPage *page, dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", _("Please wait...\nScanning for existing setups")); e_make_widget_backing_stored (dialog); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("Starting Intelligent Importers")); gtk_widget_show_all (dialog); diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c index 3a0b9f8d40..52ff90d473 100644 --- a/shell/e-shell-offline-handler.c +++ b/shell/e-shell-offline-handler.c @@ -656,6 +656,8 @@ pop_up_confirmation_dialog (EShellOfflineHandler *offline_handler) } dialog = glade_xml_get_widget (priv->dialog_gui, "active_connection_dialog"); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12); /* FIXME: do we really want this? */ /* gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->parent_shell_view)); */ diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 0fda959b97..c96049e10d 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -325,6 +325,7 @@ init (EShellSettingsDialog *dialog) set_dialog_size (dialog); gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Settings")); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); } diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c index 47f91d0f5f..0bd93acddb 100644 --- a/shell/e-shell-startup-wizard.c +++ b/shell/e-shell-startup-wizard.c @@ -564,6 +564,7 @@ prepare_importer_page (GnomeDruidPage *page, dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, _("Please wait...\nScanning for existing setups")); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); e_make_widget_backing_stored (dialog); gtk_window_set_title (GTK_WINDOW (dialog), _("Starting import")); @@ -785,20 +786,22 @@ key_press_event_callback (GtkWidget *widget, "you have entered will be forgotten. You will need to run this assistant again " "before using Evolution.\n\nDo you want to quit using the Assistant now?"); - confirm_dialog = gtk_message_dialog_new (data->dialog, + confirm_dialog = gtk_message_dialog_new (GTK_WINDOW (data->dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, confirmations); - gtk_dialog_add_button (confirm_dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (confirm_dialog, GTK_STOCK_QUIT, GTK_RESPONSE_OK); + gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), GTK_STOCK_QUIT, GTK_RESPONSE_OK); + gtk_dialog_set_has_separator (GTK_DIALOG (confirm_dialog), + FALSE); returnvalue = gtk_dialog_run (GTK_DIALOG (confirm_dialog)); gtk_widget_destroy (confirm_dialog); if (returnvalue == GTK_RESPONSE_OK) { - startup_wizard_cancel (data->druid, data); + startup_wizard_cancel ((GnomeDruid *)data->druid, data); return TRUE; } } diff --git a/shell/glade/e-active-connection-dialog.glade b/shell/glade/e-active-connection-dialog.glade index 8e904da0b3..aab9ad6577 100644 --- a/shell/glade/e-active-connection-dialog.glade +++ b/shell/glade/e-active-connection-dialog.glade @@ -4,21 +4,22 @@ - 6 True Active Connections GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False + 256 + 192 True False - True + False True False - 6 + 0 @@ -41,6 +42,7 @@ True True + True True gtk-ok True @@ -58,17 +60,18 @@ - + + 12 True False - 6 + 12 True - The following connections are currently active: + <b>Active Connections</b> False - False + True GTK_JUSTIFY_LEFT False False @@ -78,29 +81,96 @@ 0 - 10 + 0 False False - + True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True - True - True - False - False - True + False + 12 + + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + True + + + + + 0 + True + True + + + + + + True + Click OK to close these connections and go offline + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + 0 + True + True + @@ -109,27 +179,6 @@ True - - - - True - Click OK to close these connections and go offline - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 10 - False - False - - 0 diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index 7a91e4fc04..16cfad30ff 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -186,6 +186,10 @@ create_gui (GList *importers) d = g_new (IntelligentImporterDialog, 1); d->dialog = dialog = gtk_dialog_new(); + gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE); + gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)dialog)->vbox, 0); + gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)dialog)->action_area, 12); + gtk_window_set_title((GtkWindow *)dialog, _("Importers")); dummy = gtk_button_new_from_stock(GTK_STOCK_CONVERT); gtk_button_set_label((GtkButton *)dummy, _("Import")); diff --git a/shell/main.c b/shell/main.c index 18762df621..1fee5219bf 100644 --- a/shell/main.c +++ b/shell/main.c @@ -192,6 +192,7 @@ warning_dialog_response_callback (GtkDialog *dialog, static void show_development_warning (GtkWindow *parent) { + GtkWidget *vbox; GtkWidget *label; GtkWidget *warning_dialog; GtkWidget *dont_bother_me_again_checkbox; @@ -208,9 +209,22 @@ show_development_warning (GtkWindow *parent) g_object_unref (client); - warning_dialog = gtk_dialog_new_with_buttons("Ximian Evolution " VERSION, parent, - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + warning_dialog = gtk_dialog_new (); + gtk_window_set_title (GTK_WINDOW (warning_dialog), "Ximian Evolution " VERSION); + gtk_window_set_modal (GTK_WINDOW (warning_dialog), TRUE); + gtk_dialog_add_button (GTK_DIALOG (warning_dialog), GTK_STOCK_OK, GTK_RESPONSE_OK); + e_dialog_set_transient_for (GTK_WINDOW (warning_dialog), GTK_WIDGET (parent)); + + gtk_dialog_set_has_separator (GTK_DIALOG (warning_dialog), FALSE); + + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (warning_dialog)->vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (warning_dialog)->action_area), 12); + + vbox = gtk_vbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), vbox, + TRUE, TRUE, 0); + text = g_strdup_printf( /* xgettext:no-c-format */ /* Preview/Alpha/Beta version warning message */ @@ -234,26 +248,23 @@ show_development_warning (GtkWindow *parent) g_free(text); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), - label, TRUE, TRUE, 4); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); label = gtk_label_new (_("Thanks\n" "The Ximian Evolution Team\n")); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT); gtk_misc_set_alignment(GTK_MISC(label), 1, .5); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), - label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); dont_bother_me_again_checkbox = gtk_check_button_new_with_label (_("Don't tell me again")); - /* GTK sucks. (Just so you know.) */ alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (alignment), dont_bother_me_again_checkbox); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), - alignment, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0); gtk_widget_show_all (warning_dialog); -- cgit v1.2.3