From 5a9945adda3cd770a0d72f13e55f11950fd66015 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 16 Jan 2006 23:51:41 +0000 Subject: Fix number of /'s in URI. 2006-01-17 Christian Persch * data/chrome/epiphany.manifest.in: Fix number of /'s in URI. * data/epiphany.schemas.in: Add new entries. * embed/mozilla/EphyAboutModule.cpp: Fix title. * data/glade/prefs-dialog.glade: * embed/ephy-embed-prefs.h: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-notifiers.cpp: * embed/mozilla/mozilla-notifiers.h: * lib/eel-gconf-extensions.c: (eel_gconf_unset_key), (eel_gconf_notify): * lib/eel-gconf-extensions.h: * lib/egg/egg-editable-toolbar.c: (popup_context_menu_cb), (button_press_event_cb), (egg_editable_toolbar_set_ui_manager), (egg_editable_toolbar_set_selected): * lib/ephy-dialog.c: (set_value_from_pref), (set_pref_from_value), (set_value_from_togglebutton), (strcmp_with_null), (get_index_from_value), (compare_values), (set_togglebutton_from_value), (set_pref_from_info_and_emit), (spinbutton_changed_cb), (save_info): * lib/ephy-dialog.h: * lib/ephy-file-helpers.c: (ephy_file_monitor_timeout_cb), (ephy_file_monitor_cb), (ephy_file_monitor_add), (ephy_file_monitor_cancel): * lib/ephy-file-helpers.h: * src/ephy-extensions-manager.c: (ephy_extensions_manager_load_file): * src/ephy-window.c: * src/popup-commands.c: (popup_cmd_bookmark_link): * src/prefs-dialog.c: (prefs_dialog_finalize), (setup_font_combo), (fonts_language_changed_cb), (font_prefs_dialog_response_cb), (row_is_separator), (setup_fonts_dialog), (font_prefs_button_clicked_cb), (css_checkbox_toggled), (css_edit_button_clicked_cb), (prefs_dialog_init): Rework font prefs, and add user stylesheet setting. * src/bookmarks/ephy-bookmark-action-group.c: (node_added_cb): * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_get_local): * src/window-commands.c: (window_cmd_file_bookmark_page): Some build fixes. --- data/glade/prefs-dialog.glade | 860 +++++++++++++++++++++++------------------- 1 file changed, 477 insertions(+), 383 deletions(-) (limited to 'data/glade') diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade index c09fa9968..16e5d21c2 100644 --- a/data/glade/prefs-dialog.glade +++ b/data/glade/prefs-dialog.glade @@ -12,6 +12,8 @@ False True True + gtk-preferences + epiphany-preferences True False False @@ -125,7 +127,7 @@ 1 0 0 - 18 + 12 0 @@ -291,7 +293,7 @@ 1 0 0 - 18 + 12 0 @@ -365,7 +367,7 @@ 0 - True + False True @@ -418,332 +420,87 @@ 12 True False - 18 + 6 - + True False - 6 + 24 - + True - <b>Fonts</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + 12 + + + + True + _Minimum size: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + min_size_spinbutton + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 7 1 100 1 10 10 + + + 0 + False + True + + 0 - False - False + True + True - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 18 - 0 + GTK_BUTTONBOX_END + 0 - + True - False - 18 - - - - True - 5 - 3 - False - 6 - 12 - - - - True - _Variable width: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - variable_combo - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - _Fixed width: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - monospace_combo - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - _Minimum size: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - min_size_spinbutton - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - False - True - - - 1 - 2 - 3 - 4 - fill - - - - - - True - - - 0 - 3 - 1 - 2 - 6 - fill - - - - - - True - False - True - - - 1 - 3 - 0 - 1 - fill - - - - - - True - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - True - For l_anguage: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - fonts_language_combo - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 1 1 100 1 2 2 - - - 2 - 3 - 4 - 5 - shrink|fill - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 1 1 100 1 2 2 - - - 2 - 3 - 3 - 4 - shrink|fill - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 1 1 100 1 2 2 - - - 2 - 3 - 2 - 3 - shrink|fill - - - - - - 0 - True - True - - - - - - True - True - Always use _these fonts - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - + True + True + _Detailed Font Settings... + True + GTK_RELIEF_NORMAL + True @@ -757,78 +514,89 @@ 0 False - False + True - + True - False - 12 + True + Let web pages specify their own _fonts + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + - - - True - False - 6 + + + True + True + Let web pages specify their own _colors + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + - - - True - <b>Colors</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + False + 24 + + + + True + True + Use custom _stylesheet + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + GTK_BUTTONBOX_END + 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 18 - 0 - - - - True - True - Al_ways use the desktop theme colors - True - GTK_RELIEF_NORMAL - True - False - False - True - - + True + True + _Edit Stylesheet... + True + GTK_RELIEF_NORMAL + True - - 0 - True - True - @@ -841,7 +609,7 @@ 0 False - False + True @@ -854,7 +622,7 @@ True - Fonts and Colors + Fonts & Style False False GTK_JUSTIFY_LEFT @@ -921,7 +689,7 @@ 1 0 0 - 18 + 12 0 @@ -991,7 +759,7 @@ 0 - True + False True @@ -1043,7 +811,7 @@ 1 0 0 - 18 + 12 0 @@ -1115,7 +883,7 @@ 0 - True + False True @@ -1167,7 +935,7 @@ 1 0 0 - 18 + 12 0 @@ -1294,7 +1062,7 @@ 0 - True + False True @@ -1375,7 +1143,7 @@ 1 0 0 - 18 + 12 0 @@ -1479,7 +1247,7 @@ 0 - True + False True @@ -1531,7 +1299,7 @@ 1 0 0 - 18 + 12 0 @@ -1701,6 +1469,7 @@ False True True + epiphany-preferences-add-language True False False @@ -1828,4 +1597,329 @@ + + 5 + Fonts + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + False + True + gtk-preferences + epiphany-font-preferences + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 2 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + -11 + + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 5 + True + 5 + 3 + False + 6 + 12 + + + + True + _Variable width: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + variable_combo + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + _Fixed width: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + monospace_combo + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + _Minimum size: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + min_size_spinbutton + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + + True + False + True + + + 1 + 2 + 3 + 4 + fill + + + + + + True + + + 0 + 3 + 1 + 2 + 6 + fill + + + + + + True + False + True + + + 1 + 3 + 0 + 1 + fill + + + + + + True + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + True + For l_anguage: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + fonts_language_combo + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 1 1 100 1 2 2 + + + 2 + 3 + 4 + 5 + shrink|fill + + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 1 1 100 1 2 2 + + + 2 + 3 + 3 + 4 + shrink|fill + + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 1 1 100 1 2 2 + + + 2 + 3 + 2 + 3 + shrink|fill + + + + + + 0 + False + True + + + + + + -- cgit v1.2.3