Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev
This commit is contained in:
commit
a7f41cf284
|
@ -1044,6 +1044,10 @@ void hg_settingdialog::refresh_control_value(int op_id)
|
||||||
{
|
{
|
||||||
m_colorModeValue = strValue;
|
m_colorModeValue = strValue;
|
||||||
}
|
}
|
||||||
|
else if (!m_isMultiOutMode && 0 == strcmp(opt->name, SANE_STD_OPT_NAME_COLOR_MODE))
|
||||||
|
{
|
||||||
|
m_colorModeValue = strValue;
|
||||||
|
}
|
||||||
// comb->setProperty(hg_settingdialog::property_combox_data_type_.c_str(), COMBO_VAL_STRING);
|
// comb->setProperty(hg_settingdialog::property_combox_data_type_.c_str(), COMBO_VAL_STRING);
|
||||||
connect(comb, SIGNAL(currentTextChanged(const QString)), this, SLOT(slot_string_list_comboBoxClicked()));
|
connect(comb, SIGNAL(currentTextChanged(const QString)), this, SLOT(slot_string_list_comboBoxClicked()));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue