1 new commit in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/f08bbee9da53/
Changeset: f08bbee9da53
Branch: master
User: josephsl
Date: 2015-07-18 17:38:46+00:00
Summary: Squashed commit of the following:
commit 4d4f36da3a9168bfe34f438760d44684d1b54e4f
Author: Joseph Lee <joseph.lee22590@xxxxxxxxx>
Date: Sat Jul 18 10:36:07 2015 -0700
5.2: Prevent add-on settings dialog from being shown when ana alarm dialog
is opened and attempting to open the add-on dialog from NvDA menu.
From now on, the settings dialog event will make sure that alarm dialog is
closed before opening the settings dialog. This patches an issue where one may8
see the settings dialog when an alarm dialog is open and attempts to open the
add-on settings dialog via NVDA menu.
Affected #: 2 files
diff --git a/addon/appModules/splstudio/__init__.py
b/addon/appModules/splstudio/__init__.py
index 1dec9c4..690b391 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 8e6cc7b..615b52b 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -505,7 +505,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.
