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

Timestamp:

Apr 27, 2020 10:42:16 AM (5 years ago)

Author:

vboxsync

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

137560

Message:

FE/Qt: bugref:9653: Move some of cloud VM settings dialog stuff to common UICloudNetworkingStuff namespace.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/machinesettings/UICloudMachineSettingsDialog.cpp (modified) (4 diffs)
• globals/UICloudNetworkingStuff.cpp (modified) (2 diffs)
• globals/UICloudNetworkingStuff.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/machinesettings/UICloudMachineSettingsDialog.cpp

@@ -25 +25 @@
 #include "UICloudMachineSettingsDialog.h"
 #include "UICloudMachineSettingsDialogPage.h"
+#include "UICloudNetworkingStuff.h"
 
 /* COM includes: */
@@ -50 +51 @@
 void UICloudMachineSettingsDialog::accept()
 {
-    /** Makes sure page data committed: */
+    /* Makes sure page data committed: */
     if (m_pPage)
         m_pPage->makeSureDataCommitted();
@@ -88 +89 @@
 {
     /* Update name: */
-    m_strName = m_comCloudMachine.GetName();
-    if (!m_comCloudMachine.isOk())
-    {
-        msgCenter().cannotAcquireCloudMachineParameter(m_comCloudMachine, this);
+    if (!cloudMachineName(m_comCloudMachine, m_strName, this))
         reject();
-    }
 
     /* Retranslate title: */
@@ -99 +96 @@
 
     /* Update form: */
-    CForm comForm;
-    CProgress comProgress = m_comCloudMachine.GetSettingsForm(comForm);
-    if (!m_comCloudMachine.isOk())
-    {
-        msgCenter().cannotAcquireCloudMachineParameter(m_comCloudMachine, this);
+    if (!cloudMachineSettingsForm(m_comCloudMachine, m_comForm, this))
         reject();
-    }
-    msgCenter().showModalProgressDialog(comProgress,
-                                        m_strName,
-                                        ":/progress_settings_90px.png", this, 0);
-    if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-    {
-        msgCenter().cannotAcquireCloudClientParameter(comProgress, this);
-        reject();
-    }
-    m_comForm = comForm;
 
     /* Assign page with form: */

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

@@ -24 +24 @@
 /* COM includes: */
 #include "CAppliance.h"
+#include "CForm.h"
 #include "CProgress.h"
 #include "CStringArray.h"
@@ -201 +202 @@
     }
     enmResult = enmState;
+    return true;
+}
+
+bool UICloudNetworkingStuff::cloudMachineSettingsForm(CCloudMachine &comCloudMachine,
+                                                      CForm &comResult,
+                                                      QWidget *pParent /* = 0 */)
+{
+    /* Acquire machine name first: */
+    QString strMachineName;
+    if (!cloudMachineName(comCloudMachine, strMachineName))
+        return false;
+
+    /* Prepare settings form: */
+    CForm comForm;
+
+    /* Now execute GetSettingsForm async method: */
+    CProgress comProgress = comCloudMachine.GetSettingsForm(comForm);
+    if (!comCloudMachine.isOk())
+    {
+        msgCenter().cannotAcquireCloudMachineParameter(comCloudMachine, pParent);
+        return false;
+    }
+
+    /* Show "Get settings form" progress: */
+    msgCenter().showModalProgressDialog(comProgress,
+                                        strMachineName,
+                                        ":/progress_settings_90px.png", pParent, 0);
+    if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+    {
+        msgCenter().cannotAcquireCloudClientParameter(comProgress, pParent);
+        return false;
+    }
+
+    /* Return result: */
+    comResult = comForm;
     return true;
 }

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

@@ -75 +75 @@
                                                 KMachineState &enmResult,
                                                 QWidget *pParent = 0);
+
+    /** Acquires @a comCloudMachine settings form as a @a comResult, using @a pParent to show messages according to.
+      * @note  Be aware, this is a blocking function, corresponding progress dialog will be executed. */
+    SHARED_LIBRARY_STUFF bool cloudMachineSettingsForm(CCloudMachine &comCloudMachine,
+                                                       CForm &comResult,
+                                                       QWidget *pParent = 0);
 
     /** Acquires instance map.