5 new commits in EnhancedTouchGestures:
https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/commits/4057ec83553a/
Changeset: 4057ec83553a
Branch: None
User: josephsl
Date: 2018-05-22 23:54:48+00:00
Summary: Add-on settings: now part of multi-category NVDA Settings dialog.
Enhanced Touch Gesture's Touch Interaction dialog is now a panel in NVDA
Settings (NVDA 2018.2 and later). The panel itself is named 'Enhanced Touch
Gestures' and does react to whether normal ocnfiguration or other profiles are
active. In case of turning off touch support, the warning will be shown.
Affected #: 1 file
diff --git a/addon/globalPlugins/enhancedTouchGestures/__init__.py
b/addon/globalPlugins/enhancedTouchGestures/__init__.py
index b6d7c08..29e5fde 100644
--- a/addon/globalPlugins/enhancedTouchGestures/__init__.py
+++ b/addon/globalPlugins/enhancedTouchGestures/__init__.py
@@ -50,17 +50,12 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
touchHandler.touchModeLabels["synthsettings"] =
"synthsettings mode"
touchHandler.touchModeLabels["web"] = "web mode"
config.configProfileSwitched.register(self.handleConfigProfileSwitch)
- self.prefsMenu =
gui.mainFrame.sysTrayIcon.preferencesMenu
- self.touchSettings = self.prefsMenu.Append(wx.ID_ANY,
_("&Touch Interaction..."), _("Touchscreen interaction settings"))
- gui.mainFrame.sysTrayIcon.Bind(wx.EVT_MENU,
self.onConfigDialog, self.touchSettings)
+
gui.settingsDialogs.NVDASettingsDialog.categoryClasses.append(EnhancedTouchGesturesPanel)
else:
self.prefsMenu = None
self.touchSettings = None
self.touchPassthroughTimer = None
- def onConfigDialog(self, evt):
- gui.mainFrame._popupSettingsDialog(TouchInteractionDialog)
-
def terminate(self):
try:
self.prefsMenu.RemoveItem(self.touchSettings)
@@ -309,35 +304,30 @@ confspec = {
}
config.conf.spec["touch"] = confspec
-class TouchInteractionDialog(gui.SettingsDialog):
+class EnhancedTouchGesturesPanel(gui.SettingsPanel):
# Translators: This is the label for the touch interaction settings
dialog.
- title = _("Touch Interaction")
+ title = _("Enhanced Touch Gestures")
def makeSettings(self, settingsSizer):
touchHelper = gui.guiHelper.BoxSizerHelper(self,
sizer=settingsSizer)
# Never, EVER allow touch support to be disabled completely if
using normal configuration (only manual passthrough will be allowed).
if config.conf.profiles[-1].name is not None:
# Translators: This is the label for a checkbox in the
- # touch interaction settings dialog.
+ # Enhanced Touch Gestures settings panel.
self.noTouchSupportCheckBox=touchHelper.addItem(wx.CheckBox(self,
label=_("Completely disable touch interaction support")))
self.noTouchSupportCheckBox.SetValue(config.conf["touch"]["noTouchSupport"])
- # Translators: The label for a setting in touch interaction
dialog to allow users to interact directly with touchscreens for specified
duration in seconds.
+ # Translators: The label for a setting in Enhanced Touch
Gestures settings panel to allow users to interact directly with touchscreens
for specified duration in seconds.
self.commandPassthroughDuration=touchHelper.addLabeledControl(_("&Pause NVDA's
touch support (duration in seconds)"), gui.nvdaControls.SelectOnFocusSpinCtrl,
min=3, max=10, initial=config.conf["touch"]["commandPassthroughDuration"])
# Translators: a checkbox to allow passthrough to be toggled
manually.
self.manualPassthroughCheckBox=touchHelper.addItem(wx.CheckBox(self,
label=_("&Manually toggle touch passthrough")))
self.manualPassthroughCheckBox.SetValue(config.conf["touch"]["manualPassthroughToggle"])
- def postInit(self):
- if hasattr(self, "noTouchSupportCheckBox"):
self.noTouchSupportCheckBox.SetFocus()
- else: self.commandPassthroughDuration.SetFocus()
-
- def onOk(self,evt):
+ def onSave(self):
if config.conf.profiles[-1].name is not None:
if not config.conf["touch"]["noTouchSupport"] and
self.noTouchSupportCheckBox.IsChecked():
- message = _("You are about to turn off touch
interaction support completely so the touchscreen can be used as though NVDA is
not running. To enable touch support, you need to return to this dialog and
uncheck 'disable touch interaction support' checkbox. Are you sure you wish to
completely disable touch interaction support?")
+ message = _("You are about to turn off touch
interaction support completely so the touchscreen can be used as though NVDA is
not running. To enable touch support, you need to return to Enhanced Touch
Gestures panel in NVDA Settings and uncheck 'disable touch interaction support'
checkbox. Are you sure you wish to completely disable touch interaction
support?")
if gui.messageBox(message, _("Disable touch
interaction support"), wx.YES_NO | wx.NO_DEFAULT | wx.CANCEL | wx.CENTER |
wx.ICON_QUESTION) == wx.NO:
return
config.conf["touch"]["noTouchSupport"]=self.noTouchSupportCheckBox.IsChecked()
config.conf["touch"]["commandPassthroughDuration"] =
self.commandPassthroughDuration.Value
config.conf["touch"]["manualPassthroughToggle"] =
self.manualPassthroughCheckBox.IsChecked()
- super(TouchInteractionDialog, self).onOk(evt)
https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/commits/619e4bdf2d51/
Changeset: 619e4bdf2d51
Branch: None
User: josephsl
Date: 2018-05-24 20:51:11+00:00
Summary: Merge branch 'stable' of
https://bitbucket.org/nvdaaddonteam/enhancedTouchGestures
Affected #: 1 file
diff --git a/addon/locale/de_CH/LC_MESSAGES/nvda.po
b/addon/locale/de_CH/LC_MESSAGES/nvda.po
index 4105d22..08d1380 100644
--- a/addon/locale/de_CH/LC_MESSAGES/nvda.po
+++ b/addon/locale/de_CH/LC_MESSAGES/nvda.po
@@ -8,14 +8,13 @@ msgstr ""
"Project-Id-Version: enhancedTouchGestures 17.12\n"
"Report-Msgid-Bugs-To: nvda-translations@xxxxxxxxxxxxx\n"
"POT-Creation-Date: 2017-12-15 06:10+1000\n"
-"PO-Revision-Date: 2018-01-04 22:52+0100\n"
-"Last-Translator: Robert Hänggi, <aarjay.robert@xxxxxxxxx\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2018-03-23 23:10+0100\n"
+"Last-Translator: Adriani Botez <adriani.botez@xxxxxxxxx>\n"
"Language: de_CH\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.5\n"
+"X-Generator: Poedit 1.5.7\n"
"Language-Team: \n"
msgid "&Touch Interaction..."
@@ -40,7 +39,7 @@ msgstr "Unterstützung für Touch-Interaktion vollständig
deaktivieren"
#. Translators: This is the label for a checkbox in the
#. touch interaction settings dialog.
msgid "&Touch typing mode"
-msgstr "&Art der Touch-Eingabe"
+msgstr "&Tippen auf Berührung"
#. Translators: The label for a setting in touch interaction dialog to allow
users to interact directly with touchscreens for specified duration in seconds.
msgid "&Pause NVDA's touch support (duration in seconds)"
https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/commits/627f36d2dcc2/
Changeset: 627f36d2dcc2
Branch: None
User: josephsl
Date: 2018-06-06 08:08:48+00:00
Summary: wxPython 4 compatibility: catch all exceptions when terminating
the add-on for now.
Affected #: 1 file
diff --git a/addon/globalPlugins/enhancedTouchGestures/__init__.py
b/addon/globalPlugins/enhancedTouchGestures/__init__.py
index 29e5fde..e01cb62 100644
--- a/addon/globalPlugins/enhancedTouchGestures/__init__.py
+++ b/addon/globalPlugins/enhancedTouchGestures/__init__.py
@@ -59,7 +59,7 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
def terminate(self):
try:
self.prefsMenu.RemoveItem(self.touchSettings)
- except (RuntimeError, AttributeError, wx.PyDeadObjectError):
+ except:
pass
# Certain touch objects.
https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/commits/bbb2d9ce7397/
Changeset: bbb2d9ce7397
Branch: None
User: josephsl
Date: 2018-06-12 02:08:51+00:00
Summary: Enhanced Touch Gestures: remove multi-category dialog entry
instead.
Affected #: 1 file
diff --git a/addon/globalPlugins/enhancedTouchGestures/__init__.py
b/addon/globalPlugins/enhancedTouchGestures/__init__.py
index e01cb62..f8e31a8 100644
--- a/addon/globalPlugins/enhancedTouchGestures/__init__.py
+++ b/addon/globalPlugins/enhancedTouchGestures/__init__.py
@@ -52,13 +52,12 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
config.configProfileSwitched.register(self.handleConfigProfileSwitch)
gui.settingsDialogs.NVDASettingsDialog.categoryClasses.append(EnhancedTouchGesturesPanel)
else:
- self.prefsMenu = None
self.touchSettings = None
self.touchPassthroughTimer = None
def terminate(self):
try:
- self.prefsMenu.RemoveItem(self.touchSettings)
+
gui.settingsDialogs.NVDASettingsDialog.categoryClasses.remove(EnhancedTouchGesturesPanel)
except:
pass
https://bitbucket.org/nvdaaddonteam/enhancedtouchgestures/commits/8b3412f2a686/
Changeset: 8b3412f2a686
Branch: stable
User: josephsl
Date: 2018-06-13 08:02:19+00:00
Summary: Enhanced Touch Gestures 18.06
Signed-off-by: Joseph Lee <joseph.lee22590@xxxxxxxxx>
Affected #: 2 files
diff --git a/buildVars.py b/buildVars.py
index d91b5f9..e8b2b12 100755
--- a/buildVars.py
+++ b/buildVars.py
@@ -20,7 +20,7 @@ addon_info = {
"addon_description" : _("""A suite of additional touch commands,
including navigation and help commands.
Requires a touch-enabled computer with Windows 8.1 or later with NVDA
2017.4 or later installed."""),
# version
- "addon_version" : "18.04",
+ "addon_version" : "18.06",
# Author(s)
"addon_author" : "Joseph Lee <joseph.lee22590@xxxxxxxxx>",
# URL for the add-on documentation support
diff --git a/readme.md b/readme.md
index 2aec971..5cfe406 100755
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@
This add-on provides additional touchscreen gestures for NVDA. It also
provides a set of gestures for easier browse mode navigation.
-Note: this add-on requires NVDA 2018.1 or later running on a touchscreen
computer with Windows 8.1 or 10.
+Note: this add-on requires NVDA 2018.2 or later running on a touchscreen
computer with Windows 8.1 or 10.
## Commands
@@ -43,6 +43,11 @@ An unassigned command is available to allow you to use
touchscreen gestures as t
If profiles other than normal configuration is active and if you go to Touch
Interaction dialog, you'll see a checkbox named "completely disable touch
support". Checking this box and answering yes if prompted will completely turn
off touch support for that profile. This is useful in apps that provide their
own touch commands. To restore touch functionality, either uncheck this
checkbox or manually toggle touch passthrough.
+## Version 18.06
+
+* Add-on settings is now found in new multi-category NVDA Settings screen
under "Enhanced Touch Gestures" category. As a result, NVDA 2018.2 is required.
+* Fixed compatibility issues with wxPython 4.
+
## Version 18.04
* Resolves an issue where touch interaction category in NVDA Settings panel
may cause error sounds to be heard due to changes made from this add-on.
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.
