From 8e9bd0ff0918300c555e21840affde2e6d587acf Mon Sep 17 00:00:00 2001 From: Chani Armitage Date: Tue, 3 Jun 2008 00:24:51 +0000 Subject: [PATCH] revert my last commit; this does work after all, sorry. svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=815996 --- applet.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/applet.cpp b/applet.cpp index a626c10be..03a7b02a1 100644 --- a/applet.cpp +++ b/applet.cpp @@ -944,8 +944,11 @@ void Applet::setGlobalShortcut(const KShortcut &shortcut) d->activationAction->setObjectName(QString("Activate %1 Widget").arg(name())); // NO I18N connect(d->activationAction, SIGNAL(triggered()), this, SIGNAL(activate())); connect(this, SIGNAL(activate()), this, SLOT(setFocus())); - //TODO: when local shortcuts are possible, we'll need to always be associated with the right - //widget + + QList widgets = d->actions.associatedWidgets(); + foreach (QWidget *w, widgets) { + w->addAction(d->activationAction); + } } d->activationAction->setGlobalShortcut(shortcut);