Attempt to add screenreader once again

.gitignore

@@ -91,3 +91,7 @@ Modules/local
 
 # User configurations
 .qmlls.ini
+
+# Generated during build
+Desktop/modules/activemodules.h
+Tests/__pycache__/

Desktop/components/JASP/Widgets/AnalysisForms.qml

@@ -6,6 +6,10 @@ import JASP.Controls
 FocusScope
 {
 	id:				analysisFormsFocusScope
+
+	Accessible.role:	Accessible.Pane
+	Accessible.name:	qsTr("Analysis Forms")
+
 	implicitWidth:	analysesModel.visible ? jaspTheme.formWidth + 1 + (2 * formsBackground.border.width) + verticalScrollbar.visibleBreadth : 0
 
 	Behavior on width { enabled: preferencesModel.animationsOn; PropertyAnimation { duration: jaspTheme.fileMenuSlideDuration; easing.type: Easing.OutCubic  } }

Desktop/components/JASP/Widgets/ComputeColumnWindow.qml

@@ -110,6 +110,10 @@ FocusScope
 						textDocument:		computeColumnEdit.textDocument
 					}
 
+					Accessible.role:		Accessible.EditableText
+					Accessible.name:		qsTr("R code editor")
+					Accessible.description:	qsTr("Enter R code for the computed column")
+
 
 					anchors.top:			parent.top
 					anchors.left:			parent.left

Desktop/components/JASP/Widgets/CreateComputeColumnDialog.qml

@@ -8,6 +8,9 @@ Popup
 	id:			popupCreateComputedColumn;
 	modal:		true;
 
+	Accessible.role:		Accessible.Dialog
+	Accessible.name:		qsTr("Create computed column dialog")
+
 	y:			(parent.height / 2) - (height / 2)
 	x:			(parent.width / 2) - (width / 2)
 	width:		popupLoader.width
@@ -144,6 +147,10 @@ Popup
 							color:					columnNameInUse ? jaspTheme.red : jaspTheme.black
 							width:					Math.max(implicitWidth, nameBox.width)
 							selectByMouse:			true
+
+							Accessible.role:		Accessible.EditableText
+							Accessible.name:		qsTr("Computed column name")
+							Accessible.description:	qsTr("Enter a name for the new computed column")
 
 							ToolTip.visible:		columnNameInUse
 							ToolTip.text:			qsTr("Column name is already used, please choose a different one.")

Desktop/components/JASP/Widgets/CsvPreview.qml

@@ -31,6 +31,9 @@ Window
 	modality:               Qt.ApplicationModal
 	color:                  jaspTheme.white
 
+	Accessible.role:		Accessible.Window
+	Accessible.name:		title
+
 	property real windowPadding: 20 * jaspTheme.uiScale
 
 	onVisibleChanged:

Desktop/components/JASP/Widgets/CustomMenu.qml

@@ -26,7 +26,10 @@ FocusScope
 	id							: menu
 	width						: menuRectangle.width
 	height						: menuRectangle.height
-	visible						: showMe && (activeFocus || (hasSubMenus && customSubMenu.activeFocus))
+	visible						: showMe
+	Accessible.role				: Accessible.Menu
+	Accessible.name				: menuTitle
+	Accessible.ignored			: !showMe
 	x							: Math.min(sourcePos.x + realOffsetX, sceneWidth - (width  + 2) ) // Move the custom menu to the right if there is not enough space
 	y							: sourcePos.y + realOffsetY
 	property var	props		: undefined
@@ -44,11 +47,25 @@ FocusScope
 	property bool	menuMinIsMin: false // If set to true, this prevents the CustomMenu from going out of the scene by having a negative offset
 	property point	scrollOri	: "0,0" //Just for other qmls to use as a general storage of the origin of their scrolling
 	property bool	isSubMenu	: false
+	property string menuTitle	: "Analysis menu"
 
 	property int	currentIndex: -1
 
+	property bool _hadFocus: false
+
 	onSourceItemChanged: { menu.currentIndex = -1; }
 
