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

Timestamp:

Apr 20, 2020 2:13:40 PM (5 years ago)

Author:

vboxsync

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

137387

Message:

FE/Qt: bugref:9653: Rework Add Cloud VM wizard the way it notifies about registered cloud VM via temporary UICommon API; This is to be replaced by corresponding Main API event later.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (2 diffs)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)
• wizards/addcloudvm/UIWizardAddCloudVM.cpp (modified) (3 diffs)
• wizards/addcloudvm/UIWizardAddCloudVM.h (modified) (2 diffs)

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

@@ -2570 +2570 @@
 }
 
+void UICommon::notifyCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
+                                            const QUuid &uId, const bool fRegistered)
+{
+    emit sigCloudMachineRegistered(strProviderShortName, strProfileName, uId, fRegistered);
+}
+
 void UICommon::enumerateMedia(const CMediumVector &comMedia /* = CMediumVector() */)
 {

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

@@ -84 +84 @@
         /** Notifies listeners about the VBoxSVC availability change. */
         void sigVBoxSVCAvailabilityChange();
+    /** @} */
+
+    /** @name Temporary: Cloud Virtual Machine stuff.
+     * @{ */
+        /** Notifies listeners about cloud VM was (un)registered.
+          * @note   This is to be replaced by corresponding Main API event later.
+          * @param  strProviderShortName  Brings provider short name.
+          * @param  strProfileName        Brings profile name.
+          * @param  uId                   Brings cloud VM id.
+          * @param  fRegistered           True is machine was registered, false otherwise. */
+        void sigCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
+                                       const QUuid &uId, const bool fRegistered);
     /** @} */
 
@@ -483 +495 @@
     /** @} */
 
+    /** @name Temporary: Cloud Virtual Machine stuff.
+     * @{ */
+        /** Notifies listeners about cloud VM was (un)registered.
+          * @note   This is to be replaced by corresponding Main API event later.
+          * @param  strProviderShortName  Brings provider short name.
+          * @param  strProfileName        Brings profile name.
+          * @param  uId                   Brings cloud VM id.
+          * @param  fRegistered           True is machine was registered, false otherwise. */
+        void notifyCloudMachineRegistered(const QString &strProviderShortName, const QString &strProfileName,
+                                          const QUuid &uId, const bool fRegistered);
+    /** @} */
+
     /** @name COM: Virtual Media stuff.
      * @{ */

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

@@ -539 +539 @@
     connect(this, &UIChooserAbstractModel::sigGroupSavingStateChanged,
             m_pParent, &UIChooser::sigGroupSavingStateChanged);
+
+    /* Setup temporary connections,
+     * this is to be replaced by corresponding Main API event later. */
+    connect(&uiCommon(), &UICommon::sigCloudMachineRegistered,
+            this, &UIChooserAbstractModel::sltCloudMachineRegistered);
 
     /* Setup global connections: */

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

@@ -978 +978 @@
         /* Execute wizard: */
         pWizard->exec();
-
-        // WORKAROUND:
-        // Hehey! Now we have to inject created VM nodes and then rebuild tree for the main root node
-        // ourselves cause there is no corresponding event yet. So we are calling actual handler to do that.
-        foreach (const CCloudMachine &comMachine, pWizard->machines())
-            sltCloudMachineRegistered(pWizard->source() /* provider name */,
-                                      pWizard->profileName() /* profile name */,
-                                      comMachine.GetId() /* machine ID */,
-                                      true /* registered? */);
-
         delete pWizard;
     }

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

@@ -17 +17 @@
 
 /* GUI includes: */
+#include "UICommon.h"
 #include "UIMessageCenter.h"
 #include "UIWizardAddCloudVM.h"
@@ -66 +67 @@
 }
 
-QString UIWizardAddCloudVM::source() const
-{
-    return field("source").toString();
-}
-
-QString UIWizardAddCloudVM::profileName() const
-{
-    return field("profileName").toString();
-}
-
 bool UIWizardAddCloudVM::addCloudVMs()
 {
@@ -118 +109 @@
                     if (comMachine.isNotNull())
                     {
-                        m_machines << comMachine;
+                        uiCommon().notifyCloudMachineRegistered(field("source").toString(),
+                                                                field("profileName").toString(),
+                                                                comMachine.GetId(),
+                                                                true /* registered */);
                         fResult = true;
                     }

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

@@ -63 +63 @@
     CCloudClient client() const { return m_comClient; }
 
-    /** Returns Cloud Machine object wrapper list. */
-    QList<CCloudMachine> machines() const { return m_machines; }
-
-    /** Returns source. */
-    QString source() const;
-    /** Returns profile name. */
-    QString profileName() const;
-
     /** Adds cloud VMs. */
     bool addCloudVMs();
@@ -83 +75 @@
     /** Holds the Cloud Client object wrapper. */
     CCloudClient  m_comClient;
-
-    /** Holds the Cloud Machine object wrapper list. */
-    QList<CCloudMachine>  m_machines;
 };