From 352550ac75842cf608f2187fe55c2cc3f48c6807 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Wed, 12 Apr 2023 17:43:08 +0800 Subject: [PATCH] =?UTF-8?q?HGSaneUI=E7=9A=84=E8=AE=BE=E7=BD=AE=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=E6=A1=86=E5=A2=9E=E5=8A=A0=E5=BC=B9=E5=87=BA=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/saneui/hg_settingdialog.cpp | 16 ++++++++++++++++ modules/saneui/hg_settingdialog.h | 1 + 2 files changed, 17 insertions(+) diff --git a/modules/saneui/hg_settingdialog.cpp b/modules/saneui/hg_settingdialog.cpp index c23eb48d..9e74e89d 100644 --- a/modules/saneui/hg_settingdialog.cpp +++ b/modules/saneui/hg_settingdialog.cpp @@ -12,6 +12,7 @@ #include "dialog_input.h" #include #include "device_menu.h" +#include "dialog_device_scan.h" std::string hg_settingdialog::property_combox_data_type_ = "combox_value_type"; @@ -283,19 +284,27 @@ void hg_settingdialog::createUI() { QTabWidget *tabWidgetCreation = new QTabWidget(this); + QPushButton *buttonScan = new QPushButton(this); + buttonScan->setText(tr("scan")); QPushButton *buttonOk = new QPushButton(this); buttonOk->setText(tr("ok")); QPushButton *buttonCancel = new QPushButton(this); buttonCancel->setText(tr("cancel")); QHBoxLayout *hlayoutOkAndCancel = new QHBoxLayout; hlayoutOkAndCancel->addStretch(); + hlayoutOkAndCancel->addWidget(buttonScan); hlayoutOkAndCancel->addWidget(buttonOk); hlayoutOkAndCancel->addWidget(buttonCancel); QWidget *widgetOkAndCancel = new QWidget(); widgetOkAndCancel->setLayout(hlayoutOkAndCancel); + connect(buttonScan, SIGNAL(clicked(bool)), this, SLOT(slot_buttonScanClicked())); connect(buttonOk, SIGNAL(clicked(bool)), this, SLOT(slot_buttonOkClicked())); connect(buttonCancel, SIGNAL(clicked(bool)), this, SLOT(slot_buttonCancelClicked())); + if (nullptr == m_callback) + { + buttonScan->setVisible(false); + } QHBoxLayout *h = new QHBoxLayout(); QVBoxLayout *v1 = new QVBoxLayout(), @@ -1414,6 +1423,13 @@ void hg_settingdialog::slot_lineEditInput() } } +void hg_settingdialog::slot_buttonScanClicked() +{ + std::string devName = dev_que_.opened_scanner_name(); + Dialog_Device_Scan dlg(&m_saneAPI, m_devHandle, devName.c_str(), m_callback, m_callbackParam, this); + dlg.exec(); +} + void hg_settingdialog::slot_buttonOkClicked() { save_ = true; diff --git a/modules/saneui/hg_settingdialog.h b/modules/saneui/hg_settingdialog.h index 4c7da274..fba5f19b 100644 --- a/modules/saneui/hg_settingdialog.h +++ b/modules/saneui/hg_settingdialog.h @@ -104,6 +104,7 @@ private slots: void slot_gammaButtonClicked(); void slot_word_list_comboBoxClicked(int value); void slot_lineEditInput(); + void slot_buttonScanClicked(); void slot_buttonOkClicked(); void slot_buttonCancelClicked(); void slot_pushButton_scheme_management(void);