rebase master

CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wl,--as-need -fPIE")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wl,--as-needed")
 
 #安全加固
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all -Werror=return-type")

assets/configs/org.deepin.dde.file-manager.computer.json

@@ -0,0 +1,28 @@
+{
+    "magic":"dsg.config.meta",
+    "version":"1.0",
+    "contents":{
+        "hideMyDirectories":{
+            "value": false,
+            "serial":0,
+            "flags":[],
+            "name":"Hide My Directories on the Computer page",
+            "name[zh_CN]":"计算机工作区隐藏我的目录",
+            "description[zh_CN]":"计算机工作区隐藏我的目录",
+            "description":"Hide My Directories on the Computer page",
+            "permissions":"readwrite",
+            "visibility":"public"
+        },
+        "hide3rdEntries":{
+            "value": false,
+            "serial":0,
+            "flags":[],
+            "name":"Hide 3rd party entries on the Computer page",
+            "name[zh_CN]":"计算机工作区隐藏第三方插件",
+            "description[zh_CN]":"计算机工作区隐藏第三方插件",
+            "description":"Hide 3rd party entries on the Computer page",
+            "permissions":"readwrite",
+            "visibility":"public"
+        }
+    }
+}

assets/configs/org.deepin.dde.file-manager.desktop.json

@@ -0,0 +1,17 @@
+{
+    "magic":"dsg.config.meta",
+    "version":"1.0",
+    "contents":{
+        "autoAlign":{
+            "value": -1,
+            "serial":0,
+            "flags":[],
+            "name":"Enable auto align on desktop",
+            "name[zh_CN]":"启用桌面自动排列",
+            "description[zh_CN]":"用于控制是否启用桌面自动排列",
+            "description":"It's used to control whether the auto align on desktop is enabled.",
+            "permissions":"readwrite",
+            "visibility":"public"
+        }
+    }
+}

assets/configs/org.deepin.dde.file-manager.operations.json

