Changeset 93606 in vbox for trunk/src/VBox

Timestamp:

Feb 4, 2022 2:48:36 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Removing image index selector from new vm wizard.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UINameAndSystemEditor.cpp (modified) (3 diffs)
• settings/editors/UINameAndSystemEditor.h (modified) (4 diffs)
• wizards/newvm/UIWizardNewVMExpertPage.cpp (modified) (7 diffs)
• wizards/newvm/UIWizardNewVMExpertPage.h (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMUnattendedPage.cpp (modified) (4 diffs)
• wizards/newvm/UIWizardNewVMUnattendedPage.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -282 +282 @@
 }
 
+void UINameAndSystemEditor::setEditionNameAndIndices(const QVector<QString> &names, const QVector<ulong> &ids)
+{
+    AssertReturnVoid(m_pEditionSelector && names.size() == ids.size());
+
+    m_pEditionSelector->clear();
+
+    for (int i = 0; i < names.size(); ++i)
+        m_pEditionSelector->addItem(names[i], QVariant::fromValue(ids[i]) /* user data */);
+}
+
+void UINameAndSystemEditor::setEditionSelectorEnabled(bool fEnabled)
+{
+    if (m_pEditionSelector)
+        m_pEditionSelector->setEnabled(fEnabled);
+    if (m_pEditionLabel)
+        m_pEditionLabel->setEnabled(fEnabled);
+}
+
+bool UINameAndSystemEditor::isEditionsSelectorEmpty() const
+{
+    if (m_pEditionSelector)
+        return m_pEditionSelector->count() == 0;
+    return true;
+}
+
 int UINameAndSystemEditor::firstColumnWidth() const
 {
@@ -420 +445 @@
     /* Notifies listeners about OS type change: */
     emit sigOsTypeChanged();
+}
+
+void UINameAndSystemEditor::sltSelectedEditionsChanged(int)
+{
+    emit sigEditionChanged(selectedEditionIndex());
 }
 
@@ -683 +713 @@
         connect(m_pImageSelector, &UIFilePathSelector::pathChanged,
                 this, &UINameAndSystemEditor::sigImageChanged);
-}
+    connect(m_pEditionSelector, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+            this, &UINameAndSystemEditor::sltSelectedEditionsChanged);
+}
+
+ulong UINameAndSystemEditor::selectedEditionIndex() const
+{
+    if (!m_pEditionSelector || m_pEditionSelector->count() == 0)
+        return 0;
+    return m_pEditionSelector->currentData().value<ulong>();
+}

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h

@@ -72 +72 @@
     /** Notifies listeners about VM OS family change. */
     void sigOSFamilyChanged(const QString &strFamilyId);
+    /** Notifies listeners about edition change. */
+    void sigEditionChanged(ulong selectedEditionIndex);
 
 public:
@@ -132 +134 @@
     void markImageEditor(bool fError, const QString &strErrorMessage);
 
+    /** @p names and @p indices are parallel array storing edition names and their indices, respectively.*/
+    void setEditionNameAndIndices(const QVector<QString> &names, const QVector<ulong> &ids);
+
+    void setEditionSelectorEnabled(bool fEnabled);
+    bool isEditionsSelectorEmpty() const;
+
     /** Returns 1st column width. */
     int firstColumnWidth() const;
@@ -146 +154 @@
     /** Handles VM OS type @a iIndex change. */
     void sltTypeChanged(int iIndex);
+    void sltSelectedEditionsChanged(int);
 
 private:
@@ -162 +171 @@
         void prepareConnections();
     /** @} */
+
+    ulong selectedEditionIndex() const;
 
     /** Holds the current family ID list. */

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

@@ -47 +47 @@
     , m_pFormatComboBox(0)
     , m_pSizeAndLocationGroup(0)
-    , m_pWindowsISOImageSelector(0)
     , m_pNameAndSystemEditor(0)
     , m_pSkipUnattendedCheckBox(0)
@@ -164 +163 @@
 
     /* Populate the windows ISO images selector: */
-    if (m_pWindowsISOImageSelector)
-        m_pWindowsISOImageSelector->setImageNamesAndIndices(pWizard->detectedWindowsImageNames(),
-                                                            pWizard->detectedWindowsImageIndices());
+    if (m_pNameAndSystemEditor)
+        m_pNameAndSystemEditor->setEditionNameAndIndices(pWizard->detectedWindowsImageNames(),
+                                                         pWizard->detectedWindowsImageIndices());
     setSkipCheckBoxEnable();
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
@@ -244 +243 @@
         connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigImageChanged,
                 this, &UIWizardNewVMExpertPage::sltISOPathChanged);
+        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigEditionChanged,
+                this, &UIWizardNewVMExpertPage::sltSelectedEditionChanged);
     }
 
@@ -281 +282 @@
                 this, &UIWizardNewVMExpertPage::sltStartHeadlessChanged);
     }
