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

Timestamp:

Mar 17, 2021 7:21:33 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Removing the GA install checkbox and making the groupbox checkable

Location:

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

Files:

• UIWizardNewVMPageBasic2.cpp (modified) (9 diffs)
• UIWizardNewVMPageBasic2.h (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

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

@@ -48 +48 @@
     , m_pHostnameLineEdit(0)
     , m_pHostnameLabel(0)
-    , m_pGAInstallCheckBox(0)
     , m_pGAISOPathLabel(0)
     , m_pGAISOFilePathSelector(0)
@@ -98 +97 @@
 bool UIWizardNewVMPage2::installGuestAdditions() const
 {
-    if (!m_pGAInstallCheckBox)
-        return false;
-    return m_pGAInstallCheckBox->isChecked();
+    if (!m_pGAInstallationISOContainer)
+        return false;
+    return m_pGAInstallationISOContainer->isChecked();
 }
 
 void UIWizardNewVMPage2::setInstallGuestAdditions(bool fInstallGA)
 {
-    if (m_pGAInstallCheckBox)
-        m_pGAInstallCheckBox->setChecked(fInstallGA);
+    if (m_pGAInstallationISOContainer)
+        m_pGAInstallationISOContainer->setChecked(fInstallGA);
 }
 
@@ -135 +134 @@
 
     m_pGAInstallationISOContainer = new QGroupBox;
+    m_pGAInstallationISOContainer->setCheckable(true);
     QGridLayout *pGAInstallationISOContainer = new QGridLayout(m_pGAInstallationISOContainer);
-    m_pGAInstallCheckBox = new QCheckBox;
-    if (m_pGAInstallCheckBox)
-        pGAInstallationISOContainer->addWidget(m_pGAInstallCheckBox, 0, 0, 1, 8);
     m_pGAISOPathLabel = new QLabel;
     if (m_pGAISOPathLabel)
-        pGAInstallationISOContainer->addWidget(m_pGAISOPathLabel, 1, 1, 1, 1);
+        pGAInstallationISOContainer->addWidget(m_pGAISOPathLabel, 0, 1, 1, 1);
 
     m_pGAISOFilePathSelector = new UIFilePathSelector;
@@ -149 +146 @@
         m_pGAISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
         m_pGAISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
-        pGAInstallationISOContainer->addWidget(m_pGAISOFilePathSelector, 1, 2, 1, 6);
+        m_pGAISOFilePathSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
+        pGAInstallationISOContainer->addWidget(m_pGAISOFilePathSelector, 0, 2, 1, 6);
         if (m_pGAISOPathLabel)
             m_pGAISOPathLabel->setBuddy(m_pGAISOFilePathSelector);
@@ -186 +184 @@
     if (m_pGAISOFilePathSelector)
         m_pGAISOFilePathSelector->setToolTip(UIWizardNewVM::tr("Please select an installation medium (ISO file)"));
-    if (m_pGAInstallCheckBox)
-    {
-        m_pGAInstallCheckBox->setText(UIWizardNewVM::tr("&Install Guest Additions"));
-        m_pGAInstallCheckBox->setToolTip(UIWizardNewVM::tr("<p>When checked the guest additions will be installed "
+    if (m_pGAInstallationISOContainer)
+    {
+        m_pGAInstallationISOContainer->setTitle(UIWizardNewVM::tr("&Guest Additions"));
+        m_pGAInstallationISOContainer->setToolTip(UIWizardNewVM::tr("<p>When checked the guest additions will be installed "
                                                            "after the OS install.</p>"));
     }
@@ -198 +196 @@
     if (m_pAdditionalOptionsContainer)
         m_pAdditionalOptionsContainer->setTitle(UIWizardNewVM::tr("Additional options"));
-    if (m_pGAInstallationISOContainer)
-        m_pGAInstallationISOContainer->setTitle(UIWizardNewVM::tr("Guest Additions"));
     if (m_pStartHeadlessCheckBox)
     {
@@ -295 +291 @@
 bool UIWizardNewVMPage2::isGAInstallEnabled() const
 {
-    if (m_pGAInstallCheckBox && m_pGAInstallCheckBox->isChecked())
+    if (m_pGAInstallationISOContainer && m_pGAInstallationISOContainer->isChecked())
         return true;
     return false;
@@ -337 +333 @@
                 this, &UIWizardNewVMPageBasic2::sltGAISOPathChanged);
     if (m_pGAISOFilePathSelector)
-        connect(m_pGAInstallCheckBox, &QCheckBox::toggled,
+        connect(m_pGAInstallationISOContainer, &QGroupBox::toggled,
                 this, &UIWizardNewVMPageBasic2::sltInstallGACheckBoxToggle);
 }
@@ -355 +351 @@
 {
     disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
-    disableEnableGAWidgets(m_pGAInstallCheckBox ? m_pGAInstallCheckBox->isChecked() : false);
+    disableEnableGAWidgets(m_pGAInstallationISOContainer ? m_pGAInstallationISOContainer->isChecked() : false);
     retranslateUi();
 }

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

@@ -88 +88 @@
         QGroupBox *m_pAdditionalOptionsContainer;
         QGroupBox *m_pGAInstallationISOContainer;
-
         QCheckBox *m_pStartHeadlessCheckBox;
         UIUserNamePasswordEditor *m_pUserNamePasswordEditor;
         QLineEdit *m_pHostnameLineEdit;
-        QLabel  *m_pHostnameLabel;
-        QCheckBox *m_pGAInstallCheckBox;
-        QLabel  *m_pGAISOPathLabel;
+        QLabel    *m_pHostnameLabel;
+        QLabel    *m_pGAISOPathLabel;
         UIFilePathSelector *m_pGAISOFilePathSelector;
         /** Product key stuff. */
         QLineEdit *m_pProductKeyLineEdit;
-        QLabel  *m_pProductKeyLabel;
+        QLabel     *m_pProductKeyLabel;
     /** @} */
 

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

@@ -219 +219 @@
                 this, &UIWizardNewVMPageExpert::sltGAISOPathChanged);
 
-    if (m_pGAInstallCheckBox)
-        connect(m_pGAInstallCheckBox, &QCheckBox::toggled,
+    if (m_pGAInstallationISOContainer)
+        connect(m_pGAInstallationISOContainer, &QGroupBox::toggled,
                 this, &UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle);
 
@@ -442 +442 @@
         }
         /* Check the GA installation medium: */
-        if (m_pGAInstallCheckBox->isChecked() && !checkGAISOFile())
+        if (m_pGAInstallationISOContainer && m_pGAInstallationISOContainer->isChecked() && !checkGAISOFile())
         {
             m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Unattended,