Changeset 55552 in vbox for trunk/src

Timestamp:

Apr 30, 2015 1:39:17 PM (10 years ago)

Author:

vboxsync

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

99919

Message:

FE/Qt: 7791: Added a possibility to reconnect separate GUI to headless VM with simple Start/Show button click.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (2 diffs)
• UIVMItem.cpp (modified) (1 diff)
• UIVMItem.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -470 +470 @@
         /* Launch/show current VM: */
         CMachine machine = pItem->machine();
-        vboxGlobal().launchMachine(machine, qApp->keyboardModifiers() == Qt::ShiftModifier ?
-                                            VBoxGlobal::LaunchMode_Headless :
-                                            VBoxGlobal::LaunchMode_Default);
+        vboxGlobal().launchMachine(machine,
+                                   UIVMItem::isItemRunningHeadless(pItem)         ? VBoxGlobal::LaunchMode_Separate :
+                                   qApp->keyboardModifiers() == Qt::ShiftModifier ? VBoxGlobal::LaunchMode_Headless :
+                                                                                    VBoxGlobal::LaunchMode_Default);
     }
 }
@@ -1976 +1977 @@
     {
         if ((UIVMItem::isItemPoweredOff(pItem) && UIVMItem::isItemEditable(pItem)) ||
-            (UIVMItem::isItemStarted(pItem) && pItem->canSwitchTo()))
+            (UIVMItem::isItemStarted(pItem) && (pItem->canSwitchTo() || UIVMItem::isItemRunningHeadless(pItem))))
             return true;
     }

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp

@@ -477 +477 @@
 
 /* static */
+bool UIVMItem::isItemRunningHeadless(UIVMItem *pItem)
+{
+    if (isItemRunning(pItem))
+    {
+        /* Open session to determine which frontend VM is started with: */
+        CSession session = vboxGlobal().openExistingSession(pItem->id());
+        if (!session.isNull())
+        {
+            /* Acquire the session type: */
+            const QString strSessionType = session.GetMachine().GetSessionType();
+            /* Close the session early: */
+            session.UnlockMachine();
+            /* Check whether we are in 'headless' session type: */
+            if (strSessionType.compare("headless", Qt::CaseInsensitive) == 0)
+                return true;
+        }
+    }
+    return false;
+}
+
+/* static */
 bool UIVMItem::isItemPaused(UIVMItem *pItem)
 {

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h

@@ -80 +80 @@
     static bool isItemStarted(UIVMItem *pItem);
     static bool isItemRunning(UIVMItem *pItem);
+    static bool isItemRunningHeadless(UIVMItem *pItem);
     static bool isItemPaused(UIVMItem *pItem);
     static bool isItemStuck(UIVMItem *pItem);