Changeset 34961 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 10, 2010 3:36:39 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Recent opened mediums list implemented for machine settings and running VM device menu.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxDefs.cpp (modified) (1 diff)
• globals/VBoxDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (6 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (7 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (5 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp

@@ -77 +77 @@
 const char* VBoxDefs::GUI_Export_Bucket = "GUI/Export/Bucket";
 const char* VBoxDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";
+const char* VBoxDefs::GUI_RecentListHD = "GUI/RecentListHD";
+const char* VBoxDefs::GUI_RecentListCD = "GUI/RecentListCD";
+const char* VBoxDefs::GUI_RecentListFD = "GUI/RecentListFD";
 #ifdef VBOX_WITH_VIDEOHWACCEL
 const char* VBoxDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear";

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h

@@ -153 +153 @@
     static const char* GUI_PreventBetaWarning;
 
+    static const char* GUI_RecentListHD;
+    static const char* GUI_RecentListCD;
+    static const char* GUI_RecentListFD;
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
     static const char* GUI_Accelerate2D_StretchLinear;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2597 +2597 @@
 QString VBoxGlobal::openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent,
                                                  const QString &strDefaultFolder /* = QString() */,
-                                                 bool fUseLastFolder /* = false */) const
+                                                 bool fUseLastFolder /* = false */)
 {
     /* Initialize variables: */
-    CVirtualBox vbox = vboxGlobal().virtualBox();
     QString strHomeFolder = fUseLastFolder && !m_strLastFolder.isEmpty() ? m_strLastFolder :
-                            strDefaultFolder.isEmpty() ? vbox.GetHomeFolder() : strDefaultFolder;
+                            strDefaultFolder.isEmpty() ? vboxGlobal().virtualBox().GetHomeFolder() : strDefaultFolder;
     QList < QPair <QString, QString> > filters;
     QStringList backends;
@@ -2609 +2608 @@
     QString strTitle;
     QString allType;
-    KDeviceType type;
     switch (mediumType)
     {
@@ -2617 +2615 @@
             strTitle = tr ("Choose a virtual hard disk file");
             allType = tr ("hard disk");
-            type = KDeviceType_HardDisk;
             break;
         }
@@ -2625 +2622 @@
             strTitle = tr ("Choose a virtual CD/DVD disk file");
             allType = tr ("CD/DVD-ROM disk");
-            type = KDeviceType_DVD;
             break;
         }
@@ -2633 +2629 @@
             strTitle = tr ("Choose a virtual floppy disk file");
             allType = tr ("floppy disk");
-            type = KDeviceType_Floppy;
             break;
         }
@@ -2657 +2652 @@
     /* Create open file dialog: */
     QStringList files = QIFileDialog::getOpenFileNames(strHomeFolder, strFilter, pParent, strTitle, 0, true, true);
+
+    /* If dialog has some result: */
     if (!files.empty() && !files[0].isEmpty())
