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

Timestamp:

Mar 7, 2013 10:36:42 AM (12 years ago)

Author:

vboxsync

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

84157

Message:

Main/SystemProperties+Machine: new config setting for default VM frontend.
Frontend/VirtualBox+VBoxManage: changes to use the default VM frontend when starting a VM, other minor cleanups
Main/xml/*.xsd: attempt to bring the XML schema close to reality
doc/manual: document the new possibilities, and fix a few long standing inaccuracies

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageHelp.cpp (modified) (3 diffs)
• VBoxManage/VBoxManageInfo.cpp (modified) (3 diffs)
• VBoxManage/VBoxManageMisc.cpp (modified) (3 diffs)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (4 diffs)
• VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -368 +368 @@
                      "                                             acpishutdown]\n"
 #endif
+                     "                            [--defaultfrontend default|<name]\n"
                      "\n");
     }
@@ -624 +625 @@
                      "                            autostartdbpath null|<folder> |\n"
                      "                            loghistorycount <value>\n"
+                     "                            defaultfrontend default|<name>\n"
                      "\n", SEP);
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -713 +713 @@
     SHOW_BOOLEAN_PROP(    machine,  AutostartEnabled,           "autostart-enabled",        "Autostart Enabled");
     SHOW_ULONG_PROP(      machine,  AutostartDelay,             "autostart-delay",          "Autostart Delay", "");
+    SHOW_STRING_PROP(     machine,  DefaultFrontend,            "defaultfrontend",          "Default Frontend");
 
 /** @todo Convert the remainder of the function to SHOW_XXX macros and add error
@@ -1566 +1567 @@
             RTPrintf("draganddrop=\"%s\"\n", psz);
         else
-            RTPrintf("Drag'n'drop Mode:  %s\n", psz);
+            RTPrintf("Drag'n'drop Mode: %s\n", psz);
+    }
+
+    {
+        SessionState_T sessState;
+        rc = machine->COMGETTER(SessionState)(&sessState);
+        if (SUCCEEDED(rc) && sessState != SessionState_Unlocked)
+        {
+            Bstr sessType;
+            rc = machine->COMGETTER(SessionType)(sessType.asOutParam());
+            if (SUCCEEDED(rc) && !sessType.isEmpty())
+            {
+                if (details == VMINFO_MACHINEREADABLE)
+                    RTPrintf("SessionType=\"%ls\"\n", sessType.raw());
+                else
+                    RTPrintf("Session type:    %ls\n", sessType.raw());
+            }
+        }
     }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -486 +486 @@
     HRESULT rc = S_OK;
     std::list<const char *> VMs;
-    Bstr sessionType = "gui";
+    Bstr sessionType;
 
     static const RTGETOPTDEF s_aStartVMOptions[] =
@@ -871 +871 @@
             CHECK_ERROR(systemProperties, COMSETTER(AutostartDatabasePath)(Bstr(a->argv[1]).raw()));
     }
+    else if (!strcmp(a->argv[0], "defaultfrontend"))
+    {
+        Bstr bstrDefaultFrontend(a->argv[1]);
+        if (!strcmp(a->argv[1], "default"))
+            bstrDefaultFrontend.setNull();
+        CHECK_ERROR(systemProperties, COMSETTER(DefaultFrontend)(bstrDefaultFrontend.raw()));
+    }
     else
         return errorSyntax(USAGE_SETPROPERTY, "Invalid parameter '%s'", a->argv[0]);

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

@@ -197 +197 @@
     MODIFYVM_VCP_HEIGHT,
 #endif
-    MODIFYVM_CHIPSET
+    MODIFYVM_CHIPSET,
+    MODIFYVM_DEFAULTFRONTEND
 };
 
@@ -352 +353 @@
     { "--usbcardreader",            MODIFYVM_USBCARDREADER,             RTGETOPT_REQ_BOOL_ONOFF },
 #endif
+    { "--defaultfrontend",          MODIFYVM_DEFAULTFRONTEND,           RTGETOPT_REQ_STRING },
 };
 
@@ -1546 +1548 @@
 
                 CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
-                if (RTStrCmp(ValueUnion.psz,"default") == 0)
+                if (RTStrCmp(ValueUnion.psz, "default") == 0)
                 {
                     aliasMode = 0;
@@ -2514 +2516 @@
 #endif /* VBOX_WITH_USB_CARDREADER */
 
+            case MODIFYVM_DEFAULTFRONTEND:
+            {
+                Bstr bstr(ValueUnion.psz);
+                if (bstr == "default")
+                    bstr = Bstr::Empty;
+                CHECK_ERROR(machine, COMSETTER(DefaultFrontend)(bstr.raw()));
+                break;
+            }
+
             default:
             {

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

@@ -4963 +4963 @@
         env.append(QString("XAUTHORITY=%1\n").arg(xauth));
 #endif
-    const QString strType = fHeadless ? "headless" : "GUI/Qt";
+    const QString strType = fHeadless ? "headless" : "";
 
     CProgress progress = machine.LaunchVMProcess(session, strType, env);