feat: migrate QML plugins to Qt6 resource system

CMakeLists.txt

@@ -117,12 +117,13 @@ if(BUILD_DOCS)
     add_subdirectory(docs)
 endif()
 
-set(DCC_TRANSLATION_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/translations/v1.0" CACHE STRING "Install dir for dde-control-center translate files")
+set(DCC_PLUGINS_VERSION 1.1)
+set(DCC_TRANSLATION_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/translations/v${DCC_PLUGINS_VERSION}" CACHE STRING "Install dir for dde-control-center translate files")
 
 # 输出目录
 set(DCC_LIBDIR ${PROJECT_BINARY_DIR}/lib)
 # 插件目录
-set(DCC_PLUGINS_DIR plugins_v1.0)
+set(DCC_PLUGINS_DIR plugins_v${DCC_PLUGINS_VERSION})
 # 安装目录
 set(DCC_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/dde-control-center)
 set(DCC_DEBUG_LIBDIR ${DCC_INSTALL_DIR})
@@ -205,6 +206,8 @@ add_subdirectory(src/dde-control-center)
 #-----------------------shared-utils------------------------
 add_subdirectory(src/shared-utils)
 #--------------------------plugins--------------------------
+add_subdirectory(src/plugin-system)
+add_subdirectory(src/plugin-device)
 add_subdirectory(src/plugin-accounts)
 if (NOT DISABLE_AUTHENTICATION)
     add_subdirectory(src/plugin-authentication)

misc/DdeControlCenterConfig.cmake.in

@@ -1,6 +1,7 @@
 @PACKAGE_INIT@
 include(CMakeFindDependencyMacro)
 include(${CMAKE_CURRENT_LIST_DIR}/DdeControlCenterTargets.cmake)
+set(DDE_CONTROL_CENTER_PLUGIN_VERSION @DCC_PLUGINS_VERSION@)
 set(DDE_CONTROL_CENTER_PLUGIN_DIR @DCC_PLUGINS_DIR@)
 set(DDE_CONTROL_CENTER_PLUGIN_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DCC_PLUGINS_INSTALL_DIR@)
 set(DDE_CONTROL_CENTER_TRANSLATION_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DCC_TRANSLATION_INSTALL_DIR@)

misc/DdeControlCenterPluginMacros.cmake

@@ -1,20 +1,84 @@
 include(CMakeParseArguments)
 
+function(dcc_to_capitalized_string input_string output_variable)
+    if(NOT input_string STREQUAL "")
+        string(SUBSTRING ${input_string} 0 1 first_char)
+        string(SUBSTRING ${input_string} 1 -1 rest_chars)
+        string(TOUPPER ${first_char} capitalized_first_char)
+        set(result "${capitalized_first_char}${rest_chars}")
+    else()
+        set(result "")
+    endif()
+    set(${output_variable} ${result} PARENT_SCOPE)
+endfunction()
+
+
 macro(dcc_build_plugin)
     set(oneValueArgs NAME TARGET QML_ROOT_DIR)
-    set(qml_root_dir ${CMAKE_CURRENT_SOURCE_DIR}/qml)
+    set(multiValueArgs QML_FILES RESOURCE_FILES)
+    set(QML_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qml)
+    find_package(Qt6 COMPONENTS Qml)
     cmake_parse_arguments(_config "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT "${_config_NAME}" MATCHES "^[A-Za-z0-9]+$")
+        message(FATAL_ERROR "Error: The name '${_config_NAME}' contains invalid characters. Only alphanumeric characters are allowed.")
+    endif()
+
     if (DEFINED _config_QML_ROOT_DIR)
-        set(qml_root_dir ${_config_QML_ROOT_DIR})
+        set(QML_ROOT_DIR ${_config_QML_ROOT_DIR})
     endif()
-    file(GLOB_RECURSE qml_files ${qml_root_dir}/*)
-    add_custom_target(${_config_NAME}_qml ALL
-        SOURCES ${qml_files}
-    )
+
+
+    if(NOT _config_QML_FILES)
+        file(GLOB_RECURSE _config_QML_FILES ${QML_ROOT_DIR}/*.qml ${QML_ROOT_DIR}/*.js)
+    endif()
+
+    if(NOT _config_RESOURCE_FILES)
+        file(GLOB_RECURSE _config_RESOURCE_FILES ${QML_ROOT_DIR}/*.dci ${QML_ROOT_DIR}/*.svg ${QML_ROOT_DIR}/*.png ${QML_ROOT_DIR}/*.jpg ${QML_ROOT_DIR}/*.webp)
+    endif()
+
     set(plugin_dirs ${PROJECT_BINARY_DIR}/lib/${DDE_CONTROL_CENTER_PLUGIN_DIR}/${_config_NAME}/)
-    add_custom_command(TARGET ${_config_NAME}_qml POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${qml_root_dir} ${plugin_dirs}
+    foreach(FILE_PATH ${_config_QML_FILES})
+        file(RELATIVE_PATH FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR} ${FILE_PATH})
+        list(APPEND QML_PATHS ${FILE_NAME})
+
+        file(RELATIVE_PATH F_NAME ${QML_ROOT_DIR} ${FILE_PATH})
+
+        if(${F_NAME} STREQUAL "main.qml")
+            dcc_to_capitalized_string(${_config_NAME} UPPERNAME)
+            message(FATAL_ERROR "Error: The filename '${F_NAME}' is deprecated. Please rename it to ${UPPERNAME}Main.qml. path:${FILE_PATH}")
+        endif()
+        if(NOT "${F_NAME}" MATCHES "^[A-Z]")
+           dcc_to_capitalized_string(${F_NAME} UPPERNAME)
+           message(FATAL_ERROR "Error: The filename '${F_NAME}' must start with an uppercase letter. Please rename it to ${UPPERNAME}. path:${FILE_PATH}")
+        endif()
+
+        set_source_files_properties(${FILE_NAME} PROPERTIES
+            QT_RESOURCE_ALIAS ${F_NAME}
+        )
+    endforeach(FILE_PATH)
+
+    foreach(FILE_PATH ${_config_RESOURCE_FILES})
+        file(RELATIVE_PATH FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR} ${FILE_PATH})
+        list(APPEND RESOURCE_PATHS ${FILE_NAME})
+
+        file(RELATIVE_PATH F_NAME ${QML_ROOT_DIR} ${FILE_PATH})
+        set_source_files_properties(${FILE_NAME} PROPERTIES
+            QT_RESOURCE_ALIAS ${F_NAME}
+        )
+    endforeach(FILE_PATH)
+    qt_policy(SET QTP0001 NEW)
+    qt_policy(SET QTP0004 NEW)
+    qt_add_qml_module(${_config_NAME}_qml
+        PLUGIN_TARGET ${_config_NAME}_qml
+        URI ${_config_NAME}
+        VERSION 1.0
+        QML_FILES ${QML_PATHS}
+        RESOURCES ${RESOURCE_PATHS}
+        OUTPUT_DIRECTORY ${plugin_dirs}
     )
+    install(TARGETS ${_config_NAME}_qml DESTINATION ${DDE_CONTROL_CENTER_PLUGIN_INSTALL_DIR}/${_config_NAME})
+    install(FILES ${plugin_dirs}/qmldir DESTINATION ${DDE_CONTROL_CENTER_PLUGIN_INSTALL_DIR}/${_config_NAME})
 
     if (DEFINED _config_TARGET)
         set_target_properties(${_config_TARGET} PROPERTIES
@@ -33,7 +97,6 @@ function(dcc_install_plugin)
         install(TARGETS ${_config_TARGET} DESTINATION ${DDE_CONTROL_CENTER_PLUGIN_INSTALL_DIR}/${_config_NAME})
     endif()
 
-    install(DIRECTORY ${plugin_dirs} DESTINATION ${DDE_CONTROL_CENTER_PLUGIN_INSTALL_DIR}/${_config_NAME})
 endfunction()
 
 function(dcc_handle_plugin_translation)

src/dde-control-center/CMakeLists.txt

@@ -2,31 +2,18 @@ cmake_minimum_required(VERSION 3.18)
 
 #--------------------------frame--------------------------
 set(DCCFrame_Name ${DCC_FRAME_Library})
-file(GLOB DCCFrame_SRCS
-    "${DCC_PROJECT_ROOT_DIR}/include/*.h"
-    "frame/*.cpp"
-    "frame/*.h"
-)
 
 add_library(${DCCFrame_Name} SHARED
-    ${DCCFrame_SRCS}
+    "${DCC_PROJECT_ROOT_DIR}/include/dccfactory.h"
 )
 
 find_package(${QT_NS} COMPONENTS QmlModels REQUIRED)
 if(${QT_NS}_VERSION VERSION_GREATER_EQUAL 6.10)
   find_package(${QT_NS} COMPONENTS QmlModelsPrivate QuickPrivate REQUIRED)
 endif()
 
-set(DCCFrame_Libraries
-    ${DTK_NS}::Gui
-    ${QT_NS}::Gui
-    ${QT_NS}::Quick
-    ${QT_NS}::QuickPrivate
-    ${QT_NS}::QmlModelsPrivate
-)
-
 target_link_libraries(${DCCFrame_Name} PRIVATE
-    ${DCCFrame_Libraries}
+    ${QT_NS}::Core
 )
 
 set_target_properties(${DCCFrame_Name} PROPERTIES
@@ -48,7 +35,7 @@ install(EXPORT DdeControlCenterTargets
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DdeControlCenter
 )
 #--------------------------qml-plugin--------------------------
-add_subdirectory(frame/plugin)
+add_subdirectory(plugin)
 #--------------------------dde-control-center--------------------------
 set(Control_Center_Name dde-control-center)
 file(GLOB Control_Center_SRCS
@@ -64,8 +51,8 @@ add_executable(${Control_Center_Name}
 target_compile_definitions(${Control_Center_Name} PRIVATE CVERSION="${CMAKE_PROJECT_VERSION}")
 
 target_include_directories(${Control_Center_Name} PRIVATE
-    include/interface
-    frame
+    include
+    plugin
 )
 
 set(Control_Center_Libraries
@@ -75,26 +62,18 @@ set(Control_Center_Libraries
     ${QT_NS}::DBus
     ${QT_NS}::Concurrent
     ${QT_NS}::Quick
+    dde-control-center-lib
 )
 
 target_link_libraries(${Control_Center_Name} PRIVATE
     ${Control_Center_Libraries}
 )
 
-file(GLOB_RECURSE qmlFiles  "${DCC_PROJECT_ROOT_DIR}/qml/*.*")
-add_custom_target(${Control_Center_Name}_qml ALL
-    SOURCES ${qmlFiles}
-)
-add_custom_command(TARGET ${Control_Center_Name}_qml POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${DCC_PROJECT_ROOT_DIR}/qml" ${DCC_LIBDIR}
-)
-
 file(GLOB_RECURSE DCC_Translation_QML_FILES ${DCC_PROJECT_ROOT_DIR}/qml/*.qml ${DCC_PROJECT_ROOT_DIR}/src/*.qml)
 file(GLOB_RECURSE DCC_Translation_SOURCE_FILES ${DCC_PROJECT_ROOT_DIR}/src/*.cpp ${DCC_PROJECT_ROOT_DIR}/src/*.h)
 dcc_handle_plugin_translation(NAME ${Control_Center_Name} SOURCE_DIR ${DCC_PROJECT_ROOT_DIR} QML_FILES ${DCC_Translation_QML_FILES} SOURCE_FILES ${DCC_Translation_SOURCE_FILES})
 # bin
 install(TARGETS ${Control_Center_Name} DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(DIRECTORY "${DCC_PROJECT_ROOT_DIR}/qml/" DESTINATION ${DCC_INSTALL_DIR})
 #----------------------------install config------------------------------
 #desktop
 install(FILES ${DCC_PROJECT_ROOT_DIR}/misc/org.deepin.dde.control-center.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)

src/dde-control-center/dccmanager.cpp

@@ -14,20 +14,20 @@
 #include <DIconTheme>
 
 #include <QCoreApplication>
 #include <QDBusConnection>
 #include <QDBusPendingCall>
 #include <QElapsedTimer>
+#include <QFileInfo>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QLoggingCategory>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQuickWindow>
 #include <QTimer>
 #include <QTranslator>
 #include <QWindow>
-#include <QFileInfo>
 
 DCORE_USE_NAMESPACE
 
@@ -82,40 +82,23 @@
 
 bool DccManager::installTranslator(const QString &name)
 {
-    QTranslator *translator = new QTranslator(qApp);
-    if (translator->load(QLocale(), name, "_", TRANSLATE_READ_DIR)) {
-        qApp->installTranslator(translator);
-#if 1 // 兼容旧版位置
-    } else if (translator->load(QLocale(), name, "_", TRANSLATE_READ_DIR "/..")) {
-        qApp->installTranslator(translator);
-#endif
-    } else {
-        delete translator;
-        qCWarning(dccLog()) << "install translator fail:" << name << ", dir:" << TRANSLATE_READ_DIR;
-        return false;
-    }
-    return true;
+    const QStringList translateDirs = { TRANSLATE_READ_DIR,
+                                        TRANSLATE_READ_DIR "/../v1.0", // 兼容旧版位置
+                                        TRANSLATE_READ_DIR "/.." };
+    return Dtk::Gui::DGuiApplicationHelper::loadTranslator(name, translateDirs, { QLocale() });
 }
 
 void DccManager::init()
 {
     if (m_engine)
         return;
 
+    QQmlEngine::setObjectOwnership(dccV25::DccApp::instance(), QQmlEngine::CppOwnership);
+    qmlRegisterSingletonInstance("org.deepin.dcc", 1, 0, "DccApp", dccV25::DccApp::instance());
+
     m_engine = new QQmlApplicationEngine(this);
-    auto paths = m_engine->importPathList();
-    paths.prepend(DefaultModuleDirectory);
-    const auto runtimePluginDir = QCoreApplication::applicationDirPath() + "/../lib/";
-    if (QFileInfo::exists(runtimePluginDir)) {
-        paths.prepend(runtimePluginDir);
-    }
-    qCInfo(dccLog()) << "Import paths:" << paths;
-    m_engine->setImportPathList(paths);
     m_imageProvider = new DccImageProvider();
     m_engine->addImageProvider("DccImage", m_imageProvider);
-    QStringList dciPaths = Dtk::Gui::DIconTheme::dciThemeSearchPaths();
-    dciPaths << QStringLiteral(DefaultModuleDirectory);
-    Dtk::Gui::DIconTheme::setDciThemeSearchPaths(dciPaths);
 }
 
 QQmlApplicationEngine *DccManager::engine()
@@ -134,7 +117,7 @@
 void DccManager::loadModules(bool async, const QStringList &dirs)
 {
     // onAddModule(m_rootModule);
-    m_plugins->loadModules(m_root, async, dirs);
+    m_plugins->loadModules(m_root, async, dirs, m_engine);
     // showModule(m_rootModule);
 }