diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 18aefd8..4e39b18 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -79,6 +79,7 @@ add_subdirectory(awesomewidgets) add_subdirectory(extsysmonsources) add_subdirectory(extsysmon) if (BUILD_PLASMOIDS) + add_subdirectory(qml) add_subdirectory(awesome-widget) add_subdirectory(desktop-panel) add_subdirectory(translations) diff --git a/sources/awesome-widget/package/contents/ui/qmldir b/sources/awesome-widget/package/contents/ui/qmldir index e26da51..f627c3a 100644 --- a/sources/awesome-widget/package/contents/ui/qmldir +++ b/sources/awesome-widget/package/contents/ui/qmldir @@ -1,11 +1,12 @@ singleton general 1.0 general.qml -BugReport ./BugReport.qml -ButtonSelector ./ButtonSelector.qml -CheckBoxSelector ./CheckBoxSelector.qml -ColorSelector ./ColorSelector.qml -ComboBoxSelector ./ComboBoxSelector.qml -ExportDialog ./ExportDialog.qml -FontSelector ./FontSelector.qml -ImportDialog ./ImportDialog.qml -IntegerSelector ./IntegerSelector.qml -LineSelector ./LineSelector.qml + +BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml +ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml +CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml +ColorSelector file:///usr/share/awesomewidgets/qml/ColorSelector.qml +ComboBoxSelector file:///usr/share/awesomewidgets/qml/ComboBoxSelector.qml +ExportDialog file:///usr/share/awesomewidgets/qml/ExportDialog.qml +FontSelector file:///usr/share/awesomewidgets/qml/FontSelector.qml +ImportDialog file:///usr/share/awesomewidgets/qml/ImportDialog.qml +IntegerSelector file:///usr/share/awesomewidgets/qml/IntegerSelector.qml +LineSelector file:///usr/share/awesomewidgets/qml/LineSelector.qml diff --git a/sources/desktop-panel/package/contents/ui/qmldir b/sources/desktop-panel/package/contents/ui/qmldir index c5315a3..f627c3a 100644 --- a/sources/desktop-panel/package/contents/ui/qmldir +++ b/sources/desktop-panel/package/contents/ui/qmldir @@ -1 +1,12 @@ singleton general 1.0 general.qml + +BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml +ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml +CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml +ColorSelector file:///usr/share/awesomewidgets/qml/ColorSelector.qml +ComboBoxSelector file:///usr/share/awesomewidgets/qml/ComboBoxSelector.qml +ExportDialog file:///usr/share/awesomewidgets/qml/ExportDialog.qml +FontSelector file:///usr/share/awesomewidgets/qml/FontSelector.qml +ImportDialog file:///usr/share/awesomewidgets/qml/ImportDialog.qml +IntegerSelector file:///usr/share/awesomewidgets/qml/IntegerSelector.qml +LineSelector file:///usr/share/awesomewidgets/qml/LineSelector.qml diff --git a/sources/awesome-widget/package/contents/ui/BugReport.qml b/sources/qml/BugReport.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/BugReport.qml rename to sources/qml/BugReport.qml diff --git a/sources/awesome-widget/package/contents/ui/ButtonSelector.qml b/sources/qml/ButtonSelector.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/ButtonSelector.qml rename to sources/qml/ButtonSelector.qml diff --git a/sources/qml/CMakeLists.txt b/sources/qml/CMakeLists.txt new file mode 100644 index 0000000..1834fef --- /dev/null +++ b/sources/qml/CMakeLists.txt @@ -0,0 +1,12 @@ +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) + +# install +install(FILES ${SUBPROJECT_SOURCE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/qml) diff --git a/sources/awesome-widget/package/contents/ui/CheckBoxSelector.qml b/sources/qml/CheckBoxSelector.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/CheckBoxSelector.qml rename to sources/qml/CheckBoxSelector.qml diff --git a/sources/awesome-widget/package/contents/ui/ColorSelector.qml b/sources/qml/ColorSelector.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/ColorSelector.qml rename to sources/qml/ColorSelector.qml diff --git a/sources/awesome-widget/package/contents/ui/ComboBoxSelector.qml b/sources/qml/ComboBoxSelector.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/ComboBoxSelector.qml rename to sources/qml/ComboBoxSelector.qml diff --git a/sources/awesome-widget/package/contents/ui/ExportDialog.qml b/sources/qml/ExportDialog.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/ExportDialog.qml rename to sources/qml/ExportDialog.qml diff --git a/sources/awesome-widget/package/contents/ui/FontSelector.qml b/sources/qml/FontSelector.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/FontSelector.qml rename to sources/qml/FontSelector.qml diff --git a/sources/awesome-widget/package/contents/ui/ImportDialog.qml b/sources/qml/ImportDialog.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/ImportDialog.qml rename to sources/qml/ImportDialog.qml diff --git a/sources/awesome-widget/package/contents/ui/IntegerSelector.qml b/sources/qml/IntegerSelector.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/IntegerSelector.qml rename to sources/qml/IntegerSelector.qml diff --git a/sources/awesome-widget/package/contents/ui/LineSelector.qml b/sources/qml/LineSelector.qml similarity index 100% rename from sources/awesome-widget/package/contents/ui/LineSelector.qml rename to sources/qml/LineSelector.qml diff --git a/sources/qml/qmldir.in b/sources/qml/qmldir.in new file mode 100644 index 0000000..02a5f57 --- /dev/null +++ b/sources/qml/qmldir.in @@ -0,0 +1,12 @@ +singleton general 1.0 general.qml + +BugReport file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/BugReport.qml +ButtonSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/ButtonSelector.qml +CheckBoxSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/CheckBoxSelector.qml +ColorSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/ColorSelector.qml +ComboBoxSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/ComboBoxSelector.qml +ExportDialog file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/ExportDialog.qml +FontSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/FontSelector.qml +ImportDialog file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/ImportDialog.qml +IntegerSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/IntegerSelector.qml +LineSelector file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/LineSelector.qml