3 new commits in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/39b1517fec2d/
Changeset: 39b1517fec2d
Branch: None
User: josephsl
Date: 2015-11-11 17:15:57+00:00
Summary: 5.6: In Studio 5.1x, NVDA will no longer say 'not selected' when a
track is playing.
Affected #: 1 file
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index b9d6fdf..449c885 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -201,6 +201,11 @@ class SPLTrackItem(IAccessible):
class SPL510TrackItem(SPLTrackItem):
""" Track item for Studio 5.10 and later."""
+ def event_stateChange(self):
+ # Why is it that NVDA keeps announcing "not selected" when
track items are scrolled?
+ if 4 not in self.states:
+ pass
+
def script_select(self, gesture):
gesture.send()
speech.speakMessage(self.name)
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/132312870b69/
Changeset: 132312870b69
Branch: None
User: josephsl
Date: 2015-11-11 18:31:48+00:00
Summary: 5.6: NVDA-specific hack to announce playing track automatically.
According to Brian Hartgen (JAWS script writer), auto scroll in studio might be
broken (subsequently confirmed). Thus NVDA will now announce currently playing
track automatically (a hack). Once this is fixed in Studio, this hack will be
modified to operate only when Studio is not in focus.
This is a critical issue for 5.x and 6.0.
Affected #: 2 files
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index 449c885..1fe958b 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -399,13 +399,18 @@ class AppModule(appModuleHandler.AppModule):
if (obj.name ==
"00:{0:02d}".format(splconfig.SPLConfig["EndOfTrackTime"])
and
splconfig.SPLConfig["SayEndOfTrack"]):
tones.beep(440, 200)
- if obj.simplePrevious.name == "Remaining Song
Ramp":
+ elif obj.simplePrevious.name == "Remaining Song
Ramp":
# Song intro for SPL 5.x.
if splconfig.SPLConfig["BrailleTimer"]
in ("intro", "both") and api.getForegroundObject().processID == self.processID:
#and "00:00" < obj.name <= self.SPLSongRampTime:
braille.handler.message(obj.name)
if (obj.name ==
"00:{0:02d}".format(splconfig.SPLConfig["SongRampTime"])
and splconfig.SPLConfig["SaySongRamp"]):
tones.beep(512, 400)
+ # Hack: auto scroll in Studio itself might be
broken (according to Brian Hartgen), so force NVDA to announce currently
playing track automatically if checked.
+ if splconfig.SPLConfig["SayPlayingTrackName"]:
+ statusBar =
obj.parent.parent.parent.previous.previous.previous
+ if statusBar is not None and
statusBar.firstChild is not None and statusBar.firstChild.role == 27:
+ ui.message(obj.name)
nextHandler()
# JL's additions
diff --git a/addon/appModules/splstudio/splconfig.py
b/addon/appModules/splstudio/splconfig.py
index 1bc799d..2f27a2b 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -29,6 +29,7 @@ TrackDial = boolean(default=false)
SayScheduledFor = boolean(default=true)
SayListenerCount = boolean(default=true)
SayPlayingCartName = boolean(default=true)
+SayPlayingTrackName = boolean(default=true)
"""), encoding="UTF-8", list_values=False)
confspec.newlines = "\r\n"
SPLConfig = None
@@ -216,6 +217,11 @@ class SPLConfigDialog(gui.SettingsDialog):
self.cartNameCheckbox.SetValue(SPLConfig["SayPlayingCartName"])
settingsSizer.Add(self.cartNameCheckbox,
border=10,flag=wx.BOTTOM)
+ # Translators: the label for a setting in SPL add-on settings
to announce currently playing track name.
+
self.playingTrackNameCheckbox=wx.CheckBox(self,wx.NewId(),label=_("Announce
name of the currently playing &track automatically"))
+
self.playingTrackNameCheckbox.SetValue(SPLConfig["SayPlayingTrackName"])
+ settingsSizer.Add(self.playingTrackNameCheckbox,
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)
@@ -247,6 +253,7 @@ class SPLConfigDialog(gui.SettingsDialog):
SPLConfig["SayScheduledFor"] = self.scheduledForCheckbox.Value
SPLConfig["SayListenerCount"] = self.listenerCountCheckbox.Value
SPLConfig["SayPlayingCartName"] = self.cartNameCheckbox.Value
+ SPLConfig["SayPlayingTrackName"] =
self.playingTrackNameCheckbox.Value
global _configDialogOpened
_configDialogOpened = False
super(SPLConfigDialog, self).onOk(evt)
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/eceec3ea65db/
Changeset: eceec3ea65db
Branch: master
User: josephsl
Date: 2015-11-11 18:36:49+00:00
Summary: Merged hack from stable.
Affected #: 2 files
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index 5737e6b..f32b4ef 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -240,6 +240,11 @@ class SPLTrackItem(IAccessible):
class SPL510TrackItem(SPLTrackItem):
"""Track item for Studio 5.10 and later."""
+ def event_stateChange(self):
+ # Why is it that NVDA keeps announcing "not selected" when
track items are scrolled?
+ if 4 not in self.states:
+ pass
+
def script_select(self, gesture):
gesture.send()
speech.speakMessage(self.name)
@@ -443,6 +448,11 @@ class AppModule(appModuleHandler.AppModule):
if (obj.name ==
"00:{0:02d}".format(splconfig.SPLConfig["SongRampTime"])
and splconfig.SPLConfig["SaySongRamp"]):
self.alarmAnnounce(obj.name,
512, 400, intro=True)
+ # Hack: auto scroll in Studio itself might be
broken (according to Brian Hartgen), so force NVDA to announce currently
playing track automatically if checked.
+ if splconfig.SPLConfig["SayPlayingTrackName"]:
+ statusBar =
obj.parent.parent.parent.previous.previous.previous
+ if statusBar is not None and
statusBar.firstChild is not None and statusBar.firstChild.role == 27:
+ ui.message(obj.name)
nextHandler()
# JL's additions
diff --git a/addon/appModules/splstudio/splconfig.py
b/addon/appModules/splstudio/splconfig.py
index 272e52e..3e19611 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -42,6 +42,7 @@ IncludedColumns =
string_list(default=list("Artist","Title","Duration","Intro","
SayScheduledFor = boolean(default=true)
SayListenerCount = boolean(default=true)
SayPlayingCartName = boolean(default=true)
+SayPlayingTrackName = boolean(default=true)
SPLConPassthrough = boolean(default=false)
CompatibilityLayer = option("off", "jfw", default="off")
"""), encoding="UTF-8", list_values=False)
@@ -593,6 +594,11 @@ class SPLConfigDialog(gui.SettingsDialog):
self.cartNameCheckbox.SetValue(SPLConfig["SayPlayingCartName"])
settingsSizer.Add(self.cartNameCheckbox,
border=10,flag=wx.BOTTOM)
+ # Translators: the label for a setting in SPL add-on settings
to announce currently playing track name.
+
self.playingTrackNameCheckbox=wx.CheckBox(self,wx.NewId(),label=_("Announce
name of the currently playing &track automatically"))
+
self.playingTrackNameCheckbox.SetValue(SPLConfig["SayPlayingTrackName"])
+ settingsSizer.Add(self.playingTrackNameCheckbox,
border=10,flag=wx.BOTTOM)
+
# Translators: The label of a button to open advanced options
such as using SPL Controller command to invoke Assistant layer.
item = advancedOptButton = wx.Button(self, label=_("&Advanced
options..."))
item.Bind(wx.EVT_BUTTON, self.onAdvancedOptions)
@@ -635,6 +641,7 @@ class SPLConfigDialog(gui.SettingsDialog):
SPLConfig["SayScheduledFor"] = self.scheduledForCheckbox.Value
SPLConfig["SayListenerCount"] = self.listenerCountCheckbox.Value
SPLConfig["SayPlayingCartName"] = self.cartNameCheckbox.Value
+ SPLConfig["SayPlayingTrackName"] =
self.playingTrackNameCheckbox.Value
SPLConfig["SPLConPassthrough"] = self.splConPassthrough
SPLConfig["CompatibilityLayer"] = self.compLayer
SPLActiveProfile = SPLConfig.name
@@ -643,6 +650,7 @@ class SPLConfigDialog(gui.SettingsDialog):
# It also causes NVDA to display wrong label for switch button.
if self.switchProfile is None:
SPLPrevProfile = None
+ global _configDialogOpened
_configDialogOpened = False
super(SPLConfigDialog, self).onOk(evt)
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.
