设置界面显示的配置项为name字段,修改为显示title字段
This commit is contained in:
parent
65958831b9
commit
b9e9fc9324
|
@ -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("");
|
||||
|
|
|
@ -154,4 +154,5 @@ public:
|
|||
void load_all_scanner_configs(std::vector<DEVCFG>& 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);
|
||||
};
|
||||
|
|
|
@ -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("<h6><b>") + title + tr(":</b></h6>");
|
||||
info += tr("<p> ") + QString::fromStdString(opts[i].val) + tr("</p>");
|
||||
}
|
||||
|
|
|
@ -145,6 +145,7 @@ private:
|
|||
QString m_colorModeValue;
|
||||
SANE_Gamma m_gammaData;
|
||||
QComboBox *comb_;
|
||||
config *m_config;
|
||||
};
|
||||
|
||||
#endif // HG_SETTING_DIALOG_H
|
||||
|
|
Loading…
Reference in New Issue