GNOME.org
 

[gnome-settings-daemon] Port GConf schemas to GSettings

commit 157c343ac45eb03a61fe32841ceb879bcac1297d
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Wed Oct 6 17:03:37 2010 +0200

    Port GConf schemas to GSettings

 .gitignore                                         |    4 +-
 configure.ac                                       |   11 +
 data/Makefile.am                                   |   52 ++---
 ...s_gnome_settings_daemon_housekeeping.schemas.in |   61 -----
 ...ps_gnome_settings_daemon_keybindings.schemas.in |  240 --------------------
 data/apps_gnome_settings_daemon_xrandr.schemas.in  |   62 -----
 data/desktop_gnome_keybindings.schemas.in          |   20 --
 data/gnome-settings-daemon.convert                 |   40 ++++
 ....gnome.desktop.font-rendering.gschema.xml.in.in |   24 ++
 ...org.gnome.desktop.keybindings.gschema.xml.in.in |  104 +++++++++
 ...s-daemon.plugins.housekeeping.gschema.xml.in.in |   29 +++
 ...ettings-daemon.plugins.xrandr.gschema.xml.in.in |   24 ++
 12 files changed, 254 insertions(+), 417 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26d237c..29a3812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,9 @@ gnome-settings-daemon/gnome-settings-client.h
 gnome-settings-daemon/gnome-settings-daemon
 gnome-settings-daemon/gnome-settings-manager-glue.h
 data/*.pc
-data/*.schemas
+data/*.xml
+data/*.xml.in
+data/*.valid
 data/gnome-settings-daemon.desktop
 data/gnome-settings-daemon.desktop.in
 data/50-accessibility.xml
diff --git a/configure.ac b/configure.ac
index 3774e32..29b9aea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ PKG_CHECK_MODULES(SETTINGS_DAEMON,
         gmodule-2.0
         gthread-2.0
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+	gsettings-desktop-schemas
 )
 
 PKG_CHECK_MODULES(SETTINGS_PLUGIN,
@@ -89,6 +90,12 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
 
 AM_GCONF_SOURCE_2
 
+dnl ================================================================
+dnl GSettings stuff
+dnl ================================================================
+
+GLIB_GSETTINGS
+
 dnl ---------------------------------------------------------------------------
 dnl - Check for gnome-desktop
 dnl ---------------------------------------------------------------------------
@@ -457,6 +464,10 @@ data/Makefile
 data/gnome-settings-daemon.desktop.in
 data/gnome-settings-daemon.pc
 data/gnome-settings-daemon-uninstalled.pc
+data/org.gnome.desktop.font-rendering.gschame.xml.in
+data/org.gnome.desktop.keybindings.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
 po/Makefile.in
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 21fbc11..8a2dc57 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,20 +1,17 @@
 NULL =
 
- INTLTOOL_SCHEMAS_RULE@
+gsettings_SCHEMAS =							\
+	org.gnome.desktop.font-renderin.gschema.xml			\
+	org.gnome.desktop.keybindings.gschema.xml			\
+	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
+	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
 
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = 						\
-	gnome-settings-daemon.schemas.in			\
-	apps_gnome_settings_daemon_housekeeping.schemas.in	\
-	apps_gnome_settings_daemon_keybindings.schemas.in	\
-	desktop_gnome_font_rendering.schemas.in			\
-	desktop_gnome_keybindings.schemas.in			\
-	apps_gnome_settings_daemon_xrandr.schemas.in		\
-	desktop_gnome_peripherals_touchpad.schemas.in		\
-	desktop_gnome_peripherals_smartcard.schemas.in		\
-	$(NULL)
+ INTLTOOL_XML_NOMERGE_RULE@
 
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+ GSETTINGS_RULES@
+
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = gnome-settings-daemon.convert
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(sysconfdir)/xdg/autostart
@@ -37,16 +34,16 @@ xmldir = @GNOME_KEYBINDINGS_KEYSDIR@
 xml_in_files = 50-accessibility.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-EXTRA_DIST = 				\
-	$(schemas_in_files)		\
-	$(service_in_files)		\
-	$(desktop_in_files)		\
-	$(xml_in_files)			\
-	gnome-settings-daemon.pc.in	\
+EXTRA_DIST = 					\
+	$(gsettings_SCHEMAS:.xml=.xml.in.in	\
+	$(service_in_files)			\
+	$(desktop_in_files)			\
+	$(xml_in_files)				\
+	gnome-settings-daemon.pc.in		\
 	$(NULL)
 
 DISTCLEANFILES = 			\
-	$(schemas_DATA)			\
+	$(gsettings_SCHEMAS)		\
 	$(service_DATA)			\
 	$(desktop_DATA)			\
 	$(xml_DATA)			\
@@ -54,16 +51,5 @@ DISTCLEANFILES = 			\
 
 MAINTAINERCLEANFILES =			\
 	*~				\
-	Makefile.in
-
-if GCONF_SCHEMAS_INSTALL
-# don't do this if we are building in eg. rpm
-install-data-local: $(schemas_DATA)
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schemas_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p 2>&1 > /dev/null; \
-		done \
-	fi
-else
-install-data-local:
-endif
+	Makefile.in			\
+	$(gsettings_SCHEMAS:.xml=.valid)
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
new file mode 100644
index 0000000..6b16841
--- /dev/null
+++ b/data/gnome-settings-daemon.convert
@@ -0,0 +1,40 @@
+[org.gnome.desktop.font-rendering]
+antialiasing = /desktop/gnome/font_rendering/antialiasing
+dpi = /desktop/gnome/font_rendering/dpi
+hinting = /desktop/gnome/font_rendering/hinting
+rgba-order = /desktop/gnome/font_rendering/rgba_order
+
+[org.gnome.desktop.keybindings]
+allowed-keys = /desktop/gnome/keybindings/allowed_keys
+calculator = /apps/gnome_settings_daemon/keybindings/calculator
+email = /apps/gnome_settings_daemon/keybindings/email
+eject = /apps/gnome_settings_daemon/keybindings/eject
+help = /apps/gnome_settings_daemon/keybindings/help
+home = /apps/gnome_settings_daemon/keybindings/home
+media = /apps/gnome_settings_daemon/keybindings/media
+next = /apps/gnome_settings_daemon/keybindings/next
+pause = /apps/gnome_settings_daemon/keybindings/pause
+play = /apps/gnome_settings_daemon/keybindings/play
+power = /apps/gnome_settings_daemon/keybindings/power
+previous = /apps/gnome_settings_daemon/keybindings/previous
+screensaver = /apps/gnome_settings_daemon/keybindings/screensaver
+search = /apps/gnome_settings_daemon/keybindings/search
+stop = /apps/gnome_settings_daemon/keybindings/stop
+touchpad = /apps/gnome_settings_daemon/keybindings/touchpad
+volume-down = /apps/gnome_settings_daemon/keybindings/volume_down
+volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute
+volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
+www = /apps/gnome_settings_daemon/keybindings/www
+
+[org.gnome.settings-daemon.plugins.housekeeping]
+free-percent-notify = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify
+free-percent-notify-again = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify_again
+free-size-gb-no-notify = /apps/gnome_settings_daemon/plugins/housekeeping/free_size_gb_no_notify
+ignore-paths = /apps/gnome_settings_daemon/plugins/housekeeping/ignore_paths
+min-notify-period = /apps/gnome_settings_daemon/plugins/housekeeping/min_notify_period
+
+[org.gnome.settings-daemon.plugins.xrandr]
+default-configuration-file = /apps/gnome_settings_daemon/xrandr/default_configuration_file
+show-notification-icon = /apps/gnome_settings_daemon/xrandr/show_notification_icon
+turn-on-external-monitors-at-startup = /apps/gnome_settings_daemon/xrandr/turn_on_external_monitors_at_startup
+turn-on-laptop-monitor-at-startup = /apps/gnome_settings_daemon/xrandr/turn_on_laptop_monitor_at_startup
diff --git a/data/org.gnome.desktop.font-rendering.gschema.xml.in.in b/data/org.gnome.desktop.font-rendering.gschema.xml.in.in
new file mode 100644
index 0000000..8adbee2
--- /dev/null
+++ b/data/org.gnome.desktop.font-rendering.gschema.xml.in.in
@@ -0,0 +1,24 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.font-rendering" path="/desktop/gnome/font-rendering">
+    <key name="antialiasing" type="s">
+      <default>grayscale</default>
+      <_summary>Antialiasing</_summary>
+      <_description>The type of antialiasing to use when rendering fonts. Possible values are: "none" for no antialiasing, "grayscale" for standard grayscale antialiasing, and "rgba" for subpixel antialiasing (LCD screens only).</_description>
+    </key>
+    <key name="dpi" type="f">
+      <default></default>
+      <_summary>DPI</_summary>
+      <_description>The resolution used for converting font sizes to pixel sizes, in dots per inch.</_description>
+    </key>
+    <key name="hinting" type="s">
+      <default>medium</default>
+      <_summary>Hinting</_summary>
+      <_description>The type of hinting to use when rendering fonts. Possible values are: "none" for no hinting, "slight" for basic, "medium" for moderate, and "full" for maximum hinting (may cause distortion of letter forms).</_description>
+    </key>
+    <key name="rgba-order" type="s">
+      <default>rgb</default>
+      <_summary>RGBA order</_summary>
+      <_description>The order of subpixel elements on an LCD screen; only used when antialiasing is set to "rgba". Possible values are: "rgb" for red on left (most common), "bgr" for blue on left, "vrgb" for red on top, "vbgr" for red on bottom.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.desktop.keybindings.gschema.xml.in.in b/data/org.gnome.desktop.keybindings.gschema.xml.in.in
new file mode 100644
index 0000000..c820107
--- /dev/null
+++ b/data/org.gnome.desktop.keybindings.gschema.xml.in.in
@@ -0,0 +1,104 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.keybindings" path="/desktop/gnome/keybindings">
+    <key name="allowed-keys" type="as">
+      <default>[]</default>
+      <_summary>Allowed keys</_summary>
+      <_description>If non-empty, keybindings will be ignored unless their settings directory is in the list. This is useful for lockdown.</_description>
+    </key>
+    <key name="calculator" type="s">
+      <default>XF86Calculator</default>
+      <_summary>Launch calculator</_summary>
+      <_description>Binding to launch the calculator.</_description>
+    </key>
+    <key name="email" type="s">
+      <default>XF86Mail</default>
+      <_summary>Launch email client</_summary>
+      <_description>Binding to launch the email client.</_description>
+    </key>
+    <key name="eject" type="s">
+      <default>XF86Eject</default>
+      <_summary>Eject</_summary>
+      <_description>Binding to eject an optical disc.</_description>
+    </key>
+    <key name="help" type="s">
+      <default></default>
+      <_summary>Launch help browser</_summary>
+      <_description>Binding to launch the help browser.</_description>
+    </key>
+    <key name="home" type="s">
+      <default>XF86Explorer</default>
+      <_summary>Home folder</_summary>
+      <_description>Binding to open the Home folder.</_description>
+    </key>
+    <key name="media" type="s">
+      <default>XF86AudioMedia</default>
+      <_summary>Launch media player</_summary>
+      <_description>Binding to launch the media player.</_description>
+    </key>
+    <key name="next" type="s">
+      <default>XF86AudioNext</default>
+      <_summary>Next track</_summary>
+      <_description>Binding to skip to next track.</_description>
+    </key>
+    <key name="pause" type="s">
+      <default>XF86AudioPause</default>
+      <_summary>Pause playback</_summary>
+      <_description>Binding to pause playback.</_description>
+    </key>
+    <key name="play" type="s">
+      <default>XF86AudioPlay</default>
+      <_summary>Play (or play/pause)</_summary>
+      <_description>Binding to start playback (or toggle play/pause).</_description>
+    </key>
+    <key name="power" type="s">
+      <default>&lt;Control&gt;&lt;Alt&gt;Delete</default>
+      <_summary>Log out</_summary>
+      <_description>Binding to log out.</_description>
+    </key>
+    <key name="previous" type="s">
+      <default>XF86AudioPrev</default>
+      <_summary>Previous track</_summary>
+      <_description>Binding to skip to previous track.</_description>
+    </key>
+    <key name="screensaver" type="s">
+      <default>&lt;Control&gt;&lt;Alt&gt;l</default>
+      <_summary>Lock screen</_summary>
+      <_description>Binding to lock the screen.</_description>
+    </key>
+    <key name="search" type="s">
+      <default>XF86Search</default>
+      <_summary>Search</_summary>
+      <_description>Binding to launch the search tool.</_description>
+    </key>
+    <key name="stop" type="s">
+      <default>XF86AudioStop</default>
+      <_summary>Stop playback</_summary>
+      <_description>Binding to stop playback.</_description>
+    </key>
+    <key name="touchpad" type="s">
+      <default>XF86TouchpadToggle</default>
+      <_summary>Toggle touchpad</_summary>
+      <_description>Binding to enable or disable the touchpad.</_description>
+    </key>
+    <key name="volume-down" type="s">
+      <default>XF86AudioLowerVolume</default>
+      <_summary>Volume down</_summary>
+      <_description>Binding to lower the system volume.</_description>
+    </key>
+    <key name="volume-mute" type="s">
+      <default>XF86AudioMute</default>
+      <_summary>Volume mute</_summary>
+      <_description>Binding to mute the system volume.</_description>
+    </key>
+    <key name="volume-up" type="s">
+      <default>XF86AudioRaiseVolume</default>
+      <_summary>Volume up</_summary>
+      <_description>Binding to raise the system volume.</_description>
+    </key>
+    <key name="www" type="s">
+      <default>XF86WWW</default>
+      <_summary>Launch web browser</_summary>
+      <_description>Binding to launch the web browser.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
new file mode 100644
index 0000000..c96bb17
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
@@ -0,0 +1,29 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.housekeeping" path="/apps/gnome-settings-daemon/plugins/housekeeping">
+    <key name="free-percent-notify" type="f">
+      <default>0.05</default>
+      <_summary>Free percentage notify threshold</_summary>
+      <_description>Percentage free space threshold for initial warning of low disk space. If the percentage free space drops below this, a warning will be shown.</_description>
+    </key>
+    <key name="free-percent-notify-again" type="f">
+      <default>0.01</default>
+      <_summary>Subsequent free percentage notify threshold</_summary>
+      <_description>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning.</_description>
+    </key>
+    <key name="free-size-gb-no-notify" type="i">
+      <default>2</default>
+      <_summary>Free space no notify threshold</_summary>
+      <_description>Specify an amount in GB. If the amount of free space is more than this, no warning will be shown.</_description>
+    </key>
+    <key name="min-notify-period" type="i">
+      <default>10</default>
+      <_summary>Minimum notify period for repeated warnings</_summary>
+      <_description>Specify a time in minutes. Subsequent warnings for a volume will not appear more often than this period.</_description>
+    </key>
+    <key name="ignore-paths" type="as">
+      <default>[]</default>
+      <_summary>Mount paths to ignore</_summary>
+      <_description>Specify a list of mount paths to ignore when they run low on space.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
new file mode 100644
index 0000000..3b72ad0
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
@@ -0,0 +1,24 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.xrandr" path="/apps/gnome-settings-daemon/plugins/xrandr">
+    <key name="default-configuration-file" type="s">
+      <default>/etc/gnome-settings-daemon/xrandr/monitors.xml</default>
+      <_summary>File for default configuration for RandR</_summary>
+      <_description>The XRandR plugin will look for a default configuration in the file specified by this key. This is similar to the ~/.config/monitors.xml that normally gets stored in users' home directories.  If a user does not have such a file, or has one that does not match the user's setup of monitors, then the file specified by this key will be used instead.</_description>
+    </key>
+    <key name="show-notification-icon" type="b">
+      <default>false</default>
+      <_summary>Show display in Notification Area</_summary>
+      <_description>Whether a notification icon with display-related things should be shown in the panel.</_description>
+    </key>
+    <key name="turn-on-external-monitors-at-startup" type="b">
+      <default>false</default>
+      <_summary>Turn on external monitor after system boot</_summary>
+      <_description>Turn on external monitor after system boot if user plugs in external monitor on system boot.</_description>
+    </key>
+    <key name="turn-on-laptop-monitor-at-startup" type="b">
+      <default>true</default>
+      <_summary>Turn on laptop monitor after system boot</_summary>
+      <_description>Turn on laptop monitor after system boot if user plugs in external monitor on system boot.</_description>
+    </key>
+  </schema>
+</schemalist>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]