From 7f2e0d242c478603da985ab7680f4ef8b9f7de71 Mon Sep 17 00:00:00 2001 From: Iain Nicol Date: Tue, 3 Nov 2009 15:46:51 +0000 Subject: prefs-dialog: restore Close and Help buttons Bug #590387 Signed-off-by: Xan Lopez --- data/glade/prefs-dialog.ui | 711 +++++++++++++++------------------------------ 1 file changed, 233 insertions(+), 478 deletions(-) diff --git a/data/glade/prefs-dialog.ui b/data/glade/prefs-dialog.ui index 9a15fe6a6..2fcf87f5e 100644 --- a/data/glade/prefs-dialog.ui +++ b/data/glade/prefs-dialog.ui @@ -1,6 +1,6 @@ - + 7 @@ -381,1052 +381,807 @@ Use s_mooth scrolling True - False + False True - Use s_mooth scrolling + False True - GTK_RELIEF_NORMAL - True - False - False True - 0 False False + 3 True - False 24 + Use custom _stylesheet True True - Use custom _stylesheet + False True - GTK_RELIEF_NORMAL - True - False - False True - 0 False False + 0 True - GTK_BUTTONBOX_END - 0 + end + _Edit Stylesheet… True - True True - _Edit Stylesheet… + True + False True - GTK_RELIEF_NORMAL - True + + False + False + 0 + - 0 - True - True + 1 - 0 False - True + 4 - False - True + 1 True Fonts & Style - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + 1 + False + - 12 True - False + 12 18 True - False 6 True + 0 <b>Web Content</b> - False True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 0 True - 0.5 - 0.5 - 1 - 1 - 0 - 0 12 - 0 True - False 6 + Allow popup _windows True True - Allow popup _windows + False True - GTK_RELIEF_NORMAL - True - False - False True - 0 False False + 0 + Enable _Java True True - Enable _Java + False True - GTK_RELIEF_NORMAL - True - False - False True - 0 False False + 1 + Enable Java_Script True True - Enable Java_Script + False True - GTK_RELIEF_NORMAL - True - False - False True - 0 False False + 2 - 0 False - True + 1 - 0 False - True + 0 True - False 6 True + 0 <b>Cookies</b> - False True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 0 True - 0.5 - 0.5 - 1 - 1 - 0 - 0 12 - 0 True - False 6 + _Always accept True True - _Always accept + False True - GTK_RELIEF_NORMAL - True - False - False True - 0 False False + 0 + Only _from sites you visit True True - Only _from sites you visit + False True - GTK_RELIEF_NORMAL - True - False - False True cookies_radiobutton - 0 False False + 1 True - 0.5 - 0.5 - 1 - 1 - 0 - 0 22 - 0 True - <small>For example, not from advertisers on these sites</small> - False - True - GTK_JUSTIFY_LEFT - False - False 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + <small>For example, not from advertisers on these sites</small> + True - 0 False False + 2 + _Never accept True True - _Never accept + False True - GTK_RELIEF_NORMAL - True - False - False True cookies_radiobutton - 0 False False + 3 - 0 False - True + 1 - 0 False - True + 1 True - False 6 True + 0 <b>Passwords</b> - False True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 0 True - 0.5 - 0.5 - 1 - 1 - 0 - 0 12 - 0 + _Remember passwords True True - _Remember passwords + False True - GTK_RELIEF_NORMAL - True - False - False True - 0 False - True + 1 - 0 False - True + 2 True - False 6 True + 0 <b>Temporary Files</b> - False True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 0 True - 0.5 - 0.5 - 1 - 1 - 0 - 0 12 - 0 True - False 12 True _Disk space: True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 disk_cache_spin - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 0 True - False 6 True True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False adjustment2 + 1 - 0 - True - True + 0 True - MB - False - False - GTK_JUSTIFY_CENTER - False - False 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + MB + center - 0 False False + 1 - 0 False - True + 1 True - GTK_BUTTONBOX_DEFAULT_STYLE - 0 + Cl_ear True True - Cl_ear + False True - GTK_RELIEF_NORMAL - True + + False + False + 0 + - 0 False False + 2 - 0 False False + 1 - 0 False - True + 3 - False - True + 2 True Privacy - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + 2 + False + - 12 True - False + 12 18 True - False 6 True + 0 <b>Encodings</b> - True True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + True - 0 False False + 0 True - 0.5 - 0.5 - 1 - 1 - 0 - 0 12 - 0 True - 1 2 - False - 6 12 + 6 True + 0 De_fault: True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 + center default_encoding_combo - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + GTK_FILL + True - False - True 1 2 - 0 - 1 - fill + GTK_FILL - 0 False - True + 1 - 0 False - True + 0 True - False 6 True + 0 <b>Languages</b> - False True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 0 True - 0.5 - 0.5 - 1 - 1 - 0 - 0 12 - 0 True - 1 2 - False - 6 6 + 6 True - GTK_BUTTONBOX_START 6 + start + gtk-add True - True True - gtk-add + True + False True - GTK_RELIEF_NORMAL - True + + False + False + 0 + + gtk-remove True - True True - gtk-remove + True + False True - GTK_RELIEF_NORMAL - True + + False + False + 1 + + gtk-go-up True - True True - gtk-go-up + True + False True - GTK_RELIEF_NORMAL - True + + False + False + 2 + + gtk-go-down True - True True - gtk-go-down + True + False True - GTK_RELIEF_NORMAL - True + + False + False + 3 + 1 2 - 0 - 1 - fill + GTK_FILL True True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + never + automatic + in True True False - False - False - True - False - False - False - 0 - 1 - 0 - 1 - fill + GTK_FILL - 0 - True - True + 1 - 0 - True - True + 1 - False - True + 3 True Language - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + 3 + False + - 0 - True - True + 1 - - - - helpbutton1 - closebutton1 - - - - 5 - Add Language - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - True - epiphany-preferences-add-language - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - True - False - 2 - + True - GTK_BUTTONBOX_END + end - + + gtk-help True - True True - gtk-cancel + True + False True - GTK_RELIEF_NORMAL - True + + False + False + 0 + - + + gtk-close True - True True - gtk-add + True + False True - GTK_RELIEF_NORMAL - True + + False + False + 1 + - 0 False - True - GTK_PACK_END + end + 0 + + + + helpbutton1 + closebutton1 + + + + 5 + Add Language + epiphany-preferences-add-language + True + dialog + False + + + True + 2 - 5 True - False + 5 6 True + 0 Choose a l_anguage: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 languages_treeview - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 0 True True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + never + automatic + in True True False - False - False - True - False - False - False - 0 - True - True + 1 - 0 - True - True + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-add + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 -- cgit v1.2.3