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-31 15:31:04 +08:00
parent 7374fcc4a5
commit d232bd130a
8 changed files with 287 additions and 213 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.

160
modules/twainui/TwainUI_zh_CN.ts
View File

@ -1001,12 +1001,14 @@ Page range will be &apos;Chosen Pages&apos;.</source>
<translation type="vanished">配置改名</translation>
</message>
<message>
<location filename="dialog_input.cpp" line="50"/>
<source>tips</source>
<translation type="vanished">提示</translation>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_input.cpp" line="50"/>
<source>The content can not be empty</source>
<translation type="vanished">内容不能为空</translation>
<translation>内容不能为空</translation>
</message>
<message>
<source>new name can not be empty</source>
@ -1518,22 +1520,22 @@ Please make sure the two passwords are the same.</source>
<translation>扫描状态</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="103"/>
<location filename="dialog_progress_ui.ui" line="166"/>
<source>image recived:</source>
<translation>接收图片:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="129"/>
<location filename="dialog_progress_ui.ui" line="192"/>
<source>total image recived:</source>
<translation>总计图片接收数:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="166"/>
<location filename="dialog_progress_ui.ui" line="103"/>
<source>image uploaded:</source>
<translation>上传图片:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="192"/>
<location filename="dialog_progress_ui.ui" line="129"/>
<source>total image uploaded:</source>
<translation>总计图片上传数：</translation>
</message>
@ -1554,12 +1556,12 @@ Please make sure the two passwords are the same.</source>
<translation>开始扫描...</translation>
</message>
<message>
<location filename="dialog_progress_ui.cpp" line="67"/>
<location filename="dialog_progress_ui.cpp" line="75"/>
<source>stop scanning</source>
<translation>停止扫描...</translation>
</message>
<message>
<location filename="dialog_progress_ui.cpp" line="109"/>
<location filename="dialog_progress_ui.cpp" line="117"/>
<source>Total scanned images: %1</source>
<translation>总计图片扫描数:%1</translation>
</message>
@ -2653,7 +2655,7 @@ Are you sure to close?</source>
<context>
<name>Manager</name>
<message>
<location filename="Manager.cpp" line="292"/>
<location filename="Manager.cpp" line="295"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
@ -2829,133 +2831,139 @@ Are you sure to close?</source>
<translation type="vanished">删除配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="277"/>
<location filename="hg_settingdialog.cpp" line="278"/>
<source>existing configuration scheme</source>
<translation>现有配置方案：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="282"/>
<source>change name</source>
<translation>改名</translation>
<translation type="vanished">改名</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="289"/>
<source>delete</source>
<translation>删除</translation>
<translation type="vanished">删除</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="296"/>
<source>apply</source>
<translation>应用</translation>
<translation type="vanished">应用</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="307"/>
<source>delete all configurations</source>
<translation>删除所有配置</translation>
<translation type="vanished">删除所有配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="316"/>
<location filename="hg_settingdialog.cpp" line="311"/>
<source>confgiuration information:</source>
<translation>配置信息：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="332"/>
<location filename="hg_settingdialog.cpp" line="327"/>
<source>about...</source>
<translation>关于...</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="334"/>
<location filename="hg_settingdialog.cpp" line="329"/>
<source>scan</source>
<translation>扫描</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="336"/>
<location filename="hg_settingdialog.cpp" line="1696"/>
<location filename="hg_settingdialog.cpp" line="331"/>
<location filename="hg_settingdialog.cpp" line="1690"/>
<source>ok</source>
<translation>确定</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="338"/>
<location filename="hg_settingdialog.cpp" line="333"/>
<source>cancel</source>
<translation>取消</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="367"/>
<location filename="hg_settingdialog.cpp" line="362"/>
<source>configuration scheme management</source>
<translation>配置方案管理</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="413"/>
<location filename="hg_settingdialog.cpp" line="408"/>
<source>regional crop</source>
<translation>区域裁剪</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="432"/>
<location filename="hg_settingdialog.cpp" line="427"/>
<source>custom tone curve</source>
<translation>自定义色调曲线</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1483"/>
<location filename="hg_settingdialog.cpp" line="1477"/>
<source>about </source>
<translation>关于 </translation>
</message>
<message>
<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="1512"/>
<location filename="hg_settingdialog.cpp" line="1521"/>
<location filename="hg_settingdialog.cpp" line="1534"/>
<location filename="hg_settingdialog.cpp" line="1482"/>
<location filename="hg_settingdialog.cpp" line="1490"/>
<location filename="hg_settingdialog.cpp" line="1498"/>
<location filename="hg_settingdialog.cpp" line="1506"/>
<location filename="hg_settingdialog.cpp" line="1515"/>
<location filename="hg_settingdialog.cpp" line="1528"/>
<source>Not supported</source>
<translation>不支持</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1491"/>
<location filename="hg_settingdialog.cpp" line="1485"/>
<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="1499"/>
<location filename="hg_settingdialog.cpp" line="1493"/>
<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="1507"/>
<location filename="hg_settingdialog.cpp" line="1501"/>
<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="1515"/>
<location filename="hg_settingdialog.cpp" line="1509"/>
<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="1523"/>
<location filename="hg_settingdialog.cpp" line="1528"/>
<location filename="hg_settingdialog.cpp" line="1536"/>
<location filename="hg_settingdialog.cpp" line="1517"/>
<location filename="hg_settingdialog.cpp" line="1522"/>
<location filename="hg_settingdialog.cpp" line="1530"/>
<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="1541"/>
<location filename="hg_settingdialog.cpp" line="1535"/>
<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="1647"/>
<location filename="hg_settingdialog.cpp" line="1641"/>
<source>Please select to overwrite the original configuration:</source>
<translation>请选择覆盖原来的配置：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1649"/>
<location filename="hg_settingdialog.cpp" line="1643"/>
<source>,or add a new configuration</source>
<translation>，或者新增配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1652"/>
<location filename="hg_settingdialog.cpp" line="1646"/>
<source>save the configuration</source>
<translation>保存配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1991"/>
<source>Add new scheme</source>
<translation>新增配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1999"/>
<source>The configuration scheme already exists</source>
<translation>配置方案已存在</translation>
</message>
<message>
<source>The Settings you just set are in the original configuration &quot;</source>
<oldsource>The Settings you just set are in the original configuration “</oldsource>
@ -2986,82 +2994,100 @@ No: add new configuration</oldsource>
<translation type="vanished">否</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1960"/>
<location filename="hg_settingdialog.cpp" line="1964"/>
<source>&lt;h6&gt;&lt;b&gt;</source>
<translation>&lt;h6&gt;&lt;b&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1657"/>
<location filename="hg_settingdialog.cpp" line="1651"/>
<source>cover original configuration:</source>
<translation>覆盖原来配置：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1661"/>
<location filename="hg_settingdialog.cpp" line="260"/>
<location filename="hg_settingdialog.cpp" line="2059"/>
<source>Default scheme</source>
<translation>默认配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="285"/>
<source>Add new</source>
<translation>新增</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="293"/>
<source>Delete</source>
<translation>删除</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="302"/>
<source>Delete all</source>
<translation>全部删除</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1655"/>
<source>add new configuration</source>
<translation>新增配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1665"/>
<location filename="hg_settingdialog.cpp" line="1659"/>
<source>rename:</source>
<translation>更名：</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1707"/>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<location filename="hg_settingdialog.cpp" line="1701"/>
<location filename="hg_settingdialog.cpp" line="1715"/>
<location filename="hg_settingdialog.cpp" line="1999"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1707"/>
<location filename="hg_settingdialog.cpp" line="1701"/>
<source>scheme name cannot be empty</source>
<translation>配置名不能为空</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<location filename="hg_settingdialog.cpp" line="1715"/>
<source>scheme name: </source>
<translation>配置名： </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<location filename="hg_settingdialog.cpp" line="1715"/>
<source> already exists</source>
<translation> 已存在</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1960"/>
<location filename="hg_settingdialog.cpp" line="1964"/>
<source>:&lt;/b&gt;&lt;/h6&gt;</source>
<translation>:&lt;/b&gt;&lt;/h6&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1961"/>
<location filename="hg_settingdialog.cpp" line="1965"/>
<source>&lt;p&gt; </source>
<translation>&lt;p&gt; </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1961"/>
<location filename="hg_settingdialog.cpp" line="1965"/>
<source>&lt;/p&gt;</source>
<translation>&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1987"/>
<source>configuration scheme name change</source>
<translation>配置改名</translation>
<translation type="vanished">配置改名</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2041"/>
<location filename="hg_settingdialog.cpp" line="2063"/>
<location filename="hg_settingdialog.cpp" line="2028"/>
<location filename="hg_settingdialog.cpp" line="2050"/>
<source>be sure to delete the configuration</source>
<translation>确认删除配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2042"/>
<location filename="hg_settingdialog.cpp" line="2029"/>
<source>Are you sure you want to delete the configuration &quot;</source>
<translation>您确认要删除配置</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2042"/>
<location filename="hg_settingdialog.cpp" line="2029"/>
<source>&quot; ?</source>
<translation>？</translation>
</message>
@ -3074,7 +3100,7 @@ No: add new configuration</oldsource>
<translation type="vanished">’ 吗？</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2064"/>
<location filename="hg_settingdialog.cpp" line="2051"/>
<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.

