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

Timestamp:

Sep 30, 2020 12:37:06 PM (4 years ago)

Author:

vboxsync

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

140634

Message:

FE/Qt: bugref:9653: Wizards stuff: Pass full group name to add/create cloud VM wizards as a hint to determine profile (and provider in future).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• wizards/addcloudvm/UIWizardAddCloudVM.cpp (modified) (1 diff)
• wizards/addcloudvm/UIWizardAddCloudVM.h (modified) (2 diffs)
• wizards/addcloudvm/UIWizardAddCloudVMPageBasic1.cpp (modified) (1 diff)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (2 diffs)
• wizards/newcloudvm/UIWizardNewCloudVM.cpp (modified) (1 diff)
• wizards/newcloudvm/UIWizardNewCloudVM.h (modified) (3 diffs)
• wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.cpp (modified) (1 diff)

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

@@ -808 +808 @@
         /* Use the "safe way" to open stack of Mac OS X Sheets: */
         QWidget *pWizardParent = windowManager().realParentWindow(this);
-        UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent);
+        UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent, m_pWidget->fullGroupName());
         windowManager().registerNewParent(pWizard, pWizardParent);
         pWizard->prepare();
@@ -844 +844 @@
         /* Use the "safe way" to open stack of Mac OS X Sheets: */
         QWidget *pWizardParent = windowManager().realParentWindow(this);
-        UISafePointerWizardAddCloudVM pWizard = new UIWizardAddCloudVM(pWizardParent);
+        UISafePointerWizardAddCloudVM pWizard = new UIWizardAddCloudVM(pWizardParent, m_pWidget->fullGroupName());
         windowManager().registerNewParent(pWizard, pWizardParent);
         pWizard->prepare();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVM.cpp

@@ -28 +28 @@
 
 UIWizardAddCloudVM::UIWizardAddCloudVM(QWidget *pParent,
-                                       const CCloudClient &comClient /* = CCloudClient() */,
+                                       const QString &strFullGroupName /* = QString() */,
                                        WizardMode enmMode /* = WizardMode_Auto */)
     : UIWizard(pParent, WizardType_AddCloudVM, enmMode)
