lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

完善安装版本功能

This commit is contained in:
yangjiaxuan 2022-07-19 18:06:08 +08:00
parent c80380b8d0
commit 52c14f8038
9 changed files with 310 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scanner/Scanner_resource.qrc
View File

@ -2,6 +2,7 @@
<qresource prefix="/translation"> <qresource prefix="/translation">
<file>Scanner_zh_CN.qm</file> <file>Scanner_zh_CN.qm</file>
<file>qt_zh_CN.qm</file> <file>qt_zh_CN.qm</file>
<file>../upgrade/Upgrade_zh_CN.qm</file>
</qresource> </qresource>
<qresource prefix="/images"> <qresource prefix="/images">
<file>image_rsc/action/btnEmailScanedImages.png</file> <file>image_rsc/action/btnEmailScanedImages.png</file>

232
app/scanner/Scanner_zh_CN.ts
View File

@ -303,25 +303,25 @@
<translation>所有页</translation> <translation>所有页</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="51"/> <location filename="dialog_aquireinto.cpp" line="56"/>
<location filename="dialog_aquireinto.cpp" line="174"/> <location filename="dialog_aquireinto.cpp" line="180"/>
<location filename="dialog_aquireinto.cpp" line="201"/> <location filename="dialog_aquireinto.cpp" line="207"/>
<location filename="dialog_aquireinto.cpp" line="208"/> <location filename="dialog_aquireinto.cpp" line="214"/>
<source>e.g. &apos;%1%2&apos;</source> <source>e.g. &apos;%1%2&apos;</source>
<translation>例如.“%1%2”</translation> <translation>例如.“%1%2”</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="60"/> <location filename="dialog_aquireinto.cpp" line="65"/>
<source>ok</source> <source>ok</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="61"/> <location filename="dialog_aquireinto.cpp" line="66"/>
<source>cancel</source> <source>cancel</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="dialog_aquireinto.cpp" line="126"/> <location filename="dialog_aquireinto.cpp" line="132"/>
<source>Browse directory</source> <source>Browse directory</source>
<translation>文件夹路径</translation> <translation>文件夹路径</translation>
</message> </message>
@ -481,9 +481,9 @@ Page range will be &quot;Chosen Pages&quot;.
<translation>多页保存(TIFF/PDF/OFD)</translation> <translation>多页保存(TIFF/PDF/OFD)</translation>
</message> </message>
<message> <message>
<location filename="dialog_export.cpp" line="112"/> <location filename="dialog_export.cpp" line="121"/>
<location filename="dialog_export.cpp" line="283"/> <location filename="dialog_export.cpp" line="292"/>
<location filename="dialog_export.cpp" line="294"/> <location filename="dialog_export.cpp" line="303"/>
<source>Input is not valid. <source>Input is not valid.
Page range will be &apos;Chosen Pages&apos;.</source> Page range will be &apos;Chosen Pages&apos;.</source>
<translation>输入无效。 <translation>输入无效。
@ -1947,16 +1947,16 @@ Please make sure the two passwords are the same.</source>
<message> <message>
<location filename="mainwindow.cpp" line="478"/> <location filename="mainwindow.cpp" line="478"/>
<location filename="mainwindow.cpp" line="533"/> <location filename="mainwindow.cpp" line="533"/>
<location filename="mainwindow.cpp" line="1371"/> <location filename="mainwindow.cpp" line="1372"/>
<location filename="mainwindow.cpp" line="1395"/> <location filename="mainwindow.cpp" line="1396"/>
<location filename="mainwindow.cpp" line="2122"/> <location filename="mainwindow.cpp" line="2123"/>
<location filename="mainwindow.cpp" line="2442"/> <location filename="mainwindow.cpp" line="2443"/>
<source>Question</source> <source>Question</source>
<translation>警告</translation> <translation>警告</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="479"/> <location filename="mainwindow.cpp" line="479"/>
<location filename="mainwindow.cpp" line="1372"/> <location filename="mainwindow.cpp" line="1373"/>
<source>modified, save it?</source> <source>modified, save it?</source>
<translation>图像已被修改。 <translation>图像已被修改。
是否保存修改？</translation> 是否保存修改？</translation>
@ -1988,189 +1988,189 @@ Please make sure the two passwords are the same.</source>
<translation type="vanished">扫描完成</translation> <translation type="vanished">扫描完成</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1392"/> <location filename="mainwindow.cpp" line="1393"/>
<source>Clear, then start scan</source> <source>Clear, then start scan</source>
<translation>清空并启动扫描</translation> <translation>清空并启动扫描</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1393"/> <location filename="mainwindow.cpp" line="1394"/>
<source>Do NOT clear, then start scan</source> <source>Do NOT clear, then start scan</source>
<translation>不清空并启动扫描</translation> <translation>不清空并启动扫描</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1396"/> <location filename="mainwindow.cpp" line="1397"/>
<source>Already exist images in image list. <source>Already exist images in image list.
Do you want to clear?</source> Do you want to clear?</source>
<translation>图像列表中已存在图像。 <translation>图像列表中已存在图像。
是否清空？</translation> 是否清空？</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1430"/> <location filename="mainwindow.cpp" line="1431"/>
<source>Information</source> <source>Information</source>
<translation>消息</translation> <translation>消息</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1431"/> <location filename="mainwindow.cpp" line="1432"/>
<source>Insufficient disk space</source> <source>Insufficient disk space</source>
<translation>磁盘空间不足，请删除不需要的文件，以保证有足够的空间</translation> <translation>磁盘空间不足，请删除不需要的文件，以保证有足够的空间</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1617"/> <location filename="mainwindow.cpp" line="1618"/>
<source>Open images</source> <source>Open images</source>
<translation>打开图片</translation> <translation>打开图片</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1628"/> <location filename="mainwindow.cpp" line="1629"/>
<source>Insert images</source> <source>Insert images</source>
<translation>插入图片</translation> <translation>插入图片</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1802"/> <location filename="mainwindow.cpp" line="1803"/>
<location filename="mainwindow.cpp" line="1807"/> <location filename="mainwindow.cpp" line="1808"/>
<location filename="mainwindow.cpp" line="1862"/> <location filename="mainwindow.cpp" line="1863"/>
<location filename="mainwindow.cpp" line="1938"/> <location filename="mainwindow.cpp" line="1939"/>
<location filename="mainwindow.cpp" line="1943"/> <location filename="mainwindow.cpp" line="1944"/>
<source>info</source> <source>info</source>
<translation>信息</translation> <translation>信息</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1802"/> <location filename="mainwindow.cpp" line="1803"/>
<location filename="mainwindow.cpp" line="1862"/> <location filename="mainwindow.cpp" line="1863"/>
<location filename="mainwindow.cpp" line="1938"/> <location filename="mainwindow.cpp" line="1939"/>
<source>save failed</source> <source>save failed</source>
<translation>保存失败</translation> <translation>保存失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="1807"/> <location filename="mainwindow.cpp" line="1808"/>
<location filename="mainwindow.cpp" line="1943"/> <location filename="mainwindow.cpp" line="1944"/>
<source>find savePath in thumbnail</source> <source>find savePath in thumbnail</source>
<translation>图片名在列表中已存在</translation> <translation>图片名在列表中已存在</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2027"/> <location filename="mainwindow.cpp" line="2028"/>
<source>File name</source> <source>File name</source>
<translation>文件名</translation> <translation>文件名</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2027"/> <location filename="mainwindow.cpp" line="2028"/>
<source>File path</source> <source>File path</source>
<translation>文件路径</translation> <translation>文件路径</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2027"/> <location filename="mainwindow.cpp" line="2028"/>
<source>File size</source> <source>File size</source>
<translation>文件大小</translation> <translation>文件大小</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2027"/> <location filename="mainwindow.cpp" line="2028"/>
<source>Creation date/time</source> <source>Creation date/time</source>
<translation>创建时间</translation> <translation>创建时间</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2027"/> <location filename="mainwindow.cpp" line="2028"/>
<source>Modified date/time</source> <source>Modified date/time</source>
<translation>修改时间</translation> <translation>修改时间</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2027"/> <location filename="mainwindow.cpp" line="2028"/>
<source>Accessed date/time</source> <source>Accessed date/time</source>
<translation>访问时间</translation> <translation>访问时间</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2070"/> <location filename="mainwindow.cpp" line="2071"/>
<source>Format</source> <source>Format</source>
<translation>格式</translation> <translation>格式</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2070"/> <location filename="mainwindow.cpp" line="2071"/>
<source>Width</source> <source>Width</source>
<translation>宽度</translation> <translation>宽度</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2070"/> <location filename="mainwindow.cpp" line="2071"/>
<source>Height</source> <source>Height</source>
<translation>高度</translation> <translation>高度</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2070"/> <location filename="mainwindow.cpp" line="2071"/>
<source>depth</source> <source>depth</source>
<translation>深度</translation> <translation>深度</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2070"/> <location filename="mainwindow.cpp" line="2071"/>
<source>Color model</source> <source>Color model</source>
<translation>色彩模式</translation> <translation>色彩模式</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2070"/> <location filename="mainwindow.cpp" line="2071"/>
<source>DPI</source> <source>DPI</source>
<translation>每英寸像素点</translation> <translation>每英寸像素点</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2070"/> <location filename="mainwindow.cpp" line="2071"/>
<source>Print size</source> <source>Print size</source>
<translation>打印尺寸</translation> <translation>打印尺寸</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2070"/> <location filename="mainwindow.cpp" line="2071"/>
<source>Frame</source> <source>Frame</source>
<translation>帧</translation> <translation>帧</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2078"/> <location filename="mainwindow.cpp" line="2079"/>
<source>None</source> <source>None</source>
<translation>无</translation> <translation>无</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2078"/> <location filename="mainwindow.cpp" line="2079"/>
<source>Mono</source> <source>Mono</source>
<translation>黑白</translation> <translation>黑白</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2078"/> <location filename="mainwindow.cpp" line="2079"/>
<source>Gray</source> <source>Gray</source>
<translation>灰度</translation> <translation>灰度</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2078"/> <location filename="mainwindow.cpp" line="2079"/>
<source>Color</source> <source>Color</source>
<translation>彩色</translation> <translation>彩色</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2099"/> <location filename="mainwindow.cpp" line="2100"/>
<source>Warning</source> <source>Warning</source>
<translation>警告</translation> <translation>警告</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2099"/> <location filename="mainwindow.cpp" line="2100"/>
<source>Device is Running! <source>Device is Running!
Please finish scanning first.</source> Please finish scanning first.</source>
<translation>设备正在运行！ <translation>设备正在运行！
请先结束扫描。</translation> 请先结束扫描。</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3110"/> <location filename="mainwindow.cpp" line="3111"/>
<source>Are you sure to close </source> <source>Are you sure to close </source>
<translation>您确定要关闭</translation> <translation>您确定要关闭</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3110"/> <location filename="mainwindow.cpp" line="3111"/>
<source> ?</source> <source> ?</source>
<translation>吗?</translation> <translation>吗?</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3119"/>
<location filename="mainwindow.cpp" line="3120"/> <location filename="mainwindow.cpp" line="3120"/>
<location filename="mainwindow.cpp" line="3121"/>
<source>close </source> <source>close </source>
<translation>关闭</translation> <translation>关闭</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3157"/> <location filename="mainwindow.cpp" line="3158"/>
<source>error</source> <source>error</source>
<translation>错误</translation> <translation>错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3157"/> <location filename="mainwindow.cpp" line="3158"/>
<source>get versionlist failed</source> <source>get versionlist failed</source>
<translation>获取版本列表错误</translation> <translation>获取版本列表错误</translation>
</message> </message>
@ -2181,96 +2181,96 @@ Continue to close?</source>
是否继续关闭？</translation> 是否继续关闭？</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2443"/> <location filename="mainwindow.cpp" line="2444"/>
<source>Sure to sign out administrator account?</source> <source>Sure to sign out administrator account?</source>
<translation>是否确定登出管理员账户？</translation> <translation>是否确定登出管理员账户？</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2564"/> <location filename="mainwindow.cpp" line="2565"/>
<source>confirm the operation</source> <source>confirm the operation</source>
<translation>确认操作</translation> <translation>确认操作</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2565"/> <location filename="mainwindow.cpp" line="2566"/>
<source>Are you sure to clear the rollor acount?</source> <source>Are you sure to clear the rollor acount?</source>
<translation>你确定要清除滚轴计数吗</translation> <translation>你确定要清除滚轴计数吗</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2581"/> <location filename="mainwindow.cpp" line="2582"/>
<source>Please re-enter the Abount screen to obtain the latest value</source> <source>Please re-enter the Abount screen to obtain the latest value</source>
<translation>请重新进入关于界面以获取最新值</translation> <translation>请重新进入关于界面以获取最新值</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2626"/> <location filename="mainwindow.cpp" line="2627"/>
<source>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;</source> <source>&lt;p&gt;%1: &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2628"/> <location filename="mainwindow.cpp" line="2629"/>
<source>&lt;p&gt;%1: %2</source> <source>&lt;p&gt;%1: %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2630"/> <location filename="mainwindow.cpp" line="2631"/>
<source>roller number</source> <source>roller number</source>
<translation>滚轴张数</translation> <translation>滚轴张数</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2980"/> <location filename="mainwindow.cpp" line="2981"/>
<source>open scanner </source> <source>open scanner </source>
<translation>打开扫描仪</translation> <translation>打开扫描仪</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2981"/> <location filename="mainwindow.cpp" line="2982"/>
<location filename="mainwindow.cpp" line="3044"/> <location filename="mainwindow.cpp" line="3045"/>
<source>app name</source> <source>app name</source>
<translation>华高扫描软件</translation> <translation>华高扫描软件</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2986"/> <location filename="mainwindow.cpp" line="2987"/>
<location filename="mainwindow.cpp" line="3083"/> <location filename="mainwindow.cpp" line="3084"/>
<source>success</source> <source>success</source>
<translation>成功</translation> <translation>成功</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2995"/> <location filename="mainwindow.cpp" line="2996"/>
<source>apply setting </source> <source>apply setting </source>
<translation>应用配置</translation> <translation>应用配置</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2995"/> <location filename="mainwindow.cpp" line="2996"/>
<source> success</source> <source> success</source>
<translation>成功</translation> <translation>成功</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2995"/> <location filename="mainwindow.cpp" line="2996"/>
<source> failed</source> <source> failed</source>
<translation>失败</translation> <translation>失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3013"/> <location filename="mainwindow.cpp" line="3014"/>
<location filename="mainwindow.cpp" line="3098"/> <location filename="mainwindow.cpp" line="3099"/>
<source>failed</source> <source>failed</source>
<translation>失败</translation> <translation>失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3036"/> <location filename="mainwindow.cpp" line="3037"/>
<source>warning</source> <source>warning</source>
<translation>警告</translation> <translation>警告</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3036"/> <location filename="mainwindow.cpp" line="3037"/>
<source>the disk space in the current path is unsufficient, please select a new path or clear the disk space in time.</source> <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>当前路径磁盘空间不足,
请重新选择路径或及时清理磁盘空间。</translation> 请重新选择路径或及时清理磁盘空间。</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3052"/> <location filename="mainwindow.cpp" line="3053"/>
<source>lost config</source> <source>lost config</source>
<translation>配置丢失</translation> <translation>配置丢失</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3079"/> <location filename="mainwindow.cpp" line="3080"/>
<source>apply setting</source> <source>apply setting</source>
<translation>应用配置</translation> <translation>应用配置</translation>
</message> </message>
@ -2278,18 +2278,18 @@ Continue to close?</source>
<location filename="mainwindow.cpp" line="1051"/> <location filename="mainwindow.cpp" line="1051"/>
<location filename="mainwindow.cpp" line="1052"/> <location filename="mainwindow.cpp" line="1052"/>
<location filename="mainwindow.cpp" line="1053"/> <location filename="mainwindow.cpp" line="1053"/>
<location filename="mainwindow.cpp" line="2716"/>
<location filename="mainwindow.cpp" line="2717"/> <location filename="mainwindow.cpp" line="2717"/>
<location filename="mainwindow.cpp" line="2718"/> <location filename="mainwindow.cpp" line="2718"/>
<location filename="mainwindow.cpp" line="2764"/> <location filename="mainwindow.cpp" line="2719"/>
<location filename="mainwindow.cpp" line="2765"/> <location filename="mainwindow.cpp" line="2765"/>
<location filename="mainwindow.cpp" line="2766"/> <location filename="mainwindow.cpp" line="2766"/>
<location filename="mainwindow.cpp" line="2827"/> <location filename="mainwindow.cpp" line="2767"/>
<location filename="mainwindow.cpp" line="2828"/> <location filename="mainwindow.cpp" line="2828"/>
<location filename="mainwindow.cpp" line="2829"/> <location filename="mainwindow.cpp" line="2829"/>
<location filename="mainwindow.cpp" line="2890"/> <location filename="mainwindow.cpp" line="2830"/>
<location filename="mainwindow.cpp" line="2891"/> <location filename="mainwindow.cpp" line="2891"/>
<location filename="mainwindow.cpp" line="2892"/> <location filename="mainwindow.cpp" line="2892"/>
<location filename="mainwindow.cpp" line="2893"/>
<source>start failed</source> <source>start failed</source>
<translation>启动失败</translation> <translation>启动失败</translation>
</message> </message>
@ -2331,14 +2331,14 @@ Continue to close?</source>
<message> <message>
<location filename="mainwindow.cpp" line="481"/> <location filename="mainwindow.cpp" line="481"/>
<location filename="mainwindow.cpp" line="536"/> <location filename="mainwindow.cpp" line="536"/>
<location filename="mainwindow.cpp" line="1374"/> <location filename="mainwindow.cpp" line="1375"/>
<location filename="mainwindow.cpp" line="1432"/> <location filename="mainwindow.cpp" line="1433"/>
<location filename="mainwindow.cpp" line="2125"/> <location filename="mainwindow.cpp" line="2126"/>
<location filename="mainwindow.cpp" line="2139"/> <location filename="mainwindow.cpp" line="2140"/>
<location filename="mainwindow.cpp" line="2444"/> <location filename="mainwindow.cpp" line="2445"/>
<location filename="mainwindow.cpp" line="2498"/> <location filename="mainwindow.cpp" line="2499"/>
<location filename="mainwindow.cpp" line="2567"/> <location filename="mainwindow.cpp" line="2568"/>
<location filename="mainwindow.cpp" line="3112"/> <location filename="mainwindow.cpp" line="3113"/>
<source>yes</source> <source>yes</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
@ -2350,13 +2350,13 @@ Continue to close?</source>
<message> <message>
<location filename="mainwindow.cpp" line="483"/> <location filename="mainwindow.cpp" line="483"/>
<location filename="mainwindow.cpp" line="537"/> <location filename="mainwindow.cpp" line="537"/>
<location filename="mainwindow.cpp" line="1375"/> <location filename="mainwindow.cpp" line="1376"/>
<location filename="mainwindow.cpp" line="2126"/> <location filename="mainwindow.cpp" line="2127"/>
<location filename="mainwindow.cpp" line="2140"/> <location filename="mainwindow.cpp" line="2141"/>
<location filename="mainwindow.cpp" line="2445"/> <location filename="mainwindow.cpp" line="2446"/>
<location filename="mainwindow.cpp" line="2499"/> <location filename="mainwindow.cpp" line="2500"/>
<location filename="mainwindow.cpp" line="2568"/> <location filename="mainwindow.cpp" line="2569"/>
<location filename="mainwindow.cpp" line="3113"/> <location filename="mainwindow.cpp" line="3114"/>
<source>no</source> <source>no</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
@ -2382,57 +2382,57 @@ Continue to close?</source>
<translation>%1%2%3.%4</translation> <translation>%1%2%3.%4</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2123"/> <location filename="mainwindow.cpp" line="2124"/>
<source>There are pictures that have not been saved. <source>There are pictures that have not been saved.
Are you sure to close?</source> Are you sure to close?</source>
<translation>有图像未保存，确定关闭？</translation> <translation>有图像未保存，确定关闭？</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2136"/> <location filename="mainwindow.cpp" line="2137"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2137"/> <location filename="mainwindow.cpp" line="2138"/>
<source>Are you sure to close?</source> <source>Are you sure to close?</source>
<translation>确定关闭？</translation> <translation>确定关闭？</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2495"/> <location filename="mainwindow.cpp" line="2496"/>
<source>confirm operation</source> <source>confirm operation</source>
<translation>确认操作</translation> <translation>确认操作</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2496"/> <location filename="mainwindow.cpp" line="2497"/>
<source>are you sure to clear the roller count?</source> <source>are you sure to clear the roller count?</source>
<translation>您确定要清除滚轴计数吗</translation> <translation>您确定要清除滚轴计数吗</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2508"/> <location filename="mainwindow.cpp" line="2509"/>
<location filename="mainwindow.cpp" line="2510"/> <location filename="mainwindow.cpp" line="2511"/>
<location filename="mainwindow.cpp" line="2586"/> <location filename="mainwindow.cpp" line="2587"/>
<source>hint</source> <source>hint</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2508"/> <location filename="mainwindow.cpp" line="2509"/>
<location filename="mainwindow.cpp" line="2578"/> <location filename="mainwindow.cpp" line="2579"/>
<source>Roller scanned count has been set to 0.</source> <source>Roller scanned count has been set to 0.</source>
<translation>辊轴计数已置零</translation> <translation>辊轴计数已置零</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2510"/> <location filename="mainwindow.cpp" line="2511"/>
<location filename="mainwindow.cpp" line="2584"/> <location filename="mainwindow.cpp" line="2585"/>
<source>Roller scanned count reset failed.</source> <source>Roller scanned count reset failed.</source>
<translation>重置辊轴计数失败</translation> <translation>重置辊轴计数失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2553"/> <location filename="mainwindow.cpp" line="2554"/>
<source>Error</source> <source>Error</source>
<translation>错误</translation> <translation>错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2553"/> <location filename="mainwindow.cpp" line="2554"/>
<source>Document missing! It would be deleted or renamed.</source> <source>Document missing! It would be deleted or renamed.</source>
<translation>文档丢失！文档可能已被删除或被重命名。</translation> <translation>文档丢失！文档可能已被删除或被重命名。</translation>
</message> </message>
@ -2465,28 +2465,28 @@ Are you sure to close?</source>
<translation type="vanished">&lt;br&gt;导航地址: &lt;a href=&apos;https://j.map.baidu.com/7e/1TO&apos;&gt;百度地图访问&lt;/a&gt;</translation> <translation type="vanished">&lt;br&gt;导航地址: &lt;a href=&apos;https://j.map.baidu.com/7e/1TO&apos;&gt;百度地图访问&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2604"/> <location filename="mainwindow.cpp" line="2605"/>
<source>About %1</source> <source>About %1</source>
<translation>关于 %1</translation> <translation>关于 %1</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2605"/> <location filename="mainwindow.cpp" line="2606"/>
<source>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Version: %2&lt;br&gt;CopyRight: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</source> <source>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Version: %2&lt;br&gt;CopyRight: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</source>
<translation>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;版本: %2&lt;br&gt;版权: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</translation> <translation>&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;版本: %2&lt;br&gt;版权: &amp;#169; %3&lt;/p&gt;&lt;p&gt;%4%5%6%7%8%9&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2620"/> <location filename="mainwindow.cpp" line="2621"/>
<source>about %1</source> <source>about %1</source>
<translation>关于 %1</translation> <translation>关于 %1</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2621"/> <location filename="mainwindow.cpp" line="2622"/>
<source>&lt;p&gt;Version: %1&lt;/p&gt;</source> <source>&lt;p&gt;Version: %1&lt;/p&gt;</source>
<oldsource>&lt;p&gt;版本: %1&lt;/p&gt;</oldsource> <oldsource>&lt;p&gt;版本: %1&lt;/p&gt;</oldsource>
<translation>&lt;p&gt;版本： %1&lt;/p&gt;</translation> <translation>&lt;p&gt;版本： %1&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="2622"/> <location filename="mainwindow.cpp" line="2623"/>
<source>&lt;p&gt;CopyRight: &amp;#169; %1&lt;/p&gt;</source> <source>&lt;p&gt;CopyRight: &amp;#169; %1&lt;/p&gt;</source>
<oldsource>&lt;p&gt;版权: &amp;#169; %1&lt;/p&gt;</oldsource> <oldsource>&lt;p&gt;版权: &amp;#169; %1&lt;/p&gt;</oldsource>
<translation>&lt;p&gt;版权： &amp;#169; %1&lt;/p&gt;</translation> <translation>&lt;p&gt;版权： &amp;#169; %1&lt;/p&gt;</translation>

