Merge eb4fc3a into 1392aa3

Author: josephsl

source/NVDAObjects/UIA/__init__.py

@@ -1,7 +1,7 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2009-2020 NV Access Limited, Joseph Lee, Mohammad Suliman,
+# Copyright (C) 2009-2021 NV Access Limited, Joseph Lee, Mohammad Suliman,
 # Babbage B.V., Leonard de Ruijter, Bill Dengler
 
 """Support for UI Automation (UIA) controls."""
@@ -1722,12 +1722,21 @@ def event_UIA_systemAlert(self):
 	def event_UIA_notification(self, notificationKind=None, notificationProcessing=UIAHandler.NotificationProcessing_CurrentThenMostRecent, displayString=None, activityId=None):
 		"""
 		Introduced in Windows 10 Fall Creators Update (build 16299).
-		This base implementation announces all notifications from the UIA element.
+		This base implementation announces all notifications from the UIA element if enabled from NVDA.
 		Unlike other events, the text to be announced is not the name of the object, and parameters control how the incoming notification should be processed.
 		Subclasses can override this event and can react to notification processing instructions.
 		"""
 		# Do not announce notifications from background apps.
-		if self.appModule != api.getFocusObject().appModule:
+		# #10956: ignore this altogether if NVDA should not handle this event
+		# either always or from background apps.
+		appNotificationsFromAllApps = config.conf['presentation']["appNotificationsFromAllApps"]
+		if (
+			not config.conf['presentation']['reportAppNotifications']
+			or (
+				appNotificationsFromAllApps == "focusedApp"
+				and self.appModule != api.getFocusObject().appModule
+			)
+		):
 			return
 		if displayString:
 			if notificationProcessing in (UIAHandler.NotificationProcessing_ImportantMostRecent, UIAHandler.NotificationProcessing_MostRecent):

source/config/configSpec.py

@@ -87,6 +87,8 @@
 		guessObjectPositionInformationWhenUnavailable = boolean(default=false)
 		reportTooltips = boolean(default=false)
 		reportHelpBalloons = boolean(default=true)
+		reportAppNotifications = boolean(default=true)
+		appNotificationsFromAllApps = option("always", "focusedApp", default="focusedApp")
 		reportObjectDescriptions = boolean(default=True)
 		reportDynamicContentChanges = boolean(default=True)
 		reportAutoSuggestionsWithSound = boolean(default=True)

source/gui/settingsDialogs.py

@@ -1882,6 +1882,14 @@ class ObjectPresentationPanel(SettingsPanel):
 		# See Progress bar output in the Object Presentation Settings section of the User Guide.
 		("both", _("Speak and beep")),
 	)
+	appNotificationLabels = (
+		# Translators: one of the app notification choices
+		# to always announce notifications.
+		("always", pgettext("app notification", "all apps")),
+		# Translators: one of the app notification choices
+		# to announce notifications from focused app.
+		("focusedApp", pgettext("app notification", "foreground app")),
+	)
 
 	def makeSettings(self, settingsSizer):
 		sHelper = guiHelper.BoxSizerHelper(self, sizer=settingsSizer)
@@ -1892,12 +1900,47 @@ def makeSettings(self, settingsSizer):
 		self.bindHelpEvent("ObjectPresentationReportToolTips", self.tooltipCheckBox)
 		self.tooltipCheckBox.SetValue(config.conf["presentation"]["reportTooltips"])
 
-		# Translators: This is the label for a checkbox in the
+		# Translators: This is the label for a checkable list in the
 		# object presentation settings panel.
-		balloonText = _("Report &notifications")
-		self.balloonCheckBox=sHelper.addItem(wx.CheckBox(self,label=balloonText))
-		self.bindHelpEvent("ObjectPresentationReportNotifications", self.balloonCheckBox)
-		self.balloonCheckBox.SetValue(config.conf["presentation"]["reportHelpBalloons"])
+		notificationsText = _("Report &notifications")
+		self.reportNotificationChoices = [
+			# Translators: This is the label for a notification setting in
+			# report notifications list.
+			_("help balloons and toasts"),
+			# Translators: This is the label for a notification setting in
+			# report notifications list.
+			_("app notifications")
+		]
+		self.notificationsList = sHelper.addLabeledControl(
+			notificationsText,
+			nvdaControls.CustomCheckListBox,
+			choices=self.reportNotificationChoices
+		)
+		notificationSettings = ("reportHelpBalloons", "reportAppNotifications")
+		self.notificationsList.CheckedItems = [
+			notificationSettings.index(setting) for setting in notificationSettings
+			if config.conf["presentation"][setting]
+		]
+		# Enable/disable app notification list if app notifications checkbox is checked/unchecked.
+		self.Bind(wx.EVT_CHECKLISTBOX, self.onNotificationToggle)
+		self.bindHelpEvent("ObjectPresentationReportNotifications", self.notificationsList)
+		self.notificationsList.Select(0)
+
+		# Translators: This is the label for a combo box in the
+		# object presentation settings panel.
+		appNotificationText = _("Report &app notifications:")
+		notificationChoices = [label for setting, label in self.appNotificationLabels]
+		self.appNotificationList = sHelper.addLabeledControl(
+			appNotificationText, wx.Choice, choices=notificationChoices
+		)
+		self.bindHelpEvent("ObjectPresentationAppNotifications", self.appNotificationList)
+		notificationSettings = [setting for setting, label in self.appNotificationLabels]
+		try:
+			selection = notificationSettings.index(config.conf["presentation"]["appNotificationsFromAllApps"])
+		except ValueError:
+			selection = 0
+		self.appNotificationList.SetSelection(selection)
+		self.appNotificationList.Enable(config.conf["presentation"]["reportAppNotifications"])
 
 		# Translators: This is the label for a checkbox in the
 		# object presentation settings panel.