168
modules/twainui/TwainUI_zh_EN.ts
View File

@ -902,12 +902,14 @@ The page range will be “selected pages”</translation>
<translation type="vanished">Rename configuration</translation>
</message>
<message>
<location filename="dialog_input.cpp" line="50"/>
<source>tips</source>
<translation type="vanished">Prompt</translation>
<translation>Prompt</translation>
</message>
<message>
<location filename="dialog_input.cpp" line="50"/>
<source>The content can not be empty</source>
<translation type="vanished">The content can not be empty</translation>
<translation>The content can not be empty</translation>
</message>
</context>
<context>
@ -1395,22 +1397,22 @@ Please make sure the two passwords are the same.</source>
<translation>Scan status</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="103"/>
<location filename="dialog_progress_ui.ui" line="166"/>
<source>image recived:</source>
<translation>Image recived:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="129"/>
<location filename="dialog_progress_ui.ui" line="192"/>
<source>total image recived:</source>
<translation>Total image recived:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="166"/>
<location filename="dialog_progress_ui.ui" line="103"/>
<source>image uploaded:</source>
<translation>Image uploaded:</translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="192"/>
<location filename="dialog_progress_ui.ui" line="129"/>
<source>total image uploaded:</source>
<translation>Total image uploaded:</translation>
</message>
@ -1431,12 +1433,12 @@ Please make sure the two passwords are the same.</source>
<translation>Start scanning...</translation>
</message>
<message>
<location filename="dialog_progress_ui.cpp" line="67"/>
<location filename="dialog_progress_ui.cpp" line="75"/>
<source>stop scanning</source>
<translation>Stop scanning...</translation>
</message>
<message>
<location filename="dialog_progress_ui.cpp" line="109"/>
<location filename="dialog_progress_ui.cpp" line="117"/>
<source>Total scanned images: %1</source>
<translation>Total scanned images: %1</translation>
</message>
@ -2357,7 +2359,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="292"/>
<location filename="Manager.cpp" line="295"/>
<source>Prompt</source>
<translation>Prompt</translation>
</message>
@ -2488,210 +2490,234 @@ 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="277"/>
<location filename="hg_settingdialog.cpp" line="278"/>
<source>existing configuration scheme</source>
<translation>Existing configuration plan:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="282"/>
<source>change name</source>
<translation>Rename</translation>
<translation type="vanished">Rename</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="289"/>
<source>delete</source>
<translation type="vanished">Delete</translation>
</message>
<message>
<source>apply</source>
<translation type="vanished">Apply</translation>
</message>
<message>
<source>delete all configurations</source>
<translation type="vanished">Delete all configurations</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="260"/>
<location filename="hg_settingdialog.cpp" line="2059"/>
<source>Default scheme</source>
<translation>Default scheme</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="285"/>
<source>Add new</source>
<translation>Add new</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="293"/>
<source>Delete</source>
<translation>Delete</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="296"/>
<source>apply</source>
<translation>Apply</translation>
<location filename="hg_settingdialog.cpp" line="302"/>
<source>Delete all</source>
<translation>Delete all</translation>
</message>
<message>
<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="316"/>
<location filename="hg_settingdialog.cpp" line="311"/>
<source>confgiuration information:</source>
<translation>Configuration information:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="332"/>
<location filename="hg_settingdialog.cpp" line="327"/>
<source>about...</source>
<translation>About...</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="334"/>
<location filename="hg_settingdialog.cpp" line="329"/>
<source>scan</source>
<translation>Scan</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="336"/>
<location filename="hg_settingdialog.cpp" line="1696"/>
<location filename="hg_settingdialog.cpp" line="331"/>
<location filename="hg_settingdialog.cpp" line="1690"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="338"/>
<location filename="hg_settingdialog.cpp" line="333"/>
<source>cancel</source>
<translation>Cancel</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="367"/>
<location filename="hg_settingdialog.cpp" line="362"/>
<source>configuration scheme management</source>
<translation>Configuration plan management</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="413"/>
<location filename="hg_settingdialog.cpp" line="408"/>
<source>regional crop</source>
<translation>Regional crop</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="432"/>
<location filename="hg_settingdialog.cpp" line="427"/>
<source>custom tone curve</source>
<translation>Custom tone curve</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1483"/>
<location filename="hg_settingdialog.cpp" line="1477"/>
<source>about </source>
<translation>About </translation>
</message>
<message>
<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="1512"/>
<location filename="hg_settingdialog.cpp" line="1521"/>
<location filename="hg_settingdialog.cpp" line="1534"/>
<location filename="hg_settingdialog.cpp" line="1482"/>
<location filename="hg_settingdialog.cpp" line="1490"/>
<location filename="hg_settingdialog.cpp" line="1498"/>
<location filename="hg_settingdialog.cpp" line="1506"/>
<location filename="hg_settingdialog.cpp" line="1515"/>
<location filename="hg_settingdialog.cpp" line="1528"/>
<source>Not supported</source>
<translation>Not supported</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1491"/>
<location filename="hg_settingdialog.cpp" line="1485"/>
<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="1499"/>
<location filename="hg_settingdialog.cpp" line="1493"/>
<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="1507"/>
<location filename="hg_settingdialog.cpp" line="1501"/>
<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="1515"/>
<location filename="hg_settingdialog.cpp" line="1509"/>
<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="1523"/>
<location filename="hg_settingdialog.cpp" line="1528"/>
<location filename="hg_settingdialog.cpp" line="1536"/>
<location filename="hg_settingdialog.cpp" line="1517"/>
<location filename="hg_settingdialog.cpp" line="1522"/>
<location filename="hg_settingdialog.cpp" line="1530"/>
<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="1541"/>
<location filename="hg_settingdialog.cpp" line="1535"/>
<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="1647"/>
<location filename="hg_settingdialog.cpp" line="1641"/>
<source>Please select to overwrite the original configuration:</source>
<translation>Please select overwrite original configuration:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1649"/>
<location filename="hg_settingdialog.cpp" line="1643"/>
<source>,or add a new configuration</source>
<translation>, or add new configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1652"/>
<location filename="hg_settingdialog.cpp" line="1646"/>
<source>save the configuration</source>
<translation>Save configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1657"/>
<location filename="hg_settingdialog.cpp" line="1651"/>
<source>cover original configuration:</source>
<translation>Overwrite original configuration:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1661"/>
<location filename="hg_settingdialog.cpp" line="1655"/>
<source>add new configuration</source>
<translation>Add new configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1665"/>
<location filename="hg_settingdialog.cpp" line="1659"/>
<source>rename:</source>
<translation>Rename:</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1707"/>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<location filename="hg_settingdialog.cpp" line="1701"/>
<location filename="hg_settingdialog.cpp" line="1715"/>
<location filename="hg_settingdialog.cpp" line="1999"/>
<source>tips</source>
<translation>Prompt</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1707"/>
<location filename="hg_settingdialog.cpp" line="1701"/>
<source>scheme name cannot be empty</source>
<translation>Configuration name cannot be blank</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<location filename="hg_settingdialog.cpp" line="1715"/>
<source>scheme name: </source>
<translation>Configuration name: </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1721"/>
<location filename="hg_settingdialog.cpp" line="1998"/>
<location filename="hg_settingdialog.cpp" line="1715"/>
<source> already exists</source>
<translation> already exists</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1960"/>
<location filename="hg_settingdialog.cpp" line="1964"/>
<source>&lt;h6&gt;&lt;b&gt;</source>
<translation>&lt;h6&gt;&lt;b&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1960"/>
<location filename="hg_settingdialog.cpp" line="1964"/>
<source>:&lt;/b&gt;&lt;/h6&gt;</source>
<translation>:&lt;/b&gt;&lt;/h6&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1961"/>
<location filename="hg_settingdialog.cpp" line="1965"/>
<source>&lt;p&gt; </source>
<translation>&lt;p&gt; </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1961"/>
<location filename="hg_settingdialog.cpp" line="1965"/>
<source>&lt;/p&gt;</source>
<translation>&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1987"/>
<source>configuration scheme name change</source>
<translation>Rename configuration</translation>
<location filename="hg_settingdialog.cpp" line="1991"/>
<source>Add new scheme</source>
<translation>Add new scheme</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2041"/>
<location filename="hg_settingdialog.cpp" line="2063"/>
<location filename="hg_settingdialog.cpp" line="1999"/>
<source>The configuration scheme already exists</source>
<translation>The configuration scheme already exists</translation>
</message>
<message>
<source>configuration scheme name change</source>
<translation type="vanished">Rename configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2028"/>
<location filename="hg_settingdialog.cpp" line="2050"/>
<source>be sure to delete the configuration</source>
<translation>Delete configuration</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="2042"/>
<location filename="hg_settingdialog.cpp" line="2029"/>
<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="2042"/>
<location filename="hg_settingdialog.cpp" line="2029"/>
<source>&quot; ?</source>
<translation>?</translation>
</message>
@ -2704,7 +2730,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="2064"/>
<location filename="hg_settingdialog.cpp" line="2051"/>
<source>Are you sure you want to delete the configuration?</source>
<translation>Are you sure you want to delete all configurations?</translation>
</message>

