Changeset 85636 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 6, 2020 1:11:52 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: A fix for Start/Show action, it has menu only in one of states (which is Start); This menu is reflected in tool-bar which needs to be updated accordingly on state-change else menu behavior there will be broken.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManager.cpp (modified) (2 diffs)
• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -3042 +3042 @@
         actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->setState(pItem->isItemPoweredOff() ? 0 : 1);
         actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->setState(pItem->isItemPoweredOff() ? 0 : 1);
-        /// @todo Hmm, fix it?
-//        QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)));
-//        if (pButton)
-//            pButton->setPopupMode(pItem->isItemPoweredOff() ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup);
+        m_pWidget->updateToolBarMenuButtons(pItem->isItemPoweredOff());
     }
     else
@@ -3051 +3048 @@
         actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->setState(0);
         actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->setState(0);
-        /// @todo Hmm, fix it?
-//        QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)));
-//        if (pButton)
-//            pButton->setPopupMode(pItem->isItemPoweredOff() ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup);
+        m_pWidget->updateToolBarMenuButtons(true /* separate menu section? */);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -229 +229 @@
 {
     return m_pPaneToolsMachine->isCurrentStateItemSelected();
+}
+
+void UIVirtualBoxManagerWidget::updateToolBarMenuButtons(bool fSeparateMenuSection)
+{
+    QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)));
+    if (pButton)
+        pButton->setPopupMode(fSeparateMenuSection ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

@@ -197 +197 @@
     /** @} */
 
+    /** @name Tool-bar stuff.
+      * @{ */
+        /** Updates tool-bar menu buttons. */
+        void updateToolBarMenuButtons(bool fSeparateMenuSection);
+    /** @} */
+
 public slots: