make it compatible with NVDA 2021.1beta3

Author: Mahmood-Taghavi

addon/doc/en/readme.md

@@ -10,8 +10,8 @@ Note 1: You can now use a custom dialog box entitled "Dual voice" in the NVDA me
 
 Note 2: A complimentary free software namely SAPI_Unifier is designed to add support for Windows 10 oneCore voices and Microsoft speech platform (speech server) voices to the Dual Voice for NVDA. So, I suggest using [SAPI_Unifier](https://mahmood-taghavi.github.io/SAPI_Unifier/) to extend the capabilities of the Dual Voice.
 
-Note 3: The latest version of NVDA which supports Windows XP and Windows Vista is NVDA 2017.3 and the latest Dual Voice which is compatible with NVDA 2017.3 is version 3.1.
+Note 3: The latest version of NVDA which supports Windows XP and Windows Vista is NVDA 2017.3 and the latest Dual Voice which is compatible with that NVDA is version 3.1.
 
 This package is distributed under the terms of the GNU General Public License, version 2. Please see the file "COPYING.txt" for further details.
 
-Copyright © 2015-2020 Seyed Mahmood Taghavi-Shahri.
+Copyright © 2015-2021 Seyed Mahmood Taghavi-Shahri.

addon/globalPlugins/dual_voice_globalPlugin/__init__.py

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-#A part of Dual Voice for NVDA
-#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
-#https://mahmood-taghavi.github.io/dual_voice/
-#This file is covered by the GNU General Public License version 3.
-#See the file COPYING for more details.
+# A part of Dual Voice for NVDA
+# Copyright (C) 2015-2021 Seyed Mahmood Taghavi Shahri
+# https://mahmood-taghavi.github.io/dual_voice/
+# This file is covered by the GNU General Public License version 3.
+# See the file COPYING for more details.
 
 import globalPluginHandler, wx, gui
 from .dialogs import *
@@ -21,18 +21,18 @@ def __init__(self):
 
 	def createMenu(self):
 		self.submenu_dualvoice = wx.Menu()
-		item = self.submenu_dualvoice.Append(wx.ID_ANY, _('&Settings of the Dual Voice...'))
+		item = self.submenu_dualvoice.Append(wx.ID_ANY, _('&Settings of the Dual voice...'))
 		gui.mainFrame.sysTrayIcon.Bind(wx.EVT_MENU , lambda e : gui.mainFrame._popupSettingsDialog(DualVoiceLanguageSettingsDialog), item)
 		item = self.submenu_dualvoice.Append(wx.ID_ANY, _('Visit the SAPI &Unifier website!'))
 		gui.mainFrame.sysTrayIcon.Bind(wx.EVT_MENU, self.onSAPI_Unifier, item)
 		item = self.submenu_dualvoice.Append(wx.ID_ANY, _('Visit the &Dual Voice website!'))
 		gui.mainFrame.sysTrayIcon.Bind(wx.EVT_MENU, self.onCheckUpdate, item)
-		item = self.submenu_dualvoice.Append(wx.ID_ANY, _('&About the Dual Voice for NVDA'))
+		item = self.submenu_dualvoice.Append(wx.ID_ANY, _('&About the Dual voice for NVDA'))
 		gui.mainFrame.sysTrayIcon.Bind(wx.EVT_MENU, self.onAbout, item)
-		self.submenu_item = gui.mainFrame.sysTrayIcon.menu.InsertMenu(2, wx.ID_ANY, _('Dual &Voice'), self.submenu_dualvoice)
+		self.submenu_item = gui.mainFrame.sysTrayIcon.menu.InsertMenu(2, wx.ID_ANY, _('Dual &voice'), self.submenu_dualvoice)
 
 	def onAbout(self, event):
-		gui.messageBox('Version 4.9 by Seyed Mahmood Taghavi-Shahri, Iran', _('About the Dual Voice add-on for NVDA'), wx.OK)
+		gui.messageBox('Version 5.0 by Seyed Mahmood Taghavi-Shahri, Iran', _('About the Dual voice add-on for NVDA'), wx.OK)
 
 	def onCheckUpdate(self, event):
 		webbrowser.open("https://mahmood-taghavi.github.io/dual_voice/")

addon/globalPlugins/dual_voice_globalPlugin/dialogs.py

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-#A part of Dual Voice for NVDA
-#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
-#https://mahmood-taghavi.github.io/dual_voice/
-#This file is covered by the GNU General Public License version 3.
-#See the file COPYING for more details.
+# A part of Dual Voice for NVDA
+# Copyright (C) 2015-2021 Seyed Mahmood Taghavi Shahri
+# https://mahmood-taghavi.github.io/dual_voice/
+# This file is covered by the GNU General Public License version 3.
+# See the file COPYING for more details.
 
 import wx
 import gui
@@ -14,8 +14,8 @@
 #import languageHandler
 from logHandler import log
 import speech
-from synthDriverHandler import SynthDriver
 from synthDrivers import _realtime
+import synthDriverHandler
 
 class DualVoiceLanguageSettingsDialog(gui.SettingsDialog):
 	title = _('The Dual Voice settings')
@@ -24,9 +24,9 @@ def __init__(self, parent):
 
 	def makeSettings(self, sizer):
 		synthInfo = _('Your current speech synthesizer is the %s. Please select the Dual Voice as the speech synthesizer in the NVDA speech settings.')
-		synthName = speech.getSynth().description
+		synthName = synthDriverHandler.getSynth().description
 		synthInfo = synthInfo.replace('%s', synthName)
-		if ('dual_sapi5' not in speech.getSynth().name):
+		if ('dual_sapi5' not in synthDriverHandler.getSynth().name):
 			infoLabel = wx.StaticText(self, label = synthInfo)
 		else:
 			## find the primary voice and show it in a label      
@@ -41,11 +41,11 @@ def makeSettings(self, sizer):
 		infoLabel.Wrap(self.GetSize()[0])
 		sizer.Add(infoLabel)
 		###
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			sVoicesLabel = wx.StaticText(self, label=_('Secondary &voice:'))		
 			sizer.Add(sVoicesLabel)	
 			self._sVoicesChoice = wx.Choice(self, choices = _realtime.list_VoiceName)
-			if ('dual_sapi5' in speech.getSynth().name):
+			if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 				check = _realtime.sapi5SecondVoice in _realtime.list_VoiceAttribName
 				if check:
 					index = _realtime.list_VoiceAttribName.index(_realtime.sapi5SecondVoice)
@@ -62,7 +62,7 @@ def makeSettings(self, sizer):
 			sizer.Add(self._sVoicesChoice)
 			##
 			self._secondIsLatinCheckBox = wx.CheckBox(self, label = _('&Use the secondary voice for reading Latin text instead of non-Latin.'))
-			if ('dual_sapi5' in speech.getSynth().name):
+			if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 				self._secondIsLatinCheckBox.SetValue(_realtime.sapi5SecondIsLatin)
 			self._secondIsLatinCheckBox.Bind(wx.EVT_CHECKBOX, self.onSIsLatinCheck)
 			sizer.Add(self._secondIsLatinCheckBox)					
@@ -71,33 +71,33 @@ def makeSettings(self, sizer):
 			sizer.Add(sRateLabel)
 			self._sRateSlider = wx.Slider(self, value = 50, minValue = 0, maxValue = 100, style = wx.SL_HORIZONTAL)	
 			self._sRateSlider.Bind(wx.EVT_SLIDER, self.OnSRateSliderScroll)
-			if ('dual_sapi5' in speech.getSynth().name):
+			if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 				self._sRateSlider.SetValue(_realtime.sapi5SecondRate)
 			sizer.Add(self._sRateSlider)
 			##
 			sPitchLabel = wx.StaticText(self, label=_('&Pitch:'))
 			sizer.Add(sPitchLabel)
 			self._sPitchSlider = wx.Slider(self, value = 50, minValue = 0, maxValue = 100, style = wx.SL_HORIZONTAL)
 			self._sPitchSlider.Bind(wx.EVT_SLIDER, self.OnSPitchSliderScroll)
-			if ('dual_sapi5' in speech.getSynth().name):
+			if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 				self._sPitchSlider.SetValue(_realtime.sapi5SecondPitch)
 			sizer.Add(self._sPitchSlider)
 			##
 			sVolumeLabel = wx.StaticText(self, label=_('V&olume:'))
 			sizer.Add(sVolumeLabel)
 			self._sVolumeSlider = wx.Slider(self, value = 100, minValue = 0, maxValue = 100, style = wx.SL_HORIZONTAL)				
 			self._sVolumeSlider.Bind(wx.EVT_SLIDER, self.OnSVolumeSliderScroll)
-			if ('dual_sapi5' in speech.getSynth().name):
+			if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 				self._sVolumeSlider.SetValue(_realtime.sapi5SecondVolume)			
 			sizer.Add(self._sVolumeSlider)
 			##
 			self._nonLatinPriorityCheckBox = wx.CheckBox(self, label = _('&Prioritize non-Latin text over Latin text.'))
-			if ('dual_sapi5' in speech.getSynth().name):
+			if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 				self._nonLatinPriorityCheckBox.SetValue(_realtime.sapi5NonLatinPriority)
 			self._nonLatinPriorityCheckBox.Bind(wx.EVT_CHECKBOX, self.nonLatinPriorityCheck)
 			sizer.Add(self._nonLatinPriorityCheckBox)
 			self._considerContextCheckBox = wx.CheckBox(self, label = _('Read &numbers and punctuations based on surrounding text.'))
-			if ('dual_sapi5' in speech.getSynth().name):
+			if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 				self._considerContextCheckBox.SetValue(_realtime.sapi5ConsiderContext)							
 			self._considerContextCheckBox.Bind(wx.EVT_CHECKBOX, self.considerContextCheck)
 			sizer.Add(self._considerContextCheckBox)			
@@ -109,7 +109,7 @@ def makeSettings(self, sizer):
 			#self._typingAreaTextCtrl.SetValue(_realtime.list_VoiceName[0])
 			self._typingAreaTextCtrl.SetValue(_realtime.typingArea)
 			sizer.Add(self._typingAreaTextCtrl)
-			if ('dual_sapi5' not in speech.getSynth().name):
+			if ('dual_sapi5' not in synthDriverHandler.getSynth().name):
 				sVoicesLabel.Disable()
 				self._sVoicesChoice.Disable()
 				sRateLabel.Disable()
@@ -128,7 +128,7 @@ def makeSettings(self, sizer):
 
 	def onOk(self, event):
 		# Update Configurations
-		if ('dual_sapi5' in speech.getSynth().name):				
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.typingArea = self._typingAreaTextCtrl.GetValue()
 			config.conf["dual_voice"]["sapi5SecondVoice"] = _realtime.sapi5SecondVoice
 			config.conf["dual_voice"]["sapi5SecondRate"] = _realtime.sapi5SecondRate
@@ -142,7 +142,7 @@ def onOk(self, event):
 
 	def onCancel(self, event):
 		# Restore Configurations
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.sapi5SecondVoice = config.conf["dual_voice"]["sapi5SecondVoice"]
 			_realtime.sapi5SecondRate = config.conf["dual_voice"]["sapi5SecondRate"]
 			_realtime.sapi5SecondPitch = config.conf["dual_voice"]["sapi5SecondPitch"]
@@ -154,30 +154,30 @@ def onCancel(self, event):
 
 
 	def onSVoiceChange(self, event):
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.sapi5SecondVoice = _realtime.list_VoiceAttribName[self._sVoicesChoice.GetSelection()]
 			_realtime.problemisticSapi5SecondVoice = ''
 
 	def OnSRateSliderScroll(self, event):
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.sapi5SecondRate = self._sRateSlider.GetValue()
 
 	def OnSPitchSliderScroll(self, event):
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.sapi5SecondPitch = self._sPitchSlider.GetValue()
 
 	def OnSVolumeSliderScroll(self, event):
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.sapi5SecondVolume = self._sVolumeSlider.GetValue()
 
 	def onSIsLatinCheck(self, event):
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.sapi5SecondIsLatin = self._secondIsLatinCheckBox.GetValue()
 
 	def nonLatinPriorityCheck(self, event):
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.sapi5NonLatinPriority = self._nonLatinPriorityCheckBox.GetValue()	
 
 	def considerContextCheck(self, event):
-		if ('dual_sapi5' in speech.getSynth().name):
+		if ('dual_sapi5' in synthDriverHandler.getSynth().name):
 			_realtime.sapi5ConsiderContext = self._considerContextCheckBox.GetValue()

addon/locale/en/LC_MESSAGES/nvda.po

@@ -1,15 +1,14 @@
-# Translation of the Dual Voice for NVDA add-on.
-# Copyright (C) 2020 Seyed Mahmood Taghavi-Shahri.
-# https://mahmood-taghavi.github.io/dual_voice/
+# English translations for the Dual Voice for NVDA package.
+# Copyright (C) 2020 THE Dual Voice for NVDA'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Dual Voice for NVDA package.
 # <EMAIL@ADDRESS>, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Dual Voice for NVDA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-04 00:01+0430\n"
-"PO-Revision-Date: 2020-04-04 11:34+0430\n"
+"POT-Creation-Date: 2020-03-30 20:03+0430\n"
+"PO-Revision-Date: 2020-03-30 20:08+0430\n"
 "Last-Translator: <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en\n"
@@ -23,8 +22,8 @@ msgid "You can type here to check the voices"
 msgstr "You can type here to check the voices"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:24
-msgid "&Settings of the Dual Voice..."
-msgstr "&Settings of the Dual Voice..."
+msgid "&Settings of the Dual voice..."
+msgstr "&Settings of the Dual voice..."
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:26
 msgid "Visit the SAPI &Unifier website!"
@@ -35,16 +34,16 @@ msgid "Visit the &Dual Voice website!"
 msgstr "Visit the &Dual Voice website!"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:30
-msgid "&About the Dual Voice for NVDA"
-msgstr "&About the Dual Voice for NVDA"
+msgid "&About the Dual voice for NVDA"
+msgstr "&About the Dual voice for NVDA"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:32
-msgid "Dual &Voice"
-msgstr "Dual &Voice"
+msgid "Dual &voice"
+msgstr "Dual &voice"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:35
-msgid "About the Dual Voice add-on for NVDA"
-msgstr "About the Dual Voice add-on for NVDA"
+msgid "About the Dual voice add-on for NVDA"
+msgstr "About the Dual voice add-on for NVDA"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\dialogs.py:21
 msgid "The Dual Voice settings"

addon/locale/fa/LC_MESSAGES/nvda.po

@@ -1,6 +1,5 @@
-# Translation of the Dual Voice for NVDA add-on.
-# Copyright (C) 2020 Seyed Mahmood Taghavi-Shahri.
-# https://mahmood-taghavi.github.io/dual_voice/
+# Persian translations for the Dual Voice for NVDA package.
+# Copyright (C) 2020 THE Dual Voice for NVDA'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Dual Voice for NVDA package.
 # <EMAIL@ADDRESS>, 2020.
 #
@@ -23,7 +22,7 @@ msgid "You can type here to check the voices"
 msgstr "شما می‌توانید برای بررسی صداها در اینجا تایپ کنید"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:24
-msgid "&Settings of the Dual Voice..."
+msgid "&Settings of the Dual voice..."
 msgstr "&تنظیمات صدای دوگانه..."
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:26
@@ -35,15 +34,15 @@ msgid "Visit the &Dual Voice website!"
 msgstr "بازدید از &وبسایت صدای دوگانه!"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:30
-msgid "&About the Dual Voice for NVDA"
+msgid "&About the Dual voice for NVDA"
 msgstr "&درباره صدای دوگانه برای NVDA"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:32
-msgid "Dual &Voice"
+msgid "Dual &voice"
 msgstr "&صدای دوگانه"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\__init__.py:35
-msgid "About the Dual Voice add-on for NVDA"
+msgid "About the Dual voice add-on for NVDA"
 msgstr "درباره افزونه صدای دوگانه برای NVDA"
 
 #: D:\~Work\github\dual_voice\addon\globalPlugins\dual_voice_globalPlugin\dialogs.py:21

addon/synthDrivers/_dual_sapi5.py

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-#A part of Dual Voice for NVDA
-#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
-#https://mahmood-taghavi.github.io/dual_voice/
-#This file is covered by the GNU General Public License version 3.
-#See the file COPYING for more details.
+# A part of Dual Voice for NVDA
+# Copyright (C) 2015-2021 Seyed Mahmood Taghavi Shahri
+# https://mahmood-taghavi.github.io/dual_voice/
+# This file is covered by the GNU General Public License version 3.
+# See the file COPYING for more details.
 
 #import config
 from synthDrivers import _realtime

addon/synthDrivers/_dualvoice.py

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-#A part of Dual Voice for NVDA
-#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
-#https://mahmood-taghavi.github.io/dual_voice/
-#This file is covered by the GNU General Public License version 3.
-#See the file COPYING for more details.
+# A part of Dual Voice for NVDA
+# Copyright (C) 2015-2021 Seyed Mahmood Taghavi Shahri
+# https://mahmood-taghavi.github.io/dual_voice/
+# This file is covered by the GNU General Public License version 3.
+# See the file COPYING for more details.
 
 def charactertype(character):
     character.encode('utf-8')

addon/synthDrivers/_realtime.py

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-#A part of Dual Voice for NVDA
-#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
-#https://mahmood-taghavi.github.io/dual_voice/
-#This file is covered by the GNU General Public License version 3.
-#See the file COPYING for more details.
+# A part of Dual Voice for NVDA
+# Copyright (C) 2015-2021 Seyed Mahmood Taghavi Shahri
+# https://mahmood-taghavi.github.io/dual_voice/
+# This file is covered by the GNU General Public License version 3.
+# See the file COPYING for more details.
 
 typingArea = ''
 list_VoiceAttribName = []