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

Merge remote branch 'origin/KDE/4.7' into origin-frameworks

Browse Source 
Conflicts:
	kdecore/tests/kservicetest.cpp
	plasma/framesvg.cpp
This commit is contained in:
David Faure 2011-09-28 17:44:59 +02:00
commit 685bebaed9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containment.cpp
View File

@ -696,6 +696,7 @@ void ContainmentPrivate::addAppletActions(KMenu &desktopMenu, Applet *applet, QE
} }
} }
if (!applet->d->failed) {
QAction *configureApplet = applet->d->actions->action("configure"); QAction *configureApplet = applet->d->actions->action("configure");
if (configureApplet && configureApplet->isEnabled()) { if (configureApplet && configureApplet->isEnabled()) {
desktopMenu.addAction(configureApplet); desktopMenu.addAction(configureApplet);
@ -705,6 +706,7 @@ void ContainmentPrivate::addAppletActions(KMenu &desktopMenu, Applet *applet, QE
if (runAssociatedApplication && runAssociatedApplication->isEnabled()) { if (runAssociatedApplication && runAssociatedApplication->isEnabled()) {
desktopMenu.addAction(runAssociatedApplication); desktopMenu.addAction(runAssociatedApplication);
} }
}
KMenu *containmentMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", q->name()), &desktopMenu); KMenu *containmentMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", q->name()), &desktopMenu);
addContainmentActions(*containmentMenu, event); addContainmentActions(*containmentMenu, event);

2
private/storage_p.h
View File

@ -32,6 +32,8 @@
class StorageJob : public Plasma::ServiceJob class StorageJob : public Plasma::ServiceJob
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QVariantHash data READ data WRITE setData)
public: public:
StorageJob(const QString& destination, StorageJob(const QString& destination,
const QString& operation, const QString& operation,