rework of mainwindow in progress

merge
cleanup
2025-03-09 16:05:37 +03:00 · 2025-03-08 17:35:05 +03:00 · 2025-03-08 17:33:24 +03:00 · 2025-03-08 12:42:43 +03:00 · 2025-03-07 16:36:12 +03:00 · 2025-03-03 23:26:14 +03:00
24 changed files with 1262 additions and 975 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,4 @@ checks-parser

 deploy/appimage/AppDir/usr/share/doc/
 deploy/appimage/AppDir/usr/share/
+*.deb
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,97 +2,102 @@ 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 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${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
-        mainwindow.cpp
-        mainwindow.h
-        mainwindow.ui
+    main.cpp
+    mainwindow.cpp
+    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
 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
-
-        # Add other .cpp or .ui files that need translation here
+    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
 )

-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
-    qt_add_executable(checks-parser
-        MANUAL_FINALIZATION
+set(TS_FILES
+    translations/en_US.ts
+    translations/ru_RU.ts
+)
+
+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()
+
+# Media QRC
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/media.qrc ${CMAKE_CURRENT_BINARY_DIR}/media.qrc COPYONLY)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+qt5_add_resources(MEDIAQRC ${CMAKE_CURRENT_BINARY_DIR}/media.qrc)
+add_custom_target(mediaresource ALL DEPENDS ${MEDIAQRC})
+
+set(SOURCES "")
+
+list(APPEND SOURCES ${MEDIAQRC})
+
+if (BUILD_TRANSLATIONS)
+    list(APPEND SOURCES ${TRANSLATIONQRC})
+endif()
+
+if(ANDROID)
+    add_library(checks-parser SHARED
        ${PROJECT_SOURCES}
+        ${SOURCES}
    )
-
-    # Generate translation files for Qt 6
-    qt_add_translation(TRANSLATIONS "${TRANSLATION_SOURCES}")
-
 else()
-    if(ANDROID)
-        add_library(checks-parser SHARED
-            ${PROJECT_SOURCES}
-        )
-
-    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()
+    add_executable(checks-parser
+        ${PROJECT_SOURCES}
+        ${SOURCES}
+    )
 endif()

-target_link_libraries(checks-parser PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+target_link_libraries(checks-parser PRIVATE Qt5::Widgets)
+
+target_include_directories(checks-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/image_redactor)
+
+set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER org.foxarmy.checks-parser)

-# 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_target_properties(checks-parser PROPERTIES
    ${BUNDLE_ID_OPTION}
    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
