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

Timestamp:

Sep 21, 2020 2:33:29 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Moving cloud machine refresh code from UICloudNetworkingStuff namespace directly to UITaskCloudRefreshMachineInfo class; It's done cause the progress code will be manipulated directly to allow to cancel it.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICloudNetworkingStuff.cpp (modified) (1 diff)
• globals/UICloudNetworkingStuff.h (modified) (1 diff)
• manager/UITaskCloudRefreshMachineInfo.cpp (modified) (2 diffs)
• manager/UITaskCloudRefreshMachineInfo.h (modified) (2 diffs)

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

@@ -476 +476 @@
     }
     return false;
-}
-
-bool UICloudNetworkingStuff::refreshCloudMachineInfo(CCloudMachine comCloudMachine,
-                                                     QWidget *pParent /* = 0 */)
-{
-    /* Acquire machine name first: */
-    QString strMachineName;
-    if (!cloudMachineName(comCloudMachine, strMachineName))
-        return false;
-
-    /* Now execute Refresh async method: */
-    CProgress comProgress = comCloudMachine.Refresh();
-    if (!comCloudMachine.isOk())
-    {
-        msgCenter().cannotAcquireCloudMachineParameter(comCloudMachine, pParent);
-        return false;
-    }
-
-    /* Show "Refresh cloud machine information" progress: */
-    msgCenter().showModalProgressDialog(comProgress,
-                                        strMachineName,
-                                        ":/progress_reading_appliance_90px.png", pParent, 0);
-    if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-    {
-        msgCenter().cannotAcquireCloudMachineParameter(comProgress, pParent);
-        return false;
-    }
-
-    /* Return result: */
-    return true;
-}
-
-bool UICloudNetworkingStuff::refreshCloudMachineInfo(CCloudMachine comCloudMachine,
-                                                     QString &strErrorMessage)
-{
-    /* Execute Refresh async method: */
-    CProgress comProgress = comCloudMachine.Refresh();
-    if (!comCloudMachine.isOk())
-    {
-        strErrorMessage = UIErrorString::formatErrorInfo(comCloudMachine);
-        return false;
-    }
-
-    /* Show "Refresh cloud machine information" progress: */
-    comProgress.WaitForCompletion(-1);
-    if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-    {
-        strErrorMessage = UIErrorString::formatErrorInfo(comProgress);
-        return false;
-    }
-
-    /* Return result: */
-    return true;
 }
 

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

@@ -147 +147 @@
                                                                        QWidget *pParent = 0);
 
-    /** Refreshes @a comCloudMachine information, 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 refreshCloudMachineInfo(CCloudMachine comCloudMachine,
-                                                      QWidget *pParent = 0);
-    /** Refreshes @a comCloudMachine information, using @a pParent to show messages according to.
-      * @note  Be aware, this is a blocking function, it will hang for a time of progress being executed. */
-    SHARED_LIBRARY_STUFF bool refreshCloudMachineInfo(CCloudMachine comCloudMachine,
-                                                      QString &strErrorMessage);
     /** 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. */

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

@@ -18 +18 @@
 /* GUI includes: */
 #include "UICloudNetworkingStuff.h"
+#include "UIErrorString.h"
+#include "UIProgressDialog.h"
 #include "UITaskCloudRefreshMachineInfo.h"
 
@@ -38 +40 @@
 {
     m_mutex.lock();
-    refreshCloudMachineInfo(m_comCloudMachine, m_strErrorInfo);
+
+    /* Execute Refresh async method: */
+    m_comCloudMachineRefreshProgress = m_comCloudMachine.Refresh();
+    if (m_comCloudMachine.isOk())
+    {
+        /* Show "Refresh cloud machine information" progress: */
+        QPointer<UIProgress> pObject = new UIProgress(m_comCloudMachineRefreshProgress, this);
+        pObject->run();
+        if (pObject)
+            delete pObject;
+        else
+        {
+            // Premature application shutdown,
+            // exit immediately:
+            return;
+        }
+        if (!m_comCloudMachineRefreshProgress.isOk() || m_comCloudMachineRefreshProgress.GetResultCode() != 0)
+            m_strErrorInfo = UIErrorString::formatErrorInfo(m_comCloudMachineRefreshProgress);
+    }
+    else
+        m_strErrorInfo = UIErrorString::formatErrorInfo(m_comCloudMachine);
+
     m_mutex.unlock();
 }

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

@@ -32 +32 @@
 #include "COMEnums.h"
 #include "CCloudMachine.h"
+#include "CProgress.h"
 
 
@@ -60 +61 @@
     /** Holds the cloud machine object. */
     CCloudMachine  m_comCloudMachine;
+    /** Holds the cloud machine refresh progress object. */
+    CProgress      m_comCloudMachineRefreshProgress;
 
     /** Holds the error info. */