Changeset 92100 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UIWizardCloneVD: Migrate UIMessageCenter stuff to UINotificationCenter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (3 diffs)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• wizards/clonevd/UIWizardCloneVD.cpp (modified) (2 diffs)
• wizards/clonevd/UIWizardCloneVDExpertPage.cpp (modified) (2 diffs)
• wizards/clonevd/UIWizardCloneVDPathSizePage.cpp (modified) (2 diffs)

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

@@ -210 +210 @@
         QApplication::translate("UIMessageCenter", "Failed to acquire cloud machine settings.") +
         strErrorDetails);
+}
+
+/* static */
+void UINotificationMessage::cannotOverwriteMediumStorage(const QString &strPath,
+                                                         UINotificationCenter *pParent /* = 0 */)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't overwrite medium ..."),
+        QApplication::translate("UIMessageCenter", "Failed to overwrite medium storage at <nobr><b>%1</b></nobr>.")
+                                                   .arg(strPath),
+        QString(), QString(), pParent);
 }
 
@@ -843 +854 @@
 
 /* static */
+void UINotificationMessage::cannotOpenMachine(const CVirtualBox &comVBox, const QString &strLocation)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't open machine ..."),
+        QApplication::translate("UIMessageCenter", "Failed to open virtual machine located in %1.")
+                                                   .arg(strLocation) +
+        UIErrorString::formatErrorInfo(comVBox));
+}
+
+/* static */
+void UINotificationMessage::cannotCreateMediumStorage(const CVirtualBox &comVBox,
+                                                      const QString &strPath,
+                                                      UINotificationCenter *pParent /* = 0 */)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't create medium storage ..."),
+        QApplication::translate("UIMessageCenter", "Failed to create medium storage at <nobr><b>%1</b></nobr>.")
+                                                   .arg(strPath) +
+        UIErrorString::formatErrorInfo(comVBox),
+        QString(), QString(), pParent);
+}
+
+/* static */
 void UINotificationMessage::cannotOpenKnownMedium(const CVirtualBox &comVBox, const QUuid &uMediumId)
 {
@@ -849 +883 @@
         QApplication::translate("UIMessageCenter", "Failed to open the medium with following ID: <nobr><b>%1</b></nobr>.")
                                                    .arg(uMediumId.toString()) +
-        UIErrorString::formatErrorInfo(comVBox));
-}
-
-/* static */
-void UINotificationMessage::cannotOpenMachine(const CVirtualBox &comVBox, const QString &strLocation)
-{
-    createMessage(
-        QApplication::translate("UIMessageCenter", "Can't open machine ..."),
-        QApplication::translate("UIMessageCenter", "Failed to open virtual machine located in %1.")
-                                                   .arg(strLocation) +
         UIErrorString::formatErrorInfo(comVBox));
 }

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

@@ -131 +131 @@
           * @param  strErrorDetails  Brings the error details. */
         static void cannotAcquireCloudMachineSettings(const QString &strErrorDetails);
+
+        /** Notifies about inability to overwrite medium storage.
+          * @param  strPath  Brings the medium path. */
+        static void cannotOverwriteMediumStorage(const QString &strPath,
+                                                 UINotificationCenter *pParent = 0);
 
         /** Notifies about inability to open license file.
@@ -337 +342 @@
                                           const QUuid &uMachineId,
                                           UINotificationCenter *pParent = 0);
+        /** Notifies about inability to open machine.
+          * @param  comVBox      Brings common VBox object trying to open machine.
+          * @param  strLocation  Brings the machine location. */
+        static void cannotOpenMachine(const CVirtualBox &comVBox, const QString &strLocation);
+        /** Notifies about inability to create medium storage.
+          * @param  comVBox  Brings common VBox object trying to create medium storage.
+          * @param  strPath  Brings the medium path. */
+        static void cannotCreateMediumStorage(const CVirtualBox &comVBox,
+                                              const QString &strPath,
+                                              UINotificationCenter *pParent = 0);
         /** Notifies about inability to open known medium.
           * @param  comVBox    Brings common VBox object trying to open medium.
           * @param  uMediumId  Brings the medium ID. */
         static void cannotOpenKnownMedium(const CVirtualBox &comVBox, const QUuid &uMediumId);
-        /** Notifies about inability to open machine.
-          * @param  comVBox      Brings common VBox object trying to open machine.
-          * @param  strLocation  Brings the machine location. */
-        static void cannotOpenMachine(const CVirtualBox &comVBox, const QString &strLocation);
         /** Notifies about inability to get ext pack manager.
           * @param  comVBox      Brings common VBox object trying to open machine. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp

@@ -19 +19 @@
 #include "UICommon.h"
 #include "UIMedium.h"
-#include "UIMessageCenter.h"
 #include "UINotificationCenter.h"
 #include "UIWizardCloneVD.h"
@@ -68 +67 @@
     if (!comVBox.isOk())
     {
-        msgCenter().cannotCreateMediumStorage(comVBox, m_strMediumPath, this);
+        UINotificationMessage::cannotCreateMediumStorage(comVBox, m_strMediumPath, notificationCenter());
         return false;
     }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDExpertPage.cpp

@@ -22 +22 @@
 /* GUI includes: */
 #include "UICommon.h"
-#include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIWizardCloneVD.h"
 #include "UIWizardCloneVDExpertPage.h"
@@ -179 +179 @@
     if (QFileInfo(strMediumPath).exists())
     {
-        msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
+        UINotificationMessage::cannotOverwriteMediumStorage(strMediumPath, wizard()->notificationCenter());
         return false;
     }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPathSizePage.cpp

@@ -21 +21 @@
 
 /* GUI includes: */
+#include "UINotificationCenter.h"
 #include "UIWizardCloneVDPathSizePage.h"
 #include "UIWizardDiskEditors.h"
 #include "UIWizardCloneVD.h"
-#include "UIMessageCenter.h"
 
 UIWizardCloneVDPathSizePage::UIWizardCloneVDPathSizePage(qulonglong uSourceDiskLogicaSize)
@@ -101 +101 @@
     if (QFileInfo(strMediumPath).exists())
     {
-        msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
+        UINotificationMessage::cannotOverwriteMediumStorage(strMediumPath, wizard()->notificationCenter());
         return false;
     }