From 75afbb371822114869ef5aae93f5242888bd3e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= Date: Tue, 7 Jul 2020 17:45:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9,=E4=B8=8D=E5=8A=A0=E8=BD=BD=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8F=92=E4=BB=B6(=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加配置项,不加载部分或全部插件 Log: 添加配置项,不加载部分插件(添加安全模式) Bug: https://pms.uniontech.com/zentao/task-view-28389.html --- frame/util/pluginloader.cpp | 10 +++++++++- gschema/com.deepin.dde.dock.module.gschema.xml | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/frame/util/pluginloader.cpp b/frame/util/pluginloader.cpp index eda710b15..3b2e90168 100644 --- a/frame/util/pluginloader.cpp +++ b/frame/util/pluginloader.cpp @@ -24,6 +24,7 @@ #include #include #include +#include PluginLoader::PluginLoader(const QString &pluginDirPath, QObject *parent) : QThread(parent) @@ -35,8 +36,10 @@ void PluginLoader::run() { QDir pluginsDir(m_pluginDirPath); const QStringList plugins = pluginsDir.entryList(QDir::Files); + static const QGSettings gsetting("com.deepin.dde.dock.disableplugins", "/com/deepin/dde/dock/disableplugins/"); + static const auto disable_plugins_list = gsetting.get("disable-plugins-list").toStringList(); - for (const QString file : plugins) + for (QString file : plugins) { if (!QLibrary::isLibrary(file)) continue; @@ -45,6 +48,11 @@ void PluginLoader::run() if (file.startsWith("libdde-dock-")) continue; + if (disable_plugins_list.contains(file)) { + qDebug() << "disable loading plugin:" << file; + continue; + } + emit pluginFounded(pluginsDir.absoluteFilePath(file)); } diff --git a/gschema/com.deepin.dde.dock.module.gschema.xml b/gschema/com.deepin.dde.dock.module.gschema.xml index 2af4a9313..1107352a3 100644 --- a/gschema/com.deepin.dde.dock.module.gschema.xml +++ b/gschema/com.deepin.dde.dock.module.gschema.xml @@ -16,6 +16,13 @@ + + + [] + disable loading plugins + dock disable loading plugins + + false