+	onActiveFocusChanged:
+	{
+		if (activeFocus)
+			_hadFocus = true
+		else if (_hadFocus && showMe && !isSubMenu)
+		{
+			_hadFocus = false
+			closeMenu()
+		}
+	}
+
 	Connections
 	{
 		// As the sourcePos is calculated with the mapToItem function, there is no binding. So re-calculate the sourcePos each time the X or Y of the sourceItem changes.
@@ -103,6 +120,7 @@ FocusScope
 	{
 		hasIcons	= (menu.props === undefined || "undefined" === typeof(menu.props["hasIcons"]))		? true	: menu.props["hasIcons"]
 		hasSubMenus = (menu.props === undefined || "undefined" === typeof(menu.props["hasSubMenus"]))	? false : menu.props["hasSubMenus"]
+		menuTitle	= (menu.props === undefined || "undefined" === typeof(menu.props["menuTitle"]))		? "Analysis menu" : menu.props["menuTitle"]
 
 		if (menu.props === undefined || menu.props["model"] !== resultMenuModel)
 			resultsJsInterface.runJavaScript("window.setSelection(false);")
@@ -179,9 +197,9 @@ FocusScope
 
 	function callMenuAction(index)
 	{
+		menu.props['functionCall'](index)
 		if (menu.sourceItem !== null)
 			menu.sourceItem.forceActiveFocus()
-		menu.props['functionCall'](index)
 	}
 
 	function currentMenuItem(index)
@@ -341,6 +359,10 @@ FocusScope
 
 									property bool itemEnabled	: menu.props.hasOwnProperty("enabled") ? menu.props["enabled"][index] : (model.modelData !== undefined || model.isEnabled)
 
+									Accessible.role		: Accessible.MenuItem
+									Accessible.name		: (model.modelData !== undefined ? model.modelData : displayText)
+									Accessible.onPressAction: { if (menuItem.itemEnabled) callMenuAction(index) }
+
 									Image
 									{
 										id						: menuItemImage
@@ -424,6 +446,10 @@ FocusScope
 
 									property bool itemEnabled :	menu.props.hasOwnProperty("enabled") ? menu.props["enabled"][index] : (model.modelData !== undefined || model.isEnabled)
 
+									Accessible.role		: Accessible.MenuItem
+									Accessible.name		: (model.modelData !== undefined ? model.modelData.substring(3) : displayText)
+									Accessible.onPressAction: { if (menuItem.itemEnabled) callMenuAction(index) }
+
 									Image
 									{
 										id					: menuItemImage
@@ -496,7 +522,12 @@ FocusScope
 							Component
 							{
 								id	: menuSeparator
-								ToolSeparator { orientation	: Qt.Horizontal; width: column.columnWidth }
+								ToolSeparator { 
+									orientation	: Qt.Horizontal; 
+									width: column.columnWidth
+									Accessible.role		: Accessible.Separator
+									Accessible.name		: "Separator"
+								}
 							}
 						}
 					}

Desktop/components/JASP/Widgets/DataPanel.qml

@@ -6,6 +6,15 @@ import QtQuick
 Rectangle
 {
 	id:				rootDataset
+
+	Accessible.role:	Accessible.Pane
+	Accessible.name:	qsTr("Data Panel")
+
+	function focusDataTableView()
+	{
+		dataTableView.focusAndEdit();
+	}
+
 	color:			jaspTheme.uiBackground
 
 	property int leftHandSpace: 0 //Used to allow splithandler to move out of the screen on the left a bit.
@@ -50,6 +59,7 @@ Rectangle
 
 		DataTableView
 		{
+			id:						dataTableView
 			objectName:				"dataSetTableView"
 			SplitView.fillHeight:	true
 			onDoubleClicked:		ribbonModel.showData()

Desktop/components/JASP/Widgets/DataTableView.qml

@@ -8,6 +8,24 @@ FocusScope
 {
 	id: __myRoot
 
+	Accessible.role:	Accessible.Table
+	Accessible.name:	qsTr("Data Table View")
+
+	Accessible.onPressAction:	{ focusAndEdit(); }
+
+	JaspControls.ALTNavigation.enabled:				true
+	JaspControls.ALTNavigation.requestedPostfix:	"V"
+	JaspControls.ALTNavigation.onTagMatch:			{ focusAndEdit(); }
+
+	function focusAndEdit()
+	{
+		__myRoot.forceActiveFocus();
+		var col = dataTableView.view.selectionMin.x >= 0 ? dataTableView.view.selectionMin.x : 0;
+		var row = dataTableView.view.selectionMin.y >= 0 ? dataTableView.view.selectionMin.y : 0;
+		dataTableView.view.select(row, col, false, false);
+		dataTableView.view.edit(row, col);
+	}
+
 	signal doubleClicked()
 
 	property alias isMainDataViewer: dataTableView.isMainDataViewer
@@ -162,6 +180,7 @@ FocusScope
 					"icons":		menuIcons,
 					"shortcut":		menuShortcuts,
 					"enabled":		menuEnabled,
+					"menuTitle":	qsTr("Context menu"),
 					"functionCall": function (index)
 					{
 						menuFunctions[index]();

Desktop/components/JASP/Widgets/DataTableViewColumnHeader.qml

@@ -13,6 +13,13 @@ Rectangle
 				? jaspTheme.itemSelectedNoFocusColor 
 				: jaspTheme.buttonColor
 
+	signal headerClicked()
+
+	Accessible.role:		Accessible.ColumnHeader
+	Accessible.name:		qsTr("Column: %1").arg(headerText)
+	Accessible.description:	columnDescription || ""
+	Accessible.onPressAction:	{ headerRoot.headerClicked(); }
+
 	readonly	property int	__iconDim:			baseBlockDim * preferencesModel.uiScale
 
 	function getColumnTypeIcon(type)
@@ -66,34 +73,42 @@ Rectangle
 			dataTableView.view.setColumnType(columnIndex, newColumnType)
 		}
 
-
-		MouseArea
+		function openTypeMenu()
 		{
-			enabled:			!virtual && computedColumnType !== computedColumnTypeAnalysis
-			anchors.fill:		parent
-			onClicked:
+			var functionCall      = function (index)
 			{
-				var functionCall      = function (index)
-				{
-					colIcon.setColumnType(columnTypesModel.getType(index));
-					customMenu.hideMenus()
-				}
+				colIcon.setColumnType(columnTypesModel.getType(index));
+				customMenu.hideMenus()
+			}
 
-				var props = {
-					"model":		columnTypesModel,
-					"functionCall": functionCall
-				};
+			var props = {
+				"model":		columnTypesModel,
+				"functionCall": functionCall,
+				"menuTitle":	qsTr("Column type menu for %1").arg(headerText)
+			};
 
-				customMenu.scrollOri.x	= dataTableView.contentX;
-				customMenu.scrollOri.y	= 0;
+			customMenu.scrollOri.x	= dataTableView.contentX;
+			customMenu.scrollOri.y	= 0;
 
-				customMenu.toggle(headerRoot, props);
+			customMenu.toggle(headerRoot, props);
 
-				customMenu.menuScroll.x	= Qt.binding(function() { return -1 * (dataTableView.contentX - customMenu.scrollOri.x); });
-				customMenu.menuScroll.y	= 0;
-				customMenu.menuMinIsMin	= true
-				customMenu.sceneWidth		= Qt.binding(function() { return dataTableView.width + dataTableView.x })
-			}
+			customMenu.menuScroll.x	= Qt.binding(function() { return -1 * (dataTableView.contentX - customMenu.scrollOri.x); });
+			customMenu.menuScroll.y	= 0;
+			customMenu.menuMinIsMin	= true
+			customMenu.sceneWidth	= Qt.binding(function() { return dataTableView.width + dataTableView.x })
+		}
+
+
+		MouseArea
+		{
+			enabled:			!virtual && computedColumnType !== computedColumnTypeAnalysis
+			anchors.fill:		parent
+			onClicked:			colIcon.openTypeMenu()
+
+			Accessible.role:			Accessible.PushButton
+			Accessible.name:			qsTr("Change column type: %1").arg(headerText)
+			Accessible.description:		qsTr("Open menu to change type for column %1").arg(headerText)
+			Accessible.onPressAction:	{ if (enabled) colIcon.openTypeMenu(); }
 
 			hoverEnabled:		true
 			ToolTip.visible:	containsMouse
@@ -199,6 +214,7 @@ Rectangle
 			if(columnIndex >= 0)
 			{
 				headerRoot.forceActiveFocus()
+				headerRoot.headerClicked()
 
 				if(mouseEvent.button === Qt.LeftButton)
 				{

Desktop/components/JASP/Widgets/DataTableViewEdit.qml

@@ -13,6 +13,15 @@ Item
 	property bool keyPressed:	false
 	property alias text:		editItem.text
 
+	Accessible.role:		Accessible.Cell
+	Accessible.name:		qsTr("Row %1, Col %2: %3 (editing)")
+								.arg(rowIndex + 1)
+								.arg(columnName || columnIndex + 1)
+								.arg(itemTextEdit || "")
+	Accessible.description:	qsTr("Editing data cell at row %1, column %2")
+								.arg(rowIndex + 1)
+								.arg(columnName || columnIndex + 1)
+
 	TextInput
 	{
 		id:						editItem
@@ -27,10 +36,15 @@ Item
 
 		anchors.fill:			parent
 		z:						10
-
+
+		Accessible.role:		Accessible.EditableText
+		Accessible.focusable:	true
+		Accessible.name:		"Edit cell value"
+
 		Keys.onPressed: (event) =>
 		{
 			keyPressed = true
+			messages.log("DataTableViewEdit KEYS: key=" + event.key + " text='" + event.text + "' mod=" + event.modifiers)
 
 			var rowI			= rowIndex
 			var colI			= columnIndex

Desktop/components/JASP/Widgets/DataTableViewItem.qml

@@ -7,6 +7,15 @@ Item
 {
 					id:			itemDelegateItem
 	property bool	showShadow:	itemShadowText !== undefined && itemText !== undefined && itemText !== itemShadowText
+
+	Accessible.role:		Accessible.Cell
+	Accessible.name:		qsTr("Row %1, Col %2: %3")
+								.arg(rowIndex + 1)
+								.arg(columnName || columnIndex + 1)
+								.arg(itemText || "")
+	Accessible.description:	qsTr("Data cell at row %1, column %2")
+								.arg(rowIndex + 1)
+								.arg(columnName || columnIndex + 1)
 
 	TextMetrics
 	{

Desktop/components/JASP/Widgets/DataTableViewRowHeader.qml

@@ -9,6 +9,11 @@ Rectangle
 	color:	ribbonModel.dataMode && (dataTableView.view.selectionMin.y <= rowIndex && dataTableView.view.selectionMax.y >= rowIndex) 
 			? jaspTheme.itemSelectedNoFocusColor 
 			: jaspTheme.buttonColor
+
+	Accessible.role:		Accessible.RowHeader
+	Accessible.name:		qsTr("Row %1").arg(rowNumber + 1)
+	Accessible.description:	qsTr("Row header for row %1. Click to select, shift for multi-select.")
+								.arg(rowNumber + 1)
 	Text
 	{
 		text:				rowNumber

Desktop/components/JASP/Widgets/EncryptionSettingsWindow.qml

@@ -5,6 +5,8 @@ Window
 {
     id:	encryptWindow
 
+	Accessible.name:	title
+
     minimumWidth:           Math.max(passwordInput.minWidth, jaspSubmission.implicitWidth, showAdvancedCheckbox.implicitWidth) + windowPadding * 2 + 150 * jaspTheme.uiScale 
     minimumHeight:          contentColumn.implicitHeight + (advancedSettings.visible ? advancedSettings.implicitHeight + jaspTheme.groupContentPadding : 0) + buttons.height + windowPadding * 3
     visible:                encryptionModel.visible

Desktop/components/JASP/Widgets/EnginesWindow.qml

@@ -7,6 +7,9 @@ import JASP.Controls
 Window
 {
 	id:					enginesWindow
+
+	Accessible.name:	title
+
 	width:				400 * jaspTheme.uiScale
 	height:				Screen.height
 	minimumWidth:		200 * preferencesModel.uiScale

Desktop/components/JASP/Widgets/ErrorMessage.qml

@@ -24,6 +24,10 @@ import JASP.Controls
 Rectangle
 {
 	id				: errorMsg
+
+	Accessible.role:	Accessible.StaticText
+	Accessible.name:	text
+
 	color			: warning ? jaspTheme.controlWarningBackgroundColor : jaspTheme.controlErrorBackgroundColor
 	visible			: opacity > 0 && text != ""
 	opacity			: 1

Desktop/components/JASP/Widgets/FileMenu/FileMenu.qml

@@ -10,6 +10,9 @@ FocusScope
 {
 	id: fileMenu
 
+	Accessible.role:	Accessible.Pane
+	Accessible.name:	qsTr("File menu")
+
 	Keys.onEscapePressed:
 	{
 		ribbon.focus			 = true;