From 8d80642d5cd6ce3522029525505abc991087f258 Mon Sep 17 00:00:00 2001 From: raveit Date: Sat, 3 Nov 2012 01:12:52 +0100 Subject: Port MATE Screensaver to GSettings --- data/Makefile.am | 34 +++++-------- data/org.mate.screensaver.gschema.migrate | 16 ++++++ data/org.mate.screensaver.gschema.xml.in | 85 +++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 21 deletions(-) create mode 100644 data/org.mate.screensaver.gschema.migrate create mode 100644 data/org.mate.screensaver.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 1bae8e9..37e91de 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,12 +9,6 @@ man_MANS = \ mate-screensaver-preferences.1 \ $(NULL) -@INTLTOOL_SCHEMAS_RULE@ - -schemasdir = @MATECONF_SCHEMA_FILE_DIR@ -schemas_in_files = mate-screensaver.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) - @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications @@ -46,8 +40,17 @@ pkgconfig_DATA = mate-screensaver.pc dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR) dbussessionservice_DATA = org.mate.ScreenSaver.service +@GSETTINGS_RULES@ +@INTLTOOL_XML_NOMERGE_RULE@ + +gsettings_SCHEMAS = org.mate.screensaver.gschema.xml + +migrationdir = $(datadir)/MateConf/gsettings +dist_migration_DATA = org.mate.screensaver.gschema.migrate + + EXTRA_DIST = \ - $(schemas_in_files) \ + $(gsettings_SCHEMAS:.xml=.xml.in.in) \ $(desktop_in_files) \ $(directory_in_files) \ $(gtkbuilder_DATA) \ @@ -60,26 +63,15 @@ EXTRA_DIST = \ $(NULL) DISTCLEANFILES = \ - $(schemas_DATA) \ + $(gsettings_SCHEMAS) $(desktop_DATA) \ $(directory_DATA) \ $(NULL) MAINTAINERCLEANFILES = \ *~ \ - Makefile.in - -if MATECONF_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 \ - MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ - done \ - fi -else -install-data-local: -endif + Makefile.in \ + $(gsettings_SCHEMAS:.xml=.valid) install-data-hook: @system=`uname`; \ diff --git a/data/org.mate.screensaver.gschema.migrate b/data/org.mate.screensaver.gschema.migrate new file mode 100644 index 0000000..27c7b2d --- /dev/null +++ b/data/org.mate.screensaver.gschema.migrate @@ -0,0 +1,16 @@ +[org.mate.screensaver] +idle-activation-enabled = /apps/mate-screensaver/idle_activation_enabled +lock-enabled = /apps/mate-screensaver/lock_enabled +mode = /apps/mate-screensaver/mode +themes = /apps/mate-screensaver/themes +idle-delay = /apps/mate-screensaver/idle_delay +power-management-delay = /apps/mate-screensaver/power_management_delay +cycle-delay = /apps/mate-screensaver/cycle_delay +lock-delay = /apps/mate-screensaver/lock_delay +embedded-keyboard-enabled = /apps/mate-screensaver/embedded_keyboard_enabled +embedded-keyboard-command = /apps/mate-screensaver/embedded_keyboard_command +logout-enabled = /apps/mate-screensaver/logout_enabled +logout-delay = /apps/mate-screensaver/logout_delay +logout-command = /apps/mate-screensaver/logout_command +user-switch-enabled = /apps/mate-screensaver/user_switch_enabled +status-message-enabled = /apps/mate-screensaver/status_message_enabled diff --git a/data/org.mate.screensaver.gschema.xml.in b/data/org.mate.screensaver.gschema.xml.in new file mode 100644 index 0000000..bafc579 --- /dev/null +++ b/data/org.mate.screensaver.gschema.xml.in @@ -0,0 +1,85 @@ + + + + + + + + + true + Activate when idle + Set this to TRUE to activate the screensaver when the session is idle. + + + true + Lock on activation + Set this to TRUE to lock the screen when the screensaver goes active. + + + 'blank-only' + Screensaver theme selection mode + The selection mode used by screensaver. May be "blank-only" to enable the screensaver without using any theme on activation, "single" to enable screensaver using only one theme on activation (specified in "themes" key), and "random" to enable the screensaver using a random theme on activation. + + + [] + Screensaver themes + This key specifies the list of themes to be used by the screensaver. It's ignored when "mode" key is "blank-only", should provide the theme name when "mode" is "single", and should provide a list of themes when "mode" is "random". + + + 10 + Time before session is considered idle + The number of minutes of inactivity before the session is considered idle. + + + 30 + Time before power management baseline + The number of seconds of inactivity before signalling to power management. This key is set and maintained by the session power management agent. + + + 10 + Time before theme change + The number of minutes to run before changing the screensaver theme. + + + 0 + Time before locking + The number of minutes after screensaver activation before locking the screen. + + + false + Allow embedding a keyboard into the window + Set this to TRUE to allow embedding a keyboard into the window when trying to unlock. The "keyboard_command" key must be set with the appropriate command. + + + '' + Embedded keyboard command + The command that will be run, if the "embedded_keyboard_enabled" key is set to TRUE, to embed a keyboard widget into the window. This command should implement an XEMBED plug interface and output a window XID on the standard output. + + + false + Allow logout + Set this to TRUE to offer an option in the unlock dialog to allow logging out after a delay. The delay is specified in the "logout_delay" key. + + + 120 + Time before logout option + The number of minutes after the screensaver activation before a logout option will appear in the unlock dialog. This key has effect only if the "logout_enable" key is set to TRUE. + + + '' + Logout command + The command to invoke when the logout button is clicked. This command should simply log the user out without any interaction. This key has effect only if the "logout_enable" key is set to TRUE. + + + true + Allow user switching + Set this to TRUE to offer an option in the unlock dialog to switch to a different user account. + + + true + Allow the session status message to be displayed + Allow the session status message to be displayed when the screen is locked. + + + + -- cgit v1.2.1