Merge branch 'master' of http://192.168.100.140:8099/sane/code_app
This commit is contained in:
commit
e94c452962
|
@ -15,6 +15,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)
|
||||
{
|
||||
m_dpiId = -1;
|
||||
m_dpiValue = 200;
|
||||
|
@ -340,6 +341,7 @@ void hg_settingdialog::createUI()
|
|||
btn_cut_area_->setFixedWidth(120);
|
||||
h->addWidget(btn_cut_area_);
|
||||
|
||||
custom_area_lable_ = title;
|
||||
reinterpret_cast<QFormLayout*>(widget->layout())->addRow(h);
|
||||
connect(btn_cut_area_, SIGNAL(clicked(bool)), this, SLOT(slot_cutButtonClicked()));
|
||||
}
|
||||
|
@ -898,6 +900,19 @@ void hg_settingdialog::updateUIStatus()
|
|||
if(w_label)
|
||||
hide ? w_label->hide() : w_label->show();
|
||||
widget->setVisible(!hide);
|
||||
if(strcmp(opt->title, OPTION_TITLE_ZDYSMQY) == 0)
|
||||
{
|
||||
if(hide)
|
||||
{
|
||||
custom_area_lable_->hide();
|
||||
btn_cut_area_->hide();
|
||||
}
|
||||
else
|
||||
{
|
||||
custom_area_lable_->show();
|
||||
btn_cut_area_->show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Temporarily block the multi-stream output function
|
||||
|
|
|
@ -43,6 +43,7 @@ class hg_settingdialog : public QDialog
|
|||
QPushButton *apply_;
|
||||
QPushButton *del_this_;
|
||||
QPushButton *del_all_;
|
||||
QLabel *custom_area_lable_;
|
||||
QPushButton *btn_cut_area_;
|
||||
QPushButton *btn_gamma_;
|
||||
QTextEdit *sketch_;
|
||||
|
|
Loading…
Reference in New Issue