Changeset 106709 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 25, 2024 6:17:50 PM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165589

Message:

FE/Qt: VBox Manager: A fix for action-pool stuff; Get rid of menu assigning/deassigning functionality for Start/Show action/button; It conflicts with macOS native menubar creating infinite menu actions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIActionPool.cpp (modified) (2 diffs)
• UIActionPool.h (modified) (1 diff)
• UIActionPoolManager.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -303 +303 @@
 UIActionMenu::~UIActionMenu()
 {
-#if !defined(VBOX_IS_QT6_OR_LATER) || !defined(RT_OS_DARWIN) /** @todo qt6: Tcrashes in QCocoaMenuBar::menuForTag during GUI
-                                                              * termination, so disabled it for now and hope it isn't needed. */
-    /* Hide menu: */
-    hideMenu();
-#endif
     /* Delete menu: */
     delete m_pMenu;
@@ -319 +314 @@
 }
 
-void UIActionMenu::showMenu()
-{
-    /* Show menu if necessary: */
-    if (!menu())
-        setMenu(m_pMenu);
-}
-
-void UIActionMenu::hideMenu()
-{
-    /* Hide menu if necessary: */
-    if (menu())
-        setMenu((QMenu *)0);
-}
-
 void UIActionMenu::prepare()
 {
-    /* Create menu: */
+    /* Prepare menu: */
     m_pMenu = new UIMenu;
     AssertPtrReturnVoid(m_pMenu);
     {
-        /* Prepare menu: */
+        setMenu(m_pMenu);
         connect(m_pMenu, &UIMenu::aboutToShow,
                 actionPool(), &UIActionPool::sltHandleMenuPrepare);
-        /* Show menu: */
-        showMenu();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -376 +376 @@
     void setShowToolTip(bool fShowToolTip);
 
-    /** Shows menu. */
-    void showMenu();
-    /** Hides menu. */
-    void hideMenu();
-
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

@@ -1046 +1046 @@
             default:
                 break;
-        }
-    }
-
-    /** Handles state change. */
-    virtual void handleStateChange() RT_OVERRIDE
-    {
-        switch (state())
-        {
-            case 0: showMenu(); break;
-            case 1: hideMenu(); break;
-            default: break;
         }
     }