Changeset 66397 in vbox

Timestamp:

Apr 3, 2017 11:54:11 AM (8 years ago)

Author:

vboxsync

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

114349

Message:

FE/Qt: Selector UI: Chooser pane: Unify start-or-show VM processing code under one handler.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (5 diffs)
• selector/UISelectorWindow.h (modified) (3 diffs)

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

@@ -5043 +5043 @@
         case LaunchMode_Separate: strType = vboxGlobal().isSeparateProcess() ? "headless" : "separate"; break;
         case LaunchMode_Headless: strType = "headless"; break;
+        default: AssertFailedReturn(false);
     }
 

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

@@ -81 +81 @@
     enum LaunchMode
     {
+        LaunchMode_Invalid,
         LaunchMode_Default,
         LaunchMode_Headless,

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

@@ -69 +69 @@
 # include "UIDesktopWidgetWatchdog.h"
 # include "UIModalWindowManager.h"
-# include "VBoxGlobal.h"
 # ifdef VBOX_WS_MAC
 #  include "VBoxUtils.h"
@@ -604 +603 @@
 void UISelectorWindow::sltPerformStartOrShowMachine()
 {
-    /* Get selected items: */
+    /* Start selected VMs in corresponding mode: */
     QList<UIVMItem*> items = currentItems();
     AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
-
-    /* For every selected item: */
-    foreach (UIVMItem *pItem, items)
-    {
-        /* Check if current item could be started/showed: */
-        if (!isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
-            continue;
-
-        /* Launch/show current VM: */
-        CMachine machine = pItem->machine();
-        vboxGlobal().launchMachine(machine,
-                                   UIVMItem::isItemRunningHeadless(pItem)         ? VBoxGlobal::LaunchMode_Separate :
-                                   qApp->keyboardModifiers() == Qt::ShiftModifier ? VBoxGlobal::LaunchMode_Headless :
-                                                                                    VBoxGlobal::LaunchMode_Default);
-    }
+    performStartOrShowVirtualMachines(items, VBoxGlobal::LaunchMode_Invalid);
 }
 
 void UISelectorWindow::sltPerformStartMachineNormal()
 {
-    /* Get selected items: */
+    /* Start selected VMs in corresponding mode: */
     QList<UIVMItem*> items = currentItems();
     AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
-
-    /* For every selected item: */
-    foreach (UIVMItem *pItem, items)
-    {
-        /* Check if current item could be started/showed: */
-        if (!isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
-            continue;
-
-        /* Launch/show current VM: */
-        CMachine machine = pItem->machine();
-        vboxGlobal().launchMachine(machine, VBoxGlobal::LaunchMode_Default);
-    }
+    performStartOrShowVirtualMachines(items, VBoxGlobal::LaunchMode_Default);
 }
 
 void UISelectorWindow::sltPerformStartMachineHeadless()
 {
-    /* Get selected items: */
+    /* Start selected VMs in corresponding mode: */
     QList<UIVMItem*> items = currentItems();
     AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
-
-    /* For every selected item: */
-    foreach (UIVMItem *pItem, items)
-    {
-        /* Check if current item could be started/showed: */
-        if (!isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
-            continue;
-
-        /* Launch/show current VM: */
-        CMachine machine = pItem->machine();
-        vboxGlobal().launchMachine(machine, VBoxGlobal::LaunchMode_Headless);
-    }
+    performStartOrShowVirtualMachines(items, VBoxGlobal::LaunchMode_Headless);
 }
 
 void UISelectorWindow::sltPerformStartMachineDetachable()
 {
-    /* Get selected items: */
+    /* Start selected VMs in corresponding mode: */
     QList<UIVMItem*> items = currentItems();
     AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
-
-    /* For every selected item: */
-    foreach (UIVMItem *pItem, items)
-    {
-        /* Check if current item could be started/showed: */
-        if (!isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
-            continue;
-
-        /* Launch/show current VM: */
-        CMachine machine = pItem->machine();
-        vboxGlobal().launchMachine(machine, VBoxGlobal::LaunchMode_Separate);
-    }
+    performStartOrShowVirtualMachines(items, VBoxGlobal::LaunchMode_Separate);
 }
 
@@ -2053 +2005 @@
 }
 
+void UISelectorWindow::performStartOrShowVirtualMachines(const QList<UIVMItem*> &items, VBoxGlobal::LaunchMode enmLaunchMode)
+{
+    /* For every item => check if it could be launched: */
+    foreach (UIVMItem *pItem, items)
+        if (isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, QList<UIVMItem*>() << pItem))
+        {
+            /* Fetch item launch mode: */
+            VBoxGlobal::LaunchMode enmItemLaunchMode = enmLaunchMode;
+            if (enmItemLaunchMode == VBoxGlobal::LaunchMode_Invalid)
+                enmItemLaunchMode = UIVMItem::isItemRunningHeadless(pItem)         ? VBoxGlobal::LaunchMode_Separate :
+                                    qApp->keyboardModifiers() == Qt::ShiftModifier ? VBoxGlobal::LaunchMode_Headless :
+                                                                                     VBoxGlobal::LaunchMode_Default;
+
+            /* Launch current VM: */
+            CMachine machine = pItem->machine();
+            vboxGlobal().launchMachine(machine, enmItemLaunchMode);
+        }
+}
+
 void UISelectorWindow::updateActionsAppearance()
 {
@@ -2210 +2181 @@
         {
             return !m_pPaneChooser->isGroupSavingInProgress() &&
-                   isAtLeastOneItemCanBeStartedOrShowed(items);
+                   isAtLeastOneItemCanBeStartedOrShown(items);
         }
         case UIActionIndexST_M_Group_S_Discard:
@@ -2370 +2341 @@
 
 /* static */
-bool UISelectorWindow::isAtLeastOneItemCanBeStartedOrShowed(const QList<UIVMItem*> &items)
+bool UISelectorWindow::isAtLeastOneItemCanBeStartedOrShown(const QList<UIVMItem*> &items)
 {
     foreach (UIVMItem *pItem, items)

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

@@ -25 +25 @@
 #include "QIMainWindow.h"
 #include "QIWithRetranslateUI.h"
+#include "VBoxGlobal.h"
 
 /* Forward declarations: */
@@ -266 +267 @@
     /** @} */
 
+    /** @name VM launching stuff.
+      * @{ */
+        /** Launches or shows virtual machines represented by passed @a items in corresponding @a enmLaunchMode (for launch). */
+        void performStartOrShowVirtualMachines(const QList<UIVMItem*> &items, VBoxGlobal::LaunchMode enmLaunchMode);
+    /** @} */
+
     /** @name Action update stuff.
       * @{ */
@@ -288 +295 @@
         static bool isAtLeastOneItemRemovable(const QList<UIVMItem*> &items);
         /** Returns whether at least one of passed @a items can be started or shown. */
-        static bool isAtLeastOneItemCanBeStartedOrShowed(const QList<UIVMItem*> &items);
+        static bool isAtLeastOneItemCanBeStartedOrShown(const QList<UIVMItem*> &items);
         /** Returns whether at least one of passed @a items can be discarded. */
         static bool isAtLeastOneItemDiscardable(const QList<UIVMItem*> &items);