Changeset 83076 in vbox for trunk

Timestamp:

Feb 14, 2020 2:14:09 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Rework GetInstanceInfo stuff to be represented by independent namespace to reuse it later.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualMachineItemCloud.cpp (modified) (6 diffs)
• UIVirtualMachineItemCloud.h (modified) (2 diffs)

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

@@ -30 +30 @@
 
 
-UIVirtualMachineItemCloud::UIVirtualMachineItemCloud()
-    : UIVirtualMachineItem(ItemType_CloudFake)
-    , m_pCloudMachine(0)
-    , m_enmFakeCloudItemState(FakeCloudItemState_Loading)
-{
-    recache();
-}
-
-UIVirtualMachineItemCloud::UIVirtualMachineItemCloud(const UICloudMachine &guiCloudMachine)
-    : UIVirtualMachineItem(ItemType_CloudReal)
-    , m_pCloudMachine(new UICloudMachine(guiCloudMachine))
-    , m_enmFakeCloudItemState(FakeCloudItemState_NotApplicable)
-{
-    recache();
-}
-
-UIVirtualMachineItemCloud::~UIVirtualMachineItemCloud()
-{
-    delete m_pCloudMachine;
-}
-
-void UIVirtualMachineItemCloud::updateState(QWidget *pParent)
-{
-    /* Make sure item is of real cloud type: */
-    AssertReturnVoid(itemType() == ItemType_CloudReal);
-
-    /* Update state: */
-    const QString strState = acquireInstanceInfo(KVirtualSystemDescriptionType_CloudInstanceState, pParent);
-    QMap<QString, KMachineState> states;
-    states["RUNNING"] = KMachineState_Running;
-    states["STOPPED"] = KMachineState_Paused;
-    states["STOPPING"] = KMachineState_Stopping;
-    states["STARTING"] = KMachineState_Starting;
-    m_enmMachineState = states.value(strState, KMachineState_PoweredOff);
-
-    /* Recache: */
-    recache();
-
-    /* Notify listeners finally: */
-    emit sigStateChange();
-}
-
-QString UIVirtualMachineItemCloud::acquireInstanceInfo(KVirtualSystemDescriptionType enmType, QWidget *pParent)
-{
-    /* Make sure item is of real cloud type and is initialized: */
-    AssertReturn(itemType() == ItemType_CloudReal, QString());
-    AssertPtrReturn(m_pCloudMachine, QString());
-
+/** GetInstanceInfo namespace. */
+namespace GetInstanceInfo
+{
+    /** Acquires instance info of certain @a enmType.
+      * @param  comCloudClient  Brings cloud client object.
+      * @param  strId           Brings cloud VM id.
+      * @param  pWidget         Brings parent widget to show messages according to. */
+    QString getInstanceInfo(KVirtualSystemDescriptionType enmType,
+                            const CCloudClient &comCloudClient,
+                            const QString &strId,
+                            QWidget *pParent = 0);
+}
+
+/* Using across module: */
+using namespace GetInstanceInfo;
+
+
+/*********************************************************************************************************************************
+*   Namespace GetInstanceInfo implementation.                                                                                    *
+*********************************************************************************************************************************/
+
+QString GetInstanceInfo::getInstanceInfo(KVirtualSystemDescriptionType enmType,
+                                         const CCloudClient &comCloudClient,
+                                         const QString &strId,
+                                         QWidget *pParent /* = 0 */)
+{
     /* Get VirtualBox object: */
     CVirtualBox comVBox = uiCommon().virtualBox();
@@ -84 +62 @@
     CAppliance comAppliance = comVBox.CreateAppliance();
     if (!comVBox.isOk())
-        msgCenter().cannotCreateAppliance(comVBox);
+    {
+        if (pParent)
+            msgCenter().cannotCreateAppliance(comVBox, pParent);
+        else
+        {
+            /// @todo fetch error info
+        }
+    }
     else
     {
@@ -90 +75 @@
         comAppliance.CreateVirtualSystemDescriptions(1);
         if (!comAppliance.isOk())
-            msgCenter().cannotCreateVirtualSystemDescription(comAppliance);
+        {
+            if (pParent)
+                msgCenter().cannotCreateVirtualSystemDescription(comAppliance, pParent);
+            else
+            {
+                /// @todo fetch error info
+            }
+        }
         else
         {
@@ -98 +90 @@
             CVirtualSystemDescription comDescription = descriptions.at(0);
 
-            /* Acquire cloud client: */
-            CCloudClient comCloudClient = m_pCloudMachine->client();
-
             /* Now execute GetInstanceInfo async method: */
-            CProgress comProgress = comCloudClient.GetInstanceInfo(m_strId, comDescription);
+            CProgress comProgress = comCloudClient.GetInstanceInfo(strId, comDescription);
             if (!comCloudClient.isOk())
-                msgCenter().cannotAcquireCloudClientParameter(comCloudClient);
+            {
+                if (pParent)
+                    msgCenter().cannotAcquireCloudClientParameter(comCloudClient, pParent);
+                else
+                {
+                    /// @todo fetch error info
+                }
+            }
             else
             {
                 /* Show "Acquire instance info" progress: */
-                msgCenter().showModalProgressDialog(comProgress, UICommon::tr("Acquire instance info ..."),
-                                                    ":/progress_reading_appliance_90px.png", pParent, 0);
+                if (pParent)
+                    msgCenter().showModalProgressDialog(comProgress, UICommon::tr("Acquire instance info ..."),
+                                                        ":/progress_reading_appliance_90px.png", pParent, 0);
+                else
+                    comProgress.WaitForCompletion(-1);
                 if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotAcquireCloudClientParameter(comProgress);
+                {
+                    if (pParent)
+                        msgCenter().cannotAcquireCloudClientParameter(comProgress, pParent);
+                    else
+                    {
+                        /// @todo fetch error info
+                    }
+                }
                 else
                 {
@@ -131 +137 @@
 }
 
+
+/*********************************************************************************************************************************
+*   Class UIVirtualMachineItemCloud implementation.                                                                              *
+*********************************************************************************************************************************/
+
+UIVirtualMachineItemCloud::UIVirtualMachineItemCloud()
+    : UIVirtualMachineItem(ItemType_CloudFake)
+    , m_pCloudMachine(0)
+    , m_enmFakeCloudItemState(FakeCloudItemState_Loading)
+{
+    recache();
+}
+
+UIVirtualMachineItemCloud::UIVirtualMachineItemCloud(const UICloudMachine &guiCloudMachine)
+    : UIVirtualMachineItem(ItemType_CloudReal)
+    , m_pCloudMachine(new UICloudMachine(guiCloudMachine))
+    , m_enmFakeCloudItemState(FakeCloudItemState_NotApplicable)
+{
+    recache();
+}
+
+UIVirtualMachineItemCloud::~UIVirtualMachineItemCloud()
+{
+    delete m_pCloudMachine;
+}
+
+void UIVirtualMachineItemCloud::updateState(QWidget *pParent)
+{
+    /* Make sure item is of real cloud type and is initialized: */
+    AssertReturnVoid(itemType() == ItemType_CloudReal);
+    AssertPtrReturnVoid(m_pCloudMachine);
+
+    /* Acquire state: */
+    const QString strState = getInstanceInfo(KVirtualSystemDescriptionType_CloudInstanceState,
+                                             m_pCloudMachine->client(),
+                                             m_strId,
+                                             pParent);
+
+    /* Update state: */
+    updateState(strState);
+}
+
 void UIVirtualMachineItemCloud::pause(QWidget *pParent)
 {
@@ -348 +396 @@
     }
 }
+
+void UIVirtualMachineItemCloud::updateState(const QString &strState)
+{
+    /* Prepare a map of known states: */
+    QMap<QString, KMachineState> states;
+    states["RUNNING"] = KMachineState_Running;
+    states["STOPPED"] = KMachineState_Paused;
+    states["STOPPING"] = KMachineState_Stopping;
+    states["STARTING"] = KMachineState_Starting;
+
+    /* Update our state value: */
+    m_enmMachineState = states.value(strState, KMachineState_PoweredOff);
+
+    /* Recache: */
+    recache();
+
+    /* Notify listeners finally: */
+    emit sigStateChange();
+}

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

@@ -65 +65 @@
           * @param  pWidget  Brings parent widget to show messages according to. */
         void updateState(QWidget *pParent);
-        /** Acquires instance info of certain @a enmType.
-          * @param  pWidget  Brings parent widget to show messages according to. */
-        QString acquireInstanceInfo(KVirtualSystemDescriptionType enmType, QWidget *pParent);
 
         /** Puts cloud VM on pause.
@@ -119 +116 @@
 private:
 
+    /** @name State attributes.
+      * @{ */
+        /** Updates cloud VM state on the basis of string @a strState value. */
+        void updateState(const QString &strState);
+    /** @} */
+
     /** @name Arguments.
       * @{ */