From 49faaca2d972584afbb57a736dd767184e48b969 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Fri, 25 Nov 2022 11:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=AB=E6=8F=8F=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=A1=E6=81=AF=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/dialog_log.h | 4 +++- app/scanner/mainwindow.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/scanner/dialog_log.h b/app/scanner/dialog_log.h index 56521396..ffb936ea 100644 --- a/app/scanner/dialog_log.h +++ b/app/scanner/dialog_log.h @@ -38,6 +38,9 @@ public: void updateStatus(bool online, bool isScanning); void image_received_from_scanner(void); +public: + QPushButton *pbtn_export; + signals: void stopScan(); void continueScan(); @@ -59,7 +62,6 @@ private: QPushButton *pbtn_stop; QCheckBox *cBox_autoScroll; QPushButton *pbtn_clear; - QPushButton *pbtn_export; QPushButton *pbtn_continueScan; QPushButton *pbtn_finishScan; }; diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 303c171c..426b1f13 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -1630,6 +1630,8 @@ void MainWindow::updateActionStatus() ui->menu_device->setEnabled(!dev_que_.is_online() || !m_isScanning); ui->act_device_log->setEnabled(m_admin_loggedIn && !m_isScanning && dev_que_.is_online()); ui->act_driver_log->setEnabled(m_admin_loggedIn); + if(m_dialogLog != nullptr) + m_dialogLog->pbtn_export->setEnabled(ui->act_Export->isEnabled()); m_moveToAction->setEnabled(!selectIndexs.empty() && (!dev_que_.is_online() || !m_isScanning)); }