Changeset 94593 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 13, 2022 5:33:39 PM (3 years ago)

Author:

vboxsync

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

150954

Message:

FE/Qt: bugref:10215. Making necessary changes so that new vm wizard is kicked off when VirtualBox binary is started with an iso as command line argument.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (4 diffs)
• manager/UIVirtualBoxManager.h (modified) (1 diff)
• settings/editors/UINameAndSystemEditor.cpp (modified) (3 diffs)
• settings/editors/UINameAndSystemEditor.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (5 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMExpertPage.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMExpertPage.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePage.h (modified) (1 diff)

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

@@ -654 +654 @@
         const QString strFile = list.at(i).toLocalFile();
 #endif
+        const QStringList isoExtensionList = QStringList() << "iso";
         /* If there is such file exists: */
         if (!strFile.isEmpty() && QFile::exists(strFile))
@@ -689 +690 @@
 #endif
             }
+            else if (UICommon::hasAllowedExtension(strFile, isoExtensionList))
+            {
+                openNewMachineWizard(strFile);
+            }
         }
     }
@@ -957 +962 @@
 void UIVirtualBoxManager::sltOpenNewMachineWizard()
 {
-    /* Lock the actions preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Welcome_S_New)
-                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_New)
-                                                         << actionPool()->action(UIActionIndexMN_M_Group_S_New),
-                                       "opened", true);
-    connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
-            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
-    updateActionsAppearance();
-
-    /* Get first selected item: */
-    UIVirtualMachineItem *pItem = currentItem();
-
-    /* For global item or local machine: */
-    if (   !pItem
-        || pItem->itemType() == UIVirtualMachineItemType_Local)
-    {
-        CUnattended comUnattendedInstaller = uiCommon().virtualBox().CreateUnattendedInstaller();
-        AssertMsg(!comUnattendedInstaller.isNull(), ("Could not create unattended installer!\n"));
-
-        /* Use the "safe way" to open stack of Mac OS X Sheets: */
-        QWidget *pWizardParent = windowManager().realParentWindow(this);
-        UISafePointerWizardNewVM pWizard = new UIWizardNewVM(pWizardParent, actionPool(),
-                                                             m_pWidget->fullGroupName(), "gui-createvm", comUnattendedInstaller);
-        windowManager().registerNewParent(pWizard, pWizardParent);
-
-        /* Execute wizard: */
-        pWizard->exec();
-
-        bool fStartHeadless = pWizard->startHeadless();
-        bool fUnattendedEnabled = pWizard->isUnattendedEnabled();
-        QString strMachineId = pWizard->createdMachineId().toString();
-        delete pWizard;
-        /* Handle unattended install stuff: */
-        if (fUnattendedEnabled)
-            startUnattendedInstall(comUnattendedInstaller, fStartHeadless, strMachineId);
-    }
-    /* For cloud machine: */
-    else
-    {
-        /* Use the "safe way" to open stack of Mac OS X Sheets: */
-        QWidget *pWizardParent = windowManager().realParentWindow(this);
-        UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent, m_pWidget->fullGroupName());
-        windowManager().registerNewParent(pWizard, pWizardParent);
-
-        /* Execute wizard: */
-        pWizard->exec();
-        delete pWizard;
-    }
+    openNewMachineWizard();
 }
 
@@ -2529 +2487 @@
 }
 
