2 new commits in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/ebd716b05f3a/
Changeset: ebd716b05f3a
Branch: None
User: josephsl
Date: 2016-05-18 22:09:27+00:00
Summary: Merge branches '7.x' and 'lts'
Affected #: 3 files
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index 7e60cfb..d23908c 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -1871,14 +1871,17 @@ class AppModule(appModuleHandler.AppModule):
"ts(SPL):2finger_flickUp":"sayBroadcasterTime",
"kb:control+nvda+1":"toggleBeepAnnounce",
"kb:control+nvda+2":"setEndOfTrackTime",
+ "kb:alt+nvda+1":"setEndOfTrackTime",
"ts(SPL):2finger_flickRight":"setEndOfTrackTime",
"kb:alt+nvda+2":"setSongRampTime",
"ts(SPL):2finger_flickLeft":"setSongRampTime",
"kb:control+nvda+4":"setMicAlarm",
+ "kb:alt+nvda+4":"setMicAlarm",
"kb:control+nvda+f":"findTrack",
"kb:nvda+f3":"findTrackNext",
"kb:shift+nvda+f3":"findTrackPrevious",
"kb:control+nvda+3":"toggleCartExplorer",
+ "kb:alt+nvda+3":"toggleCartExplorer",
"kb:alt+nvda+r":"setLibraryScanProgress",
"kb:control+shift+r":"startScanFromInsertTracks",
"kb:control+shift+x":"setBrailleTimer",
diff --git a/addon/appModules/tracktool.py b/addon/appModules/tracktool.py
index 011c62d..f3aa53c 100755
--- a/addon/appModules/tracktool.py
+++ b/addon/appModules/tracktool.py
@@ -110,6 +110,8 @@ class TrackToolItem(IAccessible):
__gestures={
#"kb:control+`":"toggleTrackDial",
+ "kb:control+alt+rightArrow":"nextColumn",
+ "kb:control+alt+leftArrow":"prevColumn",
}
diff --git a/readme.md b/readme.md
index 8403cf1..137e7f1 100755
--- a/readme.md
+++ b/readme.md
@@ -16,16 +16,16 @@ IMPORTANT: This add-on requires NVDA 2015.3 or later and
StationPlaylist Studio
* Control+Alt+T (two finger flick down in SPL touch mode) from Studio window:
announce remaining time for the currently playing trakc.
* NVDA+Shift+F12 (two finger flick up in SPL touch mode) from Studio window:
announces broadcaster time such as 5 minutes to top of the hour.
* Control+NVDA+1 from Studio window: toggles announcement of status messages
(such as automation and end of library scan) between words and beeps.
-* Control+NVDA+2 (two finger flick right in SPL mode) from Studio window:
Opens end of track setting dialog.
+* Alt+NVDA+1 (two finger flick right in SPL mode) from Studio window: Opens
end of track setting dialog.
* Alt+NVDA+2 (two finger flick left in SPL mode) from Studio window: Opens
song intro alarm setting dialog.
-* Control+NVDA+3 from Studio window: Toggles cart explorer to learn cart
assignments.
-* Control+NVDA+4 from Studio window: Opens microphone alarm dialog.
+* Alt+NVDA+3 from Studio window: Toggles cart explorer to learn cart
assignments.
+* Alt+NVDA+4 from Studio window: Opens microphone alarm dialog.
* Control+NVDA+f from Studio window: Opens a dialog to find a track based on
artist or song name. Press NvDA+F3 to find forward or NVDA+Shift+F3 to find
backward.
* Alt+NVDA+R from Studio window: Steps through library scan announcement
settings.
* Control+Shift+X from Studio window: Steps through braille timer settings.
* Control+Alt+right/left arrow (while focused on a track): Announce
next/previous track column.
* Alt+NVDA+C while focused on a track: announces track comments if any.
-* Control+NVDA+0 from Studio window: Opens the Studio add-on configuration
dialog.
+* Control+NVDA+0 or Alt+NVDA+0 from Studio window: Opens the Studio add-on
configuration dialog.
* Control+NVDA+- (hyphen) from Studio window: Send feedback to add-on
developer using the default email client.
* Alt+NVDA+F1: Open welcome dialog.
@@ -130,7 +130,7 @@ The available SPL Controller commands are:
## Track alarms
-By default, NvDA will play a beep if five seconds are left in the track
(outro) and/or intro. To configure this value as well as to enable or disable
them, press Control+NVDA+2 or Alt+NVDA+2 to open end of track and song ramp
dialogs, respectively. In addition, use Studio add-on settings dialog to
configure if you'll hear a beep, a message or both when alarms are turned on.
+By default, NvDA will play a beep if five seconds are left in the track
(outro) and/or intro. To configure this value as well as to enable or disable
them, press Alt+NVDA+1 or Alt+NVDA+2 to open end of track and song ramp
dialogs, respectively. In addition, use Studio add-on settings dialog to
configure if you'll hear a beep, a message or both when alarms are turned on.
## Microphone alarm
@@ -146,7 +146,7 @@ Note: Track Finder is case-sensitive.
Depending on edition, SPL Studio allows up to 96 carts to be assigned for
playback. NVDA allows you to hear which cart, or jingle is assigned to these
commands.
-To learn cart assignments, from SPL Studio, press Control+NVDA+3. Pressing the
cart command once will tell you which jingle is assigned to the command.
Pressing the cart command twice will play the jingle. Press Control+NvDA+3 to
exit cart explorer. See the add-on guide for more information on cart explorer.
+To learn cart assignments, from SPL Studio, press Alt+NVDA+3. Pressing the
cart command once will tell you which jingle is assigned to the command.
Pressing the cart command twice will play the jingle. Press Alt+NvDA+3 to exit
cart explorer. See the add-on guide for more information on cart explorer.
## Track Dial
@@ -162,7 +162,7 @@ By pressing SPL Assistant, 1 through 0 (6 for Studio 5.01
and earlier), you can
## Configuration dialog
-From studio window, you can press Control+NVDA+0 to open the add-on
configuration dialog. Alternatively, go to NVDA's preferences menu and select
SPL Studio Settings item. This dialog is also used to manage broadcast profiles.
+From studio window, you can press Control+NVDA+0 or Alt+NVDA+0 to open the
add-on configuration dialog. Alternatively, go to NVDA's preferences menu and
select SPL Studio Settings item. This dialog is also used to manage broadcast
profiles.
## SPL touch mode
@@ -173,6 +173,8 @@ If you are using Studio on a touchscreen computer running
Windows 8 or later and
Version 8.0 supports SPL Studio 5.10 and later, with 7.x designed to provide
some new features from 8.0 for users using earlier versions of Studio.
* Added a welcome dialog that launches when Studio starts after installing the
add-on. A command (Alt+NvDA+F1) has been added to reopen this dialog once
dismissed.
+* Changes to various add-on commands, including removal of status announcement
toggle (Control+NvDA+1), reassigned end of track alarm to Alt+NVDA+1, Cart
Explorer toggle is now Alt+NvDA+3, microphone alarm dialog is Alt+NVDA+4 and
add-on/encoder settings dialog is Alt+NvDA+0. This was done to allow
Control+NVDA+number row to be assigned to Columns Explorer in 8.0 and later.
+* 8.0: Relaxed Columns Explorer restriction in place in 7.x so numbers 1
through 6 can be configured to announce Studio 5.1x columns.
* Added a setting in add-on settings dialog to let NVDA notify you if you've
reached top or bottom of playlist viewer.
* You can now add, view, change or delete track comments (notes). Press
Alt+NVDA+C from a track in the playlist viewer to hear track comments if
defined, press twice to copy comment to clipboard or three times to open a
dialog to edit comments.
* Added ability to notify if a track comment exists, as well as a setting in
add-on settings to control how this should be done.
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/74e49e3fce11/
Changeset: 74e49e3fce11
Branch: staging
User: josephsl
Date: 2016-05-21 18:50:07+00:00
Summary: Merged master and flexible reset branches
Affected #: 2 files
diff --git a/addon/appModules/splstudio/splconfui.py
b/addon/appModules/splstudio/splconfui.py
index 221ed1f..fcbded8 100755
--- a/addon/appModules/splstudio/splconfui.py
+++ b/addon/appModules/splstudio/splconfui.py
@@ -336,9 +336,9 @@ class SPLConfigDialog(gui.SettingsDialog):
settingsSizer.Add(item)
# 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)
- settingsSizer.Add(self.resetConfigButton)
+ item = resetButton = wx.Button(self, label=_("Reset
settings..."))
+ item.Bind(wx.EVT_BUTTON,self.onResetConfig)
+ settingsSizer.Add(item)
def postInit(self):
global _configDialogOpened
@@ -648,33 +648,8 @@ class SPLConfigDialog(gui.SettingsDialog):
# Reset settings to defaults.
# This affects the currently selected profile.
def onResetConfig(self, evt):
- if gui.messageBox(
- # Translators: A message to warn about resetting SPL config
settings to factory defaults.
- _("Are you sure you wish to reset SPL add-on settings to
defaults?"),
- # Translators: The title of the warning dialog.
- _("Warning"),wx.YES_NO|wx.NO_DEFAULT|wx.ICON_WARNING,self
- )!=wx.YES:
- return
- import threading, sys, globalVars
- # Reset all profiles.
- # LTS: Only a priveleged thread should do this, otherwise
unexpected things may happen.
- # Save some flags from death.
- with threading.Lock() as resetting:
- global _configDialogOpened
- splconfig.resetAllConfig()
- splconfig.SPLConfig = dict(splconfig._SPLDefaults7)
- splconfig.SPLConfig["ActiveIndex"] = 0
- splconfig.SPLActiveProfile =
splconfig.SPLConfigPool[0].name
- if splconfig.SPLSwitchProfile is not None:
- splconfig.SPLSwitchProfile = None
- splconfig.SPLPrevProfile = None
- if
os.path.exists(os.path.join(globalVars.appArgs.configPath,
"splStreamLabels.ini")):
-
os.remove(os.path.join(globalVars.appArgs.configPath, "splStreamLabels.ini"))
- if "globalPlugins.SPLStudioUtils.encoders" in
sys.modules:
- import globalPlugins.SPLStudioUtils.encoders
- globalPlugins.SPLStudioUtils.encoders.cleanup()
- _configDialogOpened = False
- self.Destroy()
+ self.Disable()
+ ResetDialog(self).Show()
# Open the above dialog upon request.
@@ -1341,3 +1316,80 @@ class AdvancedOptionsDialog(wx.Dialog):
self.Parent.Enable()
self.Destroy()
+# A dialog to reset add-on config including encoder settings and others.
+class ResetDialog(wx.Dialog):
+
+ def __init__(self, parent):
+ # Translators: Title of the dialog to reset various add-on
settings.
+ super(ResetDialog, self).__init__(parent, title=_("Reset
settings"))
+
+ mainSizer = wx.BoxSizer(wx.VERTICAL)
+
+ # Translators: the label for resetting profile triggers.
+
self.resetInstantProfileCheckbox=wx.CheckBox(self,wx.NewId(),label=_("Reset
instant switch profile"))
+ self.resetInstantProfileCheckbox.SetValue(False)
+ mainSizer.Add(self.resetInstantProfileCheckbox,
border=10,flag=wx.BOTTOM)
+
+ # Translators: the label for resetting profile triggers.
+
self.resetTimeProfileCheckbox=wx.CheckBox(self,wx.NewId(),label=_("Delete
time-based profile database"))
+ self.resetTimeProfileCheckbox.SetValue(False)
+ mainSizer.Add(self.resetTimeProfileCheckbox,
border=10,flag=wx.BOTTOM)
+
+ # Translators: the label for resetting encoder
settings.
+
self.resetEncodersCheckbox=wx.CheckBox(self,wx.NewId(),label=_("Remove encoder
settings"))
+ self.resetEncodersCheckbox.SetValue(False)
+ mainSizer.Add(self.resetEncodersCheckbox,
border=10,flag=wx.BOTTOM)
+
+ # Translators: the label for resetting track comments.
+
self.resetTrackCommentsCheckbox=wx.CheckBox(self,wx.NewId(),label=_("Erase
track comments"))
+ self.resetTrackCommentsCheckbox.SetValue(False)
+ mainSizer.Add(self.resetTrackCommentsCheckbox,
border=10,flag=wx.BOTTOM)
+
+ mainSizer.Add(self.CreateButtonSizer(wx.OK | wx.CANCEL))
+ self.Bind(wx.EVT_BUTTON, self.onOk, id=wx.ID_OK)
+ self.Bind(wx.EVT_BUTTON, self.onCancel, id=wx.ID_CANCEL)
+ mainSizer.Fit(self)
+ self.Sizer = mainSizer
+ self.resetInstantProfileCheckbox.SetFocus()
+ self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+
+ def onOk(self, evt):
+ parent = self.Parent
+ if gui.messageBox(
+ # Translators: A message to warn about resetting SPL config
settings to factory defaults.
+ _("Are you sure you wish to reset SPL add-on settings to
defaults?"),
+ # Translators: The title of the warning dialog.
+ _("Warning"),wx.YES_NO|wx.NO_DEFAULT|wx.ICON_WARNING,self
+ )!=wx.YES:
+ parent.profiles.SetFocus()
+ parent.Enable()
+ self.Destroy()
+ return
+ import threading, sys, globalVars
+ # Reset all profiles.
+ # LTS: Only a priveleged thread should do this, otherwise
unexpected things may happen.
+ # Save some flags from death.
+ with threading.Lock() as resetting:
+ global _configDialogOpened
+ colRange = splconfig.SPLConfig["ColumnExpRange"]
+ splconfig.resetAllConfig()
+ splconfig.SPLConfig = dict(splconfig._SPLDefaults7)
+ splconfig.SPLConfig["ActiveIndex"] = 0
+ splconfig.SPLActiveProfile =
splconfig.SPLConfigPool[0].name
+ splconfig.SPLConfig["ColumnExpRange"] = colRange
+ if splconfig.SPLSwitchProfile is not None:
+ splconfig.SPLSwitchProfile = None
+ splconfig.SPLPrevProfile = None
+ if
os.path.exists(os.path.join(globalVars.appArgs.configPath,
"splStreamLabels.ini")):
+
os.remove(os.path.join(globalVars.appArgs.configPath, "splStreamLabels.ini"))
+ if "globalPlugins.SPLStudioUtils.encoders" in
sys.modules:
+ import globalPlugins.SPLStudioUtils.encoders
+ globalPlugins.SPLStudioUtils.encoders.cleanup()
+ _configDialogOpened = False
+ self.Destroy()
+ parent.Destroy()
+
+
+ def onCancel(self, evt):
+ self.Parent.Enable()
+ self.Destroy()
diff --git a/addon/appModules/tracktool.py b/addon/appModules/tracktool.py
index 011c62d..f3aa53c 100755
--- a/addon/appModules/tracktool.py
+++ b/addon/appModules/tracktool.py
@@ -110,6 +110,8 @@ class TrackToolItem(IAccessible):
__gestures={
#"kb:control+`":"toggleTrackDial",
+ "kb:control+alt+rightArrow":"nextColumn",
+ "kb:control+alt+leftArrow":"prevColumn",
}
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.
