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

Timestamp:

Apr 20, 2020 1:36:50 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Rework add VM stuff to be more universal; Soon it will be handling cloud stuff as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManager.cpp (modified) (7 diffs)
• UIVirtualBoxManager.h (modified) (2 diffs)

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

@@ -292 +292 @@
                     uiCommon().launchMachine(comMachine);
                 else
-                    sltOpenAddMachineDialog(strFile);
+                    openAddMachineDialog(strFile);
             }
             /* And has allowed VBox OVF file extension: */
@@ -465 +465 @@
     UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance), "opened", true);
     connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
-    this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
+            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
     updateActionsAppearance();
 
@@ -557 +557 @@
 }
 
-void UIVirtualBoxManager::sltOpenAddMachineDialog(const QString &strFileName /* = QString() */)
-{
-    /* Initialize variables: */
-#ifdef VBOX_WS_MAC
-    QString strTmpFile = ::darwinResolveAlias(strFileName);
-#else
-    QString strTmpFile = strFileName;
-#endif
-    CVirtualBox comVBox = uiCommon().virtualBox();
-
+void UIVirtualBoxManager::sltOpenAddMachineDialog()
+{
     /* Lock the actions preventing cascade calls: */
     UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexST_M_Welcome_S_Add)
@@ -576 +568 @@
     updateActionsAppearance();
 
-    /* No file specified: */
-    if (strTmpFile.isEmpty())
-    {
-        QString strBaseFolder = comVBox.GetSystemProperties().GetDefaultMachineFolder();
-        QString strTitle = tr("Select a virtual machine file");
-        QStringList extensions;
-        for (int i = 0; i < VBoxFileExts.size(); ++i)
-            extensions << QString("*.%1").arg(VBoxFileExts[i]);
-        QString strFilter = tr("Virtual machine files (%1)").arg(extensions.join(" "));
-        /* Create open file dialog: */
-        QStringList fileNames = QIFileDialog::getOpenFileNames(strBaseFolder, strFilter, this, strTitle, 0, true, true);
-        if (!fileNames.isEmpty())
-            strTmpFile = fileNames.at(0);
-    }
-
-    /* Nothing was chosen? */
-    if (strTmpFile.isEmpty())
-        return;
-
-    /* Make sure this machine can be opened: */
-    CMachine comMachineNew = comVBox.OpenMachine(strTmpFile);
-    if (!comVBox.isOk())
-    {
-        msgCenter().cannotOpenMachine(comVBox, strTmpFile);
-        return;
-    }
-
-    /* Make sure this machine was NOT registered already: */
-    CMachine comMachineOld = comVBox.FindMachine(comMachineNew.GetId().toString());
-    if (!comMachineOld.isNull())
-    {
-        msgCenter().cannotReregisterExistingMachine(strTmpFile, comMachineOld.GetName());
-        return;
-    }
-
-    /* Register that machine: */
-    comVBox.RegisterMachine(comMachineNew);
+    /* Open add machine dialog: */
+    openAddMachineDialog();
 }
 
@@ -1436 +1393 @@
     /* 'Welcome' menu connections: */
     connect(actionPool()->action(UIActionIndexST_M_Welcome_S_Add), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltOpenAddMachineDialogDefault);
+            this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
 
     /* 'Group' menu connections: */
     connect(actionPool()->action(UIActionIndexST_M_Group_S_Add), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltOpenAddMachineDialogDefault);
+            this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
     connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartOrShowMachine);
@@ -1458 +1415 @@
     /* 'Machine' menu connections: */
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Add), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltOpenAddMachineDialogDefault);
+            this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
     connect(actionPool()->action(UIActionIndexST_M_Machine_S_Settings), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenMachineSettingsDialogDefault);
@@ -1632 +1589 @@
 }
 
+void UIVirtualBoxManager::openAddMachineDialog(const QString &strFileName /* = QString() */)
+{
+    /* Initialize variables: */
+#ifdef VBOX_WS_MAC
+    QString strTmpFile = ::darwinResolveAlias(strFileName);
+#else
+    QString strTmpFile = strFileName;
+#endif
+    CVirtualBox comVBox = uiCommon().virtualBox();
+
+    /* No file specified: */
+    if (strTmpFile.isEmpty())
+    {
+        QString strBaseFolder = comVBox.GetSystemProperties().GetDefaultMachineFolder();
+        QString strTitle = tr("Select a virtual machine file");
+        QStringList extensions;
+        for (int i = 0; i < VBoxFileExts.size(); ++i)
+            extensions << QString("*.%1").arg(VBoxFileExts[i]);
+        QString strFilter = tr("Virtual machine files (%1)").arg(extensions.join(" "));
+        /* Create open file dialog: */
+        QStringList fileNames = QIFileDialog::getOpenFileNames(strBaseFolder, strFilter, this, strTitle, 0, true, true);
+        if (!fileNames.isEmpty())
+            strTmpFile = fileNames.at(0);
+    }
+
+    /* Nothing was chosen? */
+    if (strTmpFile.isEmpty())
+        return;
+
+    /* Make sure this machine can be opened: */
+    CMachine comMachineNew = comVBox.OpenMachine(strTmpFile);
+    if (!comVBox.isOk())
+    {
+        msgCenter().cannotOpenMachine(comVBox, strTmpFile);
+        return;
+    }
+
+    /* Make sure this machine was NOT registered already: */
+    CMachine comMachineOld = comVBox.FindMachine(comMachineNew.GetId().toString());
+    if (!comMachineOld.isNull())
+    {
+        msgCenter().cannotReregisterExistingMachine(strTmpFile, comMachineOld.GetName());
+        return;
+    }
+
+    /* Register that machine: */
+    comVBox.RegisterMachine(comMachineNew);
+}
+
 void UIVirtualBoxManager::performStartOrShowVirtualMachines(const QList<UIVirtualMachineItem*> &items, UICommon::LaunchMode enmLaunchMode)
 {

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

@@ -185 +185 @@
     /** @name Machine menu stuff.
       * @{ */
-        /** Handles call to open Add Machine dialog.
-          * @param strFileName can bring the name of file to add machine from. */
-        void sltOpenAddMachineDialog(const QString &strFileName = QString());
-        /** Handles call to open Add Machine dialog the default way. */
-        void sltOpenAddMachineDialogDefault() { sltOpenAddMachineDialog(); }
+        /** Handles call to open add machine dialog. */
+        void sltOpenAddMachineDialog();
 
         /** Handles call to open Machine Settings dialog.
@@ -304 +301 @@
         /** Returns whether single cloud profile group is selected. */
         bool isSingleCloudProfileGroupSelected() const;
+    /** @} */
+
+    /** @name VM add stuff.
+      * @{ */
+        /** Opens add machine dialog specifying initial name with @a strFileName. */
+        void openAddMachineDialog(const QString &strFileName = QString());
     /** @} */