diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm
index 5c56e0b8..bea9080a 100644
Binary files a/app/scanner/Scanner_zh_CN.qm and b/app/scanner/Scanner_zh_CN.qm differ
diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts
index 01276007..fa56fbaf 100644
--- a/app/scanner/Scanner_zh_CN.ts
+++ b/app/scanner/Scanner_zh_CN.ts
@@ -274,39 +274,48 @@
-
+
+
+
+
+
+
-
+
压缩选项
-
+
+
+ 多页保存(TIFF/PDF/OFD/GIF)
+
+
+
用户自定义页数
-
- 多页保存(TIFF/PDF/OFD)
+ 多页保存(TIFF/PDF/OFD)
-
+
所有页
-
-
-
+
+
+
例如.“%1%2”
@@ -321,7 +330,7 @@
取消
-
+
文件夹路径
diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp
index 30440b06..8e016136 100644
--- a/app/scanner/dialog_aquireinto.cpp
+++ b/app/scanner/dialog_aquireinto.cpp
@@ -42,8 +42,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
#endif
#if defined(OEM_LISICHENG) || defined(x86_64)
+ ui->cbox_format->removeItem(8);
ui->cbox_format->removeItem(7);
- ui->cbox_format->removeItem(6);
#endif
ui->spin_index->setValue(getCfgValue("aquire", "startIndex", 1));
ui->cbox_digit->setCurrentIndex(getCfgValue("aquire", "digit", 2));
@@ -56,7 +56,7 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
ui->lab_digitExp->setText(QString(tr("e.g. '%1%2'")).arg(ui->lineEdit_fileName->text())
.arg(ui->spin_index->value(), ui->cbox_digit->currentIndex() + 1, 10, QLatin1Char('0')));
ui->btn_option->setEnabled(0 == ui->cbox_format->currentIndex() || 3 == ui->cbox_format->currentIndex());
- ui->cbtn_multiFile->setEnabled(ui->cbox_format->currentIndex() > 2 && ui->cbox_format->currentIndex() < 6);
+ ui->cbtn_multiFile->setEnabled(ui->cbox_format->currentIndex() > 2 && ui->cbox_format->currentIndex() < 7);
ui->radio_multiAll->setEnabled(ui->cbtn_multiFile->isChecked());
ui->radio_multiCustom->setEnabled(ui->cbtn_multiFile->isChecked());
ui->spinBox_multiPages->setEnabled(ui->cbtn_multiFile->isChecked() ? ui->radio_multiCustom->isChecked() : false);
@@ -110,16 +110,19 @@ AquireIntoSaveParam Dialog_AquireInto::getSaveParam()
format = "ofd";
break;
case 6:
- format = "pdf";
+ format = "gif";
break;
case 7:
+ format = "pdf";
+ break;
+ case 8:
format = "ofd";
break;
default:
break;
}
param.m_fileNameExt = format;
- param.m_isOcr = (ui->cbox_format->currentIndex() >= 6);
+ param.m_isOcr = (ui->cbox_format->currentIndex() >= 7);
param.m_isSaveAsMultiPage = ui->cbtn_multiFile->isChecked();
param.m_multiPagesType = (ui->radio_multiAll->isChecked()) ? 0 : 1;
@@ -146,8 +149,8 @@ void Dialog_AquireInto::on_btn_option_clicked()
void Dialog_AquireInto::on_cbox_format_currentIndexChanged(int index)
{
- ui->cbtn_multiFile->setEnabled(index > 2 && index < 6);
- if (index < 3 || index > 5)
+ ui->cbtn_multiFile->setEnabled(index > 2 && index < 7);
+ if (index < 3 || index > 6)
ui->cbtn_multiFile->setChecked(false);
ui->btn_option->setEnabled(0 == index || 3 == index);
diff --git a/app/scanner/dialog_aquireinto.ui b/app/scanner/dialog_aquireinto.ui
index 5c58d82c..e2a98f10 100644
--- a/app/scanner/dialog_aquireinto.ui
+++ b/app/scanner/dialog_aquireinto.ui
@@ -7,7 +7,7 @@
0
0
554
- 525
+ 360
@@ -288,14 +288,19 @@
OFD - Open Fixed-layout Document(*.ofd)
- -
+
-
- OCR->PDF - Portable Document Format(*.pdf)
+ GIF - Graphics Interchange Format(*.gif)
-
- OCR->OFD - Open Fixed-layout Document(*.ofd)
+ OCR->PDF - Portable Document Format(*.pdf)
+
+
+ -
+
+ OCR->OFD - Open Fixed-layout Document(*.ofd)
@@ -311,6 +316,26 @@
-
+
-
+
+
+ Save as multipages (TIFF/PDF/OFD/GIF)
+
+
+
+ -
+
+
+ true
+
+
+ 所有页
+
+
+ true
+
+
+
-
@@ -321,13 +346,6 @@
- -
-
-
- Save as multipages (TIFF/PDF/OFD)
-
-
-
-
@@ -347,19 +365,6 @@
- -
-
-
- true
-
-
- 所有页
-
-
- true
-
-
-
-
diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts
index af8ea94d..48a869a3 100644
--- a/app/scanner/qt_zh_CN.ts
+++ b/app/scanner/qt_zh_CN.ts
@@ -247,10 +247,6 @@
-
-
-
-
@@ -279,6 +275,14 @@
+
+
+
+
+
+
+
+
Dialog_ClrCache