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

clean up after a drop

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1022560
This commit is contained in:
Aaron J. Seigo 2009-09-12 02:38:10 +00:00
parent 36b30b8751
commit 432ad10dbe
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
containment.cpp
View File

@ -1300,29 +1300,46 @@ void ContainmentPrivate::dropData(QPointF scenePos, QPoint screenPos, QGraphicsS
}
}
void ContainmentPrivate::clearDataForMimeJob(KIO::Job *job)
{
dropPoints.remove(job);
KMenu *choices = dropMenus.take(job);
if (choices) {
delete choices;
}
job->kill();
}
void ContainmentPrivate::mimeTypeRetrieved(KIO::Job * job, const QString &mimetype)
{
kDebug() << "Mimetype Job returns." << mimetype;
if (job->error()) {
// TODO: error feedback
clearDataForMimeJob(job);
kDebug() << "ERROR" << job->error() << ' ' << job->errorString();
return;
} else {
KIO::TransferJob* tjob = dynamic_cast<KIO::TransferJob*>(job);
if (!tjob) {
kDebug() << "job should be a TransferJob, but isn't";
clearDataForMimeJob(job);
return;
}
QPointF posi; // will be overwritten with the event's position
if (!dropPoints.keys().contains(tjob)) {
kDebug() << "Bailing out. Cannot find associated dropEvent related to the TransferJob";
return;
} else {
if (dropPoints.keys().contains(tjob)) {
posi = dropPoints[tjob];
kDebug() << "Received a suitable dropEvent at" << posi;
} else {
kDebug() << "Bailing out. Cannot find associated dropEvent related to the TransferJob";
clearDataForMimeJob(job);
return;
}
KMenu *choices = dropMenus[tjob];
KMenu *choices = dropMenus.value(tjob);
if (!choices) {
kDebug() << "Bailing out. No QMenu found for this job.";
clearDataForMimeJob(job);
return;
}
@ -1400,6 +1417,8 @@ void ContainmentPrivate::mimeTypeRetrieved(KIO::Job * job, const QString &mimety
} else {
addApplet(actionsToApplets[choice], args, QRectF(posi, QSize()));
}
clearDataForMimeJob(job);
return;
}
} else {
@ -1407,9 +1426,8 @@ void ContainmentPrivate::mimeTypeRetrieved(KIO::Job * job, const QString &mimety
addApplet("icon", args, QRectF(posi, QSize()));
}
}
// job is not needed anymore, clean it up, (we have already returned when an applet
// is created that might do something with the file now.
job->kill();
clearDataForMimeJob(job);
}
const QGraphicsItem *Containment::toolBoxItem() const

4
private/containment_p.h
View File

@ -56,6 +56,8 @@ public:
{
qDeleteAll(applets);
applets.clear();
qDeleteAll(dropMenus);
}
ToolBox *createToolBox();
@ -80,6 +82,7 @@ public:
void containmentAppletAnimationComplete(QGraphicsItem *item, Plasma::Animator::Animation anim);
void zoomIn();
void zoomOut();
void clearDataForMimeJob(KIO::Job *job);
void mimeTypeRetrieved(KIO::Job *job, const QString &mimetype);
void containmentActions(KMenu &desktopMenu);
void appletActions(KMenu &desktopMenu, Applet *applet, bool includeApplet);
@ -141,7 +144,6 @@ public:
bool drawWallpaper;
QHash<KIO::Job*, QPointF> dropPoints;
QHash<KIO::Job*, KMenu*> dropMenus;
};
} // Plasma namespace