[caribou: 10/15] Update scanner settings.

[Eitan Isaacson <eitani src gnome org>]

commit 058381dffe5f4d695d647e38bd9d3b3b901f53c3
Author: Eitan Isaacson <eitan monotonous org>
Date:   Sat May 28 13:10:41 2011 -0700

    Update scanner settings.

 caribou/settings/caribou_settings.py |   50 +++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 18 deletions(-)
---
diff --git a/caribou/settings/caribou_settings.py b/caribou/settings/caribou_settings.py
index 3767a88..3d2c219 100644
--- a/caribou/settings/caribou_settings.py
+++ b/caribou/settings/caribou_settings.py
@@ -22,20 +22,33 @@ CaribouSettings = SettingsTopGroup(
                     insensitive_when_false=["scanning_general",
                                             "scanning_input"]),
                 SettingsGroup("scanning_general", _("General"), [
-                        StringSetting("scanning_type", _("Scanning mode"),
-                                      "block",
-                                      _("Scanning type, block or row"),
-                                      allowed=[("block", _("Block")),
-                                                ("row", _("Row"))]),
+                        IntegerSetting("scan_grouping", _("Scanning mode"),
+                                       1,
+                                       _("Scanning type, subgroups, rows or linear"),
+                                       allowed=[(1, _("Subgroups")),
+                                                (2, _("Rows")),
+                                                (3, _("Linear"))],
+                                       entry_type=ENTRY_COMBO),
                         FloatSetting("step_time", _("Step time"), 1.0,
                                      _("Time between key transitions"),
                                      min=0.1, max=60.0),
-                        BooleanSetting("reverse_scanning",
-                                       _("Reverse scanning"), False,
-                                       _("Scan in reverse order"))
+                        BooleanSetting("inverse_scanning",
+                                       _("Inverse scanning"), False,
+                                       _("Step with the switch, activate by dwelling")),
+                        BooleanSetting(
+                            "autorestart",
+                            _("Auto-restart scanning"), False,
+                            _("Automatically restart scanning after item activation")),
+                        IntegerSetting("scan_cycles", _("Scan cycles"),
+                                       1, allowed=[(1, _("One")),
+                                                   (2, _("Two")),
+                                                   (3, _("Three")),
+                                                   (4, _("Four")),
+                                                   (5, _("Five"))],
+                                       entry_type=ENTRY_COMBO)
                         ]),
                 SettingsGroup("scanning_input", _("Input"), [
-                        StringSetting("switch_type", _("Switch device"),
+                        StringSetting("switch_device", _("Switch device"),
                                       "keyboard",
                                       _("Switch device, keyboard or mouse"),
                                       entry_type=ENTRY_RADIO,
@@ -43,22 +56,23 @@ CaribouSettings = SettingsTopGroup(
                                                ("mouse", _("Mouse"))],
                                       children=[
                                 StringSetting("keyboard_key", _("Switch key"),
-                                              "Shift_R",
-                                              _(
-                                        "Key to use with scanning mode"),
+                                              "space",
+                                              _("Key to use with scanning mode"),
                                               allowed=[
                                         ("Shift_R", _("Right shift")),
                                         ("Shift_L", _("Left shift")),
+                                        ("space", _("Space")),
                                         ("ISO_Level3_Shift", _("Alt Gr")),
                                         ("Num_Lock", _("Num lock"))]),
-                                StringSetting("mouse_button", _("Switch button"),
-                                              "2",
-                                              _(
+                                IntegerSetting("mouse_button", _("Switch button"),
+                                               2,
+                                               _(
                                         "Mouse button to use in the scanning "
                                         "mode"), 
-                                              allowed=[("1", _("Button 1")),
-                                                       ("2", _("Button 2")),
-                                                       ("3", _("Button 3"))])
+                                               allowed=[(1, _("Button 1")),
+                                                        (2, _("Button 2")),
+                                                        (3, _("Button 3"))],
+                                               entry_type=ENTRY_COMBO)
                                 ]),
                         ]),
                 ])