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

load the wallpaper before setting the screen

Browse Source 
we want the wallpaper showing before the plasmoids.
we still need to load the wallpaper only after a screen has been
assigned, but will be done after
This commit is contained in:
Marco Martin 2013-08-08 17:59:30 +02:00
parent ce13335f36
commit 5d4f1b381f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plasma/containment.cpp
View File

@ -179,6 +179,8 @@ void Containment::restore(KConfigGroup &group)
setLocation((Plasma::Types::Location)group.readEntry("location", (int)d->location)); setLocation((Plasma::Types::Location)group.readEntry("location", (int)d->location));
setFormFactor((Plasma::Types::FormFactor)group.readEntry("formfactor", (int)d->formFactor)); setFormFactor((Plasma::Types::FormFactor)group.readEntry("formfactor", (int)d->formFactor));
setWallpaper(group.readEntry("wallpaperplugin", ContainmentPrivate::defaultWallpaper));
//qDebug() << "setScreen from restore"; //qDebug() << "setScreen from restore";
d->setScreen(group.readEntry("screen", d->screen)); d->setScreen(group.readEntry("screen", d->screen));
d->activityId = group.readEntry("activityId", QString()); d->activityId = group.readEntry("activityId", QString());
@ -187,7 +189,7 @@ void Containment::restore(KConfigGroup &group)
restoreContents(group); restoreContents(group);
setImmutability((Types::ImmutabilityType)group.readEntry("immutability", (int)Types::Mutable)); setImmutability((Types::ImmutabilityType)group.readEntry("immutability", (int)Types::Mutable));
setWallpaper(group.readEntry("wallpaperplugin", ContainmentPrivate::defaultWallpaper));
KConfigGroup cfg = KConfigGroup(corona()->config(), "ActionPlugins"); KConfigGroup cfg = KConfigGroup(corona()->config(), "ActionPlugins");
cfg = KConfigGroup(&cfg, QString::number(containmentType())); cfg = KConfigGroup(&cfg, QString::number(containmentType()));

2
src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
View File

@ -82,7 +82,6 @@ Plasma::ConfigLoader *WallpaperInterface::configScheme()
void WallpaperInterface::syncWallpaperPackage() void WallpaperInterface::syncWallpaperPackage()
{ {
qWarning()<<"22222222222222222"<<m_wallpaperPlugin<<" "<<m_containmentInterface->containment()->wallpaper();
if (m_wallpaperPlugin == m_containmentInterface->containment()->wallpaper()) { if (m_wallpaperPlugin == m_containmentInterface->containment()->wallpaper()) {
return; return;
} }
@ -129,6 +128,7 @@ qWarning()<<"22222222222222222"<<m_wallpaperPlugin<<" "<<m_containmentInterface-
} else { } else {
qWarning() << "Error loading the wallpaper, package not found"; qWarning() << "Error loading the wallpaper, package not found";
} }
emit packageChanged(); emit packageChanged();
emit configurationChanged(); emit configurationChanged();
} }