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

respect "null" as a containment request: no wallpaper

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=858909
This commit is contained in:
Aaron J. Seigo 2008-09-09 01:16:10 +00:00
parent 81ff908a3e
commit 4ae5e8bdf7
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
containment.cpp
View File

@ -1184,8 +1184,9 @@ void Containment::setDrawWallpaper(bool drawWallpaper)
d->drawWallpaper = drawWallpaper; d->drawWallpaper = drawWallpaper;
if (d->drawWallpaper) { if (d->drawWallpaper) {
KConfigGroup cfg = config(); KConfigGroup cfg = config();
setWallpaper(cfg.readEntry("wallpaperplugin", defaultWallpaper), QString wallpaper = cfg.readEntry("wallpaperplugin", defaultWallpaper);
cfg.readEntry("wallpaperpluginmode", defaultWallpaperMode)); QString mode = cfg.readEntry("wallpaperpluginmode", defaultWallpaperMode);
setWallpaper(wallpaper, mode);
} else if (!d->drawWallpaper && d->wallpaper) { } else if (!d->drawWallpaper && d->wallpaper) {
delete d->wallpaper; delete d->wallpaper;
d->wallpaper = 0; d->wallpaper = 0;

1
containment.h
View File

@ -495,6 +495,7 @@ class PLASMA_EXPORT Containment : public Applet
Q_PRIVATE_SLOT(d, void toggleDesktopImmutability()) Q_PRIVATE_SLOT(d, void toggleDesktopImmutability())
friend class Applet; friend class Applet;
friend class CoronaPrivate;
friend class ContainmentPrivate; friend class ContainmentPrivate;
ContainmentPrivate* const d; ContainmentPrivate* const d;
}; };

4
corona.cpp
View File

@ -136,6 +136,10 @@ public:
delete applet; delete applet;
containment = new Containment(0, 0, id); containment = new Containment(0, 0, id);
if (pluginName == "null") {
containment->setDrawWallpaper(false);
}
// we want to provide something and don't care about the failure to launch // we want to provide something and don't care about the failure to launch
containment->setFailedToLaunch(false); containment->setFailedToLaunch(false);
containment->setFormFactor(Plasma::Planar); containment->setFormFactor(Plasma::Planar);