diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index d4002f00..39fa5430 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -134,6 +134,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) resize(950, 720); } + ui->act_clearRoller->setVisible(false); ui->actionact_update->setVisible(false); ui->act_feedback->setVisible(false); @@ -1543,7 +1544,7 @@ void MainWindow::updateActionStatus() ui->act_log->setEnabled(m_admin_loggedIn); ui->act_clrCache->setEnabled(m_admin_loggedIn); ui->act_consume->setEnabled(m_admin_loggedIn); - ui->act_clearRoller->setEnabled(m_admin_loggedIn); +// ui->act_clearRoller->setEnabled(m_admin_loggedIn); ui->act_acquireInto->setEnabled(!m_isScanning && (m_devUser != nullptr)); m_act_acquireInto2->setEnabled(!m_isScanning && (m_devUser != nullptr)); diff --git a/modules/twainui/dialog_progress_ui.cpp b/modules/twainui/dialog_progress_ui.cpp index f0e0fe60..db5c9536 100644 --- a/modules/twainui/dialog_progress_ui.cpp +++ b/modules/twainui/dialog_progress_ui.cpp @@ -9,7 +9,6 @@ Dialog_progress_ui *Dialog_progress_ui::m_param = nullptr; static int imageRecivedCount = 0; -static int imageUploadedCount = 0; Dialog_progress_ui::Dialog_progress_ui(std::function callback, std::function *notify, QWidget *parent) : QDialog(parent), @@ -31,11 +30,6 @@ Dialog_progress_ui::Dialog_progress_ui(std::function callback, ui->label_totalImgRecived->setVisible(false); ui->lineEdit_imgRecived->setText(QString::number(imageRecivedCount)); - ui->label_imgUploaded->setVisible(false); - ui->lineEdit_imgUploaded->setVisible(false); - ui->label_totalImgUploaded->setVisible(false); - ui->lineEdit_imgUploaded->setText(QString::number(imageUploadedCount)); - m_callback = callback; *notify = FuncNotify; @@ -45,7 +39,6 @@ Dialog_progress_ui::Dialog_progress_ui(std::function callback, connect(this, SIGNAL(scan_status(QString,bool)), this, SLOT(on_scan_status(QString,bool)), Qt::QueuedConnection); connect(this, SIGNAL(scan_finish(int, QString)), this, SLOT(on_scan_finish(int, QString)), Qt::QueuedConnection); - connect(this, SIGNAL(image_uploaded()), this, SLOT(on_image_uploaded()), Qt::QueuedConnection); connect(this, SIGNAL(image_recived()), this, SLOT(on_image_recived()), Qt::QueuedConnection); } @@ -54,7 +47,6 @@ Dialog_progress_ui::~Dialog_progress_ui() m_param = nullptr; imageRecivedCount = 0; - imageUploadedCount = 0; delete ui; } @@ -101,8 +93,6 @@ void Dialog_progress_ui::on_scan_status(QString finishInfo, bool isScanning) ui->label_imgRecived->setVisible(isScanning); ui->lineEdit_imgRecived->setVisible(isScanning); - ui->label_imgUploaded->setVisible(isScanning); - ui->lineEdit_imgUploaded->setVisible(isScanning); ui->label->setText(finishInfo); ui->pbtn_cancelScan->setVisible(isScanning); @@ -113,8 +103,8 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo) { on_scan_status(finishInfo, false); - ui->label_totalImgUploaded->setVisible(true); - ui->label_totalImgUploaded->setText(tr("Total scanned images: %1").arg(QString::number(imageRecivedCount))); + ui->label_totalImgRecived->setVisible(true); + ui->label_totalImgRecived->setText(tr("Total scanned images: %1").arg(QString::number(imageRecivedCount))); if (SCANNER_ERR_OK == flag || SCANNER_ERR_USER_CANCELED == flag) { @@ -128,11 +118,6 @@ void Dialog_progress_ui::on_image_recived() ui->lineEdit_imgRecived->setText(QString::number(++imageRecivedCount)); } -void Dialog_progress_ui::on_image_uploaded() -{ - ui->lineEdit_imgUploaded->setText(QString::number(++imageUploadedCount)); -} - void Dialog_progress_ui::FuncNotify(int event, void *msg, int flag) { Dialog_progress_ui *p = (Dialog_progress_ui *)m_param; @@ -162,11 +147,5 @@ void Dialog_progress_ui::FuncNotify(int event, void *msg, int flag) emit p->image_recived(); } break; - - case SANE_EVENT_IMG_UPLOADED: - { - emit p->image_uploaded(); - } - break; } } diff --git a/modules/twainui/dialog_progress_ui.h b/modules/twainui/dialog_progress_ui.h index 1751ad4c..59dc89c2 100644 --- a/modules/twainui/dialog_progress_ui.h +++ b/modules/twainui/dialog_progress_ui.h @@ -28,7 +28,6 @@ signals: void scan_status(QString finishInfo, bool isScanning); void scan_finish(int flag, QString finishInfo); void image_recived(); - void image_uploaded(); private slots: void on_pbtn_cancelScan_clicked(); @@ -37,7 +36,6 @@ private slots: void on_scan_status(QString finishInfo, bool isScanning); void on_scan_finish(int flag, QString finishInfo); void on_image_recived(); - void on_image_uploaded(); public: static void FuncNotify(int event, void *msg, int flag); diff --git a/modules/twainui/dialog_progress_ui.ui b/modules/twainui/dialog_progress_ui.ui index 9ccf3b32..924db541 100644 --- a/modules/twainui/dialog_progress_ui.ui +++ b/modules/twainui/dialog_progress_ui.ui @@ -6,8 +6,8 @@ 0 0 - 345 - 163 + 338 + 142 @@ -18,14 +18,14 @@ - 345 - 163 + 338 + 142 - 345 - 163 + 338 + 142 @@ -82,69 +82,6 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - image uploaded: - - - - - - - - 61 - 20 - - - - - 61 - 20 - - - - true - - - - - - - total image uploaded: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - -