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

The in libplasma embedded ExtenderApplet actually works now!

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=860069
This commit is contained in:
Rob Scheepmaker 2008-09-11 21:21:18 +00:00
parent 4156bbaed4
commit 7d9f3e29c1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applet.cpp
View File

@ -1359,7 +1359,7 @@ Applet* Applet::load(const QString& appletName, uint appletId, const QVariantLis
KPluginLoader plugin(*offer); KPluginLoader plugin(*offer);
if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion())) { if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion()) && (appletName != "extender")) {
return 0; return 0;
} }
@ -1368,7 +1368,7 @@ Applet* Applet::load(const QString& appletName, uint appletId, const QVariantLis
QString error; QString error;
Applet *applet; Applet *applet;
if (appletName == "extenderapplet") { if (appletName == "extender") {
applet = new ExtenderApplet(0, allArgs); applet = new ExtenderApplet(0, allArgs);
} else { } else {
applet = offer->createInstance<Plasma::Applet>(0, allArgs, &error); applet = offer->createInstance<Plasma::Applet>(0, allArgs, &error);

2
extenderitem.cpp
View File

@ -866,7 +866,7 @@ void ExtenderItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
mousePos = d->scenePosFromScreenPos(event->screenPos() - d->mousePos); mousePos = d->scenePosFromScreenPos(event->screenPos() - d->mousePos);
foreach (Containment *containment, corona->containments()) { foreach (Containment *containment, corona->containments()) {
if (containment->sceneBoundingRect().contains(mousePos)) { if (containment->sceneBoundingRect().contains(mousePos)) {
Applet *applet = containment->addApplet("extenderapplet", Applet *applet = containment->addApplet("extender",
QVariantList(), QVariantList(),
QRectF(mousePos, size())); QRectF(mousePos, size()));
setExtender(applet->extender()); setExtender(applet->extender());