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

tawinui回退应用配置功能实现

This commit is contained in:
yangjiaxuan 2023-04-25 16:42:55 +08:00
parent d7741330f3
commit 5ac7a75634
6 changed files with 88 additions and 82 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.

80
modules/twainui/TwainUI_zh_CN.ts
View File

@ -1519,6 +1519,12 @@ Please make sure the two passwords are the same.</source>
<source>Cancel Scan</source> <source>Cancel Scan</source>
<translation>取消扫描</translation> <translation>取消扫描</translation>
</message> </message>
<message>
<location filename="dialog_progress_ui.ui" line="79"/>
<source>Close</source>
<oldsource>close</oldsource>
<translation>关闭</translation>
</message>
</context> </context>
<context> <context>
<name>Dialog_updateProgress</name> <name>Dialog_updateProgress</name>
@ -2777,78 +2783,78 @@ Are you sure to close?</source>
<translation type="vanished">删除配置</translation> <translation type="vanished">删除配置</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="228"/> <location filename="hg_settingdialog.cpp" line="232"/>
<source>existing configuration scheme</source> <source>existing configuration scheme</source>
<translation>现有配置方案：</translation> <translation>现有配置方案：</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="233"/> <location filename="hg_settingdialog.cpp" line="237"/>
<source>change name</source> <source>change name</source>
<translation>改名</translation> <translation>改名</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="240"/> <location filename="hg_settingdialog.cpp" line="244"/>
<source>delete</source> <source>delete</source>
<translation>删除</translation> <translation>删除</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="247"/> <location filename="hg_settingdialog.cpp" line="251"/>
<source>apply</source> <source>apply</source>
<translation>应用</translation> <translation>应用</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="258"/> <location filename="hg_settingdialog.cpp" line="262"/>
<source>delete all configurations</source> <source>delete all configurations</source>
<translation>删除所有配置</translation> <translation>删除所有配置</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="267"/> <location filename="hg_settingdialog.cpp" line="271"/>
<source>confgiuration information:</source> <source>confgiuration information:</source>
<translation>配置信息：</translation> <translation>配置信息：</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="283"/> <location filename="hg_settingdialog.cpp" line="287"/>
<source>scan</source> <source>scan</source>
<translation>扫描</translation> <translation>扫描</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="285"/> <location filename="hg_settingdialog.cpp" line="289"/>
<location filename="hg_settingdialog.cpp" line="1602"/> <location filename="hg_settingdialog.cpp" line="1570"/>
<source>ok</source> <source>ok</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="287"/> <location filename="hg_settingdialog.cpp" line="291"/>
<source>cancel</source> <source>cancel</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="310"/> <location filename="hg_settingdialog.cpp" line="314"/>
<source>configuration scheme management</source> <source>configuration scheme management</source>
<translation>配置方案管理</translation> <translation>配置方案管理</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="356"/> <location filename="hg_settingdialog.cpp" line="360"/>
<source>regional crop</source> <source>regional crop</source>
<translation>区域裁剪</translation> <translation>区域裁剪</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="375"/> <location filename="hg_settingdialog.cpp" line="379"/>
<source>custom tone curve</source> <source>custom tone curve</source>
<translation>自定义色调曲线</translation> <translation>自定义色调曲线</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1553"/> <location filename="hg_settingdialog.cpp" line="1521"/>
<source>Please select to overwrite the original configuration:</source> <source>Please select to overwrite the original configuration:</source>
<translation>请选择覆盖原来的配置：</translation> <translation>请选择覆盖原来的配置：</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1555"/> <location filename="hg_settingdialog.cpp" line="1523"/>
<source>,or add a new configuration</source> <source>,or add a new configuration</source>
<translation>，或者新增配置</translation> <translation>，或者新增配置</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1558"/> <location filename="hg_settingdialog.cpp" line="1526"/>
<source>save the configuration</source> <source>save the configuration</source>
<translation>保存配置</translation> <translation>保存配置</translation>
</message> </message>
@ -2882,82 +2888,82 @@ No: add new configuration</oldsource>
<translation type="vanished">否</translation> <translation type="vanished">否</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1864"/> <location filename="hg_settingdialog.cpp" line="1832"/>
<source>&lt;h6&gt;&lt;b&gt;</source> <source>&lt;h6&gt;&lt;b&gt;</source>
<translation>&lt;h6&gt;&lt;b&gt;</translation> <translation>&lt;h6&gt;&lt;b&gt;</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1563"/> <location filename="hg_settingdialog.cpp" line="1531"/>
<source>cover original configuration:</source> <source>cover original configuration:</source>
<translation>覆盖原来配置：</translation> <translation>覆盖原来配置：</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1567"/> <location filename="hg_settingdialog.cpp" line="1535"/>
<source>add new configuration</source> <source>add new configuration</source>
<translation>新增配置</translation> <translation>新增配置</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1571"/> <location filename="hg_settingdialog.cpp" line="1539"/>
<source>rename:</source> <source>rename:</source>
<translation>更名：</translation> <translation>更名：</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1613"/> <location filename="hg_settingdialog.cpp" line="1581"/>
<location filename="hg_settingdialog.cpp" line="1627"/> <location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1902"/> <location filename="hg_settingdialog.cpp" line="1870"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1613"/> <location filename="hg_settingdialog.cpp" line="1581"/>
<source>scheme name cannot be empty</source> <source>scheme name cannot be empty</source>
<translation>配置名不能为空</translation> <translation>配置名不能为空</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1627"/> <location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1902"/> <location filename="hg_settingdialog.cpp" line="1870"/>
<source>scheme name: </source> <source>scheme name: </source>
<translation>配置名： </translation> <translation>配置名： </translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1627"/> <location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1902"/> <location filename="hg_settingdialog.cpp" line="1870"/>
<source> already exists</source> <source> already exists</source>
<translation> 已存在</translation> <translation> 已存在</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1864"/> <location filename="hg_settingdialog.cpp" line="1832"/>
<source>:&lt;/b&gt;&lt;/h6&gt;</source> <source>:&lt;/b&gt;&lt;/h6&gt;</source>
<translation>:&lt;/b&gt;&lt;/h6&gt;</translation> <translation>:&lt;/b&gt;&lt;/h6&gt;</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1865"/> <location filename="hg_settingdialog.cpp" line="1833"/>
<source>&lt;p&gt; </source> <source>&lt;p&gt; </source>
<translation>&lt;p&gt; </translation> <translation>&lt;p&gt; </translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1865"/> <location filename="hg_settingdialog.cpp" line="1833"/>
<source>&lt;/p&gt;</source> <source>&lt;/p&gt;</source>
<translation>&lt;/p&gt;</translation> <translation>&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1891"/> <location filename="hg_settingdialog.cpp" line="1859"/>
<source>configuration scheme name change</source> <source>configuration scheme name change</source>
<translation>配置改名</translation> <translation>配置改名</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1945"/> <location filename="hg_settingdialog.cpp" line="1913"/>
<location filename="hg_settingdialog.cpp" line="1967"/> <location filename="hg_settingdialog.cpp" line="1935"/>
<source>be sure to delete the configuration</source> <source>be sure to delete the configuration</source>
<translation>确认删除配置</translation> <translation>确认删除配置</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1946"/> <location filename="hg_settingdialog.cpp" line="1914"/>
<source>Are you sure you want to delete the configuration &quot;</source> <source>Are you sure you want to delete the configuration &quot;</source>
<translation>您确认要删除配置</translation> <translation>您确认要删除配置</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1946"/> <location filename="hg_settingdialog.cpp" line="1914"/>
<source>&quot; ?</source> <source>&quot; ?</source>
<translation>？</translation> <translation>？</translation>
</message> </message>
@ -2970,7 +2976,7 @@ No: add new configuration</oldsource>
<translation type="vanished">’ 吗？</translation> <translation type="vanished">’ 吗？</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1968"/> <location filename="hg_settingdialog.cpp" line="1936"/>
<source>Are you sure you want to delete the configuration?</source> <source>Are you sure you want to delete the configuration?</source>
<translation>您确认要删除所有配置吗？</translation> <translation>您确认要删除所有配置吗？</translation>
</message> </message>