-    , m_comClient(comClient)
+    , m_strFullGroupName(strFullGroupName)
 {
 #ifndef VBOX_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVM.h

@@ -50 +50 @@
 
     /** Constructs Add Cloud VM wizard passing @a pParent & @a enmMode to the base-class.
-      * @param  comClient  Brings the Cloud Client object wrapper to work with. */
+      * @param  strFullGroupName  Brings full group name (/provider/profile) to add VM to. */
     UIWizardAddCloudVM(QWidget *pParent,
-                       const CCloudClient &comClient = CCloudClient(),
+                       const QString &strFullGroupName = QString(),
                        WizardMode enmMode = WizardMode_Auto);
 
     /** Prepares all. */
     virtual void prepare() /* override */;
+
+    /** Returns full group name. */
+    QString fullGroupName() const { return m_strFullGroupName; }
 
     /** Defines Cloud @a comClient object wrapper. */
@@ -73 +76 @@
 private:
 
+    /** Holds the full group name (/provider/profile) to add VM to. */
+    QString  m_strFullGroupName;
+
     /** Holds the Cloud Client object wrapper. */
     CCloudClient  m_comClient;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageBasic1.cpp

@@ -116 +116 @@
     if (m_pAccountComboBox->currentIndex() != -1)
         strOldData = m_pAccountComboBox->itemData(m_pAccountComboBox->currentIndex(), AccountData_ProfileName).toString();
+    else
+    {
+        /* Try to fetch "old" account name from wizard full group name: */
+        UIWizardAddCloudVM *pWizard = qobject_cast<UIWizardAddCloudVM*>(wizardImp());
+        AssertPtrReturnVoid(pWizard);
+        const QString strFullGroupName = pWizard->fullGroupName();
+        const QString strProfileName = strFullGroupName.section('/', 2, 2);
+        if (!strProfileName.isEmpty())
+            strOldData = strProfileName;
+    }
 
     /* Clear combo initially: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -331 +331 @@
                     CVirtualSystemDescription comDescription = field("vsd").value<CVirtualSystemDescription>();
                     /* Create and run wizard as modal dialog, but prevent final step: */
-                    pNewCloudVMWizard = new UIWizardNewCloudVM(this, comClient, comDescription, mode());
+                    pNewCloudVMWizard = new UIWizardNewCloudVM(this, QString() /** @todo pass proper full group name! */, comClient, comDescription, mode());
                     pNewCloudVMWizard->setFinalStepPrevented(true);
                     pNewCloudVMWizard->prepare();
@@ -392 +392 @@
                     /* Create and run short wizard mode as modal dialog: */
                     QWidget *pWizardParent = windowManager().realParentWindow(this);
-                    pNewCloudVMWizard = new UIWizardNewCloudVM(pWizardParent, comClient, comDescription, mode());
+                    pNewCloudVMWizard = new UIWizardNewCloudVM(pWizardParent, QString() /** @todo pass proper full group name! */, comClient, comDescription, mode());
                     windowManager().registerNewParent(pNewCloudVMWizard, pWizardParent);
                     pNewCloudVMWizard->prepare();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVM.cpp

@@ -33 +33 @@
 
 UIWizardNewCloudVM::UIWizardNewCloudVM(QWidget *pParent,
+                                       const QString &strFullGroupName /* = QString() */,
                                        const CCloudClient &comClient /* = CCloudClient() */,
                                        const CVirtualSystemDescription &comDescription /* = CVirtualSystemDescription() */,
                                        WizardMode enmMode /* = WizardMode_Auto */)
     : UIWizard(pParent, WizardType_NewCloudVM, enmMode)
+    , m_strFullGroupName(strFullGroupName)
     , m_comClient(comClient)
     , m_comVSD(comDescription)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVM.h

@@ -52 +52 @@
 
     /** Constructs New Cloud VM wizard passing @a pParent to the base-class.
-      * @param  comClient       Brings the Cloud Client object to work with.
-      * @param  comDescription  Brings the Virtual System Description object to use. */
+      * @param  strFullGroupName  Brings full group name (/provider/profile) to create VM in.
+      * @param  comClient         Brings the Cloud Client object to work with.
+      * @param  comDescription    Brings the Virtual System Description object to use. */
     UIWizardNewCloudVM(QWidget *pParent,
+                       const QString &strFullGroupName = QString(),
                        const CCloudClient &comClient = CCloudClient(),
                        const CVirtualSystemDescription &comDescription = CVirtualSystemDescription(),
@@ -64 +66 @@
     /** Sets whether the final step is @a fPrevented. */
     void setFinalStepPrevented(bool fPrevented) { m_fFinalStepPrevented = fPrevented; }
+
+    /** Returns full group name. */
+    QString fullGroupName() const { return m_strFullGroupName; }
 
     /** Defines Cloud @a comClient object. */
@@ -102 +107 @@
 private:
 
+    /** Holds the full group name (/provider/profile) to add VM to. */
+    QString                        m_strFullGroupName;
     /** Holds the Cloud Client object reference. */
     CCloudClient                   m_comClient;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.cpp

@@ -117 +117 @@
     if (m_pAccountComboBox->currentIndex() != -1)
         strOldData = m_pAccountComboBox->itemData(m_pAccountComboBox->currentIndex(), AccountData_ProfileName).toString();
+    else
+    {
+        /* Try to fetch "old" account name from wizard full group name: */
+        UIWizardNewCloudVM *pWizard = qobject_cast<UIWizardNewCloudVM*>(wizardImp());
+        AssertPtrReturnVoid(pWizard);
+        const QString strFullGroupName = pWizard->fullGroupName();
+        const QString strProfileName = strFullGroupName.section('/', 2, 2);
+        if (!strProfileName.isEmpty())
+            strOldData = strProfileName;
+    }
 
     /* Clear combo initially: */