Changeset 87475 in vbox

Timestamp:

Jan 29, 2021 9:30:25 AM (4 years ago)

Author:

vboxsync

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

142497

Message:

FE/Qt: bugref:9917: Mention Cloud Console Manager as global tool as well, it's manager after all.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -1512 +1512 @@
     switch (enmToolType)
     {
-        case UIToolType_Welcome:     strResult = "Welcome"; break;
-        case UIToolType_Extensions:  strResult = "Extensions"; break;
-        case UIToolType_Media:       strResult = "Media"; break;
-        case UIToolType_Network:     strResult = "Network"; break;
-        case UIToolType_Cloud:       strResult = "Cloud"; break;
-        case UIToolType_Resources:   strResult = "Resources"; break;
-        case UIToolType_Details:     strResult = "Details"; break;
-        case UIToolType_Snapshots:   strResult = "Snapshots"; break;
-        case UIToolType_Logs:        strResult = "Logs"; break;
-        case UIToolType_Performance: strResult = "Performance"; break;
+        case UIToolType_Welcome:      strResult = "Welcome"; break;
+        case UIToolType_Extensions:   strResult = "Extensions"; break;
+        case UIToolType_Media:        strResult = "Media"; break;
+        case UIToolType_Network:      strResult = "Network"; break;
+        case UIToolType_Cloud:        strResult = "Cloud"; break;
+        case UIToolType_CloudConsole: strResult = "CloudConsole"; break;
+        case UIToolType_Resources:    strResult = "Resources"; break;
+        case UIToolType_Details:      strResult = "Details"; break;
+        case UIToolType_Snapshots:    strResult = "Snapshots"; break;
+        case UIToolType_Logs:         strResult = "Logs"; break;
+        case UIToolType_Performance:  strResult = "Performance"; break;
         default:
         {
@@ -1536 +1537 @@
     /* Here we have some fancy stuff allowing us
      * to search through the keys using 'case-insensitive' rule: */
-    QStringList keys;      QList<UIToolType> values;
-    keys << "Welcome";     values << UIToolType_Welcome;
-    keys << "Extensions";  values << UIToolType_Extensions;
-    keys << "Media";       values << UIToolType_Media;
-    keys << "Network";     values << UIToolType_Network;
-    keys << "Cloud";       values << UIToolType_Cloud;
-    keys << "Resources";   values << UIToolType_Resources;
-    keys << "Details";     values << UIToolType_Details;
-    keys << "Snapshots";   values << UIToolType_Snapshots;
-    keys << "Logs";        values << UIToolType_Logs;
-    keys << "Performance"; values << UIToolType_Performance;
+    QStringList keys;       QList<UIToolType> values;
+    keys << "Welcome";      values << UIToolType_Welcome;
+    keys << "Extensions";   values << UIToolType_Extensions;
+    keys << "Media";        values << UIToolType_Media;
+    keys << "Network";      values << UIToolType_Network;
+    keys << "Cloud";        values << UIToolType_Cloud;
+    keys << "CloudConsole"; values << UIToolType_CloudConsole;
+    keys << "Resources";    values << UIToolType_Resources;
+    keys << "Details";      values << UIToolType_Details;
+    keys << "Snapshots";    values << UIToolType_Snapshots;
+    keys << "Logs";         values << UIToolType_Logs;
+    keys << "Performance";  values << UIToolType_Performance;
     /* Invalid type for unknown words: */
     if (!keys.contains(strToolType, Qt::CaseInsensitive))

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -270 +270 @@
                 case UIToolType_Network:
                 case UIToolType_Cloud:
+                case UIToolType_CloudConsole:
                 case UIToolType_Resources:
                     return true;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -896 +896 @@
     UIToolType_Network,
     UIToolType_Cloud,
+    UIToolType_CloudConsole,
     UIToolType_Resources,
     /* Machine types: */

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

@@ -705 +705 @@
     switch (m_pWidget->toolsType())
     {
-        case UIToolType_Extensions:  sltCloseExtensionPackManagerWindow(); break;
-        case UIToolType_Media:       sltCloseVirtualMediumManagerWindow(); break;
-        case UIToolType_Network:     sltCloseNetworkManagerWindow(); break;
-        case UIToolType_Cloud:       sltCloseCloudProfileManagerWindow(); break;
-        case UIToolType_Logs:        sltCloseLogViewerWindow(); break;
-        case UIToolType_Performance: sltClosePerformanceMonitorWindow(); break;
+        case UIToolType_Extensions:   sltCloseExtensionPackManagerWindow(); break;
+        case UIToolType_Media:        sltCloseVirtualMediumManagerWindow(); break;
+        case UIToolType_Network:      sltCloseNetworkManagerWindow(); break;
+        case UIToolType_Cloud:        sltCloseCloudProfileManagerWindow(); break;
+        case UIToolType_CloudConsole: sltCloseCloudConsoleManagerWindow(); break;
+        case UIToolType_Logs:         sltCloseLogViewerWindow(); break;
+        case UIToolType_Performance:  sltClosePerformanceMonitorWindow(); break;
         default: break;
     }
@@ -859 +860 @@
 void UIVirtualBoxManager::sltOpenCloudConsoleManagerWindow()
 {
+    /* First check if instance of widget opened the embedded way: */
+    if (m_pWidget->isGlobalToolOpened(UIToolType_CloudConsole))
+    {
+        m_pWidget->setToolsType(UIToolType_Welcome);
+        m_pWidget->closeGlobalTool(UIToolType_CloudConsole);
+    }
+
     /* Create instance if not yet created: */
     if (!m_pManagerCloudConsole)