fix: fix qml res path on start.

kevinlq · Jan 3, 2024 · 9d22b5e · 9d22b5e
1 parent b08a363
commit 9d22b5e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -58,8 +58,6 @@ From this project, you can learn the following knowledge points:
 -…
 
 ![login](images/login1.png)
-![login](images/login2.png)
-![chat](images/chat1.png)
 ![chat](images/chat2.png)
 ![favorit](images/favorit1.png)
 ![setting](images/setting1.png)

diff --git a/README_zh.md b/README_zh.md
@@ -58,8 +58,6 @@
 - ……
 
 ![login](images/login1.png)
-![login](images/login2.png)
-![chat](images/chat1.png)
 ![chat](images/chat2.png)
 ![favorit](images/favorit1.png)
 ![setting](images/setting1.png)

diff --git a/src/KQML/Config/Theme/ThemeBase.qml b/src/KQML/Config/Theme/ThemeBase.qml
@@ -22,7 +22,7 @@
   this is base theme style
 */
 import QtQuick 2.15
-import "./themeElement"
+import "./../../Config/Theme/ThemeElement"
 
 QtObject {
 

diff --git a/src/KQML/Login/LoginIngPage.qml b/src/KQML/Login/LoginIngPage.qml
@@ -20,6 +20,7 @@
 import QtQuick 2.11
 import QtQuick.Layouts 1.13
 import "./../Component"
+import "./../Config"
 
 BasePage {
 
@@ -31,7 +32,7 @@ BasePage {
         id: _titleLabel
         width: 79
         height: 79
-        source: "Config/Theme/logo.jpg"
+        source: KGlHelp.useAvatar
         anchors {
             top: parent.top
             topMargin: 52

diff --git a/src/KQML/Login/LoginWindow.qml b/src/KQML/Login/LoginWindow.qml
@@ -63,7 +63,7 @@ KWindow
         KGlHelp.loginUserName = "wxid_1024"
         KGlHelp.loginNickName = "kevinlq"
         KGlHelp.userCachePath = SettingsHelper.userCachePath()
-        KGlHelp.useAvatar = "Config/Theme/images/contact/" + KGlHelp.loginUserName + ".png"
+        KGlHelp.useAvatar = "/Config/Theme/images/contact/" + KGlHelp.loginUserName + ".png"
 
         KGlHelp.debugUserInfo()
     }

diff --git a/src/KQML/Login/ScanQRCodePage.qml b/src/KQML/Login/ScanQRCodePage.qml
@@ -51,7 +51,7 @@ BasePage {
             width: 180
             height: 180
             anchors.centerIn: parent
-            source: "Config/Theme/qrcode.jpg"
+            source: "/Config/Theme/qrcode.jpg"
         }
     }
     KTextButton {

diff --git a/src/KWeChatClient/CMakeLists.txt b/src/KWeChatClient/CMakeLists.txt
@@ -34,7 +34,7 @@ if(WIN32)
     set(WIN32_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/kchatIcon.rc)
 endif()
 
-add_executable(${TARGET_NAME}
+add_executable(${TARGET_NAME} WIN32
     ${CLIENT_SOURCES}
     ${CLIENT_HEADERS}
     ${INTERFACE_SOURCES}
@@ -46,9 +46,11 @@ add_executable(${TARGET_NAME}
     ${WIN32_RESOURCES}
 )
 
-target_sources(${TARGET_NAME} PRIVATE
-    ${PROJECT_SOURCE_DIR}/src/KChatApp.qrc
-)
+# target_sources(${TARGET_NAME} PRIVATE
+#     ${PROJECT_SOURCE_DIR}/src/KChatApp.qrc
+# )
+add_custom_target(KAppRes
+    SOURCES ${PROJECT_SOURCE_DIR}/src/KChatApp.qrc)
 
 target_include_directories(${TARGET_NAME} PUBLIC
     ${PROJECT_SOURCE_DIR}/src

diff --git a/src/KWeChatClient/Client/KStartManager.cpp b/src/KWeChatClient/Client/KStartManager.cpp
@@ -65,12 +65,20 @@ int KStartManager::start(int &argc, char *argv[])
     QString qmlRes = "qrc:/KQML/App.qml";
     QString resPrefix = ":/KQML";
     //! TODO local debug use
-    if(true)
+    if(false)
     {
         qmlRes = QString("file:///%1/src/KQML/App.qml").arg(IDE_SOURCE_PATH);
         QFileInfo fInfo(QUrl(qmlRes).toLocalFile());
         resPrefix = fInfo.absolutePath() + "/";
     }
+    else {
+        QString strFullResPath = QCoreApplication::applicationDirPath() + "/config/KSkinRes.rcc";
+        if (!QResource::registerResource(strFullResPath))
+        {
+            LOG_ERROR() << "QResource registerResource qml failed! " << strFullResPath;
+            return 1;
+        }
+    }
     settingHelp->setResPrefix(resPrefix);
 
     const QUrl url(qmlRes);