lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整同名配置项存在的问题

This commit is contained in:
yangjiaxuan 2022-10-19 11:40:00 +08:00
parent ecc0231097
commit b32094eb2f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scanner/device_menu.cpp
View File

@ -142,7 +142,7 @@ void device_menu::update(const std::vector<DEVCFG>* dev_cfgs)
child = group_action_->addAction(QString::fromStdString((*dev_cfgs)[i].schemes[j].m_schemeName)); child = group_action_->addAction(QString::fromStdString((*dev_cfgs)[i].schemes[j].m_schemeName));
child->setProperty(ACTION_DEVICE_NAME_PROPERTY, pm.menu->title()); child->setProperty(ACTION_DEVICE_NAME_PROPERTY, pm.menu->title());
child->setCheckable(true); child->setCheckable(true);
child->setChecked(true); child->setChecked(false);
pm.menu->addAction(child); pm.menu->addAction(child);
pm.actions.push_back(child); pm.actions.push_back(child);

10
app/scanner/hg_settingdialog.cpp
View File

@ -1877,10 +1877,14 @@ void hg_settingdialog::save_scheme(void)
if (!os.m_schemeTitle.empty()) if (!os.m_schemeTitle.empty())
{ {
while (std::find(schemes_->schemes.begin(), schemes_->schemes.end(), os.m_schemeTitle + buf) std::string tb= os.m_schemeTitle + buf;
!= schemes_->schemes.end()) for(int m = 0; m < schemes_->schemes.size(); ++m)
{ {
sprintf(buf, "-%d", ind++); if(strcmp(tb.c_str(), schemes_->schemes[m].m_schemeTitle.c_str()) == 0)
{
sprintf(buf, "-%d", ind++);
break;
}
} }
os.m_schemeTitle += buf; os.m_schemeTitle += buf;
} }