扫描至...增加gif功能

2022-08-08 16:38:08 +08:00 · 2022-08-08 16:38:08 +08:00 · 13e0dc548c
parent 4a45147ceb
commit 13e0dc548c
5 changed files with 65 additions and 44 deletions
--- a/app/scanner/Scanner_zh_CN.qm
+++ b/app/scanner/Scanner_zh_CN.qm
--- a/app/scanner/Scanner_zh_CN.ts
+++ b/app/scanner/Scanner_zh_CN.ts
@ -274,39 +274,48 @@
    </message>
    <message>
        <location filename="dialog_aquireinto.ui" line="293"/>
-        <source>OCR-&gt;PDF - Portable Document Format(*.pdf)</source>
+        <source>GIF - Graphics Interchange Format(*.gif)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="dialog_aquireinto.ui" line="298"/>
+        <source>OCR-&gt;PDF - Portable Document Format(*.pdf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dialog_aquireinto.ui" line="303"/>
        <source>OCR-&gt;OFD - Open Fixed-layout Document(*.ofd)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="dialog_aquireinto.ui" line="306"/>
+        <location filename="dialog_aquireinto.ui" line="311"/>
        <source>Compression option</source>
        <translation>压缩选项</translation>
    </message>
    <message>
-        <location filename="dialog_aquireinto.ui" line="320"/>
+        <location filename="dialog_aquireinto.ui" line="322"/>
+        <source>Save as multipages (TIFF/PDF/OFD/GIF)</source>
+        <translation>多页保存(TIFF/PDF/OFD/GIF)</translation>
+    </message>
+    <message>
+        <location filename="dialog_aquireinto.ui" line="345"/>
        <source>用户自定义页数</source>
        <translation>用户自定义页数</translation>
    </message>
    <message>
-        <location filename="dialog_aquireinto.ui" line="327"/>
        <source>Save as multipages (TIFF/PDF/OFD)</source>
-        <translation>多页保存(TIFF/PDF/OFD)</translation>
+        <translation type="vanished">多页保存(TIFF/PDF/OFD)</translation>
    </message>
    <message>
-        <location filename="dialog_aquireinto.ui" line="356"/>
+        <location filename="dialog_aquireinto.ui" line="332"/>
        <source>所有页</source>
        <translation>所有页</translation>
    </message>
    <message>
        <location filename="dialog_aquireinto.cpp" line="56"/>
-        <location filename="dialog_aquireinto.cpp" line="180"/>
-        <location filename="dialog_aquireinto.cpp" line="207"/>
-        <location filename="dialog_aquireinto.cpp" line="214"/>
+        <location filename="dialog_aquireinto.cpp" line="183"/>
+        <location filename="dialog_aquireinto.cpp" line="210"/>
+        <location filename="dialog_aquireinto.cpp" line="217"/>
        <source>e.g. &apos;%1%2&apos;</source>
        <translation>例如.“%1%2”</translation>
    </message>
@ -321,7 +330,7 @@
        <translation>取消</translation>
    </message>
    <message>
-        <location filename="dialog_aquireinto.cpp" line="132"/>
+        <location filename="dialog_aquireinto.cpp" line="135"/>
        <source>Browse directory</source>
        <translation>文件夹路径</translation>
    </message>
--- 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);
--- a/app/scanner/dialog_aquireinto.ui
+++ b/app/scanner/dialog_aquireinto.ui
@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>554</width>
-    <height>525</height>
+    <height>360</height>
   </rect>
  </property>
  <property name="sizePolicy">
@ -288,14 +288,19 @@
         <string>OFD - Open Fixed-layout Document(*.ofd)</string>
        </property>
       </item>
-	   <item>
+       <item>
        <property name="text">
-         <string>OCR->PDF - Portable Document Format(*.pdf)</string>
+         <string>GIF - Graphics Interchange Format(*.gif)</string>
        </property>
       </item>
       <item>
        <property name="text">
-         <string>OCR->OFD - Open Fixed-layout Document(*.ofd)</string>
+         <string>OCR-&gt;PDF - Portable Document Format(*.pdf)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>OCR-&gt;OFD - Open Fixed-layout Document(*.ofd)</string>
        </property>
       </item>
      </widget>
@ -311,6 +316,26 @@
   </item>
   <item>
    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0" colspan="2">
+      <widget class="QCheckBox" name="cbtn_multiFile">
+       <property name="text">
+        <string>Save as multipages (TIFF/PDF/OFD/GIF)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QRadioButton" name="radio_multiAll">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>所有页</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     <item row="1" column="1">
      <widget class="QRadioButton" name="radio_multiCustom">
       <property name="enabled">
@ -321,13 +346,6 @@
       </property>
      </widget>
     </item>
-     <item row="0" column="0">
-      <widget class="QCheckBox" name="cbtn_multiFile">
-       <property name="text">
-        <string>Save as multipages (TIFF/PDF/OFD)</string>
-       </property>
-      </widget>
-     </item>
     <item row="1" column="2">
      <widget class="QSpinBox" name="spinBox_multiPages">
       <property name="enabled">
@ -347,19 +365,6 @@
       </property>
      </widget>
     </item>
-     <item row="1" column="0">
-      <widget class="QRadioButton" name="radio_multiAll">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>所有页</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
    </layout>
   </item>
   <item>
--- a/app/scanner/qt_zh_CN.ts
+++ b/app/scanner/qt_zh_CN.ts
@ -247,10 +247,6 @@
        <source>用户自定义页数</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Save as multipages (TIFF/PDF/OFD)</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>所有页</source>
        <translation type="unfinished"></translation>
@ -279,6 +275,14 @@
        <source>OCR-&gt;OFD - Open Fixed-layout Document(*.ofd)</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>GIF - Graphics Interchange Format(*.gif)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as multipages (TIFF/PDF/OFD/GIF)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Dialog_ClrCache</name>