more consistent naming for containments

svn path=/trunk/KDE/kdelibs/; revision=1032391
This commit is contained in:
Aaron J. Seigo 2009-10-07 18:31:14 +00:00
parent d3b0d566b1
commit 3037b9823d

View File

@ -772,14 +772,16 @@ bool Applet::isBusy() const
QString Applet::name() const
{
if (d->isContainment) {
if (!d->appletDescription.isValid()) {
return i18n("Unknown Activity");
}
const Containment *c = qobject_cast<const Containment*>(this);
if (c && !c->activity().isNull()) {
return i18n("%1 Activity", c->activity());
}
if (!d->appletDescription.isValid()) {
return i18n("Unknown Activity");
} else {
return i18n("%1 Activity", d->appletDescription.name());
}
} else if (!d->appletDescription.isValid()) {
return i18n("Unknown Widget");
}