5
app/scanner/mainwindow.cpp
View File

@ -169,7 +169,7 @@ MainWindow::MainWindow(QWidget *parent)
m_thumb->setItemSize(120); m_thumb->setItemSize(120);
m_thumb->setScrollSize(16); m_thumb->setScrollSize(16);
m_thumb->setMinScrollSliderSize(20); m_thumb->setMinScrollSliderSize(20);
m_thumb->setItemTextHeight(0); m_thumb->setItemTextHeight(0);
QImage nullScrollImage(":images/image_rsc/scroll/nullScrollImage.png"); QImage nullScrollImage(":images/image_rsc/scroll/nullScrollImage.png");
m_view->setNullScrollImage(&nullScrollImage); m_view->setNullScrollImage(&nullScrollImage);
@ -1099,7 +1099,8 @@ void MainWindow::on_upgradeApp(QString pkgPath)
QStringList argList; QStringList argList;
argList.push_back(QString("-appName=%1").arg(HGVERSION_APPNAME_SCANNER)); argList.push_back(QString("-appName=%1").arg(HGVERSION_APPNAME_SCANNER));
argList.push_back(QString("-pkgPath=%1").arg(pkgPath.toStdString().c_str())); argList.push_back(QString("-pkgpath=%1").arg(pkgPath.toStdString().c_str()));
argList.push_back(QString("-type=%1").arg("upgrade"));
proc.startDetached("HGUpgrade.exe", argList); proc.startDetached("HGUpgrade.exe", argList);
m_closeTip = false; m_closeTip = false;

