orca r4234 - in branches/phase2/src/orca: . plugins/bookmarks plugins/debug_actions plugins/flat_review plugins/speech_parameters plugins/where_am_i
- From: wwalker svn gnome org
- To: svn-commits-list gnome org
- Subject: orca r4234 - in branches/phase2/src/orca: . plugins/bookmarks plugins/debug_actions plugins/flat_review plugins/speech_parameters plugins/where_am_i
- Date: Tue, 16 Sep 2008 17:16:18 +0000 (UTC)
Author: wwalker
Date: Tue Sep 16 17:16:18 2008
New Revision: 4234
URL: http://svn.gnome.org/viewvc/orca?rev=4234&view=rev
Log:
Rename KeyBindings to KeyboardBindings
Modified:
branches/phase2/src/orca/default.py
branches/phase2/src/orca/default_bindings.py
branches/phase2/src/orca/input_bindings.py
branches/phase2/src/orca/plugins/bookmarks/keyboard_bindings.py
branches/phase2/src/orca/plugins/bookmarks/plugin.py
branches/phase2/src/orca/plugins/debug_actions/keyboard_bindings.py
branches/phase2/src/orca/plugins/debug_actions/plugin.py
branches/phase2/src/orca/plugins/flat_review/keyboard_bindings.py
branches/phase2/src/orca/plugins/flat_review/plugin.py
branches/phase2/src/orca/plugins/speech_parameters/keyboard_bindings.py
branches/phase2/src/orca/plugins/speech_parameters/plugin.py
branches/phase2/src/orca/plugins/where_am_i/keyboard_bindings.py
branches/phase2/src/orca/plugins/where_am_i/plugin.py
branches/phase2/src/orca/script.py
branches/phase2/src/orca/script_manager.py
Modified: branches/phase2/src/orca/default.py
==============================================================================
--- branches/phase2/src/orca/default.py (original)
+++ branches/phase2/src/orca/default.py Tue Sep 16 17:16:18 2008
@@ -301,12 +301,12 @@
})
return handlers
- def _createKeyBindings(self, handlers):
+ def _createKeyboardBindings(self, handlers):
"""Defines the key bindings for this script.
- Returns an instance of input_bindings.KeyBindings.
+ Returns an instance of input_bindings.KeyboardBindings.
"""
- bindings = script.Script._createKeyBindings(self, handlers)
+ bindings = script.Script._createKeyboardBindings(self, handlers)
# TODO: make this a decision between desktop and laptop layout
if True:
bindings.extend(default_bindings.desktopKeys)
Modified: branches/phase2/src/orca/default_bindings.py
==============================================================================
--- branches/phase2/src/orca/default_bindings.py (original)
+++ branches/phase2/src/orca/default_bindings.py Tue Sep 16 17:16:18 2008
@@ -27,55 +27,55 @@
# General function keys common to laptop and desktop
#
generalKeys = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"F11",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"toggleTableCellReadModeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"SunF36",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"toggleTableCellReadModeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"f",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"readCharAttributesHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"h",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"enterLearnModeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"q",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"quitOrcaHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"space",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"preferencesSettingsHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"space",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_MODIFIER_MASK,
"appPreferencesSettingsHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"s",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"toggleSilenceSpeechHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"BackSpace",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
@@ -85,55 +85,55 @@
# Unbound keys
#
unboundKeys = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"toggleColorEnhancementsHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"toggleMouseEnhancementsHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"increaseMagnificationHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"decreaseMagnificationHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"toggleMagnifierHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"cycleZoomerTypeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"panBrailleLeftHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"panBrailleRightHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
@@ -141,7 +141,7 @@
]
desktopSayAllKeys = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Add",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
@@ -149,7 +149,7 @@
]
laptopSayAllKeys = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"semicolon",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
Modified: branches/phase2/src/orca/input_bindings.py
==============================================================================
--- branches/phase2/src/orca/input_bindings.py (original)
+++ branches/phase2/src/orca/input_bindings.py Tue Sep 16 17:16:18 2008
@@ -15,7 +15,7 @@
# Free Software Foundation, Inc., Franklin Street, Fifth Floor,
# Boston MA 02110-1301 USA.
-# TODO: change name everywhere from keybindings to keyboardbindings,
+# TODO: change name everywhere from keyboardbindings to keyboardbindings,
# using the capitalization and underscores appropriate for the context.
"""Provides support for defining braille and key bindings and matching
@@ -107,10 +107,10 @@
keycode for it matches the keycode for the other 'End' key. Odd.
If NumLock is on, we at least get KP_* keys.
- So...when setting up keybindings, we say we're interested in
+ So...when setting up keyboardbindings, we say we're interested in
KeySyms, but those keysyms are carefully chosen so as to result
in a keycode that matches the actual key on the keyboard. This
- is why we use KP_1 instead of KP_End and so on in our keybindings.
+ is why we use KP_1 instead of KP_End and so on in our keyboardbindings.
Arguments:
- keysym: a string that is a valid representation of an XKeysym.
@@ -287,7 +287,7 @@
i = i - 1
def hasBinding(self, binding, typeOfSearch="strict"):
- """Return True if keyBinding is already in self.keyBindings.
+ """Return True if keyboardBinding is already in self.keyboardBindings.
The typeOfSearch can be:
"strict": matches description, modifiers, key, and
@@ -386,7 +386,7 @@
# #
########################################################################
-class KeyBinding(Binding):
+class KeyboardBinding(Binding):
"""A single keyboard binding.
"""
def __init__(self,
@@ -422,8 +422,8 @@
self._commandCode = getKeycode(self.command)
return self._commandCode
-class KeyBindings(Bindings):
- """Structure that maintains a list of KeyBinding instances.
+class KeyboardBindings(Bindings):
+ """Structure that maintains a list of KeyboardBinding instances.
"""
def __init__(self, handlers):
Bindings.__init__(self, handlers)
@@ -501,16 +501,16 @@
print "Keyboard tests:\n"
myhandlers = {}
- bindings = KeyBindings(myhandlers)
+ bindings = KeyboardBindings(myhandlers)
handler1 = Handler(None, "Does something")
myhandlers["handler1"] = handler1
print handler1
- binding1 = KeyBinding("Insert", 0x1ff, 0, "handler1", 2)
+ binding1 = KeyboardBinding("Insert", 0x1ff, 0, "handler1", 2)
bindings.append(binding1)
handler2 = Handler(None, "Does something else")
myhandlers["handler2"] = handler2
- binding2 = KeyBinding("Return", 0x1ff, 0, "handler2", 2)
+ binding2 = KeyboardBinding("Return", 0x1ff, 0, "handler2", 2)
bindings.append(binding2)
print "All bindings:"
print bindings
Modified: branches/phase2/src/orca/plugins/bookmarks/keyboard_bindings.py
==============================================================================
--- branches/phase2/src/orca/plugins/bookmarks/keyboard_bindings.py (original)
+++ branches/phase2/src/orca/plugins/bookmarks/keyboard_bindings.py Tue Sep 16 17:16:18 2008
@@ -26,19 +26,19 @@
import orca.input_event as input_event
bindings = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"b",
input_event.defaultModifierMask,
input_event.ORCA_ALT_MODIFIER_MASK,
"saveBookmarks"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"b",
input_event.defaultModifierMask,
input_event.ORCA_SHIFT_MODIFIER_MASK,
"goToPrevBookmark"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"b",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
@@ -46,19 +46,19 @@
]
for key in xrange(1, 7):
bindings.append(
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
str(key),
input_event.defaultModifierMask,
input_event.ORCA_ALT_MODIFIER_MASK,
"addBookmark"))
bindings.append(
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
str(key),
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"goToBookmark"))
bindings.append(
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
str(key),
input_event.defaultModifierMask,
input_event.SHIFT_ALT_MODIFIER_MASK,
Modified: branches/phase2/src/orca/plugins/bookmarks/plugin.py
==============================================================================
--- branches/phase2/src/orca/plugins/bookmarks/plugin.py (original)
+++ branches/phase2/src/orca/plugins/bookmarks/plugin.py Tue Sep 16 17:16:18 2008
@@ -105,12 +105,12 @@
})
return handlers
- def _createKeyBindings(self, handlers):
+ def _createKeyboardBindings(self, handlers):
"""Defines the key bindings for this script.
- Returns an instance of input_bindings.KeyBindings.
+ Returns an instance of input_bindings.KeyboardBindings.
"""
- bindings = plugin.Plugin._createKeyBindings(self, handlers)
+ bindings = plugin.Plugin._createKeyboardBindings(self, handlers)
bindings.extend(keyboardBindings)
return bindings
Modified: branches/phase2/src/orca/plugins/debug_actions/keyboard_bindings.py
==============================================================================
--- branches/phase2/src/orca/plugins/debug_actions/keyboard_bindings.py (original)
+++ branches/phase2/src/orca/plugins/debug_actions/keyboard_bindings.py Tue Sep 16 17:16:18 2008
@@ -27,25 +27,25 @@
import orca.plugin as plugin
bindings = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"End",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_ALT_MODIFIER_MASK,
"printAppsHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"Page_Up",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_ALT_MODIFIER_MASK,
"printAncestryHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"Page_Down",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_ALT_MODIFIER_MASK,
"printHierarchyHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"Home",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_ALT_MODIFIER_MASK,
Modified: branches/phase2/src/orca/plugins/debug_actions/plugin.py
==============================================================================
--- branches/phase2/src/orca/plugins/debug_actions/plugin.py (original)
+++ branches/phase2/src/orca/plugins/debug_actions/plugin.py Tue Sep 16 17:16:18 2008
@@ -106,12 +106,12 @@
})
return handlers
- def _createKeyBindings(self, handlers):
+ def _createKeyboardBindings(self, handlers):
"""Defines the key bindings for this script.
- Returns an instance of input_bindings.KeyBindings.
+ Returns an instance of input_bindings.KeyboardBindings.
"""
- bindings = plugin.Plugin._createKeyBindings(self, handlers)
+ bindings = plugin.Plugin._createKeyboardBindings(self, handlers)
bindings.extend(keyboardBindings)
return bindings
Modified: branches/phase2/src/orca/plugins/flat_review/keyboard_bindings.py
==============================================================================
--- branches/phase2/src/orca/plugins/flat_review/keyboard_bindings.py (original)
+++ branches/phase2/src/orca/plugins/flat_review/keyboard_bindings.py Tue Sep 16 17:16:18 2008
@@ -28,277 +28,277 @@
# Desktop flat review keys
#
desktopBindings = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Divide",
input_event.NO_MODIFIER_MASK,
input_event.NO_MODIFIER_MASK,
"leftClickReviewItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Multiply",
input_event.NO_MODIFIER_MASK,
input_event.NO_MODIFIER_MASK,
"rightClickReviewItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Subtract",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"toggleFlatReviewModeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_7",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPreviousLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Home",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPreviousLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_7",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewHomeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Home",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewHomeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_8",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewCurrentLineHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_8",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewSpellCurrentLineHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_8",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPhoneticCurrentLineHandler", 3),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Up",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewCurrentLineHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Up",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewSpellCurrentLineHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Up",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPhoneticCurrentLineHandler", 3),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_9",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewNextLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Page_Up",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewNextLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_9",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewEndHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Page_Up",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewEndHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_4",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPreviousItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Left",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPreviousItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_4",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewAboveHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Left",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewAboveHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_5",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewCurrentItemHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_5",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewSpellCurrentItemHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_5",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPhoneticCurrentItemHandler", 3),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Begin",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewCurrentItemHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Begin",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewSpellCurrentItemHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Begin",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPhoneticCurrentItemHandler", 3),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_5",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewCurrentAccessibleHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Begin",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewCurrentAccessibleHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_6",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewNextItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Right",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewNextItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_6",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewBelowHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Right",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewBelowHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_1",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPreviousCharacterHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_End",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewPreviousCharacterHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_1",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewEndOfLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_End",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewEndOfLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_2",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewCurrentCharacterHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_2",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewSpellCurrentCharacterHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Down",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewCurrentCharacterHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Down",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewSpellCurrentCharacterHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_3",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewNextCharacterHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Page_Down",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"reviewNextCharacterHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Delete",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"findHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Delete",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"findNextHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Delete",
input_event.defaultModifierMask,
input_event.ORCA_SHIFT_MODIFIER_MASK,
@@ -308,157 +308,157 @@
# Laptop flat review keys
#
laptopBindings = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"7",
input_event.ORCA_MODIFIER_MASK,
input_event.ORCA_MODIFIER_MASK,
"leftClickReviewItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"8",
input_event.ORCA_MODIFIER_MASK,
input_event.ORCA_MODIFIER_MASK,
"rightClickReviewItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"p",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"toggleFlatReviewModeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"u",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewPreviousLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"u",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_MODIFIER_MASK,
"reviewHomeHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"i",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewCurrentLineHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"i",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewSpellCurrentLineHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"i",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewPhoneticCurrentLineHandler", 3),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"o",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewNextLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"o",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_MODIFIER_MASK,
"reviewEndHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"j",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewPreviousItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"j",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_MODIFIER_MASK,
"reviewAboveHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"k",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewCurrentItemHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"k",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewSpellCurrentItemHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"k",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewPhoneticCurrentItemHandler", 3),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"k",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_MODIFIER_MASK,
"reviewCurrentAccessibleHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"l",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewNextItemHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"l",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_MODIFIER_MASK,
"reviewBelowHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"m",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewPreviousCharacterHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"m",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_MODIFIER_MASK,
"reviewEndOfLineHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"comma",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewCurrentCharacterHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"comma",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewSpellCurrentCharacterHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"period",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"reviewNextCharacterHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"bracketleft",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"findHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"bracketright",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"findNextHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"bracketright",
input_event.defaultModifierMask,
input_event.ORCA_CTRL_MODIFIER_MASK,
Modified: branches/phase2/src/orca/plugins/flat_review/plugin.py
==============================================================================
--- branches/phase2/src/orca/plugins/flat_review/plugin.py (original)
+++ branches/phase2/src/orca/plugins/flat_review/plugin.py Tue Sep 16 17:16:18 2008
@@ -456,12 +456,12 @@
})
return handlers
- def _createKeyBindings(self, handlers):
+ def _createKeyboardBindings(self, handlers):
"""Defines the key bindings for this script.
- Returns an instance of input_bindings.KeyBindings.
+ Returns an instance of input_bindings.KeyboardBindings.
"""
- bindings = plugin.Plugin._createKeyBindings(self, handlers)
+ bindings = plugin.Plugin._createKeyboardBindings(self, handlers)
bindings.extend(keyboardBindings)
return bindings
Modified: branches/phase2/src/orca/plugins/speech_parameters/keyboard_bindings.py
==============================================================================
--- branches/phase2/src/orca/plugins/speech_parameters/keyboard_bindings.py (original)
+++ branches/phase2/src/orca/plugins/speech_parameters/keyboard_bindings.py Tue Sep 16 17:16:18 2008
@@ -26,25 +26,25 @@
import orca.input_event as input_event
bindings = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"decreaseSpeechRateHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"increaseSpeechRateHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"decreaseSpeechPitchHandler"),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
Modified: branches/phase2/src/orca/plugins/speech_parameters/plugin.py
==============================================================================
--- branches/phase2/src/orca/plugins/speech_parameters/plugin.py (original)
+++ branches/phase2/src/orca/plugins/speech_parameters/plugin.py Tue Sep 16 17:16:18 2008
@@ -91,12 +91,12 @@
})
return handlers
- def _createKeyBindings(self, handlers):
+ def _createKeyboardBindings(self, handlers):
"""Defines the key bindings for this script.
- Returns an instance of input_bindings.KeyBindings.
+ Returns an instance of input_bindings.KeyboardBindings.
"""
- bindings = plugin.Plugin._createKeyBindings(self, handlers)
+ bindings = plugin.Plugin._createKeyboardBindings(self, handlers)
bindings.extend(keyboardBindings)
return bindings
Modified: branches/phase2/src/orca/plugins/where_am_i/keyboard_bindings.py
==============================================================================
--- branches/phase2/src/orca/plugins/where_am_i/keyboard_bindings.py (original)
+++ branches/phase2/src/orca/plugins/where_am_i/keyboard_bindings.py Tue Sep 16 17:16:18 2008
@@ -28,25 +28,25 @@
# Desktop where am I keys
#
desktopBindings = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Enter",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"whereAmIBasicHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Enter",
input_event.defaultModifierMask,
input_event.NO_MODIFIER_MASK,
"whereAmIDetailedHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Enter",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"getTitleHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"KP_Enter",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
@@ -56,25 +56,25 @@
# Laptop bindings
#
laptopKeys = [
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"Return",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"whereAmIBasicHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"Return",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"whereAmIDetailedHandler", 2),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"slash",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
"getTitleHandler", 1),
- input_bindings.KeyBinding(
+ input_bindings.KeyboardBinding(
"slash",
input_event.defaultModifierMask,
input_event.ORCA_MODIFIER_MASK,
Modified: branches/phase2/src/orca/plugins/where_am_i/plugin.py
==============================================================================
--- branches/phase2/src/orca/plugins/where_am_i/plugin.py (original)
+++ branches/phase2/src/orca/plugins/where_am_i/plugin.py Tue Sep 16 17:16:18 2008
@@ -97,12 +97,12 @@
})
return handlers
- def _createKeyBindings(self, handlers):
+ def _createKeyboardBindings(self, handlers):
"""Defines the key bindings for this script.
- Returns an instance of input_bindings.KeyBindings.
+ Returns an instance of input_bindings.KeyboardBindings.
"""
- bindings = plugin.Plugin._createKeyBindings(self, handlers)
+ bindings = plugin.Plugin._createKeyboardBindings(self, handlers)
bindings.extend(keyboardBindings)
return bindings
Modified: branches/phase2/src/orca/script.py
==============================================================================
--- branches/phase2/src/orca/script.py (original)
+++ branches/phase2/src/orca/script.py Tue Sep 16 17:16:18 2008
@@ -31,7 +31,7 @@
"""Each script maintains a set of key bindings, braille bindings, and
AT-SPI event listeners. The key bindings are an instance of
-KeyBindings. The braille bindings are also a dictionary where the
+KeyboardBindings. The braille bindings are also a dictionary where the
keys are BrlTTY command integers and the values are instances of
InputEventHandler. The listeners field is a dictionary where the keys
are AT-SPI event names and the values are function pointers.
@@ -80,8 +80,8 @@
self._objectEventListeners = self._createObjectEventListeners()
self._inputEventHandlers = self._createInputEventHandlers()
- self._keyBindings = \
- self._createKeyBindings(self._inputEventHandlers)
+ self._keyboardBindings = \
+ self._createKeyboardBindings(self._inputEventHandlers)
self._brailleBindings = \
self._createBrailleBindings(self._inputEventHandlers)
@@ -145,7 +145,7 @@
loaded = True
try:
settingsModule.overrideBindings(
- self._keyBindings,
+ self._keyboardBindings,
self._brailleBindings)
except:
log.exception("exception handled:")
@@ -192,12 +192,12 @@
"""
return {}
- def _createKeyBindings(self, handlers):
+ def _createKeyboardBindings(self, handlers):
"""Defines the key bindings for this script.
- Returns an instance of input_bindings.KeyBindings.
+ Returns an instance of input_bindings.KeyboardBindings.
"""
- return input_bindings.KeyBindings(handlers)
+ return input_bindings.KeyboardBindings(handlers)
def _createBrailleBindings(self, handlers):
"""Defines the braille bindings for this script.
@@ -256,11 +256,10 @@
Returns True if the event is of interest.
"""
- # TODO: add support for user-settings.py keyBindingsMap
# TODO: add in structural navigation model
consumes = False
if not consumes:
- handler = self._keyBindings.getHandler(
+ handler = self._keyboardBindings.getHandler(
keyboardEvent.hw_code,
keyboardEvent.modifiers,
keyboardEvent.click_count)
@@ -276,14 +275,14 @@
"""Called whenever a key is pressed on the keyboard
and we have an interest in it.
"""
- # TODO: add support for user-settings.py keyBindingsMap
+ # TODO: add support for user-settings.py keyboardBindingsMap
# We'll annotate the event with a reference to this script.
# This will allow external scripts to muck with the script
# instance if they wish.
#
keyboardEvent.script = self
- self._keyBindings.processInputEvent(
+ self._keyboardBindings.processInputEvent(
self,
keyboardEvent,
keyboardEvent.modifiers)
Modified: branches/phase2/src/orca/script_manager.py
==============================================================================
--- branches/phase2/src/orca/script_manager.py (original)
+++ branches/phase2/src/orca/script_manager.py Tue Sep 16 17:16:18 2008
@@ -337,8 +337,8 @@
########################################################################
def _dispatchKeyboardEvent(self, keyboardEvent):
- """Processes the given keyboard event based on the keybinding from the
- currently active script.
+ """Processes the given keyboard event based on the keyboard
+ binding from the currently active script.
Arguments:
- keyboardEvent: an instance of input_event.KeyboardEvent
@@ -435,10 +435,11 @@
% (self._clickCount, inputEvent))
def _processKeyboardEvent(self, event):
- """Processes the given keyboard event based on the keybinding from the
- currently active script. This method is called synchronously from the
- at-spi registry and should be performant. In addition, it must return
- True if it has consumed the event (and False if not).
+ """Processes the given keyboard event based on the keyboard
+ binding from the currently active script. This method is
+ called synchronously from the at-spi registry and should be
+ performant. In addition, it must return True if it has
+ consumed the event (and False if not).
Arguments:
- event: an instance of pyatspi.Event
@@ -452,8 +453,8 @@
# multi-key chord has been pressed, and we might get the key
# events in different orders. See comment #15 of bug #435201
# for more details. We also want to store the "click count"
- # for the purpose of supporting keybindings with unique
- # behaviors when double- or triple-clicked.
+ # for the purpose of supporting bindings with unique behaviors
+ # when double- or triple-clicked.
#
if not self._isModifierKey(keyboardEvent.event_string):
self._setClickCount(keyboardEvent)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
