JASP QML Controls base objects should be registered automatically

Use QML_ELEMENT Remove import version in other QML files
jasp-stats · Jan 14, 2025 · 769d232 · 769d232
1 parent e32ad10
commit 769d232
Show file tree

Hide file tree

Showing 103 changed files with 172 additions and 258 deletions.
diff --git a/Desktop/components/JASP/Widgets/ComputeColumnWindow.qml b/Desktop/components/JASP/Widgets/ComputeColumnWindow.qml
@@ -105,7 +105,7 @@ FocusScope
 				{
 					id: computeColumnEdit
 
-					RSyntaxHighlighterQuick
+					JaspControls.RSyntaxHighlighterQuick
 					{
 						textDocument:		computeColumnEdit.textDocument
 					}

diff --git a/Desktop/components/JASP/Widgets/CreateComputeColumnDialog.qml b/Desktop/components/JASP/Widgets/CreateComputeColumnDialog.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 import JASP.Controls as JaspControls
 
 

diff --git a/Desktop/components/JASP/Widgets/DataPanel.qml b/Desktop/components/JASP/Widgets/DataPanel.qml
@@ -1,6 +1,6 @@
-import QtQuick.Controls 6.0
-import QtQuick.Layouts	1.0
-import QtQuick			2.15
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick
 
 
 Rectangle

diff --git a/Desktop/components/JASP/Widgets/FileMenu/CurrentFile.qml b/Desktop/components/JASP/Widgets/FileMenu/CurrentFile.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
 
 Item

diff --git a/Desktop/components/JASP/Widgets/FileMenu/DataLibrary.qml b/Desktop/components/JASP/Widgets/FileMenu/DataLibrary.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 
 Item

diff --git a/Desktop/components/JASP/Widgets/FileMenu/DataLibraryBreadCrumbs.qml b/Desktop/components/JASP/Widgets/FileMenu/DataLibraryBreadCrumbs.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.0
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.2
-import JASP.Theme 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import JASP.Theme
 
 ListView
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/PrefsTextInput.qml b/Desktop/components/JASP/Widgets/FileMenu/PrefsTextInput.qml
@@ -1,5 +1,5 @@
-import QtQuick			2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Controls
 
 Rectangle
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/RecentFiles.qml b/Desktop/components/JASP/Widgets/FileMenu/RecentFiles.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 
 Item

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/ColumnDrag.qml b/Desktop/components/JASP/Widgets/FilterConstructor/ColumnDrag.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 DragGeneric 
 {

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/DragGeneric.qml b/Desktop/components/JASP/Widgets/FilterConstructor/DragGeneric.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
 
 MouseArea

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/DropSpot.qml b/Desktop/components/JASP/Widgets/FilterConstructor/DropSpot.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
 
 

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/DropTrash.qml b/Desktop/components/JASP/Widgets/FilterConstructor/DropTrash.qml
@@ -1,5 +1,5 @@
-import QtQuick			2.9
-import QtQuick.Controls	2.2
+import QtQuick
+import QtQuick.Controls
 
 DropArea
 {

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/ElementView.qml b/Desktop/components/JASP/Widgets/FilterConstructor/ElementView.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 
 ListView

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/Function.qml b/Desktop/components/JASP/Widgets/FilterConstructor/Function.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick
 
 
 Item

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/FunctionDrag.qml b/Desktop/components/JASP/Widgets/FilterConstructor/FunctionDrag.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 DragGeneric {
 	shownChild: showMe

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/Number.qml b/Desktop/components/JASP/Widgets/FilterConstructor/Number.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 Item
 {

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/NumberDrag.qml b/Desktop/components/JASP/Widgets/FilterConstructor/NumberDrag.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 DragGeneric {
 	property real value: 0

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/Operator.qml b/Desktop/components/JASP/Widgets/FilterConstructor/Operator.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick
 
 
 Item

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/OperatorDrag.qml b/Desktop/components/JASP/Widgets/FilterConstructor/OperatorDrag.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 DragGeneric {
 	shownChild: showMe

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/OperatorSelector.qml b/Desktop/components/JASP/Widgets/FilterConstructor/OperatorSelector.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 Item
 {

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/OperatorSelectorComputedColumns.qml b/Desktop/components/JASP/Widgets/FilterConstructor/OperatorSelectorComputedColumns.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 Item
 {

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/OperatorVertical.qml b/Desktop/components/JASP/Widgets/FilterConstructor/OperatorVertical.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick
 
 
 Item

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/OperatorVerticalDrag.qml b/Desktop/components/JASP/Widgets/FilterConstructor/OperatorVerticalDrag.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 DragGeneric {
 	shownChild: showMe

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/String.qml b/Desktop/components/JASP/Widgets/FilterConstructor/String.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 Item
 {

diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/StringDrag.qml b/Desktop/components/JASP/Widgets/FilterConstructor/StringDrag.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick
 
 DragGeneric {
 	property string text: "?"

diff --git a/Desktop/components/JASP/Widgets/FilterWindow.qml b/Desktop/components/JASP/Widgets/FilterWindow.qml
@@ -301,7 +301,7 @@ FocusScope
 
 						TextArea
 						{
-							RSyntaxHighlighterQuick
+							JaspControls.RSyntaxHighlighterQuick
 							{
 								textDocument:		filterGeneratedEdit.textDocument
 							}
@@ -351,7 +351,7 @@ FocusScope
 						TextArea
 						{
 
-							RSyntaxHighlighterQuick
+							JaspControls.RSyntaxHighlighterQuick
 							{
 								textDocument:		filterEdit.textDocument
 							}

diff --git a/Desktop/components/JASP/Widgets/ImageInverter.qml b/Desktop/components/JASP/Widgets/ImageInverter.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.15
+import QtQuick
 
 ///Setting src to an Image will put this image inverter there and enable/disable it based on a dark theme is enabled. This is especially useful for getting the negative of a plot
 ShaderEffect

diff --git a/Desktop/components/JASP/Widgets/JASPMouseAreaToolTipped.qml b/Desktop/components/JASP/Widgets/JASPMouseAreaToolTipped.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
+import QtQuick
+import QtQuick.Controls
 
 MouseArea
 {

diff --git a/Desktop/components/JASP/Widgets/JASPSplitHandle.qml b/Desktop/components/JASP/Widgets/JASPSplitHandle.qml
@@ -1,6 +1,6 @@
-import QtQuick			2.11
-import JASP.Widgets		1.0
-import QtQuick.Controls	6.0
+import QtQuick
+import JASP.Widgets
+import QtQuick.Controls
 
 //Only works vertically right now...
 

diff --git a/Desktop/components/JASP/Widgets/LoadingIndicator.qml b/Desktop/components/JASP/Widgets/LoadingIndicator.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
 
 Item
 {

diff --git a/Desktop/components/JASP/Widgets/MainWindow.qml b/Desktop/components/JASP/Widgets/MainWindow.qml
@@ -16,10 +16,10 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-import QtQuick			2.11
-import QtQuick.Window	2.11
+import QtQuick
+import QtQuick.Window
 import JASP
-import QtQuick.Controls	2.12
+import QtQuick.Controls
 
 Window
 {

diff --git a/Desktop/components/JASP/Widgets/ProgressBarHolder.qml b/Desktop/components/JASP/Widgets/ProgressBarHolder.qml
@@ -1,5 +1,5 @@
-import QtQuick			2.11
-import QtQuick.Controls	2.4
+import QtQuick
+import QtQuick.Controls
 
 
 Item

diff --git a/Desktop/components/JASP/Widgets/Ribbon/MenuArrowButton.qml b/Desktop/components/JASP/Widgets/Ribbon/MenuArrowButton.qml
@@ -16,8 +16,8 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-import QtQuick 2.11
-import QtQuick.Controls 2.4
+import QtQuick
+import QtQuick.Controls
 
 
 Rectangle

diff --git a/Desktop/components/JASP/Widgets/Ribbon/RibbonBar.qml b/Desktop/components/JASP/Widgets/Ribbon/RibbonBar.qml
@@ -16,7 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-import QtQuick 2.11
+import QtQuick
 import JASP
 
 

diff --git a/Desktop/components/JASP/Widgets/Ribbon/RibbonButton.qml b/Desktop/components/JASP/Widgets/Ribbon/RibbonButton.qml
@@ -16,10 +16,10 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-import QtQuick				2.11
-import QtQuick.Controls		2.4
-import JASP					1.0
-import JASP.Widgets			1.0
+import QtQuick
+import QtQuick.Controls
+import JASP
+import JASP.Widgets
 
 Item
 {

diff --git a/Desktop/components/JASP/Widgets/Ribbon/Ribbons.qml b/Desktop/components/JASP/Widgets/Ribbon/Ribbons.qml
@@ -16,8 +16,8 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-import QtQuick			2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Controls
 import JASP
 
 Item

diff --git a/Desktop/components/JASP/Widgets/SaveDiscardCancelDialog.qml b/Desktop/components/JASP/Widgets/SaveDiscardCancelDialog.qml
@@ -1,5 +1,5 @@
-import QtQuick	2.12
-import JASP		1.0
+import QtQuick
+import JASP
 
 QtObject
 {

diff --git a/Desktop/components/JASP/Widgets/SpinBox.qml b/Desktop/components/JASP/Widgets/SpinBox.qml
@@ -97,7 +97,7 @@ Item
 	TextField
 	{
 		id:							valueField
-		validator:					JASPDoubleValidator { id: doubleValidator; bottom: root.min; top: root.max ; decimals: root.decimals }
+		validator:					JaspControls.JASPDoubleValidator { id: doubleValidator; bottom: root.min; top: root.max ; decimals: root.decimals }
 		anchors
 		{
 			left:					minus.right

diff --git a/Desktop/components/JASP/Widgets/UIScaleNotifier.qml b/Desktop/components/JASP/Widgets/UIScaleNotifier.qml
@@ -1,6 +1,6 @@
-import QtQuick			2.11
-import QtQuick.Controls 2.4
-import JASP.Widgets		1.0
+import QtQuick
+import QtQuick.Controls
+import JASP.Widgets
 
 Item
 {

diff --git a/Desktop/mainwindow.cpp b/Desktop/mainwindow.cpp
@@ -39,27 +39,6 @@
 
 #include "mainwindow.h"
 
-#include "analysisform.h"
-#include "controls/jaspcontrol.h"
-#include "controls/checkboxbase.h"
-#include "controls/comboboxbase.h"
-#include "controls/textinputbase.h"
-#include "controls/componentslistbase.h"
-#include "controls/rsyntaxhighlighter.h"
-#include "controls/factorsformbase.h"
-#include "controls/inputlistbase.h"
-#include "controls/textareabase.h"
-#include "controls/sliderbase.h"
-#include "controls/expanderbuttonbase.h"
-#include "controls/variableslistbase.h"
-#include "controls/variablesformbase.h"
-#include "controls/factorlevellistbase.h"
-#include "controls/tableviewbase.h"
-#include "controls/radiobuttonbase.h"
-#include "controls/radiobuttonsgroupbase.h"
-#include "controls/jaspdoublevalidator.h"
-#include "controls/groupboxbase.h"
-
 #include "gui/jaspversionchecker.h"
 #include "gui/preferencesmodel.h"
 #include "ALTNavigation/altnavigation.h"
@@ -69,7 +48,6 @@
 #include "modules/activemodules.h"
 #include "modules/dynamicmodules.h"
 #include "modules/menumodel.h"
-#include "modules/description/entrybase.h"
 
 #include "qquick/datasetview.h"
 #include "qquick/rcommander.h"
@@ -166,30 +144,9 @@ MainWindow::MainWindow(QApplication * application) : QObject(application), _appl
 
 	qmlRegisterType<DataSetView>								("JASP",			1, 0, "DataSetView"						);
 	qmlRegisterType<JaspTheme>									("JASP",			1, 0, "JaspTheme"						);
-	qmlRegisterType<AnalysisForm>								("JASP",			1, 0, "AnalysisForm"					);
 	qmlRegisterType<RCommander>									("JASP",			1, 0, "RCommander"						);
-	qmlRegisterType<JASPControl>								("JASP",			1, 0, "JASPControl"						);
-	qmlRegisterType<GroupBoxBase>								("JASP",			1, 0, "GroupBoxBase"					);
-	qmlRegisterType<ExpanderButtonBase>							("JASP",			1, 0, "ExpanderButtonBase"				);
-	qmlRegisterType<CheckBoxBase>								("JASP",			1, 0, "CheckBoxBase"					);
-	qmlRegisterType<SliderBase>									("JASP",			1, 0, "SliderBase"						);
-	qmlRegisterType<TextInputBase>								("JASP",			1, 0, "TextInputBase"					);
-	qmlRegisterType<TextAreaBase>								("JASP",			1, 0, "TextAreaBase"					);
-	qmlRegisterType<ComboBoxBase>								("JASP",			1, 0, "ComboBoxBase"					);
-	qmlRegisterType<RadioButtonBase>							("JASP",			1, 0, "RadioButtonBase"					);
-	qmlRegisterType<RadioButtonsGroupBase>						("JASP",			1, 0, "RadioButtonsGroupBase"			);
-	qmlRegisterType<RSyntaxHighlighterQuick>					("JASP",			1, 0, "RSyntaxHighlighterQuick"			);
-	qmlRegisterType<ComponentsListBase>							("JASP",			1, 0, "ComponentsListBase"				);
-	qmlRegisterType<FactorsFormBase>							("JASP",			1, 0, "FactorsFormBase"					);
-	qmlRegisterType<InputListBase>								("JASP",			1, 0, "InputListBase"					);
-	qmlRegisterType<FactorLevelListBase>						("JASP",			1, 0, "FactorLevelListBase"				);
-	qmlRegisterType<VariablesListBase>							("JASP",			1, 0, "VariablesListBase"				);
-	qmlRegisterType<VariablesFormBase>							("JASP",			1, 0, "VariablesFormBase"				);
-	qmlRegisterType<TableViewBase>								("JASP",			1, 0, "TableViewBase"					);
-	qmlRegisterType<JASPDoubleValidator>						("JASP",			1, 0, "JASPDoubleValidator"				);
 	qmlRegisterType<ResultsJsInterface>							("JASP",			1, 0, "ResultsJsInterface"				);
 	qmlRegisterType<ColumnModel>								("JASP",			1, 0, "ColumnModel"						);
-	qmlRegisterType<FormulaBase>								("JASP",			1, 0, "Formula"							);
 	qmlRegisterUncreatableType<PlotEditor::AxisModel>			("JASP.PlotEditor",	1, 0, "AxisModel",					"Can't make it");
 	qmlRegisterUncreatableType<PlotEditor::PlotEditorModel>		("JASP.PlotEditor",	1, 0, "PlotEditorModel",			"Can't make it");