Changeset 88110 in vbox

Timestamp:

Mar 12, 2021 5:24:08 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Adding the fields and properties for skipping unattended install

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVMPageBasic1.cpp (modified) (5 diffs)
• UIWizardNewVMPageBasic1.h (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (1 diff)
• UIWizardNewVMPageExpert.h (modified) (1 diff)

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

@@ -235 +235 @@
 QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets()
 {
+    QWidget *pContainerWidget = new QWidget;
+    QVBoxLayout *pLayout = new QVBoxLayout(pContainerWidget);
+    pLayout->setContentsMargins(0, 0, 0, 0);
+
     /* Prepare Name and OS Type editor: */
     m_pNameAndSystemEditor = new UINameAndSystemEditor(0,
@@ -241 +245 @@
                                                        true /* fChooseType? */,
                                                        true /* fChooseISOFile? */);
-    return m_pNameAndSystemEditor;
+    pLayout->addWidget(m_pNameAndSystemEditor);
+    m_pSkipUnattendedCheckBox = new QCheckBox;
+    pLayout->addWidget(m_pSkipUnattendedCheckBox);
+    return pContainerWidget;
 }
 
@@ -397 +404 @@
 }
 
+bool UIWizardNewVMPage1::skipUnattendedInstall() const
+{
+    return m_pSkipUnattendedCheckBox && m_pSkipUnattendedCheckBox->isChecked();
+}
+
 bool UIWizardNewVMPage1::checkISOFile() const
 {
@@ -438 +450 @@
         /* Prepare Name and OS Type editor: */
         pPageLayout->addWidget(createNameOSTypeWidgets());
-
-        m_pSkipUnattendedCheckBox = new QCheckBox;
-        pPageLayout->addWidget(m_pSkipUnattendedCheckBox);
 
         pPageLayout->addStretch();
@@ -456 +465 @@
     registerField("ISOFilePath", this, "ISOFilePath");
     registerField("isUnattendedEnabled", this, "isUnattendedEnabled");
+    registerField("skipUnattendedInstall", this, "skipUnattendedInstall");
     registerField("detectedOSTypeId", this, "detectedOSTypeId");
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h

@@ -70 +70 @@
         bool isUnattendedEnabled() const;
         const QString &detectedOSTypeId() const;
+
+        bool skipUnattendedInstall() const;
     /** @} */
 
@@ -124 +126 @@
     Q_PROPERTY(QString ISOFilePath READ ISOFilePath);
     Q_PROPERTY(bool isUnattendedEnabled READ isUnattendedEnabled);
+    Q_PROPERTY(bool skipUnattendedInstall READ skipUnattendedInstall);
     Q_PROPERTY(QString detectedOSTypeId READ detectedOSTypeId);
-
 
 public:

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

@@ -83 +83 @@
     registerField("ISOFilePath", this, "ISOFilePath");
     registerField("isUnattendedEnabled", this, "isUnattendedEnabled");
+    registerField("skipUnattendedInstall", this, "skipUnattendedInstall");
     registerField("startHeadless", this, "startHeadless");
     registerField("detectedOSTypeId", this, "detectedOSTypeId");

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h

@@ -55 +55 @@
     Q_PROPERTY(QString ISOFilePath READ ISOFilePath);
     Q_PROPERTY(bool isUnattendedEnabled READ isUnattendedEnabled);
+    Q_PROPERTY(bool skipUnattendedInstall READ skipUnattendedInstall);
     Q_PROPERTY(bool startHeadless READ startHeadless);
     Q_PROPERTY(QString detectedOSTypeId READ detectedOSTypeId);