diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index eecfc217..953c9cf6 100644 Binary files a/app/scanner/Scanner_zh_CN.qm and b/app/scanner/Scanner_zh_CN.qm differ diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 74fa3e88..b2ae9e24 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -1557,47 +1557,51 @@ Please make sure the two passwords are the same. 错误描述： - + bug description: - + 错误描述： + - - + + upgrade contents: - + 升级内容： + - + bug description: - + +错误描述： + - + The current version is the latest! The current version number is : 当前为最新版本！版本号为： - + Discover the new version : 发现新版本： - + ,the current version is : ，当前版本为： - + tip 提示 - + Already in current version 当前版本已安装！ @@ -2045,16 +2049,16 @@ bug description: - - - - + + + + Question 警告 - + modified, save it? 图像已被修改。 是否保存修改？ @@ -2086,189 +2090,190 @@ 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 插入图片 - - - - - + + + + + info 信息 - - - + + + save failed 保存失败 - - + + 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. 设备正在运行！ 请先结束扫描。 - + Are you sure to close 您确定要关闭 - + ? 吗? - - + + close 关闭 - + + error 错误 - + get versionlist failed 获取版本列表错误 @@ -2279,96 +2284,96 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 - + Please re-enter the Abount screen to obtain the latest value 请重新进入关于界面以获取最新值 - + <p>%1: <a href='%2'>%3</a> - + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 - + apply setting 应用配置 - + success 成功 - + failed 失败 - - + + failed 失败 - + warning 警告 - + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 - + lost config 配置丢失 - + apply setting 应用配置 @@ -2376,18 +2381,18 @@ Continue to close? - - - - - - - - - - - - + + + + + + + + + + + + start failed 启动失败 @@ -2429,14 +2434,15 @@ Continue to close? - - - - - - - - + + + + + + + + + yes 确定 @@ -2448,13 +2454,13 @@ Continue to close? - - - - - - - + + + + + + + no 取消 @@ -2480,57 +2486,62 @@ Continue to close? %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. 文档丢失！文档可能已被删除或被重命名。 @@ -2563,28 +2574,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> @@ -2598,6 +2609,13 @@ Are you sure to close? <p>%1: %2</p> + + QObject + + error + 错误 + + Widget diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index e0aa7881..bfc43e51 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -1171,6 +1171,7 @@ void MainWindow::on_upgradeApp(QString pkgPath) QProcess proc; + bool isSuccessdStart = false; QStringList argList; argList.push_back(QString("-appName=%1").arg(HGVERSION_APPNAME_SCANNER)); @@ -1179,24 +1180,35 @@ void MainWindow::on_upgradeApp(QString pkgPath) #if defined(HG_CMP_MSC) #if defined(OEM_HANWANG) - proc.startDetached(tmpPath + "/HwUpgradeApp.exe", argList); + isSuccessdStart = proc.startDetached(tmpPath + "/HwUpgradeApp.exe", argList); #elif defined(OEM_LISICHENG) - proc.startDetached(tmpPath + "/LscUpgradeApp.exe", argList); + isSuccessdStart = proc.startDetached(tmpPath + "/LscUpgradeApp.exe", argList); #else - proc.startDetached(tmpPath + "/HGUpgradeApp.exe", argList); + isSuccessdStart = proc.startDetached(tmpPath + "/HGUpgradeApp.exe", argList); #endif #else #if defined(OEM_HANWANG) - proc.startDetached(tmpPath + "/HwUpgradeApp", argList); + isSuccessdStart = proc.startDetached(tmpPath + "/HwUpgradeApp", argList); #elif defined(OEM_LISICHENG) - proc.startDetached(tmpPath + "/LscUpgradeApp", argList); + isSuccessdStart = proc.startDetached(tmpPath + "/LscUpgradeApp", argList); #else - proc.startDetached(tmpPath + "/HGUpgradeApp", argList); + isSuccessdStart = proc.startDetached(tmpPath + "/HGUpgradeApp", argList); #endif #endif - m_closeTip = false; - close(); + if(isSuccessdStart) + { + m_closeTip = false; + close(); + } + else + { + QMessageBox msg(QMessageBox::Critical, tr("error"), + tr("start failed!"), + QMessageBox::Ok); + msg.setButtonText(QMessageBox::Ok, tr("yes")); + msg.exec(); + } } void MainWindow::on_act_thumbnailBar_triggered(bool checked) diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index 63f7a329..cf179584 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -1991,6 +1991,10 @@ Are you sure to close? act_feedback + + start failed! + + Phonon:: diff --git a/app/upgrade/Upgrade_zh_CN.ts b/app/upgrade/Upgrade_zh_CN.ts index f939605f..02eafdbb 100644 --- a/app/upgrade/Upgrade_zh_CN.ts +++ b/app/upgrade/Upgrade_zh_CN.ts @@ -43,6 +43,7 @@ + yes 确定 @@ -52,7 +53,7 @@ 错误 - + install failed! 安装失败！