diff --git a/CMakeLists.txt b/CMakeLists.txt index acf50cb..3c083d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,14 +4,14 @@ project(checks-parser VERSION 0.1 LANGUAGES CXX) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) +set(CMAKE_AUTORCC OFF) set(CMAKE_INCLUDE_CURRENT_DIR ON) 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 LinguistTools) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) find_package(Qt5 COMPONENTS LinguistTools) @@ -21,7 +21,23 @@ set(PROJECT_SOURCES mainwindow.h mainwindow.ui - # Add other source files here that contain translatable strings + 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 + + 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 @@ -32,8 +48,30 @@ set(TRANSLATION_SOURCES settingsdialog.cpp settingsdialog.h settingsdialog.ui solvecaptchadialog.cpp solvecaptchadialog.h solvecaptchadialog.ui adjustpicturedialog.cpp adjustpicturedialog.h adjustpicturedialog.ui +) - # Add other .cpp or .ui files that need translation here +set(TRANSLATION_FILES translations/en_US.ts translations/ru_RU.ts) + +# 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}) + +add_custom_target(translations + DEPENDS ${QM_FILES} + DEPENDS ${TRANSLATIONQRC} + VERBATIM ) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) @@ -41,10 +79,6 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) MANUAL_FINALIZATION ${PROJECT_SOURCES} ) - - # Generate translation files for Qt 6 - qt_add_translation(TRANSLATIONS "${TRANSLATION_SOURCES}") - else() if(ANDROID) add_library(checks-parser SHARED @@ -52,41 +86,18 @@ else() ) else() - # Generate translation files for Qt 5 - # QT5_ADD_TRANSLATION() - qt5_create_translation(QM_FILES "${TRANSLATION_SOURCES}" translations/en_US.ts translations/ru_RU.ts) - qt5_add_resources(TRANSLATIONQRC translations.qrc) add_executable(checks-parser ${PROJECT_SOURCES} - 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 - - 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 # ${QM_FILES} - # ${TS_FILES} - translations.qrc ${TRANSLATIONQRC} ) - # configure_file(translations.qrc ${CMAKE_BINARY_DIR} COPYONLY) - # QT5_ADD_TRANSLATION(TRANSLATIONS ${CMAKE_SOURCE_DIR} translations/en_US.ts) endif() endif() target_link_libraries(checks-parser PRIVATE Qt${QT_VERSION_MAJOR}::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. diff --git a/adjustpicturedialog.ui b/adjustpicturedialog.ui index 0f4a508..69cf406 100644 --- a/adjustpicturedialog.ui +++ b/adjustpicturedialog.ui @@ -61,10 +61,10 @@ - 15 - 41 - 791 - 391 + 5 + 21 + 801 + 421 @@ -77,10 +77,7 @@ ImageRedactor QGraphicsView -
../../image_redactor/imageredactor.h
- - slot1() - +
imageredactor.h