@@ -0,0 +1,28 @@
+{
+    "magic":"dsg.config.meta",
+    "version":"1.0",
+    "contents":{
+        "file.operation.bigfilesize": {
+            "value":"83886080",
+            "serial":0,
+            "flags":[],
+            "name":"Big File",
+            "name[zh_CN]":"大文件大小",
+            "description[zh_CN]":"用于拷贝时判断文件是否是大文件的size，默认是80MB，value的单位是byte",
+            "description":"Size used to determine whether a file is a large file during copying，the default is 80MB,The unit of value is byte",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
+        "file.operation.blockeverysync": {
+            "value":false,
+            "serial":0,
+            "flags":[],
+            "name":"Safe synchronization mode",
+            "name[zh_CN]":"安全同步模式",
+            "description[zh_CN]":"安全同步模式是拷贝到外设块设备时，每次写入执行同步到设备。高性能模式是拷贝到外设块设备时，每个任务完成后在进行同步到设备。默认是高性能模式（即关闭安全同步模式）。",
+            "description":"Safe synchronization mode is when copying to a peripheral block device, synchronize to the device for each write. High-performance mode is to synchronize to the device after each task is completed when copying to a peripheral block device.Default is high performance mode (i.e. turn off safe synchronization mode).",
+            "permissions":"readwrite",
+            "visibility":"private"
+        }
+    }
+}

assets/configs/org.deepin.dde.file-manager.plugins.json

@@ -0,0 +1,69 @@
+{
+    "magic": "dsg.config.meta",
+    "version": "1.0",
+    "contents": {
+        "filemanager.blackList": {
+            "value": [],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-file-manager plugin blacklist",
+            "name[zh_CN]": "文件管理器插件黑名单列表",
+            "description[zh_CN]": "文件管理器插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-file-manager, blacklisted plugins will not be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "desktop.blackList": {
+            "value": [],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-desktop plugins blacklist",
+            "name[zh_CN]": "桌面插件黑名单列表",
+            "description[zh_CN]": "桌面插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-desktop, plugins in the blacklist will not be able to be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "server.blackList": {
+            "value": [],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-file-manager-server plugins blacklist",
+            "name[zh_CN]": "文件管理器用户服务插件黑名单列表",
+            "description[zh_CN]": "文件管理器用户服务插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-file-manager-server, plugins in the blacklist will not be able to be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "daemon.blackList": {
+            "value": [],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-file-manager-daemon plugins blacklist",
+            "name[zh_CN]": "文件管理器守护进程插件黑名单列表",
+            "description[zh_CN]": "文件管理器守护进程插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-file-manager-daemon, plugins in the blacklist will not be able to be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "filedialog.blackList": {
+            "value": ["dfmplugin-burn",
+                      "dfmplugin-dirshare",
+                      "dfmplugin-myshares",
+                      "dfmplugin-propertydialog",
+                      "dfmplugin-trashcore",
+                      "dfmplugin-trash",
+                      "dfmplugin-filepreview",
+                      "dfmplugin-vault",
+                      "dfmplugin-phone" ],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-file-dialog plugins blacklist",
+            "name[zh_CN]": "文件管理器文件选择对话框插件黑名单列表",
+            "description[zh_CN]": "文件管理器文件选择对话框插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-file-dialog, plugins in the blacklist will not be able to be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        }
+    }
+}

debian/changelog

@@ -1,3 +1,27 @@
+dde-file-manager (6.0.31) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.31
+
+ -- lvwujun <[email protected]>  Fri, 1 Sep 2023 10:16:23 +0800
+
+dde-file-manager (6.0.30) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.30
+
+ -- lvwujun <[email protected]>  Mon, 28 Aug 2023 15:23:11 +0800
+
+dde-file-manager (6.0.29) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.29
+
+ -- zhangsheng <[email protected]>  Thu, 24 Aug 2023 10:22:04 +0800
+
+dde-file-manager (6.0.28) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.28
+
+ -- lvwujun <[email protected]>  Fri, 18 Aug 2023 14:29:09 +0800
+
 dde-file-manager (6.0.27) unstable; urgency=medium
 
   * update file manager baseline version to V6.0.27 that fixed some bugs

debian/dde-file-manager.install

@@ -25,4 +25,3 @@ usr/lib/systemd/user/
 etc/dbus-1/system.d/com.deepin.filemanager.daemon.conf
 etc/X11/Xsession.d/99dfm-dlnfs-automount
 etc/deepin/dde-file-manager/dfm-dlnfs-automount
-etc/xdg/autostart

include/dfm-base/base/schemefactory.h

@@ -205,6 +205,11 @@ class InfoFactory final : public SchemeFactory<FileInfo>
                                     const Global::CreateFileInfoType type = Global::CreateFileInfoType::kCreateFileInfoAuto,
                                     QString *errorString = nullptr)
     {
+        if (!url.isValid()) {
+            qWarning() << "url is invalid !!! url = " << url;
+            return nullptr;
+        }
+
         if (InfoCacheController::instance().cacheDisable(url.scheme()))
             return qSharedPointerDynamicCast<T>(instance().SchemeFactory<FileInfo>::
                                                         create(url, errorString));

include/dfm-base/settingdialog/customsettingitemregister.h

@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef CUSTOMSETTINGITEMREGISTER_H
+#define CUSTOMSETTINGITEMREGISTER_H
+
+#include <QMap>
+#include <QPair>
+
+class QWidget;
+class QObject;
+
+typedef QPair<QWidget *, QWidget *> (*CustomSettingItemCreator)(QObject *);
+
+namespace dfmbase {
+class CustomSettingItemRegister
+{
+public:
+    static CustomSettingItemRegister *instance();
+    bool registCustomSettingItemType(const QString &type, const CustomSettingItemCreator &creator);
+    const QMap<QString, CustomSettingItemCreator> &getCreators() const;
+
+private:
+    CustomSettingItemRegister();
+    QMap<QString, CustomSettingItemCreator> creators;
+};
+}
+
+#endif   // CUSTOMSETTINGITEMREGISTER_H

include/dfm-base/settingdialog/settingjsongenerator.h

@@ -0,0 +1,72 @@
+// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef SETTINGJSONGENERATOR_H
+#define SETTINGJSONGENERATOR_H
+
+#include <QVariantMap>
+
+/*
+ * the root group:
+ * {
+ *      "groups": [(top level group)]
+ * }
+ *
+ * a top level group:
+ * {
+ *      "key": (string),
+ *      "name": (string),
+ *      "groups": [(config group)]
+ * }
+ *
+ * a config group:
+ * {
+ *      "key": (string),
+ *      "name": (string),
+ *      "options": [(config item)]
+ * }
+ *
+ * config item: // option item
+ * {
+ *      "key": (string),
+ *      "text": (string),
+ *      "type": (string),
+ *      "default": (variant),
+ *      "hide": (bool),
+ *      "custom_info": (variant)
+ * }
+ * */
+
+namespace dfmbase {
+
+class SettingJsonGenerator
+{
+public:
+    static SettingJsonGenerator *instance();
+
+    QByteArray genSettingJson();
+    bool addGroup(const QString &key, const QString &name);
+    bool addConfig(const QString &key, const QVariantMap &config);
+    bool addCheckBoxConfig(const QString &key, const QString &text, bool defaultVal = true);
+    bool addComboboxConfig(const QString &key, const QString &name, const QStringList &options, int defaultVal = 0);
+    bool addComboboxConfig(const QString &key, const QString &name, const QVariantMap &options, QVariant defaultVal = QVariant());
+
+protected:
+    SettingJsonGenerator();
+
+    void mergeGroups();
+    QJsonObject constructTopGroup(const QString &key);
+    QJsonObject constructConfigGroup(const QString &key);
+    QJsonObject constructConfig(const QString &key);
+
+private:
+    QMap<QString, QString> topGroups;
+    QMap<QString, QString> tmpTopGroups;
+    QMap<QString, QString> configGroups;
+    QMap<QString, QString> tmpConfigGroups;
+    QMap<QString, QVariantMap> configs;
+};
+
+}
+#endif   // SETTINGJSONGENERATOR_H

src/apps/dde-desktop/main.cpp

@@ -9,6 +9,7 @@
 
 #include <dfm-base/base/configs/dconfig/dconfigmanager.h>
 #include <dfm-base/utils/sysinfoutils.h>
+#include <dfm-base/base/configs/dconfig/dconfigmanager.h>
 
 #include <dfm-framework/dpf.h>
 
@@ -52,8 +53,14 @@ static const char *const kLibCore = "libddplugin-core.so";
 static constexpr int kMemoryThreshold { 80 * 1024 };   // 80MB
 static constexpr int kTimerInterval { 60 * 1000 };   // 1 min
 
+DFMBASE_USE_NAMESPACE
+
 static bool pluginsLoad()
 {
+    QString msg;
+    if (!DConfigManager::instance()->addConfig(kPluginsDConfName, &msg))
+        qWarning() << "Load plugins but dconfig failed: " << msg;
+
     QStringList pluginsDirs;
 #ifdef QT_DEBUG
     const QString &pluginsDir { DFM_BUILD_PLUGIN_DIR };
@@ -77,7 +84,8 @@ static bool pluginsLoad()
                                                     "dfmplugin-tag", "dfmplugin-burn", "dfmplugin-dirshare", "dfmplugin-emblem",
                                                     "dfmplugin-filepreview" };
 
-    DPF_NAMESPACE::LifeCycle::initialize({ kDesktopPluginInterface, kCommonPluginInterface }, pluginsDirs, {}, kLazyLoadPluginNames);
+    QStringList blackNames { DConfigManager::instance()->value(kPluginsDConfName, "desktop.blackList").toStringList() };
+    DPF_NAMESPACE::LifeCycle::initialize({ kDesktopPluginInterface, kCommonPluginInterface }, pluginsDirs, blackNames, kLazyLoadPluginNames);
 
     qInfo() << "Depend library paths:" << DApplication::libraryPaths();
     qInfo() << "Load plugin paths: " << dpf::LifeCycle::pluginPaths();

src/apps/dde-file-dialog-wayland/main.cpp

@@ -9,12 +9,15 @@
 #include <QTextCodec>
 #include <QIcon>
 
+#include <dfm-base/base/configs/dconfig/dconfigmanager.h>
+
 #include <dfm-framework/dpf.h>
 
 #include <signal.h>
 
 DGUI_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
+DFMBASE_USE_NAMESPACE
 
 #ifdef DFM_ORGANIZATION_NAME
 #    define ORGANIZATION_NAME DFM_ORGANIZATION_NAME
@@ -67,17 +70,10 @@ static bool singlePluginLoad(const QString &pluginName, const QString &libName)
 
 static bool pluginsLoad()
 {
-    static const QStringList kBlackNameList {
-        "dfmplugin-burn",
-        "dfmplugin-dirshare",
-        "dfmplugin-myshares",
-        "dfmplugin-propertydialog",
-        "dfmplugin-trashcore",
-        "dfmplugin-trash",
-        "dfmplugin-filepreview",
-        "dfmplugin-vault",
-        "dfmplugin-phone"   // TODO(zhangs): use white list
-    };
+    QString msg;
+    if (!DConfigManager::instance()->addConfig(kPluginsDConfName, &msg))
+        qWarning() << "Load plugins but dconfig failed: " << msg;
+    QStringList blackNames { DConfigManager::instance()->value(kPluginsDConfName, "filedialog.blackList").toStringList() };
 
     static const QStringList kLazyLoadPluginNames {
         "dfmplugin-emblem",
@@ -105,7 +101,7 @@ static bool pluginsLoad()
     DPF_NAMESPACE::LifeCycle::initialize({ kDialogPluginInterface,
                                            kFmPluginInterface,
                                            kCommonPluginInterface },
-                                         pluginsDirs, kBlackNameList, kLazyLoadPluginNames);
+                                         pluginsDirs, blackNames, kLazyLoadPluginNames);
 
     qInfo() << "Depend library paths:" << DApplication::libraryPaths();
     qInfo() << "Load plugin paths: " << dpf::LifeCycle::pluginPaths();