From cc4583f772daed8bc6e5be3c6c08a08b194583ac Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 29 Oct 2016 19:26:20 +0000 Subject: [PATCH] Fix issue with the configurations menu on Mac OS X On Mac OS X due to the Qt use of native menu widgets the connections for a menu action get disconnected before they are triggered when using QMenu::aboutToHide() to remove the items dynamically. Changed to depopulate the sub menu just before re-population in the QMenu::aboutToShow() event. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7263 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- MultiSettings.cpp | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/MultiSettings.cpp b/MultiSettings.cpp index 4eea45d46..e791f25bd 100644 --- a/MultiSettings.cpp +++ b/MultiSettings.cpp @@ -156,7 +156,7 @@ private: // create a configuration maintenance sub menu QMenu * create_sub_menu (QMainWindow * main_window, - QMenu * parent, + QMenu * parent, QString const& menu_title, QActionGroup * = nullptr); @@ -425,73 +425,73 @@ bool MultiSettings::impl::exit () } QMenu * MultiSettings::impl::create_sub_menu (QMainWindow * main_window, - QMenu * parent_menu, + QMenu * parent_menu, QString const& menu_title, QActionGroup * action_group) { - QMenu * sub_menu = parent_menu->addMenu (menu_title); + auto sub_menu = parent_menu->addMenu (menu_title); if (action_group) action_group->addAction (sub_menu->menuAction ()); sub_menu->menuAction ()->setCheckable (true); // populate sub-menu actions before showing connect (sub_menu, &QMenu::aboutToShow, [this, main_window, parent_menu, sub_menu] () { + // depopulate before populating and showing because on Mac OS X + // there is an issue with depopulating in QMenu::aboutToHide() + // with connections being disconnected before they are actioned + while (!sub_menu->actions ().isEmpty ()) + { + sub_menu->removeAction (sub_menu->actions ().last ()); + } + bool is_current {sub_menu->menuAction ()->text () == current_}; if (!is_current) - { - auto * select_action = new QAction {tr ("&Switch To"), this}; - sub_menu->addAction (select_action); - connect (select_action, &QAction::triggered, [this, main_window, sub_menu] (bool) { - select_configuration (main_window, sub_menu); - }); - sub_menu->addSeparator (); - } + { + auto select_action = new QAction {tr ("&Switch To"), this}; + sub_menu->addAction (select_action); + connect (select_action, &QAction::triggered, [this, main_window, sub_menu] (bool) { + select_configuration (main_window, sub_menu); + }); + sub_menu->addSeparator (); + } - auto * clone_action = new QAction {tr ("&Clone"), this}; + auto clone_action = new QAction {tr ("&Clone"), this}; sub_menu->addAction (clone_action); connect (clone_action, &QAction::triggered, [this, main_window, parent_menu, sub_menu] (bool) { - clone_configuration (main_window, parent_menu, sub_menu); - }); + clone_configuration (main_window, parent_menu, sub_menu); + }); auto const& current_group = settings_.group (); if (current_group.size ()) settings_.endGroup (); SettingsGroup alternatives {&settings_, multi_settings_root_group}; if (settings_.childGroups ().size ()) - { - auto * clone_into_action = new QAction {tr ("Clone &Into ..."), this}; - sub_menu->addAction (clone_into_action); - connect (clone_into_action, &QAction::triggered, [this, main_window, sub_menu] (bool) { - clone_into_configuration (main_window, sub_menu); - }); - } + { + auto clone_into_action = new QAction {tr ("Clone &Into ..."), this}; + sub_menu->addAction (clone_into_action); + connect (clone_into_action, &QAction::triggered, [this, main_window, sub_menu] (bool) { + clone_into_configuration (main_window, sub_menu); + }); + } if (current_group.size ()) settings_.beginGroup (current_group); - auto * reset_action = new QAction {tr ("R&eset"), this}; + auto reset_action = new QAction {tr ("R&eset"), this}; sub_menu->addAction (reset_action); connect (reset_action, &QAction::triggered, [this, main_window, sub_menu] (bool) { - reset_configuration (main_window, sub_menu); - }); + reset_configuration (main_window, sub_menu); + }); - auto * rename_action = new QAction {tr ("&Rename ..."), this}; + auto rename_action = new QAction {tr ("&Rename ..."), this}; sub_menu->addAction (rename_action); connect (rename_action, &QAction::triggered, [this, main_window, sub_menu] (bool) { - rename_configuration (main_window, sub_menu); - }); + rename_configuration (main_window, sub_menu); + }); if (!is_current) - { - auto * delete_action = new QAction {tr ("&Delete"), this}; - sub_menu->addAction (delete_action); - connect (delete_action, &QAction::triggered, [this, main_window, sub_menu] (bool) { - delete_configuration (main_window, sub_menu); - }); - } - }); - - // depopulate sub-menu actions before hiding - connect (sub_menu, &QMenu::aboutToHide, [this, sub_menu] () { - while (!sub_menu->actions ().isEmpty ()) - { - sub_menu->removeAction (sub_menu->actions ().last ()); - } + { + auto delete_action = new QAction {tr ("&Delete"), this}; + sub_menu->addAction (delete_action); + connect (delete_action, &QAction::triggered, [this, main_window, sub_menu] (bool) { + delete_configuration (main_window, sub_menu); + }); + } }); return sub_menu;