Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: update dock plugin version

Browse Source 
add new interface for remove plugin settings PluginProxyInterface

Change-Id: Ib26c879b3b5faa822adbee5bf33c1bae3935b7c1
This commit is contained in:
listenerri 2019-02-14 17:20:56 +08:00
parent 040dca5e1a
commit e7002b8f28
Notes: gerrit 2019-02-14 17:43:04 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Thu, 14 Feb 2019 17:43:03 +0800
Reviewed-on: https://cr.deepin.io/41624
Project: dde/dde-dock
Branch: refs/heads/dev/daemon-plugin-settings
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frame/util/abstractpluginscontroller.cpp
View File

@ -28,6 +28,7 @@
static const QStringList CompatiblePluginApiList { static const QStringList CompatiblePluginApiList {
"1.1.1", "1.1.1",
"1.2",
DOCK_PLUGIN_API_VERSION DOCK_PLUGIN_API_VERSION
}; };
@ -69,6 +70,21 @@ const QVariant AbstractPluginsController::getValue(PluginsItemInterface *const i
return v; return v;
} }
void AbstractPluginsController::removeValue(PluginsItemInterface * const itemInter, const QStringList &keyList)
{
if (keyList.isEmpty()) {
m_pluginSettingsObject.remove(itemInter->pluginName());
} else {
QJsonObject localObject = m_pluginSettingsObject.value(itemInter->pluginName()).toObject();
for (auto key : keyList) {
localObject.remove(key);
}
m_pluginSettingsObject.insert(itemInter->pluginName(), localObject);
}
m_dockDaemonInter->RemovePluginSettings(itemInter->pluginName(), keyList);
}
QMap<PluginsItemInterface *, QMap<QString, QObject *> > &AbstractPluginsController::pluginsMap() QMap<PluginsItemInterface *, QMap<QString, QObject *> > &AbstractPluginsController::pluginsMap()
{ {
return m_pluginsMap; return m_pluginsMap;

1
frame/util/abstractpluginscontroller.h
View File

@ -45,6 +45,7 @@ public:
// implements PluginProxyInterface // implements PluginProxyInterface
void saveValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &value) Q_DECL_OVERRIDE; void saveValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant &value) Q_DECL_OVERRIDE;
const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& fallback = QVariant()) Q_DECL_OVERRIDE; const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& fallback = QVariant()) Q_DECL_OVERRIDE;
void removeValue(PluginsItemInterface * const itemInter, const QStringList &keyList) override;
protected: protected:
QMap<PluginsItemInterface *, QMap<QString, QObject *>> &pluginsMap(); QMap<PluginsItemInterface *, QMap<QString, QObject *>> &pluginsMap();

2
interfaces/constants.h
View File

@ -27,7 +27,7 @@
namespace Dock { namespace Dock {
#define DOCK_PLUGIN_MIME "dock/plugin" #define DOCK_PLUGIN_MIME "dock/plugin"
#define DOCK_PLUGIN_API_VERSION "1.2" #define DOCK_PLUGIN_API_VERSION "1.2.1"
#define PROP_DISPLAY_MODE "DisplayMode" #define PROP_DISPLAY_MODE "DisplayMode"
/// ///

8
interfaces/pluginproxyinterface.h
View File

@ -85,6 +85,14 @@ public:
/// return value from .config/deepin/dde-dock.conf /// return value from .config/deepin/dde-dock.conf
/// ///
virtual const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& fallback = QVariant()) = 0; virtual const QVariant getValue(PluginsItemInterface *const itemInter, const QString &key, const QVariant& fallback = QVariant()) = 0;
///
/// \brief removeValue
/// remove the values specified by keyList
/// remove all values of itemInter if keyList is empty
/// SeeAlse: saveValue
///
virtual void removeValue(PluginsItemInterface *const itemInter, const QStringList &keyList) = 0;
}; };
#endif // PLUGINPROXYINTERFACE_H #endif // PLUGINPROXYINTERFACE_H