1 new commit in Ventrilo:
https://bitbucket.org/nvdaaddonteam/ventrilo/commits/30474a943f67/
Changeset: 30474a943f67
Branch: master
User: kyleman
Date: 2015-08-28 21:45:42+00:00
Summary: Simplified if/elif chain for labeling previous unlabeled buttons.
Added a dictionary for windowControlID’s.
Issues:
Seems to be labeling other things with the same controlid’s that we don’t’ want
labeled. Any assistance with this would be helpful.
Affected #: 1 file
diff --git a/addon/appModules/ventrilo/__init__.py
b/addon/appModules/ventrilo/__init__.py
index 6eaf3d1..8405768 100644
--- a/addon/appModules/ventrilo/__init__.py
+++ b/addon/appModules/ventrilo/__init__.py
@@ -10,7 +10,26 @@ import appModuleHandler
import addonHandler
addonHandler.initTranslation()
-class lConnectDisconnectButton(Window):
+control_id = {
+ 1028: _(u'User Name'),
+ 1026: _(u'User Configuration...'),
+ 1093: _(u'Server'),
+ 1010: _(u'Connection Editor...'),
+ 1023: _(u'Bindings'),
+ 1027: _(u'Bindings Configuration...'),
+ 1062: _(u'Enter your comment:'),
+ 1108: _(u'Enter a URL:'),
+ 1067: _(u'Enter your message:'),
+ 1070: _(u'Received Messages:'),
+ 1127: _(u'Output Device'),
+ 1128: _(u'input Device1'),
+ 1129: _(u'Input Device2'),
+ 1132: _(u'Input Volume'),
+ 1133: _(u'Amplifier'),
+ 1134: _(u'Output Volume')
+}
+
+class ConnectDisconnectButton(Window):
def _get_name(self):
original_name = super(lConnectDisconnectButton, self).name
@@ -23,26 +42,17 @@ class lConnectDisconnectButton(Window):
class AppModule(appModuleHandler.AppModule):
def event_NVDAObject_init(self, obj):
- if isinstance(obj,Window) and obj.windowClassName==u'ComboBox'
and obj.windowControlID==1028:
- obj.name = _(u'User Name')
- elif isinstance(obj,Window) and obj.windowClassName==u'Button'
and obj.windowControlID==1026:
- obj.name = _(u'User Configuration...')
- elif isinstance(obj,Window) and
obj.windowClassName==u'ComboBox' and obj.windowControlID==1093:
- obj.name = _(u'Server')
- elif isinstance(obj,Window) and obj.windowClassName==u'Button'
and obj.windowControlID==1010:
- obj.name = _(u'Connection Editor...')
- elif isinstance(obj,Window) and
obj.windowClassName==u'ComboBox' and obj.windowControlID==1023:
- obj.name = _(u'Bindings')
- elif isinstance(obj,Window) and obj.windowClassName==u'Button'
and obj.windowControlID==1027:
- obj.name = _(u'Bindings Configuration...')
- elif isinstance(obj,Window) and obj.windowClassName==u'Edit'
and obj.windowControlID==1062:
- obj.name = _(u'Enter your comment:')
- elif isinstance(obj,Window) and obj.windowClassName==u'Edit'
and obj.windowControlID==1108:
- obj.name = _(u'Enter internet URL:')
- elif isinstance(obj,Window) and obj.windowClassName==u'Edit'
and obj.windowControlID==1067:
- obj.name = _(u'Enter your message:')
- elif isinstance(obj,Window) and
obj.windowClassName==u'RichEdit20A' and obj.windowControlID==1070:
- obj.name = _(u'Received Messages:')
+ if obj.windowClassName==u'ComboBox' and obj.windowControlID in
control_id:
+ obj.name = control_id[obj.windowControlID]
+ elif obj.windowClassName==u'Button' and obj.windowControlID in
control_id:
+ obj.name = control_id[obj.windowControlID]
+ elif obj.windowClassName==u'Edit' and obj.windowControlID in
control_id:
+ obj.name = control_id[obj.windowControlID]
+ elif obj.windowClassName==u'RichEdit20A' and
obj.windowControlID in control_id:
+ obj.name = control_id[obj.windowControlID]
+ elif obj.windowClassName=="msctls_trackbar32" and
obj.windowControlID in control_id:
+ obj.name = control_id[obj.windowControlID]
+
def chooseNVDAObjectOverlayClasses(self,obj,clsList):
if isinstance(obj,Window) and obj.windowClassName==u'Button'
and obj.windowControlID==1009:
@@ -246,7 +256,7 @@ class AppModule(appModuleHandler.AppModule):
#gestures
__gestures={
- "kb:control+p": "sayPing",
+ "kb:control+p": "sayPing",
"kb:alt+a": "connectButton",
"kb:alt+s": "setupButton",
"kb:alt+x": "commentButton",
Repository URL: https://bitbucket.org/nvdaaddonteam/ventrilo/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
