From f3989426bb1c4cff49f43569c15634f90d90c1b8 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 30 Nov 2023 17:59:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=89=E6=96=B9=E8=BD=AF?= =?UTF-8?q?=E4=BB=B6showUI=E5=B9=B6=E4=B8=94=E6=97=A0=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=8C=87=E7=A4=BA=E5=99=A8=E6=97=B6=EF=BC=8C=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuaGoScan_scanSettings_Help_manual.pdf | Bin 2268042 -> 2268035 bytes modules/twainui/hg_settingdialog.cpp | 38 +++++++++++------- modules/twainui/hg_settingdialog.h | 6 +-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/doc/scanner/HuaGoScan_scanSettings_Help_manual.pdf b/doc/scanner/HuaGoScan_scanSettings_Help_manual.pdf index 6cf537f9dc7c3c27ae7c012a749aedfdcac479f4..1cbcf339ade38da64d05db3acca54f970534d3bd 100644 GIT binary patch delta 6029 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 delta 5936 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 TmjRqX2m+JQ)?T-9z0CgsSMyaX diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp index 1fc6c788..78f5fa4b 100644 --- a/modules/twainui/hg_settingdialog.cpp +++ b/modules/twainui/hg_settingdialog.cpp @@ -83,8 +83,7 @@ hg_settingdialog::hg_settingdialog(class Manager *mgr, SANE_Handle handle, const m_originGammaData = m_gammaData; connect(comb_, SIGNAL(currentTextChanged(const QString)), this, SLOT(on_current_scheme_changed())); - connect(this, SIGNAL(scan_start()),this, SLOT(on_scan_start()), Qt::QueuedConnection); - connect(this, SIGNAL(scan_finish()), this, SLOT(on_scan_finish()), Qt::QueuedConnection); + connect(this, SIGNAL(scan_status(QString,bool)),this, SLOT(on_scan_status(QString, bool)), Qt::QueuedConnection); *notify = FuncNotify; } @@ -191,13 +190,24 @@ void hg_settingdialog::FuncNotify(int event, void* msg, int flag) { case SANE_EVENT_WORKING: { - emit p->scan_start(); + QString finishInfo; + if (0 != flag) + { + finishInfo = (char*)msg; + } + + emit p->scan_status(finishInfo, true); } break; case SANE_EVENT_SCAN_FINISHED: { - emit p->scan_finish(); + QString finishInfo; + if (0 != flag) + { + finishInfo = (char*)msg; + } + emit p->scan_status(finishInfo, false); } break; } @@ -1200,18 +1210,16 @@ void hg_settingdialog::updateUIStatus() } } -void hg_settingdialog::on_scan_start() +void hg_settingdialog::on_scan_status(QString info, bool status) { - m_isScanning = true; - this->setEnabled(false); - setAttribute(Qt::WA_DeleteOnClose, false); -} - -void hg_settingdialog::on_scan_finish() -{ - m_isScanning = false; - this->setEnabled(true); - setAttribute(Qt::WA_DeleteOnClose, true); + if (!info.isEmpty()) + { + QMessageBox::information(this, tr("Prompt"), info); + } + + m_isScanning = status; + this->setEnabled(!status); + setAttribute(Qt::WA_DeleteOnClose, !status); } void hg_settingdialog::slot_checkedClicked() diff --git a/modules/twainui/hg_settingdialog.h b/modules/twainui/hg_settingdialog.h index 507f84c2..b70de800 100644 --- a/modules/twainui/hg_settingdialog.h +++ b/modules/twainui/hg_settingdialog.h @@ -137,12 +137,10 @@ private: QVector m_list_widgets; signals: - void scan_start(); - void scan_finish(); + void scan_status(QString info, bool status); private slots: - void on_scan_start(); - void on_scan_finish(); + void on_scan_status(QString info, bool status); private slots: void slot_checkedClicked();