[caribou: 22/22] Merge branch 'geometry'

[Eitan Isaacson <eitani src gnome org>]

commit f5aed67a39df38f7becf4708a80f78797823c0d3
Merge: 838a94e 18c1260
Author: Eitan Isaacson <eitan monotonous org>
Date:   Mon May 2 10:23:17 2011 -0700

    Merge branch 'geometry'
    
    Major Caribou changes:
    * Couple keyboard layout with XKB state.
    * Simplify layout format
    * Create libcaribou, an introspectable C/GObject library for creating keyboard
      UIs.
    * DBusify UI, have main caribou app activate the keyboard via DBus.

 .gitignore                                         |   16 +-
 bin/Makefile.am                                    |    3 +-
 bin/antler-keyboard.in                             |   37 +
 bin/caribou-preferences.in                         |   53 +
 bin/caribou.in                                     |   68 +-
 caribou/Makefile.am                                |   10 +-
 caribou/__init__.py                                |    3 +-
 caribou/antler/Makefile.am                         |   10 +
 .../antler/__init__.py                             |    0
 caribou/antler/keyboard_view.py                    |  164 +++
 caribou/antler/main.py                             |   30 +
 caribou/{ui => antler}/window.py                   |  173 ++--
 caribou/common/Makefile.am                         |   11 -
 caribou/common/__init__.py                         |    1 -
 caribou/common/const.py                            |   43 -
 caribou/common/settings.py                         |  179 ---
 caribou/daemon/Makefile.am                         |    8 +
 caribou/daemon/__init__.py                         |    1 +
 caribou/daemon/main.py                             |  165 +++
 caribou/{ui => }/i18n.py.in                        |    0
 caribou/settings/Makefile.am                       |   11 +
 caribou/settings/__init__.py                       |    5 +
 caribou/settings/caribou_settings.py               |   64 +
 caribou/{ui => settings}/preferences_window.py     |   70 +-
 caribou/{common => settings}/setting_types.py      |   10 +
 caribou/{common => settings}/settings_manager.py   |    9 +-
 caribou/ui/Makefile.am                             |   16 -
 caribou/ui/__init__.py                             |    1 -
 caribou/ui/keyboard.py                             |  461 -------
 caribou/ui/main.py                                 |  275 ----
 caribou/ui/opacity.py                              |   83 --
 caribou/ui/scan.py                                 |  216 ----
 configure.ac                                       |   21 +-
 data/Makefile.am                                   |   13 +-
 data/keyboards/Makefile.am                         |   10 -
 data/keyboards/hebrew.xml                          |  272 ----
 data/keyboards/lexic_es.json                       |  300 -----
 data/keyboards/qwerty.xml                          |  274 ----
 data/keyboards/qwerty_en.json                      |  261 ----
 data/keyboards/qwerty_es.json                      | 1318 --------------------
 data/keyboards/qwerty_ja.xml                       |  782 ------------
 data/layouts/Makefile.am                           |    1 +
 data/layouts/touch/Makefile.am                     |    8 +
 data/layouts/touch/ara.json                        |  122 ++
 data/layouts/touch/il.json                         |  122 ++
 data/layouts/touch/us.json                         |  212 ++++
 data/org.gnome.Caribou.Antler.service.in           |    3 +
 libcaribou/Makefile.am                             |  122 +--
 libcaribou/caribou-marshal.list                    |    1 -
 libcaribou/caribou-virtual-keyboard.c              |  175 ---
 libcaribou/caribou-virtual-keyboard.h              |   52 -
 libcaribou/caribou.h                               |   19 -
 libcaribou/external-libs.vapi                      |  234 ++++
 libcaribou/group-model.vala                        |   50 +
 libcaribou/json-deserializer.vala                  |  126 ++
 libcaribou/key-model.vala                          |   71 ++
 libcaribou/keyboard-model.vala                     |   49 +
 libcaribou/keyboard-service.vala                   |   35 +
 libcaribou/level-model.vala                        |   41 +
 libcaribou/libxklavier.vapi                        |  182 +++
 libcaribou/row-model.vala                          |   22 +
 libcaribou/util.vala                               |   13 +
 libcaribou/xadapter.vala                           |  213 ++++
 po/POTFILES.in                                     |    7 +-
 tools/fix_gir.py                                   |   63 +
 tools/make_schema.py                               |   84 ++
 66 files changed, 2463 insertions(+), 5011 deletions(-)
---