From 5ca16a4f76f95e66fd9fa0bf02558a28c201eb11 Mon Sep 17 00:00:00 2001 From: leca Date: Mon, 3 Mar 2025 22:52:09 +0300 Subject: [PATCH 1/4] translations --- CMakeLists.txt | 81 ++++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 48 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c083d9..01a9abf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,10 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS Designer) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) -find_package(Qt5 COMPONENTS LinguistTools) +find_package(Qt5Core REQUIRED) +find_package(Qt5 REQUIRED COMPONENTS LinguistTools) +find_package(Qt5Gui REQUIRED) +find_package(Qt5Widgets REQUIRED) set(PROJECT_SOURCES main.cpp @@ -50,48 +51,40 @@ set(TRANSLATION_SOURCES adjustpicturedialog.cpp adjustpicturedialog.h adjustpicturedialog.ui ) -set(TRANSLATION_FILES translations/en_US.ts translations/ru_RU.ts) +# qt_add_resources(RESOURCES +# ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc +# ) -# set(QM_FILES "") - - -# qt5_create_translation(QM_FILES "${TRANSLATION_SOURCES}" translations/en_US.ts translations/ru_RU.ts) - - -# foreach(TS_FILE IN LISTS "${TRANSLATION_FILES}") -# qt5_create_translation(QM_FILE "${TRANSLATION_SOURCES}" TS_FILE) -# set(QM_FILE "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILE}") -# set(QM_FILES "${QM_FILES};${QM_FILE}") -# endforeach() - -qt5_create_translation(QM_FILES "${TRANSLATION_SOURCES}" translations/en_US.ts translations/ru_RU.ts) -# message(STATUS ${CMAKE_CURRENT_BINARY_DIR}) -qt5_add_resources(TRANSLATIONQRC translations.qrc OPTIONS --root ${CMAKE_CURRENT_BINARY_DIR}) +qt5_add_translation(QM_FILES translations/en_US.ts translations/ru_RU.ts) +# qt5_add_resources(TRANSLATIONQRC translations.qrc OPTIONS --root ${CMAKE_CURRENT_BINARY_DIR}) +# qt5_add_resources(TRANSLATIONQRC translations.qrc) add_custom_target(translations DEPENDS ${QM_FILES} - DEPENDS ${TRANSLATIONQRC} + # DEPENDS ${RESOURCES} VERBATIM ) +file(GLOB QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/translations/*.qm) -if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) - qt_add_executable(checks-parser - MANUAL_FINALIZATION +qt_add_resources(translation_resources + ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc +) + +foreach(QM_FILE ${QM_FILES}) + file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc + " ${QM_FILE}\n" + ) +endforeach() + +if(ANDROID) + add_library(checks-parser SHARED ${PROJECT_SOURCES} ) else() - if(ANDROID) - add_library(checks-parser SHARED - ${PROJECT_SOURCES} - ) - - else() - add_executable(checks-parser - ${PROJECT_SOURCES} - # ${QM_FILES} - ${TRANSLATIONQRC} - ) - endif() + add_executable(checks-parser + ${PROJECT_SOURCES} + ${RESOURCES} + ) endif() target_link_libraries(checks-parser PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) @@ -101,9 +94,7 @@ target_include_directories(checks-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/imag # Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. # If you are developing for iOS or macOS you should consider setting an # explicit, fixed bundle identifier manually though. -if(${QT_VERSION} VERSION_LESS 6.1.0) - set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.checks-parser) -endif() +set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.checks-parser) set_target_properties(checks-parser PROPERTIES ${BUNDLE_ID_OPTION} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} @@ -119,22 +110,16 @@ install(TARGETS checks-parser RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -if(QT_VERSION_MAJOR EQUAL 6) - qt_finalize_executable(checks-parser) -endif() - if(WIN32) -# set(OPENCV_MAP_IMPORTED_CONFIG "") set(OpenCV_DIR /usr/local/lib/cmake/opencv4) -# set (OpenCV_DIR /usr/lib/x86_64-linux-gnu/cmake/opencv4) endif() -find_package(OpenCV REQUIRED) +find_package(OpenCV 4 REQUIRED COMPONENTS core imgproc imgcodecs) -include_directories( ${OpenCV_INCLUDE_DIRS} ) +include_directories(${OpenCV_INCLUDE_DIRS}) target_link_libraries(checks-parser PRIVATE -lzbar) target_link_libraries(checks-parser PRIVATE -ltesseract) target_link_libraries(checks-parser PRIVATE -lcurl) -target_link_libraries(checks-parser PRIVATE ${OpenCV_LIBS} ) +target_link_libraries(checks-parser PRIVATE ${OpenCV_LIBS}) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) -target_link_libraries(checks-parser PRIVATE -lstdc++fs) + target_link_libraries(checks-parser PRIVATE -lstdc++fs) endif() From 7d42cbd111401dcbcb37069411c0e3e3939d5c34 Mon Sep 17 00:00:00 2001 From: leca Date: Fri, 7 Mar 2025 16:36:12 +0300 Subject: [PATCH 2/4] unneeded dependencies --- README.md | 1 - README.ru.md | 1 - translations.qrc | 1 - 3 files changed, 3 deletions(-) diff --git a/README.md b/README.md index df81bbe..40a212c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,6 @@ In general, you need to install following dependencies in order to build that ap * curl * nlohmann-json * qt5 -* vtk Please, do not hesitate to open an issue if you cannot build that. I will help and if you are building on a distro that is not listed there, we can append that list as soon as we will solve your problem! ### Linux diff --git a/README.ru.md b/README.ru.md index 8a5c7a3..ca2bfe3 100644 --- a/README.ru.md +++ b/README.ru.md @@ -29,7 +29,6 @@ * curl * nlohmann-json * qt5 -* vtk Пожалуйста, не стесняйтесь и открывайте issue, если вы не можете собрать приложение. Я помогу вам, и если вы собираете приложение на дистрибутиве, который здесь не перечислен, как только мы решим вашу проблему, я добавлю новый дистрибутив в этот список! diff --git a/translations.qrc b/translations.qrc index ed12877..bd622f0 100644 --- a/translations.qrc +++ b/translations.qrc @@ -3,5 +3,4 @@ en_US.qm ru_RU.qm - From 957ccc9946553187c16250158b5cb673be25b28b Mon Sep 17 00:00:00 2001 From: leca Date: Sat, 8 Mar 2025 12:42:43 +0300 Subject: [PATCH 3/4] dirty minimal working version --- CMakeLists.txt | 143 +++++++++++++++++++++++++++++-------------------- main.cpp | 3 ++ 2 files changed, 88 insertions(+), 58 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01a9abf..f422568 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,12 +2,16 @@ cmake_minimum_required(VERSION 3.10) project(checks-parser VERSION 0.1 LANGUAGES CXX) +option(BUILD_TRANSLATIONS "Build translations?" ON) + set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC OFF) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOUIC_SEARCH_PATHS Designer) +set(OPENCV_SKIP_VTK ON) + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -17,84 +21,103 @@ find_package(Qt5Gui REQUIRED) find_package(Qt5Widgets REQUIRED) set(PROJECT_SOURCES - main.cpp - mainwindow.cpp - mainwindow.h - mainwindow.ui + main.cpp + mainwindow.cpp + mainwindow.h + mainwindow.ui - goods/goods.h goods/goods.cpp - check/check.h check/check.cpp - parser/parser.h parser/parser.cpp - parser/module.h parser/module.cpp + goods/goods.h goods/goods.cpp + check/check.h check/check.cpp + parser/parser.h parser/parser.cpp + parser/module.h parser/module.cpp - outputdialog.h outputdialog.cpp outputdialog.ui - output/output_options.h output/output_options.cpp + outputdialog.h outputdialog.cpp outputdialog.ui + output/output_options.h output/output_options.cpp - utils/utils.h utils/utils.cpp - image/checkimage.h image/checkimage.cpp - net/net.h net/net.cpp - settings/settings.h settings/settings.cpp - settingsdialog.h settingsdialog.cpp settingsdialog.ui - adjustpicturedialog.h adjustpicturedialog.cpp adjustpicturedialog.ui - image_redactor/imageredactor.h image_redactor/imageredactor.cpp - solvecaptchadialog.h solvecaptchadialog.cpp solvecaptchadialog.ui - exceptions/ofdrequestexception.h exceptions/ofdrequestexception.cpp + utils/utils.h utils/utils.cpp + image/checkimage.h image/checkimage.cpp + net/net.h net/net.cpp + settings/settings.h settings/settings.cpp + settingsdialog.h settingsdialog.cpp settingsdialog.ui + adjustpicturedialog.h adjustpicturedialog.cpp adjustpicturedialog.ui + image_redactor/imageredactor.h image_redactor/imageredactor.cpp + solvecaptchadialog.h solvecaptchadialog.cpp solvecaptchadialog.ui + exceptions/ofdrequestexception.h exceptions/ofdrequestexception.cpp ) -# Specify the UI files and source files for translation set(TRANSLATION_SOURCES - main.cpp - mainwindow.cpp mainwindow.h mainwindow.ui - outputdialog.cpp outputdialog.h outputdialog.ui - settingsdialog.cpp settingsdialog.h settingsdialog.ui - solvecaptchadialog.cpp solvecaptchadialog.h solvecaptchadialog.ui - adjustpicturedialog.cpp adjustpicturedialog.h adjustpicturedialog.ui + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + outputdialog.cpp outputdialog.h outputdialog.ui + settingsdialog.cpp settingsdialog.h settingsdialog.ui + solvecaptchadialog.cpp solvecaptchadialog.h solvecaptchadialog.ui + adjustpicturedialog.cpp adjustpicturedialog.h adjustpicturedialog.ui ) -# qt_add_resources(RESOURCES -# ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc -# ) -qt5_add_translation(QM_FILES translations/en_US.ts translations/ru_RU.ts) -# qt5_add_resources(TRANSLATIONQRC translations.qrc OPTIONS --root ${CMAKE_CURRENT_BINARY_DIR}) -# qt5_add_resources(TRANSLATIONQRC translations.qrc) -add_custom_target(translations - DEPENDS ${QM_FILES} - # DEPENDS ${RESOURCES} - VERBATIM -) -file(GLOB QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/translations/*.qm) +# QT5_CREATE_TRANSLATION(UPDATED_TS ${TRANSLATION_SOURCES}) -qt_add_resources(translation_resources - ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc +# add_custom_target(append_translations DEPENDS ${UPDATED_TS}) + +set(TS_FILES + translations/en_US.ts + translations/ru_RU.ts ) -foreach(QM_FILE ${QM_FILES}) - file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc - " ${QM_FILE}\n" - ) -endforeach() +qt5_create_translation(QM_FILES "${TRANSLATION_SOURCES}" ${TS_FILES}) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) +qt5_add_resources(TRANSLATIONQRC ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc OPTIONS --verbose) +add_custom_target(translations ALL DEPENDS ${QM_FILES}) +add_custom_target(resources ALL DEPENDS ${TRANSLATIONQRC}) +add_dependencies(resources translations) + +# qt5_add_translation(translations +# SOURCES ${CMAKE_SOURCE_DIR}/translations/en_US.ts +# SOURCES ${CMAKE_SOURCE_DIR}/translations/ru_RU.ts +# OPTIONS -recursive +# TARGET_PATH ${CMAKE_CURRENT_BINARY_DIR} +# TS_FILES ${CMAKE_SOURCE_DIR}/translations/en_US.ts ${CMAKE_SOURCE_DIR}/translations/ru_RU.ts +# ) +# set_source_files_properties(${TRANSLATION_FILES} PROPERTIES OUTPUT_LOCATION "l10n") + +# qt5_add_translation(QM_FILES ${TRANSLATION_FILES}) + +# message(STATUS ${QM_FILES}) + +# set(TRANSLATIONS_QRC ${CMAKE_SOURCE_DIR}/translations.qrc) + +# # qt5_add_resources(translations_qrc +# # SOURCES ${TRANSLATIONS_QRC} +# # ) + + +# add_custom_target(translations DEPENDS ${QM_FILES}) if(ANDROID) add_library(checks-parser SHARED ${PROJECT_SOURCES} ) + else() add_executable(checks-parser ${PROJECT_SOURCES} - ${RESOURCES} + ${TRANSLATIONQRC} ) endif() -target_link_libraries(checks-parser PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) +add_dependencies(checks-parser resources) + +# if (BUILD_TRANSLATIONS) +# target_link_libraries(checks-parser translations) +# endif() + +target_link_libraries(checks-parser PRIVATE Qt5::Widgets) target_include_directories(checks-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/image_redactor) -# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. -# If you are developing for iOS or macOS you should consider setting an -# explicit, fixed bundle identifier manually though. -set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.checks-parser) +set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER org.foxarmy.checks-parser) + set_target_properties(checks-parser PROPERTIES ${BUNDLE_ID_OPTION} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} @@ -110,16 +133,20 @@ install(TARGETS checks-parser RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -if(WIN32) - set(OpenCV_DIR /usr/local/lib/cmake/opencv4) -endif() -find_package(OpenCV 4 REQUIRED COMPONENTS core imgproc imgcodecs) -include_directories(${OpenCV_INCLUDE_DIRS}) +if(WIN32) + #???? + set(OpenCV_DIR /usr/local/lib/cmake/opencv4) +endif() + +find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs) + +include_directories( ${OpenCV_INCLUDE_DIRS} ) + target_link_libraries(checks-parser PRIVATE -lzbar) target_link_libraries(checks-parser PRIVATE -ltesseract) target_link_libraries(checks-parser PRIVATE -lcurl) -target_link_libraries(checks-parser PRIVATE ${OpenCV_LIBS}) +target_link_libraries(checks-parser PRIVATE ${OpenCV_LIBS} ) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) - target_link_libraries(checks-parser PRIVATE -lstdc++fs) +target_link_libraries(checks-parser PRIVATE -lstdc++fs) endif() diff --git a/main.cpp b/main.cpp index e0498fa..de82bd9 100644 --- a/main.cpp +++ b/main.cpp @@ -54,6 +54,9 @@ int main(int argc, char *argv[]) { } else { lang = QString::fromStdString("en_US"); } + + std::cout << "Using locale: " << lang.toStdString() << std::endl; + translator.load(":/translation/" + lang + ".qm"); a.installTranslator(&translator); From d41accd1112f46ec18c60150e6a6e01ea402b528 Mon Sep 17 00:00:00 2001 From: leca Date: Sat, 8 Mar 2025 17:33:24 +0300 Subject: [PATCH 4/4] cleanup --- CMakeLists.txt | 57 +++++++++++++------------------------------------- 1 file changed, 14 insertions(+), 43 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f422568..be87240 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,6 @@ set(CMAKE_AUTORCC OFF) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOUIC_SEARCH_PATHS Designer) -set(OPENCV_SKIP_VTK ON) - set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -54,64 +52,37 @@ set(TRANSLATION_SOURCES adjustpicturedialog.cpp adjustpicturedialog.h adjustpicturedialog.ui ) - - -# QT5_CREATE_TRANSLATION(UPDATED_TS ${TRANSLATION_SOURCES}) - -# add_custom_target(append_translations DEPENDS ${UPDATED_TS}) - set(TS_FILES translations/en_US.ts translations/ru_RU.ts ) -qt5_create_translation(QM_FILES "${TRANSLATION_SOURCES}" ${TS_FILES}) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) -qt5_add_resources(TRANSLATIONQRC ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc OPTIONS --verbose) -add_custom_target(translations ALL DEPENDS ${QM_FILES}) -add_custom_target(resources ALL DEPENDS ${TRANSLATIONQRC}) -add_dependencies(resources translations) +if (BUILD_TRANSLATIONS) + qt5_create_translation(QM_FILES "${TRANSLATION_SOURCES}" ${TS_FILES}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) + qt5_add_resources(TRANSLATIONQRC ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc) + add_custom_target(translations ALL DEPENDS ${QM_FILES}) + add_custom_target(resources ALL DEPENDS ${TRANSLATIONQRC}) + add_dependencies(resources translations) +endif() -# qt5_add_translation(translations -# SOURCES ${CMAKE_SOURCE_DIR}/translations/en_US.ts -# SOURCES ${CMAKE_SOURCE_DIR}/translations/ru_RU.ts -# OPTIONS -recursive -# TARGET_PATH ${CMAKE_CURRENT_BINARY_DIR} -# TS_FILES ${CMAKE_SOURCE_DIR}/translations/en_US.ts ${CMAKE_SOURCE_DIR}/translations/ru_RU.ts -# ) -# set_source_files_properties(${TRANSLATION_FILES} PROPERTIES OUTPUT_LOCATION "l10n") - -# qt5_add_translation(QM_FILES ${TRANSLATION_FILES}) - -# message(STATUS ${QM_FILES}) - -# set(TRANSLATIONS_QRC ${CMAKE_SOURCE_DIR}/translations.qrc) - -# # qt5_add_resources(translations_qrc -# # SOURCES ${TRANSLATIONS_QRC} -# # ) - - -# add_custom_target(translations DEPENDS ${QM_FILES}) +set(SOURCES "") +if (BUILD_TRANSLATIONS) + list(APPEND SOURCES ${TRANSLATIONQRC}) +endif() if(ANDROID) add_library(checks-parser SHARED ${PROJECT_SOURCES} + ${SOURCES} ) - else() add_executable(checks-parser ${PROJECT_SOURCES} - ${TRANSLATIONQRC} + ${SOURCES} ) endif() -add_dependencies(checks-parser resources) - -# if (BUILD_TRANSLATIONS) -# target_link_libraries(checks-parser translations) -# endif() - target_link_libraries(checks-parser PRIVATE Qt5::Widgets) target_include_directories(checks-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/image_redactor)