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 2023-05-26 17:25:01 +08:00
parent 8402070b49
commit 19d4955538
9 changed files with 383 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/twainui/TwainUI_zh_CN.qm
View File

Binary file not shown.

137
modules/twainui/TwainUI_zh_CN.ts
View File

@ -1513,21 +1513,46 @@ Please make sure the two passwords are the same.</source>
<context>
<name>Dialog_progress_ui</name>
<message>
<location filename="dialog_progress_ui.ui" line="26"/>
<location filename="dialog_progress_ui.ui" line="32"/>
<source>Dialog</source>
<translation>扫描状态</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="84"/>
<location filename="dialog_progress_ui.ui" line="103"/>
<source>image recived:</source>
<translation>接收图片:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="129"/>
<source>total image recived:</source>
<translation>总计图片接收数:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="179"/>
<source>image uploaded:</source>
<translation>上传图片:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="205"/>
<source>total image uploaded:</source>
<translation>总计图片上传数：</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="255"/>
<source>Cancel Scan</source>
<translation>取消扫描</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="91"/>
<location filename="dialog_progress_ui.ui" line="262"/>
<source>Close</source>
<oldsource>close</oldsource>
<translation>关闭</translation>
</message>
<message>
<location filename="dialog_progress_ui.cpp" line="106"/>
<source>Total scanned images: %1</source>
<translation>总计图片扫描数:%1</translation>
</message>
</context>
<context>
<name>Dialog_updateProgress</name>
@ -2618,7 +2643,7 @@ Are you sure to close?</source>
<context>
<name>Manager</name>
<message>
<location filename="Manager.cpp" line="197"/>
<location filename="Manager.cpp" line="296"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
@ -2794,130 +2819,130 @@ Are you sure to close?</source>
<translation type="vanished">删除配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="260"/>
<location filename="hg_settingdialog.cpp" line="277"/>
<source>existing configuration scheme</source>
<translation>现有配置方案：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="265"/>
<location filename="hg_settingdialog.cpp" line="282"/>
<source>change name</source>
<translation>改名</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="272"/>
<location filename="hg_settingdialog.cpp" line="289"/>
<source>delete</source>
<translation>删除</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="279"/>
<location filename="hg_settingdialog.cpp" line="296"/>
<source>apply</source>
<translation>应用</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="290"/>
<location filename="hg_settingdialog.cpp" line="307"/>
<source>delete all configurations</source>
<translation>删除所有配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="299"/>
<location filename="hg_settingdialog.cpp" line="316"/>
<source>confgiuration information:</source>
<translation>配置信息：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="315"/>
<location filename="hg_settingdialog.cpp" line="332"/>
<source>about...</source>
<translation>关于...</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="317"/>
<location filename="hg_settingdialog.cpp" line="334"/>
<source>scan</source>
<translation>扫描</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="319"/>
<location filename="hg_settingdialog.cpp" line="1675"/>
<location filename="hg_settingdialog.cpp" line="336"/>
<location filename="hg_settingdialog.cpp" line="1696"/>
<source>ok</source>
<translation>确定</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="321"/>
<location filename="hg_settingdialog.cpp" line="338"/>
<source>cancel</source>
<translation>取消</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="350"/>
<location filename="hg_settingdialog.cpp" line="367"/>
<source>configuration scheme management</source>
<translation>配置方案管理</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="396"/>
<location filename="hg_settingdialog.cpp" line="413"/>
<source>regional crop</source>
<translation>区域裁剪</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="415"/>
<location filename="hg_settingdialog.cpp" line="432"/>
<source>custom tone curve</source>
<translation>自定义色调曲线</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1466"/>
<location filename="hg_settingdialog.cpp" line="1483"/>
<source>about </source>
<translation>关于 </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1471"/>
<location filename="hg_settingdialog.cpp" line="1479"/>
<location filename="hg_settingdialog.cpp" line="1487"/>
<location filename="hg_settingdialog.cpp" line="1495"/>
<location filename="hg_settingdialog.cpp" line="1488"/>
<location filename="hg_settingdialog.cpp" line="1496"/>
<location filename="hg_settingdialog.cpp" line="1504"/>
<location filename="hg_settingdialog.cpp" line="1517"/>
<location filename="hg_settingdialog.cpp" line="1512"/>
<location filename="hg_settingdialog.cpp" line="1521"/>
<location filename="hg_settingdialog.cpp" line="1534"/>
<source>Not supported</source>
<translation>不支持</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1474"/>
<location filename="hg_settingdialog.cpp" line="1491"/>
<source>&lt;p&gt;Device model: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;设备型号: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1482"/>
<location filename="hg_settingdialog.cpp" line="1499"/>
<source>&lt;p&gt;Driver version: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;驱动版本号: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1490"/>
<location filename="hg_settingdialog.cpp" line="1507"/>
<source>&lt;p&gt;Firmware number: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;设备固件版本号: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1498"/>
<location filename="hg_settingdialog.cpp" line="1515"/>
<source>&lt;p&gt;Serial number: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;设备序列号: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1506"/>
<location filename="hg_settingdialog.cpp" line="1511"/>
<location filename="hg_settingdialog.cpp" line="1519"/>
<location filename="hg_settingdialog.cpp" line="1523"/>
<location filename="hg_settingdialog.cpp" line="1528"/>
<location filename="hg_settingdialog.cpp" line="1536"/>
<source>&lt;p&gt;Roller count: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;设备滚轴计数: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1524"/>
<location filename="hg_settingdialog.cpp" line="1541"/>
<source>&lt;p&gt;History count: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;设备历史扫描张数: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1626"/>
<location filename="hg_settingdialog.cpp" line="1647"/>
<source>Please select to overwrite the original configuration:</source>
<translation>请选择覆盖原来的配置：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1628"/>
<location filename="hg_settingdialog.cpp" line="1649"/>
<source>,or add a new configuration</source>
<translation>，或者新增配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1631"/>
<location filename="hg_settingdialog.cpp" line="1652"/>
<source>save the configuration</source>
<translation>保存配置</translation>
</message>
@ -2951,82 +2976,82 @@ No: add new configuration</oldsource>
<translation type="vanished">否</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1937"/>
<location filename="hg_settingdialog.cpp" line="1960"/>
<source>&lt;h6&gt;&lt;b&gt;</source>
<translation>&lt;h6&gt;&lt;b&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1636"/>
<location filename="hg_settingdialog.cpp" line="1657"/>
<source>cover original configuration:</source>
<translation>覆盖原来配置：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1640"/>
<location filename="hg_settingdialog.cpp" line="1661"/>
<source>add new configuration</source>
<translation>新增配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1644"/>
<location filename="hg_settingdialog.cpp" line="1665"/>
<source>rename:</source>
<translation>更名：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1686"/>
<location filename="hg_settingdialog.cpp" line="1700"/>
<location filename="hg_settingdialog.cpp" line="1975"/>
<location filename="hg_settingdialog.cpp" line="1707"/>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1686"/>
<location filename="hg_settingdialog.cpp" line="1707"/>
<source>scheme name cannot be empty</source>
<translation>配置名不能为空</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1700"/>
<location filename="hg_settingdialog.cpp" line="1975"/>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<source>scheme name: </source>
<translation>配置名： </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1700"/>
<location filename="hg_settingdialog.cpp" line="1975"/>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<source> already exists</source>
<translation> 已存在</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1937"/>
<location filename="hg_settingdialog.cpp" line="1960"/>
<source>:&lt;/b&gt;&lt;/h6&gt;</source>
<translation>:&lt;/b&gt;&lt;/h6&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1938"/>
<location filename="hg_settingdialog.cpp" line="1961"/>
<source>&lt;p&gt; </source>
<translation>&lt;p&gt; </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1938"/>
<location filename="hg_settingdialog.cpp" line="1961"/>
<source>&lt;/p&gt;</source>
<translation>&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1964"/>
<location filename="hg_settingdialog.cpp" line="1987"/>
<source>configuration scheme name change</source>
<translation>配置改名</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2018"/>
<location filename="hg_settingdialog.cpp" line="2040"/>
<location filename="hg_settingdialog.cpp" line="2041"/>
<location filename="hg_settingdialog.cpp" line="2063"/>
<source>be sure to delete the configuration</source>
<translation>确认删除配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2019"/>
<location filename="hg_settingdialog.cpp" line="2042"/>
<source>Are you sure you want to delete the configuration &quot;</source>
<translation>您确认要删除配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2019"/>
<location filename="hg_settingdialog.cpp" line="2042"/>
<source>&quot; ?</source>
<translation>？</translation>
</message>
@ -3039,7 +3064,7 @@ No: add new configuration</oldsource>
<translation type="vanished">’ 吗？</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2041"/>
<location filename="hg_settingdialog.cpp" line="2064"/>
<source>Are you sure you want to delete the configuration?</source>
<translation>您确认要删除所有配置吗？</translation>
</message>

