Changeset 90280 in vbox

Timestamp:

Jul 22, 2021 7:50:38 AM (4 years ago)

Author:

vboxsync

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

145822

Message:

FE/Qt: bugref:9996. Preserving user's virtual medium source selection

Location:

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

Files:

• UIWizardNewVMDiskPageBasic.cpp (modified) (4 diffs)
• UIWizardNewVMDiskPageBasic.h (modified) (1 diff)
• UIWizardNewVMNameOSTypePageBasic.cpp (modified) (3 diffs)
• UIWizardNewVMNameOSTypePageBasic.h (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (5 diffs)

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

@@ -235 +235 @@
 {
     AssertReturnVoid(m_pDiskSelector && m_pDiskSourceButtonGroup);
-
+    m_userModifiedParameters << "SelectedDiskSource";
     if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskEmpty)
         m_enmSelectedDiskSource = SelectedDiskSource_Empty;
@@ -255 +255 @@
 {
     AssertReturnVoid(m_pDiskSelector);
+    m_userModifiedParameters << "SelectedExistingMediumIndex";
     newVMWizardPropertySet(VirtualDisk, m_pDiskSelector->id());
     emit completeChanged();
@@ -326 +327 @@
     LONG64 iRecommendedSize = 0;
     CGuestOSType type = pWizard->guestOSType();
-    if (!type.isNull())
+    if (!type.isNull() && !m_userModifiedParameters.contains("SelectedDiskSource"))
     {
         iRecommendedSize = type.GetRecommendedHDD();
@@ -351 +352 @@
     }
 
-    if (m_pDiskSelector)
+    if (m_pDiskSelector && !m_userModifiedParameters.contains("SelectedExistingMediumIndex"))
         m_pDiskSelector->setCurrentIndex(0);
     setEnableDiskSelectionWidgets(m_enmSelectedDiskSource == SelectedDiskSource_Existing);

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

@@ -64 +64 @@
 }
 
-//     SelectedDiskSource selectedDiskSource() const;
-//     void setSelectedDiskSource(SelectedDiskSource enmSelectedDiskSource);
-//     bool getWithNewVirtualDiskWizard();
-//     virtual QWidget *createDiskWidgets();
-//     virtual QWidget *createNewDiskWidgets();
-//     void getWithFileOpenDialog();
-//     void retranslateWidgets();
-//     void setEnableDiskSelectionWidgets(bool fEnable);
 
 class UIWizardNewVMDiskPageBasic : public UINativeWizardPage

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

@@ -179 +179 @@
 };
 
-void UIWizardNewVMNameOSTypePage::guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName)
+bool UIWizardNewVMNameOSTypePage::guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName)
 {
     CHost host = uiCommon().host();
@@ -191 +191 @@
     /* Search for a matching OS type based on the string the user typed already. */
     for (size_t i = 0; i < RT_ELEMENTS(gs_OSTypePattern); ++i)
+    {
         if (strNewName.contains(gs_OSTypePattern[i].pattern))
         {
             if (pNameAndSystemEditor)
                 pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
-            break;
+            return true;
         }
+    }
+    return false;
 }
 
@@ -367 +370 @@
 {
     if (!m_userModifiedParameters.contains("GuestOSType"))
-        UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName);
+    {
+        m_pNameAndSystemEditor->blockSignals(true);
+        if (UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
+            newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
+        m_pNameAndSystemEditor->blockSignals(false);
+    }
     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
     emit completeChanged();

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

@@ -40 +40 @@
 namespace UIWizardNewVMNameOSTypePage
 {
-    void guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName);
+    bool guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName);
     bool createMachineFolder(UINameAndSystemEditor *pNameAndSystemEditor,
                              UINativeWizardPage *pCaller,

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

@@ -95 +95 @@
 void UIWizardNewVMPageExpert::sltNameChanged(const QString &strNewName)
 {
-    if (!m_userModifiedParameters.contains("GuestOSType"))
-        UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName);
+    if (!m_userModifiedParameters.contains("GuestOSType") && m_pNameAndSystemEditor)
+    {
+        m_pNameAndSystemEditor->blockSignals(true);
+        if (UIWizardNewVMNameOSTypePage::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
+        {
+            newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
+            /* Since the type `possibly` changed: */
+            setOSTypeDependedValues();
+        }
+        m_pNameAndSystemEditor->blockSignals(false);
+    }
     UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
     if (!m_userModifiedParameters.contains("MediumPath"))
@@ -118 +127 @@
     if (m_pNameAndSystemEditor)
         newVMWizardPropertySet(GuestOSType, m_pNameAndSystemEditor->type());
-    //setOSTypeDependedValues() ??!!!
+    setOSTypeDependedValues();
 }
 
@@ -253 +262 @@
     }
 
+    /* Virtual disk related connections: */
     if (m_pDiskSourceButtonGroup)
         connect(m_pDiskSourceButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
                 this, &UIWizardNewVMPageExpert::sltSelectedDiskSourceChanged);
 
-    connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMPageExpert::sltSkipUnattendedCheckBoxChecked);
+    if (m_pSkipUnattendedCheckBox)
+        connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled,
+        this, &UIWizardNewVMPageExpert::sltSkipUnattendedCheckBoxChecked);
 
     if (m_pSizeAndLocationGroup)
@@ -266 +278 @@
                 this, &UIWizardNewVMPageExpert::sltMediumPathChanged);
 
-    // /* Virtual disk related connections: */
-
-    // if (m_pDiskSelectionButton)
-    //     connect(m_pDiskSelectionButton, &QIToolButton::clicked,
-    //             this, &UIWizardNewVMPageExpert::sltGetWithFileOpenDialog);
+    if (m_pDiskSelectionButton)
+        connect(m_pDiskSelectionButton, &QIToolButton::clicked,
+               this, &UIWizardNewVMPageExpert::sltGetWithFileOpenDialog);
 
     // if (m_pDiskSelector)
@@ -308 +318 @@
     }
     LONG64 iRecommendedDiskSize = type.GetRecommendedHDD();
+
     /* Prepare initial disk choice: */
     if (!m_userModifiedParameters.contains("SelectedDiskSource"))