From 4340d2db0922249650c29622b854940719e549d3 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 28 Oct 2022 16:58:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9E=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=89=93=E5=BC=80=E8=AE=BE=E5=A4=87=E9=87=8D=E8=BF=9E=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/mainwindow.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index d85367be..5d1c1c95 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -546,7 +546,7 @@ void MainWindow::on_currItemChanged(int index) bool save = false; if(auto_save_changes_) { - // 鍒囨崲鍥剧墖鏃讹紝鑷姩淇濆瓨缂栬緫杩囩殑鍥惧儚銆傝嫢鎯冲彇娑堬紝璇峰彇娑堝嬀閫夎彍鍗曢」锛氬浘鍍?>鑷姩淇濆瓨 + // 鍒囨崲鍥剧墖鏃讹紝鑷姩淇濆瓨缂栬緫杩囩殑鍥惧儚銆傝嫢鎯冲彇娑堬紝璇峰彇娑堝嬀閫夎彍鍗曢」锛氬浘?>鑷姩淇濆瓨 QString info(tr("Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save")); m_wndStatusBar->setDeviceStatusInfo(info, false); save = true; @@ -807,6 +807,8 @@ void MainWindow::on_sane_dev_arrive(QString devName, bool opened) { // re-connected statu ... QString info(devName); + if(!opened && devName.toStdString() != dev_que_.opened_scanner_name()) + opened = true; if(opened) info += tr(" reconnected"); else @@ -2824,7 +2826,7 @@ void MainWindow::my_url_handler(const QUrl& url) { info = tr("Roller scanned count has been set to 0."); - // +璇烽噸鏂拌繘鍏ュ叧浜庣晫闈互鑾峰彇鏈€鏂板€? info += tr("Please re-enter the Abount screen to obtain the latest value"); + // +璇烽噸鏂拌繘鍏ュ叧浜庣晫闈互鑾峰彇鏈€鏂板? info += tr("Please re-enter the Abount screen to obtain the latest value"); } else info = tr("Roller scanned count reset failed."); @@ -3703,7 +3705,7 @@ void MainWindow::on_act_driver_log_triggered() if(statu == SANE_STATUS_UNSUPPORTED) // 璁惧涓嶆敮鎸佽鎿嶄綔 QMessageBox::information(this, windowTitle(), tr("The device does not support this operation")); else - QMessageBox::information(this, windowTitle(), tr("IO error")); // IO閿欒 + QMessageBox::information(this, windowTitle(), tr("IO error")); // IO閿欒? } }