From f3dcc88420b23ad655d3e5a9a7ba1af44d42c01e Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 12 Mar 2024 15:53:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BD=E4=BA=A7=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=BF=9B=E5=BA=A6=E6=8C=87=E7=A4=BA=E5=99=A8=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=BC=A0=E6=95=B0=E5=8D=A1=E9=A1=BF=E3=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8=E7=AD=89=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?BUG-924?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/twainui/dialog_progress_ui.cpp | 19 ++++----
 modules/twainui/dialog_progress_ui.ui  | 66 ++------------------------
 2 files changed, 14 insertions(+), 71 deletions(-)

diff --git a/modules/twainui/dialog_progress_ui.cpp b/modules/twainui/dialog_progress_ui.cpp
index 8b4d55ba..c9567aef 100644
--- a/modules/twainui/dialog_progress_ui.cpp
+++ b/modules/twainui/dialog_progress_ui.cpp
@@ -30,10 +30,8 @@ Dialog_progress_ui::Dialog_progress_ui(class Manager *mgr, std::function<void (u
     ui->pbtn_close->setVisible(false);
     ui->label->setText(tr("start scanning"));
 
-    ui->label_imgRecived->setVisible(false);
-    ui->lineEdit_imgRecived->setVisible(false);
-    ui->label_totalImgRecived->setVisible(false);
-    ui->lineEdit_imgRecived->setText(QString::number(m_imageRecivedCount));
+    ui->label_imgRecived->setText(tr("image recived:") + QString::number(m_imageRecivedCount));
+    ui->label_imgRecived->setAlignment(Qt::AlignCenter);
 
     m_mgr = mgr;
     m_callback = callback;
@@ -105,9 +103,6 @@ void Dialog_progress_ui::on_scan_status(QString finishInfo, bool isScanning)
 {
     m_isScanning = isScanning;
 
-    ui->label_imgRecived->setVisible(isScanning);
-    ui->lineEdit_imgRecived->setVisible(isScanning);
-
     ui->label->setText(finishInfo);
     ui->pbtn_cancelScan->setVisible(isScanning);
     ui->pbtn_close->setVisible(!isScanning);
@@ -117,8 +112,10 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
 {
     on_scan_status(finishInfo, false);
 
-    ui->label_totalImgRecived->setVisible(true);
-    ui->label_totalImgRecived->setText(tr("Total scanned images: %1").arg(QString::number(m_imageRecivedCount)));
+    QString info = tr("Total scanned images: %1").arg(QString::number(m_imageRecivedCount));
+    ui->label_imgRecived->setText(info);
+    ui->label_imgRecived->repaint();
+    this->repaint();
 
     m_imageRecivedCount = 0;
 
@@ -132,7 +129,9 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
 void Dialog_progress_ui::on_image_recived()
 {
     m_imageRecivedCount++;
-    ui->lineEdit_imgRecived->setText(QString::number(m_imageRecivedCount));
+    ui->label_imgRecived->setText(tr("image recived:") + QString::number(m_imageRecivedCount));
+    ui->label_imgRecived->repaint();
+    this->repaint();
 }
 
 void HGAPI Dialog_progress_ui::ThreadFunc(HGThread thread, HGPointer param)
diff --git a/modules/twainui/dialog_progress_ui.ui b/modules/twainui/dialog_progress_ui.ui
index 924db541..a6841aa6 100644
--- a/modules/twainui/dialog_progress_ui.ui
+++ b/modules/twainui/dialog_progress_ui.ui
@@ -83,67 +83,11 @@
     </spacer>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <spacer name="horizontalSpacer_6">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_imgRecived">
-       <property name="text">
-        <string>image recived:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="lineEdit_imgRecived">
-       <property name="minimumSize">
-        <size>
-         <width>61</width>
-         <height>20</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>61</width>
-         <height>20</height>
-        </size>
-       </property>
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_totalImgRecived">
-       <property name="text">
-        <string>total image recived:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_5">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+    <widget class="QLabel" name="label_imgRecived">
+     <property name="text">
+      <string>image recived:</string>
+     </property>
+    </widget>
    </item>
    <item>
     <spacer name="verticalSpacer_3">