From 7275892b04766fe7731eeccf87614262121dde48 Mon Sep 17 00:00:00 2001 From: leca Date: Tue, 1 Apr 2025 18:03:30 +0300 Subject: [PATCH] remove obsolete settings --- CMakeLists.txt | 3 +- mainwindow.cpp | 7 + scenes/mainwindow.ui | 13 ++ scenes/settingsdialog.ui | 298 ++++++++++++++++----------------------- settings/settings.cpp | 4 - settingsdialog.cpp | 30 +--- settingsdialog.h | 23 +-- translations/en_US.ts | 81 ++++++----- translations/ru_RU.ts | 81 ++++++----- 9 files changed, 231 insertions(+), 309 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 161ea28..3218158 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,6 @@ if (BUILD_TRANSLATIONS) endif() find_package(Qt5Gui REQUIRED) find_package(Qt5Widgets REQUIRED) -find_package(Qt5UiTools REQUIRED) set(TRANSLATION_SOURCES main.cpp @@ -159,7 +158,7 @@ else() ) endif() -target_link_libraries(checks-parser PRIVATE Qt5::Widgets Qt5::UiTools) +target_link_libraries(checks-parser PRIVATE Qt5::Widgets) if (BUILD_OFD_LOCAL_QR_SCAN) target_include_directories(checks-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/image_redactor) diff --git a/mainwindow.cpp b/mainwindow.cpp index 26c9b1a..9974eff 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #ifdef BUILD_OFD_LOCAL_QR_SCAN # include @@ -48,6 +49,12 @@ MainWindow::MainWindow(QWidget *parent) ui->or_label_1->hide(); ui->choose_image_button->hide(); #endif + + QObject::connect(ui->settings_button, &QPushButton::clicked, [&]() { + SettingsDialog d; + d.show(); + d.exec(); + }); } #ifdef BUILD_OFD_BINARYEYE_SCAN diff --git a/scenes/mainwindow.ui b/scenes/mainwindow.ui index 00609a3..712750c 100644 --- a/scenes/mainwindow.ui +++ b/scenes/mainwindow.ui @@ -234,6 +234,19 @@ + + + + + 0 + 0 + + + + Settings + + + diff --git a/scenes/settingsdialog.ui b/scenes/settingsdialog.ui index 1e8912b..9550339 100644 --- a/scenes/settingsdialog.ui +++ b/scenes/settingsdialog.ui @@ -7,7 +7,7 @@ 0 0 693 - 786 + 616 @@ -25,202 +25,107 @@ 0 0 673 - 724 + 554 - - - - - - - - - - - Goods net weight position - - - - - - - - - - Stores modules url - - - - - - - Goods quantity position - - - - - - - - - - OFD modules url - - - - - - - Print header - - - - - - - - - - + Goods quantity alias - - - - OFD modules directory - - - - - - - - - - Print total - - - - - - - - - - - - Goods net weight alias - - - - - - - - - - - - - Goods total alias - - - - - - - - - - - - - - - - - - - Goods name position - - - - - - - - - - - - - - Goods name alias - - - - - - - Goods price per unit position - - - - - - - Stores modules directory - - - - - - - Goods total position - - - - - - - Choose - - - - - - - - Goods price per unit alias - - + + - - - - Choose - - - - + Language - + + + + Goods net weight alias + + + + + + + Goods price per unit alias + + + + + + + + + + Print total + + + + + + + Goods name alias + + + + + + + + + + + + + + + + Goods total alias + + + + + + + Print header + + + + + + + + + + Goods total position + + + + + + + + + + Goods net weight position + + + + @@ -234,6 +139,47 @@ + + + + Goods quantity position + + + + + + + + + + Goods name position + + + + + + + + + + + + + + Goods price per unit position + + + + + + + + + + + + + diff --git a/settings/settings.cpp b/settings/settings.cpp index 63762f0..de10bbf 100644 --- a/settings/settings.cpp +++ b/settings/settings.cpp @@ -20,10 +20,6 @@ Settings::Settings(std::string path) { std::ofstream output(path); nlohmann::json settings = R"({ - "ofds_modules_dir":".local/share/checks_parser/modules/ofd", - "stores_modules_dir":".local/share/checks_parser/modules/stores", - "ofds_modules_url":"https://foxarmy.org/checks-parser/modules/ofd/", - "stores_modules_url":"https://foxarmy.org/checks-parser/modules/stores/", "print_header": true, "print_total": true, "output_order": { diff --git a/settingsdialog.cpp b/settingsdialog.cpp index e90d2f7..dff070d 100644 --- a/settingsdialog.cpp +++ b/settingsdialog.cpp @@ -15,11 +15,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui->setupUi(this); - ui->OFDModulesDirEdit->setText(QString::fromStdString(settings.get_all_settings()["ofds_modules_dir"])); - ui->OFDModulesURLEdit->setText(QString::fromStdString(settings.get_all_settings()["ofds_modules_url"])); - ui->storesModulesDirEdit->setText(QString::fromStdString(settings.get_all_settings()["stores_modules_dir"])); - ui->storesModulesURLEdit->setText(QString::fromStdString(settings.get_all_settings()["stores_modules_url"])); - ui->goodsNamePositionSpin->setValue(this->settings.get_all_settings()["output_order"]["goods_name"]["position"]); ui->goodsNameAliasEdit->setText(QString::fromStdString(this->settings.get_all_settings()["output_order"]["goods_name"]["name"])); @@ -56,28 +51,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) } -SettingsDialog::~SettingsDialog() { delete ui; } - -void SettingsDialog::on_OFDModulesDirEdit_editingFinished() { - this->settings.alter_setting("ofds_modules_dir", - ui->OFDModulesDirEdit->text().toStdString()); -} - -void SettingsDialog::on_storesModulesDirEdit_editingFinished() { - this->settings.alter_setting("stores_modules_dir", - ui->storesModulesDirEdit->text().toStdString()); -} - -void SettingsDialog::on_OFDModulesURLEdit_editingFinished() { - this->settings.alter_setting("ofds_modules_url", - ui->OFDModulesURLEdit->text().toStdString()); -} - -void SettingsDialog::on_storesModulesURLEdit_editingFinished() { - this->settings.alter_setting("stores_modules_url", - ui->storesModulesURLEdit->text().toStdString()); -} - void SettingsDialog::on_goodsNamePositionSpin_valueChanged(int value) { this->settings.get_all_settings()["output_order"]["goods_name"]["position"] = value; @@ -162,3 +135,6 @@ void SettingsDialog::on_languageComboBox_currentTextChanged(const QString &chang infoDialog.setWindowTitle(tr("Restart required")); infoDialog.exec(); } + + +SettingsDialog::~SettingsDialog() { delete ui; } diff --git a/settingsdialog.h b/settingsdialog.h index 137e8c5..ff2c9ee 100644 --- a/settingsdialog.h +++ b/settingsdialog.h @@ -2,7 +2,7 @@ #define SETTINGSDIALOG_H #include -#include "settings/settings.h" +#include namespace Ui { class settingsdialog; @@ -16,40 +16,27 @@ public: ~SettingsDialog(); private slots: - void on_OFDModulesDirEdit_editingFinished(); - - void on_buttonBox_accepted(); - - void on_storesModulesDirEdit_editingFinished(); - - void on_OFDModulesURLEdit_editingFinished(); - - void on_storesModulesURLEdit_editingFinished(); - void on_goodsNamePositionSpin_valueChanged(int arg1); - void on_goodsNameAliasEdit_editingFinished(); void on_goodsPricePerUnitPositionSpin_valueChanged(int arg1); - void on_goodsPricePerUnitAliasEdit_editingFinished(); void on_goodsQuantityPositionSpin_valueChanged(int arg1); - void on_goodsQuantityAliasEdit_editingFinished(); void on_goodsNetWeightPositionSpin_valueChanged(int arg1); - void on_goodsNetWeightAliasEdit_editingFinished(); - void on_goodsTotalPositionSpin_valueChanged(int arg1); + + void on_goodsTotalPositionSpin_valueChanged(int arg1); void on_goodsTotalAliasEdit_editingFinished(); + void on_printTotalCheckBox_stateChanged(int arg1); void on_printHeaderCheckBox_stateChanged(int arg1); - void on_printTotalCheckBox_stateChanged(int arg1); - + void on_buttonBox_accepted(); void on_buttonBox_rejected(); void on_languageComboBox_currentTextChanged(const QString &arg1); diff --git a/translations/en_US.ts b/translations/en_US.ts index 2be3f5a..5c271ec 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -198,6 +198,11 @@ Возврат расхода Spends return + + + Settings + + Total @@ -208,57 +213,57 @@ checks parser - + QR code for binaryeye to connect QR code for binaryeye to connect - + I've scanned I've scanned - + Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. - + Could not start http server. Could not start http server. - + Selected image: Selected image: - + Captcha was not solved correctly! Captcha was not solved correctly! - + Captcha is incorrect Captcha is incorrect - + Internal server error. Please, try again later. Internal server error. Please, try again later. - + Internal server error Internal server error - + Check not found. Please, ensure correctness of entered data. Check not found. Please, ensure correctness of entered data. - + Check was not found Check was not found @@ -271,12 +276,12 @@ Error in parsing - + Please, select a picture where QR code that contains info about check is present Please, select a picture where QR code that contains info about check is present - + Picture was not selected Picture was not selected @@ -600,12 +605,12 @@ SettingsDialog - + You need to restart program to apply language changes You need to restart program to apply language changes - + Restart required Restart required @@ -636,17 +641,17 @@ Dialog - + Goods name position Goods name position - + Goods price per unit alias Goods price per unit alias - + Language Language @@ -655,88 +660,82 @@ Language - + en_US en_US - + ru_RU ru_RU - - Choose - Choose + Choose - + Print header Print header - + Goods net weight alias Goods net weight alias - Stores modules url - Stores modules url + Stores modules url - + Goods total alias Goods total alias - + Goods name alias Goods name alias - + Goods quantity alias Goods quantity alias - Stores modules directory - Stores modules directory + Stores modules directory - OFD modules directory - OFD modules directory + OFD modules directory - + Goods price per unit position Goods price per unit position - + Goods net weight position Goods net weight position - OFD modules url - OFD modules url + OFD modules url - + Goods total position Goods total position - + Goods quantity position Goods quantity position - + Print total Print total diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 371bf2f..5d9712f 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -194,6 +194,11 @@ Spends return Возврат расхода + + + Settings + + Total @@ -204,57 +209,57 @@ Парсер чеков - + QR code for binaryeye to connect QR код для подключения BinaryEye - + I've scanned Просканировал - + Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn't lucky, please, contact the developer. Не смог поднять HTTP сервер. 10 раз подряд случайно выбранный порт был занят. Либо Вам следует бежать за лоттерейным билетом, или в программе баг. Если лотерейный билет не был выигрышным, пожалуйста, сообщите разработчику. - + Could not start http server. Не получилось запустить HTTP сервер. - + Selected image: Выбранное изображение: - + Captcha was not solved correctly! Капча была решена неверно! - + Captcha is incorrect Капча введена неверно - + Internal server error. Please, try again later. Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже. - + Internal server error Внутренняя ошибка сервера - + Check not found. Please, ensure correctness of entered data. Чек не найден. Пожалуйста, убедитесь в правильности введённых данных. - + Check was not found Чек не найден @@ -267,12 +272,12 @@ Ошибка в парсинге - + Please, select a picture where QR code that contains info about check is present Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке - + Picture was not selected Изображение не было выбрано @@ -596,12 +601,12 @@ SettingsDialog - + You need to restart program to apply language changes Требуется перезагрузить программу, чтобы применить изменения языка - + Restart required Требуется перезагрузка @@ -632,17 +637,17 @@ Диалог - + Goods name position Позиция имени товара - + Goods price per unit alias Алиас цены товара - + Language Язык @@ -651,88 +656,82 @@ Язык - + en_US en_US - + ru_RU ru_RU - - Choose - Выбрать + Выбрать - + Print header Печатать заголовок - + Goods net weight alias Алиас массы нетто товара - Stores modules url - URL модулей магазина + URL модулей магазина - + Goods total alias Алиас всего за продукт - + Goods name alias Алиас имени товара - + Goods quantity alias Алиас количества товара - Stores modules directory - Директория модулей магазина + Директория модулей магазина - OFD modules directory - Директория модулей ОФД + Директория модулей ОФД - + Goods price per unit position Позиция центы товара - + Goods net weight position Позиция массы нетто товара - OFD modules url - URL модулей ОФД + URL модулей ОФД - + Goods total position Позиция всего за товар - + Goods quantity position Позиция количества товара - + Print total Печатать Итого