Load QML Controls as QML Module

The QML Module is also a plugin. All versions in QML import statement must be removed.
jasp-stats · Jan 10, 2025 · 389e7ca · 389e7ca
1 parent 46a082e
commit 389e7ca
Show file tree

Hide file tree

Showing 66 changed files with 316 additions and 261 deletions.
diff --git a/Desktop/CMakeLists.txt b/Desktop/CMakeLists.txt
@@ -218,7 +218,7 @@ qt_add_resources(
 file(GLOB_RECURSE QML_RESOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/components/*")
 qt_add_resources(
   JASP
-  "widgets"
+  "widgetsandtheme"
   PREFIX
   "/"
   BASE

diff --git a/...nents/components/JASP/Theme/DarkTheme.qml → Desktop/components/JASP/Theme/DarkTheme.qml b/...nents/components/JASP/Theme/DarkTheme.qml → Desktop/components/JASP/Theme/DarkTheme.qml
diff --git a/...omponents/components/JASP/Theme/Theme.qml → Desktop/components/JASP/Theme/Theme.qml b/...omponents/components/JASP/Theme/Theme.qml → Desktop/components/JASP/Theme/Theme.qml
@@ -17,9 +17,9 @@
 //
 
 
-import QtQuick			2.12
-import QtQuick.Controls	2.12
-import JASP				1.0
+import QtQuick
+import QtQuick.Controls
+import JASP
 
 JaspTheme
 {

diff --git a/QMLComponents/components/JASP/Theme/qmldir → Desktop/components/JASP/Theme/qmldir b/QMLComponents/components/JASP/Theme/qmldir → Desktop/components/JASP/Theme/qmldir
diff --git a/Desktop/components/JASP/Widgets/AnalysisFormExpander.qml b/Desktop/components/JASP/Widgets/AnalysisFormExpander.qml
@@ -1,6 +1,6 @@
-import QtQuick						2.11
-import QtQuick.Controls				2.4
-import JASP.Controls				1.0
+import QtQuick
+import QtQuick.Controls
+import JASP.Controls
 import Qt5Compat.GraphicalEffects
 
 DropArea

diff --git a/Desktop/components/JASP/Widgets/AnalysisForms.qml b/Desktop/components/JASP/Widgets/AnalysisForms.qml
@@ -1,7 +1,6 @@
-import QtQuick			2.11
-import QtQuick.Controls	2.4
+import QtQuick
 import JASP
-import JASP.Controls	1.0
+import JASP.Controls
 
 
 FocusScope

diff --git a/Desktop/components/JASP/Widgets/ComputeColumnWindow.qml b/Desktop/components/JASP/Widgets/ComputeColumnWindow.qml
@@ -1,7 +1,7 @@
-import QtQuick			2.7
-import QtQuick.Controls 2.12
-import QtQuick.Layouts	1.3
-import JASP.Controls	1.0 as JaspControls
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import JASP.Controls	as JaspControls
 import JASP
 
 import "FilterConstructor"

diff --git a/Desktop/components/JASP/Widgets/CustomMenu.qml b/Desktop/components/JASP/Widgets/CustomMenu.qml
@@ -16,9 +16,9 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-import QtQuick						2.15
-import QtQuick.Controls				2.4
-import JASP.Controls				1.0 as JASPControl
+import QtQuick
+import QtQuick.Controls
+import JASP.Controls				as JASPControl
 import Qt5Compat.GraphicalEffects
 
 FocusScope

diff --git a/Desktop/components/JASP/Widgets/EnginesWindow.qml b/Desktop/components/JASP/Widgets/EnginesWindow.qml
@@ -1,8 +1,8 @@
-import QtQuick			2.12
-import QtQuick.Window	2.12
-import QtWebEngine		1.8
-import JASP.Widgets		1.0
-import JASP.Controls	1.0
+import QtQuick
+import QtQuick.Window
+import QtWebEngine
+import JASP.Widgets
+import JASP.Controls
 
 Window
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/BreadCrumbs.qml b/Desktop/components/JASP/Widgets/FileMenu/BreadCrumbs.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.11
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.4
-
-import JASP.Widgets 1.0
-import JASP.Controls 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import JASP.Widgets
+import JASP.Controls
 
 ListView
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/Computer.qml b/Desktop/components/JASP/Widgets/FileMenu/Computer.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-
-import JASP.Controls 1.0
-import JASP.Widgets 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import JASP.Controls
+import JASP.Widgets
 
 Item
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/FileList.qml b/Desktop/components/JASP/Widgets/FileMenu/FileList.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.11
-import QtQuick.Controls 2.4
-import JASP.Controls 1.0
+import QtQuick
+import QtQuick.Controls
+import JASP.Controls as JC
 
 
 ListView
@@ -81,7 +81,7 @@ ListView
 		hasBreadCrumbs:			listView.breadCrumbs !== null
 	}
 
-	JASPScrollBar
+	JC.JASPScrollBar
 	{
 		id:				rightscrollbar
 		flickable:		parent

diff --git a/Desktop/components/JASP/Widgets/FileMenu/FileMenu.qml b/Desktop/components/JASP/Widgets/FileMenu/FileMenu.qml
@@ -1,10 +1,10 @@
-import QtQuick 2.11
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import JASP.Controls 1.0
+import JASP.Controls
 import JASP
-import FileOperation 1.0
+import FileOperation
 
 FocusScope
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/ListItem.qml b/Desktop/components/JASP/Widgets/FileMenu/ListItem.qml
@@ -1,7 +1,5 @@
-import QtQuick 2.11
-import QtQuick.Controls 2.4
-import JASP.Controls 1.0
-
+import QtQuick
+import QtQuick.Controls
 
 FocusScope
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/MenuHeader.qml b/Desktop/components/JASP/Widgets/FileMenu/MenuHeader.qml
@@ -1,9 +1,8 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-
-import JASP.Widgets 1.0
-import JASP.Controls 1.0
+import QtQuick
+import QtQuick.Controls as QtC
+import QtQuick.Layouts
+import JASP.Widgets
+import JASP.Controls
 
 Item
 {
@@ -63,7 +62,7 @@ Item
 		}
 	}
 
-	ToolSeparator
+	QtC.ToolSeparator
 	{
 		id:				firstSeparator
 

diff --git a/Desktop/components/JASP/Widgets/FileMenu/OSF.qml b/Desktop/components/JASP/Widgets/FileMenu/OSF.qml
@@ -16,11 +16,10 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-import QtQuick 2.0
-import QtQuick.Controls 2.2
-
-import JASP.Controls 1.0
-import JASP.Widgets 1.0
+import QtQuick
+import QtQuick.Controls as QtC
+import JASP.Controls
+import JASP.Widgets
 
 //import QtQuick.Layouts  1.3
 
@@ -120,7 +119,7 @@ Item
 		sortMenuModel:	fileMenuModel.osf.sortedMenuModel
 	}
 
-	ToolSeparator
+	QtC.ToolSeparator
 	{
 		id			: firstSeparator
 		visible		: loggedin

diff --git a/Desktop/components/JASP/Widgets/FileMenu/PrefsAdvanced.qml b/Desktop/components/JASP/Widgets/FileMenu/PrefsAdvanced.qml
@@ -1,7 +1,7 @@
-import QtQuick			2.12
-import QtQuick.Controls 2.12
-import JASP.Widgets		1.0
-import JASP.Controls	1.0
+import QtQuick
+import QtQuick.Controls
+import JASP.Widgets
+import JASP.Controls
 
 ScrollView
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/PrefsGroupRect.qml b/Desktop/components/JASP/Widgets/FileMenu/PrefsGroupRect.qml
@@ -1,10 +1,9 @@
-import QtQuick			2.11
-import QtQuick.Controls 2.4
-import QtQuick.Layouts	1.3
-import JASP.Widgets		1.0
-
-import JASP.Controls	1.0
-import JASP				1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import JASP.Widgets
+import JASP.Controls
+import JASP
 
 Rectangle
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/PrefsResults.qml b/Desktop/components/JASP/Widgets/FileMenu/PrefsResults.qml
@@ -1,8 +1,7 @@
-import QtQuick			2.11
-import QtQuick.Controls 2.4
-import JASP.Widgets		1.0
-
-import JASP.Controls	1.0
+import QtQuick
+import QtQuick.Controls
+import JASP.Widgets
+import JASP.Controls
 
 ScrollView
 {

diff --git a/Desktop/components/JASP/Widgets/FileMenu/PrefsUI.qml b/Desktop/components/JASP/Widgets/FileMenu/PrefsUI.qml
@@ -1,8 +1,8 @@
-import QtQuick			2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts	1.3 as L
-import JASP.Widgets		1.0
-import JASP.Controls	1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts	as L
+import JASP.Widgets
+import JASP.Controls
 
 ScrollView
 {
@@ -80,7 +80,7 @@ ScrollView
 				}
 			}
 
-			GroupBox
+			Group
 			{
 				width:			parent.width
 

diff --git a/Desktop/components/JASP/Widgets/FilterWindow.qml b/Desktop/components/JASP/Widgets/FilterWindow.qml
@@ -1,6 +1,6 @@
-import QtQuick			2.12
-import QtQuick.Controls 2.12
-import JASP.Controls	1.0 as JaspControls
+import QtQuick
+import QtQuick.Controls
+import JASP.Controls	as JaspControls
 import "FilterConstructor"
 import JASP
 

diff --git a/Desktop/components/JASP/Widgets/HelpWindow.qml b/Desktop/components/JASP/Widgets/HelpWindow.qml
@@ -1,8 +1,8 @@
-import QtQuick			2.12
-import QtQuick.Window	2.12
-import QtWebEngine		1.8
-import JASP.Widgets		1.0
-import JASP.Controls	1.0
+import QtQuick
+import QtQuick.Window
+import QtWebEngine
+import JASP.Widgets
+import JASP.Controls
 
 Window
 {

diff --git a/Desktop/components/JASP/Widgets/JASPDataView.qml b/Desktop/components/JASP/Widgets/JASPDataView.qml
@@ -1,9 +1,9 @@
-import QtQuick			2.9
-import QtQuick.Window	2.3
-import QtQuick.Controls	2.2
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
 
-import JASP.Controls	1.0
-import JASP				1.0
+import JASP.Controls
+import JASP
 
 FocusScope
 {

diff --git a/Desktop/components/JASP/Widgets/MainPage.qml b/Desktop/components/JASP/Widgets/MainPage.qml
@@ -21,7 +21,7 @@ import QtWebEngine
 import QtWebChannel
 import JASP
 import QtQuick.Controls
-import JASP.Controls	1.0 as JC
+import JASP.Controls		as JC
 
 Item
 {

diff --git a/Desktop/components/JASP/Widgets/MessageBox.qml b/Desktop/components/JASP/Widgets/MessageBox.qml
@@ -1,10 +1,9 @@
-import QtQuick 2.11
-import QtQuick.Controls 2.4
-import JASP.Controls 1.0
-//import QtQuick.Dialogs 1.2
+import QtQuick
+import QtQuick.Controls as QtC
+import JASP.Controls
 
 
-Popup
+QtC.Popup
 //MessageDialog
 {
 	id: messageRoot

diff --git a/Desktop/components/JASP/Widgets/ModuleInstaller.qml b/Desktop/components/JASP/Widgets/ModuleInstaller.qml
@@ -16,12 +16,11 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-import QtQuick					2.11
-import QtQuick.Controls			2.7 as QTCONTROLS
-import Qt.labs.folderlistmodel	2.11
-//import QtQuick.Window			2.3
-import JASP.Controls			1.0
-import JASP.Widgets				1.0
+import QtQuick
+import QtQuick.Controls			as QTCONTROLS
+import Qt.labs.folderlistmodel
+import JASP.Controls
+import JASP.Widgets
 
 QTCONTROLS.Popup
 {

diff --git a/Desktop/components/JASP/Widgets/PlotEditor/PlotEditingAxis.qml b/Desktop/components/JASP/Widgets/PlotEditor/PlotEditingAxis.qml
@@ -1,11 +1,11 @@
-import QtQuick				2.14
-import QtQuick.Controls		2.14
-import QtQuick.Layouts		1.3
-import JASP.Widgets			1.0		as	JASPW
-import JASP.Theme			1.0
-import JASP.Controls		1.0		as	JASPC
-import JASP.PlotEditor		1.0
-import JASP					1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import JASP.Widgets			as	JASPW
+import JASP.Theme
+import JASP.Controls		as	JASPC
+import JASP.PlotEditor
+import JASP
 
 /*
 	TODO: it might make sense to add a global title/ box around all the options inside one axis.

diff --git a/Desktop/components/JASP/Widgets/PlotEditor/PlotEditor.qml b/Desktop/components/JASP/Widgets/PlotEditor/PlotEditor.qml
@@ -1,10 +1,10 @@
-import QtQuick				2.14
-import QtQuick.Controls		6.0
-import QtQuick.Layouts		1.3
-import JASP.Widgets			1.0		as	JASPW
-import JASP.Theme			1.0
-import JASP.Controls		1.0		as	JASPC
-import JASP.PlotEditor		1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import JASP.Widgets			as	JASPW
+import JASP.Theme
+import JASP.Controls		as	JASPC
+import JASP.PlotEditor
 
 Popup
 {