diff --git a/app/scanner2/dialog_aquireinto.cpp b/app/scanner2/dialog_aquireinto.cpp
index b4dc03e1..5dc6c538 100644
--- a/app/scanner2/dialog_aquireinto.cpp
+++ b/app/scanner2/dialog_aquireinto.cpp
@@ -145,11 +145,20 @@ 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);
+ param.m_isOcr = (ui->cbox_format->currentIndex() == 10 || ui->cbox_format->currentIndex() == 11);
param.m_isSaveAsMultiPage = ui->cbtn_multiFile->isChecked();
param.m_multiPagesType = (ui->radio_multiAll->isChecked()) ? 0 : 1;
@@ -275,7 +284,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 > 11)
+ if (format > 14)
format = 0;
ui->cbox_format->setCurrentIndex(format);
ui->cbtn_multiFile->setChecked(format > 5 ? getCfgValue(section2.c_str(), "multiFile", false) : false);
@@ -304,7 +313,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 >= 10 )
+ if (index < 6 || index > 11 )
ui->cbtn_multiFile->setChecked(false);
ui->btn_option->setEnabled(0 == index || 6 == index || 7 == index || 8 == index);
diff --git a/app/scanner2/dialog_aquireinto.ui b/app/scanner2/dialog_aquireinto.ui
index 36188b5a..89b6c891 100644
--- a/app/scanner2/dialog_aquireinto.ui
+++ b/app/scanner2/dialog_aquireinto.ui
@@ -6,7 +6,7 @@
0
0
- 705
+ 736
380
@@ -486,6 +486,21 @@
OCR->OFD - Open Fixed-layout Document(*.ofd)
+ -
+
+ TGA - Tagged Graphics(*.tga)
+
+
+ -
+
+ PCX - PC Paintbrush Exchange(*.pcx)
+
+
+ -
+
+ RAS - Sun Raster files(*.ras)
+
+
-
diff --git a/app/scanner2/dialog_export.cpp b/app/scanner2/dialog_export.cpp
index 7d293e07..3f6bbda2 100644
--- a/app/scanner2/dialog_export.cpp
+++ b/app/scanner2/dialog_export.cpp
@@ -59,6 +59,10 @@ Dialog_Export::Dialog_Export(int total, const std::vector &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);
diff --git a/app/scanner2/dialog_saveas.cpp b/app/scanner2/dialog_saveas.cpp
index 7b9ed39f..580fcf97 100644
--- a/app/scanner2/dialog_saveas.cpp
+++ b/app/scanner2/dialog_saveas.cpp
@@ -89,6 +89,10 @@ 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()));
@@ -148,7 +152,7 @@ int Dialog_SaveAs::getTiffQuality()
bool Dialog_SaveAs::isOcr()
{
- return (m_suffix >= 10);
+ return (m_suffix >= 10 && m_suffix <= 12);
}
void Dialog_SaveAs::on_dialog_accepted()
@@ -195,6 +199,15 @@ 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());
diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp
index 28709b77..29fbca9b 100644
--- a/app/scanner2/mainwindow.cpp
+++ b/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)");
+ QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, tr("Open images"), "", "(*.jpg *.jpeg *.png *.bmp *.ppm *.pgm *.pbm *.pdf *.tif *.tiff *.ofd *.gif *.tga *.pcx *.ras)");
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)");
+ QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, tr("Insert images"), "", "(*.jpg *.jpeg *.png *.bmp *.ppm *.pgm *.pbm *.pdf *.tif *.tiff *.ofd *.gif *.tga *.pcx *.ras)");
if (-1 != m_currIndex)
m_thumb->insertItems(fileNames, m_currIndex);
else