增加提示固件升级的阻塞窗口
This commit is contained in:
parent
89598f053c
commit
a7bafd0ec4
Binary file not shown.
|
@ -1649,6 +1649,34 @@ bug description:
|
|||
<translation>当前版本已安装!</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Dialog_upgradeFirmware</name>
|
||||
<message>
|
||||
<location filename="dialog_upgradefirmware.ui" line="14"/>
|
||||
<source>Dialog</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_upgradefirmware.ui" line="54"/>
|
||||
<source>gif</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_upgradefirmware.ui" line="91"/>
|
||||
<source>text</source>
|
||||
<translation>文字</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_upgradefirmware.cpp" line="14"/>
|
||||
<source>upgrade</source>
|
||||
<translation>更新升级</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_upgradefirmware.cpp" line="17"/>
|
||||
<source>firmware upgrade in progress, please wait...</source>
|
||||
<translation>设备固件自动更新升级中,请稍候...</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Dialog_wrong_img</name>
|
||||
<message>
|
||||
|
@ -2081,51 +2109,51 @@ bug description:
|
|||
<translation>导出驱动日志</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="92"/>
|
||||
<location filename="mainwindow.cpp" line="93"/>
|
||||
<source>HuaGoScan</source>
|
||||
<translation>华高扫描软件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="248"/>
|
||||
<location filename="mainwindow.cpp" line="249"/>
|
||||
<source>Grid</source>
|
||||
<translation>多列显示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="253"/>
|
||||
<location filename="mainwindow.cpp" line="254"/>
|
||||
<source>Move To...</source>
|
||||
<translation>移动到...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="257"/>
|
||||
<location filename="mainwindow.cpp" line="258"/>
|
||||
<source>Insert files</source>
|
||||
<translation>插入文件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="283"/>
|
||||
<location filename="mainwindow.cpp" line="284"/>
|
||||
<location filename="mainwindow.cpp" line="285"/>
|
||||
<location filename="mainwindow.cpp" line="286"/>
|
||||
<location filename="mainwindow.cpp" line="287"/>
|
||||
<source>nodevice</source>
|
||||
<translation>没有发现扫描仪</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="555"/>
|
||||
<location filename="mainwindow.cpp" line="610"/>
|
||||
<location filename="mainwindow.cpp" line="1531"/>
|
||||
<location filename="mainwindow.cpp" line="1555"/>
|
||||
<location filename="mainwindow.cpp" line="2347"/>
|
||||
<location filename="mainwindow.cpp" line="2684"/>
|
||||
<location filename="mainwindow.cpp" line="566"/>
|
||||
<location filename="mainwindow.cpp" line="621"/>
|
||||
<location filename="mainwindow.cpp" line="1603"/>
|
||||
<location filename="mainwindow.cpp" line="1627"/>
|
||||
<location filename="mainwindow.cpp" line="2419"/>
|
||||
<location filename="mainwindow.cpp" line="2858"/>
|
||||
<source>Question</source>
|
||||
<translation>警告</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="556"/>
|
||||
<location filename="mainwindow.cpp" line="1532"/>
|
||||
<location filename="mainwindow.cpp" line="567"/>
|
||||
<location filename="mainwindow.cpp" line="1604"/>
|
||||
<source>modified, save it?</source>
|
||||
<translation>图像已被修改。
|
||||
是否保存修改?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="611"/>
|
||||
<location filename="mainwindow.cpp" line="622"/>
|
||||
<source>file lost, remove it?</source>
|
||||
<translation>文件已丢失,是否删除?</translation>
|
||||
</message>
|
||||
|
@ -2134,7 +2162,7 @@ bug description:
|
|||
<translation type="vanished"> 已连接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="838"/>
|
||||
<location filename="mainwindow.cpp" line="852"/>
|
||||
<source> disconnected</source>
|
||||
<translation> 已断开连接</translation>
|
||||
</message>
|
||||
|
@ -2151,39 +2179,39 @@ bug description:
|
|||
<translation type="vanished">扫描完成</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1552"/>
|
||||
<location filename="mainwindow.cpp" line="1624"/>
|
||||
<source>Clear, then start scan</source>
|
||||
<translation>清空并启动扫描</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1553"/>
|
||||
<location filename="mainwindow.cpp" line="1625"/>
|
||||
<source>Do NOT clear, then start scan</source>
|
||||
<translation>不清空并启动扫描</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1556"/>
|
||||
<location filename="mainwindow.cpp" line="1628"/>
|
||||
<source>Already exist images in image list.
|
||||
Do you want to clear?</source>
|
||||
<translation>图像列表中已存在图像。
|
||||
是否清空?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1590"/>
|
||||
<location filename="mainwindow.cpp" line="1662"/>
|
||||
<source>Information</source>
|
||||
<translation>消息</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1591"/>
|
||||
<location filename="mainwindow.cpp" line="1663"/>
|
||||
<source>Insufficient disk space</source>
|
||||
<translation>磁盘空间不足,请删除不需要的文件,以保证有足够的空间</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1783"/>
|
||||
<location filename="mainwindow.cpp" line="1855"/>
|
||||
<source>Open images</source>
|
||||
<translation>打开图片</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1794"/>
|
||||
<location filename="mainwindow.cpp" line="1866"/>
|
||||
<source>Insert images</source>
|
||||
<translation>插入图片</translation>
|
||||
</message>
|
||||
|
@ -2192,230 +2220,230 @@ Do you want to clear?</source>
|
|||
<translation type="vanished">信息</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="900"/>
|
||||
<location filename="mainwindow.cpp" line="901"/>
|
||||
<location filename="mainwindow.cpp" line="2008"/>
|
||||
<location filename="mainwindow.cpp" line="2009"/>
|
||||
<location filename="mainwindow.cpp" line="2010"/>
|
||||
<location filename="mainwindow.cpp" line="2074"/>
|
||||
<location filename="mainwindow.cpp" line="2153"/>
|
||||
<location filename="mainwindow.cpp" line="2154"/>
|
||||
<location filename="mainwindow.cpp" line="2155"/>
|
||||
<location filename="mainwindow.cpp" line="914"/>
|
||||
<location filename="mainwindow.cpp" line="915"/>
|
||||
<location filename="mainwindow.cpp" line="2080"/>
|
||||
<location filename="mainwindow.cpp" line="2081"/>
|
||||
<location filename="mainwindow.cpp" line="2082"/>
|
||||
<location filename="mainwindow.cpp" line="2146"/>
|
||||
<location filename="mainwindow.cpp" line="2225"/>
|
||||
<location filename="mainwindow.cpp" line="2226"/>
|
||||
<location filename="mainwindow.cpp" line="2227"/>
|
||||
<source>save failed</source>
|
||||
<translation>保存失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1025"/>
|
||||
<location filename="mainwindow.cpp" line="1039"/>
|
||||
<source>binary</source>
|
||||
<translation>黑白</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1027"/>
|
||||
<location filename="mainwindow.cpp" line="1041"/>
|
||||
<source>gray</source>
|
||||
<translation>256级灰度</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1029"/>
|
||||
<location filename="mainwindow.cpp" line="1043"/>
|
||||
<source>rgb</source>
|
||||
<translation>24位彩色</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1269"/>
|
||||
<location filename="mainwindow.cpp" line="1341"/>
|
||||
<source>thumbnailBar enabled</source>
|
||||
<translation>显示缩略图栏</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1273"/>
|
||||
<location filename="mainwindow.cpp" line="1345"/>
|
||||
<source>thumbnailBar hidden</source>
|
||||
<translation>隐藏缩略图栏</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2003"/>
|
||||
<location filename="mainwindow.cpp" line="2069"/>
|
||||
<location filename="mainwindow.cpp" line="2148"/>
|
||||
<location filename="mainwindow.cpp" line="2075"/>
|
||||
<location filename="mainwindow.cpp" line="2141"/>
|
||||
<location filename="mainwindow.cpp" line="2220"/>
|
||||
<source>save succeed</source>
|
||||
<translation>保存成功</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2015"/>
|
||||
<location filename="mainwindow.cpp" line="2160"/>
|
||||
<location filename="mainwindow.cpp" line="2087"/>
|
||||
<location filename="mainwindow.cpp" line="2232"/>
|
||||
<source>find savePath in thumbnail</source>
|
||||
<translation>图片名在列表中已存在</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2246"/>
|
||||
<location filename="mainwindow.cpp" line="2318"/>
|
||||
<source>File name</source>
|
||||
<translation>文件名</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2246"/>
|
||||
<location filename="mainwindow.cpp" line="2318"/>
|
||||
<source>File path</source>
|
||||
<translation>文件路径</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2246"/>
|
||||
<location filename="mainwindow.cpp" line="2318"/>
|
||||
<source>File size</source>
|
||||
<translation>文件大小</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2246"/>
|
||||
<location filename="mainwindow.cpp" line="2318"/>
|
||||
<source>Creation date/time</source>
|
||||
<translation>创建时间</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2246"/>
|
||||
<location filename="mainwindow.cpp" line="2318"/>
|
||||
<source>Modified date/time</source>
|
||||
<translation>修改时间</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2246"/>
|
||||
<location filename="mainwindow.cpp" line="2318"/>
|
||||
<source>Accessed date/time</source>
|
||||
<translation>访问时间</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2289"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<source>Format</source>
|
||||
<translation>格式</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2289"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<source>Width</source>
|
||||
<translation>宽度</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2289"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<source>Height</source>
|
||||
<translation>高度</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2289"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<source>depth</source>
|
||||
<translation>深度</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2289"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<source>Color model</source>
|
||||
<translation>色彩模式</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2289"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<source>DPI</source>
|
||||
<translation>每英寸像素点</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2289"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<source>Print size</source>
|
||||
<translation>打印尺寸</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2289"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<source>Frame</source>
|
||||
<translation>帧</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2303"/>
|
||||
<location filename="mainwindow.cpp" line="2375"/>
|
||||
<source>None</source>
|
||||
<translation>无</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2303"/>
|
||||
<location filename="mainwindow.cpp" line="2375"/>
|
||||
<source>Mono</source>
|
||||
<translation>黑白</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2303"/>
|
||||
<location filename="mainwindow.cpp" line="2375"/>
|
||||
<source>Gray</source>
|
||||
<translation>灰度</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2303"/>
|
||||
<location filename="mainwindow.cpp" line="2375"/>
|
||||
<source>Color</source>
|
||||
<translation>彩色</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2324"/>
|
||||
<location filename="mainwindow.cpp" line="2396"/>
|
||||
<source>Warning</source>
|
||||
<translation>警告</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2324"/>
|
||||
<location filename="mainwindow.cpp" line="2396"/>
|
||||
<source>Device is Running!
|
||||
Please finish scanning first.</source>
|
||||
<translation>设备正在运行!
|
||||
请先结束扫描。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1187"/>
|
||||
<location filename="mainwindow.cpp" line="1188"/>
|
||||
<location filename="mainwindow.cpp" line="2961"/>
|
||||
<location filename="mainwindow.cpp" line="2962"/>
|
||||
<location filename="mainwindow.cpp" line="3034"/>
|
||||
<location filename="mainwindow.cpp" line="3035"/>
|
||||
<location filename="mainwindow.cpp" line="3123"/>
|
||||
<location filename="mainwindow.cpp" line="3124"/>
|
||||
<location filename="mainwindow.cpp" line="3211"/>
|
||||
<location filename="mainwindow.cpp" line="3212"/>
|
||||
<location filename="mainwindow.cpp" line="1259"/>
|
||||
<location filename="mainwindow.cpp" line="1260"/>
|
||||
<location filename="mainwindow.cpp" line="3135"/>
|
||||
<location filename="mainwindow.cpp" line="3136"/>
|
||||
<location filename="mainwindow.cpp" line="3208"/>
|
||||
<location filename="mainwindow.cpp" line="3209"/>
|
||||
<location filename="mainwindow.cpp" line="3297"/>
|
||||
<location filename="mainwindow.cpp" line="3298"/>
|
||||
<location filename="mainwindow.cpp" line="3385"/>
|
||||
<location filename="mainwindow.cpp" line="3386"/>
|
||||
<source>already waked up device</source>
|
||||
<translation>已唤醒设备</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3341"/>
|
||||
<location filename="mainwindow.cpp" line="3578"/>
|
||||
<source>be ready</source>
|
||||
<translation>就绪</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3516"/>
|
||||
<location filename="mainwindow.cpp" line="3517"/>
|
||||
<location filename="mainwindow.cpp" line="3518"/>
|
||||
<location filename="mainwindow.cpp" line="3527"/>
|
||||
<location filename="mainwindow.cpp" line="3528"/>
|
||||
<location filename="mainwindow.cpp" line="3529"/>
|
||||
<location filename="mainwindow.cpp" line="3753"/>
|
||||
<location filename="mainwindow.cpp" line="3754"/>
|
||||
<location filename="mainwindow.cpp" line="3755"/>
|
||||
<location filename="mainwindow.cpp" line="3764"/>
|
||||
<location filename="mainwindow.cpp" line="3765"/>
|
||||
<location filename="mainwindow.cpp" line="3766"/>
|
||||
<source>folder limit</source>
|
||||
<translation>无法访问“我的文档”,
|
||||
请前往“扫描至”更换可访问的扫描目录再进行扫描。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3573"/>
|
||||
<location filename="mainwindow.cpp" line="3812"/>
|
||||
<source>Are you sure to close </source>
|
||||
<translation>您确定要关闭</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3573"/>
|
||||
<location filename="mainwindow.cpp" line="3812"/>
|
||||
<source> ?</source>
|
||||
<translation>吗?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3583"/>
|
||||
<location filename="mainwindow.cpp" line="3584"/>
|
||||
<location filename="mainwindow.cpp" line="3822"/>
|
||||
<location filename="mainwindow.cpp" line="3823"/>
|
||||
<source>close </source>
|
||||
<translation>关闭</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3678"/>
|
||||
<location filename="mainwindow.cpp" line="3917"/>
|
||||
<source>tip</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3678"/>
|
||||
<location filename="mainwindow.cpp" line="3917"/>
|
||||
<source>Other versions not available</source>
|
||||
<translation>未获取到其他版本</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3701"/>
|
||||
<location filename="mainwindow.cpp" line="3719"/>
|
||||
<location filename="mainwindow.cpp" line="3940"/>
|
||||
<location filename="mainwindow.cpp" line="3958"/>
|
||||
<source>The device does not support this operation</source>
|
||||
<translation>设备不支持该操作</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3703"/>
|
||||
<location filename="mainwindow.cpp" line="3721"/>
|
||||
<location filename="mainwindow.cpp" line="3942"/>
|
||||
<location filename="mainwindow.cpp" line="3960"/>
|
||||
<source>IO error</source>
|
||||
<translation>IO错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3484"/>
|
||||
<location filename="mainwindow.cpp" line="3516"/>
|
||||
<location filename="mainwindow.cpp" line="3527"/>
|
||||
<location filename="mainwindow.cpp" line="3721"/>
|
||||
<location filename="mainwindow.cpp" line="3753"/>
|
||||
<location filename="mainwindow.cpp" line="3764"/>
|
||||
<source>error</source>
|
||||
<translation>错误</translation>
|
||||
</message>
|
||||
|
@ -2430,17 +2458,17 @@ Continue to close?</source>
|
|||
是否继续关闭?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2685"/>
|
||||
<location filename="mainwindow.cpp" line="2859"/>
|
||||
<source>Sure to sign out administrator account?</source>
|
||||
<translation>是否确定登出管理员账户?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2810"/>
|
||||
<location filename="mainwindow.cpp" line="2984"/>
|
||||
<source>confirm the operation</source>
|
||||
<translation>确认操作</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2811"/>
|
||||
<location filename="mainwindow.cpp" line="2985"/>
|
||||
<source>Are you sure to clear the rollor acount?</source>
|
||||
<translation>你确定要清除滚轴计数吗</translation>
|
||||
</message>
|
||||
|
@ -2449,34 +2477,34 @@ Continue to close?</source>
|
|||
<translation type="vanished">请重新进入关于界面以获取最新值</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2871"/>
|
||||
<location filename="mainwindow.cpp" line="3045"/>
|
||||
<source><p>%1: <a href='%2'>%3</a></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2873"/>
|
||||
<location filename="mainwindow.cpp" line="3047"/>
|
||||
<source><p>%1: %2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2875"/>
|
||||
<location filename="mainwindow.cpp" line="3049"/>
|
||||
<source>roller number</source>
|
||||
<translation>滚轴张数</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3307"/>
|
||||
<location filename="mainwindow.cpp" line="3481"/>
|
||||
<source>open scanner </source>
|
||||
<translation>打开扫描仪</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3308"/>
|
||||
<location filename="mainwindow.cpp" line="3541"/>
|
||||
<location filename="mainwindow.cpp" line="3482"/>
|
||||
<location filename="mainwindow.cpp" line="3778"/>
|
||||
<source>app name</source>
|
||||
<translation>华高扫描软件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3336"/>
|
||||
<location filename="mainwindow.cpp" line="3557"/>
|
||||
<location filename="mainwindow.cpp" line="3573"/>
|
||||
<location filename="mainwindow.cpp" line="3796"/>
|
||||
<source>success</source>
|
||||
<translation>成功</translation>
|
||||
</message>
|
||||
|
@ -2493,18 +2521,18 @@ Continue to close?</source>
|
|||
<translation type="vanished">失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3345"/>
|
||||
<location filename="mainwindow.cpp" line="3562"/>
|
||||
<location filename="mainwindow.cpp" line="3582"/>
|
||||
<location filename="mainwindow.cpp" line="3801"/>
|
||||
<source>failed</source>
|
||||
<translation>失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3368"/>
|
||||
<location filename="mainwindow.cpp" line="3605"/>
|
||||
<source>warning</source>
|
||||
<translation>警告</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3368"/>
|
||||
<location filename="mainwindow.cpp" line="3605"/>
|
||||
<source>the disk space in the current path is unsufficient, please select a new path or clear the disk space in time.</source>
|
||||
<translation>当前路径磁盘空间不足,
|
||||
请重新选择路径或及时清理磁盘空间。</translation>
|
||||
|
@ -2514,214 +2542,214 @@ Continue to close?</source>
|
|||
<translation type="vanished">配置丢失</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3554"/>
|
||||
<location filename="mainwindow.cpp" line="3793"/>
|
||||
<source>apply setting</source>
|
||||
<translation>应用配置</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="1168"/>
|
||||
<location filename="mainwindow.cpp" line="1169"/>
|
||||
<location filename="mainwindow.cpp" line="1170"/>
|
||||
<location filename="mainwindow.cpp" line="2942"/>
|
||||
<location filename="mainwindow.cpp" line="2943"/>
|
||||
<location filename="mainwindow.cpp" line="2944"/>
|
||||
<location filename="mainwindow.cpp" line="3015"/>
|
||||
<location filename="mainwindow.cpp" line="3016"/>
|
||||
<location filename="mainwindow.cpp" line="3017"/>
|
||||
<location filename="mainwindow.cpp" line="3104"/>
|
||||
<location filename="mainwindow.cpp" line="3105"/>
|
||||
<location filename="mainwindow.cpp" line="3106"/>
|
||||
<location filename="mainwindow.cpp" line="3192"/>
|
||||
<location filename="mainwindow.cpp" line="3193"/>
|
||||
<location filename="mainwindow.cpp" line="3194"/>
|
||||
<location filename="mainwindow.cpp" line="1240"/>
|
||||
<location filename="mainwindow.cpp" line="1241"/>
|
||||
<location filename="mainwindow.cpp" line="1242"/>
|
||||
<location filename="mainwindow.cpp" line="3116"/>
|
||||
<location filename="mainwindow.cpp" line="3117"/>
|
||||
<location filename="mainwindow.cpp" line="3118"/>
|
||||
<location filename="mainwindow.cpp" line="3189"/>
|
||||
<location filename="mainwindow.cpp" line="3190"/>
|
||||
<location filename="mainwindow.cpp" line="3191"/>
|
||||
<location filename="mainwindow.cpp" line="3278"/>
|
||||
<location filename="mainwindow.cpp" line="3279"/>
|
||||
<location filename="mainwindow.cpp" line="3280"/>
|
||||
<location filename="mainwindow.cpp" line="3366"/>
|
||||
<location filename="mainwindow.cpp" line="3367"/>
|
||||
<location filename="mainwindow.cpp" line="3368"/>
|
||||
<source>start failed</source>
|
||||
<translation>启动失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="85"/>
|
||||
<location filename="mainwindow.cpp" line="86"/>
|
||||
<source>HanvonScan</source>
|
||||
<translation>汉王扫描软件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="88"/>
|
||||
<location filename="mainwindow.cpp" line="89"/>
|
||||
<source>LanxumScan</source>
|
||||
<translation>立思辰扫描软件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="304"/>
|
||||
<location filename="mainwindow.cpp" line="306"/>
|
||||
<source>auto save</source>
|
||||
<translation>自动保存</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="307"/>
|
||||
<location filename="mainwindow.cpp" line="310"/>
|
||||
<location filename="mainwindow.cpp" line="309"/>
|
||||
<location filename="mainwindow.cpp" line="312"/>
|
||||
<source>when switching pictures, save the edited pictures directly without reminding</source>
|
||||
<translation>切换图片时,不提醒,直接保存编辑过的图片</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="450"/>
|
||||
<location filename="mainwindow.cpp" line="461"/>
|
||||
<source>statusBar displayed</source>
|
||||
<translation>显示状态栏</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="454"/>
|
||||
<location filename="mainwindow.cpp" line="465"/>
|
||||
<source>statusBar hidden</source>
|
||||
<translation>隐藏状态栏</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="463"/>
|
||||
<location filename="mainwindow.cpp" line="474"/>
|
||||
<source>toolBar displayed</source>
|
||||
<translation>显示工具栏</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="467"/>
|
||||
<location filename="mainwindow.cpp" line="478"/>
|
||||
<source>toolBar hidden</source>
|
||||
<translation>隐藏工具栏</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="476"/>
|
||||
<location filename="mainwindow.cpp" line="487"/>
|
||||
<source>colorInfo enabled</source>
|
||||
<translation>启用图像信息</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="480"/>
|
||||
<location filename="mainwindow.cpp" line="491"/>
|
||||
<source>colorInfo disenabled</source>
|
||||
<translation>关闭图像信息</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="513"/>
|
||||
<location filename="mainwindow.cpp" line="524"/>
|
||||
<source>enabling automatic saving</source>
|
||||
<translation>启用自动保存</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="517"/>
|
||||
<location filename="mainwindow.cpp" line="528"/>
|
||||
<source>cancel auto save</source>
|
||||
<translation>取消自动保存</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="550"/>
|
||||
<location filename="mainwindow.cpp" line="561"/>
|
||||
<source>Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save</source>
|
||||
<translation>切换图片时,自动保存编辑过的图像。若想取消,请取消勾选菜单项:图像->自动保存</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="558"/>
|
||||
<location filename="mainwindow.cpp" line="613"/>
|
||||
<location filename="mainwindow.cpp" line="1534"/>
|
||||
<location filename="mainwindow.cpp" line="1592"/>
|
||||
<location filename="mainwindow.cpp" line="2350"/>
|
||||
<location filename="mainwindow.cpp" line="2364"/>
|
||||
<location filename="mainwindow.cpp" line="2686"/>
|
||||
<location filename="mainwindow.cpp" line="2741"/>
|
||||
<location filename="mainwindow.cpp" line="2813"/>
|
||||
<location filename="mainwindow.cpp" line="3487"/>
|
||||
<location filename="mainwindow.cpp" line="3575"/>
|
||||
<location filename="mainwindow.cpp" line="569"/>
|
||||
<location filename="mainwindow.cpp" line="624"/>
|
||||
<location filename="mainwindow.cpp" line="1606"/>
|
||||
<location filename="mainwindow.cpp" line="1664"/>
|
||||
<location filename="mainwindow.cpp" line="2422"/>
|
||||
<location filename="mainwindow.cpp" line="2436"/>
|
||||
<location filename="mainwindow.cpp" line="2860"/>
|
||||
<location filename="mainwindow.cpp" line="2915"/>
|
||||
<location filename="mainwindow.cpp" line="2987"/>
|
||||
<location filename="mainwindow.cpp" line="3724"/>
|
||||
<location filename="mainwindow.cpp" line="3814"/>
|
||||
<source>yes</source>
|
||||
<translation>确定</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="559"/>
|
||||
<location filename="mainwindow.cpp" line="570"/>
|
||||
<source>save, do not remind again</source>
|
||||
<translation>保存,不再提醒</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="560"/>
|
||||
<location filename="mainwindow.cpp" line="614"/>
|
||||
<location filename="mainwindow.cpp" line="1535"/>
|
||||
<location filename="mainwindow.cpp" line="2351"/>
|
||||
<location filename="mainwindow.cpp" line="2365"/>
|
||||
<location filename="mainwindow.cpp" line="2687"/>
|
||||
<location filename="mainwindow.cpp" line="2742"/>
|
||||
<location filename="mainwindow.cpp" line="2814"/>
|
||||
<location filename="mainwindow.cpp" line="3576"/>
|
||||
<location filename="mainwindow.cpp" line="571"/>
|
||||
<location filename="mainwindow.cpp" line="625"/>
|
||||
<location filename="mainwindow.cpp" line="1607"/>
|
||||
<location filename="mainwindow.cpp" line="2423"/>
|
||||
<location filename="mainwindow.cpp" line="2437"/>
|
||||
<location filename="mainwindow.cpp" line="2861"/>
|
||||
<location filename="mainwindow.cpp" line="2916"/>
|
||||
<location filename="mainwindow.cpp" line="2988"/>
|
||||
<location filename="mainwindow.cpp" line="3815"/>
|
||||
<source>no</source>
|
||||
<translation>取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="801"/>
|
||||
<location filename="mainwindow.cpp" line="812"/>
|
||||
<source>found device </source>
|
||||
<translation>发现设备</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="811"/>
|
||||
<location filename="mainwindow.cpp" line="824"/>
|
||||
<source> reconnected</source>
|
||||
<translation>重新连接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="813"/>
|
||||
<location filename="mainwindow.cpp" line="826"/>
|
||||
<source>already connected, but open faild</source>
|
||||
<translation>已经连接,但打开失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="940"/>
|
||||
<location filename="mainwindow.cpp" line="1043"/>
|
||||
<location filename="mainwindow.cpp" line="954"/>
|
||||
<location filename="mainwindow.cpp" line="1057"/>
|
||||
<source>%1%2%3.%4</source>
|
||||
<translation>%1%2%3.%4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="3485"/>
|
||||
<location filename="mainwindow.cpp" line="3722"/>
|
||||
<source>start failed!</source>
|
||||
<translation>启动安装程序失败!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2348"/>
|
||||
<location filename="mainwindow.cpp" line="2420"/>
|
||||
<source>There are pictures that have not been saved.
|
||||
Are you sure to close?</source>
|
||||
<translation>有图像未保存,确定关闭?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2003"/>
|
||||
<location filename="mainwindow.cpp" line="2008"/>
|
||||
<location filename="mainwindow.cpp" line="2015"/>
|
||||
<location filename="mainwindow.cpp" line="2069"/>
|
||||
<location filename="mainwindow.cpp" line="2074"/>
|
||||
<location filename="mainwindow.cpp" line="2148"/>
|
||||
<location filename="mainwindow.cpp" line="2153"/>
|
||||
<location filename="mainwindow.cpp" line="2160"/>
|
||||
<location filename="mainwindow.cpp" line="2361"/>
|
||||
<location filename="mainwindow.cpp" line="2075"/>
|
||||
<location filename="mainwindow.cpp" line="2080"/>
|
||||
<location filename="mainwindow.cpp" line="2087"/>
|
||||
<location filename="mainwindow.cpp" line="2141"/>
|
||||
<location filename="mainwindow.cpp" line="2146"/>
|
||||
<location filename="mainwindow.cpp" line="2220"/>
|
||||
<location filename="mainwindow.cpp" line="2225"/>
|
||||
<location filename="mainwindow.cpp" line="2232"/>
|
||||
<location filename="mainwindow.cpp" line="2433"/>
|
||||
<source>tips</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2362"/>
|
||||
<location filename="mainwindow.cpp" line="2434"/>
|
||||
<source>Are you sure to close?</source>
|
||||
<translation>确定关闭?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2738"/>
|
||||
<location filename="mainwindow.cpp" line="2912"/>
|
||||
<source>confirm operation</source>
|
||||
<translation>确认操作</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2739"/>
|
||||
<location filename="mainwindow.cpp" line="2913"/>
|
||||
<source>are you sure to clear the roller count?</source>
|
||||
<translation>您确定要清除滚轴计数吗</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2752"/>
|
||||
<location filename="mainwindow.cpp" line="2756"/>
|
||||
<location filename="mainwindow.cpp" line="2831"/>
|
||||
<location filename="mainwindow.cpp" line="2926"/>
|
||||
<location filename="mainwindow.cpp" line="2930"/>
|
||||
<location filename="mainwindow.cpp" line="3005"/>
|
||||
<source>hint</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2752"/>
|
||||
<location filename="mainwindow.cpp" line="2824"/>
|
||||
<location filename="mainwindow.cpp" line="2926"/>
|
||||
<location filename="mainwindow.cpp" line="2998"/>
|
||||
<source>Roller scanned count has been set to 0.</source>
|
||||
<translation>辊轴计数已置零</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2756"/>
|
||||
<location filename="mainwindow.cpp" line="2829"/>
|
||||
<location filename="mainwindow.cpp" line="2930"/>
|
||||
<location filename="mainwindow.cpp" line="3003"/>
|
||||
<source>Roller scanned count reset failed.</source>
|
||||
<translation>重置滚轴计数失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2799"/>
|
||||
<location filename="mainwindow.cpp" line="2973"/>
|
||||
<source>Error</source>
|
||||
<translation>错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2799"/>
|
||||
<location filename="mainwindow.cpp" line="2973"/>
|
||||
<source>Document missing! It would be deleted or renamed.</source>
|
||||
<translation>文档丢失!文档可能已被删除或被重命名。</translation>
|
||||
</message>
|
||||
|
@ -2754,28 +2782,28 @@ Are you sure to close?</source>
|
|||
<translation type="vanished"><br>导航地址: <a href='https://j.map.baidu.com/7e/1TO'>百度地图访问</a></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2849"/>
|
||||
<location filename="mainwindow.cpp" line="3023"/>
|
||||
<source>About %1</source>
|
||||
<translation>关于 %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2850"/>
|
||||
<location filename="mainwindow.cpp" line="3024"/>
|
||||
<source><p>%1</p><p>Version: %2<br>CopyRight: &#169; %3</p><p>%4%5%6%7%8%9</p></source>
|
||||
<translation><p>%1</p><p>版本: %2<br>版权: &#169; %3</p><p>%4%5%6%7%8%9</p></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2865"/>
|
||||
<location filename="mainwindow.cpp" line="3039"/>
|
||||
<source>about %1</source>
|
||||
<translation>关于 %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2866"/>
|
||||
<location filename="mainwindow.cpp" line="3040"/>
|
||||
<source><p>Version: %1</p></source>
|
||||
<oldsource><p>版本: %1</p></oldsource>
|
||||
<translation><p>版本: %1</p></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="2867"/>
|
||||
<location filename="mainwindow.cpp" line="3041"/>
|
||||
<source><p>CopyRight: &#169; %1</p></source>
|
||||
<oldsource><p>版权: &#169; %1</p></oldsource>
|
||||
<translation><p>版权: &#169; %1</p></translation>
|
||||
|
@ -3068,56 +3096,56 @@ No: add new configuration</oldsource>
|
|||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1568"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1788"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1811"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1789"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1813"/>
|
||||
<source>yes</source>
|
||||
<translation>是</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1569"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1789"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1812"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1790"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1814"/>
|
||||
<source>no</source>
|
||||
<translation>否</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1703"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1704"/>
|
||||
<source><h6><b></source>
|
||||
<translation><h6><b></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1703"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1704"/>
|
||||
<source>:</b></h6></source>
|
||||
<translation>:</b></h6></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1704"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1705"/>
|
||||
<source><p> </source>
|
||||
<translation><p> </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1704"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1705"/>
|
||||
<source></p></source>
|
||||
<translation></p></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1730"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1731"/>
|
||||
<source>configuration scheme name change</source>
|
||||
<translation>配置改名</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1786"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1809"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1787"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1811"/>
|
||||
<source>be sure to delete the configuration</source>
|
||||
<translation>确认删除配置</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1787"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1788"/>
|
||||
<source>Are you sure you want to delete the configuration "</source>
|
||||
<translation>您确认要删除配置</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1787"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1788"/>
|
||||
<source>" ?</source>
|
||||
<translation>?</translation>
|
||||
</message>
|
||||
|
@ -3130,7 +3158,7 @@ No: add new configuration</oldsource>
|
|||
<translation type="vanished">’ 吗?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hg_settingdialog.cpp" line="1810"/>
|
||||
<location filename="hg_settingdialog.cpp" line="1812"/>
|
||||
<source>Are you sure you want to delete the configuration?</source>
|
||||
<translation>您确认要删除所有配置吗?</translation>
|
||||
</message>
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
#include "dialog_upgradefirmware.h"
|
||||
#include "ui_dialog_upgradefirmware.h"
|
||||
#include <QMovie>
|
||||
|
||||
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();
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#ifndef DIALOG_UPGRADEFIRMWARE_H
|
||||
#define DIALOG_UPGRADEFIRMWARE_H
|
||||
|
||||
#include <QDialog>
|
||||
#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
|
|
@ -0,0 +1,127 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog_upgradeFirmware</class>
|
||||
<widget class="QDialog" name="Dialog_upgradeFirmware">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>435</width>
|
||||
<height>125</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>19</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_gif">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>60</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>gif</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_text">
|
||||
<property name="text">
|
||||
<string>text</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
|
@ -1,4 +1,4 @@
|
|||
#include "mainwindow.h"
|
||||
#include "mainwindow.h"
|
||||
#include "ui_mainwindow.h"
|
||||
#include <QDockWidget>
|
||||
#include <QFileDialog>
|
||||
|
@ -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;
|
||||
// 韫囩晫鏆恑nfo
|
||||
// 韫囩晫鏆恑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_)
|
||||
{
|
||||
// 閸掑洦宕查崶鍓у<EFBFBD>閺冭<EFBFBD>绱濋懛顏勫З娣囨繂鐡ㄧ紓鏍<EFBFBD>帆鏉╁洨娈戦崶鎯у剼閵嗗倽瀚㈤幆鍐插絿濞戝牞绱濈拠宄板絿濞戝牆瀣€闁<EFBFBD><EFBFBD>褰嶉崡鏇€€嶉敍姘<EFBFBD>禈閸?>閼奉亜濮╂穱婵嗙摠
|
||||
// 閸掑洦宕查崶鍓у閺冭绱濋懛顏勫З娣囨繂鐡ㄧ紓鏍帆鏉╁洨娈戦崶鎯у剼閵嗗倽瀚㈤幆鍐插絿濞戝牞绱濈拠宄板絿濞戝牆瀣€闁褰嶉崡鏇€嶉敍姘禈閸?>閼奉亜濮╂穱婵嗙摠
|
||||
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,13 +1172,15 @@ 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())
|
||||
{
|
||||
if (SANE_STATUS_GOOD == dlg.getUpgradeStatus())
|
||||
{
|
||||
m_vFwUpgradeAndDevLock[index].m_handleFlag &= ~FwUpgradeAndDevLock::FwUpgrade;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (m_vFwUpgradeAndDevLock[index].m_handleFlag & FwUpgradeAndDevLock::DevLock)
|
||||
{
|
||||
if (m_devVersionNum.length() == 10 && m_devVersionNum.right(8) >= "393B1030")
|
||||
|
@ -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.");
|
||||
|
||||
// +鐠囩兘鍣搁弬鎷岀箻閸忋儱鍙ф禍搴f櫕闂堫澀浜掗懢宄板絿閺堚偓閺傛澘鈧? info += tr("Please re-enter the Abount screen to obtain the latest value");
|
||||
// +鐠囩兘鍣搁弬鎷岀箻閸忋儱鍙ф禍搴f櫕闂堫澀浜掗懢宄板絿閺堚偓閺傛澘鈧? info += tr("Please re-enter the Abount screen to obtain the latest value");
|
||||
}
|
||||
else
|
||||
info = tr("Roller scanned count reset failed.");
|
||||
|
@ -3536,13 +3539,15 @@ 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())
|
||||
{
|
||||
if (SANE_STATUS_GOOD == dlg.getUpgradeStatus())
|
||||
{
|
||||
m_vFwUpgradeAndDevLock[index].m_handleFlag &= ~FwUpgradeAndDevLock::FwUpgrade;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (m_vFwUpgradeAndDevLock[index].m_handleFlag & FwUpgradeAndDevLock::DevLock)
|
||||
{
|
||||
if (m_devVersionNum.length() == 10 && m_devVersionNum.right(8) >= "393B1030")
|
||||
|
@ -3931,10 +3936,10 @@ void MainWindow::on_act_driver_log_triggered()
|
|||
QDesktopServices::openUrl(QUrl::fromLocalFile(log_file_path));
|
||||
}
|
||||
else {
|
||||
if(statu == SANE_STATUS_UNSUPPORTED) // 鐠佹儳顦<EFBFBD>稉宥嗘暜閹镐浇顕氶幙宥勭稊
|
||||
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闁挎瑨顕?
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1265,6 +1265,29 @@ bug description:
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Dialog_upgradeFirmware</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>gif</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>text</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>upgrade</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>firmware upgrade in progress, please wait...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Dialog_wrong_img</name>
|
||||
<message>
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue