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

activity naming happens elsewhere now; generify panels

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1129009
This commit is contained in:
Aaron J. Seigo 2010-05-21 01:07:31 +00:00
parent aa5e85e3fa
commit 162eb8db18
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
applet.cpp
View File

@ -790,17 +790,12 @@ QString Applet::name() const
{
if (d->isContainment) {
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 if (c && (c->d->type == Containment::PanelContainment ||
c->d->type == Containment::CustomPanelContainment)) {
return d->appletDescription.name();
if (c && c->d->isPanelContainment()) {
return i18n("Panel");
} else if (!d->appletDescription.isValid()) {
return i18n("Unknown");
} else {
return i18n("%1 Activity", d->appletDescription.name());
return d->appletDescription.name();
}
} else if (!d->appletDescription.isValid()) {
return i18n("Unknown Widget");