BIN
modules/twainui/TwainUI_zh_EN.qm
View File

Binary file not shown.

80
modules/twainui/TwainUI_zh_EN.ts
View File

@ -1396,6 +1396,12 @@ Please make sure the two passwords are the same.</source>
<source>Cancel Scan</source> <source>Cancel Scan</source>
<translation>取消扫描</translation> <translation>取消扫描</translation>
</message> </message>
<message>
<location filename="dialog_progress_ui.ui" line="79"/>
<source>Close</source>
<oldsource>close</oldsource>
<translation>Close</translation>
</message>
</context> </context>
<context> <context>
<name>Dialog_updateProgress</name> <name>Dialog_updateProgress</name>
@ -2436,158 +2442,158 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
<context> <context>
<name>hg_settingdialog</name> <name>hg_settingdialog</name>
<message> <message>
<location filename="hg_settingdialog.cpp" line="228"/> <location filename="hg_settingdialog.cpp" line="232"/>
<source>existing configuration scheme</source> <source>existing configuration scheme</source>
<translation>Existing configuration plan:</translation> <translation>Existing configuration plan:</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="233"/> <location filename="hg_settingdialog.cpp" line="237"/>
<source>change name</source> <source>change name</source>
<translation>Rename</translation> <translation>Rename</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="240"/> <location filename="hg_settingdialog.cpp" line="244"/>
<source>delete</source> <source>delete</source>
<translation>Delete</translation> <translation>Delete</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="247"/> <location filename="hg_settingdialog.cpp" line="251"/>
<source>apply</source> <source>apply</source>
<translation>Apply</translation> <translation>Apply</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="258"/> <location filename="hg_settingdialog.cpp" line="262"/>
<source>delete all configurations</source> <source>delete all configurations</source>
<translation>Delete all configurations</translation> <translation>Delete all configurations</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="267"/> <location filename="hg_settingdialog.cpp" line="271"/>
<source>confgiuration information:</source> <source>confgiuration information:</source>
<translation>Configuration information:</translation> <translation>Configuration information:</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="283"/> <location filename="hg_settingdialog.cpp" line="287"/>
<source>scan</source> <source>scan</source>
<translation>Scan</translation> <translation>Scan</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="285"/> <location filename="hg_settingdialog.cpp" line="289"/>
<location filename="hg_settingdialog.cpp" line="1602"/> <location filename="hg_settingdialog.cpp" line="1570"/>
<source>ok</source> <source>ok</source>
<translation>OK</translation> <translation>OK</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="287"/> <location filename="hg_settingdialog.cpp" line="291"/>
<source>cancel</source> <source>cancel</source>
<translation>Cancel</translation> <translation>Cancel</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="310"/> <location filename="hg_settingdialog.cpp" line="314"/>
<source>configuration scheme management</source> <source>configuration scheme management</source>
<translation>Configuration plan management</translation> <translation>Configuration plan management</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="356"/> <location filename="hg_settingdialog.cpp" line="360"/>
<source>regional crop</source> <source>regional crop</source>
<translation>Regional crop</translation> <translation>Regional crop</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="375"/> <location filename="hg_settingdialog.cpp" line="379"/>
<source>custom tone curve</source> <source>custom tone curve</source>
<translation>Custom tone curve</translation> <translation>Custom tone curve</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1553"/> <location filename="hg_settingdialog.cpp" line="1521"/>
<source>Please select to overwrite the original configuration:</source> <source>Please select to overwrite the original configuration:</source>
<translation>Please select overwrite original configuration:</translation> <translation>Please select overwrite original configuration:</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1555"/> <location filename="hg_settingdialog.cpp" line="1523"/>
<source>,or add a new configuration</source> <source>,or add a new configuration</source>
<translation>, or add new configuration</translation> <translation>, or add new configuration</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1558"/> <location filename="hg_settingdialog.cpp" line="1526"/>
<source>save the configuration</source> <source>save the configuration</source>
<translation>Save configuration</translation> <translation>Save configuration</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1563"/> <location filename="hg_settingdialog.cpp" line="1531"/>
<source>cover original configuration:</source> <source>cover original configuration:</source>
<translation>Overwrite original configuration:</translation> <translation>Overwrite original configuration:</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1567"/> <location filename="hg_settingdialog.cpp" line="1535"/>
<source>add new configuration</source> <source>add new configuration</source>
<translation>Add new configuration</translation> <translation>Add new configuration</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1571"/> <location filename="hg_settingdialog.cpp" line="1539"/>
<source>rename:</source> <source>rename:</source>
<translation>Rename:</translation> <translation>Rename:</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1613"/> <location filename="hg_settingdialog.cpp" line="1581"/>
<location filename="hg_settingdialog.cpp" line="1627"/> <location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1902"/> <location filename="hg_settingdialog.cpp" line="1870"/>
<source>tips</source> <source>tips</source>
<translation>Prompt</translation> <translation>Prompt</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1613"/> <location filename="hg_settingdialog.cpp" line="1581"/>
<source>scheme name cannot be empty</source> <source>scheme name cannot be empty</source>
<translation>Configuration name cannot be blank</translation> <translation>Configuration name cannot be blank</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1627"/> <location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1902"/> <location filename="hg_settingdialog.cpp" line="1870"/>
<source>scheme name: </source> <source>scheme name: </source>
<translation>Configuration name: </translation> <translation>Configuration name: </translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1627"/> <location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1902"/> <location filename="hg_settingdialog.cpp" line="1870"/>
<source> already exists</source> <source> already exists</source>
<translation> already exists</translation> <translation> already exists</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1864"/> <location filename="hg_settingdialog.cpp" line="1832"/>
<source>&lt;h6&gt;&lt;b&gt;</source> <source>&lt;h6&gt;&lt;b&gt;</source>
<translation>&lt;h6&gt;&lt;b&gt;</translation> <translation>&lt;h6&gt;&lt;b&gt;</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1864"/> <location filename="hg_settingdialog.cpp" line="1832"/>
<source>:&lt;/b&gt;&lt;/h6&gt;</source> <source>:&lt;/b&gt;&lt;/h6&gt;</source>
<translation>:&lt;/b&gt;&lt;/h6&gt;</translation> <translation>:&lt;/b&gt;&lt;/h6&gt;</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1865"/> <location filename="hg_settingdialog.cpp" line="1833"/>
<source>&lt;p&gt; </source> <source>&lt;p&gt; </source>
<translation>&lt;p&gt; </translation> <translation>&lt;p&gt; </translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1865"/> <location filename="hg_settingdialog.cpp" line="1833"/>
<source>&lt;/p&gt;</source> <source>&lt;/p&gt;</source>
<translation>&lt;/p&gt;</translation> <translation>&lt;/p&gt;</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1891"/> <location filename="hg_settingdialog.cpp" line="1859"/>
<source>configuration scheme name change</source> <source>configuration scheme name change</source>
<translation>Rename configuration</translation> <translation>Rename configuration</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1945"/> <location filename="hg_settingdialog.cpp" line="1913"/>
<location filename="hg_settingdialog.cpp" line="1967"/> <location filename="hg_settingdialog.cpp" line="1935"/>
<source>be sure to delete the configuration</source> <source>be sure to delete the configuration</source>
<translation>Delete configuration</translation> <translation>Delete configuration</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1946"/> <location filename="hg_settingdialog.cpp" line="1914"/>
<source>Are you sure you want to delete the configuration &quot;</source> <source>Are you sure you want to delete the configuration &quot;</source>
<translation>Are you sure you want to delete configuration </translation> <translation>Are you sure you want to delete configuration </translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1946"/> <location filename="hg_settingdialog.cpp" line="1914"/>
<source>&quot; ?</source> <source>&quot; ?</source>
<translation>?</translation> <translation>?</translation>
</message> </message>
@ -2600,7 +2606,7 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
<translation type="vanished">No</translation> <translation type="vanished">No</translation>
</message> </message>
<message> <message>
<location filename="hg_settingdialog.cpp" line="1968"/> <location filename="hg_settingdialog.cpp" line="1936"/>
<source>Are you sure you want to delete the configuration?</source> <source>Are you sure you want to delete the configuration?</source>
<translation>Are you sure you want to delete all configurations?</translation> <translation>Are you sure you want to delete all configurations?</translation>
</message> </message>

2
modules/twainui/dialog_progress_ui.ui
View File

@ -76,7 +76,7 @@
<item> <item>
<widget class="QPushButton" name="pbtn_close"> <widget class="QPushButton" name="pbtn_close">
<property name="text"> <property name="text">
<string>close</string> <string>Close</string>
</property> </property>
</widget> </widget>
</item> </item>

8
modules/twainui/twainui.cpp
View File

@ -37,13 +37,7 @@ int choose_scanner(const std::vector<DEVQUEUI> &devs)
char *apply_current_config(const char *dev_name, SANE_Handle device, LPSANEAPI api) char *apply_current_config(const char *dev_name, SANE_Handle device, LPSANEAPI api)
{ {
hg_settingdialog dlg(device, api, false, dev_name, nullptr); return NULL;
gb::sane_config_schm *cfgScheme = dlg.getCurScheme();
dev_que::apply_scheme(api, device, cfgScheme);
std::string name = cfgScheme->get_scheme_name();
char *str = const_cast<char*>(name.c_str());
return str;
} }
void twain_ui_free(void *buf) void twain_ui_free(void *buf)