@@ -108,13 +113,16 @@ install(TARGETS checks-parser
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

-if(QT_VERSION_MAJOR EQUAL 6)
-    qt_finalize_executable(checks-parser)
+
+if(WIN32)
+    #????
+    set(OpenCV_DIR /usr/local/lib/cmake/opencv4)
 endif()

-find_package(OpenCV REQUIRED)
+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)
--- a/CMakeLists.txt.bck
+++ b/CMakeLists.txt.bck
@@ -1,122 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-
-project(checks-parser VERSION 0.1 LANGUAGES CXX)
-
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-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)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
-
-set(PROJECT_SOURCES
-        main.cpp
-        mainwindow.cpp
-        mainwindow.h
-        mainwindow.ui
-)
-
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
-    qt_add_executable(checks-parser
-        MANUAL_FINALIZATION
-        ${PROJECT_SOURCES}
-    )
-
-SET (LANGUAGES rus eng)
-SET (TRANSLATIONS_PATH "./translations")
-
-foreach (LANGUAGE ${LANGUAGES})
-    set (TS ${TRANSLATIONS_PATH}/${LANGUAGE}.ts)
-    set (QM ${TRANSLATIONS_PATH}/${LANGUAGE}.qm)
-    set (TRANSLATIONS ${TRANSLATIONS} ${TS})
-    set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
-    add_custom_command(
-        OUTPUT ${QM}
-        COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS}
-        MAIN_DEPENDENCY ${TS}
-    )
-endforeach()
-
-qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} translations/english.ts)
-
-# Define target properties for Android with Qt 6 as:
-#    set_property(TARGET checks-parser APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
-#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
-# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
-else()
-    if(ANDROID)
-        add_library(checks-parser SHARED
-            ${PROJECT_SOURCES}
-        )
-# Define properties for Android with Qt 5 after find_package() calls as:
-#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
-    else()
-        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
-            imageview/imageview.h imageview/imageview.cpp
-            image_redactor/imageredactor.h image_redactor/imageredactor.cpp
-            solvecaptchadialog.h solvecaptchadialog.cpp solvecaptchadialog.ui
-            exceptions/ofdrequestexception.h exceptions/ofdrequestexception.cpp
-            ${TRANSLATIONS}
-            ${QM_FILES}
-            ${QM}
-            ${TS}
-        )
-endif()
-endif()
-
-add_custom_target(translations DEPENDS ${QM_FILES})
-add_dependencies(checks-parser translations)
-
-target_link_libraries(checks-parser PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
-# 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_target_properties(checks-parser PROPERTIES
-    ${BUNDLE_ID_OPTION}
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    MACOSX_BUNDLE TRUE
-    WIN32_EXECUTABLE TRUE
-)
-
-include(GNUInstallDirs)
-install(TARGETS checks-parser
-    BUNDLE DESTINATION .
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-if(QT_VERSION_MAJOR EQUAL 6)
-    qt_finalize_executable(checks-parser)
-endif()
-
-find_package(OpenCV REQUIRED)
-
-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} )
--- a/README.md
+++ b/README.md
@@ -1,16 +1,19 @@
+-->[Русская версия](https://git.foxarmy.org/leca/checks-parser/src/branch/master/README.ru.md)<--
+
 # Checks parser
 checks parser is a program that help parsing different checks to csv.

 !!!CURRENTLY SUPPORTED ONLY RUSSIAN CHECKS!!!
-To know why, see [this section](#Checks-from-different-countries)
+To know why, see [this section](https://git.foxarmy.org/leca/checks-parser#checks-from-different-countries)

 # Usage
+For more detailed description, please, refer to [the wiki](https://git.foxarmy.org/leca/checks-parser/wiki/Description-%5BEN%5D)
+
 ### Input
 Ways you can input a check to this programm:
-* Via image (it uses OCR(Optical Character Recognition) to parse check content. The picture of a check must be contrast and well-lined (text must be perpendicular to right and left borders of an image) enough in order to be parsed well.)
+* Via image (it uses OCR(Optical Character Recognition) to parse check content. The picture of a check must be contrast and well-lined (text must be perpendicular to right and left borders of an image) enough in order to be parsed well.) OCR is not a magic wand :(
 * Via plaintext, copied from an E-Mail. Just copy&paste text from your email, pick a correct store type (autodetect is in my plans!) and parse.
-* Via a picture of a check. Be sure to make the image straight and sharp. OCR is not a magic wand :(
-* Via QrCode on check (OFD (ОФД, Оператор Фискальных Данных in Russian)).
+* Via QRCode on check (this method queries check content from OFD (ОФД, Оператор Фискальных Данных in Russian) (My program makes requests to ofd.ru)).

 ### Output
 At the start of writing this program, I considered 3 or more output formats: csv, xlsx and ods. But throught the development I understood that most of modern table processor (i.e. electronic tables) can import csv much better than I'd be writing a shitty export module, adding more dependencies and shitty code to the codebase. So I decided that there's no need to use anything other than csv format. 
@@ -26,15 +29,16 @@ 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
 ##### Arch Linux-based
-I recommend using aur helper (I use yay) to install dependencies. Or, if you're masochist, you can build all by yourself /shrug
+I recommend using aur helper (I use yay) to install dependencies. Or, if you're masochist, you can build all by yourself ¯\\\_(ツ)\_/¯
 ```
 #Install dependencies
-yay -S sudo cmake git coreutils base-devel eigen qt5-base mbedtls gtkglext opencv opencv2 zbar nlohmann-json tesseract tesseract-data-rus vtk
+yay -S base-devel qt5-base opencv zbar nlohmann-json tesseract
+#Install a language package for OCR. Replace ``LANG` to your language. For example, ``tesseract-data-rus`` for russian language
+yay -S tesseract-data-LANG
 #Clone and compile an app
 git clone https://git.foxarmy.org/leca/checks-parser
 cd checks-parser
@@ -64,12 +68,20 @@ sudo make install
 ```

 ### Windows 
-Maybe
+See [Precompiled binaries](https://git.foxarmy.org/leca/checks-parser#precompiled-binaries)
 ### Mac OS
 Probably not, I do not have nor desire or time. But if you can maintain that program on Mac, I'd be grateful! Please, contact me, if you can!

 ## Precompiled binaries
-I plan to make precompiled binaries for Linux and Windows. Maybe I will put it on AUR. I also think that I will be making an AppImage
+Currently I have published the program to the [AUR](https://aur.archlinux.org/packages/checks-parser-git).
+
+Every new release will certainly contain AppImage and tarball. I am working towards binaries for Windows and deb packets. Expect them to appear in next releases!
+
+# Special thanks
+
+HyperFlint (@hyperflint:foxarmy.org) - for the great idea to use OFD and a huge help in release preparations!
+
+https://check.ofd.ru - for providing a way to request data from FNS.

 # Contribution

@@ -79,11 +91,12 @@ If you want to contribute to the project, you can do it by some of the following
 I live in Russia and only know how Russian state checks system works. If you live in another country and want to help me with adding support to checks from your country - feel free to contact me!
 ## Issues and PRs

-If you have found a bug, or want to suggest a feature - don't hesitate to open an issue / PR!
+If you have found a bug, or want to suggest a feature - don't hesitate to open an issue / a PR!

 ## Tell friends

 You can help me by distributing that program. If you know people that are in search of such program, please let them know about its existance!
+
 ## Donate

 ```XMR 45ZjyH5YWdRfKxLoKEBYaiHUTcP5Z8Gv64QQxmabbooPAa7KPBxZLmqft5ohKXn5VpHiVj1x9JKCcAcAjdu9jA8b5N8XqR7```
--- a/README.ru.md
+++ b/README.ru.md
@@ -0,0 +1,103 @@
+-->[English version](https://git.foxarmy.org/leca/checks-parser/src/branch/master/README.md)<--
+
+# Чек парсер
+Чек парсер - это приложение, позволяющее доставать содержимое чека и переводить его в .csv файлы.
+
+!!!НА ДАННЫЙ МОМЕНТ ПОДДЕРЖИВАЮТСЯ ТОЛЬКО РУССКИЕ ЧЕКИ!!!
+Чтобы узнать, почему [смотрите здесь](https://git.foxarmy.org/leca/checks-parser/src/branch/master/README.ru.md#checks-from-different-countries)
+
+# Пользование
+Для более детального описания, пожалуйста, обратитесь к [вики](https://git.foxarmy.org/leca/checks-parser/wiki/Description-%5BRU%5D)
+
+### Ввод данных
+Доступны следующие способы ввода данных:
+* Через изображениие (используется OCR(Optical Character Recognition, Оптическое распознавание символов) чтобы прочитать содержимое чека. Изображение чека должно быть контрастным и выровненным (текст обязан быть перпендикулярным к границам изображения) хорошо, чтобы нормально прочитаться.) OCR - не волшебная палочка :(
+* Через просто текст, скопированный из эл. письма. Просто скопируйте и вставьте текст с вашего письма, выберите подходящий магазин (автодетект в планах!) и парсите.
+* Через QRCode на чеке (этот метод запрашивает данные у ОФД (Оператор Фискальных Данных) (В данном конкретном случае, к ofd.ru)).
+
+### Вывод данных
+На начальном этапе разработки программы, Я задумывался о 3 или более форматов вывода: csv, xlsx и ods. Но по мере разработки, я понял, что большинство современных табличных процессоров (электронных таблиц) способны импортировать в себя csv гораздо лучше, чем смог бы написать я сам. Так что я решил не делать вывод во все остальные форматы, кроме csv.
+
+Чтобы экспортировать, вам нужно указать путь до файла, если вы желаете, вы можете изменить порядок и/или переименовать (алиасы) столбцы, выбрать печатать или не печатать заголовок (алиасы столбцов) и "итого"
+
+# Установка
+## Сборка из исходников
+В целом, вам нужно установить следующие зависимости чтобы собрать приложение (я предполагаю, что вы уже имеете на системе базовые пакеты вроде cmake, make, gcc, git и так далее):
+* tesseract (также вам нужно будет установить языковой пакет для него, например tesseract-data-rus на Arch Linux или tesseract-ocr-rus на Debian Linux.)
+* opencv
+* zbar
+* curl
+* nlohmann-json
+* qt5
+
+Пожалуйста, не стесняйтесь и открывайте issue, если вы не можете собрать приложение. Я помогу вам, и если вы собираете приложение на дистрибутиве, который здесь не перечислен, как только мы решим вашу проблему, я добавлю новый дистрибутив в этот список!
+
+### Linux
+##### Arch Linux и ответвления
+Я рекомендую использовать помощник для АУРа (я использую yay) чтобы установить зависимости. Или, если вы мазохист, можете собрать все зависимости ручками ¯\\\_(ツ)\_/¯
+```
+#Установка зависимостей
+yay -S base-devel qt5-base opencv zbar nlohmann-json tesseract
+#Установка языкового пакета для OCR. Замените ``LANG` на желаемый язык. Например, ``tesseract-data-rus`` для русского языка
+yay -S tesseract-data-LANG
+#Загрузка исходгого кода и сборка приложения
+git clone https://git.foxarmy.org/leca/checks-parser
+cd checks-parser
+cmake .
+make -j{nproc}
+#Если вы хотите скопировать запускной файл в свою систему, исполните:
+sudo make install
+```
+##### Debian и ответвления
+В debian и ответвлениях большинство, но не все, имена пакетов одинаковы.
+
+Установка зависимостей для различных debian дистрибутивов:
+###### Ubuntu 18.04
+```apt install -y qtbase5-dev openssl libmbedtls-dev tesseract-ocr tesseract-ocr-rus libopencv-dev libzbar-dev qttools5-dev nlohmann-json-dev libcurl4-openssl-dev libtesseract-dev```
+###### Ubuntu 20.04, LMDE (проверил только 6), Debian (проверил только 12)
+```apt install -y qtbase5-dev openssl libmbedtls-dev tesseract-ocr tesseract-ocr-rus libopencv-dev libzbar-dev qttools5-dev nlohmann-json3-dev libcurl4-openssl-dev libtesseract-dev```
+
+Следующие шаги идеинтичны для всех дистрибутивов, основанных на debian:
+```
+#Загрузка исходного кода и сборка приложения 
+git clone https://git.foxarmy.org/leca/checks-parser
+cd checks-parser
+cmake .
+make -j{nproc}
+#Если вы хотите скопировать запускной файл в свою систему, исполните:
+sudo make install
+```
+
+### Windows 
+Смотрите [бинарники](https://git.foxarmy.org/leca/checks-parser/src/branch/master/README.ru.md#бинарники)
+### Mac OS
+Скорее всего нет, у меня нет ни времени, ни желания, ни устройства. Но если вы можете собирать программу на Mac OS, я буду рад, если вы поможете. Пожалуйста, свяжитесь со мной, если можете!
+
+## Бинарники
+На текущий момент я опубликовал программу в [АУР](https://aur.archlinux.org/packages/checks-parser-git).
+
+Каждый релиз будет содержать AppImage и арчёвский tarball. Я работаю над бинарниками для Windows и .deb пакетами. Ожидайте их в следующих релизах!
+
+# Особое спасибо
+
+HyperFlint (@hyperflint:foxarmy.org) - за гениальную идею использовать ОФД и огромную помощь в подготовке проекта к релизу!
+
+https://check.ofd.ru - за способ вытаскивать данные о чеках из ФНС.
+
+# Помощь
+
+Если вы хотите помочь проекту, вы можете сделать это следующими способами:
+## Чеки из других стран
+
+Я живу в России и знаком только с местной системой чеков. Если вы живёте в другой стране и хотите помочь мне с поддержкой чеков из Вашей страны - свяжитесь со мной!
+## Issues и PRs
+
+Если вы нашли баг или хотите предложить что-то в программу - не стесняйтесь и открывайте issue или PR!
+
+## Рассказать друзьями
+
+Вы можете помочь проекту, распространяя программу. Если вы знаете людей, которые ищут подобную программу, пожалуйста, дайте им знать о существовании таковой!
+
+## Пожертвования
+
+```XMR 45ZjyH5YWdRfKxLoKEBYaiHUTcP5Z8Gv64QQxmabbooPAa7KPBxZLmqft5ohKXn5VpHiVj1x9JKCcAcAjdu9jA8b5N8XqR7```
--- a/adjustpicturedialog.ui
+++ b/adjustpicturedialog.ui
@@ -61,10 +61,10 @@
  <widget class="ImageRedactor" name="graphicsView">
   <property name="geometry">
    <rect>
-     <x>15</x>
-     <y>41</y>
-     <width>791</width>
-     <height>391</height>
+     <x>5</x>
+     <y>21</y>
+     <width>801</width>
+     <height>421</height>
    </rect>
   </property>
  </widget>
@@ -77,10 +77,7 @@
  <customwidget>
   <class>ImageRedactor</class>
   <extends>QGraphicsView</extends>
-   <header>../../image_redactor/imageredactor.h</header>
-   <slots>
-    <slot>slot1()</slot>
-   </slots>
+   <header location="global">imageredactor.h</header>
  </customwidget>
 </customwidgets>
 <resources/>
--- a/assets/icons/OCR.svg
+++ b/assets/icons/OCR.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="159.62572mm"
+   height="146.77805mm"
+   viewBox="0 0 159.62572 146.77805"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   sodipodi:docname="OCR.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.50000001"
+     inkscape:cx="187"
+     inkscape:cy="261.99999"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer4" />
+  <defs
+     id="defs1">
+    <linearGradient
+       id="swatch50"
+       inkscape:swatch="solid">
+      <stop
+         style="stop-color:#00b2c3;stop-opacity:0;"
+         offset="0"
+         id="stop50" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5"
+       id="radialGradient6"
+       cx="178.3111"
+       cy="60.733166"
+       fx="178.3111"
+       fy="60.733166"
+       r="14.328103"
+       gradientTransform="matrix(1,0,0,0.566866,0,26.305599)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="eye"
+     transform="translate(-20.738154,-52.70636)">
+    <ellipse
+       style="display:none;fill:#ffffff;fill-opacity:1;stroke:url(#radialGradient6);stroke-width:0.418956;stroke-opacity:1"
+       id="ellipse5"
+       ry="7.9126363"
+       rx="16.896055"
+       cy="60.733166"
+       cx="178.3111"
+       inkscape:label="inner" />
+    <path
+       id="path48"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-dasharray:none;stroke-opacity:1"
+       d="m 163.03445,62.853096 c -5.5416,0.04533 -10.97868,2.888123 -16.31735,8.383468 -0.12314,0.157876 0.0243,0.318843 0.0243,0.318843 11.50919,11.568278 22.55969,11.493788 33.23673,0 0.18303,-0.169745 0.18055,-0.163774 -0.005,-0.331246 -5.75329,-5.664436 -11.39834,-8.416392 -16.93902,-8.371065 z"
+       inkscape:label="outer"
+       sodipodi:nodetypes="sccccss" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.0723045"
+       id="ellipse4"
+       inkscape:label="pupil"
+       ry="1.7112623"
+       rx="1.9444314"
+       cy="72.71582"
+       cx="160.92181" />
+  </g>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-20.738154,-52.70636)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.499999"
+       id="rect1"
+       width="101.46883"
+       height="146.27805"
+       x="21.108479"
+       y="52.95636"
+       ry="0"
+       inkscape:label="receipt" />
+    <path
+       style="fill:#ee0000;fill-opacity:0.51545;stroke:none;stroke-width:0.499999"
+       d="M 20.738154,121.46633 160.93664,72.756923 122.6633,120.9805 Z"
+       id="path1"
+       sodipodi:nodetypes="cccc"
+       inkscape:label="scan_ray" />
+    <text
+       xml:space="preserve"
+       style="font-size:13.7201px;text-align:start;writing-mode:lr-tb;direction:ltr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.16063"
+       x="47.53178"
+       y="66.945511"
+       id="text2"
+       inkscape:label="receipt text"><tspan
+         sodipodi:role="line"
+         style="fill:#000000;fill-opacity:1;stroke-width:2.16064"
+         x="47.53178"
+         y="66.945511"
+         id="tspan3">Receipt</tspan></text>
+  </g>
+</svg>
--- a/assets/icons/email-text.svg
+++ b/assets/icons/email-text.svg
--- a/deploy/Docker/archlinux/Dockerfile
+++ b/deploy/Docker/archlinux/Dockerfile
@@ -4,10 +4,7 @@ FROM archlinux
 RUN pacman --noconfirm -Sy

 #Build dependencies
-RUN pacman --noconfirm -S sudo cmake git coreutils base-devel eigen
-
-#Dependencies from repos
-RUN pacman --noconfirm -S qt5-base mbedtls
+RUN pacman --noconfirm -S sudo cmake git coreutils base-devel qt5-base

 RUN echo "MAKEFLAGS=\"-j${nproc}\"" >> /etc/makepkg.conf

@@ -24,15 +21,13 @@ RUN git clone https://aur.archlinux.org/yay.git && \
    makepkg -si --noconfirm && \
    cd .. && sudo rm -rf yay

-RUN yay -Sy --noconfirm gtkglext
-RUN yay -S --noconfirm cpr opencv opencv2 nlohmann-json tesseract tesseract-data-rus
+RUN yay -S opencv zbar nlohmann-json tesseract tesseract-data-rus

 #building
 WORKDIR /home/checks-parser
 RUN git clone https://git.foxarmy.org/leca/checks-parser && \
    cd checks-parser && \
-    mkdir build && cd build && \
-    cmake .. && \
+    cmake . && \
    make -j ${nproc} && \
    sudo make install

--- a/deploy/archlinux/PKGBUILD
+++ b/deploy/archlinux/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Leca <leca@foxarmy.org>
+pkgname=checks-parser-git
+pkgver=alpha_0.0.2
+pkgrel=1
+epoch=
+pkgdesc="Utility for parsing checks(receipts) to csv"
+arch=('x86_64')
+url="https://git.foxarmy.org/leca/checks-parser"
+license=('GPL-3.0-or-later')
+groups=()
+depends=('qt5-base' 'opencv' 'zbar' 'nlohmann-json' 'tesseract')
+makedepends=('cmake' 'make' 'gcc' 'git' 'qt5-tools')
+checkdepends=()
+optdepends=('tesseract-data-rus: scan russian checks with OCR')
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("checks-parser-git::git+$url")
+noextract=()
+sha256sums=('SKIP')
+
+build() {
+	cd "$pkgname"
+	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .
+	make -j ${nproc}
+}
+
+package() {
+	cd "$pkgname"
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	make DESTDIR="$pkgdir/" PREFIX="/usr" install
+}
--- a/deploy/debian/package.sh
+++ b/deploy/debian/package.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+pkgname="checks-parser"
+pkgver="3.0"
+revision="1"
+
+pkg=${pkgname}_$pkgver-$revision
+mkdir $pkg
+
+mkdir -p $pkg/usr/bin
+
+cp ../../checks-parser $pkg/usr/bin
+
+mkdir $pkg/DEBIAN
+
+echo \
+"Package: $pkgname
+Version: $pkgver-$revision
+Section: utils
+Priority: optional
+Architecture: amd64
+Homepage: https://git.foxarmy.org/checks-parser
+Depends: libc, qtbase5-dev, openssl, libmbedtls-dev, tesseract-ocr, tesseract-ocr-rus, libopencv-dev, libzbar-dev, qttools5-dev, nlohmann-json3-dev, libcurl4-openssl-dev, libtesseract-dev
+Maintainer: Leca <leca@foxarmy.org>
+Description: Utility for parsing checks(receipts) to csv
+ Utility for extraction of content of a check(receipt) using plaintext, OCR or request to FTS (Federal Taxation Service)"\
+> $pkg/DEBIAN/control
+
+dpkg-deb --build $pkg
+rm -rf $pkg
--- a/main.cpp
+++ b/main.cpp
@@ -16,6 +16,8 @@
 #include <QTextStream>
 #include <QTranslator>

+#include <parser/parser.h>
+
 int main(int argc, char *argv[]) {
    curl_global_init(CURL_GLOBAL_ALL);

@@ -54,10 +56,14 @@ 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);
    MainWindow w;
+    // MainWindow w;
    w.update();
    w.show();

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,212 +1,16 @@
 #include "mainwindow.h"
-#include "./ui_mainwindow.h"
-#include "check/check.h"
-#include "exceptions/ofdrequestexception.h"
-#include "goods/goods.h"
-#include "outputdialog.h"
-#include "adjustpicturedialog.h"
-#include "settingsdialog.h"
-#include "solvecaptchadialog.h"
-#include <QFileDialog>
-#include <QMessageBox>
-#include "image/checkimage.h"
-#include "utils/utils.h"
-#include <opencv2/objdetect.hpp>
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <zbar.h>
+#include "ui_mainwindow.h"

 MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent), ui(new Ui::MainWindow) {
-    ui->setupUi(this);
-    this->setupStoresList();
-}
-
-MainWindow::~MainWindow() { delete ui; }
-
-void MainWindow::setupStoresList() {
-    parser = *(new Parser());
-
-    std::vector<std::string> modules_names = parser.search_modules();
-
-    for (std::string name : modules_names) {
-        StoreModule m(name);
-        std::wstring module_name = m.get_name();
-
-        QString s = QString::fromStdWString(module_name);
-        ui->storeType->addItem(s);
-    }
-}
-
-std::string MainWindow::makeRequestToOfd(std::string captcha) {
-    std::string checkContent = Net().fetch_check_data_from_ofdru(
-        ui->fn_edit->text().toStdString(),
-        ui->fd_edit->text().toStdString(),
-        ui->fi_edit->text().toStdString(),
-        ui->dateTimeEdit->dateTime().toString(Qt::ISODate).toStdString(),
-        ui->fundIncomeCombo->currentIndex() + 1,
-        // In the request to ofd.ru, total is in a strange format, like a string of a format where 2 last digits represent decimal part of a number.
-        ui->total_edit->text().toDouble() * 100,
-        captcha);
-
-    return checkContent;
-}
-
-void MainWindow::on_parseButton_clicked() {
-    QString s;
-    switch (ui->tabWidget->currentIndex()) {
-    case 0:
-        s = ui->checkContent->toPlainText();
-        break;
-    case 1:
-        s = ui->checkContentFromImage->toPlainText();
-        break;
-    case 2:
-        Net().get_captcha_from_ofdru();
-
-        std::string solved_captcha = "";
-        bool success = true;
-        bool is_captcha_solved = true;
-
-        do {
-            SolveCaptchaDialog dialog = SolveCaptchaDialog(this, &solved_captcha);
-            dialog.exec();
-            is_captcha_solved = true;
-
-            try {
-                std::string check_content = makeRequestToOfd(solved_captcha);
-                check = parseOfdRuAnswer(check_content);
-            } catch(OfdRequestException e) {
-                success = false;
-                if (!strcmp(e.what(), "Incorrect captcha")) {
-                    is_captcha_solved = false;
-                    QMessageBox infoDialog;
-                    infoDialog.setText(tr("Captcha was not solved correctly!"));
-                    infoDialog.setIcon(QMessageBox::Critical);
-                    infoDialog.setWindowTitle(tr("Captcha is incorrect"));
-                    infoDialog.exec();
-                    break;
-                } else if (!strcmp(e.what(), "Does not exist")) {
-                    QMessageBox infoDialog;
-                    infoDialog.setText(tr("Check not found. Please, ensure correctness of entered data."));
-                    infoDialog.setIcon(QMessageBox::Critical);
-                    infoDialog.setWindowTitle(tr("Check was not found"));
-                    infoDialog.exec();
-                    return;
-                }
-            }
-        } while (!is_captcha_solved);
-
-        if (success) {
-            OutputDialog d = OutputDialog(this, check);
-            d.exec();
-        }
-
-        return;
-    }
-
-    std::wstring check_plaintext = s.toStdWString();
-    parser.set_module(parser.search_modules()[0]);
-
-    std::vector<Goods> c = parser.parse(check_plaintext);
-
-    if (c.size() == 0) {
-        QMessageBox infoDialog;
-        infoDialog.setText(tr("An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer."));
-        infoDialog.setIcon(QMessageBox::Critical);
-        infoDialog.setWindowTitle(tr("Error in parsing"));
-        infoDialog.exec();
-        return;
-    }
-
-    for (auto& g : c) {
-        check.add_goods(g);
-    }
-
-    OutputDialog d = OutputDialog(this, check);
-    d.show();
-    d.exec();
-}
-
-void MainWindow::on_storeType_currentIndexChanged(int index) {
-    std::string module = parser.search_modules()[index];
-    parser.set_module(module);
-}
-
-
-void MainWindow::on_preferencesButton_clicked() {
-    SettingsDialog s = SettingsDialog();
-    s.show();
-    s.exec();
-}
-
-void MainWindow::on_chooseImageButton_ofd_clicked() {
-    QString filename = QFileDialog::getOpenFileName();
-
-	if (filename == "") {
-		QMessageBox infoDialog;
-        infoDialog.setText(tr("Please, select a picture where QR code that contains info about check is present"));
-        infoDialog.setIcon(QMessageBox::Critical);
-	    infoDialog.setWindowTitle(tr("Picture was not selected"));
-		infoDialog.exec();
-		return;
-	}
-
-    std::string new_text = "Selected: " + filename.toStdString();
-    ui->pathLabel_ofd->setText(QString::fromStdString(new_text));
-
-    AdjustPictureDialog dialog = AdjustPictureDialog(this, filename.toStdString());
-    connect(&dialog, &AdjustPictureDialog::decodedData, this, &MainWindow::onDecodedData);
-    dialog.exec();
-
-    ui->picture_ofd->setPixmap(QPixmap(filename));
-    ui->picture_ofd->setScaledContents(true);
-}
-
-void MainWindow::onDecodedData(std::string data) {
-    std::string delimiter = "&";
-    std::vector<std::string> dataSplit = split(data, delimiter);
-
-    std::cout << data << std::endl;
-
-    ui->fn_edit->setText(QString::fromStdString(dataSplit[2]));
-    ui->fd_edit->setText(QString::fromStdString(dataSplit[3]));
-    ui->fi_edit->setText(QString::fromStdString(dataSplit[4]));
-
-    QString extractedDateTime = QString::fromStdString(split(dataSplit[0], "=")[1]);
-    QDateTime datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmm");
-    ui->dateTimeEdit->setDateTime(datetime);
-
-    int type = std::stoi(split(dataSplit[5], "=")[1]);
-    ui->fundIncomeCombo->setCurrentIndex(type - 1);
-
-    std::string total = split(dataSplit[1], "=")[1];
-
-    ui->total_edit->setText(QString::fromStdString(total));
-}
-
-void MainWindow::on_chooseImageButton_ocr_clicked()
+    : QWidget(parent)
+    , ui(new Ui::MainWindow)
 {
-    QString filename = QFileDialog::getOpenFileName();
-
-	if (filename == "") {
-		QMessageBox infoDialog;
-        infoDialog.setText(tr("Please, select a picture to scan"));
-        infoDialog.setIcon(QMessageBox::Critical);
-	    infoDialog.setWindowTitle(tr("Picture was not selected"));
-		infoDialog.exec();
-		return;
-	}
-	
-    std::string new_text = "Selected: " + filename.toStdString();
-    ui->pathLabel_ocr->setText(QString::fromStdString(new_text));
-
-    CheckImage i(filename.toStdString());
-    std::string parsed = i.parse_text();
-
-    ui->picture_ocr->setPixmap(QPixmap(filename));
-    ui->picture_ocr->setScaledContents(true);
-    ui->checkContentFromImage->setPlainText(QString::fromStdString(parsed));
+    ui->setupUi(this);
 }

+MainWindow::~MainWindow()
+{
+    delete ui;
+}
+
+
--- a/mainwindow.cpp.old
+++ b/mainwindow.cpp.old
@@ -0,0 +1,219 @@
+#include "mainwindow.h"
+#include "./ui_mainwindow.h"
+#include "check/check.h"
+#include "exceptions/ofdrequestexception.h"
+#include "goods/goods.h"
+#include "outputdialog.h"
+#include "adjustpicturedialog.h"
+#include "settingsdialog.h"
+#include "solvecaptchadialog.h"
+#include <QFileDialog>
+#include <QMessageBox>
+#include "image/checkimage.h"
+#include "utils/utils.h"
+#include <opencv2/objdetect.hpp>
+#include <opencv2/imgcodecs.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
+#include <zbar.h>
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent), ui(new Ui::MainWindow) {
+    ui->setupUi(this);
+    // this->setupStoresList();
+}
+
+MainWindow::~MainWindow() { delete ui; }
+
+// void MainWindow::setupStoresList() {
+//     parser = *(new Parser());
+
+//     std::vector<std::string> modules_names = parser.search_modules();
+
+//     for (std::string name : modules_names) {
+//         StoreModule m(name);
+//         std::wstring module_name = m.get_name();
+
+//         QString s = QString::fromStdWString(module_name);
+//         ui->storeType->addItem(s);
+//     }
+// }
+
+// std::string MainWindow::makeRequestToOfd(std::string captcha) {
+//     std::string checkContent = Net().fetch_check_data_from_ofdru(
+//         ui->fn_edit->text().toStdString(),
+//         ui->fd_edit->text().toStdString(),
+//         ui->fi_edit->text().toStdString(),
+//         ui->dateTimeEdit->dateTime().toString(Qt::ISODate).toStdString(),
+//         ui->fundIncomeCombo->currentIndex() + 1,
+//         // In the request to ofd.ru, total is in a strange format, like a string of a format where 2 last digits represent decimal part of a number.
+//         ui->total_edit->text().toDouble() * 100,
+//         captcha);
+
+//     return checkContent;
+// }
+
+// void MainWindow::on_parseButton_clicked() {
+//     QString s;
+//     switch (ui->tabWidget->currentIndex()) {
+//     case 0:
+//         s = ui->checkContent->toPlainText();
+//         break;
+//     case 1:
+//         s = ui->checkContentFromImage->toPlainText();
+//         break;
+//     case 2:
+//         Net().get_captcha_from_ofdru();
+
+//         std::string solved_captcha = "";
+//         bool success = true;
+//         bool is_captcha_solved = true;
+
+//         do {
+//             SolveCaptchaDialog dialog = SolveCaptchaDialog(this, &solved_captcha);
+//             dialog.exec();
+//             is_captcha_solved = true;
+
+//             try {
+//                 std::string check_content = makeRequestToOfd(solved_captcha);
+//                 check = parseOfdRuAnswer(check_content);
+//             } catch(OfdRequestException e) {
+//                 success = false;
+//                 if (!strcmp(e.what(), "Incorrect captcha")) {
+//                     is_captcha_solved = false;
+//                     QMessageBox infoDialog;
+//                     infoDialog.setText(tr("Captcha was not solved correctly!"));
+//                     infoDialog.setIcon(QMessageBox::Critical);
+//                     infoDialog.setWindowTitle(tr("Captcha is incorrect"));
+//                     infoDialog.exec();
+//                     break;
+//                 } else if (!strcmp(e.what(), "Internal server error")) {
+//                     QMessageBox infoDialog;
+//                     infoDialog.setText(tr("Internal server error. Please, try again later."));
+//                     infoDialog.setIcon(QMessageBox::Critical);
+//                     infoDialog.setWindowTitle(tr("Internal server error"));
+//                     infoDialog.exec();
+//                     return;
+//                 } else if (!strcmp(e.what(), "Does not exist")) {
+//                     QMessageBox infoDialog;
+//                     infoDialog.setText(tr("Check not found. Please, ensure correctness of entered data."));
+//                     infoDialog.setIcon(QMessageBox::Critical);
+//                     infoDialog.setWindowTitle(tr("Check was not found"));
+//                     infoDialog.exec();
+//                     return;
+//                 }
+//             }
+//         } while (!is_captcha_solved);
+
+//         if (success) {
+//             OutputDialog d = OutputDialog(this, check);
+//             d.exec();
+//         }
+
+//         return;
+//     }
+
+//     std::wstring check_plaintext = s.toStdWString();
+//     parser.set_module(parser.search_modules()[0]);
+
+//     std::vector<Goods> c = parser.parse(check_plaintext);
+
+//     if (c.size() == 0) {
+//         QMessageBox infoDialog;
+//         infoDialog.setText(tr("An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer."));
+//         infoDialog.setIcon(QMessageBox::Critical);
+//         infoDialog.setWindowTitle(tr("Error in parsing"));
+//         infoDialog.exec();
+//         return;
+//     }
+
+//     for (auto& g : c) {
+//         check.add_goods(g);
+//     }
+
+//     OutputDialog d = OutputDialog(this, check);
+//     d.show();
+//     d.exec();
+// }
+
+// void MainWindow::on_storeType_currentIndexChanged(int index) {
+//     std::string module = parser.search_modules()[index];
+//     parser.set_module(module);
+// }
+
+
+// void MainWindow::on_preferencesButton_clicked() {
+//     SettingsDialog s = SettingsDialog();
+//     s.show();
+//     s.exec();
+// }
+
+// void MainWindow::on_chooseImageButton_ofd_clicked() {
+//     QString filename = QFileDialog::getOpenFileName();
+
+// 	if (filename == "") {
+// 		QMessageBox infoDialog;
+//         infoDialog.setText(tr("Please, select a picture where QR code that contains info about check is present"));
+//         infoDialog.setIcon(QMessageBox::Critical);
+// 	    infoDialog.setWindowTitle(tr("Picture was not selected"));
+// 		infoDialog.exec();
+// 		return;
+// 	}
+
+//     std::string new_text = "Selected: " + filename.toStdString();
+//     ui->pathLabel_ofd->setText(QString::fromStdString(new_text));
+
+//     AdjustPictureDialog dialog = AdjustPictureDialog(this, filename.toStdString());
+//     connect(&dialog, &AdjustPictureDialog::decodedData, this, &MainWindow::onDecodedData);
+//     dialog.exec();
+
+//     ui->picture_ofd->setPixmap(QPixmap(filename));
+//     ui->picture_ofd->setScaledContents(true);
+// }
+
+// void MainWindow::onDecodedData(std::string data) {
+//     std::string delimiter = "&";
+//     std::vector<std::string> dataSplit = split(data, delimiter);
+
+//     std::cout << data << std::endl;
+
+//     ui->fn_edit->setText(QString::fromStdString(dataSplit[2]));
+//     ui->fd_edit->setText(QString::fromStdString(dataSplit[3]));
+//     ui->fi_edit->setText(QString::fromStdString(dataSplit[4]));
+
+//     QString extractedDateTime = QString::fromStdString(split(dataSplit[0], "=")[1]);
+//     QDateTime datetime = QDateTime::fromString(extractedDateTime, "yyyyMMddThhmm");
+//     ui->dateTimeEdit->setDateTime(datetime);
+
+//     int type = std::stoi(split(dataSplit[5], "=")[1]);
+//     ui->fundIncomeCombo->setCurrentIndex(type - 1);
+
+//     std::string total = split(dataSplit[1], "=")[1];
+
+//     ui->total_edit->setText(QString::fromStdString(total));
+// }
+
+// void MainWindow::on_chooseImageButton_ocr_clicked()
+// {
+//     QString filename = QFileDialog::getOpenFileName();
+
+// 	if (filename == "") {
+// 		QMessageBox infoDialog;
+//         infoDialog.setText(tr("Please, select a picture to scan"));
+//         infoDialog.setIcon(QMessageBox::Critical);
+// 	    infoDialog.setWindowTitle(tr("Picture was not selected"));
+// 		infoDialog.exec();
+// 		return;
+// 	}
+	
+//     std::string new_text = "Selected: " + filename.toStdString();
+//     ui->pathLabel_ocr->setText(QString::fromStdString(new_text));
+
+//     CheckImage i(filename.toStdString());
+//     std::string parsed = i.parse_text();
+
+//     ui->picture_ocr->setPixmap(QPixmap(filename));
+//     ui->picture_ocr->setScaledContents(true);
+//     ui->checkContentFromImage->setPlainText(QString::fromStdString(parsed));
+// }
+
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,44 +1,23 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H

-#include <QMainWindow>
+#include <QWidget>
+#include <qevent.h>

-#include "check/check.h"
-#include "parser/parser.h"
-
-QT_BEGIN_NAMESPACE
 namespace Ui {
 class MainWindow;
 }
-QT_END_NAMESPACE

-class MainWindow : public QMainWindow {
+class MainWindow : public QWidget
+{
    Q_OBJECT

-    Check check;
-    Parser parser;
-
 public:
-    MainWindow(QWidget *parent = nullptr);
+    explicit MainWindow(QWidget *parent = nullptr);
    ~MainWindow();
-    void setupStoresList();
-
-    Check get_check();
-    void onDecodedData(std::string);
-
-    std::string makeRequestToOfd(std::string captcha);
-private slots:
-    void on_parseButton_clicked();
-
-    void on_storeType_currentIndexChanged(int index);
-
-    void on_preferencesButton_clicked();
-
-    void on_chooseImageButton_ofd_clicked();
-
-    void on_chooseImageButton_ocr_clicked();

 private:
    Ui::MainWindow *ui;
 };
+
 #endif // MAINWINDOW_H
--- a/mainwindow.h.old
+++ b/mainwindow.h.old
@@ -0,0 +1,44 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+#include "check/check.h"
+#include "parser/parser.h"
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class MainWindow;
+}
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow {
+    Q_OBJECT
+
+    Check check;
+    Parser parser;
+
+public:
+    MainWindow(QWidget *parent = nullptr);
+    ~MainWindow();
+    // void setupStoresList();
+
+    // Check get_check();
+    // void onDecodedData(std::string);
+
+    // std::string makeRequestToOfd(std::string captcha);
+private slots:
+    // void on_parseButton_clicked();
+
+    // void on_storeType_currentIndexChanged(int index);
+
+    // void on_preferencesButton_clicked();
+
+    // void on_chooseImageButton_ofd_clicked();
+
+    // void on_chooseImageButton_ocr_clicked();
+
+private:
+    Ui::MainWindow *ui;
+};
+#endif // MAINWINDOW_H
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1,400 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
 <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
+ <widget class="QWidget" name="MainWindow">
  <property name="geometry">
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>817</width>
-    <height>659</height>
+    <width>971</width>
+    <height>616</height>
   </rect>
  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
  </property>
-  <widget class="QWidget" name="centralwidget">
-   <widget class="QComboBox" name="storeType">
-    <property name="geometry">
-     <rect>
-      <x>90</x>
-      <y>10</y>
-      <width>211</width>
-      <height>31</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="QLabel" name="storeTypeLabel">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>10</y>
-      <width>81</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Store type</string>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="parseButton">
-    <property name="geometry">
-     <rect>
-      <x>30</x>
-      <y>560</y>
-      <width>80</width>
-      <height>26</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Parse</string>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="preferencesButton">
-    <property name="geometry">
-     <rect>
-      <x>730</x>
-      <y>0</y>
-      <width>81</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Preferences</string>
-    </property>
-   </widget>
-   <widget class="QTabWidget" name="tabWidget">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>50</y>
-      <width>801</width>
-      <height>511</height>
-     </rect>
-    </property>
-    <property name="currentIndex">
-     <number>2</number>
-    </property>
-    <widget class="QWidget" name="Text">
-     <attribute name="title">
-      <string>Text</string>
-     </attribute>
-     <widget class="QLabel" name="checkContentLabel">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>101</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Check content</string>
-      </property>
-     </widget>
-     <widget class="QPlainTextEdit" name="checkContent">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>30</y>
-        <width>611</width>
-        <height>441</height>
-       </rect>
-      </property>
-     </widget>
+  <property name="minimumSize">
+   <size>
+    <width>971</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="0">
+    <widget class="QPushButton" name="pushButton_2">
+     <property name="text">
+      <string>PushButton</string>
+     </property>
    </widget>
-    <widget class="QWidget" name="OCR">
-     <attribute name="title">
-      <string>OCR</string>
-     </attribute>
-     <widget class="QPushButton" name="chooseImageButton_ocr">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>0</y>
-        <width>80</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Choose</string>
-      </property>
-     </widget>
-     <widget class="QPlainTextEdit" name="checkContentFromImage">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>60</y>
-        <width>511</width>
-        <height>401</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QLabel" name="pathLabel_ocr">
-      <property name="geometry">
-       <rect>
-        <x>100</x>
-        <y>0</y>
-        <width>381</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Path to image: </string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>30</y>
-        <width>571</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Here is recognised check text. Please, edit it if something's wrong:</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="picture_ocr">
-      <property name="geometry">
-       <rect>
-        <x>490</x>
-        <y>10</y>
-        <width>291</width>
-        <height>421</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QPushButton" name="pushButton_4">
+     <property name="text">
+      <string>PushButton</string>
+     </property>
    </widget>
-    <widget class="QWidget" name="OFD">
-     <attribute name="title">
-      <string>OFD</string>
-     </attribute>
-     <widget class="QLabel" name="picture_ofd">
-      <property name="geometry">
-       <rect>
-        <x>490</x>
-        <y>10</y>
-        <width>291</width>
-        <height>421</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QLabel" name="pathLabel_ofd">
-      <property name="geometry">
-       <rect>
-        <x>100</x>
-        <y>0</y>
-        <width>381</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Path to image: </string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="chooseImageButton_ofd">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>0</y>
-        <width>80</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Choose</string>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="fn_edit">
-      <property name="geometry">
-       <rect>
-        <x>180</x>
-        <y>50</y>
-        <width>261</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="inputMask">
-       <string>0000000000000000</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="fn_label">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>50</y>
-        <width>161</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="text">
-       <string>FN (Fiscal Number)</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="fd_label">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>90</y>
-        <width>161</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="text">
-       <string>FD (Fiscal Document)</string>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="fd_edit">
-      <property name="geometry">
-       <rect>
-        <x>180</x>
-        <y>90</y>
-        <width>261</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="inputMask">
-       <string>0000000000</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="fi_label">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>130</y>
-        <width>161</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="text">
-       <string>FI (Fiscal Identifier)</string>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="fi_edit">
-      <property name="geometry">
-       <rect>
-        <x>180</x>
-        <y>130</y>
-        <width>261</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="inputMask">
-       <string>0000000000</string>
-      </property>
-     </widget>
-     <widget class="QDateTimeEdit" name="dateTimeEdit">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>170</y>
-        <width>194</width>
-        <height>27</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="fundIncomeCombo">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>210</y>
-        <width>191</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <item>
-       <property name="text">
-        <string>Funds income</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Funds return</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Funds spend</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Spends return</string>
-       </property>
-      </item>
-     </widget>
-     <widget class="QLineEdit" name="total_edit">
-      <property name="geometry">
-       <rect>
-        <x>90</x>
-        <y>250</y>
-        <width>113</width>
-        <height>26</height>
-       </rect>
-      </property>
-      <property name="inputMask">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QLabel" name="total_label">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>250</y>
-        <width>66</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Total</string>
-      </property>
-     </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QPushButton" name="pushButton_3">
+     <property name="toolTip">
+      <string>Optical Character Recognition</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset>
+       <normaloff>:/icons/assets/icons/OCR.svg</normaloff>:/icons/assets/icons/OCR.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>128</width>
+       <height>128</height>
+      </size>
+     </property>
    </widget>
-   </widget>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>817</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuchecks_parser">
-    <property name="title">
-     <string>checks parser</string>
-    </property>
-   </widget>
-   <addaction name="menuchecks_parser"/>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
+   </item>
+   <item row="0" column="0">
+    <widget class="QPushButton" name="pushButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip">
+      <string>Text from E-Mail</string>
+     </property>
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset>
+       <normaloff>:/icons/assets/icons/email-text.svg</normaloff>:/icons/assets/icons/email-text.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>128</width>
+       <height>128</height>
+      </size>
+     </property>
+     <property name="autoRepeat">
+      <bool>false</bool>
+     </property>
+     <property name="autoExclusive">
+      <bool>false</bool>
+     </property>
+     <property name="autoDefault">
+      <bool>false</bool>
+     </property>
+     <property name="default">
+      <bool>false</bool>
+     </property>
+     <property name="flat">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
 </widget>
 <resources/>
 <connections/>
--- a/mainwindow.ui.old
+++ b/mainwindow.ui.old
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>817</width>
+    <height>659</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <widget class="QWidget" name="gridLayoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>-10</y>
+      <width>821</width>
+      <height>621</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QPushButton" name="preferencesButton">
+       <property name="text">
+        <string>Preferences</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>817</width>
+     <height>33</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuchecks_parser">
+    <property name="title">
+     <string>checks parser</string>
+    </property>
+   </widget>
+   <addaction name="menuchecks_parser"/>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/media.qrc
+++ b/media.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/icons">
+        <file>assets/icons/email-text.svg</file>
+	<file>assets/icons/OCR.svg</file>
+    </qresource>
+</RCC>
--- a/outputdialog.ui
+++ b/outputdialog.ui
@@ -60,7 +60,7 @@
    <rect>
     <x>10</x>
     <y>50</y>
-     <width>111</width>
+     <width>371</width>
     <height>24</height>
    </rect>
   </property>
@@ -168,7 +168,7 @@
    <rect>
     <x>10</x>
     <y>90</y>
-     <width>111</width>
+     <width>381</width>
     <height>24</height>
    </rect>
   </property>
--- a/translations.qrc
+++ b/translations.qrc
@@ -3,5 +3,4 @@
        <file>en_US.qm</file>
        <file>ru_RU.qm</file>
    </qresource>
-    <qresource prefix="/translations"/>
 </RCC>
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@@ -27,172 +27,162 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../mainwindow.ui" line="14"/>
        <source>MainWindow</source>
-        <translation>Главное окно</translation>
+        <translation type="vanished">Главное окно</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="37"/>
        <source>Store type</source>
-        <translation>Store type</translation>
+        <translation type="vanished">Store type</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="50"/>
        <source>Parse</source>
-        <translation>Parse</translation>
+        <translation type="vanished">Parse</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="63"/>
        <source>Preferences</source>
-        <translation>Preferences</translation>
+        <translation type="vanished">Preferences</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="80"/>
        <source>Text</source>
-        <translation>Text</translation>
+        <translation type="vanished">Text</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="92"/>
        <source>Check content</source>
-        <translation>Check content</translation>
+        <translation type="vanished">Check content</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="108"/>
        <source>OCR</source>
        <translatorcomment>OCR = Optical Character Recognition</translatorcomment>
-        <translation>OCR</translation>
+        <translation type="vanished">OCR</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="120"/>
-        <location filename="../mainwindow.ui" line="213"/>
        <source>Choose</source>
-        <translation>Choose</translation>
+        <translation type="vanished">Choose</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="143"/>
-        <location filename="../mainwindow.ui" line="200"/>
        <source>Path to image: </source>
-        <translation>Path to image: </translation>
+        <translation type="vanished">Path to image: </translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="156"/>
        <source>Here is recognised check text. Please, edit it if something&apos;s wrong:</source>
-        <translation>Here is recognised check text. Please, edit it if something&apos;s wrong:</translation>
+        <translation type="vanished">Here is recognised check text. Please, edit it if something&apos;s wrong:</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="175"/>
        <source>OFD</source>
        <translatorcomment>OFD = Оператор Фискальных Данных</translatorcomment>
-        <translation>OFD</translation>
+        <translation type="vanished">OFD</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="226"/>
        <source>0000000000000000</source>
-        <translation>0000000000000000</translation>
+        <translation type="vanished">0000000000000000</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="245"/>
        <source>FN (Fiscal Number)</source>
        <translatorcomment>FN = Фискальный Номер</translatorcomment>
-        <translation>FN (Fiscal Number)</translation>
+        <translation type="vanished">FN (Fiscal Number)</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="264"/>
        <source>FD (Fiscal Document)</source>
        <translatorcomment>FD = Фискальный Документ</translatorcomment>
-        <translation>FD (Fiscal Document)</translation>
+        <translation type="vanished">FD (Fiscal Document)</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="277"/>
-        <location filename="../mainwindow.ui" line="309"/>
        <source>0000000000</source>
-        <translation>000000000</translation>
+        <translation type="vanished">000000000</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="296"/>
        <source>FI (Fiscal Identifier)</source>
        <translatorcomment>FI = Фискальный Признак</translatorcomment>
-        <translation>FI (Fiscal Identifier)</translation>
+        <translation type="vanished">FI (Fiscal Identifier)</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="333"/>
        <source>Funds income</source>
        <translatorcomment>Приход средств</translatorcomment>
-        <translation>Funds incode</translation>
+        <translation type="vanished">Funds income</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="338"/>
        <source>Funds return</source>
        <translatorcomment>Возврат средств</translatorcomment>
-        <translation>Funds return</translation>
+        <translation type="vanished">Funds return</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="343"/>
        <source>Funds spend</source>
        <translatorcomment>Расход средств</translatorcomment>
-        <translation>Funds spend</translation>
+        <translation type="vanished">Funds spend</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="348"/>
        <source>Spends return</source>
        <translatorcomment>Возврат расхода</translatorcomment>
-        <translation>Spends return</translation>
+        <translation type="vanished">Spends return</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="375"/>
        <source>Total</source>
-        <translation>Total</translation>
+        <translation type="vanished">Total</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="392"/>
        <source>checks parser</source>
-        <translation>checks parser</translation>
+        <translation type="vanished">checks parser</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="85"/>
        <source>Captcha was not solved correctly!</source>
-        <translation>Captcha was not solved correctly!</translation>
+        <translation type="vanished">Captcha was not solved correctly!</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="87"/>
        <source>Captcha is incorrect</source>
-        <translation>Captcha is incorrect</translation>
+        <translation type="vanished">Captcha is incorrect</translation>
+    </message>
+    <message>
+        <source>Internal server error. Please, try again later.</source>
+        <translation type="vanished">Internal server error. Please, try again later.</translation>
+    </message>
+    <message>
+        <source>Internal server error</source>
+        <translation type="vanished">Internal server error</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="92"/>
        <source>Check not found. Please, ensure correctness of entered data.</source>
-        <translation>Check not found. Please, ensure correctness of entered data.</translation>
+        <translation type="vanished">Check not found. Please, ensure correctness of entered data.</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="94"/>
-        <source>Check was not found</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="116"/>
        <source>An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.</source>
-        <translation>An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.</translation>
+        <translation type="vanished">An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="118"/>
        <source>Error in parsing</source>
-        <translation>Error in parsing</translation>
+        <translation type="vanished">Error in parsing</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="149"/>
        <source>Please, select a picture where QR code that contains info about check is present</source>
-        <translation>Please, select a picture where QR code that contains info about check is present</translation>
+        <translation type="vanished">Please, select a picture where QR code that contains info about check is present</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="151"/>
-        <location filename="../mainwindow.cpp" line="197"/>
        <source>Picture was not selected</source>
-        <translation>Picture was not selected</translation>
+        <translation type="vanished">Picture was not selected</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="195"/>
        <source>Please, select a picture to scan</source>
-        <translation>Please, select a picture to scan</translation>
+        <translation type="vanished">Please, select a picture to scan</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="32"/>
+        <location filename="../mainwindow.ui" line="39"/>
+        <source>PushButton</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="46"/>
+        <source>Optical Character Recognition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="72"/>
+        <source>Text from E-Mail</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
--- a/translations/ru_RU.ts
+++ b/translations/ru_RU.ts
@@ -27,168 +27,162 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../mainwindow.ui" line="14"/>
        <source>MainWindow</source>
-        <translation>ГлавноеОкно</translation>
+        <translation type="vanished">ГлавноеОкно</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="37"/>
        <source>Store type</source>
-        <translation>Магазин</translation>
+        <translation type="vanished">Магазин</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="50"/>
        <source>Parse</source>
-        <translation>Парсить</translation>
+        <translation type="vanished">Парсить</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="63"/>
        <source>Preferences</source>
-        <translation>Настройки</translation>
+        <translation type="vanished">Настройки</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="80"/>
        <source>Text</source>
-        <translation>Текст</translation>
+        <translation type="vanished">Текст</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="92"/>
        <source>Check content</source>
-        <translation>Контент чека</translation>
+        <translation type="vanished">Контент чека</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="108"/>
        <source>OCR</source>
        <translatorcomment>Оптическое Распознавание Символов</translatorcomment>
-        <translation>ОСР</translation>
+        <translation type="vanished">ОРС</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="120"/>
-        <location filename="../mainwindow.ui" line="213"/>
        <source>Choose</source>
-        <translation>Выбрать</translation>
+        <translation type="vanished">Выбрать</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="143"/>
-        <location filename="../mainwindow.ui" line="200"/>
        <source>Path to image: </source>
-        <translation>Путь к изображению: </translation>
+        <translation type="vanished">Путь к изображению: </translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="156"/>
        <source>Here is recognised check text. Please, edit it if something&apos;s wrong:</source>
-        <translation>Ниже приведён распознанный текст. Пожалуйста, отредактируйте его:</translation>
+        <translation type="vanished">Ниже приведён распознанный текст. Пожалуйста, отредактируйте его:</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="175"/>
        <source>OFD</source>
        <translatorcomment>Оператор Фискальных Данных</translatorcomment>
-        <translation>ОФД</translation>
+        <translation type="vanished">ОФД</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="226"/>
        <source>0000000000000000</source>
-        <translation>0000000000000000</translation>
+        <translation type="vanished">0000000000000000</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="245"/>
        <source>FN (Fiscal Number)</source>
        <translatorcomment>Фискальный Норма</translatorcomment>
-        <translation>ФН</translation>
+        <translation type="vanished">ФН</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="264"/>
        <source>FD (Fiscal Document)</source>
        <translatorcomment>Фискальный Документ</translatorcomment>
-        <translation>ФД</translation>
+        <translation type="vanished">ФД</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="277"/>
-        <location filename="../mainwindow.ui" line="309"/>
        <source>0000000000</source>
-        <translation>000000000</translation>
+        <translation type="vanished">000000000</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="296"/>
        <source>FI (Fiscal Identifier)</source>
        <translatorcomment>Фискальный Признак</translatorcomment>
-        <translation>ФП</translation>
+        <translation type="vanished">ФП</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="333"/>
        <source>Funds income</source>
-        <translation>Приход средств</translation>
+        <translation type="vanished">Приход средств</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="338"/>
        <source>Funds return</source>
-        <translation>Возврат средств</translation>
+        <translation type="vanished">Возврат средств</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="343"/>
        <source>Funds spend</source>
-        <translation>Расход средств</translation>
+        <translation type="vanished">Расход средств</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="348"/>
        <source>Spends return</source>
-        <translation>Возврат расхода</translation>
+        <translation type="vanished">Возврат расхода</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="375"/>
        <source>Total</source>
-        <translation>Итого</translation>
+        <translation type="vanished">Итого</translation>
    </message>
    <message>
-        <location filename="../mainwindow.ui" line="392"/>
        <source>checks parser</source>
-        <translation>Парсер чеков</translation>
+        <translation type="vanished">Парсер чеков</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="85"/>
        <source>Captcha was not solved correctly!</source>
-        <translation>Капча была решена неверно!</translation>
+        <translation type="vanished">Капча была решена неверно!</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="87"/>
        <source>Captcha is incorrect</source>
-        <translation>Капча введена неверно</translation>
+        <translation type="vanished">Капча введена неверно</translation>
+    </message>
+    <message>
+        <source>Internal server error. Please, try again later.</source>
+        <translation type="vanished">Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже.</translation>
+    </message>
+    <message>
+        <source>Internal server error</source>
+        <translation type="vanished">Внутренняя ошибка сервера</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="92"/>
        <source>Check not found. Please, ensure correctness of entered data.</source>
-        <translation>Чек не найден. Пожалуйста, убедитесь в правильности введённых данных.</translation>
+        <translation type="vanished">Чек не найден. Пожалуйста, убедитесь в правильности введённых данных.</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="94"/>
        <source>Check was not found</source>
-        <translation>Чек не найден</translation>
+        <translation type="vanished">Чек не найден</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="116"/>
        <source>An error has occured. Check was matched incorrectly. Vector sizes are different. Please, contact the developer.</source>
-        <translation>Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику.</translation>
+        <translation type="vanished">Произошла ошибка. Чек был прочитан неверно. Размеры векторов различаются. Пожалуйста, сообщите об этом разработчику.</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="118"/>
        <source>Error in parsing</source>
-        <translation>Ошибка в парсинге</translation>
+        <translation type="vanished">Ошибка в парсинге</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="149"/>
        <source>Please, select a picture where QR code that contains info about check is present</source>
-        <translation>Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке</translation>
+        <translation type="vanished">Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="151"/>
-        <location filename="../mainwindow.cpp" line="197"/>
        <source>Picture was not selected</source>
-        <translation>Изображение не было выбрано</translation>
+        <translation type="vanished">Изображение не было выбрано</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="195"/>
        <source>Please, select a picture to scan</source>
-        <translation>Пожалуйста, выберете изображение для сканирования</translation>
+        <translation type="vanished">Пожалуйста, выберете изображение для сканирования</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="32"/>
+        <location filename="../mainwindow.ui" line="39"/>
+        <source>PushButton</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="46"/>
+        <source>Optical Character Recognition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="72"/>
+        <source>Text from E-Mail</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
--- a/utils/utils.cpp
+++ b/utils/utils.cpp
@@ -124,6 +124,8 @@ Check parseOfdRuAnswer(std::string html) {
    if ((products.size() + amounts.size() + prices.size()) == 0) {
        if (html == "Bad Request4") { // Failed to solve a captcha
            throw OfdRequestException("Incorrect captcha");
+        } else if (html.find("500 - Internal server error.") != std::string::npos) {
+            throw OfdRequestException("Internal server error");
        } else { // Most likely that the check does not exist
            throw OfdRequestException("Does not exist");
        }
Author	SHA1	Message	Date
leca	29b9b58759	rework of mainwindow in progress	2025-03-09 16:05:37 +03:00
leca	df522f07f7	merge	2025-03-08 17:35:05 +03:00
leca	d41accd111	cleanup	2025-03-08 17:33:24 +03:00
leca	957ccc9946	dirty minimal working version	2025-03-08 12:42:43 +03:00
leca	7d42cbd111	unneeded dependencies	2025-03-07 16:36:12 +03:00
leca	05563a5f82	removed unneeded dependency from readme	2025-03-03 23:26:14 +03:00
leca	5ca16a4f76	translations	2025-03-03 22:52:09 +03:00
leca	e60aafd653	separated translations as a new make target	2024-12-12 00:58:36 +03:00
leca	a10271e595	added debian package	2024-12-09 19:30:48 +03:00
leca	3a2901b49c	added PKGBUILD	2024-12-09 19:06:49 +03:00
leca	22922aecaa	added handler on internal server error	2024-12-09 17:34:36 +03:00
leca	baa8ae6e65	added russian readme	2024-12-09 17:06:35 +03:00
leca	2ebcf68838	fix UI and translations	2024-12-09 16:27:30 +03:00
leca	b135f8a94d	readme changes	2024-12-07 02:18:03 +03:00
leca	7290769750	readme update	2024-12-05 16:04:55 +03:00