fix loading of containmentactions plugins
This commit is contained in:
parent
55d6c78c9a
commit
834f73a101
@ -212,8 +212,7 @@ void Containment::restore(KConfigGroup &group)
|
|||||||
defaultActionsCfg = KConfigGroup(&defaultActionsCfg, "ContainmentActions");
|
defaultActionsCfg = KConfigGroup(&defaultActionsCfg, "ContainmentActions");
|
||||||
|
|
||||||
foreach (const QString &key, defaultActionsCfg.keyList()) {
|
foreach (const QString &key, defaultActionsCfg.keyList()) {
|
||||||
//qDebug() << "loading" << key;
|
addContainmentActions(key, defaultActionsCfg.readEntry(key, QString()));
|
||||||
addContainmentActions(key, cfg.readEntry(key, QString()));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,12 +155,11 @@ class PLASMA_EXPORT ContainmentActions : public QObject
|
|||||||
/**
|
/**
|
||||||
* Register a containmentactions when it is contained in a loadable module
|
* Register a containmentactions when it is contained in a loadable module
|
||||||
*/
|
*/
|
||||||
#define K_EXPORT_PLASMA_CONTAINMENTACTIONS(libname, classname) \
|
|
||||||
K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
|
|
||||||
K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
|
|
||||||
|
|
||||||
#define K_EXPORT_PLASMA_CONTAINMENTACTIONS_WITH_JSON(libname, classname, jsonFile) \
|
#define K_EXPORT_PLASMA_CONTAINMENTACTIONS_WITH_JSON(libname, classname, jsonFile) \
|
||||||
K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin<classname>();) \
|
K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin<classname>();) \
|
||||||
K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
|
K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
|
||||||
|
|
||||||
|
Q_DECLARE_METATYPE(Plasma::ContainmentActions*)
|
||||||
|
|
||||||
#endif // PLASMA_CONTAINMENTACTIONS_H
|
#endif // PLASMA_CONTAINMENTACTIONS_H
|
||||||
|
@ -377,7 +377,7 @@ ContainmentActions *PluginLoader::loadContainmentActions(Containment *parent, co
|
|||||||
|
|
||||||
if (offers.isEmpty()) {
|
if (offers.isEmpty()) {
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
// qDebug() << "offers is empty for " << name;
|
qDebug() << "offers is empty for " << name;
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -4,14 +4,14 @@ ToolBox=org.kde.desktoptoolbox
|
|||||||
RuntimePlatform=
|
RuntimePlatform=
|
||||||
|
|
||||||
[Desktop][ContainmentActions]
|
[Desktop][ContainmentActions]
|
||||||
Ctrl;LeftButton=org.kde.standardmenu
|
RightButton=org.kde.contextmenu
|
||||||
MiddleButton=org.kde.paste
|
MiddleButton=org.kde.paste
|
||||||
|
|
||||||
[Panel]
|
[Panel]
|
||||||
Containment=org.kde.panel
|
Containment=org.kde.panel
|
||||||
ToolBox=org.kde.paneltoolbox
|
ToolBox=org.kde.paneltoolbox
|
||||||
[Panel][ContainmentActions]
|
[Panel][ContainmentActions]
|
||||||
Ctrl;LeftButton=org.kde.standardmenu
|
RightButton=org.kde.contextmenu
|
||||||
|
|
||||||
[Theme]
|
[Theme]
|
||||||
Theme=default
|
Theme=default
|
||||||
|
Loading…
Reference in New Issue
Block a user