if a custom config file is specified for the layout restore of the
corona, try to restore correctly the cashews positions too svn path=/trunk/KDE/kdelibs/; revision=980468
This commit is contained in:
parent
d199bb679c
commit
a5f83c0e2b
@ -401,13 +401,19 @@ void ToolBox::save(KConfigGroup &cg) const
|
|||||||
group.writeEntry("offset", offset);
|
group.writeEntry("offset", offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ToolBox::load()
|
void ToolBox::load(const KConfigGroup &containmentGroup)
|
||||||
{
|
{
|
||||||
if (!d->movable) {
|
if (!d->movable) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
KConfigGroup group = d->containment->config();
|
KConfigGroup group;
|
||||||
|
if (containmentGroup.isValid()) {
|
||||||
|
group = containmentGroup;
|
||||||
|
} else {
|
||||||
|
group = d->containment->config();
|
||||||
|
}
|
||||||
|
|
||||||
group = KConfigGroup(&group, "ToolBox");
|
group = KConfigGroup(&group, "ToolBox");
|
||||||
|
|
||||||
if (!group.hasKey("corner")) {
|
if (!group.hasKey("corner")) {
|
||||||
|
@ -87,7 +87,7 @@ public:
|
|||||||
void setViewTransform(QTransform transforn);
|
void setViewTransform(QTransform transforn);
|
||||||
|
|
||||||
void save(KConfigGroup &cg) const;
|
void save(KConfigGroup &cg) const;
|
||||||
void load();
|
void load(const KConfigGroup &containmentGroup = KConfigGroup());
|
||||||
void reposition();
|
void reposition();
|
||||||
|
|
||||||
virtual void showToolBox() = 0;
|
virtual void showToolBox() = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user