mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 20:58:38 +02:00
Merge pull request #7276 from jherico/bookmarks
Don't trigger modal dialog from menu handler
This commit is contained in:
commit
19ad4314ca
1 changed files with 4 additions and 4 deletions
|
@ -88,11 +88,11 @@ void Bookmarks::persistToFile() {
|
||||||
|
|
||||||
void Bookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
|
void Bookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
|
||||||
// Add menus/actions
|
// Add menus/actions
|
||||||
menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkLocation, 0,
|
auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkLocation);
|
||||||
this, SLOT(bookmarkLocation()));
|
QObject::connect(bookmarkAction, SIGNAL(triggered()), this, SLOT(bookmarkLocation()), Qt::QueuedConnection);
|
||||||
_bookmarksMenu = menu->addMenu(MenuOption::Bookmarks);
|
_bookmarksMenu = menu->addMenu(MenuOption::Bookmarks);
|
||||||
_deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark, 0,
|
_deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark);
|
||||||
this, SLOT(deleteBookmark()));
|
QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
|
||||||
|
|
||||||
// Enable/Disable menus as needed
|
// Enable/Disable menus as needed
|
||||||
enableMenuItems(_bookmarks.count() > 0);
|
enableMenuItems(_bookmarks.count() > 0);
|
||||||
|
|
Loading…
Reference in a new issue