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

Timestamp:

Jun 4, 2021 6:39:07 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Adjusting r144088 and r144082 to work on systems where menu-bar got initied on startup, like on Ubuntu 16.04.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (6 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)

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

@@ -706 +706 @@
     // These menus are dynamical since local and cloud VMs have different menu contents.
     // Yet .. we have to prepare Machine/Group menus beforehand, they contains shortcuts.
-    if (currentItem())
-    {
-        updateMenuGroup(actionPool()->action(UIActionIndexMN_M_Group)->menu());
-        updateMenuMachine(actionPool()->action(UIActionIndexMN_M_Machine)->menu());
-    }
+    updateMenuGroup(actionPool()->action(UIActionIndexMN_M_Group)->menu());
+    updateMenuMachine(actionPool()->action(UIActionIndexMN_M_Machine)->menu());
 
     updateActionsVisibility();
@@ -2578 +2575 @@
 }
 
+bool UIVirtualBoxManager::isSingleCloudProviderGroupSelected() const
+{
+    return m_pWidget->isSingleCloudProviderGroupSelected();
+}
+
 bool UIVirtualBoxManager::isSingleCloudProfileGroupSelected() const
 {
@@ -2819 +2821 @@
 void UIVirtualBoxManager::updateMenuGroup(QMenu *pMenu)
 {
-    /* For single local group selected: */
-    if (isSingleLocalGroupSelected())
+    /* For single cloud provider/profile: */
+    if (   isSingleCloudProviderGroupSelected()
+        || isSingleCloudProfileGroupSelected())
+    {
+        /* Populate Group-menu: */
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_New));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Add));
+        pMenu->addSeparator();
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Console)->menu());
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
+        pMenu->addSeparator();
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
+        pMenu->addSeparator();
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Search));
+    }
+    /* For other cases, like local group or no group at all: */
+    else
     {
         /* Populate Group-menu: */
@@ -2847 +2866 @@
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Search));
     }
-    else
-    {
-        /* Populate Group-menu: */
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_New));
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Add));
-        pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
-        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Console)->menu());
-        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
-        pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
-        pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Search));
-    }
 }
 
@@ -2868 +2872 @@
     /* Get first selected item: */
     UIVirtualMachineItem *pItem = currentItem();
-    AssertPtrReturnVoid(pItem);
-
-    /* For local machine: */
-    if (pItem->itemType() == UIVirtualMachineItemType_Local)
+
+    /* For cloud machine(s): */
+    if (   pItem
+        && (   pItem->itemType() == UIVirtualMachineItemType_CloudFake
+            || pItem->itemType() == UIVirtualMachineItemType_CloudReal))
+    {
+        /* Populate Machine-menu: */
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_New));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Add));
+        pMenu->addSeparator();
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Remove));
+        pMenu->addSeparator();
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->menu());
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
+        pMenu->addSeparator();
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
+        pMenu->addSeparator();
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_T_Search));
+    }
+    /* For other cases, like local machine(s) or no machine at all: */
+    else
     {
         /* Populate Machine-menu: */
@@ -2897 +2921 @@
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowInFileManager));
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_CreateShortcut));
-        pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent));
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_T_Search));
-    }
-    else
-    {
-        /* Populate Machine-menu: */
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_New));
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Add));
-        pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Remove));
-        pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
-        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->menu());
-        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
-        pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
         pMenu->addSeparator();
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent));

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

@@ -346 +346 @@
         /** Returns whether single local group is selected. */
         bool isSingleLocalGroupSelected() const;
+        /** Returns whether single cloud provider group is selected. */
+        bool isSingleCloudProviderGroupSelected() const;
         /** Returns whether single cloud profile group is selected. */
         bool isSingleCloudProfileGroupSelected() const;