diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 37 | ||||
| -rw-r--r-- | data/epiphany-lockdown.schemas.in | 119 | ||||
| -rw-r--r-- | data/epiphany.convert | 56 | ||||
| -rw-r--r-- | data/epiphany.schemas.in | 536 | ||||
| -rw-r--r-- | data/glade/prefs-dialog.ui | 17 | ||||
| -rw-r--r-- | data/org.gnome.epiphany.gschema.xml.in | 237 | ||||
| -rw-r--r-- | data/ui/epiphany-bookmark-editor-ui.xml | 2 |
7 files changed, 321 insertions, 683 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 87f8c1d8e..e6ab83e4a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,16 +2,21 @@ SUBDIRS = art glade icons ui @INTLTOOL_SERVER_RULE@ @INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_SCHEMAS_RULE@ -@INTLTOOL_XML_RULE@ desktop_in_files = epiphany.desktop.in.in bme.desktop.in.in desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = epiphany.schemas.in epiphany-lockdown.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) +convertdir = $(datarootdir)/GConf/gsettings +convert_DATA = epiphany.convert + +gsettings_ENUM_NAMESPACE = org.gnome.Epiphany +gsettings_ENUM_FILES = $(top_srcdir)/lib/ephy-prefs.h + +gsettings_files = org.gnome.epiphany.gschema.xml.in +gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml) +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ aboutdir = $(pkgdatadir) about_DATA = epiphany.xhtml @@ -53,19 +58,9 @@ $(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile $(INTLTOOL_MER sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" $@.tmp > $@ || rm -f $@.tmp rm -f $@.tmp -install-data-local: $(schema_DATA) -if GCONF_SCHEMAS_INSTALL - if test -z "$(DESTDIR)" ; then \ - for p in $^ ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \ - done \ - fi -endif - EXTRA_DIST = \ $(aboutdialog_DATA) \ $(service_in_files) \ - $(schema_in_files) \ $(desktop_in_files) \ $(about_DATA) \ $(mimepermission_DATA) \ @@ -74,12 +69,14 @@ EXTRA_DIST = \ $(service_DATA) \ $(m4data_DATA) \ $(default_bookmarks_in_files) \ + $(gsettings_files) \ + $(convert_DATA) \ epiphany-service.xml \ check-mime.py DISTCLEANFILES = \ - $(service_DATA) \ - $(schema_in_files:.schemas.in=.schemas) \ - $(pkgconfig_DATA) \ - $(desktop_DATA) \ - $(default_bookmarks_DATA) + $(service_DATA) \ + $(pkgconfig_DATA) \ + $(desktop_DATA) \ + $(default_bookmarks_DATA) \ + $(gsettings_SCHEMAS) diff --git a/data/epiphany-lockdown.schemas.in b/data/epiphany-lockdown.schemas.in deleted file mode 100644 index f2959c293..000000000 --- a/data/epiphany-lockdown.schemas.in +++ /dev/null @@ -1,119 +0,0 @@ -<gconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/epiphany/lockdown/disable_javascript_chrome</key> - <applyto>/apps/epiphany/lockdown/disable_javascript_chrome</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Disable JavaScript chrome control</short> - <long>Disable JavaScript's control over window chrome.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/hide_menubar</key> - <applyto>/apps/epiphany/lockdown/hide_menubar</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Hide menubar by default</short> - <long>Hide the menubar by default.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/disable_unsafe_protocols</key> - <applyto>/apps/epiphany/lockdown/disable_unsafe_protocols</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Disable unsafe protocols</short> - <long>Disables loading of content from unsafe protocols. Safe protocols - are http and https.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/additional_safe_protocols</key> - <applyto>/apps/epiphany/lockdown/additional_safe_protocols</applyto> - <owner>epiphany</owner> - <type>list</type> - <list_type>string</list_type> - <default>[]</default> - <locale name="C"> - <short>Additional safe protocols</short> - <long>A list of protocols to be considered safe in addition to the - default, when disable_unsafe_protocols is enabled.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/disable_arbitrary_url</key> - <applyto>/apps/epiphany/lockdown/disable_arbitrary_url</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>0</default> - <locale name="C"> - <short>Disable arbitrary URLs</short> - <long>Disable the user's ability to type in a URL to Epiphany.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/disable_bookmark_editing</key> - <applyto>/apps/epiphany/lockdown/disable_bookmark_editing</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>0</default> - <locale name="C"> - <short>Disable bookmark editing</short> - <long>Disable the user's ability to add or edit bookmarks.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/disable_toolbar_editing</key> - <applyto>/apps/epiphany/lockdown/disable_toolbar_editing</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>0</default> - <locale name="C"> - <short>Disable toolbar editing</short> - <long>Disable the user's ability to edit toolbars.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/disable_history</key> - <applyto>/apps/epiphany/lockdown/disable_history</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>0</default> - <locale name="C"> - <short>Disable history</short> - <long>Disable all historical information by disabling back and - forward navigation, not allowing the history dialog and hiding the - most used bookmarks list.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/fullscreen</key> - <applyto>/apps/epiphany/lockdown/fullscreen</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>0</default> - <locale name="C"> - <short>Lock in fullscreen mode</short> - <long>Locks Epiphany in fullscreen mode.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/lockdown/disable_quit</key> - <applyto>/apps/epiphany/lockdown/disable_quit</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>0</default> - <locale name="C"> - <short>Epiphany cannot quit</short> - <long>User is not allowed to close Epiphany</long> - </locale> - </schema> - </schemalist> -</gconfschemafile> diff --git a/data/epiphany.convert b/data/epiphany.convert new file mode 100644 index 000000000..c938c7639 --- /dev/null +++ b/data/epiphany.convert @@ -0,0 +1,56 @@ +[org.gnome.Epiphany] +homepage-url = /apps/epiphany/general/homepage +user-agent = /apps/epiphany/general/user_agent +cache-size = /apps/epiphany/web/cache_size +new-windows-in-tabs = /apps/epiphany/general/open_new_windows_in_tab +automatic-downloads = /apps/epiphany/general/automatic_downloads +warn-on-close-unsubmitted-data = /apps/epiphany/dialogs/warn_on_close_unsubmitted_data +middle-click-opens-url = /apps/epiphany/general/middle_click_open_url +remember-passwords = /apps/epiphany/general/remember_passwords +keyword-search-url = /apps/epiphany/general/url_search +managed-network = /apps/epiphany/general/managed_network +enable-smooth-scrolling = /apps/epiphany/web/smooth_scroll +enable-web-inspector = /apps/epiphany/web/inspector_enabled +enable-caret-browsing = /apps/epiphany/web/browse_with_caret +enabled-extensions = /apps/epiphany/general/active_extensions + +[org.gnome.Epiphany.ui] +always-show-tabs-bar = /apps/epiphany/general/always_show_tabs_bar +show-toolbars = /apps/epiphany/general/show_toolbars +show-bookmarks-bar = /apps/epiphany/general/show_bookmarks_bar +toolbar-style = /apps/epiphany/general/toolbar_style +downloads-hidden = /apps/epiphany/dialogs/downloads_hidden + +[org.gnome.Epiphany.web] +min-font-size = /apps/epiphany/web/minimum_font_size +language = /apps/epiphany/web/language +use-own-fonts = /apps/epiphany/web/use_own_fonts +use-own-colors = /apps/epiphany/web/use_own_colors +enable-user-css = /apps/epiphany/web/user_css_enabled +enable-popups = /apps/epiphany/web/allow_popups +enable-plugins = /apps/epiphany/web/plugins_enabled +enable-javascript = /apps/epiphany/web/javascript_enabled +image-animation-mode = /apps/epiphany/web/image_animation +default-encoding = /apps/epiphany/web/default_encoding + +[org.gnome.Epiphany.state] +save-dir = /apps/epiphany/directories/save +save-image-dir = /apps/epiphany/directories/saveimage +open-dir = /apps/epiphany/directories/open +download-dir = /apps/epiphany/directories/downloads_folder +upload-dir = /apps/epiphany/directories/upload +recent-encodings =/apps/epiphany/general/recent_encodings + +[org.gnome.Epiphany.lockdown] +disable-fullscreen = /apps/epiphany/lockdown/fullscreen +disable-arbitrary-url = /apps/epiphany/lockdown/disable_arbitrary_url +disable-bookmark-editing = /apps/epiphany/lockdown/disable_bookmark_editing +disable-toolbar-editing = /apps/epiphany/lockdown/disable_toolbar_editing +disable-history = /apps/epiphany/lockdown/disable_history +disable-save-to-disk = /desktop/gnome/lockdown/disable_save_to_disk +disable-printing = /desktop/gnome/lockdown/disable_printing +disable-print-setup = /desktop/gnome/lockdown/disable_print_setup +disable-command-line = /desktop/gnome/lockdown/disable_command_line +disable-quit = /apps/epiphany/lockdown/disable_quit +disable-javascript-chrome = /apps/epiphany/lockdown/disable_javascript_chrome +disable-menubar = /apps/epiphany/lockdown/hide_menubar diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in deleted file mode 100644 index 359b7a971..000000000 --- a/data/epiphany.schemas.in +++ /dev/null @@ -1,536 +0,0 @@ -<gconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/epiphany/general/homepage</key> - <applyto>/apps/epiphany/general/homepage</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>http://www.google.com</default> - <locale name="C"> - <short>Home page</short> - <long>Address of the user's home page.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/url_search</key> - <applyto>/apps/epiphany/general/url_search</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8</default> - <locale name="C"> - <short>URL Search</short> - <long>Search string for keywords entered in the URL bar.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/history_date_filter</key> - <applyto>/apps/epiphany/dialogs/history_date_filter</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>ever</default> - <locale name="C"> - <short>History pages time range</short> - <long>Show the history pages visited "ever", - "last_two_days", "last_three_days", "today". - </long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/bookmarks_view_details</key> - <applyto>/apps/epiphany/dialogs/bookmarks_view_details</applyto> - <owner>epiphany</owner> - <type>list</type> - <list_type>string</list_type> - <default>[title]</default> - <locale name="C"> - <short>The bookmark information shown in the editor view</short> - <long> - The bookmark information shown in the editor view. Valid values - in the list are "address" and "title". - </long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/history_view_details</key> - <applyto>/apps/epiphany/dialogs/history_view_details</applyto> - <owner>epiphany</owner> - <type>list</type> - <list_type>string</list_type> - <default>[ViewTitle,ViewAddress]</default> - <locale name="C"> - <short>The page information shown in the history view</short> - <long> - The page information shown in the history view. Valid values - in the list are "ViewTitle", "ViewAddress" and "ViewDateTime". - </long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/preferences_font_language</key> - <applyto>/apps/epiphany/dialogs/preferences_font_language</applyto> - <owner>epiphany</owner> - <type>string</type> - <locale name="C"> - <default>x-western</default> - <short>The currently selected fonts language</short> - <long> - The currently selected fonts language. Valid values are "ar" (arabic), - "x-baltic" (baltic languages), "x-central-euro" (central european languages), - "x-cyrillic" (languages written with cyrillic alphabet), "el" (greek), - "he" (hebrew), "ja" (japanese), "ko" (korean), "zh-CN" (simplified chinese), - "th" (thai), "zh-TW" (traditional chinese), "tr" (turkish), "x-unicode" (other - languages), "x-western" (languages written in latin script), "x-tamil" (tamil) - and "x-devanagari" (devanagari). - </long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/smooth_scroll</key> - <applyto>/apps/epiphany/web/smooth_scroll</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Enable smooth scrolling</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/user_agent</key> - <applyto>/apps/epiphany/general/user_agent</applyto> - <owner>epiphany</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>User agent</short> - <long>String that will be used as user agent, to identify the browser to the web servers.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/minimum_font_size</key> - <applyto>/apps/epiphany/web/minimum_font_size</applyto> - <owner>epiphany</owner> - <type>int</type> - <default>7</default> - <locale name="C"> - <short>Minimum font size</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/use_own_colors</key> - <applyto>/apps/epiphany/web/use_own_colors</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Use own colors</short> - <long>Use your own colors instead of the colors the page - requests.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/use_own_fonts</key> - <applyto>/apps/epiphany/web/use_own_fonts</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Use own fonts</short> - <long>Use your own fonts instead of the fonts the page - requests.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/always_show_tabs_bar</key> - <applyto>/apps/epiphany/general/always_show_tabs_bar</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Always show the tab bar</short> - <long>Show the tab bar also when there is only one tab open.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/automatic_downloads</key> - <applyto>/apps/epiphany/general/automatic_downloads</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Automatic downloads</short> - <long>When files cannot be opened by the browser they are - automatically downloaded to the download folder and opened - with the appropriate application.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/middle_click_open_url</key> - <applyto>/apps/epiphany/general/middle_click_open_url</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Middle click to open the web page pointed to by the currently - selected text</short> - <long>Middle clicking on the main view pane will open the web page - pointed to by the currently selected text.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/toolbar_style</key> - <applyto>/apps/epiphany/general/toolbar_style</applyto> - <owner>epiphany</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Toolbar style</short> - <long>Toolbar style. Allowed values are "" (use GNOME default style), - "both" (text and icons), "both-horiz" (text besides icons), - "icons", and "text".</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/open_new_windows_in_tab</key> - <applyto>/apps/epiphany/general/open_new_windows_in_tab</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Force new windows to be opened in tabs</short> - <long>Force new window requests to be opened in tabs instead - of using a new window.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/show_toolbars</key> - <applyto>/apps/epiphany/general/show_toolbars</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Show toolbars by default</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/show_bookmarks_bar</key> - <applyto>/apps/epiphany/general/show_bookmarks_bar</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Show bookmarks bar by default</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/show_statusbar</key> - <applyto>/apps/epiphany/general/show_statusbar</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Show statusbar by default</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/active_extensions</key> - <applyto>/apps/epiphany/general/active_extensions</applyto> - <owner>epiphany</owner> - <type>list</type> - <list_type>string</list_type> - <default>[extensions-manager-ui]</default> - <locale name="C"> - <short>Active extensions</short> - <long>Lists the active extensions.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/default_encoding</key> - <applyto>/apps/epiphany/web/default_encoding</applyto> - <owner>epiphany</owner> - <type>string</type> - <locale name="C"> - <default><!-- Translators: this is the default encoding used by Epiphany for Web pages display -->ISO-8859-1</default> - <short>Default encoding</short> - <long>Default encoding. Accepted values are: "armscii-8", "Big5", - "Big5-HKSCS", "EUC-JP", "EUC-KR", "gb18030", "GB2312", "geostd8", - "HZ-GB-2312", "IBM850", "IBM852", "IBM855", "IBM857", "IBM862", - "IBM864", "IBM866", "ISO-2022-CN", "ISO-2022-JP", "ISO-2022-KR", - "ISO-8859-1", "ISO-8859-2", "ISO-8859-3", "ISO-8859-4", "ISO-8859-5", - "ISO-8859-6", "ISO-8859-7", "ISO-8859-8", "ISO-8859-8-I", "ISO-8859-9", - "ISO-8859-10", "ISO-8859-11", "ISO-8859-13", "ISO-8859-14", - "ISO-8859-15", "ISO-8859-16", "ISO-IR-111", "KOI8-R", "KOI8-U", - "Shift_JIS", "TIS-620", "UTF-7", "UTF-8", "VISCII", "windows-874", - "windows-1250", "windows-1251", "windows-1252", "windows-1253", - "windows-1254", "windows-1255", "windows-1256", "windows-1257", - "windows-1258", "x-euc-tw", "x-gbk", "x-johab", "x-mac-arabic", - "x-mac-ce", "x-mac-croatian", "x-mac-cyrillic", "x-mac-devanagari", - "x-mac-farsi", "x-mac-greek", "x-mac-gujarati", "x-mac-gurmukhi", - "x-mac-hebrew", "x-mac-icelandic", "x-mac-roman", "x-mac-romanian", - "x-mac-turkish", "x-mac-ukrainian", "x-user-defined", "x-viet-tcvn5712", - "x-viet-vps" and "x-windows-949".</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/cache_size</key> - <applyto>/apps/epiphany/web/cache_size</applyto> - <owner>epiphany</owner> - <type>int</type> - <default>50</default> - <locale name="C"> - <short>Size of disk cache</short> - <long>Size of disk cache, in MB.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/language</key> - <applyto>/apps/epiphany/web/language</applyto> - <owner>epiphany</owner> - <type>list</type> - <list_type>string</list_type> - <default>[]</default> - <locale name="C"> - <short>Languages</short> - <long>Preferred languages, two letter codes.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/print_page_title</key> - <applyto>/apps/epiphany/dialogs/print_page_title</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Whether to print the page title in the header</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/print_page_url</key> - <applyto>/apps/epiphany/dialogs/print_page_url</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Whether to print the page address in the header</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/print_date</key> - <applyto>/apps/epiphany/dialogs/print_date</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Whether to print the date in the footer</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/print_background_colors</key> - <applyto>/apps/epiphany/dialogs/print_background_colors</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Whether to print the background color</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/print_background_images</key> - <applyto>/apps/epiphany/dialogs/print_background_images</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Whether to print the background images</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/print_page_numbers</key> - <applyto>/apps/epiphany/dialogs/print_page_numbers</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Whether to print the page numbers (x of total) in the footer</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/print_frames</key> - <applyto>/apps/epiphany/dialogs/print_frames</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>normal</default> - <locale name="C"> - <short>How to print frames</short> - <long>How to print pages containing frames. Allowed values are "normal", "separately" and "selected".</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/directories/open</key> - <applyto>/apps/epiphany/directories/open</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>~</default> - <locale name="C"> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/directories/save</key> - <applyto>/apps/epiphany/directories/save</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>~</default> - <locale name="C"> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/directories/saveimage</key> - <applyto>/apps/epiphany/directories/saveimage</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>~</default> - <locale name="C"> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/directories/upload</key> - <applyto>/apps/epiphany/directories/upload</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>~</default> - <locale name="C"> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/directories/downloads_folder</key> - <applyto>/apps/epiphany/directories/downloads_folder</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>Downloads</default> - <locale name="C"> - <short>The downloads folder</short> - <long>The path of the folder where to download files to; or "Downloads" to use the default downloads folder, or "Desktop" to use the desktop folder.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/cookie_accept</key> - <applyto>/apps/epiphany/web/cookie_accept</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>current site</default> - <locale name="C"> - <short>Cookie accept</short> - <long>Where to accept cookies from. Possible values are "anywhere", - "current site" and "nowhere".</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/image_animation</key> - <applyto>/apps/epiphany/web/image_animation</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>normal</default> - <locale name="C"> - <short>Image animation mode</short> - <long>How to present animated images. Possible values are "normal", - "once" and "disabled".</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/remember_passwords</key> - <applyto>/apps/epiphany/general/remember_passwords</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Remember passwords</short> - <long>Whether to store and prefill passwords in web sites.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/allow_popups</key> - <applyto>/apps/epiphany/web/allow_popups</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Allow popups</short> - <long>Allow sites to open new windows using JavaScript (if JavaScript - is enabled).</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/plugins_enabled</key> - <applyto>/apps/epiphany/web/plugins_enabled</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Enable Plugins</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/javascript_enabled</key> - <applyto>/apps/epiphany/web/javascript_enabled</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Enable JavaScript</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/browse_with_caret</key> - <applyto>/apps/epiphany/web/browse_with_caret</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Browse with caret</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/general/managed_network</key> - <applyto>/apps/epiphany/general/managed_network</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Automatically manage offline status with NetworkManager</short> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/downloads_hidden</key> - <applyto>/apps/epiphany/dialogs/downloads_hidden</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Visibility of the downloads window</short> - <long>Hide or show the downloads window. When hidden, a notification will be shown when new downloads are started.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/dialogs/warn_on_close_unsubmitted_data</key> - <applyto>/apps/epiphany/dialogs/warn_on_close_unsubmitted_data</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short></short> - <long></long> - </locale> - </schema> - <schema> - <key>/schemas/apps/epiphany/web/inspector_enabled</key> - <applyto>/apps/epiphany/web/inspector_enabled</applyto> - <owner>epiphany</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Enable Web Inspector</short> - <long></long> - </locale> - </schema> - - </schemalist> -</gconfschemafile> diff --git a/data/glade/prefs-dialog.ui b/data/glade/prefs-dialog.ui index 81c247896..32a9e1368 100644 --- a/data/glade/prefs-dialog.ui +++ b/data/glade/prefs-dialog.ui @@ -555,8 +555,9 @@ <property name="visible">True</property> <property name="spacing">6</property> <child> - <object class="GtkRadioButton" id="cookies_radiobutton"> + <object class="GtkRadioButton" id="cookies_always_radiobutton"> <property name="label" translatable="yes">_Always accept</property> + <property name="name">always</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -570,14 +571,15 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="radiobutton58"> + <object class="GtkRadioButton" id="cookies_no_third_party_radiobutton"> <property name="label" translatable="yes">Only _from sites you visit</property> + <property name="name">no-third-party</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <property name="group">cookies_radiobutton</property> + <property name="group">cookies_always_radiobutton</property> </object> <packing> <property name="expand">False</property> @@ -605,14 +607,15 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="radiobutton59"> + <object class="GtkRadioButton" id="cookies_never_radiobutton"> <property name="label" translatable="yes">_Never accept</property> + <property name="name">never</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <property name="group">cookies_radiobutton</property> + <property name="group">cookies_always_radiobutton</property> </object> <packing> <property name="expand">False</property> @@ -707,7 +710,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">_Disk space:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">disk_cache_spin</property> + <property name="mnemonic_widget">disk_cache_spinbutton</property> </object> <packing> <property name="expand">False</property> @@ -720,7 +723,7 @@ <property name="visible">True</property> <property name="spacing">6</property> <child> - <object class="GtkSpinButton" id="disk_cache_spin"> + <object class="GtkSpinButton" id="disk_cache_spinbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">adjustment2</property> diff --git a/data/org.gnome.epiphany.gschema.xml.in b/data/org.gnome.epiphany.gschema.xml.in new file mode 100644 index 000000000..6bc4089da --- /dev/null +++ b/data/org.gnome.epiphany.gschema.xml.in @@ -0,0 +1,237 @@ +<?xml version="1.0" encoding="UTF-8"?> +<schemalist> + <schema path="/apps/epiphany/" id="org.gnome.Epiphany"> + <child schema="org.gnome.Epiphany.ui" name="ui"/> + <child schema="org.gnome.Epiphany.web" name="web"/> + <child schema="org.gnome.Epiphany.state" name="state"/> + <child schema="org.gnome.Epiphany.lockdown" name="lockdown"/> + <key type="b" name="enable-caret-browsing"> + <default>false</default> + <summary>Browse with caret</summary> + </key> + <key type="b" name="enable-web-inspector"> + <default>false</default> + <summary>Enable Web Inspector</summary> + </key> + <key type="s" name="homepage-url"> + <default>'http://www.google.com'</default> + <summary>Home page</summary> + <description>Address of the user's home page.</description> + </key> + <key type="s" name="keyword-search-url"> + <default>'http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8' + </default> + <summary>URL Search</summary> + <description>Search string for keywords entered in the URL bar.</description> + </key> + <key type="s" name="user-agent"> + <default>''</default> + <summary>User agent</summary> + <description>String that will be used as user agent, to identify the browser to the web servers.</description> + </key> + <key type="b" name="automatic-downloads"> + <default>true</default> + <summary>Automatic downloads</summary> + <description>When files cannot be opened by the browser they are automatically downloaded to the download folder and opened with the appropriate application.</description> + </key> + <key type="b" name="middle-click-opens-url"> + <default>false</default> + <summary>Middle click to open the web page pointed to by the currently selected text</summary> + <description>Middle clicking on the main view pane will open the web page pointed to by the currently selected text.</description> + </key> + <key type="b" name="new-windows-in-tabs"> + <default>false</default> + <summary>Force new windows to be opened in tabs</summary> + <description>Force new window requests to be opened in tabs instead of using a new window.</description> + </key> + <key type="b" name="remember-passwords"> + <default>true</default> + <summary>Remember passwords</summary> + <description>Whether to store and prefill passwords in web sites.</description> + </key> + <key type="b" name="managed-network"> + <default>true</default> + <summary>Automatically manage offline status with NetworkManager</summary> + </key> + <key type="b" name="warn-on-close-unsubmitted-data"> + <default>true</default> + </key> + <key type="b" name="enable-smooth-scrolling"> + <default>false</default> + <summary>Enable smooth scrolling</summary> + </key> + <key type="as" name="enabled-extensions"> + <default>['extensions-manager-ui' ]</default> + <summary>Active extensions</summary> + <description>Lists the active extensions.</description> + </key> + </schema> + <schema path="/apps/epiphany/ui/" id="org.gnome.Epiphany.ui"> + <key type="b" name="show-toolbars"> + <default>true</default> + <summary>Show toolbars by default</summary> + </key> + <key type="b" name="show-bookmarks-bar"> + <default>false</default> + <summary>Show bookmarks bar by default</summary> + </key> + <key name="toolbar-style" enum="org.gnome.Epiphany.EphyPrefsUIToolbarStyle"> + <default>'both-horiz'</default> + <summary>Toolbar style</summary> + <description>Toolbar style. Allowed values are "" (use GNOME default style), "both" (text and icons), "both-horiz" (text besides icons), "icons", and "text".</description> + </key> + <key type="b" name="always-show-tabs-bar"> + <default>false</default> + <summary>Always show the tab bar</summary> + <description>Show the tab bar also when there is only one tab open.</description> + </key> + <key type="b" name="downloads-hidden"> + <default>false</default> + <summary>Visibility of the downloads window</summary> + <description>Hide or show the downloads window. When hidden, a notification will be shown when new downloads are started.</description> + </key> + </schema> + <schema path="/apps/epiphany/web/" id="org.gnome.Epiphany.web"> + <key type="i" name="min-font-size"> + <default>7</default> + <summary>Minimum font size</summary> + </key> + <key type="b" name="use-own-colors"> + <default>false</default> + <summary>Use own colors</summary> + <description>Use your own colors instead of the colors the page requests.</description> + </key> + <key type="b" name="use-own-fonts"> + <default>false</default> + <summary>Use own fonts</summary> + <description>Use your own fonts instead of the fonts the page requests.</description> + </key> + <key type="b" name="enable-user-css"> + <default>false</default> + <summary>Use a custom CSS</summary> + <description>Use a custom CSS file to modify websites own CSS.</description> + </key> + <key type="s" name="default-encoding"> + <default>'UTF-8'</default> + <summary>Default encoding</summary> + <description>Default encoding. Accepted values are the ones WebKitGTK+ can understand.</description> + </key> + <key type="i" name="cache-size"> + <default>50</default> + <summary>Size of disk cache</summary> + <description>Size of disk cache, in MB.</description> + </key> + <key type="as" name="language"> + <default>[]</default> + <summary>Languages</summary> + <description>Preferred languages, two letter codes.</description> + </key> + <key name="cookies-policy" enum="org.gnome.Epiphany.EphyPrefsWebCookiesPolicy"> + <default>'no-third-party'</default> + <summary>Cookie accept</summary> + <description>Where to accept cookies from. Possible values are "anywhere", "current site" and "nowhere".</description> + </key> + <key type="s" name="image-animation-mode"> + <default>'normal'</default> + <summary>Image animation mode</summary> + <description>How to present animated images. Possible values are "normal", "once" and "disabled".</description> + </key> + <key type="b" name="enable-popups"> + <default>true</default> + <summary>Allow popups</summary> + <description>Allow sites to open new windows using JavaScript (if JavaScript is enabled).</description> + </key> + <key type="b" name="enable-plugins"> + <default>true</default> + <summary>Enable Plugins</summary> + </key> + <key type="b" name="enable-javascript"> + <default>true</default> + <summary>Enable JavaScript</summary> + </key> + </schema> + <schema path="/apps/epiphany/state/" id="org.gnome.Epiphany.state"> + <key type="s" name="open-dir"> + <default>'~'</default> + </key> + <key type="s" name="save-dir"> + <default>'~'</default> + </key> + <key type="s" name="save-image-dir"> + <default>'~'</default> + </key> + <key type="s" name="upload-dir"> + <default>'~'</default> + </key> + <key type="s" name="download-dir"> + <default>'Downloads'</default> + <summary>The downloads folder</summary> + <description>The path of the folder where to download files to; or "Downloads" to use the default downloads folder, or "Desktop" to use the desktop folder.</description> + </key> + <key type="as" name="recent-encodings"> + <default>['' ]</default> + </key> + <key type="i" name="history-date-filter"> + <default>1</default> + <summary>History pages time range</summary> + </key> + <key type="b" name="history-view-title"> + <default>true</default> + <summary>Whether to show the title column in the history window.</summary> + </key> + <key type="b" name="history-view-address"> + <default>true</default> + <summary>Whether to show the address column in the history window.</summary> + </key> + <key type="b" name="history-view-date"> + <default>false</default> + <summary>Whether to show the date-time column in the history window.</summary> + </key> + <key type="b" name="bookmarks-view-title"> + <default>true</default> + <summary>Whether to show the title column in the bookmarks window.</summary> + </key> + <key type="b" name="bookmarks-view-address"> + <default>false</default> + <summary>Whether to show the address column in the bookmarks window.</summary> + </key> + </schema> + <schema path="/apps/epiphany/lockdown/" id="org.gnome.Epiphany.lockdown"> + <key type="b" name="disable-fullscreen"> + <default>false</default> + </key> + <key type="b" name="disable-arbitrary-url"> + <default>false</default> + </key> + <key type="b" name="disable-bookmark-editing"> + <default>false</default> + </key> + <key type="b" name="disable-toolbar-editing"> + <default>false</default> + </key> + <key type="b" name="disable-history"> + <default>false</default> + </key> + <key type="b" name="disable-save-to-disk"> + <default>false</default> + </key> + <key type="b" name="disable-printing"> + <default>false</default> + </key> + <key type="b" name="disable-print-setup"> + <default>false</default> + </key> + <key type="b" name="disable-command-line"> + <default>false</default> + </key> + <key type="b" name="disable-quit"> + <default>false</default> + </key> + <key type="b" name="disable-javascript-chrome"> + <default>false</default> + </key> + <key type="b" name="disable-menubar"> + <default>false</default> + </key> + </schema> +</schemalist> diff --git a/data/ui/epiphany-bookmark-editor-ui.xml b/data/ui/epiphany-bookmark-editor-ui.xml index 7475a79be..ac4ae962a 100644 --- a/data/ui/epiphany-bookmark-editor-ui.xml +++ b/data/ui/epiphany-bookmark-editor-ui.xml @@ -29,7 +29,7 @@ <menu name="ViewMenu" action="View"> <menuitem action="ViewTitle"/> - <menuitem action="ViewTitleAddress"/> + <menuitem action="ViewAddress"/> </menu> <menu name="HelpMenu" action="Help"> |