translations

CMakeLists.txt

@@ -4,16 +4,17 @@ 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(Qt5Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+find_package(Qt5 REQUIRED COMPONENTS LinguistTools)
-find_package(Qt5 COMPONENTS LinguistTools)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets REQUIRED)
 
 set(PROJECT_SOURCES
         main.cpp
@@ -21,7 +22,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,67 +49,52 @@ 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
 )
 
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+# qt_add_resources(RESOURCES
-    qt_add_executable(checks-parser
+#   ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc
-        MANUAL_FINALIZATION
+# )
+
+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)
+
+qt_add_resources(translation_resources
+  ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc
+)
+
+foreach(QM_FILE ${QM_FILES})
+  file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc
+    "    <file>${QM_FILE}</file>\n"
+  )
+endforeach()
+
+if(ANDROID)
+    add_library(checks-parser SHARED
         ${PROJECT_SOURCES}
     )
-
-    # Generate translation files for Qt 6
-    qt_add_translation(TRANSLATIONS "${TRANSLATION_SOURCES}")
-
 else()
-    if(ANDROID)
+    add_executable(checks-parser
-        add_library(checks-parser SHARED
+        ${PROJECT_SOURCES}
-            ${PROJECT_SOURCES}
+        ${RESOURCES}
-        )
+    )
-
-    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.
-if(${QT_VERSION} VERSION_LESS 6.1.0)
+set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.checks-parser)
-  set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.checks-parser)
-endif()
 set_target_properties(checks-parser PROPERTIES
     ${BUNDLE_ID_OPTION}
     MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
@@ -108,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()

adjustpicturedialog.ui

@@ -61,10 +61,10 @@
   <widget class="ImageRedactor" name="graphicsView">
    <property name="geometry">
     <rect>
-     <x>15</x>
+     <x>5</x>
-     <y>41</y>
+     <y>21</y>
-     <width>791</width>
+     <width>801</width>
-     <height>391</height>
+     <height>421</height>
     </rect>
    </property>
   </widget>
@@ -77,10 +77,7 @@
   <customwidget>
    <class>ImageRedactor</class>
    <extends>QGraphicsView</extends>
-   <header>../../image_redactor/imageredactor.h</header>
+   <header location="global">imageredactor.h</header>
-   <slots>
-    <slot>slot1()</slot>
-   </slots>
   </customwidget>
  </customwidgets>
  <resources/>