@@ -1970,9 +2013,21 @@ def makeSettings(self, settingsSizer):
 		)
 		self.autoSuggestionSoundsCheckBox.SetValue(config.conf["presentation"]["reportAutoSuggestionsWithSound"])
 
+	def onNotificationToggle(self, evt):
+		appNotifications = 1
+		self.appNotificationList.Enable(
+			self.notificationsList.IsChecked(appNotifications)
+		)
+
 	def onSave(self):
 		config.conf["presentation"]["reportTooltips"]=self.tooltipCheckBox.IsChecked()
-		config.conf["presentation"]["reportHelpBalloons"]=self.balloonCheckBox.IsChecked()
+		helpBalloonNotifications = 0
+		config.conf["presentation"]["reportHelpBalloons"] = self.notificationsList.IsChecked(helpBalloonNotifications)
+		appNotifications = 1
+		config.conf["presentation"]["reportAppNotifications"] = self.notificationsList.IsChecked(appNotifications)
+		config.conf["presentation"]["appNotificationsFromAllApps"] = (
+			self.appNotificationLabels[self.appNotificationList.GetSelection()][0]
+		)
 		config.conf["presentation"]["reportKeyboardShortcuts"]=self.shortcutCheckBox.IsChecked()
 		config.conf["presentation"]["reportObjectPositionInformation"]=self.positionInfoCheckBox.IsChecked()
 		config.conf["presentation"]["guessObjectPositionInformationWhenUnavailable"]=self.guessPositionInfoCheckBox.IsChecked()

user_docs/en/userGuide.t2t

@@ -1579,9 +1579,26 @@ A checkbox that when checked tells NVDA to report tooltips as they appear.
 Many Windows and controls show a small message (or tooltip) when you move the mouse pointer over them, or sometimes when you move the focus to them.
 
 ==== Report notifications ====[ObjectPresentationReportNotifications]
-This checkbox, when checked, tells NVDA to report help balloons and toast notifications as they appear.
-- Help Balloons are like tooltips, but are usually larger in size, and are associated with system events such as a network cable being unplugged, or perhaps to alert you about Windows security issues.
-- Toast notifications have been introduced in Windows 10 and appear in the notification centre in the system tray, informing about several events (i.e. if an update has been downloaded, a new e-mail arrived in your inbox, etc.).
+Checkboxes in this setting allows you to configure which notifications will be announced.
+Notifications can include:
+- Help balloons and toasts:
+ - Help Balloons are like tooltips, but are usually larger in size, and are associated with system events such as a network cable being unplugged, or perhaps to alert you about Windows security issues.
+ - Toast notifications were introduced in Windows 8 and appear in the notification centre in the system tray, informing about several events (i.e. if an update has been downloaded, a new e-mail arrived in your inbox, etc.).
+- Apps: notifications from apps such as page load status in web browsers.
+ - In Windows 10 Fall creators update (version 1709) or later, app notifications can include UIA accessible event notifications from apps such as Microsoft Edge, microsoft Store, and audio volume changes.
+ -
+-
+
+==== Report app notifications ====[ObjectPresentationAppNotifications]
+If app notifications is enabled in [report notifications #ObjectPresentationReportNotifications], this combo box sets which app notifications should be announced.
+
+A special type of app notifications is UIA accessible event notifications, introduced in Windows 10 Fall Creators Update.
+Accessible event notifications are used by apps to let assistive technologies such as NVDA announce important information.
+These announcements include update check results from Microsoft Store, page load status in Microsoft Edge, and audio volume changes while focused on File Explorer.
+
+The available options are:
+- All apps: announce notifications from all apps, including background notifications.
+- Foreground app: announce notifications from the app you are using.
 -
 
 ==== Report Object Shortcut Keys ====[ObjectPresentationShortcutKeys]