refactor: use default qml library paths

previous implementation stores data in share instead of lib (I guess, I had issues with using default paths?). Let's use normal paths instead
arcan1s · Mar 31, 2024 · ac52888 · ac52888
1 parent a35b57e
commit ac52888
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 108 deletions.
diff --git a/sources/awesome-widget/package/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml
@@ -18,7 +18,8 @@
 import QtQuick 2.15
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
 KCM.SimpleKCM {

diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml
@@ -19,7 +19,8 @@ import QtQuick 2.15
 import QtQuick.Controls
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
 KCM.SimpleKCM {

diff --git a/sources/awesome-widget/package/contents/ui/appearance.qml b/sources/awesome-widget/package/contents/ui/appearance.qml
@@ -18,8 +18,8 @@
 import QtQuick 2.15
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
-import "."
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
 KCM.SimpleKCM {

diff --git a/sources/awesome-widget/package/contents/ui/dataengine.qml b/sources/awesome-widget/package/contents/ui/dataengine.qml
@@ -19,7 +19,8 @@ import QtQuick 2.15
 import QtQuick.Controls
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
 KCM.SimpleKCM {

diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml
@@ -22,8 +22,8 @@ import QtQuick.Layouts
 import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0
 
-import org.kde.plasma.private.awesomewidget 1.0
-import "."
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
 PlasmoidItem {

diff --git a/sources/awesome-widget/package/contents/ui/qmldir b/sources/awesome-widget/package/contents/ui/qmldir
diff --git a/sources/awesome-widget/package/contents/ui/tooltip.qml b/sources/awesome-widget/package/contents/ui/tooltip.qml
@@ -19,7 +19,8 @@ import QtQuick 2.15
 import QtQuick.Controls
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
 KCM.SimpleKCM {

diff --git a/sources/awesome-widget/package/contents/ui/widget.qml b/sources/awesome-widget/package/contents/ui/widget.qml
@@ -19,8 +19,8 @@ import QtQuick 2.15
 import QtQuick.Controls
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
-import "."
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
 KCM.SimpleKCM {

diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml
@@ -18,7 +18,8 @@
 import QtQuick 2.15
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.desktoppanel 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.desktoppanel
 
 
 KCM.SimpleKCM {

diff --git a/sources/desktop-panel/package/contents/ui/activeapp.qml b/sources/desktop-panel/package/contents/ui/activeapp.qml
@@ -18,8 +18,8 @@
 import QtQuick 2.15
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.desktoppanel 1.0
-import "."
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.desktoppanel
 
 
 KCM.SimpleKCM {

diff --git a/sources/desktop-panel/package/contents/ui/advanced.qml b/sources/desktop-panel/package/contents/ui/advanced.qml
@@ -19,7 +19,8 @@ import QtQuick 2.15
 import QtQuick.Controls
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.desktoppanel 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.desktoppanel
 
 
 KCM.SimpleKCM {

diff --git a/sources/desktop-panel/package/contents/ui/inactiveapp.qml b/sources/desktop-panel/package/contents/ui/inactiveapp.qml
@@ -18,8 +18,8 @@
 import QtQuick 2.15
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.desktoppanel 1.0
-import "."
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.desktoppanel
 
 
 KCM.SimpleKCM {

diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts
 import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0
 
-import org.kde.plasma.private.desktoppanel 1.0
-import "."
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.desktoppanel
 
 
 PlasmoidItem {

diff --git a/sources/desktop-panel/package/contents/ui/qmldir b/sources/desktop-panel/package/contents/ui/qmldir
diff --git a/sources/desktop-panel/package/contents/ui/widget.qml b/sources/desktop-panel/package/contents/ui/widget.qml
@@ -18,8 +18,8 @@
 import QtQuick 2.15
 import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.desktoppanel 1.0
-import "."
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.desktoppanel
 
 
 KCM.SimpleKCM {

diff --git a/sources/qml/CMakeLists.txt b/sources/qml/CMakeLists.txt
@@ -1,12 +1,7 @@
 set(SUBPROJECT awesomewidgets-qml)
 message(STATUS "Subproject ${SUBPROJECT}")
 
-file(GLOB SUBPROJECT_SOURCE *.qml)
-file(GLOB SUBPROJECT_QMLDIR_IN qmldir.in)
-
-# prepare
-configure_file(${SUBPROJECT_QMLDIR_IN} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/package/contents/ui/qmldir)
-configure_file(${SUBPROJECT_QMLDIR_IN} ${CMAKE_CURRENT_SOURCE_DIR}/../desktop-panel/package/contents/ui/qmldir)
+file(GLOB SUBPROJECT_SOURCE *.qml qmldir)
 
 # install
-install(FILES ${SUBPROJECT_SOURCE} DESTINATION ${KDE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/qml)
+install(FILES ${SUBPROJECT_SOURCE} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/${PROJECT_NAME})
diff --git a/sources/qml/qmldir b/sources/qml/qmldir
@@ -0,0 +1,23 @@
+# common QML constants
+singleton General 1.0 General.qml
+
+# custom QML UI classes
+AboutTab AboutTab.qml
+AWExtensions AWExtensions.qml
+AWInfoLabel AWInfoLabel.qml
+AWTagSelector AWTagSelector.qml
+AWTextEditor AWTextEditor.qml
+BugReport BugReport.qml
+ButtonSelector ButtonSelector.qml
+CheckBoxSelector CheckBoxSelector.qml
+ColorSelector ColorSelector.qml
+ComboBoxSelector ComboBoxSelector.qml
+ExportDialog ExportDialog.qml
+FontSelector FontSelector.qml
+HtmlDefaultFunctionsBar HtmlDefaultFunctionsBar.qml
+HtmlEditorButton HtmlEditorButton.qml
+HtmlEditorColor HtmlEditorColor.qml
+HtmlEditorFont HtmlEditorFont.qml
+ImportDialog ImportDialog.qml
+IntegerSelector IntegerSelector.qml
+LineSelector LineSelector.qml
diff --git a/sources/qml/qmldir.in b/sources/qml/qmldir.in