From 65391202450a610ed2f25b433ee8ba73e2cf440f Mon Sep 17 00:00:00 2001 From: Javier Jardón Date: Tue, 27 Mar 2012 16:10:43 +0100 Subject: build: intltool 0.50 add proper support for gsettings schemas Its not needed to use the .in hack anymore Fixes https://bugzilla.gnome.org/show_bug.cgi?id=672932 --- data/Makefile.am | 9 +- data/org.gnome.epiphany.gschema.xml | 258 +++++++++++++++++++++++++++++++++ data/org.gnome.epiphany.gschema.xml.in | 258 --------------------------------- 3 files changed, 261 insertions(+), 264 deletions(-) create mode 100644 data/org.gnome.epiphany.gschema.xml delete mode 100644 data/org.gnome.epiphany.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 2672fc333..3ac9beef8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -13,9 +13,7 @@ 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_SCHEMAS = org.gnome.epiphany.gschema.xml @GSETTINGS_RULES@ aboutdir = $(pkgdatadir) @@ -69,7 +67,7 @@ EXTRA_DIST = \ $(service_DATA) \ $(m4data_DATA) \ $(default_bookmarks_in_files) \ - $(gsettings_files) \ + $(gsettings_SCHEMAS) \ $(convert_DATA) \ epiphany-service.xml \ check-mime.py @@ -78,5 +76,4 @@ DISTCLEANFILES = \ $(service_DATA) \ $(pkgconfig_DATA) \ $(desktop_DATA) \ - $(default_bookmarks_DATA) \ - $(gsettings_SCHEMAS) + $(default_bookmarks_DATA) diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml new file mode 100644 index 000000000..b06f4232b --- /dev/null +++ b/data/org.gnome.epiphany.gschema.xml @@ -0,0 +1,258 @@ + + + + + + + + + false + Browse with caret + + + 'http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8' + URL Search + Search string for keywords entered in the URL bar. + + + '' + User agent + String that will be used as user agent, to identify the browser to the web servers. + + + true + Automatic downloads + When files cannot be opened by the browser they are automatically downloaded to the download folder and opened with the appropriate application. + + + false + Middle click to open the web page pointed to by the currently selected text + Middle clicking on the main view pane will open the web page pointed to by the currently selected text. + + + true + Force new windows to be opened in tabs + Force new window requests to be opened in tabs instead of using a new window. + + + true + Remember passwords + Whether to store and prefill passwords in web sites. + + + true + Automatically manage offline status with NetworkManager + + + true + + + false + Enable smooth scrolling + + + ['extensions-manager-ui' ] + Active extensions + Lists the active extensions. + + + true + Don't use an external application to view page source. + + + + + true + Show toolbars by default + + + false + Show bookmarks bar by default + + + 'both-horiz' + Toolbar style + Toolbar style. Allowed values are "" (use GNOME default style), "both" (text and icons), "both-horiz" (text besides icons), "icons", and "text". + + + false + Always show the tab bar + Show the tab bar also when there is only one tab open. + + + false + Visibility of the downloads window + Hide or show the downloads window. When hidden, a notification will be shown when new downloads are started. + + + + + 0 + Minimum font size + + + true + Use GNOME fonts + Use GNOME desktop wide font configuration. + + + 'Sans 10' + Custom sans-serif font + A value to be used to override sans-serif desktop font when use-gnome-fonts is set. + + + 'Serif 10' + Custom serif font + A value to be used to override serif desktop font when use-gnome-fonts is set. + + + 'Monospace 10' + Custom monospace font + A value to be used to override monospace desktop font when use-gnome-fonts is set. + + + false + Use own colors + Use your own colors instead of the colors the page requests. + + + false + Use own fonts + Use your own fonts instead of the fonts the page requests. + + + false + Use a custom CSS + Use a custom CSS file to modify websites own CSS. + + + true + Enable spell checking + Spell check any text typed in editable areas. + + + 'UTF-8' + Default encoding + Default encoding. Accepted values are the ones WebKitGTK+ can understand. + + + 50 + Size of disk cache + Size of disk cache, in MB. + + + [] + Languages + Preferred languages, two letter codes. + + + 'no-third-party' + Cookie accept + Where to accept cookies from. Possible values are "anywhere", "current site" and "nowhere". + + + 'normal' + Image animation mode + How to present animated images. Possible values are "normal", "once" and "disabled". + + + true + Allow popups + Allow sites to open new windows using JavaScript (if JavaScript is enabled). + + + true + Enable Plugins + + + true + Enable JavaScript + + + false + Enable WebGL + Whether to enable support for WebGL contexts. + + + + + '~' + + + '~' + + + '~' + + + '~' + + + 'Downloads' + The downloads folder + 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. + + + ['' ] + + + 5 + History pages time range + + + true + Whether to show the title column in the history window. + + + true + Whether to show the address column in the history window. + + + false + Whether to show the date-time column in the history window. + + + true + Whether to show the title column in the bookmarks window. + + + false + Whether to show the address column in the bookmarks window. + + + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + diff --git a/data/org.gnome.epiphany.gschema.xml.in b/data/org.gnome.epiphany.gschema.xml.in deleted file mode 100644 index b06f4232b..000000000 --- a/data/org.gnome.epiphany.gschema.xml.in +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - - - - false - Browse with caret - - - 'http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8' - URL Search - Search string for keywords entered in the URL bar. - - - '' - User agent - String that will be used as user agent, to identify the browser to the web servers. - - - true - Automatic downloads - When files cannot be opened by the browser they are automatically downloaded to the download folder and opened with the appropriate application. - - - false - Middle click to open the web page pointed to by the currently selected text - Middle clicking on the main view pane will open the web page pointed to by the currently selected text. - - - true - Force new windows to be opened in tabs - Force new window requests to be opened in tabs instead of using a new window. - - - true - Remember passwords - Whether to store and prefill passwords in web sites. - - - true - Automatically manage offline status with NetworkManager - - - true - - - false - Enable smooth scrolling - - - ['extensions-manager-ui' ] - Active extensions - Lists the active extensions. - - - true - Don't use an external application to view page source. - - - - - true - Show toolbars by default - - - false - Show bookmarks bar by default - - - 'both-horiz' - Toolbar style - Toolbar style. Allowed values are "" (use GNOME default style), "both" (text and icons), "both-horiz" (text besides icons), "icons", and "text". - - - false - Always show the tab bar - Show the tab bar also when there is only one tab open. - - - false - Visibility of the downloads window - Hide or show the downloads window. When hidden, a notification will be shown when new downloads are started. - - - - - 0 - Minimum font size - - - true - Use GNOME fonts - Use GNOME desktop wide font configuration. - - - 'Sans 10' - Custom sans-serif font - A value to be used to override sans-serif desktop font when use-gnome-fonts is set. - - - 'Serif 10' - Custom serif font - A value to be used to override serif desktop font when use-gnome-fonts is set. - - - 'Monospace 10' - Custom monospace font - A value to be used to override monospace desktop font when use-gnome-fonts is set. - - - false - Use own colors - Use your own colors instead of the colors the page requests. - - - false - Use own fonts - Use your own fonts instead of the fonts the page requests. - - - false - Use a custom CSS - Use a custom CSS file to modify websites own CSS. - - - true - Enable spell checking - Spell check any text typed in editable areas. - - - 'UTF-8' - Default encoding - Default encoding. Accepted values are the ones WebKitGTK+ can understand. - - - 50 - Size of disk cache - Size of disk cache, in MB. - - - [] - Languages - Preferred languages, two letter codes. - - - 'no-third-party' - Cookie accept - Where to accept cookies from. Possible values are "anywhere", "current site" and "nowhere". - - - 'normal' - Image animation mode - How to present animated images. Possible values are "normal", "once" and "disabled". - - - true - Allow popups - Allow sites to open new windows using JavaScript (if JavaScript is enabled). - - - true - Enable Plugins - - - true - Enable JavaScript - - - false - Enable WebGL - Whether to enable support for WebGL contexts. - - - - - '~' - - - '~' - - - '~' - - - '~' - - - 'Downloads' - The downloads folder - 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. - - - ['' ] - - - 5 - History pages time range - - - true - Whether to show the title column in the history window. - - - true - Whether to show the address column in the history window. - - - false - Whether to show the date-time column in the history window. - - - true - Whether to show the title column in the bookmarks window. - - - false - Whether to show the address column in the bookmarks window. - - - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - -- cgit