Changeset 88014 in vbox

Timestamp:

Mar 8, 2021 12:52:42 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Several fixes

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic4.cpp (modified) (3 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (5 diffs)
• UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -630 +630 @@
 void UIWizardNewVM::setVirtualDisk(const CMedium &medium)
 {
-    m_virtualDisk == medium;
+    m_virtualDisk = medium;
 }
 

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

@@ -65 +65 @@
 void UIWizardNewVMPage4::getWithFileOpenDialog()
 {
-    /* Get opened medium id: */
     QUuid uMediumId;
-
     int returnCode = uiCommon().openMediumSelectorDialog(thisImp(), UIMediumDeviceType_HardDisk,
                                                            uMediumId,
@@ -74 +72 @@
                                                            fieldImp("type").value<CGuestOSType>().GetId(),
                                                            false /* don't show/enable the create action: */);
-
     if (returnCode == static_cast<int>(UIMediumSelector::ReturnCode_Accepted) && !uMediumId.isNull())
     {
@@ -277 +274 @@
 void UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog()
 {
-    /* Call to base-class: */
     getWithFileOpenDialog();
 }

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

@@ -103 +103 @@
     registerField("selectedDiskSource", this, "selectedDiskSource");
     registerField("mediumVariant", this, "mediumVariant");
-
-    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
-    setEnableDiskSelectionWidgets(m_enmSelectedDiskSource == SelectedDiskSource_Existing);
-    setEnableNewDiskWidgets(m_enmSelectedDiskSource == SelectedDiskSource_New);
 }
 
@@ -134 +130 @@
 }
 
-void UIWizardNewVMPageExpert::sltVirtualDiskSourceChanged()
-{
-    /* Broadcast complete-change: */
-    emit completeChanged();
-}
 
 void UIWizardNewVMPageExpert::sltGetWithFileOpenDialog()
 {
+    getWithFileOpenDialog();
 }
 
@@ -244 +236 @@
                 this, &UIWizardNewVMPageExpert::sltInstallGACheckBoxToggle);
 
-    if (m_pDiskEmpty)
-    {
-        connect(m_pDiskEmpty, &QRadioButton::toggled,
-                this, &UIWizardNewVMPageExpert::sltVirtualDiskSourceChanged);
-        connect(m_pDiskEmpty, &QRadioButton::toggled,
-                this, &UIWizardNewVMPageExpert::sltValueModified);
-    }
-    if (m_pDiskNew)
-    {
-        connect(m_pDiskNew, &QRadioButton::toggled,
-                this, &UIWizardNewVMPageExpert::sltVirtualDiskSourceChanged);
-        connect(m_pDiskNew, &QRadioButton::toggled,
-                this, &UIWizardNewVMPageExpert::sltValueModified);
-    }
-    if (m_pDiskExisting)
-    {
-        connect(m_pDiskExisting, &QRadioButton::toggled,
-                this, &UIWizardNewVMPageExpert::sltVirtualDiskSourceChanged);
-        connect(m_pDiskExisting, &QRadioButton::toggled,
-                this, &UIWizardNewVMPageExpert::sltValueModified);
-    }
-    if (m_pDiskSelector)
-        connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
-                this, &UIWizardNewVMPageExpert::sltVirtualDiskSourceChanged);
     if (m_pDiskSelectionButton)
         connect(m_pDiskSelectionButton, &QIToolButton::clicked,
                 this, &UIWizardNewVMPageExpert::sltGetWithFileOpenDialog);
+
     if (m_pBaseMemoryEditor)
         connect(m_pBaseMemoryEditor, &UIBaseMemoryEditor::sigValueChanged,
@@ -290 +259 @@
 
     if (m_pDiskSourceButtonGroup)
+    {
         connect(m_pDiskSourceButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
                 this, &UIWizardNewVMPageExpert::sltSelectedDiskSourceChanged);
+        connect(m_pDiskSourceButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
+                this, &UIWizardNewVMPageExpert::sltValueModified);
+    }
 }
 
@@ -360 +333 @@
 void UIWizardNewVMPageExpert::initializePage()
 {
-    /* Translate page: */
-    retranslateUi();
+    disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
+    setEnableDiskSelectionWidgets(m_enmSelectedDiskSource == SelectedDiskSource_Existing);
+    setEnableNewDiskWidgets(m_enmSelectedDiskSource == SelectedDiskSource_New);
     setOSTypeDependedValues();
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
     updateVirtualDiskPathFromMachinePathName();
     updateWidgetAterMediumFormatChange();
+    retranslateUi();
 }
 

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

@@ -91 +91 @@
     void sltPathChanged(const QString &strNewPath);
     void sltOsTypeChanged();
-    void sltVirtualDiskSourceChanged();
+    void sltMediaComboBoxIndexChanged();
     void sltGetWithFileOpenDialog();
     void sltISOPathChanged(const QString &strPath);
@@ -100 +100 @@
     void sltMediumFormatChanged();
     void sltMediumSizeChanged();
-    void sltMediaComboBoxIndexChanged();
     void sltSelectedDiskSourceChanged();