3 new commits in EnhancedTouchGestures:
https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/commits/941edf49e74b/
Changeset: 941edf49e74b
Branch: None
User: josephsl
Date: 2016-11-24 04:43:43+00:00
Summary: Code modernation 1: support navigating landmarks and lists in web
touch mode, use modulo when chanigng web touch nav mode.
Affected #: 1 file
diff --git a/addon/globalPlugins/enhancedTouchGestures.py
b/addon/globalPlugins/enhancedTouchGestures.py
index 47a6eff..acbee94 100755
--- a/addon/globalPlugins/enhancedTouchGestures.py
+++ b/addon/globalPlugins/enhancedTouchGestures.py
@@ -10,6 +10,7 @@ import touchHandler
import wx
import ui
from globalCommands import commands
+import browseMode
import virtualBuffers
import api
import winUser
@@ -72,9 +73,8 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
def event_gainFocus(self, obj, nextHandler):
# Crucial: Don't do anything unless if it is an installed copy
and touchscreen support is active.
if config.isInstalledCopy() and touchHandler.handler:
- if isinstance(obj.treeInterceptor,
virtualBuffers.VirtualBuffer):
- if "Web" not in
touchHandler.availableTouchModes:
-
touchHandler.availableTouchModes.append("Web") # Web browsing gestures.
+ if isinstance(obj.treeInterceptor,
virtualBuffers.VirtualBuffer) and "Web" not in touchHandler.availableTouchModes:
+ touchHandler.availableTouchModes.append("Web")
# Web browsing gestures.
else:
# If we're not in browser window, force object
mode.
if "Web" not in
touchHandler.availableTouchModes: touchHandler.handler._curTouchMode =
touchHandler.availableTouchModes[1]
@@ -109,18 +109,18 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
#Web navigation:
# Web elements list:
- webBrowseElements=["normal", "Link", "Form", "Heading", "Frame",
"Table"]
+ webBrowseElements=("normal", "Link", "Form", "Heading", "Frame",
"Table", "List", "Landmark")
webBrowseMode = 0 # The starting index for the web browse mode, which
flicks through objects.
# Touch gestures please.
def script_nextWebElement(self, gesture):
- self.webBrowseMode = 0 if self.webBrowseMode+1 ==
len(self.webBrowseElements) else self.webBrowseMode +1
+ self.webBrowseMode = (self.webBrowseMode+1) %
len(self.webBrowseElements)
ui.message(self.webBrowseElements[self.webBrowseMode])
script_nextWebElement.__doc__="Selects the next web navigation element."
def script_prevWebElement(self, gesture):
- self.webBrowseMode = len(self.webBrowseElements)-1 if
self.webBrowseMode == 0 else self.webBrowseMode -1
+ self.webBrowseMode = (self.webBrowseMode-1) %
len(self.webBrowseElements)
ui.message(self.webBrowseElements[self.webBrowseMode])
script_prevWebElement.__doc__="Selects the previous web navigation
element."
https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/commits/20fc77a43029/
Changeset: 20fc77a43029
Branch: None
User: josephsl
Date: 2016-11-24 05:13:00+00:00
Summary: Web mode: browse mode module is in use, a tuple of web mode
scripts will be consulted.
Instead of using touch levels, a tuple of web browse mode scripts will be
consulted when performing web browse mode commands (cleaner than before). Also,
in order to properly support Edge, browse mode module will be used (this means
NVDA 2016.3 or later will be required).
Affected #: 1 file
diff --git a/addon/globalPlugins/enhancedTouchGestures.py
b/addon/globalPlugins/enhancedTouchGestures.py
index acbee94..14f725d 100755
--- a/addon/globalPlugins/enhancedTouchGestures.py
+++ b/addon/globalPlugins/enhancedTouchGestures.py
@@ -11,7 +11,6 @@ import wx
import ui
from globalCommands import commands
import browseMode
-import virtualBuffers
import api
import winUser
import winKernel
@@ -73,7 +72,8 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
def event_gainFocus(self, obj, nextHandler):
# Crucial: Don't do anything unless if it is an installed copy
and touchscreen support is active.
if config.isInstalledCopy() and touchHandler.handler:
- if isinstance(obj.treeInterceptor,
virtualBuffers.VirtualBuffer) and "Web" not in touchHandler.availableTouchModes:
+ # From 2015 onwards, browse mode module is used.
+ if isinstance(obj.treeInterceptor,
browseMode.BrowseModeTreeInterceptor) and "Web" not in
touchHandler.availableTouchModes:
touchHandler.availableTouchModes.append("Web")
# Web browsing gestures.
else:
# If we're not in browser window, force object
mode.
@@ -105,11 +105,10 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
def script_navigatorObject_current(self, gesture):
commands.script_navigatorObject_current(gesture)
-
#Web navigation:
# Web elements list:
- webBrowseElements=("normal", "Link", "Form", "Heading", "Frame",
"Table", "List", "Landmark")
+ webBrowseElements=("normal", "Link", "Form field", "Heading", "Frame",
"Table", "List", "Landmark")
webBrowseMode = 0 # The starting index for the web browse mode, which
flicks through objects.
# Touch gestures please.
@@ -125,26 +124,28 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
script_prevWebElement.__doc__="Selects the previous web navigation
element."
# The actual navigation gestures:
+ # Look up the needed commands for readability purposes.
+ browseModeCommands=(
+ (browseMode.BrowseModeTreeInterceptor.script_nextLink,
browseMode.BrowseModeTreeInterceptor.script_previousLink),
+ (browseMode.BrowseModeTreeInterceptor.script_nextFormField,
browseMode.BrowseModeTreeInterceptor.script_previousFormField),
+ (browseMode.BrowseModeTreeInterceptor.script_nextHeading,
browseMode.BrowseModeTreeInterceptor.script_previousHeading),
+ (browseMode.BrowseModeTreeInterceptor.script_nextFrame,
browseMode.BrowseModeTreeInterceptor.script_previousFrame),
+ (browseMode.BrowseModeTreeInterceptor.script_nextTable,
browseMode.BrowseModeTreeInterceptor.script_previousTable),
+ (browseMode.BrowseModeTreeInterceptor.script_nextList,
browseMode.BrowseModeTreeInterceptor.script_previousList),
+ (browseMode.BrowseModeTreeInterceptor.script_nextLandmark,
browseMode.BrowseModeTreeInterceptor.script_previousLandmark),
+ )
def script_nextSelectedElement(self, gesture):
obj = api.getNavigatorObject().treeInterceptor
- if isinstance(obj, virtualBuffers.VirtualBuffer):
+ if isinstance(obj, browseMode.BrowseModeTreeInterceptor):
if self.webBrowseMode == 0:
commands.script_navigatorObject_nextInFlow(gesture)
- elif self.webBrowseMode == 1:
virtualBuffers.VirtualBuffer.script_nextLink(obj, gesture)
- elif self.webBrowseMode == 2:
virtualBuffers.VirtualBuffer.script_nextFormField(obj, gesture)
- elif self.webBrowseMode == 3:
virtualBuffers.VirtualBuffer.script_nextHeading(obj, gesture)
- elif self.webBrowseMode == 4:
virtualBuffers.VirtualBuffer.script_nextFrame(obj, gesture)
- elif self.webBrowseMode == 5:
virtualBuffers.VirtualBuffer.script_nextTable(obj, gesture)
+ else:
self.browseModeCommands[self.webBrowseMode-1][0](obj, gesture)
def script_prevSelectedElement(self, gesture):
obj = api.getNavigatorObject().treeInterceptor
- if isinstance(obj, virtualBuffers.VirtualBuffer):
+ if isinstance(obj, browseMode.BrowseModeTreeInterceptor):
if self.webBrowseMode == 0:
commands.script_navigatorObject_previousInFlow(gesture)
- elif self.webBrowseMode == 1:
virtualBuffers.VirtualBuffer.script_previousLink(obj, gesture)
- elif self.webBrowseMode == 2:
virtualBuffers.VirtualBuffer.script_previousFormField(obj, gesture)
- elif self.webBrowseMode == 3:
virtualBuffers.VirtualBuffer.script_previousHeading(obj, gesture)
- elif self.webBrowseMode == 4:
virtualBuffers.VirtualBuffer.script_previousFrame(obj, gesture)
- elif self.webBrowseMode == 5:
virtualBuffers.VirtualBuffer.script_previousTable(obj, gesture)
+ else:
self.browseModeCommands[self.webBrowseMode-1][1](obj, gesture)
def script_touch_rightClick(self, gesture):
obj=api.getNavigatorObject()
https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/commits/faba7657aca6/
Changeset: faba7657aca6
Branch: master
User: josephsl
Date: 2016-11-24 05:14:01+00:00
Summary: Merge branch 'stable'
Affected #: 1 file
diff --git a/buildVars.py b/buildVars.py
index 03d791b..fdfb26b 100755
--- a/buildVars.py
+++ b/buildVars.py
@@ -20,7 +20,7 @@ addon_info = {
"addon_description" : _("""A suite of additional touch commands,
including tabbing and help commands.
Requires a touch-enabled computer with Windows 8.0 or later with NVDA
2012.3 or later installed."""),
# version
- "addon_version" : "0.7",
+ "addon_version" : "16.06",
# Author(s)
"addon_author" : "Joseph Lee <joseph.lee22590@xxxxxxxxx>",
# URL for the add-on documentation support
Repository URL: https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