+void UIVirtualBoxManager::openNewMachineWizard(const QString &strISOFilePath /* = QString() */)
+{
+    /* Lock the actions preventing cascade calls: */
+    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Welcome_S_New)
+                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_New)
+                                                         << actionPool()->action(UIActionIndexMN_M_Group_S_New),
+                                       "opened", true);
+    connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
+            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
+    updateActionsAppearance();
+
+    /* Get first selected item: */
+    UIVirtualMachineItem *pItem = currentItem();
+
+    /* For global item or local machine: */
+    if (   !pItem
+        || pItem->itemType() == UIVirtualMachineItemType_Local)
+    {
+        CUnattended comUnattendedInstaller = uiCommon().virtualBox().CreateUnattendedInstaller();
+        AssertMsg(!comUnattendedInstaller.isNull(), ("Could not create unattended installer!\n"));
+
+        /* Use the "safe way" to open stack of Mac OS X Sheets: */
+        QWidget *pWizardParent = windowManager().realParentWindow(this);
+        UISafePointerWizardNewVM pWizard = new UIWizardNewVM(pWizardParent, actionPool(),
+                                                             m_pWidget->fullGroupName(), "gui-createvm",
+                                                             comUnattendedInstaller, strISOFilePath);
+        windowManager().registerNewParent(pWizard, pWizardParent);
+
+        /* Execute wizard: */
+        pWizard->exec();
+
+        bool fStartHeadless = pWizard->startHeadless();
+        bool fUnattendedEnabled = pWizard->isUnattendedEnabled();
+        QString strMachineId = pWizard->createdMachineId().toString();
+        delete pWizard;
+        /* Handle unattended install stuff: */
+        if (fUnattendedEnabled)
+            startUnattendedInstall(comUnattendedInstaller, fStartHeadless, strMachineId);
+    }
+    /* For cloud machine: */
+    else
+    {
+        /* Use the "safe way" to open stack of Mac OS X Sheets: */
+        QWidget *pWizardParent = windowManager().realParentWindow(this);
+        UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent, m_pWidget->fullGroupName());
+        windowManager().registerNewParent(pWizard, pWizardParent);
+
+        /* Execute wizard: */
+        pWizard->exec();
+        delete pWizard;
+    }
+}
+
 /* static */
 void UIVirtualBoxManager::launchMachine(CMachine &comMachine,

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

@@ -368 +368 @@
         /** Opens add machine dialog specifying initial name with @a strFileName. */
         void openAddMachineDialog(const QString &strFileName = QString());
-
+        /** Opens new machine dialog specifying initial name with @a strFileName. */
+        void openNewMachineWizard(const QString &strISOFilePath = QString());
         /** Launches certain @a comMachine in specified @a enmLaunchMode. */
         static void launchMachine(CMachine &comMachine, UICommon::LaunchMode enmLaunchMode = UICommon::LaunchMode_Default);

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -136 +136 @@
 }
 
+void UINameAndSystemEditor::setISOImagePath(const QString &strPath)
+{
+    if (m_pSelectorImage)
+        m_pSelectorImage->setPath(strPath);
+    emit sigImageChanged(strPath);
+}
 QString UINameAndSystemEditor::ISOImagePath() const
 {
@@ -543 +549 @@
                 m_pLabelEdition->setAlignment(Qt::AlignRight);
                 m_pLabelEdition->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-
                 m_pLayout->addWidget(m_pLabelEdition, iRow, 0);
             }
@@ -550 +555 @@
             if (m_pComboEdition)
             {
-                m_pLabelEdition->setBuddy(m_pComboEdition->focusProxy());
+                m_pLabelEdition->setBuddy(m_pComboEdition);
                 m_pLayout->addWidget(m_pComboEdition, iRow, 1, 1, 2);
             }

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h

@@ -111 +111 @@
     /** Returns image string selected by the user. */
     QString ISOImagePath() const;
+    /** Sets image path. */
+    void setISOImagePath(const QString &strPath);
 
     /** Defines the VM OS @a strTypeId and @a strFamilyId if passed. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -49 +49 @@
 UIWizardNewVM::UIWizardNewVM(QWidget *pParent, UIActionPool *pActionPool,
                              const QString &strMachineGroup, const QString &strHelpHashtag,
-                             CUnattended &comUnattended)
+                             CUnattended &comUnattended, const QString &strISOFilePath /* = QString() */)
     : UINativeWizard(pParent, WizardType_NewVM, WizardMode_Auto, strHelpHashtag)
     , m_strMachineGroup(strMachineGroup)
