From a7bafd0ec42c1210a0df50a290a4193cf5d06c98 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Sun, 6 Nov 2022 16:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA=E5=9B=BA?= =?UTF-8?q?=E4=BB=B6=E5=8D=87=E7=BA=A7=E7=9A=84=E9=98=BB=E5=A1=9E=E7=AA=97?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 34615 -> 34982 bytes app/scanner/Scanner_zh_CN.ts | 438 +++++++++++--------- app/scanner/dialog_upgradefirmware.cpp | 62 +++ app/scanner/dialog_upgradefirmware.h | 43 ++ app/scanner/dialog_upgradefirmware.ui | 127 ++++++ app/scanner/mainwindow.cpp | 49 ++- app/scanner/qt_zh_CN.ts | 23 + build-qt/HGSolution/HGScanner/HGScanner.pro | 9 +- 8 files changed, 521 insertions(+), 230 deletions(-) create mode 100644 app/scanner/dialog_upgradefirmware.cpp create mode 100644 app/scanner/dialog_upgradefirmware.h create mode 100644 app/scanner/dialog_upgradefirmware.ui diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index 504a58f6dd6ee41fc592a5e44258272c585046ad..63d452990753f13f9a9d01cabb95e22512a3d369 100644 GIT binary patch delta 3211 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 delta 2891 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 Sds&WtYsv^dS~0_G{Qm(j)h^ip diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 9355cea3..a467fbc1 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -1649,6 +1649,34 @@ bug description: 当前版本已安装！ + + Dialog_upgradeFirmware + + + Dialog + + + + + gif + + + + + text + 文字 + + + + upgrade + 更新升级 + + + + firmware upgrade in progress, please wait... + 设备固件自动更新升级中，请稍候... + + Dialog_wrong_img @@ -2081,51 +2109,51 @@ bug description: 导出驱动日志 - + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - - + + nodevice 没有发现扫描仪 - - - - - - + + + + + + Question 警告 - - + + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2134,7 +2162,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2151,39 +2179,39 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 是否清空？ - + Information 消息 - + Insufficient disk space 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2192,230 +2220,230 @@ Do you want to clear? 信息 - - - - - - - - - + + + + + + + + + save failed 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - + thumbnailBar enabled 显示缩略图栏 - + thumbnailBar hidden 隐藏缩略图栏 - - - + + + save succeed 保存成功 - - + + find savePath in thumbnail 图片名在列表中已存在 - + File name 文件名 - + File path 文件路径 - + File size 文件大小 - + Creation date/time 创建时间 - + Modified date/time 修改时间 - + Accessed date/time 访问时间 - + Format 格式 - + Width 宽度 - + Height 高度 - + depth 深度 - + Color model 色彩模式 - + DPI 每英寸像素点 - + Print size 打印尺寸 - + Frame 帧 - + None 无 - + Mono 黑白 - + Gray 灰度 - + Color 彩色 - + Warning 警告 - + Device is Running! Please finish scanning first. 设备正在运行！ 请先结束扫描。 - - - - - - - - - - + + + + + + + + + + already waked up device 已唤醒设备 - + be ready 就绪 - - - - - - + + + + + + folder limit 无法访问“我的文档”， 请前往“扫描至”更换可访问的扫描目录再进行扫描。 - + Are you sure to close 您确定要关闭 - + ? 吗? - - + + close 关闭 - + tip 提示 - + Other versions not available 未获取到其他版本 - - + + The device does not support this operation 设备不支持该操作 - - + + IO error IO错误 - - - + + + error 错误 @@ -2430,17 +2458,17 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 @@ -2449,34 +2477,34 @@ Continue to close? 请重新进入关于界面以获取最新值 - + <p>%1: <a href='%2'>%3</a> - + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 @@ -2493,18 +2521,18 @@ Continue to close? 失败 - - + + failed 失败 - + warning 警告 - + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 @@ -2514,214 +2542,214 @@ Continue to close? 配置丢失 - + apply setting 应用配置 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + start failed 启动失败 - + HanvonScan 汉王扫描软件 - + LanxumScan 立思辰扫描软件 - + auto save 自动保存 - - + + when switching pictures, save the edited pictures directly without reminding 切换图片时，不提醒，直接保存编辑过的图片 - + statusBar displayed 显示状态栏 - + statusBar hidden 隐藏状态栏 - + toolBar displayed 显示工具栏 - + toolBar hidden 隐藏工具栏 - + colorInfo enabled 启用图像信息 - + colorInfo disenabled 关闭图像信息 - + enabling automatic saving 启用自动保存 - + cancel auto save 取消自动保存 - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存 - - - - - - - - - - - + + + + + + + + + + + yes 确定 - + save, do not remind again 保存，不再提醒 - - - - - - - - - + + + + + + + + + no 取消 - + found device 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - - + + %1%2%3.%4 %1%2%3.%4 - + start failed! 启动安装程序失败！ - + There are pictures that have not been saved. Are you sure to close? 有图像未保存，确定关闭？ - - - - - - - - - + + + + + + + + + tips 提示 - + Are you sure to close? 确定关闭？ - + confirm operation 确认操作 - + are you sure to clear the roller count? 您确定要清除滚轴计数吗 - - - + + + hint 提示 - - + + Roller scanned count has been set to 0. 辊轴计数已置零 - - + + Roller scanned count reset failed. 重置滚轴计数失败 - + Error 错误 - + Document missing! It would be deleted or renamed. 文档丢失！文档可能已被删除或被重命名。 @@ -2754,28 +2782,28 @@ Are you sure to close? <br>导航地址: <a href='https://j.map.baidu.com/7e/1TO'>百度地图访问</a> - + About %1 关于 %1 - + <p>%1</p><p>Version: %2<br>CopyRight: &#169; %3</p><p>%4%5%6%7%8%9</p> <p>%1</p><p>版本: %2<br>版权: &#169; %3</p><p>%4%5%6%7%8%9</p> - + about %1 关于 %1 - + <p>Version: %1</p> <p>版本: %1</p> <p>版本： %1</p> - + <p>CopyRight: &#169; %1</p> <p>版权: &#169; %1</p> <p>版权： &#169; %1</p> @@ -3068,56 +3096,56 @@ No: add new configuration - - + + yes 是 - - + + no 否 - + <h6><b> <h6><b> - + :</b></h6> :</b></h6> - + <p> <p> - + </p> </p> - + configuration scheme name change 配置改名 - - + + be sure to delete the configuration 确认删除配置 - + Are you sure you want to delete the configuration " 您确认要删除配置 - + " ? ？ @@ -3130,7 +3158,7 @@ No: add new configuration ’ 吗？ - + Are you sure you want to delete the configuration? 您确认要删除所有配置吗？ diff --git a/app/scanner/dialog_upgradefirmware.cpp b/app/scanner/dialog_upgradefirmware.cpp new file mode 100644 index 00000000..f77f1b0c --- /dev/null +++ b/app/scanner/dialog_upgradefirmware.cpp @@ -0,0 +1,62 @@ +#include "dialog_upgradefirmware.h" +#include "ui_dialog_upgradefirmware.h" +#include + +Dialog_upgradeFirmware::Dialog_upgradeFirmware(SANE_Handle handle, const std::string &upgradePath, QWidget *parent) : + QDialog(parent) + , m_handle(handle) + , m_upgradePath(upgradePath) + , m_status(SANE_STATUS_INVAL) + , ui(new Ui::Dialog_upgradeFirmware) +{ + ui->setupUi(this); + + setWindowTitle(tr("upgrade")); + setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint); + + ui->label_text->setText(tr("firmware upgrade in progress, please wait...")); + + QMovie *movie = new QMovie(":images/image_rsc/logo/waiting.gif"); + ui->label_gif->setMovie(movie); + movie->setCacheMode(QMovie::CacheAll); + movie->setScaledSize(QSize(ui->label_gif->width(), ui->label_gif->height())); + movie->start(); + ui->label_gif->show(); + + connect(this, SIGNAL(finish()), this, SLOT(on_finish()), Qt::QueuedConnection); + + HGBase_OpenThread(ThreadFunc, this, &m_thread); +} + +Dialog_upgradeFirmware::~Dialog_upgradeFirmware() +{ + if (nullptr != m_thread) + { + HGBase_CloseThread(m_thread); + m_thread = nullptr; + } + + delete ui; +} + +void HGAPI Dialog_upgradeFirmware::ThreadFunc(HGThread thread, HGPointer param) +{ + (void)thread; + Dialog_upgradeFirmware *p = (Dialog_upgradeFirmware *)param; + + SANE_Status rc = sane_io_control(p->m_handle, IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)p->m_upgradePath.c_str(), NULL); + p->m_status = rc; + + emit p->finish(); +} + +SANE_Status Dialog_upgradeFirmware::getUpgradeStatus() +{ + return m_status; +} + +void Dialog_upgradeFirmware::on_finish() +{ + accept(); +} + diff --git a/app/scanner/dialog_upgradefirmware.h b/app/scanner/dialog_upgradefirmware.h new file mode 100644 index 00000000..fd1afa7b --- /dev/null +++ b/app/scanner/dialog_upgradefirmware.h @@ -0,0 +1,43 @@ +#ifndef DIALOG_UPGRADEFIRMWARE_H +#define DIALOG_UPGRADEFIRMWARE_H + +#include +#include "base/HGThread.h" +#include "sane/sane_ex.h" + +namespace Ui { +class Dialog_upgradeFirmware; +} + +class Dialog_upgradeFirmware : public QDialog +{ + Q_OBJECT + +public: + explicit Dialog_upgradeFirmware(SANE_Handle handle, const std::string &upgradePath, QWidget *parent = nullptr); + ~Dialog_upgradeFirmware(); + +private: + static void HGAPI ThreadFunc(HGThread thread, HGPointer param); + +public: + SANE_Status getUpgradeStatus(); + +signals: + void finish(); + +private slots: + void on_finish(); + +private: + SANE_Handle m_handle; + std::string m_upgradePath; + SANE_Status m_status; + + HGThread m_thread; + +private: + Ui::Dialog_upgradeFirmware *ui; +}; + +#endif // DIALOG_UPGRADEFIRMWARE_H diff --git a/app/scanner/dialog_upgradefirmware.ui b/app/scanner/dialog_upgradefirmware.ui new file mode 100644 index 00000000..df195eaa --- /dev/null +++ b/app/scanner/dialog_upgradefirmware.ui @@ -0,0 +1,127 @@ + + + Dialog_upgradeFirmware + + + + 0 + 0 + 435 + 125 + + + + Dialog + + + + + + Qt::Vertical + + + + 20 + 19 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 40 + 60 + + + + gif + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + text + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 20 + + + + + + + + + diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 6b83e2a6..2e772662 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -1,4 +1,4 @@ -#include "mainwindow.h" +#include "mainwindow.h" #include "ui_mainwindow.h" #include #include @@ -31,6 +31,7 @@ #include "dialog_updateprogress.h" #include "dialog_upgrade.h" #include "dialog_feedback.h" +#include "dialog_upgradefirmware.h" #include "hg_settingdialog.h" #include "base/HGInfo.h" #include "huagao/hgscanner_error.h" @@ -366,7 +367,7 @@ HGResult MainWindow::saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool } HGResult ret = HGBASE_ERR_FAIL; - // 蹇界暐info + // 韫囩晫鏆恑nfo HGOCRMgr ocrMgr = nullptr; HGImgProc_CreateOCRMgr(0, &ocrMgr); if (nullptr != ocrMgr) @@ -556,7 +557,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; @@ -1171,11 +1172,13 @@ void MainWindow::on_fwUpgradeAndDevLock_Finish() if (m_vFwUpgradeAndDevLock[index].m_handleFlag & FwUpgradeAndDevLock::FwUpgrade) { const char* path = m_vFwUpgradeAndDevLock[index].m_upgradeFilePath.c_str(); - unsigned int len = strlen(path); - SANE_Status rc = sane_io_control(dev_que_.handle(), IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)path, &len); - if (SANE_STATUS_GOOD == rc) + Dialog_upgradeFirmware dlg(dev_que_.handle(), path); + if(dlg.exec()) { - m_vFwUpgradeAndDevLock[index].m_handleFlag &= ~FwUpgradeAndDevLock::FwUpgrade; + if (SANE_STATUS_GOOD == dlg.getUpgradeStatus()) + { + m_vFwUpgradeAndDevLock[index].m_handleFlag &= ~FwUpgradeAndDevLock::FwUpgrade; + } } } else if (m_vFwUpgradeAndDevLock[index].m_handleFlag & FwUpgradeAndDevLock::DevLock) @@ -1964,7 +1967,7 @@ void MainWindow::on_act_save_triggered() int count = 0; if(!auto_save_changes_ || auto_save_info_.path.isEmpty() || !judgeDiskSpace(savePath)) - { + { Dialog_SaveAs dlg(this); if(savePath.length()) { @@ -1993,7 +1996,7 @@ void MainWindow::on_act_save_triggered() { savePath = auto_save_info_.path = dlg.getSavePath(); } - + isOcr = auto_save_info_.isOcr = dlg.isOcr(); jpegQuality = auto_save_info_.jpegQuality = dlg.getJpegQuality(); tiffQuality = auto_save_info_.tiffQuality = dlg.getTiffQuality(); @@ -2009,7 +2012,7 @@ void MainWindow::on_act_save_triggered() { sprintf(index, "_%03u", ++auto_save_info_.index); } - + savePath.insert(pos, QString::fromStdString(index)); m_thumb->notify_mouse_leave(); } @@ -2064,7 +2067,7 @@ void MainWindow::on_act_save_triggered() } else m_thumb->updateItem(m_currIndex, savePath); - + m_currFilePath = savePath; m_modify = false; if(!auto_save_changes_) @@ -2573,13 +2576,13 @@ void HGAPI MainWindow::FwUpgradeAndDevLockThread(HGThread thread, HGPointer para else if (p->m_devVersionNum.left(2) == "G4") devType = "G400"; - // + // 检查升级 HGVersionInfo* versionInfo = NULL; HGUInt versionCount = 0; p->m_versionDll->GetDriverVersionList(devType.c_str(), &versionInfo, &versionCount); if (versionCount > 0) { - if ((std::string)(versionInfo[0].version) > p->m_devVersionNum.toStdString()) // Ƚϰ汾 + if ((std::string)(versionInfo[0].version) > p->m_devVersionNum.toStdString()) // 比较版本号 { HGChar suffix[64]; HGBase_GetFileSuffix(versionInfo[0].url, suffix, 64); @@ -2630,7 +2633,7 @@ void HGAPI MainWindow::FwUpgradeAndDevLockThread(HGThread thread, HGPointer para if (p->m_vFwUpgradeAndDevLock[index].m_checkFlag & FwUpgradeAndDevLock::DevLock) { - // + // 检查锁定 HGBool inList = HGFALSE; HGResult ret = p->m_versionDll->BlackListCheck(p->m_devSerialNum.toStdString().c_str(), &inList); if (HGBASE_ERR_OK == ret) @@ -2643,7 +2646,7 @@ void HGAPI MainWindow::FwUpgradeAndDevLockThread(HGThread thread, HGPointer para } } - // ź + // 发送信号 emit p->fwUpgradeAndDevLock_Finish(); } @@ -2994,7 +2997,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."); @@ -3536,11 +3539,13 @@ bool MainWindow::open_scanner(const QString& name, const QString& scheme) if (m_vFwUpgradeAndDevLock[index].m_handleFlag & FwUpgradeAndDevLock::FwUpgrade) { const char* path = m_vFwUpgradeAndDevLock[index].m_upgradeFilePath.c_str(); - unsigned int len = strlen(path); - SANE_Status rc = sane_io_control(dev_que_.handle(), IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)path, &len); - if (SANE_STATUS_GOOD == rc) + Dialog_upgradeFirmware dlg(dev_que_.handle(), path); + if(dlg.exec()) { - m_vFwUpgradeAndDevLock[index].m_handleFlag &= ~FwUpgradeAndDevLock::FwUpgrade; + if (SANE_STATUS_GOOD == dlg.getUpgradeStatus()) + { + m_vFwUpgradeAndDevLock[index].m_handleFlag &= ~FwUpgradeAndDevLock::FwUpgrade; + } } } else if (m_vFwUpgradeAndDevLock[index].m_handleFlag & FwUpgradeAndDevLock::DevLock) @@ -3931,10 +3936,10 @@ void MainWindow::on_act_driver_log_triggered() QDesktopServices::openUrl(QUrl::fromLocalFile(log_file_path)); } else { - if(statu == SANE_STATUS_UNSUPPORTED) // 璁惧涓嶆敮鎸佽鎿嶄綔 + 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闁挎瑨顕? } } diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index 51ff5d74..bd976651 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -1265,6 +1265,29 @@ bug description: + + Dialog_upgradeFirmware + + Dialog + + + + gif + + + + text + + + + upgrade + + + + firmware upgrade in progress, please wait... + + + Dialog_wrong_img diff --git a/build-qt/HGSolution/HGScanner/HGScanner.pro b/build-qt/HGSolution/HGScanner/HGScanner.pro index 65602f2e..d95273f8 100644 --- a/build-qt/HGSolution/HGScanner/HGScanner.pro +++ b/build-qt/HGSolution/HGScanner/HGScanner.pro @@ -198,7 +198,8 @@ SOURCES += \ ../../../app/scanner/dialog_updateprogress.cpp \ ../../../app/scanner/dialog_upgrade.cpp \ ../../../app/scanner/dialog_feedback.cpp \ - ../../../app/scanner/dialog_wrong_img.cpp + ../../../app/scanner/dialog_wrong_img.cpp \ + ../../../app/scanner/dialog_upgradefirmware.cpp HEADERS += \ ../../../app/scanner/VersionDll.h \ @@ -247,7 +248,8 @@ HEADERS += \ ../../../app/scanner/dialog_updateprogress.h \ ../../../app/scanner/dialog_upgrade.h \ ../../../app/scanner/dialog_feedback.h \ - ../../../app/scanner/dialog_wrong_img.h + ../../../app/scanner/dialog_wrong_img.h \ + ../../../app/scanner/dialog_upgradefirmware.h FORMS += \ ../../../app/scanner/cutdialog.ui \ @@ -281,7 +283,8 @@ FORMS += \ ../../../app/scanner/dialog_updateprogress.ui \ ../../../app/scanner/dialog_upgrade.ui \ ../../../app/scanner/dialog_feedback.ui \ - ../../../app/scanner/dialog_wrong_img.ui + ../../../app/scanner/dialog_wrong_img.ui \ + ../../../app/scanner/dialog_upgradefirmware.ui TRANSLATIONS += \ ../../../app/scanner/Scanner_zh_CN.ts \