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

Binary file not shown.

View File

@ -1519,6 +1519,12 @@ Please make sure the two passwords are the same.</source>
<source>Cancel Scan</source>
<translation></translation>
</message>
<message>
<location filename="dialog_progress_ui.ui" line="79"/>
<source>Close</source>
<oldsource>close</oldsource>
<translation></translation>
</message>
</context>
<context>
<name>Dialog_updateProgress</name>
@ -2777,78 +2783,78 @@ Are you sure to close?</source>
<translation type="vanished"></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="228"/>
<location filename="hg_settingdialog.cpp" line="232"/>
<source>existing configuration scheme</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="233"/>
<location filename="hg_settingdialog.cpp" line="237"/>
<source>change name</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="240"/>
<location filename="hg_settingdialog.cpp" line="244"/>
<source>delete</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="247"/>
<location filename="hg_settingdialog.cpp" line="251"/>
<source>apply</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="258"/>
<location filename="hg_settingdialog.cpp" line="262"/>
<source>delete all configurations</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="267"/>
<location filename="hg_settingdialog.cpp" line="271"/>
<source>confgiuration information:</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="283"/>
<location filename="hg_settingdialog.cpp" line="287"/>
<source>scan</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="285"/>
<location filename="hg_settingdialog.cpp" line="1602"/>
<location filename="hg_settingdialog.cpp" line="289"/>
<location filename="hg_settingdialog.cpp" line="1570"/>
<source>ok</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="287"/>
<location filename="hg_settingdialog.cpp" line="291"/>
<source>cancel</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="310"/>
<location filename="hg_settingdialog.cpp" line="314"/>
<source>configuration scheme management</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="356"/>
<location filename="hg_settingdialog.cpp" line="360"/>
<source>regional crop</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="375"/>
<location filename="hg_settingdialog.cpp" line="379"/>
<source>custom tone curve</source>
<translation>线</translation>
</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>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1555"/>
<location filename="hg_settingdialog.cpp" line="1523"/>
<source>,or add a new configuration</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1558"/>
<location filename="hg_settingdialog.cpp" line="1526"/>
<source>save the configuration</source>
<translation></translation>
</message>
@ -2882,82 +2888,82 @@ No: add new configuration</oldsource>
<translation type="vanished"></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1864"/>
<location filename="hg_settingdialog.cpp" line="1832"/>
<source>&lt;h6&gt;&lt;b&gt;</source>
<translation>&lt;h6&gt;&lt;b&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1563"/>
<location filename="hg_settingdialog.cpp" line="1531"/>
<source>cover original configuration:</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1567"/>
<location filename="hg_settingdialog.cpp" line="1535"/>
<source>add new configuration</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1571"/>
<location filename="hg_settingdialog.cpp" line="1539"/>
<source>rename:</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1613"/>
<location filename="hg_settingdialog.cpp" line="1627"/>
<location filename="hg_settingdialog.cpp" line="1902"/>
<location filename="hg_settingdialog.cpp" line="1581"/>
<location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1870"/>
<source>tips</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1613"/>
<location filename="hg_settingdialog.cpp" line="1581"/>
<source>scheme name cannot be empty</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1627"/>
<location filename="hg_settingdialog.cpp" line="1902"/>
<location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1870"/>
<source>scheme name: </source>
<translation> </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1627"/>
<location filename="hg_settingdialog.cpp" line="1902"/>
<location filename="hg_settingdialog.cpp" line="1595"/>
<location filename="hg_settingdialog.cpp" line="1870"/>
<source> already exists</source>
<translation> </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1864"/>
<location filename="hg_settingdialog.cpp" line="1832"/>
<source>:&lt;/b&gt;&lt;/h6&gt;</source>
<translation>:&lt;/b&gt;&lt;/h6&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1865"/>
<location filename="hg_settingdialog.cpp" line="1833"/>
<source>&lt;p&gt; </source>
<translation>&lt;p&gt; </translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1865"/>
<location filename="hg_settingdialog.cpp" line="1833"/>
<source>&lt;/p&gt;</source>
<translation>&lt;/p&gt;</translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1891"/>
<location filename="hg_settingdialog.cpp" line="1859"/>
<source>configuration scheme name change</source>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1945"/>
<location filename="hg_settingdialog.cpp" line="1967"/>
<location filename="hg_settingdialog.cpp" line="1913"/>
<location filename="hg_settingdialog.cpp" line="1935"/>
<source>be sure to delete the configuration</source>
<translation></translation>
</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>
<translation></translation>
</message>
<message>
<location filename="hg_settingdialog.cpp" line="1946"/>
<location filename="hg_settingdialog.cpp" line="1914"/>
<source>&quot; ?</source>
<translation></translation>
</message>
@ -2970,7 +2976,7 @@ No: add new configuration</oldsource>
<translation type="vanished"> </translation>
</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>
<translation></translation>
</message>

Binary file not shown.

View File

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

View File

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

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)
{
hg_settingdialog dlg(device, api, false, dev_name, nullptr);
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;
return NULL;
}
void twain_ui_free(void *buf)