diff --git a/containment.cpp b/containment.cpp index a546721a8..6a58ccb84 100644 --- a/containment.cpp +++ b/containment.cpp @@ -972,7 +972,7 @@ bool Containment::drawWallpaper() return d->drawWallpaper; } -void Containment::setWallpaper(const QString &pluginName, const QString &action) +void Containment::setWallpaper(const QString &pluginName, const QString &mode) { delete d->wallpaper; if (!pluginName.isEmpty()) { @@ -980,7 +980,7 @@ void Containment::setWallpaper(const QString &pluginName, const QString &action) setDrawWallpaper(d->wallpaper != 0); if (d->wallpaper) { d->wallpaper->setBoundingRect(geometry()); - d->wallpaper->init(action); + d->wallpaper->init(mode); connect(d->wallpaper, SIGNAL(update(const QRectF&)), this, SLOT(updateRect(const QRectF&))); } @@ -990,7 +990,7 @@ void Containment::setWallpaper(const QString &pluginName, const QString &action) } } -Plasma::Wallpaper* Containment::wallpaper() +Plasma::Wallpaper* Containment::wallpaper() const { return d->wallpaper; } diff --git a/containment.h b/containment.h index adace97d3..413efd40a 100644 --- a/containment.h +++ b/containment.h @@ -282,13 +282,18 @@ class PLASMA_EXPORT Containment : public Applet /** * Sets wallpaper plugin. + * + * @param pluginName the name of the wallpaper to attempt to load + * @param mode optional mode or the wallpaper plugin (e.g. "Slideshow"). + * These values are pugin specific and enumerated in the plugin's + * .desktop file. */ - void setWallpaper(const QString &pluginName, const QString &action = QString()); + void setWallpaper(const QString &pluginName, const QString &mode = QString()); /** * Return wallpaper plugin. */ - Plasma::Wallpaper* wallpaper(); + Plasma::Wallpaper* wallpaper() const; Q_SIGNALS: