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

use trigger for config group

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1012648
This commit is contained in:
Chani Armitage 2009-08-17 22:31:37 +00:00
parent 2ab601f945
commit 0ecafe8131
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
containment.cpp
View File

@ -243,7 +243,7 @@ void Containment::init()
switch (d->type) { switch (d->type) {
case DesktopContainment: case DesktopContainment:
defaults.insert("wheel:Vertical;NoModifier", "switchdesktop"); defaults.insert("wheel:Vertical;NoModifier", "switchdesktop");
defaults.insert("MiddleButton;NoModifier", "paste"); defaults.insert("MidButton;NoModifier", "paste");
defaults.insert("RightButton;NoModifier", "contextmenu"); defaults.insert("RightButton;NoModifier", "contextmenu");
break; break;
case PanelContainment: case PanelContainment:
@ -615,7 +615,7 @@ void ContainmentPrivate::containmentActions(KMenu &desktopMenu)
if (!plugin->isInitialized()) { if (!plugin->isInitialized()) {
KConfigGroup cfg = q->config(); KConfigGroup cfg = q->config();
cfg = KConfigGroup(&cfg, "ActionPlugins"); cfg = KConfigGroup(&cfg, "ActionPlugins");
KConfigGroup pluginConfig = KConfigGroup(&cfg, plugin->pluginName()); KConfigGroup pluginConfig = KConfigGroup(&cfg, trigger);
plugin->restore(pluginConfig); plugin->restore(pluginConfig);
} }
@ -1704,7 +1704,7 @@ void Containment::setContainmentActions(const QString &trigger, const QString &p
//it already existed, just reload config //it already existed, just reload config
if (plugin->isInitialized()) { if (plugin->isInitialized()) {
//FIXME make a truly unique config group //FIXME make a truly unique config group
KConfigGroup pluginConfig = KConfigGroup(&cfg, pluginName); KConfigGroup pluginConfig = KConfigGroup(&cfg, trigger);
plugin->restore(pluginConfig); plugin->restore(pluginConfig);
} }
} else { } else {
@ -2256,7 +2256,7 @@ bool ContainmentPrivate::prepareContainmentActions(const QString &trigger, const
if (!plugin->isInitialized()) { if (!plugin->isInitialized()) {
KConfigGroup cfg = q->config(); KConfigGroup cfg = q->config();
cfg = KConfigGroup(&cfg, "ActionPlugins"); cfg = KConfigGroup(&cfg, "ActionPlugins");
KConfigGroup pluginConfig = KConfigGroup(&cfg, plugin->pluginName()); KConfigGroup pluginConfig = KConfigGroup(&cfg, trigger);
plugin->restore(pluginConfig); plugin->restore(pluginConfig);
} }