diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-02-18 12:49:50 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-02-18 12:49:50 +0000 |
| commit | 6be711e8cd9e11f4994184e95141a1c72ac5f0de (patch) | |
| tree | 98e5f3e89973ab022277401d36a3bc8301a13b99 | |
| parent | 54b46812cbbfdc5458a763236e30f1d75d34e040 (diff) | |
| download | VirtualBox-svn-6be711e8cd9e11f4994184e95141a1c72ac5f0de.tar.gz | |
FE/Qt: bugref:9340. Using medium selector in the first time run wizard
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@77345 cfe28804-0f27-0410-a406-dd0f0b0b656f
| -rw-r--r-- | src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp | 23 | ||||
| -rw-r--r-- | src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp | 4 |
2 files changed, 2 insertions, 25 deletions
diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp index 4a91ba0bf8d..8b7c962c8f3 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp @@ -2889,29 +2889,6 @@ void VBoxGlobal::prepareStorageMenu(QMenu &menu, pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose/Create a disk image...", "This is used for hard disks, optical media and floppies")); - // /* Prepare create floppy disk action: */ - // if (enmMediumType == UIMediumDeviceType_Floppy) - // { - // QAction *pActionCreateFloppy = menu.addAction(UIIconPool::iconSet(":/fd_add_16px.png"), - // QString(), pListener, pszSlotName); - // pActionCreateFloppy->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(), - // comCurrentAttachment.GetDevice(), enmMediumType, - // UIMediumTarget::UIMediumTargetType_CreateFloppyDisk))); - // pActionCreateFloppy->setText(QApplication::translate("UIMachineSettingsStorage", "Create a new floppy disk...", - // "This is used to create a new floppy disk")); - // } - // /* Prepare ad-hoc-viso action for DVD-ROMs: */ - // if (enmMediumType == UIMediumDeviceType_DVD) - // { - // QAction *pActionAdHocViso = menu.addAction(UIIconPool::iconSet(":/select_file_16px.png"), - // QString(), pListener, pszSlotName); - // pActionAdHocViso->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(), - // comCurrentAttachment.GetDevice(), enmMediumType, - // UIMediumTarget::UIMediumTargetType_CreateAdHocVISO))); - // pActionAdHocViso->setText(QApplication::translate("UIMachineSettingsStorage", "Create ad hoc VISO...", - // "This is used for optical media")); - // } - /* Insert separator: */ menu.addSeparator(); diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp index 5e3b0994a82..048eda6d20b 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp @@ -39,7 +39,8 @@ UIWizardFirstRunPage::UIWizardFirstRunPage(bool fBootHardDiskWasSet) void UIWizardFirstRunPage::onOpenMediumWithFileOpenDialog() { /* Get opened vboxMedium id: */ - QUuid uMediumId = vboxGlobal().openMediumWithFileOpenDialog(m_pMediaSelector->type(), thisImp()); + QUuid uMediumId; + vboxGlobal().openMediumSelectorDialog(thisImp(), UIMediumDeviceType_DVD, uMediumId, "", "", "", true); /* Update medium-combo if necessary: */ if (!uMediumId.isNull()) m_pMediaSelector->setCurrentItem(uMediumId); @@ -158,4 +159,3 @@ QString UIWizardFirstRunPageBasic::source() const { return m_pMediaSelector->currentText(); } - |