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

Timestamp:

Oct 21, 2020 4:15:11 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Do not limit Cloud Profile Manager tool availability to ext-pack presence.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/profilemanager/UICloudProfileManager.cpp (modified) (1 diff)
• globals/UIActionPoolManager.cpp (modified) (3 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (3 diffs)
• manager/tools/UIToolsModel.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp

@@ -566 +566 @@
 
     /* Update actions availability: */
-    m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Add)->setEnabled(!pItem || pItemProvider);
-    m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Import)->setEnabled(!pItem || pItemProvider);
+    m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Add)->setEnabled(pItemProvider || pItemProfile);
+    m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Import)->setEnabled(pItemProvider || pItemProfile);
     m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Remove)->setEnabled(pItemProfile);
-    m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details)->setEnabled(pItemProfile || pItemProvider);
+    m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details)->setEnabled(pItemProvider || pItemProfile);
 
     /* If there is an item => update details data: */

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

@@ -3776 +3776 @@
     pMenu->clear();
 
-    /* Check if Ext Pack is ready, some of actions my depend on it: */
-    CExtPack extPack = uiCommon().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
-    const bool fExtPackAccessible = !extPack.isNull() && extPack.GetUsable();
-
     /* The Application / 'File' menu contents is very different depending on host type. */
 
@@ -3813 +3809 @@
     pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
     /* 'Show Cloud Profile Manager' action goes to 'File' menu: */
-    if (fExtPackAccessible)
-        pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
 
 #else /* !VBOX_WS_MAC */
@@ -3837 +3832 @@
     pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
     /* 'Show Cloud Profile Manager' action goes to 'File' menu: */
-    if (fExtPackAccessible)
-        pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
+    pMenu->addAction(action(UIActionIndexMN_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

@@ -1414 +1414 @@
     if (QMenu *pMenuGlobal = m_localMenus.value(UIChooserNodeType_Global))
     {
-        /* Check if Ext Pack is ready, some of actions my depend on it: */
-        CExtPack extPack = uiCommon().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
-        const bool fExtPackAccessible = !extPack.isNull() && extPack.GetUsable();
-
 #ifdef VBOX_WS_MAC
         pMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
@@ -1430 +1426 @@
         pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager));
         pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
-        if (fExtPackAccessible)
-            pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
 
 #else /* !VBOX_WS_MAC */
@@ -1445 +1440 @@
         pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager));
         pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
-        if (fExtPackAccessible)
-            pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
 # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         pMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));

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

@@ -482 +482 @@
 void UIToolsModel::prepareItems()
 {
-    /* Check if Ext Pack is ready, some of actions my depend on it: */
-    CExtPack extPack = uiCommon().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
-    const bool fExtPackAccessible = !extPack.isNull() && extPack.GetUsable();
-
     /* Enable both classes of tools initially: */
     m_statesToolsEnabled[UIToolClass_Global] = true;
@@ -503 +499 @@
 
     /* Cloud: */
-    if (fExtPackAccessible)
-        m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Cloud, QString(),
-                                   UIIconPool::iconSet(":/cloud_profile_manager_24px.png", ":/cloud_profile_manager_disabled_24px.png"));
+    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Cloud, QString(),
+                               UIIconPool::iconSet(":/cloud_profile_manager_24px.png", ":/cloud_profile_manager_disabled_24px.png"));
 
     /* Resources: */