diff --git a/app/fwupgrade/FWUpgrade_zh_CN.qm b/app/fwupgrade/FWUpgrade_zh_CN.qm
index fd60c5e5..0c53468c 100644
Binary files a/app/fwupgrade/FWUpgrade_zh_CN.qm and b/app/fwupgrade/FWUpgrade_zh_CN.qm differ
diff --git a/app/fwupgrade/FWUpgrade_zh_CN.ts b/app/fwupgrade/FWUpgrade_zh_CN.ts
index 28360461..ea8ad18b 100644
--- a/app/fwupgrade/FWUpgrade_zh_CN.ts
+++ b/app/fwupgrade/FWUpgrade_zh_CN.ts
@@ -269,7 +269,7 @@
-
+
未校正
@@ -326,19 +326,19 @@
打开设备:%1,固件版本号为:%2
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
+
不支持
@@ -347,27 +347,27 @@
打开设备错误:%1
-
+
无设备打开
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
提示
-
+
未获取到可升级版本
@@ -376,7 +376,7 @@
确定
-
+
打开文件
@@ -385,9 +385,9 @@
压缩文件(* .zip)
-
-
-
+
+
+
设备:%1 固件升级成功
@@ -400,24 +400,24 @@
设备: %1, 固件版本: %2, 升级: %3
-
+
支持
-
+
upgrade: %2
固件在线升级: %1
-
+
压缩文件(*.zip)
-
-
+
+
选择的固件版本比当前版本低
@@ -426,7 +426,7 @@
固件不匹配
-
+
固件文件版本不匹配,是否继续?
@@ -439,99 +439,98 @@
设备: %1, 固件升级: %2
-
+
固件号: %1
-
+
序列号: %1
-
+
速度模式: %1
-
+
电机固件版本: %1
-
+
设备被其他进程占用
-
+
打开设备失败
-
-
-
+
+
设备:%1 固件升级失败,IO错误
-
+
下载固件失败
-
+
滚轴计数已清零
-
+
设备不支持
-
+
清除滚轴计数失败
-
+
旧密码错误
-
+
新密码不能为空
-
+
新密码不一致
-
+
密码修改失败
-
+
密码修改成功
-
+
校正中...
-
+
导出专用测试纸
-
+
jpg(*.jpg)
@@ -540,107 +539,114 @@
导出失败
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
提示
-
-
+
+
请确认设备已正确放置校正纸!
-
+
Prompt of Hualin device
若当前为华凌设备,自动校正后,须勾选"彩色校正"再校正一次,其它设备无需勾选。
-
+
开始计算畸变值之前,请确认设备已放置畸变校正专用扫描测试纸!
-
+
警告
-
+
设备正在运行!请等待流程结束。
-
-
+
+
计算畸变值失败
-
+
计算畸变值成功: %1
-
-
-
+
+
+
滚轴计数: %1
-
-
+
+
历史扫描张数: %1
-
+
+
+ 设备:%1 固件升级失败: %2
+
+
+
获取畸变值失败
-
+
获取失败
-
+
获取畸变值成功: %1
-
+
颜色模式: %1, 分辨率 :%2
-
-
+
+
设置失败
-
+
设置成功
-
+
校正失败
-
+
已校正
diff --git a/app/fwupgrade/dialog_upgradefirmware.cpp b/app/fwupgrade/dialog_upgradefirmware.cpp
index ba4fa479..2f796b0e 100644
--- a/app/fwupgrade/dialog_upgradefirmware.cpp
+++ b/app/fwupgrade/dialog_upgradefirmware.cpp
@@ -47,10 +47,15 @@ void HGAPI Dialog_upgradeFirmware::ThreadFunc(HGThread thread, HGPointer param)
(void)thread;
Dialog_upgradeFirmware *p = (Dialog_upgradeFirmware *)param;
- if (SANE_STATUS_GOOD == sane_io_control(p->m_handle, IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)p->m_filePath.c_str(), nullptr))
+ SANE_Status ret = sane_io_control(p->m_handle, IO_CTRL_CODE_SET_FIRMWARE_UPGRADE, (void*)p->m_filePath.c_str(), nullptr);
+ if (SANE_STATUS_GOOD == ret)
{
p->m_result = 0;
}
+ else
+ {
+ p->m_result = ret;
+ }
emit p->finish();
}
diff --git a/app/fwupgrade/mainwindow.cpp b/app/fwupgrade/mainwindow.cpp
index e59c3769..17a2343f 100644
--- a/app/fwupgrade/mainwindow.cpp
+++ b/app/fwupgrade/mainwindow.cpp
@@ -770,13 +770,15 @@ void MainWindow::on_btnDownloadUpgrade_clicked()
{
Dialog_upgradeFirmware dlg(m_curDevHandle, savePath, this);
dlg.exec();
- if (0 == dlg.getUpgradeStatus())
+ int status = dlg.getUpgradeStatus();
+ if (0 == status)
{
- ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware success")).arg(m_curDevName));
+ QMessageBox::information(this, tr("Prompt"), QString(tr("device: %1 upgrade firmware success")).arg(m_curDevName));
}
else
{
- ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware failed, io error")).arg(m_curDevName));
+ QMessageBox::information(this, tr("Prompt"),
+ QString(tr("device: %1 upgrade firmware failed: %2")).arg(m_curDevName).arg(sane_strstatus((SANE_Status)status)));
}
}
else
@@ -811,13 +813,15 @@ void MainWindow::on_btnUpgrade_clicked()
{
Dialog_upgradeFirmware dlg(m_curDevHandle, filePath, this);
dlg.exec();
- if (0 == dlg.getUpgradeStatus())
+ int status = dlg.getUpgradeStatus();
+ if (0 == status)
{
- ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware success")).arg(m_curDevName));
+ QMessageBox::information(this, tr("Prompt"), QString(tr("device: %1 upgrade firmware success")).arg(m_curDevName));
}
else
{
- ui->labelDevInfo->setText(QString(tr("device: %1 upgrade firmware failed, io error")).arg(m_curDevName));
+ QMessageBox::information(this, tr("Prompt"),
+ QString(tr("device: %1 upgrade firmware failed: %2")).arg(m_curDevName).arg(sane_strstatus((SANE_Status)status)));
}
}
}
diff --git a/app/fwupgrade/mainwindow.ui b/app/fwupgrade/mainwindow.ui
index eb6405e6..0de50fa9 100644
--- a/app/fwupgrade/mainwindow.ui
+++ b/app/fwupgrade/mainwindow.ui
@@ -551,7 +551,7 @@
80
10
- 108
+ 491
31