Changeset 92132 in vbox for trunk/src/VBox

Timestamp:

Oct 28, 2021 10:30:59 AM (4 years ago)

Author:

vboxsync

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

147951

Message:

FE/Qt: bugref:10067: UIVirtualBoxManager: Migrate unattended related UIMessageCenter stuff to UINotificationCenter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• manager/UIVirtualBoxManager.h (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)

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

@@ -2028 +2028 @@
 }
 
-void UIMessageCenter::cannotRunUnattendedGuestInstall(const CUnattended &comUnattendedInstall, QWidget *pParent /* = 0 */)
-{
-    COMErrorInfo comErrorInfo =  comUnattendedInstall.errorInfo();    \
-    error(pParent, MessageType_Error,
-          tr("An error has occured during unattended guest install setup."),
-          UIErrorString::formatErrorInfo(comErrorInfo));
-}
-
 bool UIMessageCenter::confirmOverridingFile(const QString &strPath, QWidget *pParent /* = 0*/) const
 {

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

@@ -457 +457 @@
         void cannotCreateVirtualSystemDescription(const CAppliance &comAppliance, QWidget *pParent = 0) const;
         bool confirmExportMachinesInSaveState(const QStringList &machineNames, QWidget *pParent = 0) const;
-        void cannotRunUnattendedGuestInstall(const CUnattended &comUnattendedInstall, QWidget *pParent = 0);
         bool confirmOverridingFile(const QString &strPath, QWidget *pParent = 0) const;
         bool confirmOverridingFiles(const QVector<QString> &strPaths, QWidget *pParent = 0) const;

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

@@ -2419 +2419 @@
 }
 
-bool UIVirtualBoxManager::checkUnattendedInstallError(CUnattended &comUnattendedInstaller) const
-{
-    if (!comUnattendedInstaller.isOk())
-    {
-        COMErrorInfo comErrorInfo =  comUnattendedInstaller.errorInfo();
-        QString strErrorInfo = UIErrorString::formatErrorInfo(comErrorInfo);
-        msgCenter().cannotRunUnattendedGuestInstall(comUnattendedInstaller);
+bool UIVirtualBoxManager::checkUnattendedInstallError(const CUnattended &comUnattended) const
+{
+    if (!comUnattended.isOk())
+    {
+        UINotificationMessage::cannotRunUnattendedGuestInstall(comUnattended);
         return false;
     }

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

@@ -355 +355 @@
         bool isCloudProfileUpdateInProgress() const;
 
-        /* Checks if @p comUnattendedInstaller has any errors. If so shows an error message and return false, else returns true. */
-        bool checkUnattendedInstallError(CUnattended &comUnattendedInstaller) const;
+        /** Checks if @a comUnattended has any errors.
+          * If so shows an error notification and returns false, else returns true. */
+        bool checkUnattendedInstallError(const CUnattended &comUnattended) const;
     /** @} */
 

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

@@ -49 +49 @@
 #include "CNATNetwork.h"
 #include "CNetworkAdapter.h"
+#include "CUnattended.h"
 #include "CVRDEServer.h"
 
@@ -1244 +1245 @@
 
 /* static */
+void UINotificationMessage::cannotRunUnattendedGuestInstall(const CUnattended &comUnattended)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't run guest install ..."),
+        QApplication::translate("UIMessageCenter", "Failed to run unattended guest installation.") +
+        UIErrorString::formatErrorInfo(comUnattended));
+}
+
+/* static */
 void UINotificationMessage::cannotAttachUSBDevice(const CConsole &comConsole, const QString &strDevice)
 {

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

@@ -56 +56 @@
 class CVirtualBoxErrorInfo;
 class CVRDEServer;
+class CUnattended;
 
 /** UINotificationObject extension for message functionality. */
@@ -478 +479 @@
           * @param  strMachineName   Brings machine name. */
         static void cannotChangeSnapshot(const CSnapshot &comSnapshot, const QString &strSnapshotName, const QString &strMachineName);
+
+        /** Notifies about inability to run unattended guest install.
+          * @param  comUnattended  Brings the unattended being running guest install. */
+        static void cannotRunUnattendedGuestInstall(const CUnattended &comUnattended);
     /** @} */