Changeset 83857 in vbox for trunk/src

Timestamp:

Apr 20, 2020 1:54:44 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: When adding cloud VM make sure actual provider/profile names are used.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/chooser/UIChooserModel.cpp (modified) (3 diffs)
• wizards/addcloudvm/UIWizardAddCloudVM.cpp (modified) (1 diff)
• wizards/addcloudvm/UIWizardAddCloudVM.h (modified) (1 diff)
• wizards/addcloudvm/UIWizardAddCloudVMPageBasic1.cpp (modified) (1 diff)
• wizards/addcloudvm/UIWizardAddCloudVMPageBasic1.h (modified) (1 diff)
• wizards/addcloudvm/UIWizardAddCloudVMPageExpert.cpp (modified) (1 diff)
• wizards/addcloudvm/UIWizardAddCloudVMPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -939 +939 @@
         return;
 
-    /* Select the parent: */
-    UIChooserNode *pGroup = 0;
-    if (isSingleGroupSelected())
-        pGroup = firstSelectedItem()->node();
-    else if (!selectedItems().isEmpty())
-        pGroup = firstSelectedItem()->parentItem()->node();
-    QString strGroupName;
-    if (pGroup)
-        strGroupName = pGroup->fullName();
-
     /* Lock the action preventing cascade calls: */
     actionPool()->action(UIActionIndexST_M_Welcome_S_New)->setEnabled(false);
@@ -958 +948 @@
         ||firstSelectedMachineItem()->itemType() == UIVirtualMachineItem::ItemType_Local)
     {
+        /* Select the parent: */
+        UIChooserNode *pGroup = 0;
+        if (isSingleGroupSelected())
+            pGroup = firstSelectedItem()->node();
+        else if (!selectedItems().isEmpty())
+            pGroup = firstSelectedItem()->parentItem()->node();
+        QString strGroupName;
+        if (pGroup)
+            strGroupName = pGroup->fullName();
+
         /* Use the "safe way" to open stack of Mac OS X Sheets: */
         QWidget *pWizardParent = windowManager().realParentWindow(chooser()->managerWidget());
@@ -983 +983 @@
         // ourselves cause there is no corresponding event yet. So we are calling actual handler to do that.
         foreach (const CCloudMachine &comMachine, pWizard->machines())
-            sltCloudMachineRegistered(pGroup->parentNode()->name() /* provider name */,
-                                      pGroup->name() /* profile name */,
+            sltCloudMachineRegistered(pWizard->source() /* provider name */,
+                                      pWizard->profileName() /* profile name */,
                                       comMachine.GetId() /* machine ID */,
                                       true /* registered? */);

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

@@ -66 +66 @@
 }
 
+QString UIWizardAddCloudVM::source() const
+{
+    return field("source").toString();
+}
+
+QString UIWizardAddCloudVM::profileName() const
+{
+    return field("profileName").toString();
+}
+
 bool UIWizardAddCloudVM::addCloudVMs()
 {

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

@@ -66 +66 @@
     QList<CCloudMachine> machines() const { return m_machines; }
 
+    /** Returns source. */
+    QString source() const;
+    /** Returns profile name. */
+    QString profileName() const;
+
     /** Adds cloud VMs. */
     bool addCloudVMs();

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

@@ -601 +601 @@
 
     /* Register fields: */
+    registerField("source", this, "source");
+    registerField("profileName", this, "profileName");
     registerField("instanceIds", this, "instanceIds");
 }

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

@@ -133 +133 @@
 {
     Q_OBJECT;
+    Q_PROPERTY(QString source READ source);
+    Q_PROPERTY(QString profileName READ profileName);
     Q_PROPERTY(QStringList instanceIds READ instanceIds);
 

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

@@ -154 +154 @@
 
     /* Register fields: */
+    registerField("source", this, "source");
+    registerField("profileName", this, "profileName");
     registerField("instanceIds", this, "instanceIds");
 }

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

@@ -33 +33 @@
 {
     Q_OBJECT;
+    Q_PROPERTY(QString source READ source);
+    Q_PROPERTY(QString profileName READ profileName);
     Q_PROPERTY(QStringList instanceIds READ instanceIds);