diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm
index 0e22dac0..7019357a 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 649cc294..90e47ee5 100644
--- a/app/scanner/Scanner_zh_CN.ts
+++ b/app/scanner/Scanner_zh_CN.ts
@@ -1465,6 +1465,11 @@ Please make sure the two passwords are the same.
压缩选项
+
+
+
+ 使用当前日期建立子文件夹
+
Dialog_SaveQuality
diff --git a/app/scanner/dialog_saveas.cpp b/app/scanner/dialog_saveas.cpp
index 1cd21260..f778e093 100644
--- a/app/scanner/dialog_saveas.cpp
+++ b/app/scanner/dialog_saveas.cpp
@@ -5,6 +5,7 @@
#include "app_cfg.h"
#include
#include
+#include
class del_delegate : public QAbstractProxyModel
{
@@ -99,6 +100,9 @@ Dialog_SaveAs::Dialog_SaveAs(QWidget *parent) :
m_suffix = 0;
ui->fileDialog->selectNameFilter(ui->fileDialog->nameFilters().at(m_suffix));
ui->btn_option->setEnabled(0 == m_suffix || 3 == m_suffix);
+ ui->cbox_subFolder->setChecked(false);
+
+ ui->cbox_subFolder->setChecked(getCfgValue("saveAs", "subFolderByTime", false));
}
Dialog_SaveAs::~Dialog_SaveAs()
@@ -183,13 +187,27 @@ void Dialog_SaveAs::on_dialog_accepted()
{
QString path = selectedFile.left(pos + 1);
QString name = selectedFile.right(selectedFile.count() - pos - 1);
+
+ bool checked = ui->cbox_subFolder->isChecked();
+ QString dirName = NULL;
+ if(checked)
+ {
+ dirName = path + QDateTime::currentDateTime().toString("yy-MM-dd hh.mm.ss");
+ QDir dir(dirName);
+ if(!dir.exists())
+ {
+ dir.mkdir(dirName);
+ }
+ }
+ path = dirName;
if(name.endsWith(extName))
- m_savePath = getStdFileName(path + name);
+ m_savePath = getStdFileName(path + "/" + name);
else
- m_savePath = getStdFileName(path + name + extName);
+ m_savePath = getStdFileName(path + "/" + name + extName);
}
saveCfgValue("saveAs", "suffix", m_suffix);
+ saveCfgValue("saveAs", "subFolderByTime", ui->cbox_subFolder->isChecked());
accept();
}
diff --git a/app/scanner/dialog_saveas.ui b/app/scanner/dialog_saveas.ui
index e5a39d46..8d9775c0 100644
--- a/app/scanner/dialog_saveas.ui
+++ b/app/scanner/dialog_saveas.ui
@@ -13,7 +13,7 @@
Save As
-
+
-
@@ -26,6 +26,13 @@
+ -
+
+
+ Use subfolder based on current date
+
+
+
-
diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts
index d92f54d3..59f253c3 100644
--- a/app/scanner/qt_zh_CN.ts
+++ b/app/scanner/qt_zh_CN.ts
@@ -1171,6 +1171,10 @@ Please make sure the two passwords are the same.
+
+
+
+
Dialog_WriteSettings