From b47075448a59c1419cc21ac8104a58d549962ce6 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 13 Jun 2003 12:46:09 +0000 Subject: Add support for string enums. 2003-06-13 Marco Pesenti Gritti * lib/ephy-dialog.c: (set_config_from_editable), (set_config_from_optionmenu), (set_config_from_radiobuttongroup), (set_config_from_spin_button), (set_config_from_togglebutton), (set_config_from_color), (set_editable_from_config), (set_optionmenu_from_config), (set_radiobuttongroup_from_config), (set_spin_button_from_config), (set_togglebutton_from_config), (set_color_from_config), (prefs_togglebutton_clicked_cb), (prefs_radiobutton_clicked_cb), (prefs_spinbutton_timeout_cb), (prefs_color_changed_cb), (prefs_entry_changed_cb), (prefs_optionmenu_selected_cb), (ephy_dialog_init), (load_props), (save_props), (free_props), (ephy_dialog_finalize), (ephy_dialog_add_enum), (init_props), (impl_construct), (impl_show): Add support for string enums. * lib/ephy-dialog.h: * lib/ephy-prefs.h: * src/prefs-dialog.c: (prefs_dialog_init): * data/epiphany.schemas.in: * embed/downloader-view.c: * embed/ephy-embed-prefs.h: * embed/find-dialog.c: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-notifiers.cpp: * embed/print-dialog.c: * lib/Makefile.am: Cleanup gconf prefs. This breaks compatibility but better now that later. --- data/epiphany.schemas.in | 198 +++++++++++++++++++---------------------------- 1 file changed, 81 insertions(+), 117 deletions(-) (limited to 'data') diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index bd59ac934..e4c14c8b2 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -1,20 +1,19 @@ - /schemas/apps/epiphany/general/start_page - /apps/epiphany/general/start_page + /schemas/apps/epiphany/general/homepage + /apps/epiphany/general/homepage epiphany string http://www.google.com Home page - Address of the user's home page that is displayed when - opening a new window or tab + Address of the user's home page - /schemas/apps/epiphany/find/match_case - /apps/epiphany/find/match_case + /schemas/apps/epiphany/dialogs/find_match_case + /apps/epiphany/dialogs/find_atch_case epiphany bool 0 @@ -24,8 +23,8 @@ - /schemas/apps/epiphany/find/autowrap - /apps/epiphany/find/autowrap + /schemas/apps/epiphany/dialogs/find_autowrap + /apps/epiphany/dialogs/find_autowrap epiphany bool 1 @@ -36,8 +35,8 @@ - /schemas/apps/epiphany/rendering/use_own_colors - /apps/epiphany/rendering/use_own_colors + /schemas/apps/epiphany/web/use_own_colors + /apps/epiphany/web/use_own_colors epiphany bool false @@ -48,8 +47,8 @@ - /schemas/apps/epiphany/rendering/use_own_fonts - /apps/epiphany/rendering/use_own_fonts + /schemas/apps/epiphany/web/use_own_fonts + /apps/epiphany/web/use_own_fonts epiphany bool false @@ -60,19 +59,8 @@ - /schemas/apps/epiphany/rendering/underline_links - /apps/epiphany/rendering/underline_links - epiphany - bool - true - - Underline links - Underline links. - - - - /schemas/apps/epiphany/interface/ask_download_dest - /apps/epiphany/interface/ask_download_dest + /schemas/apps/epiphany/general/ask_download_dest + /apps/epiphany/general/ask_download_dest epiphany bool true @@ -82,8 +70,8 @@ - /schemas/apps/epiphany/interface/open_in_tab - /apps/epiphany/interface/open_in_tab + /schemas/apps/epiphany/general/open_in_tab + /apps/epiphany/general/open_in_tab epiphany bool false @@ -93,8 +81,8 @@ - /schemas/apps/epiphany/interface/middle_click_open_url - /apps/epiphany/interface/middle_click_open_url + /schemas/apps/epiphany/general/middle_click_open_url + /apps/epiphany/general/middle_click_open_url epiphany bool 0 @@ -104,8 +92,8 @@ - /schemas/apps/epiphany/interface/show_toolbars - /apps/epiphany/interface/show_toolbars + /schemas/apps/epiphany/general/show_toolbars + /apps/epiphany/general/show_toolbars epiphany bool 1 @@ -115,8 +103,8 @@ - /schemas/apps/epiphany/interface/show_bookmarks_bar - /apps/epiphany/interface/show_bookmarks_bar + /schemas/apps/epiphany/general/show_bookmarks_bar + /apps/epiphany/general/show_bookmarks_bar epiphany bool 0 @@ -126,8 +114,8 @@ - /schemas/apps/epiphany/interface/show_statusbar - /apps/epiphany/interface/show_statusbar + /schemas/apps/epiphany/general/show_statusbar + /apps/epiphany/general/show_statusbar epiphany bool 1 @@ -137,8 +125,8 @@ - /schemas/apps/epiphany/rendering/default_encoding - /apps/epiphany/rendering/default_encoding + /schemas/apps/epiphany/web/default_encoding + /apps/epiphany/web/default_encoding epiphany string ISO-8859-1 @@ -164,20 +152,19 @@ - /schemas/apps/epiphany/rendering/default_font - /apps/epiphany/rendering/default_font + /schemas/apps/epiphany/web/default_font_type + /apps/epiphany/web/default_font_type epiphany - int - 0 + string + serif Default font type - Default font type. Possible values are 0 (serif), 1 - (sans-serif) + Default font type. Possible values are serif and sans-serif - /schemas/apps/epiphany/downloader/show_details - /apps/epiphany/downloader/show_details + /schemas/apps/epiphany/dialogs/downloader_show_details + /apps/epiphany/dialogs/downloader_show_details epiphany bool false @@ -187,20 +174,8 @@ - /schemas/apps/epiphany/network/no_proxies_for - /apps/epiphany/network/no_proxies_for - epiphany - string - - - No proxy for - List of domains for wherefore not to use the proxy, comma - delimited - - - - /schemas/apps/epiphany/network/cache_size - /apps/epiphany/network/cache_size + /schemas/apps/epiphany/web/cache_size + /apps/epiphany/web/cache_size epiphany int 50 @@ -210,20 +185,20 @@ - /schemas/apps/epiphany/network/cache_compare - /apps/epiphany/network/cache_compare + /schemas/apps/epiphany/web/cache_compare + /apps/epiphany/web/cache_compare epiphany - int - 3 + string + automatic When to compare cached copy - When to compare cached copy to web copy. Possible values are 0 - (once per session), 1 (every time), 2 (never), 3 (automatic). + When to compare cached copy to web copy. Possible values are + once per session, every time, never, automatic. - /schemas/apps/epiphany/rendering/lang - /apps/epiphany/rendering/lang + /schemas/apps/epiphany/web/language + /apps/epiphany/web/language epiphany list string @@ -234,8 +209,8 @@ - /schemas/apps/epiphany/print/top_margin - /apps/epiphany/print/top_margin + /schemas/apps/epiphany/dialogs/print_top_margin + /apps/epiphany/dialogs/print_top_margin epiphany float 0.5 @@ -245,8 +220,8 @@ - /schemas/apps/epiphany/print/bottom_margin - /apps/epiphany/print/bottom_margin + /schemas/apps/epiphany/dialogs/print_bottom_margin + /apps/epiphany/dialogs/print_bottom_margin epiphany float 0.5 @@ -256,8 +231,8 @@ - /schemas/apps/epiphany/print/left_margin - /apps/epiphany/print/left_margin + /schemas/apps/epiphany/dialogs/print_left_margin + /apps/epiphany/dialogs/print_left_margin epiphany float 0.5 @@ -267,8 +242,8 @@ - /schemas/apps/epiphany/print/right_margin - /apps/epiphany/print/right_margin + /schemas/apps/epiphany/dialogs/print_right_margin + /apps/epiphany/dialogs/print_right_margin epiphany float 0.5 @@ -278,8 +253,8 @@ - /schemas/apps/epiphany/print/page_title_toggle - /apps/epiphany/print/page_title_toggle + /schemas/apps/epiphany/dialogs/print_page_title + /apps/epiphany/dialogs/print_page_title epiphany bool true @@ -289,8 +264,8 @@ - /schemas/apps/epiphany/print/page_url_toggle - /apps/epiphany/print/page_url_toggle + /schemas/apps/epiphany/dialogs/print_page_url + /apps/epiphany/dialogs/print_page_url epiphany bool true @@ -300,8 +275,8 @@ - /schemas/apps/epiphany/print/date_toggle - /apps/epiphany/print/date_toggle + /schemas/apps/epiphany/dialogs/print_date + /apps/epiphany/dialogs/print_date epiphany bool true @@ -311,8 +286,8 @@ - /schemas/apps/epiphany/print/page_numbers_toggle - /apps/epiphany/print/page_numbers_toggle + /schemas/apps/epiphany/dialogs/print_page_numbers + /apps/epiphany/dialogs/print_page_numbers epiphany bool true @@ -322,8 +297,8 @@ - /schemas/apps/epiphany/print/printer - /apps/epiphany/print/printer + /schemas/apps/epiphany/dialogs/print_printer + /apps/epiphany/dialogs/print_printer epiphany string lpr @@ -333,8 +308,8 @@ - /schemas/apps/epiphany/print/file - /apps/epiphany/print/file + /schemas/apps/epiphany/dialogs/print_file + /apps/epiphany/dialogs/print_file epiphany string @@ -343,25 +318,14 @@ - /schemas/apps/epiphany/print/printon - /apps/epiphany/print/printon - epiphany - int - 0 - - Print range - Print range: 0 (all pages), 1 (specific range). - - - - /schemas/apps/epiphany/print/paper - /apps/epiphany/print/paper + /schemas/apps/epiphany/dialogs/print_paper + /apps/epiphany/dialogs/print_paper epiphany int 0 Paper type - Paper type: 0 (Letter), 1 (Legal), 2 (Executive), 3 (A4). + Paper type: letter, legal, executive, A4. @@ -392,8 +356,8 @@ - /schemas/apps/epiphany/directories/downloading - /apps/epiphany/directories/downloading + /schemas/apps/epiphany/directories/download + /apps/epiphany/directories/download epiphany string ~ @@ -401,8 +365,8 @@ - /schemas/apps/epiphany/rendering/autodetect_encoding - /apps/epiphany/rendering/autodetect_encoding + /schemas/apps/epiphany/web/autodetect_encoding + /apps/epiphany/web/autodetect_encoding epiphany string @@ -421,20 +385,20 @@ - /schemas/apps/epiphany/security/cookie_accept - /apps/epiphany/security/cookie_accept + /schemas/apps/epiphany/web/cookie_accept + /apps/epiphany/web/cookie_accept epiphany - int - 0 + string + anywhere Cookie accept - Where to accept cookies from. Possible values are 0 (anywhere), - 1 (from current server only), 2 (nowhere) + Where to accept cookies from. Possible values are anywhere, + current site, nowhere - /schemas/apps/epiphany/security/allow_popups - /apps/epiphany/security/allow_popups + /schemas/apps/epiphany/web/allow_popups + /apps/epiphany/web/allow_popups epiphany bool true @@ -445,8 +409,8 @@ - /schemas/apps/epiphany/security/java_enabled - /apps/epiphany/security/java_enabled + /schemas/apps/epiphany/web/java_enabled + /apps/epiphany/web/java_enabled epiphany bool 1 @@ -456,8 +420,8 @@ - /schemas/apps/epiphany/security/javascript_enabled - /apps/epiphany/security/javascript_enabled + /schemas/apps/epiphany/web/javascript_enabled + /apps/epiphany/web/javascript_enabled epiphany bool 1 -- cgit