BIN
modules/twainui/TwainUI_zh_EN.qm
View File

Binary file not shown.

137
modules/twainui/TwainUI_zh_EN.ts
View File

@ -1390,21 +1390,46 @@ Please make sure the two passwords are the same.</source>
<context>
<name>Dialog_progress_ui</name>
<message>
<location filename="dialog_progress_ui.ui" line="26"/>
<location filename="dialog_progress_ui.ui" line="32"/>
<source>Dialog</source>
<translation>Scan status</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="84"/>
<location filename="dialog_progress_ui.ui" line="103"/>
<source>image recived:</source>
<translation>Image recived:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="129"/>
<source>total image recived:</source>
<translation>Total image recived:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="179"/>
<source>image uploaded:</source>
<translation>Image uploaded:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="205"/>
<source>total image uploaded:</source>
<translation>Total image uploaded:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="255"/>
<source>Cancel Scan</source>
<translation>取消扫描</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="91"/>
<location filename="dialog_progress_ui.ui" line="262"/>
<source>Close</source>
<oldsource>close</oldsource>
<translation>Close</translation>
</message>
<message>
<location filename="dialog_progress_ui.cpp" line="106"/>
<source>Total scanned images: %1</source>
<translation>Total scanned images: %1</translation>
</message>
</context>
<context>
<name>Dialog_updateProgress</name>
@ -2322,7 +2347,7 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
<context>
<name>Manager</name>
<message>
<location filename="Manager.cpp" line="197"/>
<location filename="Manager.cpp" line="296"/>
<source>Prompt</source>
<translation>Prompt</translation>
</message>
@ -2453,210 +2478,210 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
<context>
<name>hg_settingdialog</name>
<message>
<location filename="hg_settingdialog.cpp" line="260"/>
<location filename="hg_settingdialog.cpp" line="277"/>
<source>existing configuration scheme</source>
<translation>Existing configuration plan:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="265"/>
<location filename="hg_settingdialog.cpp" line="282"/>
<source>change name</source>
<translation>Rename</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="272"/>
<location filename="hg_settingdialog.cpp" line="289"/>
<source>delete</source>
<translation>Delete</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="279"/>
<location filename="hg_settingdialog.cpp" line="296"/>
<source>apply</source>
<translation>Apply</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="290"/>
<location filename="hg_settingdialog.cpp" line="307"/>
<source>delete all configurations</source>
<translation>Delete all configurations</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="299"/>
<location filename="hg_settingdialog.cpp" line="316"/>
<source>confgiuration information:</source>
<translation>Configuration information:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="315"/>
<location filename="hg_settingdialog.cpp" line="332"/>
<source>about...</source>
<translation>About...</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="317"/>
<location filename="hg_settingdialog.cpp" line="334"/>
<source>scan</source>
<translation>Scan</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="319"/>
<location filename="hg_settingdialog.cpp" line="1675"/>
<location filename="hg_settingdialog.cpp" line="336"/>
<location filename="hg_settingdialog.cpp" line="1696"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="321"/>
<location filename="hg_settingdialog.cpp" line="338"/>
<source>cancel</source>
<translation>Cancel</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="350"/>
<location filename="hg_settingdialog.cpp" line="367"/>
<source>configuration scheme management</source>
<translation>Configuration plan management</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="396"/>
<location filename="hg_settingdialog.cpp" line="413"/>
<source>regional crop</source>
<translation>Regional crop</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="415"/>
<location filename="hg_settingdialog.cpp" line="432"/>
<source>custom tone curve</source>
<translation>Custom tone curve</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1466"/>
<location filename="hg_settingdialog.cpp" line="1483"/>
<source>about </source>
<translation>About </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1471"/>
<location filename="hg_settingdialog.cpp" line="1479"/>
<location filename="hg_settingdialog.cpp" line="1487"/>
<location filename="hg_settingdialog.cpp" line="1495"/>
<location filename="hg_settingdialog.cpp" line="1488"/>
<location filename="hg_settingdialog.cpp" line="1496"/>
<location filename="hg_settingdialog.cpp" line="1504"/>
<location filename="hg_settingdialog.cpp" line="1517"/>
<location filename="hg_settingdialog.cpp" line="1512"/>
<location filename="hg_settingdialog.cpp" line="1521"/>
<location filename="hg_settingdialog.cpp" line="1534"/>
<source>Not supported</source>
<translation>Not supported</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1474"/>
<location filename="hg_settingdialog.cpp" line="1491"/>
<source>&lt;p&gt;Device model: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Device model: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1482"/>
<location filename="hg_settingdialog.cpp" line="1499"/>
<source>&lt;p&gt;Driver version: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Driver version: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1490"/>
<location filename="hg_settingdialog.cpp" line="1507"/>
<source>&lt;p&gt;Firmware number: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Firmware number: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1498"/>
<location filename="hg_settingdialog.cpp" line="1515"/>
<source>&lt;p&gt;Serial number: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Serial number: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1506"/>
<location filename="hg_settingdialog.cpp" line="1511"/>
<location filename="hg_settingdialog.cpp" line="1519"/>
<location filename="hg_settingdialog.cpp" line="1523"/>
<location filename="hg_settingdialog.cpp" line="1528"/>
<location filename="hg_settingdialog.cpp" line="1536"/>
<source>&lt;p&gt;Roller count: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Roller count: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1524"/>
<location filename="hg_settingdialog.cpp" line="1541"/>
<source>&lt;p&gt;History count: %1&lt;/p&gt;</source>
<translation>&lt;p&gt;History count: %1&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1626"/>
<location filename="hg_settingdialog.cpp" line="1647"/>
<source>Please select to overwrite the original configuration:</source>
<translation>Please select overwrite original configuration:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1628"/>
<location filename="hg_settingdialog.cpp" line="1649"/>
<source>,or add a new configuration</source>
<translation>, or add new configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1631"/>
<location filename="hg_settingdialog.cpp" line="1652"/>
<source>save the configuration</source>
<translation>Save configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1636"/>
<location filename="hg_settingdialog.cpp" line="1657"/>
<source>cover original configuration:</source>
<translation>Overwrite original configuration:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1640"/>
<location filename="hg_settingdialog.cpp" line="1661"/>
<source>add new configuration</source>
<translation>Add new configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1644"/>
<location filename="hg_settingdialog.cpp" line="1665"/>
<source>rename:</source>
<translation>Rename:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1686"/>
<location filename="hg_settingdialog.cpp" line="1700"/>
<location filename="hg_settingdialog.cpp" line="1975"/>
<location filename="hg_settingdialog.cpp" line="1707"/>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<source>tips</source>
<translation>Prompt</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1686"/>
<location filename="hg_settingdialog.cpp" line="1707"/>
<source>scheme name cannot be empty</source>
<translation>Configuration name cannot be blank</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1700"/>
<location filename="hg_settingdialog.cpp" line="1975"/>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<source>scheme name: </source>
<translation>Configuration name: </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1700"/>
<location filename="hg_settingdialog.cpp" line="1975"/>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<source> already exists</source>
<translation> already exists</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1937"/>
<location filename="hg_settingdialog.cpp" line="1960"/>
<source>&lt;h6&gt;&lt;b&gt;</source>
<translation>&lt;h6&gt;&lt;b&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1937"/>
<location filename="hg_settingdialog.cpp" line="1960"/>
<source>:&lt;/b&gt;&lt;/h6&gt;</source>
<translation>:&lt;/b&gt;&lt;/h6&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1938"/>
<location filename="hg_settingdialog.cpp" line="1961"/>
<source>&lt;p&gt; </source>
<translation>&lt;p&gt; </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1938"/>
<location filename="hg_settingdialog.cpp" line="1961"/>
<source>&lt;/p&gt;</source>
<translation>&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1964"/>
<location filename="hg_settingdialog.cpp" line="1987"/>
<source>configuration scheme name change</source>
<translation>Rename configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2018"/>
<location filename="hg_settingdialog.cpp" line="2040"/>
<location filename="hg_settingdialog.cpp" line="2041"/>
<location filename="hg_settingdialog.cpp" line="2063"/>
<source>be sure to delete the configuration</source>
<translation>Delete configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2019"/>
<location filename="hg_settingdialog.cpp" line="2042"/>
<source>Are you sure you want to delete the configuration &quot;</source>
<translation>Are you sure you want to delete configuration </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2019"/>
<location filename="hg_settingdialog.cpp" line="2042"/>
<source>&quot; ?</source>
<translation>?</translation>
</message>
@ -2669,7 +2694,7 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
<translation type="vanished">No</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2041"/>
<location filename="hg_settingdialog.cpp" line="2064"/>
<source>Are you sure you want to delete the configuration?</source>
<translation>Are you sure you want to delete all configurations?</translation>
</message>

