add gsettings schema

4 files changed, 138 insertions, 321 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index b89623a..dcf635a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,11 +8,12 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
-@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.mate.eom.gschema.xml
+@GSETTINGS_RULES@
 
-schemas_in_files = eom.schemas.in
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+	$(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
 
 gladedir = $(pkgdatadir)
 glade_DATA = eom-image-properties-dialog.ui \
@@ -32,24 +33,16 @@ pkgconfig_DATA = eom.pc
 gtkrcdir = $(pkgdatadir)
 gtkrc_DATA = gtkrc
 
-install-data-local:
-if MATECONF_SCHEMAS_INSTALL
-	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 >&1 > /dev/null; \
-	done \
-	fi
-endif
-
-EXTRA_DIST =			\
-        $(gtkrc_DATA)		\
-        $(glade_DATA)		\
-        $(DESKTOP_IN_FILES)	\
-        $(schemas_in_files)	\
+EXTRA_DIST =				\
+        $(gtkrc_DATA)			\
+        $(glade_DATA)			\
+        $(DESKTOP_IN_FILES)		\
+        $(gsettings_SCHEMAS_in_in)	\
 	$(UI_FILES)
 
 DISTCLEANFILES = 		\
-        $(DESKTOP_FILES)        \
-        $(schemas_DATA)
+        $(DESKTOP_FILES)	\
+        $(gsettings_SCHEMAS_in)	\
+	$(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/eom.pc.in b/data/eom.pc.in
index 2e7259c..25a7fab 100644
--- a/data/eom.pc.in
+++ b/data/eom.pc.in
@@ -6,6 +6,6 @@ pluginsdir=@libdir@/eom/plugins
 
 Name: Eye of MATE
 Description: The MATE Image Viewer
-Requires: gtk+-2.0, mateconf-2.0
+Requires: gtk+-2.0, gio-2.0
 Version: @VERSION@
 Cflags: -I${includedir}
diff --git a/data/eom.schemas.in b/data/eom.schemas.in
deleted file mode 100644
index 626ebca..0000000
--- a/data/eom.schemas.in
+++ /dev/null
@@ -1,300 +0,0 @@
-<mateconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/eom/view/autorotate</key>
-      <applyto>/apps/eom/view/autorotate</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-	<short>Automatic orientation</short>
-	<long>Whether the image should be rotated automatically based on
-	EXIF orientation.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/view/background-color</key>
-      <applyto>/apps/eom/view/background-color</applyto>
-      <owner>eom</owner>
-      <type>string</type>
-      <default>#000000</default>
-      <locale name="C">
-	<short>Background Color</short>
-	<long>The color that is used to fill the area behind the image.
-        If the use-background-color key is not set, the color is determined
-        by the active GTK+ theme instead.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/view/use-background-color</key>
-      <applyto>/apps/eom/view/use-background-color</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-	<short>Use a custom background color</short>
-	<long>If this is active, the color set by the background-color key will be used to fill the area behind the image. If it is not set, the current GTK+ theme will determine the fill color.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/view/interpolate</key>
-      <applyto>/apps/eom/view/interpolate</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-	<short>Interpolate Image</short>
-	<long>Whether the image should be interpolated on zoom-out.
-	This leads to better quality but is somewhat slower than
-        non-interpolated images.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/view/extrapolate</key>
-      <applyto>/apps/eom/view/extrapolate</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-	<short>Extrapolate Image</short>
-	<long>Whether the image should be extrapolated on zoom-in.
-	This leads to blurry quality and is somewhat slower than
-        non-extrapolated images.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/view/transparency</key>
-      <applyto>/apps/eom/view/transparency</applyto>
-      <owner>eom</owner>
-      <type>string</type>
-      <default>CHECK_PATTERN</default>
-      <locale name="C">
-	<short>Transparency indicator</short>
-	<long>Determines how transparency should be indicated. Valid values
-        are CHECK_PATTERN, COLOR and NONE. If COLOR is chosen, then
-        the trans-color key determines the color value used.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/view/scroll_wheel_zoom</key>
-      <applyto>/apps/eom/view/scroll_wheel_zoom</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-	<short>Scroll wheel zoom</short>
-	<long>Whether the scroll wheel should be used for zooming.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/view/zoom_multiplier</key>
-      <applyto>/apps/eom/view/zoom_multiplier</applyto>
-      <owner>eom</owner>
-      <type>float</type>
-      <default>0.05</default>
-      <locale name="C">
-	<short>Zoom multiplier</short>
-	<long>The multiplier to be applied when using the mouse scroll wheel 
-        for zooming. This value defines the zooming step used for each scroll 
-	event. For example, 0.05 results in a 5% zoom increment for each 
-	scroll event and 1.00 result in a 100% zoom increment.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/view/trans_color</key>
-      <applyto>/apps/eom/view/trans_color</applyto>
-      <owner>eom</owner>
-      <type>string</type>
-      <default>#000000</default>
-      <locale name="C">
-	<short>Transparency color</short>
-	<long>If the transparency key has the value COLOR, then this 
-        key determines the color which is used for indicating transparency.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/full_screen/loop</key>
-      <applyto>/apps/eom/full_screen/loop</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Loop through the image sequence</short>
-        <long>Whether the sequence of images should be shown in an
-        endless loop.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/full_screen/upscale</key>
-      <applyto>/apps/eom/full_screen/upscale</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Allow zoom greater than 100% initially</short>
-        <long>If this is set to FALSE small images will not be
-        stretched to fit into the screen initially.</long>
-      </locale>
-    </schema>
-	
-    <schema>
-      <key>/schemas/apps/eom/full_screen/seconds</key>
-      <applyto>/apps/eom/full_screen/seconds</applyto>
-      <owner>eom</owner>
-      <type>int</type>
-      <default>5</default>
-      <locale name="C">
-        <short>Delay in seconds until showing the next image</short>
-        <long>A value greater than 0 determines the seconds an image stays
-        on screen until the next one is shown automatically. Zero 
-        disables the automatic browsing.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/toolbar</key>
-      <applyto>/apps/eom/ui/toolbar</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Show/Hide the window toolbar.</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/statusbar</key>
-      <applyto>/apps/eom/ui/statusbar</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Show/Hide the window statusbar.</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/image_collection</key>
-      <applyto>/apps/eom/ui/image_collection</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Show/Hide the image collection pane.</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/image_collection_position</key>
-      <applyto>/apps/eom/ui/image_collection_position</applyto>
-      <owner>eom</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Image collection pane position. Set to 0 for bottom; 
-        1 for left; 2 for top; 3 for right.</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/image_collection_resizable</key>
-      <applyto>/apps/eom/ui/image_collection_resizable</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Whether the image collection pane should be resizable.</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/sidebar</key>
-      <applyto>/apps/eom/ui/sidebar</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Show/Hide the window side pane.</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/scroll_buttons</key>
-      <applyto>/apps/eom/ui/scroll_buttons</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Show/Hide the image collection pane scroll buttons.</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/disable_trash_confirmation</key>
-      <applyto>/apps/eom/ui/disable_trash_confirmation</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Trash images without asking</short>
-	<long>If activated, Eye of MATE won't ask for confirmation when
-	moving images to the trash. It will still ask if any of the files
-	cannot be moved to the trash and would be deleted instead.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/filechooser_xdg_fallback</key>
-      <applyto>/apps/eom/ui/filechooser_xdg_fallback</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Whether the file chooser should show the user's pictures folder if no images are loaded.</short>
-        <long>If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up, it will show the current working directory.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/ui/propsdialog_netbook_mode</key>
-      <applyto>/apps/eom/ui/propsdialog_netbook_mode</applyto>
-      <owner>eom</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Whether the metadata list in the properties dialog should have its own page.</short>
-        <long>If activated, the detailed metadata list in the properties dialog
-	will be moved to its own page in the dialog. This should make the dialog
-	more usable on smaller screens, e.g. as used by netbooks. If disabled,
-	the widget will be embedded on the "Metadata" page.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/eom/plugins/active_plugins</key>
-      <applyto>/apps/eom/plugins/active_plugins</applyto>
-      <owner>eom</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Active plugins</short>
-        <long>List of active plugins. It doesn't contain the "Location" of the active plugins. 
-        See the .eom-plugin file for obtaining the "Location" of a given plugin.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</mateconfschemafile>
diff --git a/data/org.mate.eom.gschema.xml.in.in b/data/org.mate.eom.gschema.xml.in.in
new file mode 100644
index 0000000..4dd5831
--- /dev/null
+++ b/data/org.mate.eom.gschema.xml.in.in
@@ -0,0 +1,124 @@
+<schemalist>
+  <schema id="org.mate.eom" path="/org/mate/eom/">
+    <child name="view" schema="org.mate.eom.view"/>
+    <child name="full-screen" schema="org.mate.eom.full-screen"/>
+    <child name="ui" schema="org.mate.eom.ui"/>
+    <child name="plugins" schema="org.mate.eom.plugins"/>
+  </schema>
+  <schema id="org.mate.eom.view" path="/org/mate/eom/view/">
+    <key name="autorotate" type="b">
+      <default>true</default>
+      <_summary>Automatic orientation</_summary>
+      <_description>Whether the image should be rotated automatically based on EXIF orientation.</_description>
+    </key>
+    <key name="background-color" type="s">
+      <default>'#000000'</default>
+      <_summary>Background Color</_summary>
+      <_description>The color that is used to fill the area behind the image. If the use-background-color key is not set, the color is determined by the active GTK+ theme instead.</_description>
+    </key>
+    <key name="use-background-color" type="b">
+      <default>true</default>
+      <_summary>Use a custom background color</_summary>
+      <_description>If this is active, the color set by the background-color key will be used to fill the area behind the image. If it is not set, the current GTK+ theme will determine the fill color.</_description>
+    </key>
+    <key name="interpolate" type="b">
+      <default>true</default>
+      <_summary>Interpolate Image</_summary>
+      <_description>Whether the image should be interpolated on zoom-out. This leads to better quality but is somewhat slower than non-interpolated images.</_description>
+    </key>
+    <key name="extrapolate" type="b">
+      <default>true</default>
+      <_summary>Extrapolate Image</_summary>
+      <_description>Whether the image should be extrapolated on zoom-in. This leads to blurry quality and is somewhat slower than non-extrapolated images.</_description>
+    </key>
+    <key name="transparency" type="s">
+      <default>'CHECK_PATTERN'</default>
+      <_summary>Transparency indicator</_summary>
+      <_description>Determines how transparency should be indicated. Valid values are CHECK_PATTERN, COLOR and NONE. If COLOR is chosen, then the trans-color key determines the color value used.</_description>
+    </key>
+    <key name="scroll-wheel-zoom" type="b">
+      <default>true</default>
+      <_summary>Scroll wheel zoom</_summary>
+      <_description>Whether the scroll wheel should be used for zooming.</_description>
+    </key>
+    <key name="zoom-multiplier" type="d">
+      <default>0.05</default>
+      <_summary>Zoom multiplier</_summary>
+      <_description>The multiplier to be applied when using the mouse scroll wheel  for zooming. This value defines the zooming step used for each scroll  event. For example, 0.05 results in a 5% zoom increment for each  scroll event and 1.00 result in a 100% zoom increment.</_description>
+    </key>
+    <key name="trans-color" type="s">
+      <default>'#000000'</default>
+      <_summary>Transparency color</_summary>
+      <_description>If the transparency key has the value COLOR, then this  key determines the color which is used for indicating transparency.</_description>
+    </key>
+  </schema>
+  <schema id="org.mate.eom.full-screen" path="/org/mate/eom/full-screen/">
+    <key name="loop" type="b">
+      <default>true</default>
+      <_summary>Loop through the image sequence</_summary>
+      <_description>Whether the sequence of images should be shown in an endless loop.</_description>
+    </key>
+    <key name="upscale" type="b">
+      <default>true</default>
+      <_summary>Allow zoom greater than 100% initially</_summary>
+      <_description>If this is set to FALSE small images will not be stretched to fit into the screen initially.</_description>
+    </key>
+    <key name="seconds" type="i">
+      <default>5</default>
+      <_summary>Delay in seconds until showing the next image</_summary>
+      <_description>A value greater than 0 determines the seconds an image stays on screen until the next one is shown automatically. Zero  disables the automatic browsing.</_description>
+    </key>
+  </schema>
+  <schema id="org.mate.eom.ui" path="/org/mate/eom/ui/">
+    <key name="toolbar" type="b">
+      <default>true</default>
+      <_summary>Show/Hide the window toolbar.</_summary>
+    </key>
+    <key name="statusbar" type="b">
+      <default>true</default>
+      <_summary>Show/Hide the window statusbar.</_summary>
+    </key>
+    <key name="image-collection" type="b">
+      <default>false</default>
+      <_summary>Show/Hide the image collection pane.</_summary>
+    </key>
+    <key name="image-collection-position" type="i">
+      <default>0</default>
+      <_summary>Image collection pane position. Set to 0 for bottom;  1 for left; 2 for top; 3 for right.</_summary>
+    </key>
+    <key name="image-collection-resizable" type="b">
+      <default>false</default>
+      <_summary>Whether the image collection pane should be resizable.</_summary>
+    </key>
+    <key name="sidebar" type="b">
+      <default>true</default>
+      <_summary>Show/Hide the window side pane.</_summary>
+    </key>
+    <key name="scroll-buttons" type="b">
+      <default>true</default>
+      <_summary>Show/Hide the image collection pane scroll buttons.</_summary>
+    </key>
+    <key name="disable-trash-confirmation" type="b">
+      <default>false</default>
+      <_summary>Trash images without asking</_summary>
+      <_description>If activated, Eye of MATE won't ask for confirmation when moving images to the trash. It will still ask if any of the files cannot be moved to the trash and would be deleted instead.</_description>
+    </key>
+    <key name="filechooser-xdg-fallback" type="b">
+      <default>true</default>
+      <_summary>Whether the file chooser should show the user's pictures folder if no images are loaded.</_summary>
+      <_description>If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up, it will show the current working directory.</_description>
+    </key>
+    <key name="propsdialog-netbook-mode" type="b">
+      <default>true</default>
+      <_summary>Whether the metadata list in the properties dialog should have its own page.</_summary>
+      <_description>If activated, the detailed metadata list in the properties dialog will be moved to its own page in the dialog. This should make the dialog more usable on smaller screens, e.g. as used by netbooks. If disabled, the widget will be embedded on the "Metadata" page.</_description>
+    </key>
+  </schema>
+  <schema id="org.mate.eom.plugins" path="/org/mate/eom/plugins/">
+    <key name="active-plugins" type="as">
+      <default>[]</default>
+      <_summary>Active plugins</_summary>
+      <_description>List of active plugins. It doesn't contain the "Location" of the active plugins.  See the .eom-plugin file for obtaining the "Location" of a given plugin.</_description>
+    </key>
+  </schema>
+</schemalist>