Use new magic to auto-generate gconf schema file.

3 files changed, 10 insertions, 201 deletions

diff --git a/.gitignore b/.gitignore
index f23b105..3402137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 *.pyc
-*.swp
-*.orig
 *~
 Makefile
 Makefile.in
@@ -24,4 +22,5 @@ m4/intltool.m4
 *.tar.gz
 data/caribou.desktop
 po/.intltool-merge-cache
-
+data/caribou.schemas
+data/caribou.schemas.in
diff --git a/data/Makefile.am b/data/Makefile.am
index fb32b10..fd7f312 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,20 +1,21 @@
 SUBDIRS = keyboards
 
-gtkbuilderdir = $(datadir)/caribou
-gtkbuilder_DATA = caribou-prefs.ui
-
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = caribou.schemas
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = caribou.schemas.in
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+@INTLTOOL_SCHEMAS_RULE@
 
 desktopdir = $(datadir)/applications
 desktop_in_files = caribou.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(gtkbuilder_DATA) \
-             $(schema_DATA) \
+EXTRA_DIST = $(schema_DATA) \
              $(desktop_in_files)
 
+caribou.schemas.in: $(top_srcdir)/caribou/common/settings.py
+	PYTHONPATH=$(top_srcdir) $(PYTHON) $< > $@
+
 CLEANFILES = $(desktop_DATA)
 # installation of schemas
 if GCONF_SCHEMAS_INSTALL
diff --git a/data/caribou.schemas b/data/caribou.schemas
deleted file mode 100644
index 38a69c6..0000000
--- a/data/caribou.schemas
+++ /dev/null
@@ -1,191 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/caribou/osk/layout</key>
-      <applyto>/apps/caribou/osk/layout</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>qwerty.xml</default>
-      <locale name="C">
-        <short>The layout Caribou should use.</short>
-        <long>The layout should be in the data directory of Caribou (usually /usr/share/caribou/keyboards) and should be a .xml or .json file.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/normal_color</key>
-      <applyto>/apps/caribou/osk/normal_color</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>grey80</default>
-      <locale name="C">
-        <short>Color of the keys when there is no event on them</short>
-        <long></long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/mouse_over_color</key>
-      <applyto>/apps/caribou/osk/mouse_over_color</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>yellow</default>
-      <locale name="C">
-        <short>Color of the keys when the mouse goes over the key</short>
-        <long></long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/default_colors</key>
-      <applyto>/apps/caribou/osk/default_colors</applyto>
-      <owner>caribou</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Use the default theme colors</short>
-        <long></long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/key_font</key>
-      <applyto>/apps/caribou/osk/keyboard_font</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>Sans 12</default>
-      <locale name="C">
-        <short>Custom font for keyboard</short>
-        <long></long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/default_font</key>
-      <applyto>/apps/caribou/osk/default_font</applyto>
-      <owner>caribou</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Use the default system font for keyboard</short>
-        <long></long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/row_scanning_color</key>
-      <applyto>/apps/caribou/osk/row_scanning_color</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>green</default>
-      <locale name="C">
-        <short>Color of row scanning of Caribou</short>
-        <long>Color of row scanning of Caribou</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/button_scanning_color</key>
-      <applyto>/apps/caribou/osk/button_scanning_color</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>cyan</default>
-      <locale name="C">
-        <short>Color of the button scanning of Caribou</short>
-        <long>Color of the button scanning of Caribou</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/block_scanning_color</key>
-      <applyto>/apps/caribou/osk/block_scanning_color</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>gray70</default>
-      <locale name="C">
-        <short>Color of the block scanning of Caribou</short>
-        <long>Color of the block scanning of Caribou</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/cancel_scanning_color</key>
-      <applyto>/apps/caribou/osk/cancel_scanning_color</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>red</default>
-      <locale name="C">
-        <short>Color of cancelling scanning on Caribou</short>
-        <long>Color of cancelling scanning on Caribou</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/switch_type</key>
-      <applyto>/apps/caribou/osk/switch_type</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>keyboard</default>
-      <locale name="C">
-        <short>Switch type, keyboard or mouse</short>
-        <long>Switch type, keyboard or mouse</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/keyboard_key</key>
-      <applyto>/apps/caribou/osk/keyboard_key</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>Shift_R</default>
-      <locale name="C">
-        <short>Key to use with the scanning mode</short>
-        <long>Key to use with the scanning mode</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/mouse_button</key>
-      <applyto>/apps/caribou/osk/mouse_button</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>keyboard</default>
-      <locale name="C">
-        <short>Mouse button to use in the scanning mode</short>
-        <long>Mouse button to use in the scanning mode</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/reverse_scanning</key>
-      <applyto>/apps/caribou/osk/reverse_scanning</applyto>
-      <owner>caribou</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Enable the reverse scanning</short>
-        <long>Enable the reverse scanning, the keyboard is scanned when the user press the switch button</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/scan_enabled</key>
-      <applyto>/apps/caribou/osk/scan_enabled</applyto>
-      <owner>caribou</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Enable the keyboard scanning</short>
-        <long>Enable the keyboard scanning</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/scanning_type</key>
-      <applyto>/apps/caribou/osk/scanning_type</applyto>
-      <owner>caribou</owner>
-      <type>string</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Scanning type</short>
-        <long>Scanning type, 0 for block and 1 for row</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/caribou/osk/step_time</key>
-      <applyto>/apps/caribou/osk/step_time</applyto>
-      <owner>caribou</owner>
-      <type>int</type>
-      <default>1000</default>
-      <locale name="C">
-        <short>Step time</short>
-        <long>Time between key transitions</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>