Changeset 93541 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 2, 2022 10:07:07 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt, Main/Unattended. ​bugref:9515, ​bugref:9781. Adding a widget to the new wizard expert page to select windows image from the ISO. Connections etc. are not there yet.

Location:

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

Files:

• editors/UIWizardNewVMEditors.cpp (modified) (1 diff)
• editors/UIWizardNewVMEditors.h (modified) (2 diffs)
• newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• newvm/UIWizardNewVM.h (modified) (2 diffs)
• newvm/UIWizardNewVMExpertPage.cpp (modified) (5 diffs)
• newvm/UIWizardNewVMExpertPage.h (modified) (2 diffs)
• newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (1 diff)

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

@@ -408 +408 @@
     }
 }
+
+
+/*********************************************************************************************************************************
+*   UIWindowsISOImageSelector implementation.                                                                                   *
+*********************************************************************************************************************************/
+
+UIWindowsISOImageSelector::UIWindowsISOImageSelector(QWidget *pParent /* = 0 */)
+    :QIWithRetranslateUI<QGroupBox>(pParent)
+    , m_pComboBox(0)
+    , m_pLabel(0)
+{
+    prepare();
+}
+
+ulong UIWindowsISOImageSelector::selectedImageIndex() const
+{
+    if (!m_pComboBox || m_pComboBox->count() == 0)
+        return 0;
+    return m_pComboBox->currentData().value<ulong>();
+}
+
+void UIWindowsISOImageSelector::setImageNamesAndIndices(const QVector<QString> &names, const QVector<ulong> &ids)
+{
+    AssertReturnVoid(m_pComboBox && names.size() == ids.size());
+
+    m_pComboBox->clear();
+
+    for (int i = 0; i < names.size(); ++i)
+        m_pComboBox->addItem(names[i], QVariant::fromValue(ids[i]) /* user data */);
+}
+
+bool UIWindowsISOImageSelector::isEmpty() const
+{
+    if (!m_pComboBox)
+        return true;
+    return m_pComboBox->count() == 0;
+}
+
+void UIWindowsISOImageSelector::retranslateUi()
+{
+    setTitle(UIWizardNewVM::tr("Available OS Versions from ISO"));
+    if (m_pLabel)
+        m_pLabel->setText(UIWizardNewVM::tr("ISO Images"));
+
+    if (m_pComboBox)
+        m_pComboBox->setToolTip(UIWizardNewVM::tr("Select an image to be installed."));
+}
+
+void UIWindowsISOImageSelector::prepare()
+{
+    QHBoxLayout *pMainLayout = new QHBoxLayout(this);
+
+    m_pComboBox = new QIComboBox;
+    if (m_pComboBox)
+    {
+        pMainLayout->addWidget(m_pComboBox);
+        connect(m_pComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+                this, &UIWindowsISOImageSelector::sltSelectedWindowsImageChanged);
+    }
+    retranslateUi();
+}
+
+
+void UIWindowsISOImageSelector::sltSelectedWindowsImageChanged(int)
+{
+    emit sigSelectedWindowsImageChanged(selectedImageIndex());
+}

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

@@ -33 +33 @@
 class QGridLayout;
 class QLabel;
+class QIComboBox;
 class QILineEdit;
 class UIBaseMemoryEditor;
@@ -177 +178 @@
 };
 
+class UIWindowsISOImageSelector : public QIWithRetranslateUI<QGroupBox>
+{
+    Q_OBJECT;
+
+signals:
+
+    void sigSelectedWindowsImageChanged(ulong selectedImageIndex);
+
+public:
+
+    UIWindowsISOImageSelector(QWidget *pParent = 0);
+    void setImageNamesAndIndices(const QVector<QString> &names, const QVector<ulong> &ids);
+    bool isEmpty() const;
+    ulong selectedImageIndex() const;
+
+private slots:
+    void sltSelectedWindowsImageChanged(int);
+private:
+
+    void prepare();
+    void retranslateUi();
+
+    QIComboBox *m_pComboBox;
+    QLabel     *m_pLabel;
+
+};
+
 #endif /* !FEQT_INCLUDED_SRC_wizards_editors_UIWizardNewVMEditors_h */

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

