Merge ace6811 into 4840e5f

jakubl7545 · web-flow · commit 2335315a8a34 · 2020-10-15T05:48:25.000+10:00
diff --git a/source/browseMode.py b/source/browseMode.py
@@ -23,7 +23,7 @@
 import gui
 import ui
 import cursorManager
-from scriptHandler import isScriptWaiting, willSayAllResume
+from scriptHandler import script, isScriptWaiting, willSayAllResume
 import aria
 import controlTypes
 from controlTypes import OutputReason
@@ -1844,3 +1844,14 @@ def _iterNotLinkBlock(self, direction="next", pos=None):
 		"kb:shift+,": "moveToStartOfContainer",
 		"kb:,": "movePastEndOfContainer",
 	}
+
+	@script(
+		description=_(
+			# Translators: the description for the toggleScreenLayout script.
+			"Toggles on and off if the screen layout is preserved while rendering the document content"
+		),
+		gesture="kb:NVDA+v",
+	)
+	def script_toggleScreenLayout(self, gesture):
+		# Translators: The message reported for not supported toggling of screen layout
+		ui.message(_("Not supported in this document."))
diff --git a/source/virtualBuffers/__init__.py b/source/virtualBuffers/__init__.py
@@ -15,8 +15,8 @@
 import review
 import NVDAHelper
 import XMLFormatting
+from scriptHandler import script, isScriptWaiting, willSayAllResume
 import scriptHandler
-from scriptHandler import isScriptWaiting, willSayAllResume
 import speech
 import NVDAObjects
 import api
@@ -539,6 +539,13 @@ def script_refreshBuffer(self,gesture):
 	# Translators: the description for the refreshBuffer script on virtualBuffers.
 	script_refreshBuffer.__doc__ = _("Refreshes the document content")
 
+	@script(
+		description=_(
+			# Translators: the description for the toggleScreenLayout script on virtualBuffers.
+			"Toggles on and off if the screen layout is preserved while rendering the document content"
+		),
+		gesture="kb:NVDA+v",
+	)
 	def script_toggleScreenLayout(self,gesture):
 		config.conf["virtualBuffers"]["useScreenLayout"]=not config.conf["virtualBuffers"]["useScreenLayout"]
 		if config.conf["virtualBuffers"]["useScreenLayout"]:
@@ -547,8 +554,6 @@ def script_toggleScreenLayout(self,gesture):
 		else:
 			# Translators: Presented when use screen layout option is toggled.
 			ui.message(_("Use screen layout off"))
-	# Translators: the description for the toggleScreenLayout script on virtualBuffers.
-	script_toggleScreenLayout.__doc__ = _("Toggles on and off if the screen layout is preserved while rendering the document content")
 
 	def _searchableAttributesForNodeType(self,nodeType):
 		pass
