Move qml.qrc and qtquickcontrols2.conf from root to atomic_defi_desig…

…n folder
firoorg · Sep 21, 2021 · 6c286e6 · 6c286e6
1 parent 9183b61
commit 6c286e6
Show file tree

Hide file tree

Showing 7 changed files with 574 additions and 574 deletions.
diff --git a/atomic_defi_design/qml.qrc b/atomic_defi_design/qml.qrc
diff --git a/atomic_defi_design/qml/Constants/General.qml b/atomic_defi_design/qml/Constants/General.qml
@@ -12,7 +12,7 @@ QtObject {
 
     readonly property string os_file_prefix: Qt.platform.os == "windows" ? "file:///" : "file://"
     readonly property string assets_path: "qrc:///"
-    readonly property string image_path: assets_path + "atomic_defi_design/assets/images/"
+    readonly property string image_path: assets_path + "assets/images/"
     readonly property string coin_icons_path: image_path + "coins/"
     readonly property string custom_coin_icons_path: os_file_prefix + API.app.settings_pg.get_custom_coins_icons_path() + "/"
     readonly property string providerIconsPath: image_path + "providers/"

diff --git a/atomic_defi_design/qml/main.qml b/atomic_defi_design/qml/main.qml
@@ -148,7 +148,7 @@ DexWindow
 		spacing: 5
 
 		Image {
-			source: "qrc:/atomic_defi_design/assets/images/dex-tray-icon.png"
+            source: "qrc:/assets/images/dex-tray-icon.png"
 			width: 15
 			height: 15
 			smooth: true

diff --git a/qtquickcontrols2.conf → atomic_defi_design/qtquickcontrols2.conf b/qtquickcontrols2.conf → atomic_defi_design/qtquickcontrols2.conf
diff --git a/qml.qrc b/qml.qrc
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -73,7 +73,7 @@ add_executable(${PROJECT_NAME}
         ${CMAKE_SOURCE_DIR}/cmake/install/windows/dex.rc
 
         ##! QRC
-        ${CMAKE_SOURCE_DIR}/qml.qrc
+        ${CMAKE_SOURCE_DIR}/atomic_defi_design/qml.qrc
 
         ##! Linguistic
         ${QM_FILES}

diff --git a/src/app/main.prerequisites.hpp b/src/app/main.prerequisites.hpp
@@ -388,7 +388,7 @@ run_app(int argc, char** argv)
     QtWebEngine::initialize();
     std::shared_ptr<QApplication> app = std::make_shared<QApplication>(argc, argv);
 
-    app->setWindowIcon(QIcon(":/atomic_defi_design/assets/images/logo/dex-logo.png"));
+    app->setWindowIcon(QIcon(":/assets/images/logo/dex-logo.png"));
     app->setOrganizationName("KomodoPlatform");
     app->setOrganizationDomain("com");
     QQmlApplicationEngine engine;
@@ -445,13 +445,13 @@ run_app(int argc, char** argv)
     //  SPDLOG_INFO("{}",  QQuickStyle::ge))
     SPDLOG_INFO("Qaterial type created");
 
-    engine.addImportPath("qrc:/atomic_defi_design/imports");
-    engine.addImportPath("qrc:/atomic_defi_design/Constants");
-    qmlRegisterSingletonType(QUrl("qrc:/atomic_defi_design/qml/Constants/DexTheme.qml"), "App", 1, 0, "DexTheme");
-    qmlRegisterSingletonType(QUrl("qrc:/atomic_defi_design/qml/Constants/DexTypo.qml"), "App", 1, 0, "DexTypo");
-    qmlRegisterSingletonType(QUrl("qrc:/atomic_defi_design/qml/Constants/General.qml"), "App", 1, 0, "General");
-    qmlRegisterSingletonType(QUrl("qrc:/atomic_defi_design/qml/Constants/Style.qml"), "App", 1, 0, "Style");
-    qmlRegisterSingletonType(QUrl("qrc:/atomic_defi_design/qml/Constants/API.qml"), "App", 1, 0, "API");
+    engine.addImportPath("qrc:/imports");
+    engine.addImportPath("qrc:/Constants");
+    qmlRegisterSingletonType(QUrl("qrc:/qml/Constants/DexTheme.qml"), "App", 1, 0, "DexTheme");
+    qmlRegisterSingletonType(QUrl("qrc:/qml/Constants/DexTypo.qml"), "App", 1, 0, "DexTypo");
+    qmlRegisterSingletonType(QUrl("qrc:/qml/Constants/General.qml"), "App", 1, 0, "General");
+    qmlRegisterSingletonType(QUrl("qrc:/qml/Constants/Style.qml"), "App", 1, 0, "Style");
+    qmlRegisterSingletonType(QUrl("qrc:/qml/Constants/API.qml"), "App", 1, 0, "API");
     qRegisterMetaType<t_portfolio_roles>("PortfolioRoles");
     SPDLOG_INFO("QML singleton created");
 
@@ -468,7 +468,7 @@ run_app(int argc, char** argv)
 #else
     SPDLOG_INFO("Load qml engine");
     engine.rootContext()->setContextProperty("debug_bar", QVariant(false));
-    const QUrl url(QStringLiteral("qrc:/atomic_defi_design/qml/main.qml"));
+    const QUrl url(QStringLiteral("qrc:/qml/main.qml"));
     QObject::connect(
         &engine, &QQmlApplicationEngine::objectCreated, app.get(),
         [url](QObject* obj, const QUrl& objUrl)