4 new commits in goldenCursor:
https://bitbucket.org/nvdaaddonteam/goldencursor/commits/bb42865120e4/
Changeset: bb42865120e4
Branch: None
User: josephsl
Date: 2019-11-11 07:22:26+00:00
Summary: Add-on settings: remove Golden Cursor settings used in NVDA 2018.1
and earlier.
Now that NVDA 2019.3 is required, remove the old settings dialog in favor of
settings panel. This involves not only the class itself, but also startup and
terminate methods.
Affected #: 1 file
diff --git a/addon/globalPlugins/goldenCursor.py
b/addon/globalPlugins/goldenCursor.py
index c60a138..a6389b0 100755
--- a/addon/globalPlugins/goldenCursor.py
+++ b/addon/globalPlugins/goldenCursor.py
@@ -273,28 +273,10 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
self.getAppRestriction = None
self.restriction = False
self.mouseArrows = False
- # Dialog or the panel.
- if hasattr(gui.settingsDialogs, "SettingsPanel"):
-
gui.settingsDialogs.NVDASettingsDialog.categoryClasses.append(GoldenCursorSettings)
- else:
- self.prefsMenu =
gui.mainFrame.sysTrayIcon.preferencesMenu
- self.gcSettings = self.prefsMenu.Append(wx.ID_ANY,
_("&Golden Cursor..."), _("Golden Cursor add-on settings"))
- gui.mainFrame.sysTrayIcon.Bind(wx.EVT_MENU,
self.onConfigDialog, self.gcSettings)
-
- def onConfigDialog(self, evt):
- gui.mainFrame._popupSettingsDialog(GoldenCursorSettings)
+
gui.settingsDialogs.NVDASettingsDialog.categoryClasses.append(GoldenCursorSettings)
def terminate(self):
- if hasattr(gui.settingsDialogs, "SettingsPanel"):
-
gui.settingsDialogs.NVDASettingsDialog.categoryClasses.remove(GoldenCursorSettings)
- else:
- try:
- if wx.version().startswith("4"):
- self.prefsMenu.Remove(self.gcSettings)
- else:
-
self.prefsMenu.RemoveItem(self.gcSettings)
- except:
- pass
+
gui.settingsDialogs.NVDASettingsDialog.categoryClasses.remove(GoldenCursorSettings)
def script_mousePositionsList(self, gesture):
# Don't even think about opening this dialog if positions list
does not exist.
@@ -486,43 +468,19 @@ confspec = {
}
config.conf.spec["goldenCursor"] = confspec
-# Present either the old settings dialog or a settings panel.
-if hasattr(gui.settingsDialogs, "SettingsPanel"):
- class GoldenCursorSettings(gui.settingsDialogs.SettingsPanel):
- # Translators: This is the label for the Golden Cursor settings
category in NVDA Settings screen.
- title = _("Golden Cursor")
-
- def makeSettings(self, settingsSizer):
- gcHelper = gui.guiHelper.BoxSizerHelper(self,
sizer=settingsSizer)
- # Translators: This is the label for a checkbox in the
- # Golden Cursor settings dialog.
-
self.mouseCoordinatesCheckBox=gcHelper.addItem(wx.CheckBox(self,
label=_("&Announce new mouse coordinates when mouse moves")))
-
self.mouseCoordinatesCheckBox.SetValue(config.conf["goldenCursor"]["reportNewMouseCoordinates"])
- # Translators: The label for a setting in Golden Cursor
settings dialog to change mouse movement units.
-
self.mouseMovementUnit=gcHelper.addLabeledControl(_("Mouse movement &unit (in
pixels)"), gui.nvdaControls.SelectOnFocusSpinCtrl, min=1, max=100,
initial=config.conf["goldenCursor"]["mouseMovementUnit"])
-
- def onSave(self):
-
config.conf["goldenCursor"]["reportNewMouseCoordinates"] =
self.mouseCoordinatesCheckBox.IsChecked()
- config.conf["goldenCursor"]["mouseMovementUnit"] =
self.mouseMovementUnit.Value
-
-else:
- class GoldenCursorSettings(gui.SettingsDialog):
- # Translators: This is the label for the Golden Cursor settings
dialog.
- title = _("Golden Cursor Settings")
-
- def makeSettings(self, settingsSizer):
- gcHelper = gui.guiHelper.BoxSizerHelper(self,
sizer=settingsSizer)
- # Translators: This is the label for a checkbox in the
- # Golden Cursor settings dialog.
-
self.mouseCoordinatesCheckBox=gcHelper.addItem(wx.CheckBox(self,
label=_("&Announce new mouse coordinates when mouse moves")))
-
self.mouseCoordinatesCheckBox.SetValue(config.conf["goldenCursor"]["reportNewMouseCoordinates"])
- # Translators: The label for a setting in Golden Cursor
settings dialog to change mouse movement units.
-
self.mouseMovementUnit=gcHelper.addLabeledControl(_("Mouse movement &unit (in
pixels)"), gui.nvdaControls.SelectOnFocusSpinCtrl, min=1, max=100,
initial=config.conf["goldenCursor"]["mouseMovementUnit"])
-
- def postInit(self):
- self.mouseCoordinatesCheckBox.SetFocus()
-
- def onOk(self,evt):
-
config.conf["goldenCursor"]["reportNewMouseCoordinates"] =
self.mouseCoordinatesCheckBox.IsChecked()
- config.conf["goldenCursor"]["mouseMovementUnit"] =
self.mouseMovementUnit.Value
- super(GoldenCursorSettings, self).onOk(evt)
+class GoldenCursorSettings(gui.settingsDialogs.SettingsPanel):
+ # Translators: This is the label for the Golden Cursor settings
category in NVDA Settings screen.
+ title = _("Golden Cursor")
+
+ def makeSettings(self, settingsSizer):
+ gcHelper = gui.guiHelper.BoxSizerHelper(self,
sizer=settingsSizer)
+ # Translators: This is the label for a checkbox in the
+ # Golden Cursor settings dialog.
+
self.mouseCoordinatesCheckBox=gcHelper.addItem(wx.CheckBox(self,
label=_("&Announce new mouse coordinates when mouse moves")))
+
self.mouseCoordinatesCheckBox.SetValue(config.conf["goldenCursor"]["reportNewMouseCoordinates"])
+ # Translators: The label for a setting in Golden Cursor
settings dialog to change mouse movement units.
+ self.mouseMovementUnit=gcHelper.addLabeledControl(_("Mouse
movement &unit (in pixels)"), gui.nvdaControls.SelectOnFocusSpinCtrl, min=1,
max=100, initial=config.conf["goldenCursor"]["mouseMovementUnit"])
+
+ def onSave(self):
+ config.conf["goldenCursor"]["reportNewMouseCoordinates"] =
self.mouseCoordinatesCheckBox.IsChecked()
+ config.conf["goldenCursor"]["mouseMovementUnit"] =
self.mouseMovementUnit.Value
https://bitbucket.org/nvdaaddonteam/goldencursor/commits/86b592c83ad8/
Changeset: 86b592c83ad8
Branch: None
User: josephsl
Date: 2019-11-11 07:23:42+00:00
Summary: wxPython: use wx.NewIdRef function in wxPython 4.0.3.
Affected #: 1 file
diff --git a/addon/globalPlugins/goldenCursor.py
b/addon/globalPlugins/goldenCursor.py
index a6389b0..78452d5 100755
--- a/addon/globalPlugins/goldenCursor.py
+++ b/addon/globalPlugins/goldenCursor.py
@@ -129,19 +129,19 @@ class PositionsList(wx.Dialog):
bHelper = gui.guiHelper.ButtonHelper(orientation=wx.HORIZONTAL)
- jumpButtonID = wx.NewIdRef() if wx.version().startswith("4")
else wx.NewId()
+ jumpButtonID = wx.NewIdRef()
# Translators: the button to jump to the selected position.
bHelper.addButton(self, jumpButtonID, _("&Jump"),
wx.DefaultPosition)
- renameButtonID = wx.NewIdRef() if wx.version().startswith("4")
else wx.NewId()
+ renameButtonID = wx.NewIdRef()
# Translators: the button to rename a mouse position.
bHelper.addButton(self, renameButtonID, _("&Rename"),
wx.DefaultPosition)
- deleteButtonID = wx.NewIdRef() if wx.version().startswith("4")
else wx.NewId()
+ deleteButtonID = wx.NewIdRef()
# Translators: the button to delete the selected mouse position.
bHelper.addButton(self, deleteButtonID, _("&Delete"),
wx.DefaultPosition)
- clearButtonID = wx.NewIdRef() if wx.version().startswith("4")
else wx.NewId()
+ clearButtonID = wx.NewIdRef()
# Translators: the button to clear all mouse positions for the
focused app.
bHelper.addButton(self, clearButtonID, _("C&lear positions"),
wx.DefaultPosition)
https://bitbucket.org/nvdaaddonteam/goldencursor/commits/e2b22f0543ed/
Changeset: e2b22f0543ed
Branch: None
User: josephsl
Date: 2019-11-11 07:28:46+00:00
Summary: Readme: bump version to 4.0
Affected #: 1 file
diff --git a/readme.md b/readme.md
index b98250f..51dfec9 100755
--- a/readme.md
+++ b/readme.md
@@ -2,7 +2,7 @@
* Author: salah atair, Joseph Lee
* Download [stable version][1]
-* Download [development version][2]
+* NVDA compatibility: 2019.3 and beyond
This add-on allows you to move the mouse using a keyboard and save mouse
positions for applications.
@@ -29,6 +29,11 @@ Note: these gestures can be reassigned via NVDA's Input
Gestures dialog under Go
* To perform functions that require use of arrow keys, turn off mouse arrows
first.
* When deleting saved positions, if there are no saved positions left,
positions for the application will be cleared.
+## Version 4.0
+
+* Requires NVDA 2019.3 or later.
+* Golden Cursor settings dialog has been replaced by Golden Cursor settings
panel.
+
## Version 3.3
* Internal changes to support future NVDA releases.
https://bitbucket.org/nvdaaddonteam/goldencursor/commits/e9f15a8e9c09/
Changeset: e9f15a8e9c09
Branch: master
User: josephsl
Date: 2019-11-11 07:29:05+00:00
Summary: BuildVars: minimum NVDA version -> 2019.3
Affected #: 1 file
diff --git a/buildVars.py b/buildVars.py
index 105d702..7e8395b 100755
--- a/buildVars.py
+++ b/buildVars.py
@@ -27,7 +27,7 @@ addon_info = {
# File name for the add-on help file.
"addon_docFileName" : "readme.html",
# Minimum NVDA version supported
- "addon_minimumNVDAVersion" : "2017.3.0",
+ "addon_minimumNVDAVersion" : "2019.3.0",
# Last NVDA version supported/tested
"addon_lastTestedNVDAVersion" : "2019.3.0",
# Add-on update channel (default is stable)
Repository URL: https://bitbucket.org/nvdaaddonteam/goldencursor/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
