1 new commit in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/dca6441f3c7d/
Changeset: dca6441f3c7d
Branch: 6.0/instantProfileSwitching
User: josephsl
Date: 2015-07-18 17:56:42+00:00
Summary: Merged master with add-on settings fixes
Affected #: 2 files
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index 3c554f3..b461515 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -685,11 +685,7 @@ class AppModule(appModuleHandler.AppModule):
# SPL Config management.
def script_openConfigDialog(self, gesture):
- # 5.2: Guard against alarm dialogs.
- if splconfig._alarmDialogOpened:
- # Translators: Presented when an alarm dialog is opened.
- wx.CallAfter(gui.messageBox, _("An alarm dialog is
already opened. Please close the alarm dialog first."), _("Error"),
wx.OK|wx.ICON_ERROR)
- else: wx.CallAfter(splconfig.onConfigDialog, None)
+ wx.CallAfter(splconfig.onConfigDialog, None)
# Translators: Input help mode message for a command in Station
Playlist Studio.
script_openConfigDialog.__doc__=_("Opens SPL Studio add-on
configuration dialog.")
diff --git a/addon/appModules/splstudio/splconfig.py
b/addon/appModules/splstudio/splconfig.py
index 7445a9d..93815e2 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -562,7 +562,11 @@ class SPLConfigDialog(gui.SettingsDialog):
# Open the above dialog upon request.
def onConfigDialog(evt):
- gui.mainFrame._popupSettingsDialog(SPLConfigDialog)
+ # 5.2: Guard against alarm dialogs.
+ if _alarmDialogOpened:
+ # Translators: Presented when an alarm dialog is opened.
+ wx.CallAfter(gui.messageBox, _("An alarm dialog is already
opened. Please close the alarm dialog first."), _("Error"), wx.OK|wx.ICON_ERROR)
+ else: gui.mainFrame._popupSettingsDialog(SPLConfigDialog)
# Helper dialogs for add-on settings dialog.
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.
