固件升级结果增加提示
This commit is contained in:
parent
f3e4ef8f15
commit
10bdd4371e
Binary file not shown.
|
|
@ -269,7 +269,7 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.ui" line="211"/>
|
||||
<location filename="mainwindow.cpp" line="462"/>
|
||||
<location filename="mainwindow.cpp" line="491"/>
|
||||
<source>Have not corrected</source>
|
||||
<translation>未校正</translation>
|
||||
</message>
|
||||
|
|
@ -326,19 +326,19 @@
|
|||
<translation type="vanished">打开设备：%1，固件版本号为：%2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="411"/>
|
||||
<location filename="mainwindow.cpp" line="518"/>
|
||||
<location filename="mainwindow.cpp" line="519"/>
|
||||
<location filename="mainwindow.cpp" line="520"/>
|
||||
<location filename="mainwindow.cpp" line="532"/>
|
||||
<location filename="mainwindow.cpp" line="544"/>
|
||||
<location filename="mainwindow.cpp" line="439"/>
|
||||
<location filename="mainwindow.cpp" line="548"/>
|
||||
<location filename="mainwindow.cpp" line="549"/>
|
||||
<location filename="mainwindow.cpp" line="550"/>
|
||||
<location filename="mainwindow.cpp" line="880"/>
|
||||
<location filename="mainwindow.cpp" line="881"/>
|
||||
<location filename="mainwindow.cpp" line="562"/>
|
||||
<location filename="mainwindow.cpp" line="574"/>
|
||||
<location filename="mainwindow.cpp" line="580"/>
|
||||
<location filename="mainwindow.cpp" line="913"/>
|
||||
<location filename="mainwindow.cpp" line="914"/>
|
||||
<location filename="mainwindow.cpp" line="948"/>
|
||||
<location filename="mainwindow.cpp" line="949"/>
|
||||
<location filename="mainwindow.cpp" line="946"/>
|
||||
<location filename="mainwindow.cpp" line="947"/>
|
||||
<location filename="mainwindow.cpp" line="982"/>
|
||||
<location filename="mainwindow.cpp" line="983"/>
|
||||
<source>do not support</source>
|
||||
<translation>不支持</translation>
|
||||
</message>
|
||||
|
|
@ -347,27 +347,27 @@
|
|||
<translation type="vanished">打开设备错误：%1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="580"/>
|
||||
<location filename="mainwindow.cpp" line="611"/>
|
||||
<source>no device opened</source>
|
||||
<translation>无设备打开</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="625"/>
|
||||
<location filename="mainwindow.cpp" line="670"/>
|
||||
<location filename="mainwindow.cpp" line="680"/>
|
||||
<location filename="mainwindow.cpp" line="703"/>
|
||||
<location filename="mainwindow.cpp" line="753"/>
|
||||
<location filename="mainwindow.cpp" line="817"/>
|
||||
<location filename="mainwindow.cpp" line="833"/>
|
||||
<location filename="mainwindow.cpp" line="840"/>
|
||||
<location filename="mainwindow.cpp" line="847"/>
|
||||
<location filename="mainwindow.cpp" line="854"/>
|
||||
<location filename="mainwindow.cpp" line="863"/>
|
||||
<location filename="mainwindow.cpp" line="656"/>
|
||||
<location filename="mainwindow.cpp" line="701"/>
|
||||
<location filename="mainwindow.cpp" line="711"/>
|
||||
<location filename="mainwindow.cpp" line="734"/>
|
||||
<location filename="mainwindow.cpp" line="786"/>
|
||||
<location filename="mainwindow.cpp" line="850"/>
|
||||
<location filename="mainwindow.cpp" line="866"/>
|
||||
<location filename="mainwindow.cpp" line="873"/>
|
||||
<location filename="mainwindow.cpp" line="880"/>
|
||||
<location filename="mainwindow.cpp" line="887"/>
|
||||
<location filename="mainwindow.cpp" line="896"/>
|
||||
<source>tips</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="625"/>
|
||||
<location filename="mainwindow.cpp" line="656"/>
|
||||
<source>no version available</source>
|
||||
<translation>未获取到可升级版本</translation>
|
||||
</message>
|
||||
|
|
@ -376,7 +376,7 @@
|
|||
<translation type="vanished">确定</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="656"/>
|
||||
<location filename="mainwindow.cpp" line="687"/>
|
||||
<source>Open File</source>
|
||||
<translation>打开文件</translation>
|
||||
</message>
|
||||
|
|
@ -385,9 +385,9 @@
|
|||
<translation type="vanished">压缩文件(* .zip)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="744"/>
|
||||
<location filename="mainwindow.cpp" line="764"/>
|
||||
<location filename="mainwindow.cpp" line="785"/>
|
||||
<location filename="mainwindow.cpp" line="776"/>
|
||||
<location filename="mainwindow.cpp" line="797"/>
|
||||
<location filename="mainwindow.cpp" line="818"/>
|
||||
<source>device: %1 upgrade firmware success</source>
|
||||
<translation>设备：%1 固件升级成功</translation>
|
||||
</message>
|
||||
|
|
@ -400,24 +400,24 @@
|
|||
<translation type="vanished">设备: %1, 固件版本: %2, 升级: %3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="518"/>
|
||||
<location filename="mainwindow.cpp" line="548"/>
|
||||
<source>support</source>
|
||||
<translation>支持</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="518"/>
|
||||
<location filename="mainwindow.cpp" line="548"/>
|
||||
<source>upgrade: %1</source>
|
||||
<oldsource>upgrade: %2</oldsource>
|
||||
<translation>固件在线升级: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="656"/>
|
||||
<location filename="mainwindow.cpp" line="687"/>
|
||||
<source>ZIP Files(*.zip *.zip)</source>
|
||||
<translation>压缩文件(*.zip)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="670"/>
|
||||
<location filename="mainwindow.cpp" line="703"/>
|
||||
<location filename="mainwindow.cpp" line="701"/>
|
||||
<location filename="mainwindow.cpp" line="734"/>
|
||||
<source>the selected firmware is not newer than the current version</source>
|
||||
<translation>选择的固件版本比当前版本低</translation>
|
||||
</message>
|
||||
|
|
@ -426,7 +426,7 @@
|
|||
<translation type="vanished">固件不匹配</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="681"/>
|
||||
<location filename="mainwindow.cpp" line="712"/>
|
||||
<source>firmware file mismatch, continue?</source>
|
||||
<translation>固件文件版本不匹配，是否继续？</translation>
|
||||
</message>
|
||||
|
|
@ -439,99 +439,98 @@
|
|||
<translation type="vanished">设备: %1, 固件升级: %2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="519"/>
|
||||
<location filename="mainwindow.cpp" line="549"/>
|
||||
<source>FirmWare number: %1</source>
|
||||
<translation>固件号: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="520"/>
|
||||
<location filename="mainwindow.cpp" line="550"/>
|
||||
<source>Serial number: %1</source>
|
||||
<translation>序列号: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="521"/>
|
||||
<location filename="mainwindow.cpp" line="551"/>
|
||||
<source>speed mode: %1</source>
|
||||
<translation>速度模式: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="550"/>
|
||||
<location filename="mainwindow.cpp" line="580"/>
|
||||
<source>Motor Version: %1</source>
|
||||
<translation>电机固件版本： %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="571"/>
|
||||
<location filename="mainwindow.cpp" line="602"/>
|
||||
<source>Device is opened by other process</source>
|
||||
<translation>设备被其他进程占用</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="575"/>
|
||||
<location filename="mainwindow.cpp" line="606"/>
|
||||
<source>open device error</source>
|
||||
<translation>打开设备失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="748"/>
|
||||
<location filename="mainwindow.cpp" line="768"/>
|
||||
<location filename="mainwindow.cpp" line="789"/>
|
||||
<location filename="mainwindow.cpp" line="801"/>
|
||||
<location filename="mainwindow.cpp" line="822"/>
|
||||
<source>device: %1 upgrade firmware failed, io error</source>
|
||||
<translation>设备：%1 固件升级失败，IO错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="753"/>
|
||||
<location filename="mainwindow.cpp" line="786"/>
|
||||
<source>download firmware fail</source>
|
||||
<translation>下载固件失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="808"/>
|
||||
<location filename="mainwindow.cpp" line="841"/>
|
||||
<source>Roller scanned count has been set to 0.</source>
|
||||
<translation>滚轴计数已清零</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="812"/>
|
||||
<location filename="mainwindow.cpp" line="845"/>
|
||||
<source>Do not supported</source>
|
||||
<translation>设备不支持</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="815"/>
|
||||
<location filename="mainwindow.cpp" line="848"/>
|
||||
<source>Roller scanned count reset failed.</source>
|
||||
<translation>清除滚轴计数失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="833"/>
|
||||
<location filename="mainwindow.cpp" line="866"/>
|
||||
<source>old password is wrong</source>
|
||||
<translation>旧密码错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="840"/>
|
||||
<location filename="mainwindow.cpp" line="873"/>
|
||||
<source>new password can not be empty</source>
|
||||
<translation>新密码不能为空</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="847"/>
|
||||
<location filename="mainwindow.cpp" line="880"/>
|
||||
<source>new password is inconsistent</source>
|
||||
<translation>新密码不一致</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="854"/>
|
||||
<location filename="mainwindow.cpp" line="887"/>
|
||||
<source>modify password fail</source>
|
||||
<translation>密码修改失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="863"/>
|
||||
<location filename="mainwindow.cpp" line="896"/>
|
||||
<source>modify password success</source>
|
||||
<translation>密码修改成功</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="944"/>
|
||||
<location filename="mainwindow.cpp" line="978"/>
|
||||
<source>correcting...</source>
|
||||
<translation>校正中...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="964"/>
|
||||
<location filename="mainwindow.cpp" line="998"/>
|
||||
<source>Export special test paper</source>
|
||||
<translation>导出专用测试纸</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="964"/>
|
||||
<location filename="mainwindow.cpp" line="998"/>
|
||||
<source>jpg(*.jpg)</source>
|
||||
<translation>jpg(*.jpg)</translation>
|
||||
</message>
|
||||
|
|
@ -540,107 +539,114 @@
|
|||
<translation type="vanished">导出失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="289"/>
|
||||
<location filename="mainwindow.cpp" line="304"/>
|
||||
<location filename="mainwindow.cpp" line="881"/>
|
||||
<location filename="mainwindow.cpp" line="887"/>
|
||||
<location filename="mainwindow.cpp" line="316"/>
|
||||
<location filename="mainwindow.cpp" line="331"/>
|
||||
<location filename="mainwindow.cpp" line="776"/>
|
||||
<location filename="mainwindow.cpp" line="780"/>
|
||||
<location filename="mainwindow.cpp" line="914"/>
|
||||
<location filename="mainwindow.cpp" line="920"/>
|
||||
<location filename="mainwindow.cpp" line="927"/>
|
||||
<location filename="mainwindow.cpp" line="948"/>
|
||||
<location filename="mainwindow.cpp" line="955"/>
|
||||
<location filename="mainwindow.cpp" line="947"/>
|
||||
<location filename="mainwindow.cpp" line="953"/>
|
||||
<location filename="mainwindow.cpp" line="960"/>
|
||||
<location filename="mainwindow.cpp" line="982"/>
|
||||
<location filename="mainwindow.cpp" line="989"/>
|
||||
<source>Prompt</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="53"/>
|
||||
<location filename="mainwindow.cpp" line="927"/>
|
||||
<location filename="mainwindow.cpp" line="63"/>
|
||||
<location filename="mainwindow.cpp" line="960"/>
|
||||
<source>Please confirm that the device has correctly placed the calibration paper!</source>
|
||||
<translation>请确认设备已正确放置校正纸！</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="54"/>
|
||||
<location filename="mainwindow.cpp" line="64"/>
|
||||
<source>Prompt of Hualing device</source>
|
||||
<oldsource>Prompt of Hualin device</oldsource>
|
||||
<translation>若当前为华凌设备，自动校正后，须勾选"彩色校正"再校正一次，其它设备无需勾选。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="55"/>
|
||||
<location filename="mainwindow.cpp" line="65"/>
|
||||
<source>Please confirm that the device has placed a special scanning test paper for distortion correction!</source>
|
||||
<translation>开始计算畸变值之前，请确认设备已放置畸变校正专用扫描测试纸！</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="221"/>
|
||||
<location filename="mainwindow.cpp" line="248"/>
|
||||
<source>Warning</source>
|
||||
<translation>警告</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="221"/>
|
||||
<location filename="mainwindow.cpp" line="248"/>
|
||||
<source>Device is Running! please wait for the process to end.</source>
|
||||
<translation>设备正在运行！请等待流程结束。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="288"/>
|
||||
<location filename="mainwindow.cpp" line="289"/>
|
||||
<location filename="mainwindow.cpp" line="315"/>
|
||||
<location filename="mainwindow.cpp" line="316"/>
|
||||
<source>Count distortion failed</source>
|
||||
<translation>计算畸变值失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="295"/>
|
||||
<location filename="mainwindow.cpp" line="322"/>
|
||||
<source>Count distortion succeed: %1</source>
|
||||
<translation>计算畸变值成功: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="458"/>
|
||||
<location filename="mainwindow.cpp" line="528"/>
|
||||
<location filename="mainwindow.cpp" line="807"/>
|
||||
<location filename="mainwindow.cpp" line="487"/>
|
||||
<location filename="mainwindow.cpp" line="558"/>
|
||||
<location filename="mainwindow.cpp" line="840"/>
|
||||
<source>roll count: %1</source>
|
||||
<translation>滚轴计数： %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="459"/>
|
||||
<location filename="mainwindow.cpp" line="540"/>
|
||||
<location filename="mainwindow.cpp" line="488"/>
|
||||
<location filename="mainwindow.cpp" line="570"/>
|
||||
<source>scan count: %1</source>
|
||||
<translation>历史扫描张数： %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="886"/>
|
||||
<location filename="mainwindow.cpp" line="781"/>
|
||||
<source>device: %1 upgrade firmware failed: %2</source>
|
||||
<translation>设备：%1 固件升级失败: %2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="919"/>
|
||||
<source>Get distortion failed</source>
|
||||
<translation>获取畸变值失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="887"/>
|
||||
<location filename="mainwindow.cpp" line="920"/>
|
||||
<source>Get failed</source>
|
||||
<translation>获取失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="892"/>
|
||||
<location filename="mainwindow.cpp" line="925"/>
|
||||
<source>Get distortion succeed: %1</source>
|
||||
<translation>获取畸变值成功: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="971"/>
|
||||
<location filename="mainwindow.cpp" line="1005"/>
|
||||
<source>Color mode: %1, Dpi: %2</source>
|
||||
<translation>颜色模式: %1, 分辨率 :%2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="919"/>
|
||||
<location filename="mainwindow.cpp" line="920"/>
|
||||
<location filename="mainwindow.cpp" line="952"/>
|
||||
<location filename="mainwindow.cpp" line="953"/>
|
||||
<source>Set failed</source>
|
||||
<translation>设置失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="909"/>
|
||||
<location filename="mainwindow.cpp" line="942"/>
|
||||
<source>Set succeed</source>
|
||||
<translation>设置成功</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="955"/>
|
||||
<location filename="mainwindow.cpp" line="989"/>
|
||||
<source>Correct failed</source>
|
||||
<translation>校正失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="300"/>
|
||||
<location filename="mainwindow.cpp" line="327"/>
|
||||
<source>Have already corrected</source>
|
||||
<translation>已校正</translation>
|
||||
</message>
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -551,7 +551,7 @@
|
|||
<rect>
|
||||
<x>80</x>
|
||||
<y>10</y>
|
||||
<width>108</width>
|
||||
<width>491</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
|
|||
Loading…
Reference in New Issue