-    {
-        /* Get location: */
-        QString strLocation = files[0];
-
-        /* Remember absolute path: */
-        m_strLastFolder = QFileInfo(strLocation).absolutePath();
-
-        /* Open corresponding medium: */
-        CMedium comMedium = vbox.OpenMedium(strLocation, type, KAccessMode_ReadWrite);
-
-        if (vbox.isOk())
-        {
-            /* Prepare vbox medium wrapper: */
-            VBoxMedium vboxMedium;
-
-            /* First of all we should test if that medium already opened: */
-            if (!vboxGlobal().findMedium(comMedium, vboxMedium))
-            {
-                /* And create new otherwise: */
-                vboxMedium = VBoxMedium(CMedium(comMedium), mediumType, KMediumState_Created);
-                vboxGlobal().addMedium(vboxMedium);
-            }
-
-            /* Return vboxMedium id: */
-            return vboxMedium.id();
-        }
-        else
-            vboxProblem().cannotOpenMedium(pParent, vbox, mediumType, strLocation);
-    }
+        return openMedium(mediumType, files[0]);
+
+    return QString();
+}
+
+QString VBoxGlobal::openMedium(VBoxDefs::MediumType mediumType, QString strMediumLocation)
+{
+    /* Convert to native separators: */
+    strMediumLocation = QDir::toNativeSeparators(strMediumLocation);
+
+    /* Initialize variables: */
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+
+    /* Remember the path of the last chosen medium: */
+    m_strLastFolder = QFileInfo(strMediumLocation).absolutePath();
+
+    /* Update recently used list: */
+    QString strRecentAddress = mediumType == VBoxDefs::MediumType_HardDisk ? VBoxDefs::GUI_RecentListHD :
+                               mediumType == VBoxDefs::MediumType_DVD ? VBoxDefs::GUI_RecentListCD :
+                               mediumType == VBoxDefs::MediumType_Floppy ? VBoxDefs::GUI_RecentListFD :
+                               QString();
+    QStringList recentMediumList = virtualBox().GetExtraData(strRecentAddress).split(';');
+    if (recentMediumList.contains(strMediumLocation))
+        recentMediumList.removeAll(strMediumLocation);
+    recentMediumList.prepend(strMediumLocation);
+    while(recentMediumList.size() > 5) recentMediumList.removeLast();
+    virtualBox().SetExtraData(strRecentAddress, recentMediumList.join(";"));
+
+    /* Open corresponding medium: */
+    CMedium comMedium = vbox.OpenMedium(strMediumLocation, mediumTypeToGlobal(mediumType), KAccessMode_ReadWrite);
+
+    if (vbox.isOk())
+    {
+        /* Prepare vbox medium wrapper: */
+        VBoxMedium vboxMedium;
+
+        /* First of all we should test if that medium already opened: */
+        if (!vboxGlobal().findMedium(comMedium, vboxMedium))
+        {
+            /* And create new otherwise: */
+            vboxMedium = VBoxMedium(CMedium(comMedium), mediumType, KMediumState_Created);
+            vboxGlobal().addMedium(vboxMedium);
+        }
+
+        /* Return vboxMedium id: */
+        return vboxMedium.id();
+    }
+    else
+        vboxProblem().cannotOpenMedium(0, vbox, mediumType, strMediumLocation);
 
     return QString();

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -594 +594 @@
 
     QString openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent = 0,
-                                         const QString &strDefaultFolder = QString(), bool fUseLastFolder = false) const;
+                                         const QString &strDefaultFolder = QString(), bool fUseLastFolder = false);
+    QString openMedium(VBoxDefs::MediumType mediumType, QString strMediumLocation);
 
     /* Returns the number of current running Fe/Qt4 main windows. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -80 +80 @@
 Q_DECLARE_METATYPE(MediumTarget);
 
+struct RecentMediumTarget
+{
+    RecentMediumTarget() : name(QString("")), port(0), device(0), location(QString()), type(VBoxDefs::MediumType_Invalid) {}
+    RecentMediumTarget(const QString &strName, LONG iPort, LONG iDevice, const QString &strLocation, VBoxDefs::MediumType eType)
+        : name(strName), port(iPort), device(iDevice), location(strLocation), type(eType) {}
+    QString name;
+    LONG port;
+    LONG device;
+    QString location;
+    VBoxDefs::MediumType type;
+};
+Q_DECLARE_METATYPE(RecentMediumTarget);
+
 struct USBTarget
 {
@@ -1097 +1110 @@
 
     /* Fill attachments menu: */
-    CMachine machine = session().GetMachine();
+    const CMachine &machine = session().GetMachine();
     const CMediumAttachmentVector &attachments = machine.GetMediumAttachments();
