diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index 752ad32..123590e 100644 Binary files a/app/HGProductionTool/ProductionTool_zh_CN.qm and b/app/HGProductionTool/ProductionTool_zh_CN.qm differ diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts index 5664db6..2d55dc1 100644 --- a/app/HGProductionTool/ProductionTool_zh_CN.ts +++ b/app/HGProductionTool/ProductionTool_zh_CN.ts @@ -748,11 +748,6 @@ START 开始测试(Enter) - - - Enter - - PrePage @@ -803,6 +798,11 @@ DevInfo: 设备信息: + + + Return + + SHOWIMG @@ -824,7 +824,7 @@ Device type: - 设备型号: + 设备类型: @@ -913,6 +913,19 @@ 休眠时间:%1分钟 + + + sleep time:%1 + + 休眠时间:%1 + + + + + + Not sleeping + 不休眠 + speed mode:%1PPM @@ -926,36 +939,36 @@ 设备型号:%1 - - + + device history scan count: 设备历史扫描张数: - - - - + + + + Prompt 提示 - + No paper 无纸 - + Device is sleeping 设备处于休眠模式 - + Counting mode 设备处于计数模式 - + Other error 其他错误 @@ -1020,8 +1033,8 @@ Pid: - - + + device roller count: 设备滚轴张数: diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index 97edaf7..2e41dbf 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -264,7 +264,7 @@ void Form_mainInterface::on_testGetDevCfgInfo(int vid, int pid, int sleepTime, i QString str = (tr("please verify the configuration of the device:") + "\n\t"); str.append(tr("vid:%1\n\t").arg(QString::fromStdString(buf))); str.append(tr("pid:%1\n\t").arg(QString::fromStdString(buf2))); - str.append(tr("sleep time:%1minute\n\t").arg(QString::number(sleepTime))); + str.append(sleepTime > 0 ? tr("sleep time:%1minute\n\t").arg(QString::number(sleepTime)) : tr("sleep time:%1\n\t").arg(tr("Not sleeping"))); str.append(tr("speed mode:%1PPM\n\t").arg(QString::number(speedMode))); str.append(tr("device serial number:%1\n\t").arg(devSn)); str.append(tr("device firmware number:%1\n\t").arg(devFw)); @@ -592,7 +592,7 @@ QString Form_mainInterface::getSleepTime() sane_io_control(m_handle, IO_CTRL_CODE_GET_POWER_LEVEL, &sleepTime, &len2); if (sleepTime > 99999 || sleepTime == -1) - return QString::number(0); + return tr("Not sleeping"); return QString::number(sleepTime / 60) + tr(" minute"); }