Changeset 83962 in vbox

Timestamp:

Apr 24, 2020 9:45:59 AM (5 years ago)

Author:

vboxsync

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

137527

Message:

FE/Qt: bugref:9653: Cleanup for cloud related message-center stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (3 diffs)
• globals/UIMessageCenter.cpp (modified) (5 diffs)
• globals/UIMessageCenter.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (4 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)

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

@@ -2459 +2459 @@
     if (!comMachine.isOk())
     {
-        msgCenter().cannotAcquireMachineParameter(comMachine);
+        msgCenter().cannotAcquireCloudMachineParameter(comMachine);
         return false;
     }
@@ -2467 +2467 @@
     if (!comMachine.isOk())
     {
-        msgCenter().cannotPowerUpMachine(comMachine);
+        msgCenter().cannotPowerUpCloudMachine(comMachine);
         return false;
     }
@@ -2475 +2475 @@
     if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
     {
-        msgCenter().cannotPowerUpMachine(comProgress, strName);
+        msgCenter().cannotPowerUpCloudMachine(comProgress, strName);
         return false;
     }

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

@@ -605 +605 @@
 
 void UIMessageCenter::cannotAcquireMachineParameter(const CMachine &comMachine, QWidget *pParent /* = 0 */) const
-{
-    /* Show the error: */
-    error(pParent, MessageType_Error,
-          tr("Failed to acquire machine parameter."), UIErrorString::formatErrorInfo(comMachine));
-}
-
-void UIMessageCenter::cannotAcquireMachineParameter(const CCloudMachine &comMachine, QWidget *pParent /* = 0 */) const
 {
     /* Show the error: */
@@ -925 +918 @@
 }
 
