diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm
index 816ab6e8..648da452 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 e512f67e..80847055 100644
--- a/app/scanner/Scanner_zh_CN.ts
+++ b/app/scanner/Scanner_zh_CN.ts
@@ -345,7 +345,7 @@
Dialog
- 清除缓存
+ 缓存设置
@@ -358,48 +358,56 @@
-
setCachePath
- 设置缓存路径
+ 确认设置
-
+
Cache occupied space:
缓存占用空间：
-
-
+
+
0
0×0×0 {0?}
-
+
B
B
-
+
(0 Byte)
(0 Byte)
-
+
Number of files:
文件数量：
-
+
Clear Cache
清除缓存
-
- Close
- 关闭
+
+ ok
+ 确定
-
+
+ cancel
+ 取消
+
+
+ Close
+ 关闭
+
+
+
Question
询问
@@ -410,53 +418,58 @@ Continue to clear?
继续清除？
-
+
Main window contains temporary files, clear cache would remove all of them.
Continue to clear?
主窗口中包含临时文件，清除缓存将会移除这些文件。
继续清除？
-
+
yes
确定
-
+
no
取消
-
-
+
+
Information
消息
-
+
No cached file is available
暂无缓存文件
-
+
Cache clear successfully.
缓存清除成功。
-
+
Warning
警告
-
+
Cache clear failed or incompletely clear.
缓存清除失败或者未清除干净。
-
+
Browse directory
文件夹路径
+
+
+ tips
+ 提示
+
Dialog_Export
@@ -2092,7 +2105,7 @@ bug description:
act_clrCache
- 缓存设置
+ 缓存设置...
diff --git a/app/scanner/dialog_clrcache.cpp b/app/scanner/dialog_clrcache.cpp
index 52a39df4..bb315fbf 100644
--- a/app/scanner/dialog_clrcache.cpp
+++ b/app/scanner/dialog_clrcache.cpp
@@ -75,11 +75,6 @@ void Dialog_ClrCache::on_btn_clr_clicked()
setInformation(m_cachePath);
}
-void Dialog_ClrCache::on_btn_close_clicked()
-{
- close();
-}
-
bool Dialog_ClrCache::clrCache(const QString &path)
{
QDir dir = QDir(path);
@@ -148,7 +143,18 @@ void Dialog_ClrCache::setInformation(const QString &path)
ui->lab_num->setNum(getFileNum(path));
}
-void Dialog_ClrCache::on_pbtn_setCachePath_clicked()
+void Dialog_ClrCache::on_btn_directory_clicked()
+{
+ QString save_dir = QFileDialog::getExistingDirectory(this, tr("Browse directory"), "");
+ if (!save_dir.isEmpty())
+ {
+ if (save_dir[save_dir.size() - 1] != '/')
+ save_dir += "/";
+ ui->lineEdit->setText(getStdFileName(save_dir));
+ }
+}
+
+void Dialog_ClrCache::on_pbtn_ok_clicked()
{
if (ui->lineEdit->text().endsWith(getStdFileName(QString("/Cache/")), Qt::CaseInsensitive))
{
@@ -171,13 +177,7 @@ void Dialog_ClrCache::on_pbtn_setCachePath_clicked()
close();
}
-void Dialog_ClrCache::on_btn_directory_clicked()
+void Dialog_ClrCache::on_pbtn_cancel_clicked()
{
- QString save_dir = QFileDialog::getExistingDirectory(this, tr("Browse directory"), "");
- if (!save_dir.isEmpty())
- {
- if (save_dir[save_dir.size() - 1] != '/')
- save_dir += "/";
- ui->lineEdit->setText(getStdFileName(save_dir));
- }
+ close();
}
diff --git a/app/scanner/dialog_clrcache.h b/app/scanner/dialog_clrcache.h
index 7749ea50..9b5287fe 100644
--- a/app/scanner/dialog_clrcache.h
+++ b/app/scanner/dialog_clrcache.h
@@ -25,9 +25,9 @@ signals:
private slots:
void on_btn_clr_clicked();
- void on_btn_close_clicked();
- void on_pbtn_setCachePath_clicked();
void on_btn_directory_clicked();
+ void on_pbtn_ok_clicked();
+ void on_pbtn_cancel_clicked();
private:
bool clrCache(const QString &path);
diff --git a/app/scanner/dialog_clrcache.ui b/app/scanner/dialog_clrcache.ui
index 0ba85392..2cad2115 100644
--- a/app/scanner/dialog_clrcache.ui
+++ b/app/scanner/dialog_clrcache.ui
@@ -49,13 +49,6 @@
- -
-
-
- setCachePath
-
-
-
-
@@ -157,9 +150,16 @@
-
-
+
- Close
+ ok
+
+
+
+ -
+
+
+ cancel
diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts
index 648cce65..2af267a1 100644
--- a/app/scanner/qt_zh_CN.ts
+++ b/app/scanner/qt_zh_CN.ts
@@ -324,7 +324,7 @@
Close
- 关闭
+ 关闭
Information
@@ -368,11 +368,19 @@
...
- setCachePath
+ Browse directory
- Browse directory
+ ok
+
+
+
+ cancel
+
+
+
+ tips