-    foreach (const CMediumAttachment &attachment, attachments)
-    {
-        CStorageController controller = machine.GetStorageControllerByName(attachment.GetController());
+    for (int iAttachmentIndex = 0; iAttachmentIndex < attachments.size(); ++iAttachmentIndex)
+    {
+        /* Current attachment: */
+        const CMediumAttachment &attachment = attachments[iAttachmentIndex];
+        /* Current controller: */
+        const CStorageController &controller = machine.GetStorageControllerByName(attachment.GetController());
+        /* If controller present and device type correct: */
         if (!controller.isNull() && (attachment.GetType() == deviceType))
         {
+            /* Current attachment attributes: */
+            const CMedium &currentMedium = attachment.GetMedium();
+            QString strCurrentId = currentMedium.isNull() ? QString::null : currentMedium.GetId();
+            QString strCurrentLocation = currentMedium.isNull() ? QString::null : currentMedium.GetLocation();
+
             /* Attachment menu item: */
             QMenu *pAttachmentMenu = 0;
@@ -1110 +1132 @@
                 pAttachmentMenu = new QMenu(pMenu);
                 pAttachmentMenu->setTitle(QString("%1 (%2)").arg(controller.GetName())
-                                          .arg (vboxGlobal().toString(StorageSlot(controller.GetBus(),
-                                                                                  attachment.GetPort(),
-                                                                                  attachment.GetDevice()))));
+                                          .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(),
+                                                                                 attachment.GetPort(),
+                                                                                 attachment.GetDevice()))));
                 switch (controller.GetBus())
                 {
@@ -1130 +1152 @@
             else pAttachmentMenu = pMenu;
 
-            /* Mount Medium actions: */
+            /* Prepare choose-existing-medium action: */
+            QAction *pChooseExistingMediumAction = pAttachmentMenu->addAction(QIcon(":/select_file_16px.png"), QString(),
+                                                                              this, SLOT(sltMountStorageMedium()));
+            pChooseExistingMediumAction->setData(QVariant::fromValue(MediumTarget(controller.GetName(), attachment.GetPort(),
+                                                                                  attachment.GetDevice(), mediumType)));
+
+            /* Prepare choose-particular-medium actions: */
             CMediumVector mediums;
+            QString strRecentMediumAddress;
             switch (mediumType)
             {
                 case VBoxDefs::MediumType_DVD:
-                    mediums += vboxGlobal().virtualBox().GetHost().GetDVDDrives();
-                    mediums += vboxGlobal().virtualBox().GetDVDImages();
+                    mediums = vboxGlobal().virtualBox().GetHost().GetDVDDrives();
+                    strRecentMediumAddress = VBoxDefs::GUI_RecentListCD;
                     break;
                 case VBoxDefs::MediumType_Floppy:
-                    mediums += vboxGlobal().virtualBox().GetHost().GetFloppyDrives();
-                    mediums += vboxGlobal().virtualBox().GetFloppyImages();
+                    mediums = vboxGlobal().virtualBox().GetHost().GetFloppyDrives();
+                    strRecentMediumAddress = VBoxDefs::GUI_RecentListFD;
                     break;
                 default:
@@ -1146 +1175 @@
             }
 
-            /* Mediums to be shown: */
-            int mediumsToBeShown = 0;
-            const int maxMediumsToBeShown = 5;
-            CMedium currentMedium = attachment.GetMedium();
-            QString currentId = currentMedium.isNull() ? QString::null : currentMedium.GetId();
-            bool fCurrentUsed = false;
-            foreach (CMedium medium, mediums)
+            /* Prepare choose-host-drive actions: */
+            for (int iHostDriveIndex = 0; iHostDriveIndex < mediums.size(); ++iHostDriveIndex)
             {
-                bool isMediumUsed = false;
-                foreach (const CMediumAttachment &otherAttachment, attachments)
+                const CMedium &medium = mediums[iHostDriveIndex];
+                bool fIsHostDriveUsed = false;
+                for (int iOtherAttachmentIndex = 0; iOtherAttachmentIndex < attachments.size(); ++iOtherAttachmentIndex)
                 {
+                    const CMediumAttachment &otherAttachment = attachments[iOtherAttachmentIndex];
                     if (otherAttachment != attachment)
                     {
-                        CMedium otherMedium = otherAttachment.GetMedium();
+                        const CMedium &otherMedium = otherAttachment.GetMedium();
                         if (!otherMedium.isNull() && otherMedium.GetId() == medium.GetId())
                         {
-                            isMediumUsed = true;
+                            fIsHostDriveUsed = true;
                             break;
                         }
                     }
                 }
-                if (!isMediumUsed)
+                if (!fIsHostDriveUsed)
                 {
-                    if (!fCurrentUsed && !currentMedium.isNull() && mediumsToBeShown == maxMediumsToBeShown - 1)
-                        medium = currentMedium;
-
-                    if (medium.GetId() == currentId)
-                        fCurrentUsed = true;
-
-                    QAction *mountMediumAction = new QAction(VBoxMedium(medium, mediumType).name(), pAttachmentMenu);
-                    mountMediumAction->setCheckable(true);
-                    mountMediumAction->setChecked(!currentMedium.isNull() && medium.GetId() == currentId);
-                    mountMediumAction->setData(QVariant::fromValue(MediumTarget(controller.GetName(),
-                                                                                attachment.GetPort(),
-                                                                                attachment.GetDevice(),
-                                                                                medium.GetId())));
-                    connect(mountMediumAction, SIGNAL(triggered(bool)), this, SLOT(sltMountStorageMedium()));
-                    pAttachmentMenu->addAction(mountMediumAction);
-                    ++ mediumsToBeShown;
-                    if (mediumsToBeShown == maxMediumsToBeShown)
-                        break;
+                    QAction *pChooseHostDriveAction = pAttachmentMenu->addAction(VBoxMedium(medium, mediumType).name(),
+                                                                                 this, SLOT(sltMountStorageMedium()));
+                    pChooseHostDriveAction->setCheckable(true);
+                    pChooseHostDriveAction->setChecked(!currentMedium.isNull() && medium.GetId() == strCurrentId);
+                    pChooseHostDriveAction->setData(QVariant::fromValue(MediumTarget(controller.GetName(), attachment.GetPort(),
+                                                                                     attachment.GetDevice(), medium.GetId())));
                 }
             }
 
-            /* Virtual Media Manager action: */
-            QAction *callVMMAction = new QAction(pAttachmentMenu);
-            callVMMAction->setIcon(QIcon(":/diskimage_16px.png"));
-            callVMMAction->setData(QVariant::fromValue(MediumTarget(controller.GetName(),
-                                                                    attachment.GetPort(),
-                                                                    attachment.GetDevice(),
-                                                                    mediumType)));
-            connect(callVMMAction, SIGNAL(triggered(bool)), this, SLOT(sltMountStorageMedium()));
-            pAttachmentMenu->addAction(callVMMAction);
+            /* Prepare choose-recent-medium actions: */
+            QStringList recentMediumList = vboxGlobal().virtualBox().GetExtraData(strRecentMediumAddress).split(';');
+            /* For every list-item: */
+            for (int i = 0; i < recentMediumList.size(); ++i)
+            {
+                QString strRecentMediumLocation = QDir::toNativeSeparators(recentMediumList[i]);
+                if (QFile::exists(strRecentMediumLocation))
+                {
+                    bool fIsRecentMediumUsed = false;
+                    for (int iOtherAttachmentIndex = 0; iOtherAttachmentIndex < attachments.size(); ++iOtherAttachmentIndex)
+                    {
+                        const CMediumAttachment &otherAttachment = attachments[iOtherAttachmentIndex];
+                        if (otherAttachment != attachment)
+                        {
+                            const CMedium &otherMedium = otherAttachment.GetMedium();
+                            if (!otherMedium.isNull() && otherMedium.GetLocation() == strRecentMediumLocation)
+                            {
+                                fIsRecentMediumUsed = true;
+                                break;
+                            }
+                        }
+                    }
+                    if (!fIsRecentMediumUsed)
+                    {
+                        QAction *pChooseRecentMediumAction = pAttachmentMenu->addAction(QFileInfo(strRecentMediumLocation).fileName(),
+                                                                                        this, SLOT(sltMountRecentStorageMedium()));
+                        pChooseRecentMediumAction->setCheckable(true);
+                        pChooseRecentMediumAction->setChecked(!currentMedium.isNull() && strRecentMediumLocation == strCurrentLocation);
+                        pChooseRecentMediumAction->setData(QVariant::fromValue(RecentMediumTarget(controller.GetName(), attachment.GetPort(),
+                                                                                                  attachment.GetDevice(), strRecentMediumLocation, mediumType)));
+                    }
+                }
+            }
 
             /* Insert separator: */
@@ -1216 +1254 @@
             {
                 case VBoxDefs::MediumType_DVD:
-                    callVMMAction->setText(QApplication::translate("UIMachineLogic", "More CD/DVD Images..."));
-                    unmountMediumAction->setText(QApplication::translate("UIMachineLogic", "Unmount CD/DVD Device"));
+                    pChooseExistingMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual CD/DVD disk file..."));
+                    unmountMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
                     unmountMediumAction->setIcon(UIIconPool::iconSet(":/cd_unmount_16px.png",
                                                                      ":/cd_unmount_dis_16px.png"));
                     break;
                 case VBoxDefs::MediumType_Floppy:
-                    callVMMAction->setText(QApplication::translate("UIMachineLogic", "More Floppy Images..."));
-                    unmountMediumAction->setText(QApplication::translate("UIMachineLogic", "Unmount Floppy Device"));
+                    pChooseExistingMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual floppy disk file..."));
+                    unmountMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
                     unmountMediumAction->setIcon(UIIconPool::iconSet(":/fd_unmount_16px.png",
                                                                      ":/fd_unmount_dis_16px.png"));
@@ -1332 +1370 @@
         if (!machine.isOk())
             vboxProblem().cannotSaveMachineSettings(machine);
+    }
+}
+
+void UIMachineLogic::sltMountRecentStorageMedium()
+{
+    /* Get sender action: */
+    QAction *pSender = qobject_cast<QAction*>(sender());
+    AssertMsg(pSender, ("This slot should only be called on selecting storage menu item!\n"));
+
+    /* Get mount-target: */
+    RecentMediumTarget target = pSender->data().value<RecentMediumTarget>();
+
+    /* Get new medium id: */
+    QString strNewId = vboxGlobal().openMedium(target.type, target.location);
+
+    if (!strNewId.isEmpty())
+    {
+        /* Get current machine: */
+        CMachine machine = session().GetMachine();
+
+        /* Get current medium id: */
+        const CMediumAttachment &currentAttachment = machine.GetMediumAttachment(target.name, target.port, target.device);
+        CMedium currentMedium = currentAttachment.GetMedium();
+        QString strCurrentId = currentMedium.isNull() ? QString("") : currentMedium.GetId();
+
+        /* Should we mount or unmount? */
+        bool fMount = strNewId != strCurrentId;
+
+        /* Prepare target medium: */
+        const VBoxMedium &vboxMedium = fMount ? vboxGlobal().findMedium(strNewId) : VBoxMedium();
+        const CMedium &comMedium = fMount ? vboxMedium.medium() : CMedium();
+
+        /* 'Mounted' flag: */
+        bool fWasMounted = false;
+
+        /* Try to mount medium to the predefined port/device: */
+        machine.MountMedium(target.name, target.port, target.device, comMedium, false /* force? */);
+        if (machine.isOk())
+            fWasMounted = true;
+        else
+        {
+            /* Ask for force remounting: */
+            if (vboxProblem().cannotRemountMedium(0, machine, vboxGlobal().findMedium(fMount ? strNewId : strCurrentId), fMount, true /* retry? */) == QIMessageBox::Ok)
+            {
+                /* Force remount medium to the predefined port/device: */
+                machine.MountMedium(target.name, target.port, target.device, comMedium, true /* force? */);
+                if (machine.isOk())
+                    fWasMounted = true;
+                else
+                    vboxProblem().cannotRemountMedium(0, machine, vboxGlobal().findMedium(fMount ? strNewId : strCurrentId), fMount, false /* retry? */);
+            }
+        }
+
+        /* Save medium mounted at runtime if necessary: */
+        if (fWasMounted && !uisession()->isIgnoreRuntimeMediumsChanging())
+        {
+            machine.SaveSettings();
+            if (!machine.isOk())
+                vboxProblem().cannotSaveMachineSettings(machine);
+        }
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -171 +171 @@
     void sltPrepareStorageMenu();
     void sltMountStorageMedium();
+    void sltMountRecentStorageMedium();
     void sltPrepareUSBMenu();
     void sltAttachUSBDevice();

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -2404 +2404 @@
                 /* Add "Choose a virtual hard disk file" action: */
                 addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose a virtual hard disk file..."));
+                /* Add recent mediums list: */
+                addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
                 break;
             }
@@ -2412 +2414 @@
                 /* Add "Choose a physical drive" actions: */
                 addChooseHostDriveActions(pOpenMediumMenu);
+                /* Add recent mediums list: */
+                addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
                 /* Add "Eject current medium" action: */
                 pOpenMediumMenu->addSeparator();
@@ -2427 +2431 @@
                 /* Add "Choose a physical drive" actions: */
                 addChooseHostDriveActions(pOpenMediumMenu);
+                /* Add recent mediums list: */
+                addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
                 /* Add "Eject current medium" action: */
                 pOpenMediumMenu->addSeparator();
@@ -2469 +2475 @@
     if (pChooseHostDriveAction)
         m_pMediumIdHolder->setId(pChooseHostDriveAction->data().toString());
+}
+
+void UIMachineSettingsStorage::sltChooseRecentMedium()
+{
+    /* This slot should be called ONLY by choose-recent-medium action: */
+    QAction *pChooseRecentMediumAction = qobject_cast<QAction*>(sender());
+    AssertMsg(pChooseRecentMediumAction, ("Can't access choose-recent-medium action!\n"));
+    if (pChooseRecentMediumAction)
+    {
+        /* Get recent medium type & name: */
+        QStringList mediumInfoList = pChooseRecentMediumAction->data().toString().split(',');
+        VBoxDefs::MediumType mediumType = (VBoxDefs::MediumType)mediumInfoList[0].toUInt();
+        QString strMediumLocation = mediumInfoList[1];
+        QString strMediumId = vboxGlobal().openMedium(mediumType, strMediumLocation);
+        if (!strMediumId.isNull())
+            m_pMediumIdHolder->setId(strMediumId);
+    }
 }
 