BIN
app/upgrade/Upgrade_zh_CN.qm Normal file
View File

Binary file not shown.

32
app/upgrade/Upgrade_zh_CN.ts Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="zh_CN">
<context>
<name>MainWindow</name>
<message>
<location filename="mainwindow.ui" line="14"/>
<source>MainWindow</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.ui" line="27"/>
<source>gif</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.ui" line="40"/>
<source>text</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="16"/>
<source>Installation</source>
<translation>安装</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="19"/>
<source>Installation in progress, please wait...</source>
<translation>安装中，请稍候...</translation>
</message>
</context>
</TS>

5
app/upgrade/main.cpp
View File

@ -3,6 +3,7 @@
#include <QApplication> #include <QApplication>
#include <QThread> #include <QThread>
#include <QScreen> #include <QScreen>
#include <QTranslator>
#include "version/HGVersion.h" #include "version/HGVersion.h"
#include "HGUpgrade.h" #include "HGUpgrade.h"
@ -54,6 +55,10 @@ int main(int argc, char *argv[])
while (AppIsRun(appName)) while (AppIsRun(appName))
QThread::msleep(20); QThread::msleep(20);
QTranslator translator_upgrade_;
if (translator_upgrade_.load(":translation/upgrade/Upgrade_zh_CN.qm"))
a.installTranslator(&translator_upgrade_);
MainWindow w(appName, pkgPath); MainWindow w(appName, pkgPath);
QScreen *screen = QGuiApplication::primaryScreen(); QScreen *screen = QGuiApplication::primaryScreen();
w.move((screen->size().width() - w.width()) / 2, (screen->size().height() - w.height()) / 2); w.move((screen->size().width() - w.width()) / 2, (screen->size().height() - w.height()) / 2);

