Add ALTNavigation

Desktop/components/JASP/Widgets/MainPage.qml

@@ -105,10 +105,10 @@ Item
 		onXChanged:			checkPosition(false)
 		onDraggingChanged:	checkPosition(true)
 
-		ALTNavigation.enabled:				true
-		ALTNavigation.onTagMatch:			{ arrowClicked(); }
-		ALTNavigation.requestedPostfix:		"D"
-		ALTNavigation.y:					height / 2 - 25 * jaspTheme.uiScale
+		JC.ALTNavigation.enabled:				true
+		JC.ALTNavigation.onTagMatch:			{ arrowClicked(); }
+		JC.ALTNavigation.requestedPostfix:		"D"
+		JC.ALTNavigation.y:					height / 2 - 25 * jaspTheme.uiScale
 
 		function checkPosition(forceCheck)
 		{
@@ -230,9 +230,9 @@ Item
 		visible:				hasAnalysis && !ribbonModel.dataMode
 		color:					analysesModel.currentAnalysisIndex !== -1 ? jaspTheme.uiBackground : jaspTheme.white
 
-		ALTNavigation.enabled:				true
-		ALTNavigation.requestedPostfix:		"R"
-		ALTNavigation.onTagMatch:			{ resultsView.nextItemInFocusChain().forceActiveFocus(); }
+		JC.ALTNavigation.enabled:				true
+		JC.ALTNavigation.requestedPostfix:		"R"
+		JC.ALTNavigation.onTagMatch:			{ resultsView.nextItemInFocusChain().forceActiveFocus(); }
 
 		Rectangle
 		{

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

@@ -18,6 +18,7 @@
 
 import QtQuick
 import JASP
+import JASP.Controls
 
 
 FocusScope

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

@@ -18,7 +18,7 @@
 
 import QtQuick
 import QtQuick.Controls
-import JASP
+import JASP.Controls
 
 Item
 {

Desktop/mainwindow.cpp

@@ -139,7 +139,6 @@ MainWindow::MainWindow(QApplication * application) : QObject(application), _appl
 
 	makeConnections();
 
-	qmlRegisterUncreatableType<JASPControl>						("JASP",			1, 0, "JASP",				"Impossible to create JASP Object"	); //This is here to keep JASP.enum short I guess?
 	qmlRegisterUncreatableType<MessageForwarder>				("JASP",			1, 0, "MessageForwarder",	"You can't touch this"				);
 
 	qmlRegisterType<DataSetView>								("JASP",			1, 0, "DataSetView"						);
@@ -150,7 +149,6 @@ MainWindow::MainWindow(QApplication * application) : QObject(application), _appl
 	qmlRegisterUncreatableType<PlotEditor::AxisModel>			("JASP.PlotEditor",	1, 0, "AxisModel",					"Can't make it");
 	qmlRegisterUncreatableType<PlotEditor::PlotEditorModel>		("JASP.PlotEditor",	1, 0, "PlotEditorModel",			"Can't make it");
 
-	ALTNavigation::registerQMLTypes("JASP");
 	ALTNavControl::ctrl()->enableAlTNavigation(_preferences->ALTNavModeActive());
 	QmlUtils::setGlobalPropertiesInQMLContext(_qml->rootContext());
 

QMLComponents/ALTNavigation/altnavigation.cpp

@@ -7,12 +7,3 @@ ALTNavScope* ALTNavigation::qmlAttachedProperties(QObject *object)
 	ALTNavControl::ctrl()->registrate(scope, object);
 	return scope;
 }
-
-//Could parameterize module
-void ALTNavigation::registerQMLTypes(QString uri)
-{
-	std::string u = uri.toStdString();
-	qmlRegisterType<ALTNavigation>									(u.c_str(),		1, 0, "ALTNavigation"									);
-	qmlRegisterType<ALTNavTagBase>									(u.c_str(),		1, 0, "ALTNavTagBase"									);
-	qmlRegisterUncreatableType<ALTNavPostfixAssignmentStrategy>		(u.c_str(),		1, 0, "AssignmentStrategy",				"Can't make it"	);
-}

QMLComponents/ALTNavigation/altnavigation.h

@@ -84,6 +84,7 @@
 class ALTNavigation : public QObject
 {
 	Q_OBJECT
+	QML_ELEMENT
 	QML_ATTACHED(ALTNavScope)
 
 public:
@@ -94,11 +95,6 @@ class ALTNavigation : public QObject
 	 */
 	static ALTNavScope* qmlAttachedProperties(QObject *object);
 
-	/*!
-	 * \brief registers the QML types related to this subsystem under JASP
-	 */
-	static void registerQMLTypes(QString uri);
-
 };
 
 #endif // ALTNAVIGATION_H

QMLComponents/ALTNavigation/altnavscope.cpp

@@ -4,6 +4,8 @@
 
 #include <QQmlProperty>
 #include <QMetaObject>
+#include <QDirIterator>
+#include "log.h"
 
 ALTNavScope::ALTNavScope(QObject* attachee)
 	: QObject{attachee}
@@ -15,7 +17,7 @@ ALTNavScope::ALTNavScope(QObject* attachee)
 		if(_attachee) //is a visual item
 		{
 			//create a visual tag
-			QQmlComponent component(qmlEngine(_attachee), QUrl("qrc:///components/JASP/Widgets/ALTNavTag.qml"), _attachee);
+			QQmlComponent component(qmlEngine(_attachee), QUrl("qrc:/jasp-stats.org/imports/JASP/Controls/components/JASP/Controls/ALTNavTag.qml"), _attachee);
 			_attachedTag = qobject_cast<ALTNavTagBase*>(component.create());
 			_attachedTag->setParentItem(_attachee);
 			_attachedTag->setParent(_attachee);

QMLComponents/ALTNavigation/altnavtag.h

@@ -14,6 +14,7 @@ class ALTNavScope;
 class ALTNavTagBase : public QQuickItem
 {
 	Q_OBJECT
+	QML_ELEMENT
 
 	Q_PROPERTY( QString		tagText			READ	getTagText		NOTIFY	tagTextChanged		);
 	Q_PROPERTY( bool		active			READ	getActive		NOTIFY	activeChanged		);

QMLComponents/CMakeLists.txt

@@ -42,6 +42,7 @@ target_include_directories(
 	${PROJECT_SOURCE_DIR}/Common/jaspColumnEncoder
 	${CMAKE_CURRENT_LIST_DIR}/controls
 	${CMAKE_CURRENT_LIST_DIR}/rsyntax
+	${CMAKE_CURRENT_LIST_DIR}/ALTNavigation
 )
 
 

QMLComponents/analysisform.cpp

@@ -456,7 +456,7 @@ void AnalysisForm::addControlError(JASPControl* control, QString message, bool t
 			// Cannot instantiate _controlErrorMessageComponent in the constructor (it crashes), and it might be too late in the formCompletedHandler since error can be generated earlier
 			// So create it when it is needed for the first time.
 			if (!_controlErrorMessageComponent)
-				_controlErrorMessageComponent = new QQmlComponent(qmlEngine(this), "qrc:///components/JASP/Controls/ControlErrorMessage.qml");
+				_controlErrorMessageComponent = new QQmlComponent(qmlEngine(this), "qrc:/jasp-stats.org/imports/JASP/Controls/components/JASP/Controls/ControlErrorMessage.qml");
 
 			controlErrorMessageItem = qobject_cast<QQuickItem*>(_controlErrorMessageComponent->create(QQmlEngine::contextForObject(this)));
 			if (!controlErrorMessageItem)

Desktop/components/JASP/Widgets/ALTNavTag.qml → QMLComponents/components/JASP/Controls/ALTNavTag.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Controls
 import JASP
+import JASP.Controls
 
 //Tag shown when alt navigation mode is enabled.
 ALTNavTagBase

QMLComponents/utilities/qmlutils.cpp

@@ -6,6 +6,8 @@
 #include "log.h"
 #include "columnencoder.h"
 #include "models/term.h"
+#include "jaspcontrol.h"
+#include "altnavpostfixassignmentstrategy.h"
 
 #ifdef linux
 #include <QtGlobal>
@@ -196,4 +198,7 @@ void QmlUtils::setGlobalPropertiesInQMLContext(QQmlContext * ctxt)
 	ctxt->setContextProperty("LINUX",					isLinux);
 	ctxt->setContextProperty("WINDOWS",					isWindows);
 	ctxt->setContextProperty("INTERACTION_SEPARATOR",	Term::separator);
+
+	qmlRegisterUncreatableType<JASPControl>(					"JASP",		1, 0, "JASP",					"Impossible to create JASP Object");
+	qmlRegisterUncreatableType<ALTNavPostfixAssignmentStrategy>("JASP",		1, 0, "AssignmentStrategy",		"Can't make it"	);
 }