alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix loading of containmentactions plugins

Browse Source
This commit is contained in:
Marco Martin 2013-08-14 14:08:18 +02:00
parent 55d6c78c9a
commit 834f73a101
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plasma/containment.cpp
View File

@ -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()));
} }
} }

5
src/plasma/containmentactions.h
View File

@ -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

2
src/plasma/pluginloader.cpp
View File

@ -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
src/shell/qmlpackages/desktop/contents/defaults
View File

@ -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