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-29 18:45:15 +08:00
parent e5951a960e
commit 6400b4db88
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/scanner2/Scanner_zh_CN.qm
View File

Binary file not shown.

10
app/scanner2/Scanner_zh_CN.ts
View File

@ -97,7 +97,7 @@
<message>
<location filename="dialog_aquireinto.ui" line="136"/>
<source>delete all configurations</source>
<translation>删除所有配置方案</translation>
<translation>全部删除</translation>
</message>
<message>
<source>confgiuration information:</source>
@ -106,12 +106,12 @@
<message>
<location filename="dialog_aquireinto.ui" line="94"/>
<source>change name</source>
<translation>重命名配置方案</translation>
<translation>重命名</translation>
</message>
<message>
<location filename="dialog_aquireinto.ui" line="117"/>
<source>delete</source>
<translation>删除配置方案</translation>
<translation>删除</translation>
</message>
<message>
<source>apply</source>
@ -120,12 +120,12 @@
<message>
<location filename="dialog_aquireinto.ui" line="75"/>
<source>found scheme</source>
<translation>新建配置方案</translation>
<translation>新建</translation>
</message>
<message>
<location filename="dialog_aquireinto.ui" line="151"/>
<source>Restore Defaults</source>
<translation>恢复默认配置</translation>
<translation>恢复默认</translation>
</message>
<message>
<location filename="dialog_aquireinto.ui" line="179"/>

BIN
app/scanner2/Scanner_zh_EN.qm
View File

Binary file not shown.

4
app/scanner2/Scanner_zh_EN.ts
View File

@ -125,7 +125,7 @@
<message>
<location filename="dialog_aquireinto.ui" line="136"/>
<source>delete all configurations</source>
<translation>Delete all configurations</translation>
<translation>Delete all</translation>
</message>
<message>
<source>confgiuration information:</source>
@ -153,7 +153,7 @@
<message>
<location filename="dialog_aquireinto.ui" line="151"/>
<source>Restore Defaults</source>
<translation>Restore default configuration</translation>
<translation>Restore default</translation>
</message>
<message>
<location filename="dialog_aquireinto.ui" line="179"/>

3
modules/saneui/device_menu.h
View File

@ -203,6 +203,9 @@ public:
{
const SANE_Option_Descriptor* opt = saneApi->sane_get_option_descriptor_api(h, i);
if(!opt)
continue;
if (opt->type == SANE_TYPE_BUTTON || opt->type == SANE_TYPE_GROUP)
continue;
saneApi->sane_control_option_api(h, i, SANE_ACTION_SET_AUTO, NULL, NULL);

7
modules/twainui/device_menu.h
View File

@ -205,6 +205,9 @@ public:
if(!opt)
continue;
if (opt->type == SANE_TYPE_BUTTON || opt->type == SANE_TYPE_GROUP)
continue;
saneApi->sane_control_option_api(h, i, SANE_ACTION_SET_AUTO, NULL, NULL);
}
@ -213,7 +216,7 @@ public:
static SANE_Status get_default_value(const SANEAPI* saneApi, SANE_Handle h, int i, void* def)
{
const SANE_Option_Descriptor* opt = saneApi->sane_get_option_descriptor_api(h, i);
if(!opt)
if(!opt || opt->type == SANE_TYPE_BUTTON || opt->type == SANE_TYPE_GROUP)
{
return SANE_STATUS_INVAL;
}
@ -272,7 +275,7 @@ public:
for(int i = 1; i < dev_options; ++i)
{
const SANE_Option_Descriptor* opt = saneApi->sane_get_option_descriptor_api(h, i);
if(!opt)
if(!opt || opt->type == SANE_TYPE_BUTTON || opt->type == SANE_TYPE_GROUP)
continue;
unsigned int n = i;

2
modules/twainui/dialog_progress_ui.cpp
View File

@ -117,7 +117,7 @@ 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++));
ui->lineEdit_imgRecived->setText(QString::number(++imageRecivedCount));
}
void Dialog_progress_ui::on_image_uploaded()