From 79bdbfa9652fa4711c85978f40b0df4e35c6d523 Mon Sep 17 00:00:00 2001
From: mae <qt-info@nokia.com>
Date: Thu, 20 Aug 2009 18:44:02 +0200
Subject: [PATCH] In the FancyActionBar, trigger a button's default action also
when a context menu action is selected.
This allows the user e.g. to select and run a specific run
configuration with one click.
---
src/plugins/coreplugin/fancyactionbar.cpp | 19 +++++++++++++++++++
src/plugins/coreplugin/fancyactionbar.h | 2 ++
2 files changed, 21 insertions(+)
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index 35ad9778b24..fedbc0cf3b9 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -34,6 +34,7 @@
#include <QtGui/QPicture>
#include <QtGui/QVBoxLayout>
#include <QtSvg/QSvgRenderer>
+#include <QtGui/QAction>
using namespace Core;
using namespace Internal;
@@ -154,6 +155,24 @@ void FancyActionBar::insertAction(int index, QAction *action, QMenu *menu)
if (menu) {
toolButton->setMenu(menu);
toolButton->setPopupMode(QToolButton::DelayedPopup);
+
+ // execute action also if a context menu item is select
+ connect(toolButton, SIGNAL(triggered(QAction*)),
+ this, SLOT(toolButtonContextMenuActionTriggered(QAction*)));
}
m_actionsLayout->insertWidget(index, toolButton);
}
+
+/*
+ This slot is invoked when a context menu action of a tool button is triggered.
+ In this case we also want to trigger the default action of the button.
+
+ This allows the user e.g. to select and run a specific run configuration with one click.
+ */
+void FancyActionBar::toolButtonContextMenuActionTriggered(QAction* action)
+{
+ if (QToolButton *button = qobject_cast<QToolButton*>(sender())) {
+ if (action != button->defaultAction())
+ button->defaultAction()->trigger();
+ }
+}
diff --git a/src/plugins/coreplugin/fancyactionbar.h b/src/plugins/coreplugin/fancyactionbar.h
index b7fcca9e9f4..4c49f61c5b9 100644
--- a/src/plugins/coreplugin/fancyactionbar.h
+++ b/src/plugins/coreplugin/fancyactionbar.h
@@ -64,6 +64,8 @@ public:
void paintEvent(QPaintEvent *event);
void insertAction(int index, QAction *action, QMenu *menu = 0);
+private slots:
+ void toolButtonContextMenuActionTriggered(QAction*);
private:
QVBoxLayout *m_actionsLayout;
};
--
GitLab