From 9618f0ebbf4b88045247c01ce8c8f58203508ebf Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Tue, 12 May 2015 16:19:40 -0400 Subject: Imported Upstream version 3.0.6 --- .../guiSQLiteStudio/common/extactioncontainer.cpp | 30 ++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp') diff --git a/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp b/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp index 9d983a8..8aaeefd 100644 --- a/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp @@ -96,19 +96,16 @@ void ExtActionContainer::attachActionInMenu(int parentAction, QAction* childActi void ExtActionContainer::attachActionInMenu(QAction* parentAction, QAction* childAction, QToolBar* toolbar) { - QToolButton* button = dynamic_cast(toolbar->widgetForAction(parentAction)); - QMenu* menu = button->menu(); - - if (!menu) - { - menu = new QMenu(button); - button->setMenu(menu); - button->setPopupMode(QToolButton::MenuButtonPopup); - } - + QMenu* menu = getMenuForAction(parentAction, toolbar); menu->addAction(childAction); } +void ExtActionContainer::addSeparatorInMenu(QAction *parentAction, QToolBar* toolbar) +{ + QMenu* menu = getMenuForAction(parentAction, toolbar); + menu->addSeparator(); +} + void ExtActionContainer::updateShortcutTips() { } @@ -262,6 +259,19 @@ void ExtActionContainer::handleExtraActions() } } +QMenu *ExtActionContainer::getMenuForAction(QAction *parentAction, QToolBar* toolbar) +{ + QToolButton* button = dynamic_cast(toolbar->widgetForAction(parentAction)); + QMenu* menu = button->menu(); + if (!menu) + { + menu = new QMenu(button); + button->setMenu(menu); + button->setPopupMode(QToolButton::MenuButtonPopup); + } + return menu; +} + ExtActionContainer::ActionDetails::ActionDetails() { } -- cgit v1.2.3