36
modules/twainui/dialog_input.cpp
View File

@ -8,6 +8,7 @@ Dialog_Input::Dialog_Input(QWidget *parent) :
ui(new Ui::Dialog_Input)
{
ui->setupUi(this);
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
}
Dialog_Input::~Dialog_Input()
@ -34,23 +35,30 @@ void Dialog_Input::on_pushButton_clicked()
}
str.erase(pos + 1);
if(str.empty())
// if(str.empty())
// {
// QString title(QString::fromStdString("\351\224\231\350\257\257")),
// text(QString::fromStdString("\350\276\223\345\205\245\351\235\236\346\263\225"));
// QMessageBox::warning(this, title, text);
// return;
// }
if (ui->lineEdit->text().isEmpty())
{
QString title(QString::fromStdString("\351\224\231\350\257\257")),
text(QString::fromStdString("\350\276\223\345\205\245\351\235\236\346\263\225"));
QMessageBox::warning(this, title, text);
QMessageBox msg(QMessageBox::Information, tr("tips"), tr("The content can not be empty"), QMessageBox::Ok, this);
msg.exec();
return;
}
val_ = QString::fromStdString(str);
done(1);
accept();
}
void Dialog_Input::on_pushButton_2_clicked()
{
done(0);
reject();
}
void Dialog_Input::init_value(const QString& str)
@ -63,3 +71,15 @@ QString Dialog_Input::get_inputting_value(void)
{
return val_;
}
QString Dialog_Input::getText()
{
QString text = ui->lineEdit->text();
return text.toUtf8();
}
void Dialog_Input::setEditText(const QString& text)
{
ui->lineEdit->setText(text);
ui->lineEdit->selectAll();
}

