Changeset 88101 in vbox

Timestamp:

Mar 12, 2021 1:26:56 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Adding a file selector to name/type editor.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UINameAndSystemEditor.cpp (modified) (7 diffs)
• settings/editors/UINameAndSystemEditor.h (modified) (5 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic1.h (modified) (1 diff)

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

@@ -42 +42 @@
                                              bool fChooseName /* = true */,
                                              bool fChoosePath /* = false */,
-                                             bool fChooseType /* = true */)
+                                             bool fChooseType /* = true */,
+                                             bool fChooseISOFile /* = false */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fChooseName(fChooseName)
     , m_fChoosePath(fChoosePath)
+    , m_fChooseISOFile(fChooseISOFile)
     , m_fChooseType(fChooseType)
     , m_fSupportsHWVirtEx(false)
@@ -52 +54 @@
     , m_pNameLabel(0)
     , m_pPathLabel(0)
+    , m_pISOFileSelectorLabel(0)
     , m_pLabelFamily(0)
     , m_pLabelType(0)
@@ -57 +60 @@
     , m_pNameLineEdit(0)
     , m_pPathSelector(0)
+    , m_pISOFileSelector(0)
     , m_pComboFamily(0)
     , m_pComboType(0)
@@ -99 +103 @@
 }
 
+void UINameAndSystemEditor::setFileSelectorDialogFilters(const QString &strFilters)
+{
+    if (m_pISOFileSelector)
+        m_pISOFileSelector->setFileDialogFilters(strFilters);
+}
+
 void UINameAndSystemEditor::setName(const QString &strName)
 {
@@ -266 +276 @@
     if (m_pPathLabel)
         m_pPathLabel->setText(tr("Folder:"));
+    if (m_pISOFileSelectorLabel)
+        m_pISOFileSelectorLabel->setText(tr("Installation ISO:"));
     if (m_pLabelFamily)
         m_pLabelFamily->setText(tr("&Type:"));
@@ -452 +464 @@
         }
 
+        if (m_fChooseISOFile)
+        {
+            m_pISOFileSelectorLabel = new QLabel(this);
+            m_pMainLayout->addWidget(m_pISOFileSelectorLabel, iRow, 0);
+
+            m_pISOFileSelector = new UIFilePathSelector(this);
+            if (m_pISOFileSelector)
+            {
+                m_pISOFileSelector->setResetEnabled(false);
+                m_pISOFileSelector->setMode(UIFilePathSelector::Mode_File_Open);
+                m_pISOFileSelector->setFileDialogFilters("*.iso *.ISO");
+                m_pISOFileSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+                m_pISOFileSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
+                m_pISOFileSelectorLabel->setBuddy(m_pISOFileSelector);
+                m_pMainLayout->addWidget(m_pISOFileSelector, iRow, 1, 1, 2);
+            }
+            ++iRow;
+        }
+
         if (m_fChooseType)
         {
@@ -460 +491 @@
                 m_pLabelFamily->setAlignment(Qt::AlignRight);
                 m_pLabelFamily->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-
                 /* Add into layout: */
                 m_pMainLayout->addWidget(m_pLabelFamily, iRow, 0);

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

@@ -70 +70 @@
 
     /** Constructs VM parameters editor passing @a pParent to the base-class.
-     * @param  fChooseName  Controls whether we should propose to choose name.
-     * @param  fChoosePath  Controls whether we should propose to choose path.
-     * @param  fChooseType  Controls whether we should propose to choose type. */
+     * @param  fChooseName    Controls whether we should propose to choose name.
+     * @param  fChoosePath    Controls whether we should propose to choose path.
+     * @param  fChooseType    Controls whether we should propose to choose type.
+     * @param  fChooseISOFile Controls whether we should have a ISO file selector. */
     UINameAndSystemEditor(QWidget *pParent,
                           bool fChooseName = true,
                           bool fChoosePath = false,
-                          bool fChooseType = true);
+                          bool fChooseType = true,
+                          bool fChooseISOFile = false);
 
     /** Defines minimum layout @a iIndent. */
@@ -87 +89 @@
     /** Defines whether VM OS type stuff is @a fEnabled. */
     void setOSTypeStuffEnabled(bool fEnabled);
+
+    void setFileSelectorDialogFilters(const QString &strFilters);
 
     /** Defines the VM @a strName. */
@@ -162 +166 @@
     /** Holds whether we should propose to choose a path. */
     bool  m_fChoosePath;
+    /** Holds whether we should propose a file selector. */
+    bool  m_fChooseISOFile;
     /** Holds whether we should propose to choose a type. */
     bool  m_fChooseType;
@@ -176 +182 @@
     /** Holds the VM path label instance. */
     QLabel *m_pPathLabel;
+    QLabel *m_pISOFileSelectorLabel;
     /** Holds the VM OS family label instance. */
     QLabel *m_pLabelFamily;
@@ -187 +194 @@
     /** Holds the VM path editor instance. */
     UIFilePathSelector *m_pPathSelector;
+    /** Holds the ISO file selector instance. */
+    UIFilePathSelector    *m_pISOFileSelector;
     /** Holds the VM OS family combo instance. */
     QComboBox          *m_pComboFamily;

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

@@ -239 +239 @@
                                                        true /* fChooseName? */,
                                                        true /* fChoosePath? */,
-                                                       true /* fChooseType? */);
+                                                       true /* fChooseType? */,
+                                                       true /* fChooseISOFile? */);
     return m_pNameAndSystemEditor;
 }

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

@@ -81 +81 @@
     QString ISOFilePath() const;
     bool determineOSType(const QString &strISOPath);
-    bool isISOFileSelectorComplete() const;
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
     /** Return false if ISO path is not empty but points to an missing or unreadable file. */
     bool checkISOFile() const;
-
 
     /** @name Widgets