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. --- ChangeLog | 14 + data/glade/epiphany.glade | 188 ++++--- data/glade/prefs-dialog.glade | 587 +++++++++++---------- data/glade/print.glade | 880 ++++++++++++++++--------------- 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 + 9 files changed, 887 insertions(+), 824 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6227410c..2be922cb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-05-19 Christian Neumair + + * data/glade/epiphany.glade + * data/glade/prefs-dialog.glade + * data/glade/print.glade + * src/bookmarks/ephy-bookmark-properties.c + * src/bookmarks/ephy-new-bookmark.c + * src/pdm-dialog.c + * src/session.c + * src/window-commands.c : + + Made (hopefully) all dialogs HIG compliant, at least when it comes to spacing. + Last patch of the #112781 patch series. + 2003-05-19 David Bordoley * embed/downloader-view.c: (downloader_view_build_ui): diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade index c272bdfe7..4a5cd8a77 100644 --- a/data/glade/epiphany.glade +++ b/data/glade/epiphany.glade @@ -5,7 +5,7 @@ - 6 + 5 Find GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -18,7 +18,7 @@ True False - 0 + 2 @@ -182,93 +182,32 @@ - - 6 + + 5 True False - 0 + 6 - + True False - 6 + 12 - + True - False - 6 - - - - True - _Find: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - find_entry - - - 0 - False - False - - - - - - True - FindEntry - 10 - - - - True - True - True - True - True - 0 - - True - * - True - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - C_ase sensitive + _Find: True - GTK_RELIEF_NORMAL - False - False - True - + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + find_entry 0 @@ -278,21 +217,31 @@ - + True - True - _Wrap around - True - GTK_RELIEF_NORMAL - False - False - True - + FindEntry + 10 + + + + True + True + True + True + True + 0 + + True + * + True + + + 0 - False - False + True + True @@ -302,6 +251,44 @@ True + + + + True + True + C_ase sensitive + True + GTK_RELIEF_NORMAL + False + False + True + + + + 0 + False + False + + + + + + True + True + _Wrap around + True + GTK_RELIEF_NORMAL + False + False + True + + + + 0 + False + False + + 2 @@ -333,7 +320,7 @@ True GTK_BUTTONBOX_END - 8 + 6 @@ -418,13 +405,13 @@ True False - 6 + 12 True True - _Keep the dialog open + _Keep dialog open True GTK_RELIEF_NORMAL False @@ -481,7 +468,7 @@ True - Download _details... + Download _Details... True False GTK_JUSTIFY_LEFT @@ -750,10 +737,10 @@ - 7 + 5 400 300 - Personal data manager + Personal Data Manager GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -765,7 +752,7 @@ True False - 0 + 2 @@ -996,7 +983,7 @@ - 6 + 5 Choose the file type action GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -1009,7 +996,7 @@ True False - 12 + 14 @@ -1072,9 +1059,10 @@ + 5 True False - 5 + 6 diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade index 72d7dfeea..7d6fe4e26 100644 --- a/data/glade/prefs-dialog.glade +++ b/data/glade/prefs-dialog.glade @@ -19,7 +19,7 @@ True False - 0 + 2 @@ -319,7 +319,7 @@ True True - _Open in tabs by default + Open in _tabs by default True GTK_RELIEF_NORMAL False @@ -897,7 +897,7 @@ True False - 5 + 12 @@ -1133,7 +1133,7 @@ True False - 0 + 12 @@ -1337,7 +1337,7 @@ True True - Allow popup windows + Allow _popup windows True GTK_RELIEF_NORMAL False @@ -1526,8 +1526,8 @@ 0 - False - False + True + True @@ -1677,8 +1677,8 @@ 0 - False - False + True + True @@ -1696,8 +1696,8 @@ 0 - False - False + True + True @@ -1715,8 +1715,8 @@ 0 - False - False + True + True @@ -1734,8 +1734,8 @@ 0 - False - False + True + True @@ -1755,30 +1755,6 @@ 6 12 - - - True - kB - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 0 - 1 - - - - - True @@ -1854,43 +1830,44 @@ - + True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False + kB + False + False + GTK_JUSTIFY_CENTER False - 1 0 1e+06 1000 10 10 + False + 0 + 0.5 + 0 + 0 - 1 - 2 - 1 - 2 + 2 + 3 + 0 + 1 + - + True True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 1e+06 1000 10 10 + Clear _Disk Cache + True + GTK_RELIEF_NORMAL + - 1 - 2 + 3 + 4 0 1 + fill @@ -1909,41 +1886,66 @@ 4 1 2 - + fill - + True True - Clear _Disk Cache - True - GTK_RELIEF_NORMAL - + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 1e+06 1000 10 10 - 3 - 4 + 1 + 2 0 1 fill + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 1e+06 1000 10 10 + + + 1 + 2 + 1 + 2 + fill + + + 0 - False - False + True + True 0 - False - False + True + True @@ -1965,7 +1967,7 @@ True False - 0 + 6 @@ -1989,220 +1991,240 @@ - - 12 + True - 3 - 3 False - 6 - 12 + 0 - + True - Autodetec_t encoding: - True + + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 1 + 0.5 0.5 0 0 - autocharset_optionmenu - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - _Default encoding: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - default_charset_optionmenu - - - 0 - 1 - 1 - 2 - fill - - - + 3 + 3 + False + 6 + 12 - - - True - Lan_guage: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - language_optionmenu - - - 0 - 1 - 2 - 3 - fill - - - + + + True + Autodetec_t encoding: + True + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + autocharset_optionmenu + + + 0 + 1 + 0 + 1 + fill + + + - - - True - True - -1 - - - 1 - 2 - 2 - 3 - fill - - - + + + True + _Default encoding: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + default_charset_optionmenu + + + 0 + 1 + 1 + 2 + fill + + + - - - True - True - -1 - - - 1 - 2 - 1 - 2 - fill - - - + + + True + Lan_guage: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + language_optionmenu + + + 0 + 1 + 2 + 3 + fill + + + - - - True - True - 0 + + + True + True + -1 + + + 1 + 2 + 2 + 3 + fill + + + - - + + True + True + -1 + + + 1 + 2 + 1 + 2 + fill + + + - - - True - Off - True - - + + + True + True + 0 - - + + True - Chinese - True - - - - - True - East asian - True - - + + + True + Off + True + + - - - True - Japanese - True - - + + + True + Chinese + True + + - - - True - Korean - True - - + + + True + East asian + True + + - - - True - Russian - True - - + + + True + Japanese + True + + - - - True - Simplified Chinese - True - - + + + True + Korean + True + + - - - True - Traditional Chinese - True - - + + + True + Russian + True + + - - - True - Ukrainian - True + + + True + Simplified Chinese + True + + + + + + True + Traditional Chinese + True + + + + + + True + Ukrainian + True + + + + 1 + 2 + 0 + 1 + + - - - 1 - 2 - 0 - 1 - - - - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 0 @@ -2214,35 +2236,38 @@ GTK_RELIEF_NORMAL + + 2 + 3 + 2 + 3 + + - - - 2 - 3 - 2 - 3 - fill - fill - - - - - True - gtk-select-font - 6 - 0.5 - 0.5 - 0 - 0 + + + True + gtk-select-font + 6 + 0.5 + 0.5 + 0 + 0 + + + 2 + 3 + 0 + 2 + fill + + - 2 - 3 - 0 - 2 - fill - fill + 0 + True + True @@ -2296,9 +2321,9 @@ - 6 + 5 300 - Languages editor + Language Editor GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -2310,7 +2335,7 @@ True False - 0 + 2 @@ -2364,7 +2389,7 @@ - 6 + 5 True False 6 @@ -2373,12 +2398,12 @@ True False - 6 + 12 True - Language + Language: False False GTK_JUSTIFY_LEFT diff --git a/data/glade/print.glade b/data/glade/print.glade index 1e3b71707..848fb8314 100644 --- a/data/glade/print.glade +++ b/data/glade/print.glade @@ -5,7 +5,7 @@ - 7 + 5 Print GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -18,7 +18,7 @@ True False - 6 + 2 @@ -158,7 +158,7 @@ True True - P_rinter + P_rinter: True GTK_RELIEF_NORMAL False @@ -179,7 +179,7 @@ True True - _File + _File: True GTK_RELIEF_NORMAL False @@ -197,27 +197,6 @@ - - - True - True - True - True - 0 - lpr - True - * - False - - - 1 - 2 - 0 - 1 - - - - True @@ -248,11 +227,32 @@ + + + + True + True + True + True + 0 + lpr + True + * + False + + + 1 + 2 + 0 + 1 + + + 0 - False - False + True + True @@ -279,7 +279,7 @@ True - <b>Pages range</b> + <b>Page Range</b> False True GTK_JUSTIFY_LEFT @@ -380,7 +380,7 @@ True False - 5 + 12 @@ -779,13 +779,13 @@ True False - 0 + 6 True True - P_ortrait + _Portrait True GTK_RELIEF_NORMAL False @@ -865,34 +865,58 @@ - + 12 True + 2 + 2 False - 18 + 18 + 36 - + True False - 18 + 6 + + + + True + <b>Colors</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True False - 6 + 0 - + True - <b>Margins (inches)</b> + False - True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 @@ -905,24 +929,21 @@ - + True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + C_olor + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -932,202 +953,73 @@ - + True - 4 - 2 - False - 6 - 6 - - - - True - _Bottom - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - bottom_spinbutton - - - 0 - 1 - 1 - 2 - fill - - - + True + _Grayscale + True + GTK_RELIEF_NORMAL + False + False + True + print_color_radiobutton + + + 0 + False + False + + - - - True - Le_ft - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - left_spinbutton - - - 0 - 1 - 2 - 3 - fill - - - + + + True + False + 0 - + + 18 True - _Right - True + + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - right_spinbutton - 0 - 1 - 3 - 4 - fill - + 0 + False + False - + True - _Top - True - False - GTK_JUSTIFY_CENTER - False - False + gtk-select-color + 6 0 0.5 0 0 - top_spinbutton - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - 0.1 - 1 - True - GTK_UPDATE_ALWAYS - False - False - 0.6 0 100 0.1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 0.1 - 1 - True - GTK_UPDATE_ALWAYS - False - False - 0.5 0 100 0.1 10 10 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - 0.1 - 1 - True - GTK_UPDATE_ALWAYS - False - False - 0.3 0 100 0.1 10 10 - - - 1 - 2 - 0 - 1 - - - - - - - True - True - 0.1 - 1 - True - GTK_UPDATE_ALWAYS - False - False - 0.5 0 100 0.1 10 10 - 1 - 2 - 3 - 4 - + 0 + True + True 0 - False - False + True + True @@ -1138,6 +1030,43 @@ + + 0 + True + True + + + + + 1 + 2 + 0 + 1 + fill + fill + + + + + + True + False + 6 + + + + True + <b>Margins (Inches)</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + 0 False @@ -1146,21 +1075,21 @@ - + True False - 6 + 0 - + True - <b>Colors</b> + False - True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 @@ -1173,142 +1102,265 @@ - + True + 4 + 2 False - 0 + 6 + 12 - + True - - False + _Bottom: + True False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_CENTER False False - 0.5 + 0 0.5 0 0 + bottom_spinbutton - 0 - False - False + 0 + 1 + 1 + 2 + fill + - + True - False - 6 - - - - True - True - C_olor - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + _Left: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + left_spinbutton + + + 0 + 1 + 2 + 3 + fill + + + - - - True - True - Gra_yscale - True - GTK_RELIEF_NORMAL - False - False - True - print_color_radiobutton - - - 0 - False - False - - + + + True + _Right: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + right_spinbutton + + + 0 + 1 + 3 + 4 + fill + + + - - - True - gtk-select-color - 6 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - + + + True + _Top: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + top_spinbutton - 0 - False - False + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + 0.1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 0.6 0 100 0.1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + + True + True + 0.1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 0.5 0 100 0.1 10 10 + + + 1 + 2 + 2 + 3 + + + + + + + True + True + 0.1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 0.3 0 100 0.1 10 10 + + + 1 + 2 + 0 + 1 + + + + + + + True + True + 0.1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 0.5 0 100 0.1 10 10 + + + 1 + 2 + 3 + 4 + 0 - True - True + False + False 0 True - False + True - 0 - False - True + 0 + 1 + 0 + 1 + fill + fill - + True False - 0 + 6 - + + True + <b>Headers</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True False - 6 + 0 - + True - <b>Footers</b> + False - True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 @@ -1321,24 +1373,21 @@ - + True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + P_age title + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -1348,58 +1397,27 @@ - + True - False - 6 - - - - True - True - Page nu_mbers - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - True - True - _Date - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + True + Page a_ddress + True + GTK_RELIEF_NORMAL + False + False + True 0 - True - True + False + False 0 - False - False + True + True @@ -1409,23 +1427,60 @@ True + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + False + 6 + + + + True + <b>Footers</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True False - 6 + 0 - + True - <b>Headers</b> + False - True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 @@ -1438,24 +1493,21 @@ - + True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + True + Page _numbers + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -1465,46 +1517,15 @@ - + True - False - 6 - - - - True - True - P_age Title - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - True - True - Page Addre_ss - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + True + _Date + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -1522,15 +1543,18 @@ 0 - True - True + False + False - 0 - True - True + 0 + 1 + 1 + 2 + fill + fill 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