Major re-work of Python modules:

* Created Antler to use new keyboard model via PyGI
* Rearanged settings to accomodate view/model seperation.
* Created in preferences executable, it will be a standalone
  generic caribou settings UI where we will eventually get the important
  stuff in GNOME's control panel.
* DBusified the UI.

7 files changed, 11 insertions, 11 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 98da3b2..745443b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,8 +17,8 @@ autostart_DATA   = $(autostart_in_files:.desktop.in=.desktop)
 
 EXTRA_DIST = $(desktop_in_files) $(autostart_in_files)
 
-org.gnome.caribou.gschema.xml.in: $(top_srcdir)/caribou/common/settings.py
-	PYTHONPATH=${PYTHONPATH}:$(top_srcdir) $(PYTHON) $< > $@
+org.gnome.caribou.gschema.xml.in: $(top_srcdir)/tools/make_schema.py
+	$< org.gnome.caribou
 
 CLEANFILES = $(desktop_DATA) \
 	$(autostart_DATA) \
diff --git a/data/layouts/Makefile.am b/data/layouts/Makefile.am
index 40457f3..9d82efe 100644
--- a/data/layouts/Makefile.am
+++ b/data/layouts/Makefile.am
@@ -1 +1 @@
-SUBDIRS = natural
+SUBDIRS = touch
diff --git a/data/layouts/natural/Makefile.am b/data/layouts/natural/Makefile.am
deleted file mode 100644
index f02c463..0000000
--- a/data/layouts/natural/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-naturallayoutsdir = $(datadir)/caribou/layouts/natural
-
-naturallayouts_DATA = \
-    ara.json \
-    il.json \
-    us.json
-
-EXTRA_DIST = $(naturallayouts_DATA)
diff --git a/data/layouts/touch/Makefile.am b/data/layouts/touch/Makefile.am
new file mode 100644
index 0000000..f18d728
--- /dev/null
+++ b/data/layouts/touch/Makefile.am
@@ -0,0 +1,8 @@
+touchlayoutsdir = $(datadir)/caribou/layouts/touch
+
+touchlayouts_DATA = \
+    ara.json \
+    il.json \
+    us.json
+
+EXTRA_DIST = $(touchlayouts_DATA)
diff --git a/data/layouts/natural/ara.json b/data/layouts/touch/ara.json
index e757ee9..e757ee9 100644
--- a/data/layouts/natural/ara.json
+++ b/data/layouts/touch/ara.json
diff --git a/data/layouts/natural/il.json b/data/layouts/touch/il.json
index b0939ed..b0939ed 100644
--- a/data/layouts/natural/il.json
+++ b/data/layouts/touch/il.json
diff --git a/data/layouts/natural/us.json b/data/layouts/touch/us.json
index 20fcf04..20fcf04 100644
--- a/data/layouts/natural/us.json
+++ b/data/layouts/touch/us.json