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

Renamed extender to internal:extender to avoid possible name clashes.

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=860083
This commit is contained in:
Rob Scheepmaker 2008-09-11 22:51:43 +00:00
parent 7d9f3e29c1
commit 11a5a957d0
3 changed files with 4 additions and 4 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()) && (appletName != "extender")) { if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion()) && (appletName != "internal: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 == "extender") { if (appletName == "internal: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("extender", Applet *applet = containment->addApplet("internal:extender",
QVariantList(), QVariantList(),
QRectF(mousePos, size())); QRectF(mousePos, size()));
setExtender(applet->extender()); setExtender(applet->extender());

2
servicetypes/plasma-applet-extenderapplet.desktop
View File

@ -2,5 +2,5 @@
Name=Internal Extender Container Name=Internal Extender Container
Type=Service Type=Service
X-KDE-ServiceTypes=Plasma/Applet X-KDE-ServiceTypes=Plasma/Applet
X-KDE-PluginInfo-Name=extender X-KDE-PluginInfo-Name=internal:extender
X-KDE-PluginInfo-EnabledByDefault=false X-KDE-PluginInfo-EnabledByDefault=false