app/scanner2/dialog_aquireinto.cpp

@@ -145,20 +145,11 @@ AquireIntoSaveParam Dialog_AquireInto::getSaveParam()
     case 11:
         format = "ofd";
         break;
-    case 12:
-        format = "tga";
-        break;
-    case 13:
-        format = "pcx";
-        break;
-    case 14:
-        format = "ras";
-        break;
     default:
         break;
     }
     param.m_fileNameExt = format;
-    param.m_isOcr = (ui->cbox_format->currentIndex() == 10 || ui->cbox_format->currentIndex() == 11);
+    param.m_isOcr = (ui->cbox_format->currentIndex() >= 10);
 
     param.m_isSaveAsMultiPage = ui->cbtn_multiFile->isChecked();
     param.m_multiPagesType = (ui->radio_multiAll->isChecked()) ? 0 : 1;
@@ -284,7 +275,7 @@ void Dialog_AquireInto::setCfgBaseOnSection(QString section)
     ui->cbox_digit->setCurrentIndex(getCfgValue(section2.c_str(), "digit", 2));
     ui->cbox_evenOdd->setCurrentIndex(getCfgValue(section2.c_str(), "evenOdd", 0));
     int format = getCfgValue(section2.c_str(), "format", 0);
-    if (format > 14)
+    if (format > 11)
         format = 0;
     ui->cbox_format->setCurrentIndex(format);
     ui->cbtn_multiFile->setChecked(format > 5 ? getCfgValue(section2.c_str(), "multiFile", false) : false);
@@ -313,7 +304,7 @@ void Dialog_AquireInto::on_btn_option_clicked()
 void Dialog_AquireInto::on_cbox_format_currentIndexChanged(int index)
 {
     ui->cbtn_multiFile->setEnabled(index > 5 && index < 12);
-    if (index < 6 || index > 11 )
+    if (index < 6 || index >= 10 )
         ui->cbtn_multiFile->setChecked(false);
 
     ui->btn_option->setEnabled(0 == index || 6 == index || 7 == index || 8 == index);

app/scanner2/dialog_aquireinto.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>736</width>
+    <width>705</width>
     <height>380</height>
    </rect>
   </property>
@@ -486,21 +486,6 @@
             <string>OCR-&gt;OFD - Open Fixed-layout Document(*.ofd)</string>
            </property>
           </item>
-          <item>
-           <property name="text">
-            <string>TGA - Tagged Graphics(*.tga)</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>PCX - PC Paintbrush Exchange(*.pcx)</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>RAS - Sun Raster files(*.ras)</string>
-           </property>
-          </item>
          </widget>
         </item>
         <item>

app/scanner2/dialog_export.cpp

@@ -59,10 +59,6 @@ Dialog_Export::Dialog_Export(int total, const std::vector<int> &selectedIndexs,
     }
 #endif
 
-    m_supportType.push_back(SupportType(".tga", "TGA - Tagged Graphics", FILE_TYPE_ATTR_NO_MORE_OPTION));
-    m_supportType.push_back(SupportType(".pcx", "PCX - PC Paintbrush Exchange", FILE_TYPE_ATTR_NO_MORE_OPTION));
-    m_supportType.push_back(SupportType(".ras", "RAS - Sun Raster filesp", FILE_TYPE_ATTR_NO_MORE_OPTION));
-
     ui->fileDialog->setAcceptMode(QFileDialog::AcceptSave);
     ui->fileDialog->setWindowFlags(ui->fileDialog->windowFlags() & ~Qt::Dialog);
     ui->fileDialog->setOption(QFileDialog::DontUseNativeDialog, true);

app/scanner2/dialog_saveas.cpp

@@ -89,10 +89,6 @@ Dialog_SaveAs::Dialog_SaveAs(bool isSaveAs, QWidget *parent) :
      }
 #endif
 
-     filters.append("TGA - Tagged Graphics(*.tga)");
-     filters.append("PCX - PC Paintbrush Exchange(*.pcx)");
-     filters.append("RAS - Sun Raster files(*.ras)");
-
     ui->fileDialog->setNameFilters(filters);
 
     connect(ui->fileDialog, SIGNAL(accepted()), this, SLOT(on_dialog_accepted()));
@@ -152,7 +148,7 @@ int Dialog_SaveAs::getTiffQuality()
 
 bool Dialog_SaveAs::isOcr()
 {
-    return (m_suffix >= 10 && m_suffix <= 12);
+    return (m_suffix >= 10);
 }
 
 void Dialog_SaveAs::on_dialog_accepted()
@@ -199,15 +195,6 @@ void Dialog_SaveAs::on_dialog_accepted()
     case 12:
         extName = ".rtf";
         break;
-    case 13:
-        extName = ".tga";
-        break;
-    case 14:
-        extName = ".pcx";
-        break;
-    case 15:
-        extName = ".ras";
-        break;
     }
 
     assert(!extName.isEmpty());

app/scanner2/mainwindow.cpp

@@ -2238,7 +2238,7 @@ void MainWindow::on_act_open_triggered()
         return;
     }
 
-    QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, tr("Open images"), "", "(*.jpg *.jpeg *.png *.bmp *.ppm *.pgm *.pbm *.pdf *.tif *.tiff *.ofd *.gif *.tga *.pcx *.ras)");
+    QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, tr("Open images"), "", "(*.jpg *.jpeg *.png *.bmp *.ppm *.pgm *.pbm *.pdf *.tif *.tiff *.ofd *.gif)");
     m_thumb->addItems(fileNames);
 }
 
@@ -2249,7 +2249,7 @@ void MainWindow::on_act_insert_triggered()
         return;
     }
 
-    QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, tr("Insert images"), "", "(*.jpg *.jpeg *.png *.bmp *.ppm *.pgm *.pbm *.pdf *.tif *.tiff *.ofd *.gif *.tga *.pcx *.ras)");
+    QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, tr("Insert images"), "", "(*.jpg *.jpeg *.png *.bmp *.ppm *.pgm *.pbm *.pdf *.tif *.tiff *.ofd *.gif)");
     if (-1 != m_currIndex)
         m_thumb->insertItems(fileNames, m_currIndex);
     else

app/scantool/dialog_scaninfo.cpp

@@ -48,7 +48,6 @@ void Dialog_ScanInfo::SetScanInfo(const QString &info, bool error)
 void Dialog_ScanInfo::SetScanCount(unsigned int count)
 {
     ui->labelScanCount->setText(tr("Scan count: ") + QString::number(count));
-    ui->labelScanCount->repaint();
     this->repaint();
 }