Changeset 90252 in vbox for trunk/src/VBox

Timestamp:

Jul 20, 2021 9:54:18 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Adding connections for medium size and path

Location:

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

Files:

• editors/UIWizardDiskEditors.cpp (modified) (3 diffs)
• editors/UIWizardDiskEditors.h (modified) (3 diffs)
• newvm/UIWizardNewVMDiskPageBasic.cpp (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (8 diffs)
• newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -347 +347 @@
     m_pMediumSizeEditorLabel->setBuddy(m_pMediumSizeEditor);
 
-
     pDiskContainerLayout->addWidget(m_pLocationLabel, 0, 0, 1, 1);
     pDiskContainerLayout->addWidget(m_pLocationEditor, 0, 1, 1, 2);
@@ -354 +353 @@
     pDiskContainerLayout->addWidget(m_pMediumSizeEditorLabel, 1, 0, 1, 1, Qt::AlignBottom);
     pDiskContainerLayout->addWidget(m_pMediumSizeEditor, 1, 1, 2, 3);
+
+    connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
+            this, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged);
+
+    connect(m_pLocationEditor, &QILineEdit::textChanged,
+            this, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged);
 
     retranslateUi();
@@ -394 +399 @@
 }
 
+qulonglong UIMediumSizeAndPathGroupBox::mediumSize() const
+{
+    if (m_pMediumSizeEditor)
+        return m_pMediumSizeEditor->mediumSize();
+    return 0;
+}
+
+void UIMediumSizeAndPathGroupBox::setMediumSize(qulonglong uSize)
+{
+    if (m_pMediumSizeEditor)
+        return m_pMediumSizeEditor->setMediumSize(uSize);
+}
+
+
 /* static */
 QString UIMediumSizeAndPathGroupBox::stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

@@ -111 +111 @@
 signals:
 
+    void sigMediumSizeChanged(qulonglong uSize);
+    void sigMediumPathChanged(const QString &strPath);
 
 public:
@@ -119 +121 @@
     void setMediumPath(const QString &strMediumPath);
     void updateMediumPath(const CMediumFormat &mediumFormat, const QStringList &formatExtensions);
+    qulonglong mediumSize() const;
+    void setMediumSize(qulonglong uSize);
+
 
 private:
@@ -133 +138 @@
     QLabel *m_pMediumSizeEditorLabel;
     UIMediumSizeEditor *m_pMediumSizeEditor;
-
 };
 

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

@@ -399 +399 @@
         return !pWizard->virtualDisk().isNull();
 
-    if (m_pDiskNew && m_pDiskNew->isChecked() && uSize <= 0)
-        return false;
-
     return true;
 }

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

@@ -71 +71 @@
     , m_enmSelectedDiskSource(SelectedDiskSource_New)
     , m_fRecommendedNoDisk(false)
+    , m_uMediumSizeMin(_4M)
+    , m_uMediumSizeMax(uiCommon().virtualBox().GetSystemProperties().GetInfoVDSize())
 {
     /* Create widgets: */
@@ -287 +289 @@
     connect(m_pSkipUnattendedCheckBox, &QCheckBox::toggled, this, &UIWizardNewVMPageExpert::sltSkipUnattendedCheckBoxChecked);
 
+    if (m_pSizeAndLocationGroup)
+    {
+        connect(m_pSizeAndLocationGroup, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged,
+                this, &UIWizardNewVMPageExpert::sltMediumSizeChanged);
+        connect(m_pSizeAndLocationGroup, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged,
+                this, &UIWizardNewVMPageExpert::sltMediumPathChanged);
+
+    // /* Virtual disk related connections: */
+
+    // if (m_pDiskSelectionButton)
+    //     connect(m_pDiskSelectionButton, &QIToolButton::clicked,
+    //             this, &UIWizardNewVMPageExpert::sltGetWithFileOpenDialog);
+
+    // if (m_pDiskSelector)
+    //     connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
+    //             this, &UIWizardNewVMPageExpert::sltMediaComboBoxIndexChanged);
+
+    }
     // if (m_pFormatButtonGroup)
     //     connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
     //             this, &UIWizardNewVMPageExpert::sltMediumFormatChanged);
 
-    // /* Virtual disk related connections: */
-    // if (m_pMediumSizeEditor)
-    //     connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
-    //             this, &UIWizardNewVMPageExpert::sltMediumSizeChanged);
-
-    // if (m_pDiskSelectionButton)
-    //     connect(m_pDiskSelectionButton, &QIToolButton::clicked,
-    //             this, &UIWizardNewVMPageExpert::sltGetWithFileOpenDialog);
-
-    // if (m_pDiskSelector)
-    //     connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
-    //             this, &UIWizardNewVMPageExpert::sltMediaComboBoxIndexChanged);
 
 
@@ -330 +338 @@
         m_pHardwareWidgetContainer->blockSignals(false);
     }
