From d1fa9d361bad63b6de676bc9cec0dd7f6b26b716 Mon Sep 17 00:00:00 2001
From: Chani Armitage <chanika@gmail.com>
Date: Fri, 6 Mar 2009 05:22:08 +0000
Subject: [PATCH] (hopefully) temporary fix for shortcuts. this could interfere
 with plasma-mid, because it assumes one view per window but it's the best we
 can get until we can use real QGraphicsWidget action stuff

svn path=/trunk/KDE/kdelibs/; revision=935758
---
 applet.cpp      | 4 ++--
 containment.cpp | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/applet.cpp b/applet.cpp
index d31893c98..1e1b24812 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -1033,7 +1033,6 @@ void Applet::flushPendingConstraintsEvents()
         closeApplet->setIcon(KIcon("edit-delete"));
         closeApplet->setEnabled(unlocked);
         closeApplet->setVisible(unlocked);
-        closeApplet->setShortcutContext(Qt::WidgetShortcut); //don't clash with other views
         closeApplet->setText(i18nc("%1 is the name of the applet", "Remove this %1", name()));
         if (d->isContainment) {
             closeApplet->setShortcut(QKeySequence("alt+d,alt+r"));
@@ -1170,6 +1169,7 @@ QAction *Applet::action(QString name) const
 void Applet::addAction(QString name, QAction *action)
 {
     d->actions.addAction(name, action);
+    QGraphicsWidget::addAction(action);
 }
 
 void Applet::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -1401,7 +1401,7 @@ void Applet::setHasConfigurationInterface(bool hasInterface)
         if (!configAction) { //should be always true
             configAction = new KAction(i18n("%1 Settings", name()), this);
             configAction->setIcon(KIcon("configure"));
-            configAction->setShortcutContext(Qt::WidgetShortcut); //don't clash with other views
+            //configAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); //don't clash with other views
             bool unlocked = immutability() == Mutable;
             bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
             configAction->setVisible(canConfig);
diff --git a/containment.cpp b/containment.cpp
index d42bdcdf5..7c7f42cf0 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -145,21 +145,18 @@ void Containment::init()
     appletBrowserAction->setVisible(unlocked);
     appletBrowserAction->setEnabled(unlocked);
     connect(appletBrowserAction, SIGNAL(triggered()), this, SLOT(triggerShowAddWidgets()));
-    appletBrowserAction->setShortcutContext(Qt::WidgetShortcut);
     appletBrowserAction->setShortcut(QKeySequence("alt+d,a"));
     d->actions().addAction("add widgets", appletBrowserAction);
 
     KAction *action = new KAction(i18n("Next Widget"), this);
     //no icon
     connect(action, SIGNAL(triggered()), this, SLOT(focusNextApplet()));
-    action->setShortcutContext(Qt::WidgetShortcut);
     action->setShortcut(QKeySequence("alt+d,n"));
     d->actions().addAction("next applet", action);
 
     action = new KAction(i18n("Previous Widget"), this);
     //no icon
     connect(action, SIGNAL(triggered()), this, SLOT(focusPreviousApplet()));
-    action->setShortcutContext(Qt::WidgetShortcut);
     action->setShortcut(QKeySequence("alt+d,p"));
     d->actions().addAction("previous applet", action);
 
@@ -171,7 +168,6 @@ void Containment::init()
         lockDesktopAction->setIcon(KIcon(unlocked ? "object-locked" : "object-unlocked"));
         connect(lockDesktopAction, SIGNAL(triggered(bool)),
                 this, SLOT(toggleDesktopImmutability()));
-        lockDesktopAction->setShortcutContext(Qt::WidgetShortcut);
         lockDesktopAction->setShortcut(QKeySequence("alt+d,l"));
         d->actions().addAction("lock widgets", lockDesktopAction);
     }
@@ -181,7 +177,6 @@ void Containment::init()
         KAction *zoomAction = new KAction(i18n("Zoom In"), this);
         zoomAction->setIcon(KIcon("zoom-in"));
         connect(zoomAction, SIGNAL(triggered(bool)), this, SLOT(zoomIn()));
-        zoomAction->setShortcutContext(Qt::WidgetShortcut);
         //two shortcuts because I hate ctrl-+ but others expect it
         QList<QKeySequence> keys;
         keys << QKeySequence("alt+d,+");
@@ -192,7 +187,6 @@ void Containment::init()
         zoomAction = new KAction(i18n("Zoom Out"), this);
         zoomAction->setIcon(KIcon("zoom-out"));
         connect(zoomAction, SIGNAL(triggered(bool)), this, SLOT(zoomOut()));
-        zoomAction->setShortcutContext(Qt::WidgetShortcut);
         zoomAction->setShortcut(QKeySequence("alt+d,-"));
         d->actions().addAction("zoom out", zoomAction);
 
@@ -201,7 +195,6 @@ void Containment::init()
         activityAction->setVisible(unlocked);
         activityAction->setEnabled(unlocked);
         connect(activityAction, SIGNAL(triggered(bool)), this, SLOT(addSiblingContainment()));
-        activityAction->setShortcutContext(Qt::WidgetShortcut);
         activityAction->setShortcut(QKeySequence("alt+d,alt+a"));
         d->actions().addAction("add sibling containment", activityAction);