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

consolidate loading a bit more even, only save when applet is new

Browse Source
This commit is contained in:
Aaron Seigo 2013-02-13 21:38:47 +01:00
parent ec1c4d18fc
commit bc1b63ebad
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plasma/containment.cpp
View File

@ -539,10 +539,19 @@ void Containment::addApplet(Applet *applet, const QPointF &pos)
connect(applet, SIGNAL(activate()), this, SIGNAL(activate())); connect(applet, SIGNAL(activate()), this, SIGNAL(activate()));
if (!currentContainment) { if (!currentContainment) {
const bool isNew = applet->d->mainConfigGroup()->entryMap().isEmpty();
if (!isNew) {
applet->restore(*applet->d->mainConfigGroup()); applet->restore(*applet->d->mainConfigGroup());
}
applet->init(); applet->init();
if (isNew) {
applet->save(*applet->d->mainConfigGroup());
emit configNeedsSaving();
}
//FIXME: an on-appear animation would be nice to have again //FIXME: an on-appear animation would be nice to have again
d->appletAppeared(applet);
} }
applet->updateConstraints(Plasma::AllConstraints); applet->updateConstraints(Plasma::AllConstraints);

8
plasma/private/containment_p.cpp
View File

@ -423,14 +423,6 @@ void ContainmentPrivate::appletDeleted(Plasma::Applet *applet)
emit q->configNeedsSaving(); emit q->configNeedsSaving();
} }
void ContainmentPrivate::appletAppeared(Applet *applet)
{
//kDebug() << type << Containment::DesktopContainment;
KConfigGroup *cg = applet->d->mainConfigGroup();
applet->save(*cg);
emit q->configNeedsSaving();
}
bool ContainmentPrivate::isPanelContainment() const bool ContainmentPrivate::isPanelContainment() const
{ {
return type == Containment::PanelContainment || type == Containment::CustomPanelContainment; return type == Containment::PanelContainment || type == Containment::CustomPanelContainment;

1
plasma/private/containment_p.h
View File

@ -88,7 +88,6 @@ public:
bool isPanelContainment() const; bool isPanelContainment() const;
void setLockToolText(); void setLockToolText();
void appletDeleted(Applet*); void appletDeleted(Applet*);
void appletAppeared(Applet*);
void addContainmentActions(KMenu &desktopMenu, QEvent *event); void addContainmentActions(KMenu &desktopMenu, QEvent *event);
void addAppletActions(KMenu &desktopMenu, Applet *applet, QEvent *event); void addAppletActions(KMenu &desktopMenu, Applet *applet, QEvent *event);
void checkRemoveAction(); void checkRemoveAction();