@@ -2927 +2950 @@
 }
 
+void UIMachineSettingsStorage::addRecentMediumActions(QMenu *pOpenMediumMenu, VBoxDefs::MediumType recentMediumType)
+{
+    /* Compose recent-medium list address: */
+    QString strRecentMediumAddress;
+    switch (recentMediumType)
+    {
+        case VBoxDefs::MediumType_HardDisk:
+            strRecentMediumAddress = VBoxDefs::GUI_RecentListHD;
+            break;
+        case VBoxDefs::MediumType_DVD:
+            strRecentMediumAddress = VBoxDefs::GUI_RecentListCD;
+            break;
+        case VBoxDefs::MediumType_Floppy:
+            strRecentMediumAddress = VBoxDefs::GUI_RecentListFD;
+            break;
+        default:
+            break;
+    }
+    /* Get recent-medium list: */
+    QStringList recentMediumList = vboxGlobal().virtualBox().GetExtraData(strRecentMediumAddress).split(';');
+    /* For every list-item: */
+    for (int index = 0; index < recentMediumList.size(); ++index)
+    {
+        /* Prepare corresponding action: */
+        QString strRecentMediumLocation = recentMediumList[index];
+        if (QFile::exists(strRecentMediumLocation))
+        {
+            QAction *pChooseRecentMediumAction = pOpenMediumMenu->addAction(QFileInfo(strRecentMediumLocation).fileName(),
+                                                                            this, SLOT(sltChooseRecentMedium()));
+            pChooseRecentMediumAction->setData(QString("%1,%2").arg(recentMediumType).arg(strRecentMediumLocation));
+        }
+    }
+}
+
 #include "UIMachineSettingsStorage.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -637 +637 @@
     void sltChooseExistingMedium();
     void sltChooseHostDrive();
+    void sltChooseRecentMedium();
 
     void updateActionsState();
@@ -667 +668 @@
     void addChooseExistingMediumAction(QMenu *pOpenMediumMenu, const QString &strActionName);
     void addChooseHostDriveActions(QMenu *pOpenMediumMenu);
+    void addRecentMediumActions(QMenu *pOpenMediumMenu, VBoxDefs::MediumType recentMediumType);
 
     QIWidgetValidator *mValidator;