* Misc => Miscellaneous

* provide acccess to the applet id and plugin name

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=696629
This commit is contained in:
Aaron J. Seigo 2007-08-05 13:01:09 +00:00
parent b1d1f1959f
commit d10dba893e
2 changed files with 29 additions and 5 deletions

View File

@ -352,6 +352,11 @@ Applet::~Applet()
delete d; delete d;
} }
uint Applet::id() const
{
return d->appletId;
}
KConfigGroup Applet::config() const KConfigGroup Applet::config() const
{ {
return KConfigGroup(d->config(), "General"); return KConfigGroup(d->config(), "General");
@ -444,13 +449,22 @@ QString Applet::icon() const
return d->appletDescription.icon(); return d->appletDescription.icon();
} }
QString Applet::pluginName() const
{
if (!d->appletDescription.isValid()) {
return QString();
}
return d->appletDescription.pluginName();
}
QString Applet::category() const QString Applet::category() const
{ {
if (!d->appletDescription.isValid()) { if (!d->appletDescription.isValid()) {
return i18n("Misc"); return i18n("Miscellaneous");
} }
return d->appletDescription.property("X-KDE-PluginInfo-Category").toString(); return d->appletDescription.category();
} }
QString Applet::category(const KPluginInfo& applet) QString Applet::category(const KPluginInfo& applet)
@ -823,7 +837,7 @@ KPluginInfo::List Applet::knownApplets(const QString &category,
} }
constraint.append("[X-KDE-PluginInfo-Category] == '").append(category).append("'"); constraint.append("[X-KDE-PluginInfo-Category] == '").append(category).append("'");
if (category == "Misc") { if (category == "Miscellaneous") {
constraint.append(" or (not exist [X-KDE-PluginInfo-Category] or [X-KDE-PluginInfo-Category] == '')"); constraint.append(" or (not exist [X-KDE-PluginInfo-Category] or [X-KDE-PluginInfo-Category] == '')");
} }
} }
@ -857,8 +871,8 @@ QStringList Applet::knownCategories(const QString &parentApp)
QString appletCategory = applet->property("X-KDE-PluginInfo-Category").toString(); QString appletCategory = applet->property("X-KDE-PluginInfo-Category").toString();
//kDebug() << " and we have " << appletCategory; //kDebug() << " and we have " << appletCategory;
if (appletCategory.isEmpty()) { if (appletCategory.isEmpty()) {
if (!categories.contains(i18n("Misc"))) { if (!categories.contains(i18n("Miscellaneous"))) {
categories << i18n("Misc"); categories << i18n("Miscellaneous");
} }
} else if (!categories.contains(appletCategory)) { } else if (!categories.contains(appletCategory)) {
categories << appletCategory; categories << appletCategory;

View File

@ -95,6 +95,11 @@ class PLASMA_EXPORT Applet : public Widget
~Applet(); ~Applet();
/**
* @return the id of this applet
*/
uint id() const;
/** /**
* Returns the KConfigGroup to access the applets configuration. * Returns the KConfigGroup to access the applets configuration.
* *
@ -332,6 +337,11 @@ class PLASMA_EXPORT Applet : public Widget
**/ **/
QString name() const; QString name() const;
/**
* Returns the plugin name for the applet
*/
QString pluginName() const;
/** /**
* Returns the icon related to this applet * Returns the icon related to this applet
**/ **/