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

better name for the method, and the setter will be replaced by package content

Browse Source
This commit is contained in:
Aaron Seigo 2013-03-04 13:50:42 +01:00
parent efb57d45b9
commit 3edcbc51a3
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/containment.cpp
View File

@ -187,7 +187,7 @@ void Containment::restore(KConfigGroup &group)
}
} else { //shell defaults
//steal the data directly, for efficiency
QHash<QString,QString> defaults = corona()->containmentActionsDefaults(d->type);
QHash<QString,QString> defaults = corona()->defaultContainmentActionsPlugins(d->type);
for (QHash<QString,QString>::const_iterator it = defaults.constBegin(),
end = defaults.constEnd(); it != end; ++it) {
addContainmentActions(it.key(), it.value());

13
src/plasma/corona.cpp
View File

@ -388,18 +388,9 @@ void Corona::addShortcuts(KActionCollection *newShortcuts)
}
}
void Corona::setContainmentActionsDefault(Plasma::ContainmentType containmentType, QEvent *trigger, const QString &name)
{
d->containmentActionsDefaults[containmentType].insert(ContainmentActions::eventToString(trigger), name);
}
QString Corona::containmentActionsDefault(Plasma::ContainmentType containmentType, QEvent *trigger) const
{
return d->containmentActionsDefaults.value(containmentType).value(ContainmentActions::eventToString(trigger));
}
QHash<QString, QString> Corona::containmentActionsDefaults(ContainmentType containmentType) const
QHash<QString, QString> Corona::defaultContainmentActionsPlugins(ContainmentType containmentType) const
{
//FIXME: need to read these out of the package
return d->containmentActionsDefaults.value(containmentType);
}

19
src/plasma/corona.h
View File

@ -187,21 +187,12 @@ public:
/**
* @since 5.0
* Sets the default containmentactions plugins for the given containment type
* Returns the default containmentactions plugins for the given containment type.
*
* @arg containmentType the type of containment these actions apply to
* @return a hash containing the triggers and the plugin names associated with them
*/
void setContainmentActionsDefault(Plasma::ContainmentType containmentType, QEvent *trigger, const QString &name);
/**
* @since 5.0
* Returns the default containmentactions plugins for the given containment type
*/
QString containmentActionsDefault(ContainmentType containmentType, QEvent *trigger) const;
/**
* @since 5.0
* Returns the default containmentactions plugins for the given containment type
*/
QHash<QString, QString> containmentActionsDefaults(ContainmentType containmentType) const;
QHash<QString, QString> defaultContainmentActionsPlugins(ContainmentType containmentType) const;
/**
* @param the AbstractDialogManager implementation