@@ -832 +832 @@
 }
 
-void UIWizardNewVM::setDetectedImageNamesAndIndices(const QVector<QString> &names, const QVector<ULONG> &ids)
+void UIWizardNewVM::setDetectedImageNamesAndIndices(const QVector<QString> &names, const QVector<ulong> &ids)
 {
     AssertMsg(names.size() == ids.size(),
@@ -845 +845 @@
 }
 
-const QVector<ULONG> &UIWizardNewVM::detectedImageIndices() const
+const QVector<ulong> &UIWizardNewVM::detectedImageIndices() const
 {
     return m_detectedImageIndices;

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

@@ -171 +171 @@
         void setEmptyDiskRecommended(bool fEmptyDiskRecommended);
 
-        void setDetectedImageNamesAndIndices(const QVector<QString> &names, const QVector<ULONG> &ids);
+        void setDetectedImageNamesAndIndices(const QVector<QString> &names, const QVector<ulong> &ids);
         const QVector<QString> &detectedImageNames() const;
-        const QVector<ULONG> &detectedImageIndices() const;
+        const QVector<ulong> &detectedImageIndices() const;
 
         QVector<KMediumVariant> mediumVariants() const;
@@ -230 +230 @@
        /* Name and index lists of the images detected from an ISO. Currently only for Windows ISOs. */
        QVector<QString> m_detectedImageNames;
-       QVector<ULONG> m_detectedImageIndices;
+       QVector<ulong> m_detectedImageIndices;
 
        /** Holds the VM OS family ID. */

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)
@@ -152 +153 @@
     if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))
         m_userModifiedParameters << "GuestOSTypeFromISO";
-    else /* Remove GuestOSTypeFromISO fromthe set if it is there: */
+    else /* Remove GuestOSTypeFromISO from the set if it is there: */
         m_userModifiedParameters.remove("GuestOSTypeFromISO");
 
@@ -161 +162 @@
     if (fileInfo.exists() && fileInfo.isReadable())
         uiCommon().updateRecentlyUsedMediumListAndFolder(UIMediumDeviceType_DVD, strISOPath);
+
+    /* Populate the windows ISO images selector: */
+    if (m_pWindowsISOImageSelector)
+        m_pWindowsISOImageSelector->setImageNamesAndIndices(pWizard->detectedImageNames(), pWizard->detectedImageIndices());
     setSkipCheckBoxEnable();
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
@@ -468 +473 @@
     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;
@@ -673 +682 @@
     if (m_pGAInstallationISOContainer)
         m_pGAInstallationISOContainer->setEnabled(fEnabled);
+    if (m_pWindowsISOImageSelector)
+        m_pWindowsISOImageSelector->setEnabled(fEnabled && !m_pWindowsISOImageSelector->isEmpty());
     m_pAdditionalOptionsContainer->disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
 }

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. */
@@ -133 +134 @@
         UIDiskFormatsComboBox *m_pFormatComboBox;
         UIMediumSizeAndPathGroupBox *m_pSizeAndLocationGroup;
+        UIWindowsISOImageSelector *m_pWindowsISOImageSelector;
         UINameAndSystemEditor *m_pNameAndSystemEditor;
         QCheckBox *m_pSkipUnattendedCheckBox;

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

@@ -328 +328 @@
     pWizard->setDetectedOSTypeId(comUnatteded.GetDetectedOSTypeId());
 
-    pWizard->setDetectedImageNamesAndIndices(comUnatteded.GetDetectedImageNames(),
-                                             comUnatteded.GetDetectedImageIndices());
+    const QVector<ULONG> &indices = comUnatteded.GetDetectedImageIndices();
+    QVector<ulong> qIndices;
+    for (int i = 0; i < indices.size(); ++i)
+        qIndices << indices[i];
+    pWizard->setDetectedImageNamesAndIndices(comUnatteded.GetDetectedImageNames(), qIndices);
 }