From b9e9fc932488fa9eea5dc4a0e588b9a7fad23f3c Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 13 Oct 2022 17:31:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=B8=BAname?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=98=BE?= =?UTF-8?q?=E7=A4=BAtitle=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/config.cpp | 13 +++++++++++++ app/scanner/config.h | 1 + app/scanner/hg_settingdialog.cpp | 5 ++--- app/scanner/hg_settingdialog.h | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/scanner/config.cpp b/app/scanner/config.cpp index 711c8666..8f12722f 100644 --- a/app/scanner/config.cpp +++ b/app/scanner/config.cpp @@ -471,6 +471,19 @@ void transfer_name_from_cn_title_2_en_name(std::string& name) } } } + +std::string config::transfer_en_name_2_cn_title(std::string& name) +{ + int size = sizeof(g_opts) / sizeof(g_opts[0]); + for (size_t i = 0; i < size; i++) + { + if (strcmp(name.c_str(), g_opts[i].name) == 0) + { + name = g_opts[i].title; + } + } + return name; +} void config::load_scanner_configs(QString dev_name, DEVCFG* cfg) { std::string name(config::device_to_config_dev_name(dev_name)), cont(""); diff --git a/app/scanner/config.h b/app/scanner/config.h index 725b8322..aeb057c3 100644 --- a/app/scanner/config.h +++ b/app/scanner/config.h @@ -154,4 +154,5 @@ public: void load_all_scanner_configs(std::vector& cfgs); void load_scanner_configs(QString dev_name, DEVCFG* cfg); int save_scanner_configs(const DEVCFG* cfg); + std::string transfer_en_name_2_cn_title(std::string& name); }; diff --git a/app/scanner/hg_settingdialog.cpp b/app/scanner/hg_settingdialog.cpp index 13cf6ffd..9541885c 100644 --- a/app/scanner/hg_settingdialog.cpp +++ b/app/scanner/hg_settingdialog.cpp @@ -17,7 +17,7 @@ hg_settingdialog::hg_settingdialog(void *handle, QWidget *parent : QDialog(parent) , schemes_(cfg), cur_ind_(cfg->cur_scheme), changed_count_(0), save_(false) , btn_cut_area_(nullptr), btn_gamma_(nullptr), cfg_file_(nullptr), clicked_gamma_(false) - , custom_area_lable_(nullptr), comb_(nullptr) + , custom_area_lable_(nullptr), comb_(nullptr), m_config(nullptr) { m_dpiId = -1; m_dpiValue = 200; @@ -1861,7 +1861,7 @@ void hg_settingdialog::save_scheme(void) bool save_gamma = false; if(os.name.empty()) - os.name = os.opts[0].name + "(" + os.opts[0].val + ")"; + os.name = m_config->transfer_en_name_2_cn_title(os.opts[0].name) + "(" + os.opts[0].val + ")"; buf[0] = 0; while(std::find(schemes_->schemes.begin(), schemes_->schemes.end(), os.name + buf) != schemes_->schemes.end()) @@ -2158,7 +2158,6 @@ void hg_settingdialog::on_current_scheme_changed() break; } } - info += tr("
") + title + tr(":
"); info += tr("

") + QString::fromStdString(opts[i].val) + tr("

"); } diff --git a/app/scanner/hg_settingdialog.h b/app/scanner/hg_settingdialog.h index e6fcebf4..92ee6ded 100644 --- a/app/scanner/hg_settingdialog.h +++ b/app/scanner/hg_settingdialog.h @@ -145,6 +145,7 @@ private: QString m_colorModeValue; SANE_Gamma m_gammaData; QComboBox *comb_; + config *m_config; }; #endif // HG_SETTING_DIALOG_H