@@ -71 +71 @@
     , m_comUnattended(comUnattended)
     , m_fStartHeadless(false)
+    , m_strInitialISOFilePath(strISOFilePath)
 {
 #ifndef VBOX_WS_MAC
@@ -91 +92 @@
         case WizardMode_Basic:
         {
-            addPage(new UIWizardNewVMNameOSTypePage);
+            UIWizardNewVMNameOSTypePage *pNamePage = new UIWizardNewVMNameOSTypePage;
+            addPage(pNamePage);
+            if (!m_strInitialISOFilePath.isEmpty())
+                pNamePage->setISOFilePath(m_strInitialISOFilePath);
             m_iUnattendedInstallPageIndex = addPage(new UIWizardNewVMUnattendedPage);
             setUnattendedPageVisible(false);
@@ -101 +105 @@
         case WizardMode_Expert:
         {
-            addPage(new UIWizardNewVMExpertPage(m_pActionPool));
+            UIWizardNewVMExpertPage *pExpertPage = new UIWizardNewVMExpertPage(m_pActionPool);
+            addPage(pExpertPage);
+            if (!m_strInitialISOFilePath.isEmpty())
+                pExpertPage->setISOFilePath(m_strInitialISOFilePath);
             break;
         }
@@ -708 +715 @@
 void UIWizardNewVM::setISOFilePath(const QString &strISOFilePath)
 {
-    /* am I being a paranoid?: */
     QFileInfo isoFileInfo(strISOFilePath);
     if (!isoFileInfo.exists())

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -51 +51 @@
 
     UIWizardNewVM(QWidget *pParent, UIActionPool *pActionPool,
-                  const QString &strMachineGroup, const QString &strHelpHashtag, CUnattended &comUnattended);
+                  const QString &strMachineGroup, const QString &strHelpHashtag,
+                  CUnattended &comUnattended, const QString &strISOFilePath = QString());
+
     bool isUnattendedEnabled() const;
     bool isUnattendedInstallSupported() const;
@@ -225 +227 @@
        CUnattended &m_comUnattended;
        bool m_fStartHeadless;
+       QString m_strInitialISOFilePath;
     /** @} */
 };

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

@@ -84 +84 @@
 }
 
+void UIWizardNewVMExpertPage::setISOFilePath(const QString &strISOFilePath)
+{
+    QFileInfo isoFileInfo(strISOFilePath);
+    if (isoFileInfo.exists() && m_pNameAndSystemEditor)
+        m_pNameAndSystemEditor->setISOImagePath(strISOFilePath);
+}
+
 void UIWizardNewVMExpertPage::sltNameChanged(const QString &strNewName)
 {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.h

@@ -55 +55 @@
 
     UIWizardNewVMExpertPage(UIActionPool *pActionPool);
+    void setISOFilePath(const QString &strISOFilePath);
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -407 +407 @@
 }
 
+void UIWizardNewVMNameOSTypePage::setISOFilePath(const QString &strISOFilePath)
+{
+    QFileInfo isoFileInfo(strISOFilePath);
+    if (isoFileInfo.exists() && m_pNameAndSystemEditor)
+        m_pNameAndSystemEditor->setISOImagePath(strISOFilePath);
+}
+
 void UIWizardNewVMNameOSTypePage::prepare()
 {
@@ -511 +518 @@
         {
             m_pNameAndSystemEditor->setFocus();
-            m_pNameAndSystemEditor->setEditionSelectorEnabled(false);
+            setEditionSelectorEnabled();
         }
         setSkipCheckBoxEnable();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h

@@ -56 +56 @@
     /** Constructor. */
     UIWizardNewVMNameOSTypePage();
-
+    void setISOFilePath(const QString &strISOFilePath);
 
 protected: