Changeset 92096 in vbox for trunk/src

Timestamp:

Oct 27, 2021 12:03:43 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UIWizardImportApp: Migrate a lot of UIMessageCenter stuff to UINotificationCenter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• wizards/importappliance/UIWizardImportApp.cpp (modified) (3 diffs)
• wizards/importappliance/UIWizardImportAppPageExpert.cpp (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageSettings.cpp (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageSource.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -522 +522 @@
 
 /* static */
+void UINotificationMessage::cannotAcquireApplianceParameter(const CAppliance &comAppliance,
+                                                            UINotificationCenter *pParent /* = 0 */)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Appliance failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire appliance parameter.") +
+        UIErrorString::formatErrorInfo(comAppliance),
+        QString(), QString(), pParent);
+}
+
+/* static */
 void UINotificationMessage::cannotAcquireExtensionPackManagerParameter(const CExtPackManager &comEPManager)
 {
@@ -865 +876 @@
         QApplication::translate("UIMessageCenter", "Bad password ..."),
         QApplication::translate("UIMessageCenter", "Bad password or authentication failure.") +
+        UIErrorString::formatErrorInfo(comAppliance),
+        QString(), QString(), pParent);
+}
+
+/* static */
+void UINotificationMessage::cannotInterpretAppliance(const CAppliance &comAppliance, UINotificationCenter *pParent /* = 0 */)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't interpret appliance ..."),
+        QApplication::translate("UIMessageCenter", "Failed to interpret appliance being imported.") +
         UIErrorString::formatErrorInfo(comAppliance),
         QString(), QString(), pParent);

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -227 +227 @@
           * @param  comVBox  Brings the object parameter get acquired from. */
         static void cannotAcquireVirtualBoxParameter(const CVirtualBox &comVBox);
+        /** Notifies about inability to acquire IAppliance parameter.
+          * @param  comVBox  Brings the object parameter get acquired from. */
+        static void cannotAcquireApplianceParameter(const CAppliance &comAppliance,
+                                                    UINotificationCenter *pParent = 0);
         /** Notifies about inability to acquire IExtPackManager parameter.
           * @param  comVBox  Brings the object parameter get acquired from. */
@@ -348 +352 @@
           * @param  comAppliance  Brings appliance trying to add disk scryption password. */
         static void cannotAddDiskEncryptionPassword(const CAppliance &comAppliance, UINotificationCenter *pParent = 0);
+        /** Notifies about inability to interpret appliance.
+          * @param  comAppliance  Brings appliance we are trying to interpret. */
+        static void cannotInterpretAppliance(const CAppliance &comAppliance, UINotificationCenter *pParent = 0);
 
         /** Notifies about inability to open extension pack.

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp

@@ -29 +29 @@
 #include "QIDialog.h"
 #include "QIFileDialog.h"
-#include "UIMessageCenter.h"
 #include "UINotificationCenter.h"
 #include "UIWizardImportApp.h"
@@ -175 +174 @@
     if (!comVBox.isOk())
     {
-        msgCenter().cannotCreateAppliance(comVBox, this);
+        UINotificationMessage::cannotCreateAppliance(comVBox, notificationCenter());
         return false;
     }
@@ -188 +187 @@
     if (!comAppliance.isOk())
     {
-        msgCenter().cannotImportAppliance(comAppliance, this);
+        UINotificationMessage::cannotInterpretAppliance(comAppliance, notificationCenter());
         return false;
     }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

@@ -36 +36 @@
 #include "UIFormEditorWidget.h"
 #include "UIIconPool.h"
-#include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIToolBox.h"
 #include "UIVirtualBoxEventHandler.h"
@@ -465 +465 @@
             fResult = comForm.isOk();
             if (!fResult)
-                msgCenter().cannotAcquireVirtualSystemDescriptionFormProperty(comForm);
+                UINotificationMessage::cannotAcquireVirtualSystemDescriptionFormParameter(comForm, wizard()->notificationCenter());
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageSettings.cpp

@@ -30 +30 @@
 #include "UIFilePathSelector.h"
 #include "UIFormEditorWidget.h"
-#include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIWizardImportApp.h"
 #include "UIWizardImportAppPageSettings.h"
@@ -519 +519 @@
             fResult = comForm.isOk();
             if (!fResult)
-                msgCenter().cannotAcquireVirtualSystemDescriptionFormProperty(comForm);
+                UINotificationMessage::cannotAcquireVirtualSystemDescriptionFormParameter(comForm, wizard()->notificationCenter());
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageSource.cpp

@@ -29 +29 @@
 #include "UIEmptyFilePathSelector.h"
 #include "UIIconPool.h"
-#include "UIMessageCenter.h"
 #include "UINotificationCenter.h"
 #include "UIVirtualBoxEventHandler.h"
@@ -321 +320 @@
     CAppliance comAppliance = comVBox.CreateAppliance();
     if (!comVBox.isOk())
-    {
-        msgCenter().cannotCreateAppliance(comVBox, pWizard);
-        return;
-    }
+        return UINotificationMessage::cannotCreateAppliance(comVBox, pWizard->notificationCenter());
 
     /* Remember appliance: */
@@ -339 +335 @@
     QVector<CVirtualSystemDescription> descriptions = comCloudAppliance.GetVirtualSystemDescriptions();
     if (!comCloudAppliance.isOk())
-    {
-        msgCenter().cannotAcquireVirtualSystemDescription(comCloudAppliance, pWizard);
-        return;
-    }
+        return UINotificationMessage::cannotAcquireApplianceParameter(comCloudAppliance, pWizard->notificationCenter());
 
     /* Make sure there is at least one virtual system description created: */