Merge branch 'main' into task_74

src/Client/CMakeLists.txt

@@ -72,3 +72,16 @@ if(QT_VERSION_MAJOR EQUAL 6)
     qt_import_qml_plugins(${CURRENT_PROJECT})
     qt_finalize_executable(${CURRENT_PROJECT})
 endif()
+
+set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts
+          ${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts)
+
+prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")

src/Client/CrawlClient.qrc

@@ -0,0 +1,14 @@
+<RCC>
+    <qresource prefix="/crawlTranslations">
+        <file>languages/de.qm</file>
+        <file>languages/en.qm</file>
+        <file>languages/es.qm</file>
+        <file>languages/fr.qm</file>
+        <file>languages/ja.qm</file>
+        <file>languages/pl.qm</file>
+        <file>languages/ru.qm</file>
+        <file>languages/tr.qm</file>
+        <file>languages/uk.qm</file>
+        <file>languages/zh.qm</file>
+    </qresource>
+</RCC>

src/Client/main.cpp

@@ -9,9 +9,24 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <Crawl/clientapp.h>
-#include <testlevel.h>
+#include <testlvl.h>
+#include <quasarapp.h>
 #include <jungle.h>
 
+void initLang() {
+    QLocale locale = QLocale::system();
+    QString customLanguage = QuasarAppUtils::Params::getArg("lang");
+    if(customLanguage.size()) {
+        locale = QLocale(customLanguage);
+    }
+
+    if(!QuasarAppUtils::Locales::init(locale, {":/crawlTranslations/languages/",
+                                               ":/credits_languages/",
+                                               ":/qmlNotify_languages/",
+                                               ":/lv_languages/"})){
+        QuasarAppUtils::Params::log("Error load language : ", QuasarAppUtils::Error);
+    }
+}
 
 int main(int argc, char *argv[])
 {
@@ -29,5 +44,8 @@ int main(int argc, char *argv[])
     if (!client.init(&engine)) {
         return 1;
     }
+
+    initLang();
+
     return app.exec();
 }

src/Core/CMakeLists.txt

@@ -35,17 +35,4 @@ target_link_libraries(${CURRENT_PROJECT} PUBLIC
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
 target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
 
-set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts)
-
-prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")
-
 set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/" CACHE STRING "" FORCE)

src/Core/Crawl.qrc

@@ -14,19 +14,4 @@
         <file>CrawlModule/DefaultMenu.qml</file>
         <file>CrawlModule/AbstractMenuView.qml</file>
     </qresource>
-    <qresource prefix="/SnakeTr">
-        <file>languages/de.qm</file>
-        <file>languages/en.qm</file>
-        <file>languages/es.qm</file>
-        <file>languages/fr.qm</file>
-        <file>languages/ja.qm</file>
-        <file>languages/pl.qm</file>
-        <file>languages/ru.qm</file>
-        <file>languages/tr.qm</file>
-        <file>languages/zh.qm</file>
-        <file>languages/uk.qm</file>
-    </qresource>
-    <qresource prefix="/images"/>
-    <qresource prefix="/mesh"/>
-    <qresource prefix="/hdr"/>
 </RCC>

src/Core/Crawl/clientapp.cpp

@@ -54,21 +54,6 @@ ClientApp::~ClientApp() {
     _availableLvls.clear();
 }
 
-void ClientApp::initLang() {
-    QLocale locale = QLocale::system();
-    QString customLanguage = QuasarAppUtils::Params::getArg("lang");
-    if(customLanguage.size()) {
-        locale = QLocale(customLanguage);
-    }
-
-    if(!QuasarAppUtils::Locales::init(locale, {":/languages/languages/",
-                                               ":/credits_languages/",
-                                               ":/qmlNotify_languages/",
-                                               ":/lv_languages/"})){
-        QuasarAppUtils::Params::log("Error load language : " , QuasarAppUtils::Error);
-    }
-}
-
 IWorld *ClientApp::getLastWorld() {
     for (const auto &data : qAsConst(_availableLvls)) {
         if (data.viewModel && data.viewModel->unlocked()) {
@@ -120,7 +105,6 @@ bool ClientApp::init(QQmlApplicationEngine *engine) {
                 "Error: only enums");
 
     initCrawlResources();
-    initLang();
 
     engine->addImportPath(":/CrawlModule/");
 

src/Core/Crawl/clientapp.h

@@ -67,7 +67,6 @@ public:
 
 private:
     QByteArray initTheme();
-    void initLang();
     IWorld* getLastWorld();
 
     /**