From 0cebf8f1fffa36d9ae89d698d447307808c16896 Mon Sep 17 00:00:00 2001 From: slava Date: Tue, 27 May 2025 14:54:29 +0700 Subject: [PATCH] Fix for windows --- CMakeLists.txt | 5 ++++- main.cpp | 12 ++++++------ views/bank/BankSettingsWindow.cpp | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a78487..b04b623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,8 @@ add_executable(ARCDesktopProject ${DB_SOURCES} ${MODELS_SOURCES} ${ANDROID_SOURCES} + views/bank/BankSettingsWindow.cpp + views/bank/BankSettingsWindow.h ) if (WIN32) @@ -74,8 +76,9 @@ if (WIN32) ) # Копирование изображений в директорию сборки - file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/database/app_data.db" DESTINATION "${CMAKE_BINARY_DIR}") + 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}") file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/config.ini" DESTINATION "${CMAKE_BINARY_DIR}") diff --git a/main.cpp b/main.cpp index 70996a5..65d1084 100644 --- a/main.cpp +++ b/main.cpp @@ -194,12 +194,12 @@ int main(int argc, char *argv[]) { // Выбрать стиль Fusion app.setStyle(QStyleFactory::create("Fusion")); - // logFile.setFileName("application.log"); - // if (!logFile.open(QIODevice::Append | QIODevice::Text)) { - // qWarning() << "Не удалось открыть лог-файл для записи"; - // } - // // Устанавливаем свой обработчик - // qInstallMessageHandler(messageHandler); + logFile.setFileName("application.log"); + if (!logFile.open(QIODevice::Append | QIODevice::Text)) { + qWarning() << "Не удалось открыть лог-файл для записи"; + } + // Устанавливаем свой обработчик + qInstallMessageHandler(messageHandler); // // auto *thread = new QThread; // auto *worker = new EventHandler; diff --git a/views/bank/BankSettingsWindow.cpp b/views/bank/BankSettingsWindow.cpp index d3cd064..d91dc4e 100644 --- a/views/bank/BankSettingsWindow.cpp +++ b/views/bank/BankSettingsWindow.cpp @@ -128,7 +128,7 @@ BankSettingsWindow::BankSettingsWindow(QWidget *parent, QString deviceId, QStrin tableWidget->setItemDelegateForColumn(4, delegate); tableWidget->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter); - for (int i = 0; i < 8; ++i) { + for (int i = 0; i < 7; ++i) { tableWidget->horizontalHeader()->setSectionResizeMode(i, QHeaderView::ResizeToContents); } tableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);