Changeset 33668 in vbox

Timestamp:

Nov 2, 2010 1:43:28 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 5302: Reworking New HD wizard for VBox config 4.0 (part 2).

Location:

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

Files:

• UINewVMWzd.cpp (modified) (3 diffs)
• UINewVMWzd.h (modified) (1 diff)
• UINewVMWzdPage4.ui (modified) (1 diff)

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

@@ -25 +25 @@
 #include "UINewHDWzd.h"
 #include "UINewVMWzd.h"
-#include "VBoxMediaManagerDlg.h"
+#include "QIFileDialog.h"
 #include "VBoxProblemReporter.h"
 #include "VBoxVMSettingsHD.h"
@@ -417 +417 @@
     connect(m_pDiskPresent, SIGNAL(toggled(bool)), this, SLOT(hardDiskSourceChanged()));
     connect(m_pDiskSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(hardDiskSourceChanged()));
-    connect(m_pVMMButton, SIGNAL(clicked()), this, SLOT(getWithMediaManager()));
+    connect(m_pVMMButton, SIGNAL(clicked()), this, SLOT(getWithFileOpenDialog()));
 
     /* Initialise page connections */
@@ -532 +532 @@
 }
 
-void UINewVMWzdPage4::getWithMediaManager()
-{
-    VBoxMediaManagerDlg dlg(this);
-    dlg.setup(VBoxDefs::MediumType_HardDisk, true);
-
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        QString newId = dlg.selectedId();
-        if (m_pDiskSelector->id() != newId)
-            m_pDiskSelector->setCurrentItem(newId);
-    }
-
-    hardDiskSourceChanged();
-
-    m_pDiskSelector->setFocus();
+void UINewVMWzdPage4::getWithFileOpenDialog()
+{
+    /* Initialize variables: */
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    QString strHomeFolder = vbox.GetHomeFolder();
+    QString title = m_pVMMButton->toolTip();
+    QList < QPair <QString, QString> > filters = vboxGlobal().HDDBackends();
+    QString allType = tr("hard disk");
+    QString strFilter;
+    QStringList backends;
+    QStringList prefixes;
+
+    /* Prepare filters and backends: */
+    for (int i = 0; i < filters.count(); ++i)
+    {
+        /* Get iterated filter: */
+        QPair <QString, QString> item = filters.at(i);
+        /* Create one backend filter string: */
+        backends << QString("%1 (%2)").arg(item.first).arg(item.second);
+        /* Save the suffix's for the "All" entry: */
+        prefixes << item.second;
+    }
+    if (!prefixes.isEmpty())
+        backends.insert(0, tr("All %1 images (%2)").arg(allType).arg(prefixes.join(" ").trimmed()));
+    backends << tr("All files (*)");
+    strFilter = backends.join(";;").trimmed();
+
+    /* Create open file dialog: */
+    QStringList files = QIFileDialog::getOpenFileNames(strHomeFolder, strFilter, this, title, 0, true, true);
+    if (!files.empty() && !files[0].isEmpty())
+    {
+        /* Get location: */
+        QString strLocation = files[0];
+
+        /* Prepare GUI medium wrapper: */
+        VBoxMedium vboxMedium;
+
+        /* Open corresponding medium: */
+        CMedium comMedium = vbox.OpenMedium(strLocation, KDeviceType_HardDisk, KAccessMode_ReadWrite);
+        if (vbox.isOk())
+            vboxMedium = VBoxMedium(CMedium(comMedium), VBoxDefs::MediumType_HardDisk, KMediumState_Created);
+
+        /* Add medium to GUI list: */
+        if (vbox.isOk())
+            vboxGlobal().addMedium(vboxMedium);
+        else
+            vboxProblem().cannotOpenMedium(this, vbox, VBoxDefs::MediumType_HardDisk, strLocation);
+
+        /* Ask medium combobox to select newly added medium: */
+        m_pDiskSelector->setCurrentItem(vboxMedium.id());
+
+        /* Update hard disk source: */
+        hardDiskSourceChanged();
+
+        m_pDiskSelector->setFocus();
+    }
 }
 

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

@@ -144 +144 @@
     void ensureNewHardDiskDeleted();
     void hardDiskSourceChanged();
-    void getWithMediaManager();
+    void getWithFileOpenDialog();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzdPage4.ui

@@ -91 +91 @@
          <bool>true</bool>
         </property>
+        <property name="toolTip">
+         <string>Select a hard disk image file</string>
+        </property>
        </widget>
       </item>