-void UIMessageCenter::cannotACPIShutdownMachine(const CCloudMachine &comMachine) const
-{
-    error(0, MessageType_Error,
-          tr("Failed to send the ACPI Power Button press event to virtual machine <b>%1</b>.")
+void UIMessageCenter::cannotACPIShutdownCloudMachine(const CCloudMachine &comMachine) const
+{
+    error(0, MessageType_Error,
+          tr("Failed to send the ACPI Power Button press event to the virtual machine <b>%1</b>.")
              .arg(CCloudMachine(comMachine).GetName()),
           UIErrorString::formatErrorInfo(comMachine));
 }
 
-void UIMessageCenter::cannotACPIShutdownMachine(const CProgress &progress, const QString &strMachineName) const
-{
-    error(0, MessageType_Error,
-          tr("Failed to send the ACPI Power Button press event to virtual machine <b>%1</b>.")
+void UIMessageCenter::cannotACPIShutdownCloudMachine(const CProgress &comProgress, const QString &strMachineName) const
+{
+    error(0, MessageType_Error,
+          tr("Failed to send the ACPI Power Button press event to the virtual machine <b>%1</b>.")
              .arg(strMachineName),
-          UIErrorString::formatErrorInfo(progress));
-}
-
-void UIMessageCenter::cannotPowerUpMachine(const CCloudMachine &comMachine) const
+          UIErrorString::formatErrorInfo(comProgress));
+}
+
+void UIMessageCenter::cannotPowerUpCloudMachine(const CCloudMachine &comMachine) const
 {
     error(0, MessageType_Error,
@@ -949 +942 @@
 }
 
-void UIMessageCenter::cannotPowerUpMachine(const CProgress &comProgress, const QString &strMachineName) const
+void UIMessageCenter::cannotPowerUpCloudMachine(const CProgress &comProgress, const QString &strMachineName) const
 {
     error(0, MessageType_Error,
@@ -957 +950 @@
 }
 
-void UIMessageCenter::cannotPowerDownMachine(const CConsole &console) const
+void UIMessageCenter::cannotPowerDownMachine(const CConsole &comConsole) const
 {
     error(0, MessageType_Error,
           tr("Failed to stop the virtual machine <b>%1</b>.")
-             .arg(CConsole(console).GetMachine().GetName()),
-          UIErrorString::formatErrorInfo(console));
-}
-
-void UIMessageCenter::cannotPowerDownMachine(const CCloudMachine &comMachine) const
+             .arg(CConsole(comConsole).GetMachine().GetName()),
+          UIErrorString::formatErrorInfo(comConsole));
+}
+
+void UIMessageCenter::cannotPowerDownMachine(const CProgress &comProgress, const QString &strMachineName) const
+{
+    error(0, MessageType_Error,
+          tr("Failed to stop the virtual machine <b>%1</b>.")
+             .arg(strMachineName),
+          UIErrorString::formatErrorInfo(comProgress));
+}
+
+void UIMessageCenter::cannotPowerDownCloudMachine(const CCloudMachine &comMachine) const
 {
     error(0, MessageType_Error,
@@ -973 +974 @@
 }
 
-void UIMessageCenter::cannotPowerDownMachine(const CProgress &progress, const QString &strMachineName) const
+void UIMessageCenter::cannotPowerDownCloudMachine(const CProgress &comProgress, const QString &strMachineName) const
 {
     error(0, MessageType_Error,
           tr("Failed to stop the virtual machine <b>%1</b>.")
              .arg(strMachineName),
-          UIErrorString::formatErrorInfo(progress));
+          UIErrorString::formatErrorInfo(comProgress));
 }
 

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

@@ -265 +265 @@
     void cannotAcquireVirtualBoxParameter(const CVirtualBox &comVBox, QWidget *pParent = 0) const;
     void cannotAcquireMachineParameter(const CMachine &comMachine, QWidget *pParent = 0) const;
-    void cannotAcquireMachineParameter(const CCloudMachine &comMachine, QWidget *pParent = 0) const;
 
     /* API: Global cloud warnings: */
@@ -294 +293 @@
     void cannotSaveMachineState(const CProgress &progress, const QString &strMachineName);
     void cannotACPIShutdownMachine(const CConsole &console) const;
-    void cannotACPIShutdownMachine(const CCloudMachine &comMachine) const;
-    void cannotACPIShutdownMachine(const CProgress &progress, const QString &strMachineName) const;
-    void cannotPowerUpMachine(const CCloudMachine &comMachine) const;
-    void cannotPowerUpMachine(const CProgress &comProgress, const QString &strMachineName) const;
-    void cannotPowerDownMachine(const CConsole &console) const;
-    void cannotPowerDownMachine(const CCloudMachine &comMachine) const;
-    void cannotPowerDownMachine(const CProgress &progress, const QString &strMachineName) const;
+    void cannotACPIShutdownCloudMachine(const CCloudMachine &comMachine) const;
+    void cannotACPIShutdownCloudMachine(const CProgress &comProgress, const QString &strMachineName) const;
+    void cannotPowerUpCloudMachine(const CCloudMachine &comMachine) const;
+    void cannotPowerUpCloudMachine(const CProgress &comProgress, const QString &strMachineName) const;
+    void cannotPowerDownMachine(const CConsole &comConsole) const;
+    void cannotPowerDownMachine(const CProgress &comProgress, const QString &strMachineName) const;
+    void cannotPowerDownCloudMachine(const CCloudMachine &comMachine) const;
+    void cannotPowerDownCloudMachine(const CProgress &comProgress, const QString &strMachineName) const;
     bool confirmStartMultipleMachines(const QString &strNames) const;
     void cannotMoveMachine(const CMachine &machine, QWidget *pParent = 0) const;

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

@@ -990 +990 @@
             CProgress comProgress = comCloudMachine.Shutdown();
             if (!comCloudMachine.isOk())
-                msgCenter().cannotACPIShutdownMachine(comCloudMachine);
+                msgCenter().cannotACPIShutdownCloudMachine(comCloudMachine);
             else
             {
@@ -996 +996 @@
                 msgCenter().showModalProgressDialog(comProgress, pItem->name(), ":/progress_poweroff_90px.png");
                 if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotACPIShutdownMachine(comProgress, pItem->name());
+                    msgCenter().cannotACPIShutdownCloudMachine(comProgress, pItem->name());
                 /* Update info in any case: */
                 pItem->toCloud()->updateInfoAsync(false /* delayed? */);
@@ -1063 +1063 @@
             CProgress comProgress = comCloudMachine.PowerDown();
             if (!comCloudMachine.isOk())
-                msgCenter().cannotPowerDownMachine(comCloudMachine);
+                msgCenter().cannotPowerDownCloudMachine(comCloudMachine);
             else
             {
@@ -1069 +1069 @@
                 msgCenter().showModalProgressDialog(comProgress, pItem->name(), ":/progress_poweroff_90px.png");
                 if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotPowerDownMachine(comProgress, pItem->name());
+                    msgCenter().cannotPowerDownCloudMachine(comProgress, pItem->name());
                 /* Update info in any case: */
                 pItem->toCloud()->updateInfoAsync(false /* delayed? */);

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

@@ -1720 +1720 @@
         if (!comMachine.isOk())
         {
-            msgCenter().cannotAcquireMachineParameter(comMachine);
+            msgCenter().cannotAcquireCloudMachineParameter(comMachine);
             continue;
         }