From 0c843e88a595d6191a043426b99b49f65d2b24e4 Mon Sep 17 00:00:00 2001 From: Christian Neumair Date: Mon, 19 May 2003 19:53:28 +0000 Subject: Made (hopefully) all dialogs HIG compliant, at least when it comes to spacing. Last patch of the #112781 patch series. --- src/bookmarks/ephy-bookmark-properties.c | 7 ++++--- src/bookmarks/ephy-new-bookmark.c | 15 +++++++++------ src/pdm-dialog.c | 8 ++++---- src/session.c | 5 +++-- src/window-commands.c | 7 +++++++ 5 files changed, 27 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index ad8afff56..5180d3863 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -335,12 +335,13 @@ build_ui (EphyBookmarkProperties *editor) set_window_icon (editor); gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE); - gtk_container_set_border_width (GTK_CONTAINER (editor), 6); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (editor)->vbox), 12); + gtk_container_set_border_width (GTK_CONTAINER (editor), 5); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (editor)->vbox), 2); table = gtk_table_new (2, 2, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 6); + gtk_table_set_col_spacings (GTK_TABLE (table), 12); + gtk_container_set_border_width (GTK_CONTAINER (GTK_TABLE (table)), 5); gtk_widget_show (table); entry = gtk_entry_new (); diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c index 0ddcef6c0..6a842b42b 100644 --- a/src/bookmarks/ephy-new-bookmark.c +++ b/src/bookmarks/ephy-new-bookmark.c @@ -207,7 +207,8 @@ build_editing_table (EphyNewBookmark *editor) table = gtk_table_new (2, 2, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 6); + gtk_table_set_col_spacings (GTK_TABLE (table), 12); + gtk_container_set_border_width (GTK_CONTAINER (GTK_TABLE (table)), 5); gtk_widget_show (table); @@ -273,16 +274,17 @@ ephy_new_bookmark_construct (EphyNewBookmark *editor) g_object_unref(icon); gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE); - gtk_container_set_border_width (GTK_CONTAINER (editor), 6); + gtk_container_set_border_width (GTK_CONTAINER (editor), 5); g_signal_connect (G_OBJECT (editor), "response", G_CALLBACK (response_cb), editor); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (editor)->vbox), 12); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (editor)->vbox), 2); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox), build_editing_table (editor), TRUE, TRUE, 0); + gtk_dialog_add_button (GTK_DIALOG (editor), GTK_STOCK_HELP, GTK_RESPONSE_HELP); @@ -308,15 +310,16 @@ duplicate_dialog_construct (GtkWindow *parent, * so we build our own. See bug 65501. */ - dialog = gtk_dialog_new_with_buttons (_("Duplicated bookmark"), + dialog = gtk_dialog_new_with_buttons (_("Duplicated Bookmark"), GTK_WINDOW (parent), GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 12); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); hbox = gtk_hbox_new (FALSE, 6); gtk_widget_show (hbox); diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 41bb553e4..87e594812 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -601,7 +601,7 @@ show_cookies_properties (PdmDialog *dialog, PROP_DIALOG); gdialog = gtk_dialog_new_with_buttons - (_("Cookie properties"), + (_("Cookie Properties"), GTK_WINDOW(parent), GTK_DIALOG_MODAL, GTK_STOCK_CLOSE, 0, NULL); @@ -609,9 +609,9 @@ show_cookies_properties (PdmDialog *dialog, gtk_container_set_border_width (GTK_CONTAINER(gdialog), 6); table = gtk_table_new (2, 4, FALSE); - gtk_container_set_border_width (GTK_CONTAINER(table), 6); - gtk_table_set_row_spacings (GTK_TABLE(table), 10); - gtk_table_set_col_spacings (GTK_TABLE(table), 10); + gtk_container_set_border_width (GTK_CONTAINER(table), 5); + gtk_table_set_row_spacings (GTK_TABLE(table), 6); + gtk_table_set_col_spacings (GTK_TABLE(table), 12); gtk_widget_show (table); str = g_strconcat ("", _("Value:"), "", NULL); diff --git a/src/session.c b/src/session.c index 9b9bdcad7..9d568a22f 100644 --- a/src/session.c +++ b/src/session.c @@ -197,10 +197,11 @@ crashed_resume_dialog (Session *session) NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 12); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); hbox = gtk_hbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (GTK_BOX (hbox)), 5); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 0); diff --git a/src/window-commands.c b/src/window-commands.c index d827a95f5..fbc141ca0 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -695,18 +695,25 @@ window_cmd_edit_toolbar (EggAction *action, EGG_TOOLBARS_MODEL (model)); egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor), ephy_file ("epiphany-toolbar.xml")); + gtk_container_set_border_width (GTK_CONTAINER (EGG_TOOLBAR_EDITOR (editor)), 5); + gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor); g_signal_connect (editor, "destroy", G_CALLBACK (toolbar_editor_destroy_cb), t); gtk_widget_show (editor); + + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add a New Toolbar"), RESPONSE_ADD_TOOLBAR); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_HELP, GTK_RESPONSE_HELP); + g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (toolbar_editor_response_cb), NULL); ephy_state_add_window (dialog, -- cgit v1.2.3