2 new commits in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/ca5a83c9e532/
Changeset: ca5a83c9e532
Branch: None
User: josephsl
Date: 2015-06-06 05:19:20+00:00
Summary: 5.0: Few fixes and code cleanup.
Fixed an issue where wrong cart banks were read when broadcaster is not focused
on playlist viewer. When this happens, NVDA will prevent activation of cart
explorer.
In settings dialog, outro and intro checks will now be done by calling the
event functions to deduplicate code.
Just one more commit and SPL add-on 5.0 will be ready for public review
(release candidate)
Affected #: 2 files
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index 35de8e3..af5b771 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -249,7 +249,8 @@ class AppModule(appModuleHandler.AppModule):
super(AppModule, self).__init__(*args, **kwargs)
if self.SPLCurVersion < SPLMinVersion:
raise RuntimeError("Unsupported version of Studio is
running, exiting app module")
- ui.message("Using SPL Studio version
{SPLVersion}".format(SPLVersion = self.SPLCurVersion))
+ # Translators: The sign-on message for Studio app module.
+ ui.message(_("Using SPL Studio version
{SPLVersion}").format(SPLVersion = self.SPLCurVersion))
splconfig.initConfig()
# Announce status changes while using other programs.
# This requires NVDA core support and will be available in 6.0
and later (cannot be ported to earlier versions).
@@ -882,6 +883,13 @@ class AppModule(appModuleHandler.AppModule):
def script_toggleCartExplorer(self, gesture):
if not self.cartExplorer:
+ # Prevent cart explorer from being engaged outside of
playlist viewer.
+ # Todo for 6.0: Let users set cart banks.
+ fg = api.getForegroundObject()
+ if fg.windowClassName != "TStudioForm":
+ # Translators: Presented when cart explorer
cannot be entered.
+ ui.message(_("You are not in playlist viewer,
cannot enter cart explorer"))
+ return
cartsRead, cartCount = self.cartsReader()
if not cartsRead:
# Translators: presented when cart explorer
could not be switched on.
diff --git a/addon/appModules/splstudio/splconfig.py
b/addon/appModules/splstudio/splconfig.py
index 26b6415..01e3869 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -156,9 +156,7 @@ class SPLConfigDialog(gui.SettingsDialog):
self.endOfTrackAlarm = wx.SpinCtrl(self, wx.ID_ANY, min=1,
max=59)
self.endOfTrackAlarm.SetValue(long(SPLConfig["EndOfTrackTime"]))
self.outroSizer.Add(self.endOfTrackAlarm)
- if not self.outroCheckBox.IsChecked():
- self.outroSizer.Hide(self.outroAlarmLabel)
- self.outroSizer.Hide(self.endOfTrackAlarm)
+ self.onOutroCheck(None)
settingsSizer.Add(self.outroSizer, border=10, flag=wx.BOTTOM)
self.introSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -174,9 +172,7 @@ class SPLConfigDialog(gui.SettingsDialog):
self.songRampAlarm = wx.SpinCtrl(self, wx.ID_ANY, min=1, max=9)
self.songRampAlarm.SetValue(long(SPLConfig["SongRampTime"]))
self.introSizer.Add(self.songRampAlarm)
- if not self.introCheckBox.IsChecked():
- self.introSizer.Hide(self.introAlarmLabel)
- self.introSizer.Hide(self.songRampAlarm)
+ self.onIntroCheck(None)
settingsSizer.Add(self.introSizer, border=10, flag=wx.BOTTOM)
sizer = wx.BoxSizer(wx.HORIZONTAL)
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/206eb99fcdeb/
Changeset: 206eb99fcdeb
Branch: master
User: josephsl
Date: 2015-06-06 05:21:52+00:00
Summary: 5.0: Readme updates regarding cart explorer, add-on code is ready
for review
Affected #: 1 file
diff --git a/readme.md b/readme.md
index 8763242..c313286 100755
--- a/readme.md
+++ b/readme.md
@@ -142,6 +142,7 @@ If you are using Studio on a touchscreen computer running
Windows 8 or later and
* You can now assign custom commands to hear temperature information or to
announce title for the upcoming track if scheduled.
* Added a checkbox in end of track and song intro alarm dialogs to enable or
disable these alarms (check to enable). These can also be "configured" from
add-on settings.
* Fixed an issue where pressing alarm dialog or track finder commands while
another alarm or find dialog is opened would cause another instance of the
same dialog to appear. NVDA will pop up a message asking you to close the
previously opened dialog first.
+* Cart explorer changes and fixes, including exploring wrong cart banks when
user is not focused on playlist viewer. Cart explorer will now check to make
sure that you are in playlist viewer.
* Added ability to use SPL Controller layer command to invoke SPL Assistant
(experimental; consult the add-on guide on how to enable this).
* In encoder windows, NVDA's time and date announcement command (NVDA+F12 by
default) will announce time including seconds.
* You can now monitor individual encoders for connection status and for other
messages by pressing Control+F11 while the encoder you wish to monitor is
focused (works better when using SAM encoders).
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.