13
app/upgrade/mainwindow.cpp
View File

@ -1,6 +1,8 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "HGUpgrade.h" #include "HGUpgrade.h"
#include <QLabel>
#include <QMovie>
MainWindow::MainWindow(const std::string &appName, const std::string& pkgPath, QWidget *parent) MainWindow::MainWindow(const std::string &appName, const std::string& pkgPath, QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
@ -11,9 +13,18 @@ MainWindow::MainWindow(const std::string &appName, const std::string& pkgPath, Q
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowTitle(tr("Installation in progress, please wait...")); setWindowTitle(tr("Installation"));
setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint); setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
ui->label_text->setText(tr("Installation 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(closeWnd()), this, SLOT(close()), Qt::QueuedConnection); connect(this, SIGNAL(closeWnd()), this, SLOT(close()), Qt::QueuedConnection);
HGBase_OpenThread(ThreadFunc, this, &m_thread); HGBase_OpenThread(ThreadFunc, this, &m_thread);

132
app/upgrade/mainwindow.ui
View File

@ -6,15 +6,139 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>460</width>
<height>600</height> <height>152</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"/> <widget class="QWidget" name="centralwidget">
<widget class="QMenuBar" name="menubar"/> <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>1</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<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>
<item>
<widget class="QLabel" name="label_gif">
<property name="minimumSize">
<size>
<width>41</width>
<height>41</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>41</width>
<height>41</height>
</size>
</property>
<property name="text">
<string>gif</string>
</property>
</widget>
</item>
<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>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<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>
<item>
<widget class="QLabel" name="label_text">
<property name="text">
<string>text</string>
</property>
</widget>
</item>
<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>
</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>2</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>460</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QStatusBar" name="statusbar"/> <widget class="QStatusBar" name="statusbar"/>
</widget> </widget>
<resources/> <resources/>

9
build-qt/HGSolution/HGUpgrade/HGUpgrade.pro
View File

@ -129,3 +129,12 @@ HEADERS += \
FORMS += \ FORMS += \
../../../app/upgrade/mainwindow.ui ../../../app/upgrade/mainwindow.ui
RESOURCES += \
../../../app/scanner/Scanner_resource.qrc
TRANSLATIONS += \
../../../app/upgrade/Upgrade_zh_CN.ts \
DISTFILES += \
../../../app/upgrade/Upgrade_zh_CN.qm \