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

Timestamp:

Oct 26, 2018 2:50:02 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9230: Cloud Profile Manager: Hide Cloud Profile Manager if valid ExtPack is not present.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (5 diffs)
• chooser/UIChooserModel.cpp (modified) (4 diffs)
• tools/UIToolsModel.cpp (modified) (3 diffs)

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

@@ -63 +63 @@
 
 /* COM includes: */
+# include "CExtPack.h"
+# include "CExtPackManager.h"
 # include "CSystemProperties.h"
 
@@ -1348 +1350 @@
         return;
 
+    /* Check if Ext Pack is ready, some of actions my depend on it: */
+    CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
+    const bool fExtPackAccessible = !extPack.isNull() && extPack.GetUsable();
+
     /* The Application / 'File' menu contents is very different depending on host type. */
 
@@ -1381 +1387 @@
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
     /* 'Show Cloud Profile Manager' action goes to 'File' menu: */
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+    if (fExtPackAccessible)
+        pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
 
 #else /* !VBOX_WS_MAC */
@@ -1400 +1407 @@
     addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
     addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
-    addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+    if (fExtPackAccessible)
+        addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
 #  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
@@ -1428 +1436 @@
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
     /* 'Show Cloud Profile Manager' action goes to 'File' menu: */
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+    if (fExtPackAccessible)
+        pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
 # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* 'Network Access Manager' action goes to 'File' menu: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -51 +51 @@
 
 /* COM includes: */
+# include "CExtPack.h"
+# include "CExtPackManager.h"
 # include "CMachine.h"
 # include "CMedium.h"
@@ -1330 +1332 @@
     if (m_pContextMenuGlobal)
     {
+        /* Check if Ext Pack is ready, some of actions my depend on it: */
+        CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
+        const bool fExtPackAccessible = !extPack.isNull() && extPack.GetUsable();
+
 #ifdef VBOX_WS_MAC
         m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
@@ -1347 +1353 @@
         m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
         m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
-        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+        if (fExtPackAccessible)
+            m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
 
 #else /* !VBOX_WS_MAC */
@@ -1361 +1368 @@
         m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
         m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
-        m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+        if (fExtPackAccessible)
+            m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
 # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -47 +47 @@
 # include "UIWizardNewVM.h"
 
+/* COM includes: */
+# include "CExtPack.h"
+# include "CExtPackManager.h"
+
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -455 +459 @@
 void UIToolsModel::prepareItems()
 {
+    /* Check if Ext Pack is ready, some of actions my depend on it: */
+    CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
+    const bool fExtPackAccessible = !extPack.isNull() && extPack.GetUsable();
+
     /* Enable both classes of tools initially: */
     m_statesToolsEnabled[UIToolClass_Global] = true;
@@ -472 +480 @@
 
     /* Cloud: */
-    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Cloud, tr("Cloud"),
-                               UIIconPool::iconSet(":/cloud_profile_manager_24px.png", ":/cloud_profile_manager_disabled_24px.png"));
+    if (fExtPackAccessible)
+        m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Cloud, tr("Cloud"),
+                                   UIIconPool::iconSet(":/cloud_profile_manager_24px.png", ":/cloud_profile_manager_disabled_24px.png"));
 
     /* Details: */