-    LONG64 recommendedDiskSize = type.GetRecommendedHDD();
+    LONG64 iRecommendedDiskSize = type.GetRecommendedHDD();
     /* Prepare initial disk choice: */
     if (!m_userModifiedParameters.contains("SelectedDiskSource"))
     {
-        if (recommendedDiskSize != 0)
+        if (iRecommendedDiskSize != 0)
         {
             if (m_pDiskNew)
@@ -356 +364 @@
     }
 
-    // if (m_pMediumSizeEditor  && !m_userSetWidgets.contains(m_pMediumSizeEditor))
-    // {
-    //     m_pMediumSizeEditor->blockSignals(true);
-    //     setMediumSize(recommendedDiskSize);
-    //     m_pMediumSizeEditor->blockSignals(false);
-    // }
+    if (m_pSizeAndLocationGroup  && !m_userModifiedParameters.contains("MediumSize"))
+        m_pSizeAndLocationGroup->setMediumSize(iRecommendedDiskSize);
 
     // if (m_pProductKeyLabel)
@@ -583 +587 @@
     }
 
-    if (m_pDiskExisting && m_pDiskExisting->isChecked() && uiCommon().medium(m_pDiskSelector->id()).isNull())
+    if (m_enmSelectedDiskSource == SelectedDiskSource_New && uiCommon().medium(m_pDiskSelector->id()).isNull())
     {
         m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Disk,
@@ -590 +594 @@
     }
 
-    if (m_pDiskNew && m_pDiskNew->isChecked())
-    {
+    if (m_enmSelectedDiskSource == SelectedDiskSource_New)
+    {
+
         qulonglong uSize = pWizard->mediumSize();
-        if (uSize <= 0)
+        if( uSize >= m_uMediumSizeMin && uSize <= m_uMediumSizeMax)
         {
             m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Disk,
@@ -601 +606 @@
     }
 
-
-     // return !mediumFormat().isNull() &&
-     //       mediumVariant() != (qulonglong)KMediumVariant_Max &&
-     //       !m_pLocationEditor->text().trimmed().isEmpty() &&
-     //       mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;
 
     return fIsComplete;
@@ -687 +687 @@
 {
     updateWidgetAterMediumFormatChange();
-    completeChanged();
-}
-
-void UIWizardNewVMPageExpert::sltMediumSizeChanged()
-{
-    completeChanged();
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageExpert::sltMediumSizeChanged(qulonglong uSize)
+{
+    m_userModifiedParameters << "MediumSize";
+    newVMWizardPropertySet(MemorySize, uSize);
+    emit completeChanged();
+}
+
+void UIWizardNewVMPageExpert::sltMediumPathChanged(const QString &strPath)
+{
+    m_userModifiedParameters << "MediumPath";
+    newVMWizardPropertySet(MediumPath, strPath);
+    emit completeChanged();
 }
 

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

@@ -83 +83 @@
     void sltSkipUnattendedCheckBoxChecked(bool fSkip);
     void sltMediumFormatChanged();
-    void sltMediumSizeChanged();
+    void sltMediumSizeChanged(qulonglong uSize);
+    void sltMediumPathChanged(const QString &strPath);
     void sltSelectedDiskSourceChanged();
     void sltSelectLocationButtonClicked();
@@ -163 +164 @@
         QSet<QString> m_userModifiedParameters;
         SelectedDiskSource m_enmSelectedDiskSource;
-    bool m_fRecommendedNoDisk;
+        bool m_fRecommendedNoDisk;
+        qulonglong m_uMediumSizeMin;
+        qulonglong m_uMediumSizeMax;
     /** @} */
 };