Plugins::WebBrowser: Modify translations

Author: KangLin

Plugins/WebBrowser/AddressCompleter.cpp

@@ -64,11 +64,11 @@ CAddressCompleter::CAddressCompleter(QWidget *parent)
     m_szLineEditToolTip = m_szEnter  + "\n\n"
                           + tr("Enter key: Apply current url");
 
-    m_szListWidgetToolTip += tr("Enter key:       Apply current item") + "\n";
-    m_szListWidgetToolTip += tr("Tab key:         Apply current item") + "\n";
+    m_szListWidgetToolTip += tr("Enter ↲ key:       Apply current item") + "\n";
+    m_szListWidgetToolTip += tr("Tab ⇆ key:         Apply current item") + "\n";
     m_szListWidgetToolTip += tr("Esc Key:         Exit address completer") + "\n";
-    m_szListWidgetToolTip += tr("Upper arrow key: Select previous item") + "\n";
-    m_szListWidgetToolTip += tr("Down arrow key:  Select next item");
+    m_szListWidgetToolTip += tr("↑ (Upper arrow) key: Select previous item") + "\n";
+    m_szListWidgetToolTip += tr("↓ (Down arrow) key:  Select next item");
 
     m_szLineEditToolTipShow = m_szEnter + "\n\n" + m_szListWidgetToolTip;
     setToolTip(m_szListWidgetToolTip);

Plugins/WebBrowser/Bookmark/FrmBookmark.cpp

@@ -10,7 +10,8 @@
 #include <QInputDialog>
 #include <QFileDialog>
 #include <QLoggingCategory>
-
+#include <QCoreApplication>
+#include "RabbitCommonDir.h"
 #include "FrmBookmark.h"
 #include "ui_FrmBookmark.h"
 
@@ -420,7 +421,9 @@ void CFrmBookmark::onSetFavorite()
 void CFrmBookmark::onImportBookmarks()
 {
     QString filename = QFileDialog::getOpenFileName(
-        this, tr("Import bookmarks"), QString(), tr("HTML(*.html);; All files (*.*)"));
+        this, tr("Import bookmarks"),
+        RabbitCommon::CDir::Instance()->GetDirDocument(QCoreApplication::applicationName()),
+        tr("HTML(*.html);; All files (*.*)"));
 
     if (!filename.isEmpty()) {
         if (m_pDatabase->importFromHtml(filename)) {
@@ -435,7 +438,9 @@ void CFrmBookmark::onImportBookmarks()
 void CFrmBookmark::onExportBookmarks()
 {
     QString filename = QFileDialog::getSaveFileName(
-        this, tr("Export bookmarks"), QString(), tr("HTML (*.html);; All files (*.*)"));
+        this, tr("Export bookmarks"),
+        RabbitCommon::CDir::Instance()->GetDirDocument(QCoreApplication::applicationName()),
+        tr("HTML (*.html);; All files (*.*)"));
 
     if (!filename.isEmpty()) {
         if (m_pDatabase->exportToHtml(filename)) {

Plugins/WebBrowser/History/FrmHistory.cpp

@@ -12,7 +12,9 @@
 #include <QComboBox>
 #include <QDateEdit>
 #include <QSpinBox>
+#include <QCoreApplication>
 #include "FrmHistory.h"
+#include "RabbitCommonDir.h"
 #include "ui_FrmHistory.h"
 
 static Q_LOGGING_CATEGORY(log, "WebBrowser.History")
@@ -451,10 +453,13 @@ void CFrmHistory::onDeleteSelectedItems(const QModelIndexList &indexes)
 void CFrmHistory::slotImport()
 {
     QString filename = QFileDialog::getOpenFileName(
-        this, tr("Import histories"), QString(), tr("CSV file (*.csv);; All files (*.*)"));
+        this, tr("Import histories"),
+        RabbitCommon::CDir::Instance()->GetDirDocument(QCoreApplication::applicationName()),
+        tr("CSV file (*.csv);; All files (*.*)"));
 
     if (!filename.isEmpty()) {
         if(m_pModelHistory->importFromCSV(filename)) {
+            slotRefresh();
             QMessageBox::information(this, tr("Success"), tr("Histories import from csv file successfully"));
         } else {
             QMessageBox::warning(this, tr("Failure"), tr("Failed to import histories from csv file"));
@@ -465,7 +470,9 @@ void CFrmHistory::slotImport()
 void CFrmHistory::slotExport()
 {
     QString filename = QFileDialog::getSaveFileName(
-        this, tr("Export histories"), QString(), tr("CSV (*.csv);; All files (*.*)"));
+        this, tr("Export histories"),
+        RabbitCommon::CDir::Instance()->GetDirDocument(QCoreApplication::applicationName()),
+        tr("CSV (*.csv);; All files (*.*)"));
 
     if (!filename.isEmpty()) {
         if (m_pModelHistory->exportToCSV(filename)) {