2 new commits in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/d84e0eae3f19/
Changeset: d84e0eae3f19
Branch: None
User: josephsl
Date: 2015-06-26 02:27:37+00:00
Summary: 5.1: It is now possible to configure announcement of currently
playing cart.
Because of name change event mess, use a dedicated conditional for cart name
object. The whole announcement conditionals in name change event will be
refactored in add-on 6.0.
Affected #: 2 files
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index af5b771..5a6e623 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -353,8 +353,12 @@ class AppModule(appModuleHandler.AppModule):
elif "Listener" in obj.name and not
splconfig.SPLConfig["SayListenerCount"]:
nextHandler()
return
- elif not obj.name.endswith((" On", " Off")) or
(obj.name.startswith("Cart") and obj.IAccessibleChildID == 3):
+ elif obj.name.startswith("Cart") and
obj.IAccessibleChildID == 3 and not splconfig.SPLConfig["SayPlayingCartName"]:
+ nextHandler()
+ return
+ elif not obj.name.endswith((" On", " Off")):
# Announce status information that does
not contain toggle messages and return immediately.
+ # Optimize this in 6.0.
ui.message(obj.name)
return
elif splconfig.SPLConfig["BeepAnnounce"]:
diff --git a/addon/appModules/splstudio/splconfig.py
b/addon/appModules/splstudio/splconfig.py
index 01e3869..ebb75a2 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -28,6 +28,7 @@ LibraryScanAnnounce = option("off", "ending", "progress",
"numbers", default="of
TrackDial = boolean(default=false)
SayScheduledFor = boolean(default=true)
SayListenerCount = boolean(default=true)
+SayPlayingCartName = boolean(default=true)
"""), encoding="UTF-8", list_values=False)
confspec.newlines = "\r\n"
SPLConfig = None
@@ -241,6 +242,11 @@ class SPLConfigDialog(gui.SettingsDialog):
self.listenerCountCheckbox.SetValue(SPLConfig["SayListenerCount"])
sizer.Add(self.listenerCountCheckbox, border=10,flag=wx.BOTTOM)
+ # Translators: the label for a setting in SPL add-on settings
to announce currently playing cart.
+
self.cartNameCheckbox=wx.CheckBox(self,wx.NewId(),label=_("&Announce name of
the currently playing cart"))
+ self.cartNameCheckbox.SetValue(SPLConfig["SayPlayingCartName"])
+ sizer.Add(self.listenerCountCheckbox, border=10,flag=wx.BOTTOM)
+
# Translators: The label for a button in SPL add-on
configuration dialog to reset settings to defaults.
self.resetConfigButton = wx.Button(self, wx.ID_ANY,
label=_("Reset settings"))
self.resetConfigButton.Bind(wx.EVT_BUTTON,self.onResetConfig)
@@ -269,6 +275,7 @@ class SPLConfigDialog(gui.SettingsDialog):
SPLConfig["TrackDial"] = self.trackDialCheckbox.Value
SPLConfig["SayScheduledFor"] = self.scheduledForCheckbox.Value
SPLConfig["SayListenerCount"] = self.listenerCountCheckbox.Value
+ SPLConfig["SayPlayingCartName"] = self.cartNameCheckbox.Value
super(SPLConfigDialog, self).onOk(evt)
# Check events for outro and intro alarms, respectively.
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/7514aba79eca/
Changeset: 7514aba79eca
Branch: master
User: josephsl
Date: 2015-06-26 02:28:18+00:00
Summary: Merge branch '5.x'
Affected #: 2 files
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index 2edebf0..84f1b2e 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -353,8 +353,12 @@ class AppModule(appModuleHandler.AppModule):
elif "Listener" in obj.name and not
splconfig.SPLConfig["SayListenerCount"]:
nextHandler()
return
- elif not obj.name.endswith((" On", " Off")) or
(obj.name.startswith("Cart") and obj.IAccessibleChildID == 3):
+ elif obj.name.startswith("Cart") and
obj.IAccessibleChildID == 3 and not splconfig.SPLConfig["SayPlayingCartName"]:
+ nextHandler()
+ return
+ elif not obj.name.endswith((" On", " Off")):
# Announce status information that does
not contain toggle messages and return immediately.
+ # Optimize this in 6.0.
ui.message(obj.name)
return
elif splconfig.SPLConfig["BeepAnnounce"]:
diff --git a/addon/appModules/splstudio/splconfig.py
b/addon/appModules/splstudio/splconfig.py
index 01e3869..ebb75a2 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -28,6 +28,7 @@ LibraryScanAnnounce = option("off", "ending", "progress",
"numbers", default="of
TrackDial = boolean(default=false)
SayScheduledFor = boolean(default=true)
SayListenerCount = boolean(default=true)
+SayPlayingCartName = boolean(default=true)
"""), encoding="UTF-8", list_values=False)
confspec.newlines = "\r\n"
SPLConfig = None
@@ -241,6 +242,11 @@ class SPLConfigDialog(gui.SettingsDialog):
self.listenerCountCheckbox.SetValue(SPLConfig["SayListenerCount"])
sizer.Add(self.listenerCountCheckbox, border=10,flag=wx.BOTTOM)
+ # Translators: the label for a setting in SPL add-on settings
to announce currently playing cart.
+
self.cartNameCheckbox=wx.CheckBox(self,wx.NewId(),label=_("&Announce name of
the currently playing cart"))
+ self.cartNameCheckbox.SetValue(SPLConfig["SayPlayingCartName"])
+ sizer.Add(self.listenerCountCheckbox, border=10,flag=wx.BOTTOM)
+
# Translators: The label for a button in SPL add-on
configuration dialog to reset settings to defaults.
self.resetConfigButton = wx.Button(self, wx.ID_ANY,
label=_("Reset settings"))
self.resetConfigButton.Bind(wx.EVT_BUTTON,self.onResetConfig)
@@ -269,6 +275,7 @@ class SPLConfigDialog(gui.SettingsDialog):
SPLConfig["TrackDial"] = self.trackDialCheckbox.Value
SPLConfig["SayScheduledFor"] = self.scheduledForCheckbox.Value
SPLConfig["SayListenerCount"] = self.listenerCountCheckbox.Value
+ SPLConfig["SayPlayingCartName"] = self.cartNameCheckbox.Value
super(SPLConfigDialog, self).onOk(evt)
# Check events for outro and intro alarms, respectively.
Repository URL: https://bitbucket.org/nvdaaddonteam/stationplaylist/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