2
modules/twainui/dialog_input.h
View File

@ -20,6 +20,8 @@ public:
public:
void init_value(const QString& str);
QString get_inputting_value(void);
QString getText();
void setEditText(const QString& text);
private slots:
void on_pushButton_clicked();

133
modules/twainui/hg_settingdialog.cpp
View File

@ -250,13 +250,14 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
{
QLabel *title = new QLabel(this);
bool enabled = false;
QHBoxLayout *hbox = new QHBoxLayout();
QHBoxLayout *hLayout = new QHBoxLayout();
int width = 180;
std::vector<std::string> schemes;
std::string cur_schm(cur_cfg_->get_current_scheme_name());
cur_cfg_->get_all_schemes(schemes);
comb_ = new QComboBox(this);
comb_->addItem(tr("Default scheme"));
layout->addSpacing(30);
for(int i = 1; i < (int)schemes.size(); ++i)
{
@ -269,7 +270,7 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
}
if(!enabled)
comb_->setCurrentIndex(-1);
comb_->setCurrentIndex(0);
title->setFixedWidth(width);
comb_->setFixedWidth(width);
@ -278,35 +279,29 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
layout->addWidget(title);
layout->addWidget(comb_);
rename_ = new QPushButton(this);
rename_->setText(tr("change name"));
rename_->setEnabled(enabled);
rename_->setFixedWidth(width/3);
hbox->addWidget(rename_);
connect(rename_, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
layout->addSpacing(10);
m_pbtn_addNew = new QPushButton(this);
m_pbtn_addNew->setText(tr("Add new"));
m_pbtn_addNew->setFixedWidth(width / 2);
layout->addWidget(m_pbtn_addNew);
connect(m_pbtn_addNew, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
layout->addSpacing(10);
del_this_ = new QPushButton(this);
del_this_->setText(tr("delete"));
del_this_->setText(tr("Delete"));
del_this_->setEnabled(enabled);
del_this_->setFixedWidth(width / 3);
hbox->addWidget(del_this_);
del_this_->setFixedWidth(width / 2);
layout->addWidget(del_this_);
connect(del_this_, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
apply_ = new QPushButton(this);
apply_->setText(tr("apply"));
apply_->setEnabled(enabled);
apply_->setFixedWidth(width / 3);
hbox->addWidget(apply_);
connect(apply_, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
hbox->setSizeConstraint(QLayout::SetFixedSize);
layout->addLayout(hbox);
layout->addSpacing(10);
del_all_ = new QPushButton(this);
del_all_->setText(tr("delete all configurations"));
del_all_->setText(tr("Delete all"));
del_all_->setEnabled(enabled);
del_all_->setFixedWidth(width);
del_all_->setFixedWidth(width / 2);
layout->addWidget(del_all_);
connect(del_all_, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
@ -1818,7 +1813,7 @@ void hg_settingdialog::save_scheme(void)
return;
}
else
add = createMsgBoxUi(add, name);
add = false;
}
}
if(add)
@ -1848,10 +1843,7 @@ void hg_settingdialog::save_scheme(void)
sprintf(append, "-%d", ++ind);
}
}
while(!cur_cfg_->add_scheme(cur_scheme_, (name + append).c_str()))
{
sprintf(append, "-%d", ++ind);
}
cur_cfg_->add_scheme(cur_scheme_, (name + append).c_str());
}
else
{
@ -1906,6 +1898,35 @@ std::string sane_val_to_string(const char* val, SANE_Value_Type type)
}
void hg_settingdialog::on_current_scheme_changed()
{
del_this_->setEnabled(true);
del_all_->setEnabled(false);
if (comb_->currentIndex() == 0)
{
del_this_->setEnabled(false);
}
if (comb_->count() > 1)
{
del_all_->setEnabled(true);
}
QString text(find_current_scheme_menu());
gb::sane_config_schm *cur = nullptr;
cur_cfg_->select_scheme(text.toStdString().c_str());
cur = cur_cfg_->get_scheme();
if(!cur)
cur = new gb::sane_config_schm();
cur->copy_default_value(cur_scheme_);
cur_scheme_->end_setting(true);
cur_scheme_->release();
cur_scheme_ = cur;
cur_scheme_->begin_setting();
apply_current_scheme();
updateUIStatus();
changed_count_++;
QString scheme(comb_->currentText());
bool enabled = false;
gb::sane_config_schm *schm = cur_cfg_->get_scheme(scheme.toStdString().c_str());
@ -1913,10 +1934,6 @@ void hg_settingdialog::on_current_scheme_changed()
if(schm)
enabled = true;
rename_->setEnabled(enabled);
apply_->setEnabled(enabled);
del_this_->setEnabled(enabled);
del_all_->setEnabled(enabled);
memset(&m_gammaData, 0, sizeof(m_gammaData));
for(int i = 0; i < sizeof(m_gammaData.table) / sizeof(m_gammaData.table[0]); ++i)
m_gammaData.table[i] = i & 0x0ff;
@ -1962,7 +1979,7 @@ void hg_settingdialog::slot_pushButton_scheme_management(void)
{
QPushButton* btn = qobject_cast<QPushButton*>(sender());
if(btn == rename_)
if(btn == m_pbtn_addNew)
{
int id = 0;
QString text(find_current_scheme_menu(&id));
@ -1970,53 +1987,36 @@ void hg_settingdialog::slot_pushButton_scheme_management(void)
{
Dialog_Input dlg;
dlg.init_value(text);
dlg.setWindowTitle(tr("configuration scheme name change"));
if(dlg.exec() && text != dlg.get_inputting_value())
dlg.setEditText(text);
dlg.setWindowTitle(tr("Add new scheme"));
if(dlg.exec())
{
std::vector<std::string> now;
std::string str = dlg.get_inputting_value().toStdString();
cur_cfg_->get_all_schemes(now);
for(auto& v: now)
QString newCfgName = dlg.getText();
for (int i = 0; i < comb_->count(); ++i)
{
if(v == str)
if (newCfgName == comb_->itemText(i))
{
QMessageBox::information(this, tr("tips"), tr("scheme name: ") + QString::fromStdString(str) + tr(" already exists"));
QMessageBox::information(this, tr("tips"), tr("The configuration scheme already exists"));
return;
}
}
disconnect(comb_, SIGNAL(currentTextChanged(const QString)), this, SLOT(on_current_scheme_changed()));
comb_->removeItem(id);
comb_->insertItem(id, QString::fromStdString(str));
comb_->setCurrentIndex(id);
comb_->insertItem(id, newCfgName);
connect(comb_, SIGNAL(currentTextChanged(const QString)), this, SLOT(on_current_scheme_changed()));
cur_cfg_->rename_scheme(text.toStdString().c_str(), str.c_str());
cur_cfg_->save();
changed_count_++;
}
}
}
else if(btn == apply_)
{
QString text(find_current_scheme_menu());
gb::sane_config_schm *cur = nullptr;
cur_cfg_->select_scheme(text.toStdString().c_str());
cur = cur_cfg_->get_scheme();
if(!cur)
cur = new gb::sane_config_schm();
cur->copy_default_value(cur_scheme_);
gb::sane_config_schm *scheme = cur_scheme_->copy();
cur_scheme_->end_setting(true);
cur_scheme_->release();
cur_scheme_ = cur;
cur_scheme_->begin_setting();
apply_current_scheme();
updateUIStatus();
cur_scheme_ = scheme;
cur_cfg_->add_scheme(cur_scheme_, newCfgName.toStdString().c_str());
cur_cfg_->select_scheme(cur_scheme_->get_scheme_name().c_str());
cur_cfg_->save();
comb_->setCurrentIndex(id);
changed_count_++;
}
}
}
else if(btn == del_this_)
{
int id = -1;
@ -2056,6 +2056,7 @@ void hg_settingdialog::slot_pushButton_scheme_management(void)
restore_2_default_settings();
updateUIStatus();
comb_->clear();
comb_->addItem(tr("Default scheme"));
changed_count_++;
cur_cfg_->remove_all_schemes();
cur_cfg_->save();

3
modules/twainui/hg_settingdialog.h
View File

@ -26,8 +26,7 @@ class hg_settingdialog : public QDialog
QMenu *top_menu_;
QLineEdit *edit_name_;
QPushButton *rename_;
QPushButton *apply_;
QPushButton *m_pbtn_addNew;
QPushButton *del_this_;
QPushButton *del_all_;
QLabel *custom_area_lable_;