This commit is contained in:
parent
e5951a960e
commit
6400b4db88
Binary file not shown.
|
@ -97,7 +97,7 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="136"/>
|
<location filename="dialog_aquireinto.ui" line="136"/>
|
||||||
<source>delete all configurations</source>
|
<source>delete all configurations</source>
|
||||||
<translation>删除所有配置方案</translation>
|
<translation>全部删除</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>confgiuration information:</source>
|
<source>confgiuration information:</source>
|
||||||
|
@ -106,12 +106,12 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="94"/>
|
<location filename="dialog_aquireinto.ui" line="94"/>
|
||||||
<source>change name</source>
|
<source>change name</source>
|
||||||
<translation>重命名配置方案</translation>
|
<translation>重命名</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="117"/>
|
<location filename="dialog_aquireinto.ui" line="117"/>
|
||||||
<source>delete</source>
|
<source>delete</source>
|
||||||
<translation>删除配置方案</translation>
|
<translation>删除</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>apply</source>
|
<source>apply</source>
|
||||||
|
@ -120,12 +120,12 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="75"/>
|
<location filename="dialog_aquireinto.ui" line="75"/>
|
||||||
<source>found scheme</source>
|
<source>found scheme</source>
|
||||||
<translation>新建配置方案</translation>
|
<translation>新建</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="151"/>
|
<location filename="dialog_aquireinto.ui" line="151"/>
|
||||||
<source>Restore Defaults</source>
|
<source>Restore Defaults</source>
|
||||||
<translation>恢复默认配置</translation>
|
<translation>恢复默认</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="179"/>
|
<location filename="dialog_aquireinto.ui" line="179"/>
|
||||||
|
|
Binary file not shown.
|
@ -125,7 +125,7 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="136"/>
|
<location filename="dialog_aquireinto.ui" line="136"/>
|
||||||
<source>delete all configurations</source>
|
<source>delete all configurations</source>
|
||||||
<translation>Delete all configurations</translation>
|
<translation>Delete all</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>confgiuration information:</source>
|
<source>confgiuration information:</source>
|
||||||
|
@ -153,7 +153,7 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="151"/>
|
<location filename="dialog_aquireinto.ui" line="151"/>
|
||||||
<source>Restore Defaults</source>
|
<source>Restore Defaults</source>
|
||||||
<translation>Restore default configuration</translation>
|
<translation>Restore default</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_aquireinto.ui" line="179"/>
|
<location filename="dialog_aquireinto.ui" line="179"/>
|
||||||
|
|
|
@ -203,6 +203,9 @@ public:
|
||||||
{
|
{
|
||||||
const SANE_Option_Descriptor* opt = saneApi->sane_get_option_descriptor_api(h, i);
|
const SANE_Option_Descriptor* opt = saneApi->sane_get_option_descriptor_api(h, i);
|
||||||
if(!opt)
|
if(!opt)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (opt->type == SANE_TYPE_BUTTON || opt->type == SANE_TYPE_GROUP)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
saneApi->sane_control_option_api(h, i, SANE_ACTION_SET_AUTO, NULL, NULL);
|
saneApi->sane_control_option_api(h, i, SANE_ACTION_SET_AUTO, NULL, NULL);
|
||||||
|
|
|
@ -205,6 +205,9 @@ public:
|
||||||
if(!opt)
|
if(!opt)
|
||||||
continue;
|
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);
|
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)
|
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);
|
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;
|
return SANE_STATUS_INVAL;
|
||||||
}
|
}
|
||||||
|
@ -272,7 +275,7 @@ public:
|
||||||
for(int i = 1; i < dev_options; ++i)
|
for(int i = 1; i < dev_options; ++i)
|
||||||
{
|
{
|
||||||
const SANE_Option_Descriptor* opt = saneApi->sane_get_option_descriptor_api(h, 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;
|
continue;
|
||||||
|
|
||||||
unsigned int n = i;
|
unsigned int n = i;
|
||||||
|
|
|
@ -117,7 +117,7 @@ void Dialog_progress_ui::on_scan_finish(int flag, QString finishInfo)
|
||||||
|
|
||||||
void Dialog_progress_ui::on_image_recived()
|
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()
|
void Dialog_progress_ui::on_image_uploaded()
|
||||||
|
|
Loading…
Reference in New Issue