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.

3 files changed, 36 insertions, 7 deletions

diff --git a/bin/Makefile.am b/bin/Makefile.am
index cae01c9..e7797ec 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-bin_SCRIPTS = caribou
+bin_SCRIPTS = caribou caribou-preferences
 
 CLEANFILES = $(bin_SCRIPTS)
 
diff --git a/bin/caribou-preferences.in b/bin/caribou-preferences.in
new file mode 100644
index 0000000..a745bab
--- /dev/null
+++ b/bin/caribou-preferences.in
@@ -0,0 +1,32 @@
+#!/usr/bin/python
+
+import sys, os
+
+libs = os.path.join('@prefix@', 'lib', 'python@PYTHON_VERSION@', 'site-packages')
+
+# This might be run from the build dir.
+_dirname = os.path.dirname(__file__)
+if _dirname != "@prefix@/bin":
+    libs = os.path.normpath(os.path.join(_dirname, '..'))
+    
+sys.path.insert(1, libs)
+
+from gi.repository import Gtk
+from caribou.settings.settings_manager import SettingsManager
+from caribou.settings import CaribouSettings
+from caribou.settings.preferences_window import PreferencesWindow
+
+import signal
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+w = PreferencesWindow(CaribouSettings())
+
+w.connect("delete-event", lambda x, y: Gtk.main_quit())
+
+w.show_all()
+
+try:
+    Gtk.main()
+except KeyboardInterrupt:
+    Gtk.main_quit()
+
diff --git a/bin/caribou.in b/bin/caribou.in
index fb31d47..a0aa03f 100644
--- a/bin/caribou.in
+++ b/bin/caribou.in
@@ -53,9 +53,7 @@ else:
     import caribou.ui
     caribou.data_path = os.path.join("@prefix@", "share", "caribou")
 
-import caribou.ui.window as window
-import caribou.ui.keyboard as keyboard
-import caribou.ui.main as main
+from caribou.daemon import CaribouDaemon
 
 _ = gettext.gettext
     
@@ -71,10 +69,9 @@ if __name__ == "__main__":
                       help="print debug messages on stdout")
     (options, args) = parser.parse_args()
 
-    main.debug = options.debug
+    #main.debug = options.debug
 
-    caribou = main.Caribou()
-    caribou.window.hide()
+    caribou = CaribouDaemon()
  
     try:
         pyatspi.Registry.start()