-
-    if (m_pWindowsISOImageSelector)
-        connect(m_pWindowsISOImageSelector, &UIWindowsISOImageSelector::sigSelectedWindowsImageChanged,
-                this, &UIWizardNewVMExpertPage::sltSelectedWindowsImageChanged);
 
     /* Virtual disk related connections: */
@@ -478 +475 @@
     AssertReturn(m_pGAInstallationISOContainer, 0);
     pLayout->addWidget(m_pGAInstallationISOContainer, iRow, 0, 1, 4);
-
-    m_pWindowsISOImageSelector = new UIWindowsISOImageSelector;
-    AssertReturn(m_pWindowsISOImageSelector, 0);
-    pLayout->addWidget(m_pWindowsISOImageSelector, iRow, 0, 1, 5);
 
     return pContainerWidget;
@@ -687 +680 @@
     if (m_pGAInstallationISOContainer)
         m_pGAInstallationISOContainer->setEnabled(fEnabled);
-    if (m_pWindowsISOImageSelector)
-        m_pWindowsISOImageSelector->setEnabled(fEnabled && !m_pWindowsISOImageSelector->isEmpty());
+    if (m_pNameAndSystemEditor)
+        m_pNameAndSystemEditor->setEditionSelectorEnabled(fEnabled && !m_pNameAndSystemEditor->isEditionsSelectorEmpty());
     m_pAdditionalOptionsContainer->disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
 }
@@ -855 +848 @@
 }
 
-void UIWizardNewVMExpertPage::sltSelectedWindowsImageChanged(ulong uImageIndex)
-{
-    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
-    wizardWindow<UIWizardNewVM>()->setSelectedWindowImageIndex(uImageIndex);
+void UIWizardNewVMExpertPage::sltSelectedEditionChanged(ulong uEditionIndex)
+{
+    AssertReturnVoid(wizardWindow<UIWizardNewVM>());
+    wizardWindow<UIWizardNewVM>()->setSelectedWindowImageIndex(uEditionIndex);
 }
 

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

@@ -46 +46 @@
 class UIToolBox;
 class UIUserNamePasswordGroupBox;
-class UIWindowsISOImageSelector;
 
 /** Expert page of the New Virtual Machine wizard. */
@@ -83 +82 @@
     void sltProductKeyChanged(const QString &strProductKey);
     void sltStartHeadlessChanged(bool fStartHeadless);
-    void sltSelectedWindowsImageChanged(ulong uImageIndex);
+    void sltSelectedEditionChanged(ulong uEditionIndex);
 
 private:
@@ -135 +134 @@
         UIDiskFormatsComboBox *m_pFormatComboBox;
         UIMediumSizeAndPathGroupBox *m_pSizeAndLocationGroup;
-        UIWindowsISOImageSelector *m_pWindowsISOImageSelector;
         UINameAndSystemEditor *m_pNameAndSystemEditor;
         QCheckBox *m_pSkipUnattendedCheckBox;

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

@@ -41 +41 @@
     , m_pGAInstallationISOContainer(0)
     , m_pUserNamePasswordGroupBox(0)
-    , m_pWindowsISOImageSelector(0)
 {
     prepare();
@@ -65 +64 @@
     AssertReturnVoid(m_pGAInstallationISOContainer);
     pMainLayout->addWidget(m_pGAInstallationISOContainer, 2, 0, 1, 2);
-
-    m_pWindowsISOImageSelector = new UIWindowsISOImageSelector;
-    AssertReturnVoid(m_pWindowsISOImageSelector);
-    pMainLayout->addWidget(m_pWindowsISOImageSelector, 3, 0, 1, 2);
 
     pMainLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding), 4, 0, 1, 2);
@@ -101 +96 @@
                 this, &UIWizardNewVMUnattendedPage::sltStartHeadlessChanged);
     }
-
-    if (m_pWindowsISOImageSelector)
-        connect(m_pWindowsISOImageSelector, &UIWindowsISOImageSelector::sigSelectedWindowsImageChanged,
-                this, &UIWizardNewVMUnattendedPage::sltSelectedWindowsImageChanged);
 }
 
@@ -164 +155 @@
         m_pGAInstallationISOContainer->blockSignals(false);
     }
-    if (m_pWindowsISOImageSelector)
-    {
-        m_pWindowsISOImageSelector->setImageNamesAndIndices(pWizard->detectedWindowsImageNames(),
-                                                            pWizard->detectedWindowsImageIndices());
-        m_pWindowsISOImageSelector->setEnabled(!m_pWindowsISOImageSelector->isEmpty());
-    }
 }
 

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

@@ -75 +75 @@
         UIGAInstallationGroupBox *m_pGAInstallationISOContainer;
         UIUserNamePasswordGroupBox *m_pUserNamePasswordGroupBox;
-        UIWindowsISOImageSelector *m_pWindowsISOImageSelector;
     /** @} */
     QSet<QString> m_userModifiedParameters;