Changeset 85039 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 2, 2020 6:13:37 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Adding a message windows for IUnattended errors

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasicGAInstall.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasicUnattended.cpp (modified) (1 diff)

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

@@ -83 +83 @@
 #include "CExtPackFile.h"
 #include "CHostNetworkInterface.h"
+#include "CUnattended.h"
 #include "CVFSExplorer.h"
 #include "CVirtualSystemDescription.h"
@@ -2261 +2262 @@
 }
 
+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));
+}
+
+
 void UIMessageCenter::showRuntimeError(const CConsole &console, bool fFatal, const QString &strErrorId, const QString &strErrorMsg) const
 {

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

@@ -446 +446 @@
     bool cannotExportAppliance(const CProgress &comProgress, const QString &strPath, QWidget *pParent = 0) const;
     bool cannotAddDiskEncryptionPassword(const CAppliance &comAppliance, QWidget *pParent = 0);
+    void cannotRunUnattendedGuestInstall(const CUnattended &comUnattendedInstall, QWidget *pParent = 0);
 
     /* API: Runtime UI warnings: */

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

@@ -82 +82 @@
         COMErrorInfo comErrorInfo =  comUnattendedInstaller.errorInfo(); \
         QString strErrorInfo = UIErrorString::formatErrorInfo(comErrorInfo); \
-        printf("unattended install error %s\n", qPrintable(strErrorInfo)); \
+        msgCenter().cannotRunUnattendedGuestInstall(comUnattendedInstaller); \
         return; \
         } \

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicGAInstall.cpp

@@ -139 +139 @@
 void UIWizardNewVMPageBasicGAInstall::retranslateUi()
 {
-    /* Translate page: */
-    setTitle(UIWizardNewVM::tr("Unattended Guest OS Install"));
 
-    /* Translate widgets: */
-    m_pLabel->setText(UIWizardNewVM::tr("<p>Guest Additions install</p>"));
-    m_pInstallGACheckBox->setText(UIWizardNewVM::tr("Install guest additions"));
-    m_pISOPathLabel->setText(UIWizardNewVM::tr("Installation medium:"));
-    m_pISOFilePathSelector->setToolTip(UIWizardNewVM::tr("Please select an installation medium (ISO file)"));
+    setTitle(UIWizardNewVM::tr("Guest Additions install"));
+    if (m_pLabel)
+        m_pLabel->setText(UIWizardNewVM::tr("<p>You can enable the guest additions install which will be performed during the unattended "
+                                            "guest OS install. </p>"));
+
+    if (m_pInstallGACheckBox)
+        m_pInstallGACheckBox->setText(UIWizardNewVM::tr("Install guest additions"));
+    if (m_pISOPathLabel)
+        m_pISOPathLabel->setText(UIWizardNewVM::tr("Installation medium:"));
+    if (m_pISOFilePathSelector)
+        m_pISOFilePathSelector->setToolTip(UIWizardNewVM::tr("Please select an installation medium (ISO file)"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasicUnattended.cpp

@@ -215 +215 @@
 
     /* Translate widgets: */
-    m_pLabel->setText(UIWizardNewVM::tr("You can enable the unattended (automated) guest OS install "
-                                        "and select an installation medium. The guest OS will be "
-                                        "installed after this wizard is closed. "));
-    m_pUnattendedCheckBox->setText(UIWizardNewVM::tr("Enable unattended guest OS Install"));
+    m_pLabel->setText(UIWizardNewVM::tr("<p>You can enable the unattended (automated) guest OS install. "
+                                        "Optionally you can select to start the unattended on the background by selecting "
+                                        "a headless virtual machine start.</p>"));
+    if (m_pUnattendedCheckBox)
+    {
+        m_pUnattendedCheckBox->setText(UIWizardNewVM::tr("Enable unattended guest OS Install"));
+        m_pUnattendedCheckBox->setToolTip(UIWizardNewVM::tr("When checkedan unattended guest OS will be initialized after this wizard is closed"));
+    }
     m_pISOSelectorLabel->setText(UIWizardNewVM::tr("Installation medium:"));
     if (m_pStartHeadlessCheckBox)