53
modules/twainui/dialog_progress_ui.cpp
View File

@ -8,6 +8,9 @@
Dialog_progress_ui *Dialog_progress_ui::m_param = nullptr;
static int imageRecivedCount = 0;
static int imageUploadedCount = 0;
Dialog_progress_ui::Dialog_progress_ui(std::function<void (ui_result)> callback, std::function<void (int, void *, int)> *notify, QWidget *parent) :
QDialog(parent),
ui(new Ui::Dialog_progress_ui)
@ -17,11 +20,21 @@ Dialog_progress_ui::Dialog_progress_ui(std::function<void (ui_result)> callback,
ui->setupUi(this);
setWindowFlags(Qt::SubWindow | Qt::Popup);
setWindowFlags(Qt::SubWindow | Qt::Popup | Qt::WindowStaysOnTopHint);
ui->pbtn_cancelScan->setVisible(false);
ui->pbtn_close->setVisible(false);
ui->label_imgRecived->setVisible(false);
ui->lineEdit_imgRecived->setVisible(false);
ui->label_totalImgRecived->setVisible(false);
ui->lineEdit_imgRecived->setText(QString::number(imageRecivedCount));
ui->label_imgUploaded->setVisible(false);
ui->lineEdit_imgUploaded->setVisible(false);
ui->label_totalImgUploaded->setVisible(false);
ui->lineEdit_imgUploaded->setText(QString::number(imageUploadedCount));
m_callback = callback;
*notify = FuncNotify;
@ -31,12 +44,17 @@ Dialog_progress_ui::Dialog_progress_ui(std::function<void (ui_result)> callback,
connect(this, SIGNAL(scan_status(QString,bool)), this, SLOT(on_scan_status(QString,bool)), Qt::QueuedConnection);
connect(this, SIGNAL(scan_finish(int, QString)), this, SLOT(on_scan_finish(int, QString)), Qt::QueuedConnection);
connect(this, SIGNAL(image_uploaded()), this, SLOT(on_image_uploaded()), Qt::QueuedConnection);
connect(this, SIGNAL(image_recived()), this, SLOT(on_image_recived()), Qt::QueuedConnection);
}
Dialog_progress_ui::~Dialog_progress_ui()
{
m_param = nullptr;
imageRecivedCount = 0;
imageUploadedCount = 0;
delete ui;
}
@ -69,6 +87,12 @@ void Dialog_progress_ui::on_pbtn_close_clicked()
void Dialog_progress_ui::on_scan_status(QString finishInfo, bool isScanning)
{
m_isScanning = isScanning;
ui->label_imgRecived->setVisible(isScanning);
ui->lineEdit_imgRecived->setVisible(isScanning);
ui->label_imgUploaded->setVisible(isScanning);
ui->lineEdit_imgUploaded->setVisible(isScanning);
ui->label->setText(finishInfo);
ui->pbtn_cancelScan->setVisible(isScanning);
ui->pbtn_close->setVisible(!isScanning);
@ -77,6 +101,10 @@ void Dialog_progress_ui::on_scan_status(QString finishInfo, bool isScanning)
void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
{
on_scan_status(finishInfo, false);
ui->label_totalImgUploaded->setVisible(true);
ui->label_totalImgUploaded->setText(tr("Total scanned images: %1").arg(QString::number(imageRecivedCount)));
if (SCANNER_ERR_OK == flag || SCANNER_ERR_USER_CANCELED == flag)
{
m_timer->start(2000);
@ -84,6 +112,16 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
}
}
void Dialog_progress_ui::on_image_recived()
{
ui->lineEdit_imgRecived->setText(QString::number(imageRecivedCount++));
}
void Dialog_progress_ui::on_image_uploaded()
{
ui->lineEdit_imgUploaded->setText(QString::number(imageUploadedCount++));
}
void Dialog_progress_ui::FuncNotify(int event, void *msg, int flag)
{
Dialog_progress_ui *p = (Dialog_progress_ui *)m_param;
@ -105,7 +143,18 @@ void Dialog_progress_ui::FuncNotify(int event, void *msg, int flag)
{
QString finishInfo((char*)msg);
emit p->scan_finish(flag, finishInfo);
// emit p->scan_status(finishInfo, false);
}
break;
case SANE_EVENT_IMAGE_OK:
{
emit p->image_recived();
}
break;
case SANE_EVENT_IMG_UPLOADED:
{
emit p->image_uploaded();
}
break;
}

4
modules/twainui/dialog_progress_ui.h
View File

@ -24,6 +24,8 @@ private:
signals:
void scan_status(QString finishInfo, bool isScanning);
void scan_finish(int flag, QString finishInfo);
void image_recived();
void image_uploaded();
private slots:
void on_pbtn_cancelScan_clicked();
@ -31,6 +33,8 @@ private slots:
void on_scan_status(QString finishInfo, bool isScanning);
void on_scan_finish(int flag, QString finishInfo);
void on_image_recived();
void on_image_uploaded();
public:
static void FuncNotify(int event, void *msg, int flag);

164
modules/twainui/dialog_progress_ui.ui
View File

@ -6,10 +6,16 @@
<rect>
<x>0</x>
<y>0</y>
<width>324</width>
<width>353</width>
<height>156</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>324</width>
@ -18,8 +24,8 @@
</property>
<property name="maximumSize">
<size>
<width>324</width>
<height>156</height>
<width>99999</width>
<height>999999</height>
</size>
</property>
<property name="windowTitle">
@ -63,6 +69,158 @@
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>14</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_6">
<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_imgRecived">
<property name="text">
<string>image recived:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_imgRecived">
<property name="minimumSize">
<size>
<width>61</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>61</width>
<height>20</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_totalImgRecived">
<property name="text">
<string>total image recived:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<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_4">
<item>
<spacer name="horizontalSpacer_7">
<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_imgUploaded">
<property name="text">
<string>image uploaded:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_imgUploaded">
<property name="minimumSize">
<size>
<width>61</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>61</width>
<height>20</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_totalImgUploaded">
<property name="text">
<string>total image uploaded:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_8">
<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_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>11</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>

2
modules/twainui/hg_settingdialog.cpp
View File

@ -108,7 +108,7 @@ hg_settingdialog::hg_settingdialog(SANE_Handle handle, const SANEAPI* saneApi, b
initUi();
on_current_scheme_changed();
getAppVersion();
//getAppVersion();
}
hg_settingdialog::~hg_settingdialog()

6
modules/twainui/twainui.cpp
View File

@ -94,14 +94,16 @@ char *apply_current_config(const char *dev_name, SANE_Handle device, LPSANEAPI a
std::string name = curScheme->get_scheme_name();
char *str = const_cast<char*>(name.c_str());
return str;
char *buf2 = new char[strlen(str) + 4];
memcpy(buf2, str, sizeof(str));
return buf2;
}
void twain_ui_free(void *buf)
{
if (buf != nullptr)
{
delete buf;
delete[] buf;
buf = nullptr;
}
}