[caribou: 5/15] Added "scan" layout.

[Eitan Isaacson <eitani src gnome org>]

commit 7ae8c1838b571904959eb58d0adf1605e7dafddb
Author: Eitan Isaacson <eitan monotonous org>
Date:   Sat May 28 12:59:42 2011 -0700

    Added "scan" layout.

 caribou/settings/caribou_settings.py |    3 +-
 configure.ac                         |    1 +
 data/layouts/Makefile.am             |    2 +-
 data/layouts/scan/Makefile.am        |    6 +++
 data/layouts/scan/us.json            |   67 ++++++++++++++++++++++++++++++++++
 5 files changed, 77 insertions(+), 2 deletions(-)
---
diff --git a/caribou/settings/caribou_settings.py b/caribou/settings/caribou_settings.py
index 638e1c4..3767a88 100644
--- a/caribou/settings/caribou_settings.py
+++ b/caribou/settings/caribou_settings.py
@@ -12,7 +12,8 @@ CaribouSettings = SettingsTopGroup(
                               "and complexity of the keyboard, it could range from "
                               "a 'natural' look and feel good for composing simple "
                               "text, to a fullscale keyboard."),
-                            allowed=[(('touch'), _('Touch'))])]),
+                            allowed=[(('touch'), _('Touch')),
+                                     (('scan'), _('Scan'))])]),
                 ]),
         SettingsGroup("scanning", _("Scanning"), [
                 BooleanSetting(
diff --git a/configure.ac b/configure.ac
index 36c9983..d8d5af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,5 +85,6 @@ data/Makefile
 data/antler/Makefile
 data/layouts/Makefile
 data/layouts/touch/Makefile
+data/layouts/scan/Makefile
 libcaribou/Makefile
 ])
diff --git a/data/layouts/Makefile.am b/data/layouts/Makefile.am
index 9d82efe..b5ad9a6 100644
--- a/data/layouts/Makefile.am
+++ b/data/layouts/Makefile.am
@@ -1 +1 @@
-SUBDIRS = touch
+SUBDIRS = scan touch
diff --git a/data/layouts/scan/Makefile.am b/data/layouts/scan/Makefile.am
new file mode 100644
index 0000000..6fb66fd
--- /dev/null
+++ b/data/layouts/scan/Makefile.am
@@ -0,0 +1,6 @@
+scanlayoutsdir = $(datadir)/caribou/layouts/scan
+
+scanlayouts_DATA = \
+    us.json
+
+EXTRA_DIST = $(scanlayouts_DATA)
diff --git a/data/layouts/scan/us.json b/data/layouts/scan/us.json
new file mode 100644
index 0000000..84523c7
--- /dev/null
+++ b/data/layouts/scan/us.json
@@ -0,0 +1,67 @@
+{
+    "level1" : {
+       "mode" : "default",
+       "rows" : [
+          [[{"name" : "Caribou_Repeat"},
+            {"name" : "space"},
+            {"name" : "a"},
+            {"name" : "b"},
+            {"name" : "c"}],
+           [{"name" : "d"},
+            {"name" : "e"},
+            {"name" : "f"},
+            {"name" : "g"},
+            {"name" : "h"}],
+           [{"name" : "i"},
+            {"name" : "j"},
+            {"name" : "k"},
+            {"name" : "l"},
+            {"name" : "m"}]],
+          [[{"name" : "Return"},
+            {"name" : "Caribou_ShiftUp"},
+            {"name" : "n"},
+            {"name" : "o"},
+            {"name" : "p"}],
+           [{"name" : "q"},
+            {"name" : "r"},
+            {"name" : "s"},
+            {"name" : "t"},
+            {"name" : "u"}],
+           [{"name" : "v"},
+            {"name" : "w"},
+            {"name" : "x"},
+            {"name" : "y"},
+            {"name" : "z"}]],
+          [[{"name" :"period"},
+            {"name" : "comma"},
+            {"name" : "at"},
+            {"name" : "numbersign"},
+            {"name" : "dollar"}],
+           [{"name" : "percent"},
+            {"name" : "ampersand"},
+            {"name" : "asterisk"},
+            {"name" : "parenleft"},
+            {"name" : "parenright"}],
+           [{"name" : "minus"},
+            {"name" : "plus"},
+            {"name" : "equal"},
+            {"name" : "quotedbl"},
+            {"name" : "apostrophe"}]],
+          [[{"name" : "grave"},
+            {"name" : "asciitilde"},
+            {"name" : "underscore"},
+            {"name" : "colon"},
+            {"name" : "semicolon"}],
+           [{"name" : "backslash"},
+            {"name" : "bar"},
+            {"name" : "bracketleft"},
+            {"name" : "bracketright"},
+            {"name" : "braceleft"}],
+           [{"name" : "braceright"},
+            {"name" : "_"},
+            {"name" : "_"},
+            {"name" : "_"},
+            {"name" : "_"}]]
+       ]
+    }
+}
\ No newline at end of file