Clean up

Desktop/CMakeLists.txt

@@ -94,7 +94,6 @@ target_include_directories(
     ${PROJECT_SOURCE_DIR}/jaspCommonLib
     ${PROJECT_SOURCE_DIR}/jaspCommonLib/QtUtils
     ${PROJECT_SOURCE_DIR}/CommonData
-    #${PROJECT_SOURCE_DIR}/JASPQMLControlsPlugin
     # ReadStat
     $<$<PLATFORM_ID:Windows>:${RTOOLS_LIBREADSTAT_H}>
     ${LIBREADSTAT_INCLUDE_DIRS}

Desktop/components/JASP/Widgets/AnalysisForms.qml

@@ -88,7 +88,7 @@ FocusScope
 
 					ALTNavigation.enabled:				true
 					ALTNavigation.scopeOnly:			true
-					ALTNavigation.strategy:				AssignmentStrategy.INDEXED
+					ALTNavigation.strategy:				JASP.INDEXED
 					ALTNavigation.requestedPostfix:		"A"
 
 					move: Transition

Desktop/components/JASP/Widgets/RCommanderWindow.qml

@@ -18,10 +18,9 @@
 
 import QtQuick
 import QtQuick.Window
-import QtQuick.Controls
-import JASP
-import JASP.Widgets		as JW
-import JASP.Controls	as JC
+import QtQuick.Controls as QTC
+import JASP.Widgets
+import JASP.Controls
 
 Window
 {
@@ -108,7 +107,7 @@ Window
 					height:		Math.max(outputWindow.implicitHeight, outputScroll.height)
 					width:		outputScroll.width
 
-					TextArea
+					QTC.TextArea
 					{
 						id:					outputWindow
 						text:				rCmd.output
@@ -139,7 +138,7 @@ Window
 				}
 			}
 
-			JC.JASPScrollBar
+			JASPScrollBar
 			{
 				id:					vertScroll
 				flickable:			outputScroll
@@ -190,7 +189,7 @@ Window
 						width:					codeEntry.width
 						height:					codeEntry.implicitHeight
 
-						TextArea
+						QTC.TextArea
 						{
 							id:						codeEntry
 							font:					jaspTheme.fontRCode
@@ -228,7 +227,7 @@ Window
 					interactive:			false
 				}
 
-				JC.JASPScrollBar
+				JASPScrollBar
 				{
 					id:					codeEntryScrollbar
 					flickable:			codeEntryFlickable;
@@ -252,7 +251,7 @@ Window
 				}
 			}
 
-			JC.RoundedButton
+			RoundedButton
 			{
 				id:				runButton
 				text:			qsTr("Run code")
@@ -291,7 +290,7 @@ Window
 				}
 			}
 
-			JC.RoundedButton
+			RoundedButton
 			{
 				id:			addAnalysisItem
 				text:		qsTr("Add analysis")
@@ -310,7 +309,7 @@ Window
 				function addAnalysis() { if(addAnalysisItem.enabled && rCmd.addAnalysis(codeEntry.text)) codeEntry.text = ""; }
 			}
 
-			JC.RoundedButton
+			RoundedButton
 			{
 				id:			clearOutput
 				text:		qsTr("Clear output")
@@ -326,7 +325,7 @@ Window
 				}
 			}
 
-			JC.DropDown
+			DropDown
 			{
 				id:							selectModule
 				values:		 				dynamicModules.loadedModulesTitles

Desktop/components/JASP/Widgets/Ribbon/Ribbons.qml

@@ -17,7 +17,7 @@
 //
 
 import QtQuick
-import JASP
+import JASP.Widgets
 import JASP.Controls
 
 Item
@@ -133,7 +133,7 @@ Item
 
 		ALTNavigation.enabled:				true
 		ALTNavigation.scopeOnly:			true
-		ALTNavigation.strategy:				AssignmentStrategy.INDEXED
+		ALTNavigation.strategy:				JASP.INDEXED
 		ALTNavigation.requestedPostfix:		"M"
 
 		onDragStarted:					customMenu.hide()

Desktop/mainwindow.cpp

@@ -129,10 +129,9 @@ MainWindow::MainWindow(QApplication * application) : QObject(application), _appl
 	makeConnections();
 
 	qmlRegisterUncreatableType<MessageForwarder>				("JASP",				1, 0, "MessageForwarder",	"You can't touch this"				);
-	qmlRegisterType<DataSetView>								("JASP",				1, 0, "DataSetView"						);
+	qmlRegisterType<DataSetView>								("JASP.Controls",		1, 0, "DataSetView"						); // Register the real DataSetView in QML
 	qmlRegisterType<JaspTheme>									("JASP",				1, 0, "JaspTheme"						);
-	qmlRegisterType<RCommander>									("JASP",				1, 0, "RCommander"						);
-	qmlRegisterType<ResultsJsInterface>							("JASP",				1, 0, "ResultsJsInterface"				);
+	qmlRegisterType<RCommander>									("JASP.Widgets",		1, 0, "RCommander"						);
 	qmlRegisterUncreatableType<PlotEditor::AxisModel>			("JASP.PlotEditor",		1, 0, "AxisModel",					"Can't make it");
 	qmlRegisterUncreatableType<PlotEditor::PlotEditorModel>		("JASP.PlotEditor",		1, 0, "PlotEditorModel",			"Can't make it");
 

Desktop/qquick/datasetview.h

@@ -38,6 +38,7 @@ struct ItemContextualized
 class DataSetView : public QQuickItem
 {
 	Q_OBJECT
+	QML_ELEMENT
 
 	Q_PROPERTY( QAbstractItemModel	*	model					READ model					WRITE setModel					NOTIFY modelChanged					)
 	Q_PROPERTY( int						itemHorizontalPadding	READ itemHorizontalPadding	WRITE setItemHorizontalPadding	NOTIFY itemHorizontalPaddingChanged )

Desktop/qquick/rcommander.h

@@ -11,6 +11,8 @@ class EngineRepresentation;
 class RCommander : public QQuickItem
 {
 	Q_OBJECT
+	QML_ELEMENT
+
 	Q_PROPERTY(QString	output			READ output				WRITE setOutput		NOTIFY outputChanged			)
 	Q_PROPERTY(bool		running			READ running			WRITE setRunning	NOTIFY runningChanged			)
 	Q_PROPERTY(bool		isAnalysisCode	READ isAnalysisCode							NOTIFY isAnalysisCodeChanged	)

Docs/development/jasp-qml-style-example.qml

@@ -11,7 +11,7 @@ import JASP.Widgets 	1.0
 Form 
 {				//Opening braces should on their own line and at the exact same indent as the closing brace.
 
-	GroupBox	//A subitem is indented and always has a space between the previous subitem/property/function
+	Group		//A subitem is indented and always has a space between the previous subitem/property/function
 	{
 		title:		qsTr("A nice grouping of elements") //putting qsTr(...) around string constants allows us to make the interface translatable.