feat: Custom Task Turn to Main Line: dde-file-manager Clears Search H…

…istory Add option to clear file manager search records in settings Log: Custom Task Turn to Main Line: dde-file-manager Clears Search History Task: https://pms.uniontech.com/bug-view-252515.html
linuxdeepin · May 11, 2024 · b25c65e · b25c65e
1 parent 04d33a8
commit b25c65e
Show file tree

Hide file tree

Showing 12 changed files with 543 additions and 458 deletions.
diff --git a/src/dfm-base/base/application/application.cpp b/src/dfm-base/base/application/application.cpp
@@ -279,7 +279,7 @@ Settings *Application::dataPersistence()
 void Application::appAttributeTrigger(TriggerAttribute ta)
 {
     switch (ta) {
-    case kRestoreViewMode:
+    case kRestoreViewMode: {
         auto defaultViewMode = appAttribute(Application::kViewMode).toInt();
         auto settings = appObtuselySetting();
 
@@ -304,6 +304,11 @@ void Application::appAttributeTrigger(TriggerAttribute ta)
 
         if (instance())
             Q_EMIT instance()->viewModeChanged(defaultViewMode);
+        break;
+        }
+    case kClearSearchHistory:
+        Q_EMIT instance()->clearSearchHistory();
+        break;
     }
 }
 

diff --git a/src/dfm-base/base/application/application.h b/src/dfm-base/base/application/application.h
@@ -65,7 +65,8 @@ class Application : public QObject
     Q_ENUM(GenericAttribute)
 
     enum TriggerAttribute {
-        kRestoreViewMode    // restore defualt view mode to all dir
+        kRestoreViewMode,    // restore defualt view mode to all dir
+        kClearSearchHistory     // clear search history
     };
 
     Q_ENUM(TriggerAttribute)
@@ -110,6 +111,7 @@ class Application : public QObject
 
     void genericSettingCreated(Settings *settings);
     void appSettingCreated(Settings *settings);
+    void clearSearchHistory();
 
 protected:
     Application(ApplicationPrivate *dd, QObject *parent = nullptr);

diff --git a/src/plugins/filemanager/core/dfmplugin-titlebar/views/addressbar.cpp b/src/plugins/filemanager/core/dfmplugin-titlebar/views/addressbar.cpp
@@ -13,6 +13,7 @@
 #include <dfm-base/base/schemefactory.h>
 #include <dfm-base/utils/fileutils.h>
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
+#include <dfm-base/base/application/application.h>
 
 #include <dfm-framework/event/event.h>
 
@@ -125,6 +126,8 @@ void AddressBarPrivate::initConnect()
         initUiForSizeMode();
     });
 #endif
+    connect(Application::instance(), &Application::clearSearchHistory, this,
+            &AddressBarPrivate::onClearSearchHistory);
 }
 
 void AddressBarPrivate::initUiForSizeMode()
@@ -362,6 +365,13 @@ int AddressBarPrivate::showClearSearchHistory()
     return code;
 }
 
+void AddressBarPrivate::onClearSearchHistory()
+{
+    auto result = showClearSearchHistory();
+    if (result == DDialog::Accepted)
+        q->clearSearchHistory();
+}
+
 
 void AddressBarPrivate::requestCompleteByUrl(const QUrl &url)
 {

diff --git a/src/plugins/filemanager/core/dfmplugin-titlebar/views/private/addressbar_p.h b/src/plugins/filemanager/core/dfmplugin-titlebar/views/private/addressbar_p.h
@@ -110,6 +110,7 @@ public Q_SLOTS:
     void onDConfigValueChanged(const QString &config, const QString &key);
     void filterHistory(const QString &text);
     int showClearSearchHistory();
+    void onClearSearchHistory();
 
 protected:
     virtual bool eventFilterResize(AddressBar *addressbar, QResizeEvent *event);

diff --git a/src/plugins/filemanager/dfmplugin-search/dfmplugin_search_global.h b/src/plugins/filemanager/dfmplugin-search/dfmplugin_search_global.h
@@ -38,6 +38,7 @@ inline constexpr char kIndexInternal[] { SEARCH_SETTING_GROUP ".00_index_interna
 inline constexpr char kIndexExternal[] { SEARCH_SETTING_GROUP ".01_index_external" };
 inline constexpr char kFulltextSearch[] { SEARCH_SETTING_GROUP ".02_fulltext_search" };
 inline constexpr char kDisplaySearchHistory[] { SEARCH_SETTING_GROUP ".03_display_search_history" };
+inline constexpr char kClearSearchHistory[] { SEARCH_SETTING_GROUP ".04_clear_search_history" };
 }
 
 namespace DConfig {

diff --git a/src/plugins/filemanager/dfmplugin-search/search.cpp b/src/plugins/filemanager/dfmplugin-search/search.cpp
@@ -169,6 +169,12 @@ void Search::regSearchSettingConfig()
                                                      DConfig::kDisplaySearchHistory,
                                                      val);
             });
+    SettingJsonGenerator::instance()->addConfig(SearchSettings::kClearSearchHistory,
+                   { { "key", "04_clear_search_history" },
+                     { "desc", tr("Clear dde-file-manager Search Records") },
+                     { "text", tr("Clean up") },
+                     { "type", "pushButton" },
+                     { "trigger", QVariant(Application::kClearSearchHistory) } });
 }
 
 void Search::bindEvents()

diff --git a/translations/dde-file-manager.ts b/translations/dde-file-manager.ts
diff --git a/translations/dde-file-manager_bo.ts b/translations/dde-file-manager_bo.ts
diff --git a/translations/dde-file-manager_ug.ts b/translations/dde-file-manager_ug.ts
diff --git a/translations/dde-file-manager_zh_CN.ts b/translations/dde-file-manager_zh_CN.ts
diff --git a/translations/dde-file-manager_zh_HK.ts b/translations/dde-file-manager_zh_HK.ts
diff --git a/translations/dde-file-manager_zh_TW.ts b/translations/dde-file-manager_zh_TW.ts