From 1659d9633eb7e7245e4c4cb03a521bc8bd8ad9d1 Mon Sep 17 00:00:00 2001
From: trnsmkotik <vlad.n.kasatkin@gmail.com>
Date: Wed, 18 Jun 2025 20:02:38 +0700
Subject: [PATCH] Fix for windows

---
 CMakeLists.txt                    | 6 +++---
 config.ini                        | 2 ++
 database/DatabaseManager.cpp      | 6 +++++-
 views/bank/BankSettingsWindow.cpp | 9 ++-------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08d2c20..ae1eaa4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,8 @@ add_compile_definitions(QT_MESSAGELOGCONTEXT)
 
 if (WIN32)
     # Укажи путь к Qt6
-    #set(CMAKE_PREFIX_PATH "C:/Qt/6.9.0/msvc2022_arm64")
-    set(CMAKE_PREFIX_PATH "C:/Qt/6.9.0/msvc2022_64")
+    set(CMAKE_PREFIX_PATH "C:/Qt/6.9.0/msvc2022_arm64")
+#    set(CMAKE_PREFIX_PATH "C:/Qt/6.9.0/msvc2022_64")
    # list(APPEND CMAKE_PREFIX_PATH "C:/Users/User/.vcpkg-clion/vcpkg/installed/arm64-windows")
     #vcpkg install tesseract:arm64-windows
     #set(Tesseract_DIR "C:/Users/User/.vcpkg-clion/vcpkg/installed/arm64-windows/share/tesseract")
@@ -97,7 +97,7 @@ if (WIN32)
     )
 
     # Копирование изображений в директорию сборки
-    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/database/app_data.db" DESTINATION "${CMAKE_BINARY_DIR}/database")
+#    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/database/app_data.db" DESTINATION "${CMAKE_BINARY_DIR}/database")
     file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/tutorials" DESTINATION "${CMAKE_BINARY_DIR}")
     file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/images" DESTINATION "${CMAKE_BINARY_DIR}")
     file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/rus.traineddata" DESTINATION "${CMAKE_BINARY_DIR}")
diff --git a/config.ini b/config.ini
index a791753..a36fa1c 100644
--- a/config.ini
+++ b/config.ini
@@ -20,6 +20,8 @@ android_package_name=com.ziraat.ziraatmobil
 name=Santander
 android_package_name=ar.com.santander.rio.mbanking
 
+[db]
+dbPath=C:/Users/User/CLionProjects/ARCDeskProject/database/app_data.db
 
 [net]
 appInfoUpdate=http://localhost:9999/api/v1/device/update
diff --git a/database/DatabaseManager.cpp b/database/DatabaseManager.cpp
index b981a15..b5551ec 100644
--- a/database/DatabaseManager.cpp
+++ b/database/DatabaseManager.cpp
@@ -2,6 +2,7 @@
 #include <QCoreApplication>
 #include <QSqlError>
 #include <QDebug>
+#include <QSettings>
 #include <QThread>
 
 DatabaseManager::DatabaseManager() = default;
@@ -27,7 +28,10 @@ QSqlDatabase DatabaseManager::database() {
     // Создаем новое соединение, если его ещё нет
     if (!connectionPool.contains(name)) {
         QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", name);
-        db.setDatabaseName(QCoreApplication::applicationDirPath() + "/database/app_data.db");
+        const QSettings settings("config.ini", QSettings::IniFormat);
+        // qDebug() << settings.value("db/dbPath").toString();
+        // db.setDatabaseName(QCoreApplication::applicationDirPath() + "/database/app_data.db");
+        db.setDatabaseName(settings.value("db/dbPath").toString());
 
         if (!db.open()) {
             qWarning() << "Ошибка открытия базы данных:" << db.lastError().text();
diff --git a/views/bank/BankSettingsWindow.cpp b/views/bank/BankSettingsWindow.cpp
index 662cb2b..37ae66a 100644
--- a/views/bank/BankSettingsWindow.cpp
+++ b/views/bank/BankSettingsWindow.cpp
@@ -105,16 +105,11 @@ void BankSettingsWindow::reloadContent(QTableWidget *tableWidget) {
     tableWidget->setWordWrap(true);
     tableWidget->setTextElideMode(Qt::ElideNone);
 
-    QMargins cellPadding{8, 4, 8, 4};
-    auto *delegate = new PaddedItemDelegate(cellPadding, tableWidget);
-    // tableWidget->setItemDelegateForColumn(1, delegate);
-    // tableWidget->setItemDelegateForColumn(2, delegate);
-    // tableWidget->setItemDelegateForColumn(3, delegate);
-    // tableWidget->setItemDelegateForColumn(4, delegate);
-
     tableWidget->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     for (int i = 0; i < 7; ++i) {
         tableWidget->horizontalHeader()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
+    }
+    for (int i = 0; i < applications.length(); ++i) {
         tableWidget->verticalHeader()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
     }
     tableWidget->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Stretch);