重新调整缓存设置窗口

app/scanner/Scanner_zh_CN.ts

@@ -345,7 +345,7 @@
     <message>
         <location filename="dialog_clrcache.ui" line="26"/>
         <source>Dialog</source>
-        <translation>清除缓存</translation>
+        <translation>缓存设置</translation>
     </message>
     <message>
         <location filename="dialog_clrcache.ui" line="34"/>
@@ -358,48 +358,56 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.ui" line="55"/>
         <source>setCachePath</source>
-        <translation>设置缓存路径</translation>
+        <translation type="vanished">确认设置</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.ui" line="66"/>
+        <location filename="dialog_clrcache.ui" line="59"/>
         <source>Cache occupied space:</source>
         <translation>缓存占用空间：</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.ui" line="73"/>
-        <location filename="dialog_clrcache.ui" line="118"/>
+        <location filename="dialog_clrcache.ui" line="66"/>
+        <location filename="dialog_clrcache.ui" line="111"/>
         <source>0</source>
         <translation>0×0×0 {0?}</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.ui" line="80"/>
+        <location filename="dialog_clrcache.ui" line="73"/>
         <source>B</source>
         <translation>B</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.ui" line="87"/>
+        <location filename="dialog_clrcache.ui" line="80"/>
         <source>(0 Byte)</source>
         <translation>(0 Byte)</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.ui" line="111"/>
+        <location filename="dialog_clrcache.ui" line="104"/>
         <source>Number of files:</source>
         <translation>文件数量：</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.ui" line="155"/>
+        <location filename="dialog_clrcache.ui" line="148"/>
         <source>Clear Cache</source>
         <translation>清除缓存</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.ui" line="162"/>
-        <source>Close</source>
-        <translation>关闭</translation>
+        <location filename="dialog_clrcache.ui" line="155"/>
+        <source>ok</source>
+        <translation>确定</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="52"/>
+        <location filename="dialog_clrcache.ui" line="162"/>
+        <source>cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="vanished">关闭</translation>
+    </message>
+    <message>
+        <location filename="dialog_clrcache.cpp" line="53"/>
         <source>Question</source>
         <translation>询问</translation>
     </message>
@@ -410,53 +418,58 @@ Continue to clear?</source>
 继续清除？</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="53"/>
+        <location filename="dialog_clrcache.cpp" line="54"/>
         <source>Main window contains temporary files, clear cache would remove all of them.
  Continue to clear?</source>
         <translation>主窗口中包含临时文件，清除缓存将会移除这些文件。
 继续清除？</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="55"/>
+        <location filename="dialog_clrcache.cpp" line="56"/>
         <source>yes</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="56"/>
+        <location filename="dialog_clrcache.cpp" line="57"/>
         <source>no</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="48"/>
-        <location filename="dialog_clrcache.cpp" line="67"/>
+        <location filename="dialog_clrcache.cpp" line="49"/>
+        <location filename="dialog_clrcache.cpp" line="68"/>
         <source>Information</source>
         <translation>消息</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="48"/>
+        <location filename="dialog_clrcache.cpp" line="49"/>
         <source>No cached file is available</source>
         <translation>暂无缓存文件</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="67"/>
+        <location filename="dialog_clrcache.cpp" line="68"/>
         <source>Cache clear successfully.</source>
         <translation>缓存清除成功。</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="71"/>
+        <location filename="dialog_clrcache.cpp" line="72"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="71"/>
+        <location filename="dialog_clrcache.cpp" line="72"/>
         <source>Cache clear failed or incompletely clear.</source>
         <translation>缓存清除失败或者未清除干净。</translation>
     </message>
     <message>
-        <location filename="dialog_clrcache.cpp" line="168"/>
+        <location filename="dialog_clrcache.cpp" line="148"/>
         <source>Browse directory</source>
         <translation>文件夹路径</translation>
     </message>
+    <message>
+        <location filename="dialog_clrcache.cpp" line="170"/>
+        <source>tips</source>
+        <translation>提示</translation>
+    </message>
 </context>
 <context>
     <name>Dialog_Export</name>
@@ -2092,7 +2105,7 @@ bug description:
     <message>
         <location filename="mainwindow.ui" line="527"/>
         <source>act_clrCache</source>
-        <translation>缓存设置</translation>
+        <translation>缓存设置...</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="532"/>

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();
 }

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);

app/scanner/dialog_clrcache.ui

@@ -49,13 +49,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="pbtn_setCachePath">
-       <property name="text">
-        <string>setCachePath</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
@@ -157,9 +150,16 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="btn_close">
+      <widget class="QPushButton" name="pbtn_ok">
        <property name="text">
-        <string>Close</string>
+        <string>ok</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pbtn_cancel">
+       <property name="text">
+        <string>cancel</string>
        </property>
       </widget>
      </item>

app/scanner/qt_zh_CN.ts

@@ -324,7 +324,7 @@
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation type="obsolete">关闭</translation>
     </message>
     <message>
         <source>Information</source>
@@ -368,11 +368,19 @@
         <translation type="unfinished">...</translation>
     </message>
     <message>
-        <source>setCachePath</source>
+        <source>Browse directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse directory</source>
+        <source>ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tips</source>
         <translation type="unfinished"></translation>
     </message>
 </context>