Changeset 85178 in vbox

Timestamp:

Jul 10, 2020 12:58:02 PM (5 years ago)

Author:

vboxsync

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

139144

Message:

OCI: (bugref:9469) help, showvminfo and 'experimental' label in UI.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -479 +479 @@
                      "                            usbhost|usbfilters|systemproperties|extpacks|\n"
                      "                            groups|webcams|screenshotformats|cloudproviders|\n"
+#if defined(VBOX_WITH_CLOUD_NET)
+                     "                            cloudprofiles|cloudnets\n"
+#else
                      "                            cloudprofiles\n"
+#endif
                      "\n", SEP);
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1414 +1414 @@
                     }
 
+#ifdef VBOX_WITH_CLOUD_NET
+                    case NetworkAttachmentType_Cloud:
+                    {
+                        Bstr strNetwork;
+                        nic->COMGETTER(CloudNetwork)(strNetwork.asOutParam());
+                        if (details == VMINFO_MACHINEREADABLE)
+                        {
+                            RTPrintf("cloud-network%d=\"%ls\"\n", currentNIC + 1, strNetwork.raw());
+                            strAttachment = "cloudnetwork";
+                        }
+                        else
+                            strAttachment = Utf8StrFmt("Cloud Network '%s'", Utf8Str(strNetwork).c_str());
+                        break;
+                    }
+#endif /* VBOX_WITH_CLOUD_NET */
+
                     default:
                         strAttachment = "unknown";

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

@@ -382 +382 @@
         case KNetworkAttachmentType_NATNetwork: return QApplication::translate("UICommon", "NAT Network", "NetworkAttachmentType");
 #ifdef VBOX_WITH_CLOUD_NET
-        case KNetworkAttachmentType_Cloud:      return QApplication::translate("UICommon", "Cloud Network", "NetworkAttachmentType");
+        case KNetworkAttachmentType_Cloud:      return QApplication::translate("UICommon", "Cloud Network [EXPERIMENTAL]", "NetworkAttachmentType");
 #endif /* VBOX_WITH_CLOUD_NET */
         default: AssertMsgFailed(("No text for %d", type)); break;