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

protect against crashing / interupted plasma exit with global shortcuts

Browse Source 
BUG:184042

svn path=/trunk/KDE/kdelibs/; revision=943557
This commit is contained in:
Aaron J. Seigo 2009-03-24 02:07:20 +00:00
parent 345738e8e6
commit 6d98e6f2aa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
applet.cpp
View File

@ -250,11 +250,6 @@ void Applet::save(KConfigGroup &g) const
//FIXME: we need a global save state too //FIXME: we need a global save state too
saveState(appletConfigGroup); saveState(appletConfigGroup);
if (d->activationAction) {
KConfigGroup shortcutConfig(&group, "Shortcuts");
shortcutConfig.writeEntry("global", d->activationAction->globalShortcut().toString());
}
if (d->configLoader) { if (d->configLoader) {
d->configLoader->writeConfig(); d->configLoader->writeConfig();
} }
@ -289,9 +284,11 @@ void Applet::restore(KConfigGroup &group)
QString shortcutText = shortcutConfig.readEntryUntranslated("global", QString()); QString shortcutText = shortcutConfig.readEntryUntranslated("global", QString());
if (!shortcutText.isEmpty()) { if (!shortcutText.isEmpty()) {
setGlobalShortcut(KShortcut(shortcutText)); setGlobalShortcut(KShortcut(shortcutText));
/*
kDebug() << "got global shortcut for" << name() << "of" << QKeySequence(shortcutText); kDebug() << "got global shortcut for" << name() << "of" << QKeySequence(shortcutText);
kDebug() << "set to" << d->activationAction->objectName() kDebug() << "set to" << d->activationAction->objectName()
<< d->activationAction->globalShortcut().primary(); << d->activationAction->globalShortcut().primary();
*/
} }
// local shortcut, if any // local shortcut, if any
@ -1298,6 +1295,10 @@ void Applet::setGlobalShortcut(const KShortcut &shortcut)
shortcut, shortcut,
KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut), KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
KAction::NoAutoloading); KAction::NoAutoloading);
KConfigGroup shortcutConfig(d->mainConfigGroup(), "Shortcuts");
shortcutConfig.writeEntry("global", d->activationAction->globalShortcut().toString());
d->scheduleModificationNotification();
//kDebug() << "after" << shortcut.primary() << d->activationAction->globalShortcut().primary(); //kDebug() << "after" << shortcut.primary() << d->activationAction->globalShortcut().primary();
} }