Changeset 41615 in vbox

Timestamp:

Jun 7, 2012 4:55:08 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Moving VBoxMedium stuff into separate folder, renaming it into UIMedium. Remove VBoxMedium stuff from VBoxGlobal/VBoxDefs.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/VBoxMediaManagerDlg.cpp (modified) (49 diffs)
• src/VBoxMediaManagerDlg.h (modified) (5 diffs)
• src/VBoxMedium.cpp (deleted)
• src/VBoxMedium.h (deleted)
• src/globals/UIMessageCenter.cpp (modified) (19 diffs)
• src/globals/UIMessageCenter.h (modified) (8 diffs)
• src/globals/VBoxDefs.h (modified) (2 diffs)
• src/globals/VBoxGlobal.cpp (modified) (30 diffs)
• src/globals/VBoxGlobal.h (modified) (5 diffs)
• src/runtime/UIIndicatorsPool.cpp (modified) (3 diffs)
• src/runtime/UIMachineLogic.cpp (modified) (13 diffs)
• src/runtime/UISession.cpp (modified) (2 diffs)
• src/selector/UISelectorWindow.h (modified) (1 diff)
• src/settings/machine/UIMachineSettingsStorage.cpp (modified) (24 diffs)
• src/settings/machine/UIMachineSettingsStorage.h (modified) (2 diffs)
• src/widgets/VBoxMediaComboBox.cpp (modified) (12 diffs)
• src/widgets/VBoxMediaComboBox.h (modified) (3 diffs)
• src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp (modified) (2 diffs)
• src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp (modified) (1 diff)
• src/wizards/firstrun/UIWizardFirstRun.cpp (modified) (1 diff)
• src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp (modified) (1 diff)
• src/wizards/newvd/UIWizardNewVD.cpp (modified) (1 diff)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (3 diffs)
• src/wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (3 diffs)
• src/wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -148 +148 @@
         ./src/globals \
         ./src/net \
+        ./src/medium \
         ./src/platform \
         ./src/platform/darwin \
@@ -436 +437 @@
 
 VirtualBox_SOURCES = \
+        src/main.cpp \
         src/UIMediumTypeChangeDialog.cpp \
         src/VBoxAboutDlg.cpp \
@@ -441 +443 @@
         src/VBoxLicenseViewer.cpp \
         src/VBoxMediaManagerDlg.cpp \
-        src/VBoxMedium.cpp \
         src/VBoxSnapshotDetailsDlg.cpp \
         src/VBoxTakeSnapshotDlg.cpp \
@@ -480 +481 @@
         src/globals/VBoxGlobal.cpp \
         src/globals/COMEnumsWrapper.cpp \
-        src/main.cpp \
+        src/medium/UIMediumDefs.cpp \
+        src/medium/UIMedium.cpp \
         src/net/UINetworkManager.cpp \
         src/net/UINetworkManagerDialog.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

@@ -82 +82 @@
     enum { MediaItemType = QTreeWidgetItem::UserType + 1 };
 
-    MediaItem (MediaItem *aParent, const VBoxMedium &aMedium, const VBoxMediaManagerDlg *aManager)
+    MediaItem (MediaItem *aParent, const UIMedium &aMedium, const VBoxMediaManagerDlg *aManager)
         : QTreeWidgetItem (aParent, MediaItemType)
         , mMedium (aMedium)
@@ -88 +88 @@
     { refresh(); }
 
-    MediaItem (QTreeWidget *aParent, const VBoxMedium &aMedium, const VBoxMediaManagerDlg *aManager)
+    MediaItem (QTreeWidget *aParent, const UIMedium &aMedium, const VBoxMediaManagerDlg *aManager)
         : QTreeWidgetItem (aParent, MediaItemType)
         , mMedium (aMedium)
@@ -100 +100 @@
     }
 
-    void setMedium (const VBoxMedium &aMedium)
+    void setMedium (const UIMedium &aMedium)
     {
         mMedium = aMedium;
@@ -106 +106 @@
     }
 
-    const VBoxMedium& medium() const { return mMedium; }
-
-    VBoxDefs::MediumType type() const { return mMedium.type(); }
+    const UIMedium& medium() const { return mMedium; }
+
+    UIMediumType type() const { return mMedium.type(); }
 
     KMediumState state() const { return mMedium.state (!mManager->showDiffs()); }
@@ -152 +152 @@
     }
 
-    VBoxMedium mMedium;
+    UIMedium mMedium;
     const VBoxMediaManagerDlg *mManager;
 };
@@ -212 +212 @@
 VBoxMediaManagerDlg::VBoxMediaManagerDlg (QWidget *aParent /* = 0 */, Qt::WindowFlags aFlags /* = Qt::Dialog */)
     : QIWithRetranslateUI2 <QIMainDialog> (aParent, aFlags)
-    , mType (VBoxDefs::MediumType_Invalid)
+    , mType (UIMediumType_Invalid)
     , mShowDiffs (true)
     , mSetupMode (false)
@@ -434 +434 @@
  *                          a machine from its settings dialog.
  * @param aSelectId         Which medium to make selected? (ignored when @a
- *                          aType is VBoxDefs::MediumType_All)
+ *                          aType is UIMediumType_All)
  * @param aShowDiffs        @c true to show differencing hard disks initially
  *                          (ignored if @a aSessionMachine is null assuming
@@ -441 +441 @@
  *                          attachments to restrict selection.
  */
-void VBoxMediaManagerDlg::setup (VBoxDefs::MediumType aType, bool aDoSelect,
+void VBoxMediaManagerDlg::setup (UIMediumType aType, bool aDoSelect,
                                  bool aRefresh /* = true */,
                                  const CMachine &aSessionMachine /* = CMachine() */,
@@ -460 +460 @@
     switch (aType)
     {
-        case VBoxDefs::MediumType_HardDisk: mHDSelectedId = aSelectId; break;
-        case VBoxDefs::MediumType_DVD:      mCDSelectedId = aSelectId; break;
-        case VBoxDefs::MediumType_Floppy:   mFDSelectedId = aSelectId; break;
-        case VBoxDefs::MediumType_All: break;
+        case UIMediumType_HardDisk: mHDSelectedId = aSelectId; break;
+        case UIMediumType_DVD:      mCDSelectedId = aSelectId; break;
+        case UIMediumType_Floppy:   mFDSelectedId = aSelectId; break;
+        case UIMediumType_All: break;
         default:
             AssertFailedReturnVoid();
@@ -469 +469 @@
 
     mTabWidget->setTabEnabled (HDTab,
-                               aType == VBoxDefs::MediumType_All ||
-                               aType == VBoxDefs::MediumType_HardDisk);
+                               aType == UIMediumType_All ||
+                               aType == UIMediumType_HardDisk);
     mTabWidget->setTabEnabled (CDTab,
-                               aType == VBoxDefs::MediumType_All ||
-                               aType == VBoxDefs::MediumType_DVD);
+                               aType == UIMediumType_All ||
+                               aType == UIMediumType_DVD);
     mTabWidget->setTabEnabled (FDTab,
-                               aType == VBoxDefs::MediumType_All ||
-                               aType == VBoxDefs::MediumType_Floppy);
+                               aType == UIMediumType_All ||
+                               aType == UIMediumType_Floppy);
 
     mDoSelect = aDoSelect;
@@ -487 +487 @@
              this, SLOT (mediumEnumStarted()));
     /* Listen to "media enumeration" signals */
-    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const VBoxMedium &)),
-             this, SLOT (mediumEnumerated (const VBoxMedium &)));
+    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const UIMedium &)),
+             this, SLOT (mediumEnumerated (const UIMedium &)));
     /* Listen to "media enumeration finished" signals */
     connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)),
@@ -494 +494 @@
 
     /* Listen to "media add" signals */
-    connect (&vboxGlobal(), SIGNAL (mediumAdded (const VBoxMedium &)),
-             this, SLOT (mediumAdded (const VBoxMedium &)));
+    connect (&vboxGlobal(), SIGNAL (mediumAdded (const UIMedium &)),
+             this, SLOT (mediumAdded (const UIMedium &)));
     /* Listen to "media update" signals */
-    connect (&vboxGlobal(), SIGNAL (mediumUpdated (const VBoxMedium &)),
-             this, SLOT (mediumUpdated (const VBoxMedium &)));
+    connect (&vboxGlobal(), SIGNAL (mediumUpdated (const UIMedium &)),
+             this, SLOT (mediumUpdated (const UIMedium &)));
     /* Listen to "media remove" signals */
-    connect (&vboxGlobal(), SIGNAL (mediumRemoved (VBoxDefs::MediumType, const QString &)),
-             this, SLOT (mediumRemoved (VBoxDefs::MediumType, const QString &)));
+    connect (&vboxGlobal(), SIGNAL (mediumRemoved (UIMediumType, const QString &)),
+             this, SLOT (mediumRemoved (UIMediumType, const QString &)));
 
     if (aRefresh && !vboxGlobal().isMediaEnumerationStarted())
@@ -557 +557 @@
         mModelessDialog->centerAccording (aCenterWidget);
         mModelessDialog->setAttribute (Qt::WA_DeleteOnClose);
-        mModelessDialog->setup (VBoxDefs::MediumType_All, false /* aDoSelect */, aRefresh);
+        mModelessDialog->setup (UIMediumType_All, false /* aDoSelect */, aRefresh);
 
         /* Setup 'closing' connection if main window is UISelectorWindow: */
@@ -739 +739 @@
 }
 
-void VBoxMediaManagerDlg::mediumAdded (const VBoxMedium &aMedium)
+void VBoxMediaManagerDlg::mediumAdded (const UIMedium &aMedium)
 {
     /* Ignore non-interesting aMedium */
     if ((aMedium.isNull()) ||
-        (mType != VBoxDefs::MediumType_All && mType != aMedium.type()) ||
+        (mType != UIMediumType_All && mType != aMedium.type()) ||
         (aMedium.isHostDrive()))
         return;
 
-    if (!mShowDiffs && aMedium.type() == VBoxDefs::MediumType_HardDisk)
+    if (!mShowDiffs && aMedium.type() == UIMediumType_HardDisk)
     {
         if (aMedium.parent() && !mSessionMachineId.isNull())
@@ -780 +780 @@
     switch (aMedium.type())
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
         {
             item = createHardDiskItem (mTwHD, aMedium);
@@ -797 +797 @@
             break;
         }
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
         {
             item = new MediaItem (mTwCD, aMedium, this);
@@ -814 +814 @@
             break;
         }
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
         {
             item = new MediaItem (mTwFD, aMedium, this);
@@ -850 +850 @@
 }
 
-void VBoxMediaManagerDlg::mediumUpdated (const VBoxMedium &aMedium)
+void VBoxMediaManagerDlg::mediumUpdated (const UIMedium &aMedium)
 {
     /* Ignore non-interesting aMedium */
     if ((aMedium.isNull()) ||
-        (mType != VBoxDefs::MediumType_All && mType != aMedium.type()) ||
+        (mType != UIMediumType_All && mType != aMedium.type()) ||
         (aMedium.isHostDrive()))
         return;
@@ -862 +862 @@
     switch (aMedium.type())
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
         {
             item = searchItem (mTwHD, aMedium.id());
             break;
         }
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
         {
             item = searchItem (mTwCD, aMedium.id());
             break;
         }
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
         {
             item = searchItem (mTwFD, aMedium.id());
@@ -896 +896 @@
 }
 
-void VBoxMediaManagerDlg::mediumRemoved (VBoxDefs::MediumType aType, const QString &aId)
+void VBoxMediaManagerDlg::mediumRemoved (UIMediumType aType, const QString &aId)
 {
     /* Ignore non-interesting aMedium */
-    if (mType != VBoxDefs::MediumType_All && mType != aType)
+    if (mType != UIMediumType_All && mType != aType)
         return;
 
@@ -960 +960 @@
 }
 
-void VBoxMediaManagerDlg::mediumEnumerated (const VBoxMedium &aMedium)
+void VBoxMediaManagerDlg::mediumEnumerated (const UIMedium &aMedium)
 {
     mediumUpdated (aMedium);
@@ -979 +979 @@
 void VBoxMediaManagerDlg::doNewMedium()
 {
-    AssertReturnVoid (currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk);
+    AssertReturnVoid (currentTreeWidgetType() == UIMediumType_HardDisk);
 
 //    UIWizardNewVD dlg(this);
@@ -998 +998 @@
     QString title;
     QString filter;
-    VBoxDefs::MediumType type = currentTreeWidgetType();
+    UIMediumType type = currentTreeWidgetType();
 
     QString dir;
@@ -1015 +1015 @@
     switch (type)
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
         {
             filterList = vboxGlobal().HDDBackends();
@@ -1022 +1022 @@
             break;
         }
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
         {
             filterList = vboxGlobal().DVDBackends();
@@ -1029 +1029 @@
             break;
         }
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
         {
             filterList = vboxGlobal().FloppyBackends();
@@ -1037 +1037 @@
         }
         default:
-            AssertMsgFailed (("Selected tree should be equal to one item in VBoxDefs::MediumType.\n"));
+            AssertMsgFailed (("Selected tree should be equal to one item in UIMediumType.\n"));
             break;
     }
@@ -1096 +1096 @@
     QString id = item->id();
     AssertReturnVoid (!id.isNull());
-    VBoxDefs::MediumType type = item->type();
+    UIMediumType type = item->type();
 
     if (!msgCenter().confirmRemoveMedium (this, item->medium()))
@@ -1105 +1105 @@
     switch (type)
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
         {
             bool deleteStorage = false;
@@ -1144 +1144 @@
             break;
         }
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
         {
             CMedium image = item->medium().medium();
@@ -1151 +1151 @@
             break;
         }
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
         {
             CMedium image = item->medium().medium();
@@ -1217 +1217 @@
     /* Inform others about medium changes (use a copy since data owning is not
      * clean there (to be fixed one day using shared_ptr)) */
-    VBoxMedium newMedium = item->medium();
+    UIMedium newMedium = item->medium();
     newMedium.refresh();
     vboxGlobal().updateMedium (newMedium);
 }
 
-bool VBoxMediaManagerDlg::releaseMediumFrom (const VBoxMedium &aMedium, const QString &aMachineId)
+bool VBoxMediaManagerDlg::releaseMediumFrom (const UIMedium &aMedium, const QString &aMachineId)
 {
     CSession session;
@@ -1246 +1246 @@
     switch (aMedium.type())
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
         {
             CMediumAttachmentVector attachments = machine.GetMediumAttachments();
@@ -1259 +1259 @@
                     {
                         CStorageController controller = machine.GetStorageControllerByName (attachment.GetController());
-                        msgCenter().cannotDetachDevice (this, machine, VBoxDefs::MediumType_HardDisk, aMedium.location(),
+                        msgCenter().cannotDetachDevice (this, machine, UIMediumType_HardDisk, aMedium.location(),
                                                           StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice()));
                         success = false;
@@ -1268 +1268 @@
             break;
         }
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
         {
             CMediumAttachmentVector attachments = machine.GetMediumAttachments();
@@ -1275 +1275 @@
                 if (attachment.GetType() != KDeviceType_DVD) continue;
 
-                VBoxMedium medium = vboxGlobal().findMedium (attachment.GetMedium().isNull() ? QString() : attachment.GetMedium().GetId());
+                UIMedium medium = vboxGlobal().findMedium (attachment.GetMedium().isNull() ? QString() : attachment.GetMedium().GetId());
                 if (medium.id() == aMedium.id())
                 {
@@ -1289 +1289 @@
             break;
         }
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
         {
             CMediumAttachmentVector attachments = machine.GetMediumAttachments();
@@ -1296 +1296 @@
                 if (attachment.GetType() != KDeviceType_Floppy) continue;
 
-                VBoxMedium medium = vboxGlobal().findMedium (attachment.GetMedium().isNull() ? QString() : attachment.GetMedium().GetId());
+                UIMedium medium = vboxGlobal().findMedium (attachment.GetMedium().isNull() ? QString() : attachment.GetMedium().GetId());
                 if (medium.id() == aMedium.id())
                 {
@@ -1331 +1331 @@
 }
 
-QTreeWidget* VBoxMediaManagerDlg::treeWidget (VBoxDefs::MediumType aType) const
+QTreeWidget* VBoxMediaManagerDlg::treeWidget (UIMediumType aType) const
 {
     QTreeWidget* tree = 0;
     switch (aType)
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
             tree = mTwHD;
             break;
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
             tree = mTwCD;
             break;
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
             tree = mTwFD;
             break;
@@ -1352 +1352 @@
 }
 
-VBoxDefs::MediumType VBoxMediaManagerDlg::currentTreeWidgetType() const
-{
-    VBoxDefs::MediumType type = VBoxDefs::MediumType_Invalid;
+UIMediumType VBoxMediaManagerDlg::currentTreeWidgetType() const
+{
+    UIMediumType type = UIMediumType_Invalid;
     switch (mTabWidget->currentIndex())
     {
         case HDTab:
-            type = VBoxDefs::MediumType_HardDisk;
+            type = UIMediumType_HardDisk;
             break;
         case CDTab:
-            type = VBoxDefs::MediumType_DVD;
+            type = UIMediumType_DVD;
             break;
         case FDTab:
-            type = VBoxDefs::MediumType_Floppy;
+            type = UIMediumType_Floppy;
             break;
         default:
@@ -1439 +1439 @@
 
     /* New and Add are now enabled even when enumerating since it should be safe */
-    bool newEnabled     = currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk;
+    bool newEnabled     = currentTreeWidgetType() == UIMediumType_HardDisk;
     bool addEnabled     = true;
-    bool copyEnabled    = currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk &&
+    bool copyEnabled    = currentTreeWidgetType() == UIMediumType_HardDisk &&
                           notInEnum && item && checkMediumFor (item, Action_Copy);
-    bool modifyEnabled  = currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk &&
+    bool modifyEnabled  = currentTreeWidgetType() == UIMediumType_HardDisk &&
                           notInEnum && item && checkMediumFor (item, Action_Modify);
     bool removeEnabled  = notInEnum && item && checkMediumFor (item, Action_Remove);
@@ -1506 +1506 @@
     else
     {
-        if (currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk)
+        if (currentTreeWidgetType() == UIMediumType_HardDisk)
             doModifyMedium();
     }
@@ -1577 +1577 @@
 }
 
-void VBoxMediaManagerDlg::addMediumToList(const QString &aLocation, VBoxDefs::MediumType aType)
+void VBoxMediaManagerDlg::addMediumToList(const QString &aLocation, UIMediumType aType)
 {
     AssertReturnVoid (!aLocation.isEmpty());
 
-    VBoxMedium medium;
+    UIMedium medium;
     KDeviceType devType;
 
     switch (aType)
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
             devType = KDeviceType_HardDisk;
         break;
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
             devType = KDeviceType_DVD;
         break;
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
             devType = KDeviceType_Floppy;
         break;
@@ -1601 +1601 @@
     CMedium med = mVBox.OpenMedium(aLocation, devType, KAccessMode_ReadWrite, false /* fForceNewUuid */);
     if (mVBox.isOk())
-        medium = VBoxMedium(CMedium(med), aType, KMediumState_Created);
+        medium = UIMedium(CMedium(med), aType, KMediumState_Created);
 
     if (!mVBox.isOk())
@@ -1609 +1609 @@
 }
 
-MediaItem* VBoxMediaManagerDlg::createHardDiskItem (QTreeWidget *aTree, const VBoxMedium &aMedium) const
+MediaItem* VBoxMediaManagerDlg::createHardDiskItem (QTreeWidget *aTree, const UIMedium &aMedium) const
 {
     AssertReturn (!aMedium.medium().isNull(), 0);
@@ -1642 +1642 @@
     switch (aItem->type())
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
             tab = HDTab;
             icon = &mHardDiskIcon;
             inaccessible = &mHardDisksInaccessible;
             break;
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
             tab = CDTab;
             icon = &mDVDImageIcon;
             inaccessible = &mDVDImagesInaccessible;
             break;
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
             tab = FDTab;
             icon = &mFloppyImageIcon;
@@ -1818 +1818 @@
         switch (currentTreeWidgetType())
         {
-            case VBoxDefs::MediumType_HardDisk:
+            case UIMediumType_HardDisk:
             {
                 QList < QPair <QString, QString> > filterList = vboxGlobal().HDDBackends();
@@ -1834 +1834 @@
                 break;
             }
-            case VBoxDefs::MediumType_DVD:
+            case UIMediumType_DVD:
                 err |= (suffix != "iso");
                 break;
-            case VBoxDefs::MediumType_Floppy:
+            case UIMediumType_Floppy:
                 err |= (suffix != "img");
                 break;
             default:
-                AssertMsgFailed (("Selected tree should be equal to one item in VBoxDefs::MediumType.\n"));
+                AssertMsgFailed (("Selected tree should be equal to one item in UIMediumType.\n"));
                 break;
         }
@@ -1853 +1853 @@
     {
         QString file = u.toLocalFile();
-        VBoxDefs::MediumType type = currentTreeWidgetType();
+        UIMediumType type = currentTreeWidgetType();
         addMediumToList (file, type);
     }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.h

@@ -50 +50 @@
     ~VBoxMediaManagerDlg();
 
-    void setup (VBoxDefs::MediumType aType, bool aDoSelect,
+    void setup (UIMediumType aType, bool aDoSelect,
                 bool aRefresh = true,
                 const CMachine &aSessionMachine = CMachine(),
@@ -77 +77 @@
 private slots:
 
-    void mediumAdded (const VBoxMedium &aMedium);
-    void mediumUpdated (const VBoxMedium &aMedium);
-    void mediumRemoved (VBoxDefs::MediumType aType, const QString &aId);
+    void mediumAdded (const UIMedium &aMedium);
+    void mediumUpdated (const UIMedium &aMedium);
+    void mediumRemoved (UIMediumType aType, const QString &aId);
 
     void mediumEnumStarted();
-    void mediumEnumerated (const VBoxMedium &aMedium);
+    void mediumEnumerated (const UIMedium &aMedium);
     void mediumEnumFinished (const VBoxMediaList &aList);
 
@@ -92 +92 @@
     void doReleaseMedium();
 
-    bool releaseMediumFrom (const VBoxMedium &aMedium, const QString &aMachineId);
+    bool releaseMediumFrom (const UIMedium &aMedium, const QString &aMachineId);
 
     void processCurrentChanged (int index = -1);
@@ -106 +106 @@
 private:
 
-    QTreeWidget* treeWidget (VBoxDefs::MediumType aType) const;
-    VBoxDefs::MediumType currentTreeWidgetType() const;
+    QTreeWidget* treeWidget (UIMediumType aType) const;
+    UIMediumType currentTreeWidgetType() const;
     QTreeWidget* currentTreeWidget() const;
 
@@ -115 +115 @@
     void setCurrentItem (QTreeWidget *aTree, QTreeWidgetItem *aItem);
 
-    void addMediumToList (const QString &aLocation, VBoxDefs::MediumType aType);
+    void addMediumToList (const QString &aLocation, UIMediumType aType);
 
-    MediaItem* createHardDiskItem (QTreeWidget *aTree, const VBoxMedium &aMedium) const;
+    MediaItem* createHardDiskItem (QTreeWidget *aTree, const UIMedium &aMedium) const;
 
     void updateTabIcons (MediaItem *aItem, ItemAction aAction);

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

@@ -1358 +1358 @@
 
 bool UIMessageCenter::confirmReleaseMedium(QWidget *pParent,
-                                           const VBoxMedium &aMedium,
+                                           const UIMedium &aMedium,
                                            const QString &strUsage)
 {
@@ -1376 +1376 @@
 
 bool UIMessageCenter::confirmRemoveMedium(QWidget *pParent,
-                                          const VBoxMedium &aMedium)
+                                          const UIMedium &aMedium)
 {
     /** @todo (translation-related): the gender of "the" in translations
@@ -1386 +1386 @@
             .arg(aMedium.location());
 
-    if (aMedium.type() == VBoxDefs::MediumType_HardDisk &&
+    if (aMedium.type() == UIMediumType_HardDisk &&
         aMedium.medium().GetMediumFormat().GetCapabilities() & MediumFormatCapabilities_File)
     {
@@ -1531 +1531 @@
 void UIMessageCenter::cannotDetachDevice(QWidget *pParent,
                                          const CMachine &machine,
-                                         VBoxDefs::MediumType type,
+                                         UIMediumType type,
                                          const QString &strLocation,
                                          const StorageSlot &storageSlot)
@@ -1538 +1538 @@
     switch (type)
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
         {
             strMessage = tr("Failed to detach the hard disk (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1544 +1544 @@
             break;
         }
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
         {
             strMessage = tr("Failed to detach the CD/DVD device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1550 +1550 @@
             break;
         }
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
         {
             strMessage = tr("Failed to detach the floppy device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -1564 +1564 @@
 int UIMessageCenter::cannotRemountMedium(QWidget *pParent,
                                          const CMachine &machine,
-                                         const VBoxMedium &aMedium,
+                                         const UIMedium &aMedium,
                                          bool fMount,
                                          bool fRetry)
@@ -1603 +1603 @@
 void UIMessageCenter::cannotOpenMedium(QWidget *pParent,
                                        const CVirtualBox &vbox,
-                                       VBoxDefs::MediumType type,
+                                       UIMediumType type,
                                        const QString &strLocation)
 {
@@ -1616 +1616 @@
 
 void UIMessageCenter::cannotCloseMedium(QWidget *pParent,
-                                        const VBoxMedium &aMedium,
+                                        const UIMedium &aMedium,
                                         const COMResult &rc)
 {
@@ -1660 +1660 @@
 }
 
-void UIMessageCenter::cannotGetMediaAccessibility(const VBoxMedium &aMedium)
+void UIMessageCenter::cannotGetMediaAccessibility(const UIMedium &aMedium)
 {
     message(qApp->activeWindow(), Error,
@@ -2754 +2754 @@
 
 /* static */
-QString UIMessageCenter::mediumToAccusative(VBoxDefs::MediumType type, bool fIsHostDrive /* = false */)
+QString UIMessageCenter::mediumToAccusative(UIMediumType type, bool fIsHostDrive /* = false */)
 {
     QString strType =
-        type == VBoxDefs::MediumType_HardDisk ?
+        type == UIMediumType_HardDisk ?
             tr("hard disk", "failed to mount ...") :
-        type == VBoxDefs::MediumType_DVD && fIsHostDrive ?
+        type == UIMediumType_DVD && fIsHostDrive ?
             tr("CD/DVD", "failed to mount ... host-drive") :
-        type == VBoxDefs::MediumType_DVD && !fIsHostDrive ?
+        type == UIMediumType_DVD && !fIsHostDrive ?
             tr("CD/DVD image", "failed to mount ...") :
-        type == VBoxDefs::MediumType_Floppy && fIsHostDrive ?
+        type == UIMediumType_Floppy && fIsHostDrive ?
             tr("floppy", "failed to mount ... host-drive") :
-        type == VBoxDefs::MediumType_Floppy && !fIsHostDrive ?
+        type == UIMediumType_Floppy && !fIsHostDrive ?
             tr("floppy image", "failed to mount ...") :
         QString::null;
@@ -2865 +2865 @@
 }
 
-void UIMessageCenter::cannotAttachDevice(const CMachine &machine, VBoxDefs::MediumType type,
+void UIMessageCenter::cannotAttachDevice(const CMachine &machine, UIMediumType type,
                                          const QString &strLocation, const StorageSlot &storageSlot,
                                          QWidget *pParent /* = 0 */)
@@ -3072 +3072 @@
 }
 
-void UIMessageCenter::sltCannotAttachDevice(const CMachine &machine, VBoxDefs::MediumType type,
+void UIMessageCenter::sltCannotAttachDevice(const CMachine &machine, UIMediumType type,
                                             const QString &strLocation, const StorageSlot &storageSlot,
                                             QWidget *pParent)
@@ -3079 +3079 @@
     switch (type)
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
         {
             strMessage = tr("Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -3085 +3085 @@
             break;
         }
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
         {
             strMessage = tr("Failed to attach the CD/DVD device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -3091 +3091 @@
             break;
         }
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
         {
             strMessage = tr("Failed to attach the floppy device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.")
@@ -3211 +3211 @@
     qRegisterMetaType<CConsole>();
     qRegisterMetaType<CHostNetworkInterface>();
-    qRegisterMetaType<VBoxDefs::MediumType>();
+    qRegisterMetaType<UIMediumType>();
     qRegisterMetaType<StorageSlot>();
 
@@ -3227 +3227 @@
             this, SLOT(sltCannotRemoveHostInterface(const CProgress&, const CHostNetworkInterface&, QWidget*)),
             Qt::BlockingQueuedConnection);
-    connect(this, SIGNAL(sigCannotAttachDevice(const CMachine&, VBoxDefs::MediumType, const QString&, const StorageSlot&, QWidget*)),
-            this, SLOT(sltCannotAttachDevice(const CMachine&, VBoxDefs::MediumType, const QString&, const StorageSlot&, QWidget*)),
+    connect(this, SIGNAL(sigCannotAttachDevice(const CMachine&, UIMediumType, const QString&, const StorageSlot&, QWidget*)),
+            this, SLOT(sltCannotAttachDevice(const CMachine&, UIMediumType, const QString&, const StorageSlot&, QWidget*)),
             Qt::BlockingQueuedConnection);
     connect(this, SIGNAL(sigCannotCreateSharedFolder(const CMachine&, const QString&, const QString&, QWidget*)),

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

@@ -25 +25 @@
 
 /* GUI includes: */
-#include "CProgress.h"
 #include "QIMessageBox.h"
+#include "UIMediumDefs.h"
 
 /* COM includes: */
 #include "COMEnums.h"
+#include "CProgress.h"
 
 /* Forward declarations: */
-class VBoxMedium;
+class UIMedium;
 struct StorageSlot;
 #ifdef VBOX_WITH_DRAG_AND_DROP
@@ -259 +260 @@
     void cannotChangeMediumType(QWidget *pParent, const CMedium &medium, KMediumType oldMediumType, KMediumType newMediumType);
 
-    bool confirmReleaseMedium(QWidget *pParent, const VBoxMedium &aMedium,
+    bool confirmReleaseMedium(QWidget *pParent, const UIMedium &aMedium,
                               const QString &strUsage);
 
-    bool confirmRemoveMedium(QWidget *pParent, const VBoxMedium &aMedium);
+    bool confirmRemoveMedium(QWidget *pParent, const UIMedium &aMedium);
 
     void sayCannotOverwriteHardDiskStorage(QWidget *pParent,
@@ -282 +283 @@
                                      const CProgress &progress);
     void cannotDetachDevice(QWidget *pParent, const CMachine &machine,
-                            VBoxDefs::MediumType type, const QString &strLocation, const StorageSlot &storageSlot);
-
-    int cannotRemountMedium(QWidget *pParent, const CMachine &machine, const VBoxMedium &aMedium, bool fMount, bool fRetry);
+                            UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot);
+
+    int cannotRemountMedium(QWidget *pParent, const CMachine &machine, const UIMedium &aMedium, bool fMount, bool fRetry);
     void cannotOpenMedium(QWidget *pParent, const CVirtualBox &vbox,
-                          VBoxDefs::MediumType type, const QString &strLocation);
-    void cannotCloseMedium(QWidget *pParent, const VBoxMedium &aMedium,
+                          UIMediumType type, const QString &strLocation);
+    void cannotCloseMedium(QWidget *pParent, const UIMedium &aMedium,
                            const COMResult &rc);
 
@@ -294 +295 @@
                            const CProgress &progress = CProgress());
 
-    void cannotGetMediaAccessibility(const VBoxMedium &aMedium);
+    void cannotGetMediaAccessibility(const UIMedium &aMedium);
 
     int confirmDeletingHostInterface(const QString &strName, QWidget *pParent = 0);
@@ -391 +392 @@
                           const QString &strErrorMsg) const;
 
-    static QString mediumToAccusative(VBoxDefs::MediumType type, bool fIsHostDrive = false);
+    static QString mediumToAccusative(UIMediumType type, bool fIsHostDrive = false);
 
     static QString formatRC(HRESULT rc);
@@ -422 +423 @@
     void cannotRemoveHostInterface(const CHost &host, const CHostNetworkInterface &iface, QWidget *pParent = 0);
     void cannotRemoveHostInterface(const CProgress &progress, const CHostNetworkInterface &iface, QWidget *pParent = 0);
-    void cannotAttachDevice(const CMachine &machine, VBoxDefs::MediumType type,
+    void cannotAttachDevice(const CMachine &machine, UIMediumType type,
                             const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0);
     void cannotCreateSharedFolder(const CMachine &machine, const QString &strName,
@@ -448 +449 @@
     void sigCannotRemoveHostInterface(const CHost &host, const CHostNetworkInterface &iface, QWidget *pParent);
     void sigCannotRemoveHostInterface(const CProgress &progress, const CHostNetworkInterface &iface, QWidget *pParent);
-    void sigCannotAttachDevice(const CMachine &machine, VBoxDefs::MediumType type,
+    void sigCannotAttachDevice(const CMachine &machine, UIMediumType type,
                                const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent);
     void sigCannotCreateSharedFolder(const CMachine &machine, const QString &strName,
@@ -476 +477 @@
     void sltCannotRemoveHostInterface(const CHost &host, const CHostNetworkInterface &iface, QWidget *pParent);
     void sltCannotRemoveHostInterface(const CProgress &progress, const CHostNetworkInterface &iface, QWidget *pParent);
-    void sltCannotAttachDevice(const CMachine &machine, VBoxDefs::MediumType type,
+    void sltCannotAttachDevice(const CMachine &machine, UIMediumType type,
                                const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent);
     void sltCannotCreateSharedFolder(const CMachine &machine, const QString &strName,

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

@@ -60 +60 @@
 struct VBoxDefs
 {
-    /** Medium type. */
-    enum MediumType
-    {
-        MediumType_Invalid,
-        MediumType_HardDisk,
-        MediumType_DVD,
-        MediumType_Floppy,
-        MediumType_All
-    };
-
     /** VM display rendering mode. */
     enum RenderMode
@@ -192 +182 @@
 };
 
-Q_DECLARE_METATYPE(VBoxDefs::MediumType);
-
 #define MAC_LEOPARD_STYLE defined(Q_WS_MAC) && (QT_VERSION >= 0x040300)
 

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

@@ -176 +176 @@
 
     /** Constructs a regular enum event */
-    VBoxMediaEnumEvent (const VBoxMedium &aMedium,
+    VBoxMediaEnumEvent (const UIMedium &aMedium,
                         VBoxMediaList::iterator &aIterator)
         : QEvent ((QEvent::Type) VBoxDefs::MediaEnumEventType)
@@ -188 +188 @@
 
     /** Last enumerated medium (not valid when #last is true) */
-    const VBoxMedium mMedium;
+    const UIMedium mMedium;
     /** Opaque iterator provided by the event sender (guaranteed to be
      *  the same variable for all media in the single enumeration procedure) */
@@ -1237 +1237 @@
 /**
  * Searches for the given hard disk in the list of known media descriptors and
- * calls VBoxMedium::details() on the found descriptor.
+ * calls UIMedium::details() on the found descriptor.
  *
  * If the requested hard disk is not found (for example, it's a new hard disk
@@ -1248 +1248 @@
  *       succeeds. This (unexpected object uninitialization) is a generic
  *       problem though and needs to be addressed using exceptions (see also the
- *       @todo in VBoxMedium::details()).
+ *       @todo in UIMedium::details()).
  */
 QString VBoxGlobal::details (const CMedium &aMedium, bool aPredictDiff)
 {
     CMedium cmedium (aMedium);
-    VBoxMedium medium;
+    UIMedium medium;
 
     if (!findMedium (cmedium, medium))
@@ -1999 +1999 @@
 static void addNullMediumToList (VBoxMediaList &aList, VBoxMediaList::iterator aWhere)
 {
-    VBoxMedium medium;
+    UIMedium medium;
     aList.insert (aWhere, medium);
 }
@@ -2010 +2010 @@
                               VBoxMediaList &aList,
                               VBoxMediaList::iterator aWhere,
-                              VBoxDefs::MediumType aType,
-                              VBoxMedium *aParent = 0)
+                              UIMediumType aType,
+                              UIMedium *aParent = 0)
 {
     VBoxMediaList::iterator first = aWhere;
@@ -2018 +2018 @@
     {
         CMedium cmedium (*it);
-        VBoxMedium medium (cmedium, aType, aParent);
+        UIMedium medium (cmedium, aType, aParent);
 
         /* Search for a proper alphabetic position */
@@ -2041 +2041 @@
                                 VBoxMediaList &aList,
                                 VBoxMediaList::iterator aWhere,
-                                VBoxMedium *aParent = 0)
+                                UIMedium *aParent = 0)
 {
     VBoxMediaList::iterator first = aWhere;
@@ -2049 +2049 @@
     {
         CMedium cmedium (*it);
-        VBoxMedium medium (cmedium, VBoxDefs::MediumType_HardDisk, aParent);
+        UIMedium medium (cmedium, UIMediumType_HardDisk, aParent);
 
         /* Search for a proper alphabetic position */
@@ -2068 +2068 @@
     {
         CMediumVector children = (*it).medium().GetChildren();
-        VBoxMedium *parent = &(*it);
+        UIMedium *parent = &(*it);
 
         ++ it; /* go to the next sibling before inserting children */
@@ -2120 +2120 @@
     addNullMediumToList (mMediaList, mMediaList.end());
     addHardDisksToList (mVBox.GetHardDisks(), mMediaList, mMediaList.end());
-    addMediumsToList (mHost.GetDVDDrives(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_DVD);
-    addMediumsToList (mVBox.GetDVDImages(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_DVD);
-    addMediumsToList (mHost.GetFloppyDrives(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_Floppy);
-    addMediumsToList (mVBox.GetFloppyImages(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_Floppy);
+    addMediumsToList (mHost.GetDVDDrives(), mMediaList, mMediaList.end(), UIMediumType_DVD);
+    addMediumsToList (mVBox.GetDVDImages(), mMediaList, mMediaList.end(), UIMediumType_DVD);
+    addMediumsToList (mHost.GetFloppyDrives(), mMediaList, mMediaList.end(), UIMediumType_Floppy);
+    addMediumsToList (mVBox.GetFloppyImages(), mMediaList, mMediaList.end(), UIMediumType_Floppy);
 
     /* enumeration thread class */
@@ -2167 +2167 @@
     private:
 
-        QVector <VBoxMedium> mVector;
+        QVector <UIMedium> mVector;
         VBoxMediaList::iterator mSavedIt;
     };
@@ -2198 +2198 @@
 }
 
-VBoxDefs::MediumType VBoxGlobal::mediumTypeToLocal(KDeviceType globalType)
-{
-    switch (globalType)
-    {
-        case KDeviceType_HardDisk:
-            return VBoxDefs::MediumType_HardDisk;
-        case KDeviceType_DVD:
-            return VBoxDefs::MediumType_DVD;
-        case KDeviceType_Floppy:
-            return VBoxDefs::MediumType_Floppy;
-        default:
-            break;
-    }
-    return VBoxDefs::MediumType_Invalid;
-}
-
-KDeviceType VBoxGlobal::mediumTypeToGlobal(VBoxDefs::MediumType localType)
-{
-    switch (localType)
-    {
-        case VBoxDefs::MediumType_HardDisk:
-            return KDeviceType_HardDisk;
-        case VBoxDefs::MediumType_DVD:
-            return KDeviceType_DVD;
-        case VBoxDefs::MediumType_Floppy:
-            return KDeviceType_Floppy;
-        default:
-            break;
-    }
-    return KDeviceType_Null;
-}
-
 /**
  * Adds a new medium to the current media list and emits the #mediumAdded()
@@ -2236 +2204 @@
  * @sa #currentMediaList()
  */
-void VBoxGlobal::addMedium (const VBoxMedium &aMedium)
+void VBoxGlobal::addMedium (const UIMedium &aMedium)
 {
     /* Note that we maintain the same order here as #startEnumeratingMedia() */
@@ -2242 +2210 @@
     VBoxMediaList::iterator it = mMediaList.begin();
 
-    if (aMedium.type() == VBoxDefs::MediumType_HardDisk)
+    if (aMedium.type() == UIMediumType_HardDisk)
     {
         VBoxMediaList::iterator itParent = mMediaList.end();
@@ -2251 +2219 @@
             if ((*it).isNull()) continue;
 
-            if ((*it).type() != VBoxDefs::MediumType_HardDisk)
+            if ((*it).type() != UIMediumType_HardDisk)
                 break;
 
@@ -2283 +2251 @@
 
             /* skip HardDisks that come first */
-            if ((*it).type() == VBoxDefs::MediumType_HardDisk)
+            if ((*it).type() == UIMediumType_HardDisk)
                 continue;
 
             /* skip DVD when inserting Floppy */
-            if (aMedium.type() == VBoxDefs::MediumType_Floppy &&
-                (*it).type() == VBoxDefs::MediumType_DVD)
+            if (aMedium.type() == UIMediumType_Floppy &&
+                (*it).type() == UIMediumType_DVD)
                 continue;
 
             if ((*it).name().localeAwareCompare (aMedium.name()) > 0 ||
-                (aMedium.type() == VBoxDefs::MediumType_DVD &&
-                 (*it).type() == VBoxDefs::MediumType_Floppy))
+                (aMedium.type() == UIMediumType_DVD &&
+                 (*it).type() == UIMediumType_Floppy))
                 break;
         }
@@ -2309 +2277 @@
  * @sa #currentMediaList()
  */
-void VBoxGlobal::updateMedium (const VBoxMedium &aMedium)
+void VBoxGlobal::updateMedium (const UIMedium &aMedium)
 {
     VBoxMediaList::Iterator it;
@@ -2330 +2298 @@
  * @sa #currentMediaList()
  */
-void VBoxGlobal::removeMedium (VBoxDefs::MediumType aType, const QString &aId)
+void VBoxGlobal::removeMedium (UIMediumType aType, const QString &aId)
 {
     VBoxMediaList::Iterator it;
@@ -2348 +2316 @@
 #endif
 
-    VBoxMedium *pParent = (*it).parent();
+    UIMedium *pParent = (*it).parent();
 
     /* remove the medium from the list to keep it in sync with the server "for
@@ -2370 +2338 @@
  *  @return true if found and false otherwise.
  */
-bool VBoxGlobal::findMedium (const CMedium &aObj, VBoxMedium &aMedium) const
+bool VBoxGlobal::findMedium (const CMedium &aObj, UIMedium &aMedium) const
 {
     for (VBoxMediaList::ConstIterator it = mMediaList.begin(); it != mMediaList.end(); ++ it)
@@ -2389 +2357 @@
  *  @return VBoxMedum if found which is invalid otherwise.
  */
-VBoxMedium VBoxGlobal::findMedium (const QString &aMediumId) const
+UIMedium VBoxGlobal::findMedium (const QString &aMediumId) const
 {
     for (VBoxMediaList::ConstIterator it = mMediaList.begin(); it != mMediaList.end(); ++ it)
         if ((*it).id() == aMediumId)
             return *it;
-    return VBoxMedium();
+    return UIMedium();
 }
 
 /* Open some external medium using file open dialog
  * and temporary cache (enumerate) it in GUI inner mediums cache: */
-QString VBoxGlobal::openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent,
+QString VBoxGlobal::openMediumWithFileOpenDialog(UIMediumType mediumType, QWidget *pParent,
                                                  const QString &strDefaultFolder /* = QString() */,
                                                  bool fUseLastFolder /* = false */)
@@ -2413 +2381 @@
     switch (mediumType)
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
         {
             filters = vboxGlobal().HDDBackends();
@@ -2425 +2393 @@
             break;
         }
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
         {
             filters = vboxGlobal().DVDBackends();
@@ -2437 +2405 @@
             break;
         }
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
         {
             filters = vboxGlobal().FloppyBackends();
@@ -2480 +2448 @@
 }
 
-QString VBoxGlobal::openMedium(VBoxDefs::MediumType mediumType, QString strMediumLocation, QWidget *pParent /* = 0*/)
+QString VBoxGlobal::openMedium(UIMediumType mediumType, QString strMediumLocation, QWidget *pParent /* = 0*/)
 {
     /* Convert to native separators: */
@@ -2489 +2457 @@
 
     /* Remember the path of the last chosen medium: */
-    QString strRecentFolderKey = mediumType == VBoxDefs::MediumType_HardDisk ? VBoxDefs::GUI_RecentFolderHD :
-                                 mediumType == VBoxDefs::MediumType_DVD ? VBoxDefs::GUI_RecentFolderCD :
-                                 mediumType == VBoxDefs::MediumType_Floppy ? VBoxDefs::GUI_RecentFolderFD :
+    QString strRecentFolderKey = mediumType == UIMediumType_HardDisk ? VBoxDefs::GUI_RecentFolderHD :
+                                 mediumType == UIMediumType_DVD ? VBoxDefs::GUI_RecentFolderCD :
+                                 mediumType == UIMediumType_Floppy ? VBoxDefs::GUI_RecentFolderFD :
                                  QString();
     vbox.SetExtraData(strRecentFolderKey, QFileInfo(strMediumLocation).absolutePath());
 
     /* Update recently used list: */
-    QString strRecentListKey = mediumType == VBoxDefs::MediumType_HardDisk ? VBoxDefs::GUI_RecentListHD :
-                               mediumType == VBoxDefs::MediumType_DVD ? VBoxDefs::GUI_RecentListCD :
-                               mediumType == VBoxDefs::MediumType_Floppy ? VBoxDefs::GUI_RecentListFD :
+    QString strRecentListKey = mediumType == UIMediumType_HardDisk ? VBoxDefs::GUI_RecentListHD :
+                               mediumType == UIMediumType_DVD ? VBoxDefs::GUI_RecentListCD :
+                               mediumType == UIMediumType_Floppy ? VBoxDefs::GUI_RecentListFD :
                                QString();
     QStringList recentMediumList = vbox.GetExtraData(strRecentListKey).split(';');
@@ -2513 +2481 @@
     {
         /* Prepare vbox medium wrapper: */
-        VBoxMedium vboxMedium;
+        UIMedium vboxMedium;
 
         /* First of all we should test if that medium already opened: */
@@ -2519 +2487 @@
         {
             /* And create new otherwise: */
-            vboxMedium = VBoxMedium(CMedium(comMedium), mediumType, KMediumState_Created);
+            vboxMedium = UIMedium(CMedium(comMedium), mediumType, KMediumState_Created);
             vboxGlobal().addMedium(vboxMedium);
         }
@@ -4699 +4667 @@
     /* Cache IMedium data.
      * There could be no used mediums at all,
-     * but this method should be run anyway just to enumerate null VBoxMedium object,
+     * but this method should be run anyway just to enumerate null UIMedium object,
      * used by some VBox smart widgets, like VBoxMediaComboBox: */
     vboxGlobal().startEnumeratingMedia();

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

@@ -30 +30 @@
 /* GUI includes: */
 #include "VBoxGlobalSettings.h"
-#include "VBoxMedium.h"
+#include "UIMedium.h"
 
 /* COM includes: */
@@ -286 +286 @@
     bool isMediaEnumerationStarted() const { return mMediaEnumThread != NULL; }
 
-    VBoxDefs::MediumType mediumTypeToLocal(KDeviceType globalType);
-    KDeviceType mediumTypeToGlobal(VBoxDefs::MediumType localType);
-
-    void addMedium (const VBoxMedium &);
-    void updateMedium (const VBoxMedium &);
-    void removeMedium (VBoxDefs::MediumType, const QString &);
-
-    bool findMedium (const CMedium &, VBoxMedium &) const;
-    VBoxMedium findMedium (const QString &aMediumId) const;
+    void addMedium (const UIMedium &);
+    void updateMedium (const UIMedium &);
+    void removeMedium (UIMediumType, const QString &);
+
+    bool findMedium (const CMedium &, UIMedium &) const;
+    UIMedium findMedium (const QString &aMediumId) const;
 
     /** Compact version of #findMediumTo(). Asserts if not found. */
-    VBoxMedium getMedium (const CMedium &aObj) const
-    {
-        VBoxMedium medium;
+    UIMedium getMedium (const CMedium &aObj) const
+    {
+        UIMedium medium;
         if (!findMedium (aObj, medium))
             AssertFailed();
@@ -305 +302 @@
     }
 
-    QString openMediumWithFileOpenDialog(VBoxDefs::MediumType mediumType, QWidget *pParent = 0,
+    QString openMediumWithFileOpenDialog(UIMediumType mediumType, QWidget *pParent = 0,
                                          const QString &strDefaultFolder = QString(), bool fUseLastFolder = true);
-    QString openMedium(VBoxDefs::MediumType mediumType, QString strMediumLocation, QWidget *pParent = 0);
+    QString openMedium(UIMediumType mediumType, QString strMediumLocation, QWidget *pParent = 0);
 
     /* Returns the number of current running Fe/Qt4 main windows. */
@@ -428 +425 @@
      * accessibility state.
      */
-    void mediumEnumerated (const VBoxMedium &aMedum);
+    void mediumEnumerated (const UIMedium &aMedum);
 
     /**
@@ -438 +435 @@
 
     /** Emitted when a new media is added using #addMedia(). */
-    void mediumAdded (const VBoxMedium &);
+    void mediumAdded (const UIMedium &);
 
     /** Emitted when the media is updated using #updateMedia(). */
-    void mediumUpdated (const VBoxMedium &);
+    void mediumUpdated (const UIMedium &);
 
     /** Emitted when the media is removed using #removeMedia(). */
-    void mediumRemoved (VBoxDefs::MediumType, const QString &);
+    void mediumRemoved (UIMediumType, const QString &);
 
 #ifdef VBOX_GUI_WITH_SYSTRAY

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

@@ -89 +89 @@
                 strAttData += QString("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
                     .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
-                    .arg(VBoxMedium(attachment.GetMedium(), VBoxDefs::MediumType_HardDisk).location());
+                    .arg(UIMedium(attachment.GetMedium(), UIMediumType_HardDisk).location());
                 fAttachmentsPresent = true;
             }
@@ -155 +155 @@
                 if (attachment.GetType() != KDeviceType_DVD)
                     continue;
-                VBoxMedium vboxMedium(attachment.GetMedium(), VBoxDefs::MediumType_DVD);
+                UIMedium vboxMedium(attachment.GetMedium(), UIMediumType_DVD);
                 strAttData += QString("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
                     .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
@@ -226 +226 @@
                 if (attachment.GetType() != KDeviceType_Floppy)
                     continue;
-                VBoxMedium vboxMedium(attachment.GetMedium(), VBoxDefs::MediumType_Floppy);
+                UIMedium vboxMedium(attachment.GetMedium(), UIMediumType_Floppy);
                 strAttData += QString("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
                     .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))

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

@@ -81 +81 @@
 struct MediumTarget
 {
-    MediumTarget() : name(QString("")), port(0), device(0), id(QString()), type(VBoxDefs::MediumType_Invalid) {}
+    MediumTarget() : name(QString("")), port(0), device(0), id(QString()), type(UIMediumType_Invalid) {}
     MediumTarget(const QString &strName, LONG iPort, LONG iDevice)
-        : name(strName), port(iPort), device(iDevice), id(QString()), type(VBoxDefs::MediumType_Invalid) {}
+        : name(strName), port(iPort), device(iDevice), id(QString()), type(UIMediumType_Invalid) {}
     MediumTarget(const QString &strName, LONG iPort, LONG iDevice, const QString &strId)
-        : name(strName), port(iPort), device(iDevice), id(strId), type(VBoxDefs::MediumType_Invalid) {}
-    MediumTarget(const QString &strName, LONG iPort, LONG iDevice, VBoxDefs::MediumType eType)
+        : name(strName), port(iPort), device(iDevice), id(strId), type(UIMediumType_Invalid) {}
+    MediumTarget(const QString &strName, LONG iPort, LONG iDevice, UIMediumType eType)
         : name(strName), port(iPort), device(iDevice), id(QString()), type(eType) {}
     QString name;
@@ -92 +92 @@
     LONG device;
     QString id;
-    VBoxDefs::MediumType type;
+    UIMediumType type;
 };
 Q_DECLARE_METATYPE(MediumTarget);
@@ -98 +98 @@
 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)
+    RecentMediumTarget() : name(QString("")), port(0), device(0), location(QString()), type(UIMediumType_Invalid) {}
+    RecentMediumTarget(const QString &strName, LONG iPort, LONG iDevice, const QString &strLocation, UIMediumType eType)
         : name(strName), port(iPort), device(iDevice), location(strLocation), type(eType) {}
     QString name;
@@ -105 +105 @@
     LONG device;
     QString location;
-    VBoxDefs::MediumType type;
+    UIMediumType type;
 };
 Q_DECLARE_METATYPE(RecentMediumTarget);
@@ -1123 +1123 @@
 
     /* Determine medium & device types: */
-    VBoxDefs::MediumType mediumType = pMenu == pOpticalDevicesMenu ? VBoxDefs::MediumType_DVD :
-                                      pMenu == pFloppyDevicesMenu  ? VBoxDefs::MediumType_Floppy :
-                                                                     VBoxDefs::MediumType_Invalid;
-    KDeviceType deviceType = vboxGlobal().mediumTypeToGlobal(mediumType);
-    AssertMsg(mediumType != VBoxDefs::MediumType_Invalid, ("Incorrect storage medium type!\n"));
+    UIMediumType mediumType = pMenu == pOpticalDevicesMenu ? UIMediumType_DVD :
+                                      pMenu == pFloppyDevicesMenu  ? UIMediumType_Floppy :
+                                                                     UIMediumType_Invalid;
+    KDeviceType deviceType = mediumTypeToGlobal(mediumType);
+    AssertMsg(mediumType != UIMediumType_Invalid, ("Incorrect storage medium type!\n"));
     AssertMsg(deviceType != KDeviceType_Null, ("Incorrect storage device type!\n"));
 
@@ -1184 +1184 @@
             switch (mediumType)
             {
-                case VBoxDefs::MediumType_DVD:
+                case UIMediumType_DVD:
                     mediums = vboxGlobal().host().GetDVDDrives();
                     strRecentMediumAddress = VBoxDefs::GUI_RecentListCD;
                     break;
-                case VBoxDefs::MediumType_Floppy:
+                case UIMediumType_Floppy:
                     mediums = vboxGlobal().host().GetFloppyDrives();
                     strRecentMediumAddress = VBoxDefs::GUI_RecentListFD;
@@ -1216 +1216 @@
                 if (!fIsHostDriveUsed)
                 {
-                    QAction *pChooseHostDriveAction = pAttachmentMenu->addAction(VBoxMedium(medium, mediumType).name(),
+                    QAction *pChooseHostDriveAction = pAttachmentMenu->addAction(UIMedium(medium, mediumType).name(),
                                                                                  this, SLOT(sltMountStorageMedium()));
                     pChooseHostDriveAction->setCheckable(true);
@@ -1276 +1276 @@
             switch (mediumType)
             {
-                case VBoxDefs::MediumType_DVD:
+                case UIMediumType_DVD:
                     pChooseExistingMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual CD/DVD disk file..."));
                     unmountMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
@@ -1282 +1282 @@
                                                                      ":/cd_unmount_dis_16px.png"));
                     break;
-                case VBoxDefs::MediumType_Floppy:
+                case UIMediumType_Floppy:
                     pChooseExistingMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual floppy disk file..."));
                     unmountMediumAction->setText(QApplication::translate("UIMachineSettingsStorage", "Remove disk from virtual drive"));
@@ -1302 +1302 @@
         switch (mediumType)
         {
-            case VBoxDefs::MediumType_DVD:
+            case UIMediumType_DVD:
                 pEmptyMenuAction->setText(QApplication::translate("UIMachineLogic", "No CD/DVD Devices Attached"));
                 pEmptyMenuAction->setToolTip(QApplication::translate("UIMachineLogic", "No CD/DVD devices attached to that VM"));
                 break;
-            case VBoxDefs::MediumType_Floppy:
+            case UIMediumType_Floppy:
                 pEmptyMenuAction->setText(QApplication::translate("UIMachineLogic", "No Floppy Devices Attached"));
                 pEmptyMenuAction->setToolTip(QApplication::translate("UIMachineLogic", "No floppy devices attached to that VM"));
@@ -1337 +1337 @@
     /* New mount-target attributes: */
     QString newId = QString("");
-    bool fSelectWithMediaManager = target.type != VBoxDefs::MediumType_Invalid;
+    bool fSelectWithMediaManager = target.type != UIMediumType_Invalid;
 
     /* Open Virtual Media Manager to select image id: */
@@ -1371 +1371 @@
     bool fMount = !newId.isEmpty();
 
-    VBoxMedium vmedium = vboxGlobal().findMedium(newId);
+    UIMedium vmedium = vboxGlobal().findMedium(newId);
     CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
 
@@ -1428 +1428 @@
 
         /* Prepare target medium: */
-        const VBoxMedium &vboxMedium = fMount ? vboxGlobal().findMedium(strNewId) : VBoxMedium();
+        const UIMedium &vboxMedium = fMount ? vboxGlobal().findMedium(strNewId) : UIMedium();
         const CMedium &comMedium = fMount ? vboxMedium.medium() : CMedium();
 

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

@@ -399 +399 @@
         if (!vbox.isOk())
         {
-            msgCenter().cannotOpenMedium(0, vbox, VBoxDefs::MediumType_DVD, strSource);
+            msgCenter().cannotOpenMedium(0, vbox, UIMediumType_DVD, strSource);
             return;
         }
@@ -433 +433 @@
         if (!strCntName.isNull())
         {
-            /* Create a new VBoxMedium: */
-            VBoxMedium vboxMedium(image, VBoxDefs::MediumType_DVD, KMediumState_Created);
+            /* Create a new UIMedium: */
+            UIMedium vboxMedium(image, UIMediumType_DVD, KMediumState_Created);
             /* Register it in GUI internal list: */
             vboxGlobal().addMedium(vboxMedium);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -29 +29 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "VBoxMedium.h"
+#include "UIMedium.h"
 #include "UINetworkDefs.h"
 

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

@@ -704 +704 @@
 void AttachmentItem::cache()
 {
-    VBoxMedium medium = vboxGlobal().findMedium (mAttMediumId);
+    UIMedium medium = vboxGlobal().findMedium (mAttMediumId);
 
     /* Cache medium information */
@@ -1699 +1699 @@
     void setId(const QString &strId) { m_strId = strId; emit sigChanged(); }
 
-    VBoxDefs::MediumType type() const { return m_type; }
-    void setType(VBoxDefs::MediumType type) { m_type = type; }
-
-    bool isNull() const { return m_strId == VBoxMedium().id(); }
+    UIMediumType type() const { return m_type; }
+    void setType(UIMediumType type) { m_type = type; }
+
+    bool isNull() const { return m_strId == UIMedium().id(); }
 
 signals:
@@ -1711 +1711 @@
 
     QString m_strId;
-    VBoxDefs::MediumType m_type;
+    UIMediumType m_type;
 };
 
@@ -1832 +1832 @@
 
     /* Setup connections */
-    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const VBoxMedium &)),
-             this, SLOT (mediumUpdated (const VBoxMedium &)));
-    connect (&vboxGlobal(), SIGNAL (mediumUpdated (const VBoxMedium &)),
-             this, SLOT (mediumUpdated (const VBoxMedium &)));
-    connect (&vboxGlobal(), SIGNAL (mediumRemoved (VBoxDefs::MediumType, const QString &)),
-             this, SLOT (mediumRemoved (VBoxDefs::MediumType, const QString &)));
+    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const UIMedium &)),
+             this, SLOT (mediumUpdated (const UIMedium &)));
+    connect (&vboxGlobal(), SIGNAL (mediumUpdated (const UIMedium &)),
+             this, SLOT (mediumUpdated (const UIMedium &)));
+    connect (&vboxGlobal(), SIGNAL (mediumRemoved (UIMediumType, const QString &)),
+             this, SLOT (mediumRemoved (UIMediumType, const QString &)));
     connect (mAddCtrAction, SIGNAL (triggered (bool)), this, SLOT (addController()));
     connect (mAddIDECtrAction, SIGNAL (triggered (bool)), this, SLOT (addIDEController()));
@@ -1944 +1944 @@
                     storageAttachmentData.m_fAttachmentNonRotational = attachment.GetNonRotational();
                     CMedium comMedium(attachment.GetMedium());
-                    VBoxMedium vboxMedium;
+                    UIMedium vboxMedium;
                     vboxGlobal().findMedium(comMedium, vboxMedium);
                     storageAttachmentData.m_strAttachmentMediumId = vboxMedium.id();
@@ -2245 +2245 @@
 }
 
-void UIMachineSettingsStorage::mediumUpdated (const VBoxMedium &aMedium)
+void UIMachineSettingsStorage::mediumUpdated (const UIMedium &aMedium)
 {
     QModelIndex rootIndex = mStorageModel->root();
@@ -2264 +2264 @@
 }
 
-void UIMachineSettingsStorage::mediumRemoved (VBoxDefs::MediumType /* aType */, const QString &aMediumId)
+void UIMachineSettingsStorage::mediumRemoved (UIMediumType /* aType */, const QString &aMediumId)
 {
     QModelIndex rootIndex = mStorageModel->root();
@@ -2276 +2276 @@
             if (attMediumId == aMediumId)
             {
-                mStorageModel->setData (attIndex, VBoxMedium().id(), StorageModel::R_AttMediumId);
+                mStorageModel->setData (attIndex, UIMedium().id(), StorageModel::R_AttMediumId);
                 if (mValidator) mValidator->revalidate();
             }
@@ -2491 +2491 @@
                         break;
                 }
-                m_pMediumIdHolder->setType(vboxGlobal().mediumTypeToLocal(device));
+                m_pMediumIdHolder->setType(mediumTypeToLocal(device));
                 m_pMediumIdHolder->setId(mStorageModel->data(index, StorageModel::R_AttMediumId).toString());
                 mLbMedium->setEnabled(isMachineOffline() || (isMachineOnline() && device != KDeviceType_HardDisk));
@@ -2610 +2610 @@
         switch (m_pMediumIdHolder->type())
         {
-            case VBoxDefs::MediumType_HardDisk:
+            case UIMediumType_HardDisk:
             {
                 /* Add "Create a new virtual hard disk" action: */
@@ -2623 +2623 @@
                 break;
             }
-            case VBoxDefs::MediumType_DVD:
+            case UIMediumType_DVD:
             {
                 /* Add "Choose a virtual CD/DVD disk file" action: */
@@ -2640 +2640 @@
                 break;
             }
-            case VBoxDefs::MediumType_Floppy:
+            case UIMediumType_Floppy:
             {
                 /* Add "Choose a virtual floppy disk file" action: */
@@ -2672 +2672 @@
 void UIMachineSettingsStorage::sltUnmountDevice()
 {
-    m_pMediumIdHolder->setId(VBoxMedium().id());
+    m_pMediumIdHolder->setId(UIMedium().id());
 }
 
@@ -2701 +2701 @@
         /* Get recent medium type & name: */
         QStringList mediumInfoList = pChooseRecentMediumAction->data().toString().split(',');
-        VBoxDefs::MediumType mediumType = (VBoxDefs::MediumType)mediumInfoList[0].toUInt();
+        UIMediumType mediumType = (UIMediumType)mediumInfoList[0].toUInt();
         QString strMediumLocation = mediumInfoList[1];
         QString strMediumId = vboxGlobal().openMedium(mediumType, strMediumLocation, this);
@@ -3038 +3038 @@
                 strMediumId = getWithNewHDWizard();
             else if (iAnswer == QIMessageBox::No)
-                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(VBoxDefs::MediumType_HardDisk, this, strMachineFolder);
+                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_HardDisk, this, strMachineFolder);
             break;
         }
@@ -3045 +3045 @@
             int iAnswer = msgCenter().askAboutOpticalAttachmentCreation(this, strControllerName);
             if (iAnswer == QIMessageBox::Yes)
-                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(VBoxDefs::MediumType_DVD, this, strMachineFolder);
+                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_DVD, this, strMachineFolder);
             else if (iAnswer == QIMessageBox::No)
                 strMediumId = vboxGlobal().findMedium(strMediumId).id();
@@ -3054 +3054 @@
             int iAnswer = msgCenter().askAboutFloppyAttachmentCreation(this, strControllerName);
             if (iAnswer == QIMessageBox::Yes)
-                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(VBoxDefs::MediumType_Floppy, this, strMachineFolder);
+                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_Floppy, this, strMachineFolder);
             else if (iAnswer == QIMessageBox::No)
                 strMediumId = vboxGlobal().findMedium(strMediumId).id();
@@ -3154 +3154 @@
     for (it = mediums.begin(); it != mediums.end(); ++it)
     {
-        const VBoxMedium &medium = *it;
+        const UIMedium &medium = *it;
         if (medium.isHostDrive() && m_pMediumIdHolder->type() == medium.type())
         {
@@ -3164 +3164 @@
 }
 
-void UIMachineSettingsStorage::addRecentMediumActions(QMenu *pOpenMediumMenu, VBoxDefs::MediumType recentMediumType)
+void UIMachineSettingsStorage::addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumType recentMediumType)
 {
     /* Compose recent-medium list address: */
@@ -3170 +3170 @@
     switch (recentMediumType)
     {
-        case VBoxDefs::MediumType_HardDisk:
+        case UIMediumType_HardDisk:
             strRecentMediumAddress = VBoxDefs::GUI_RecentListHD;
             break;
-        case VBoxDefs::MediumType_DVD:
+        case UIMediumType_DVD:
             strRecentMediumAddress = VBoxDefs::GUI_RecentListCD;
             break;
-        case VBoxDefs::MediumType_Floppy:
+        case UIMediumType_Floppy:
             strRecentMediumAddress = VBoxDefs::GUI_RecentListFD;
             break;
@@ -3470 +3470 @@
         bool fAttachmentNonRotational = attachmentData.m_fAttachmentNonRotational;
         /* Get GUI medium object: */
-        VBoxMedium vboxMedium = vboxGlobal().findMedium(strAttachmentMediumId);
+        UIMedium vboxMedium = vboxGlobal().findMedium(strAttachmentMediumId);
         /* Get COM medium object: */
         CMedium comMedium = vboxMedium.medium();
@@ -3512 +3512 @@
             {
                 /* Show error message: */
-                msgCenter().cannotAttachDevice(m_machine, vboxGlobal().mediumTypeToLocal(attachmentDeviceType),
+                msgCenter().cannotAttachDevice(m_machine, mediumTypeToLocal(attachmentDeviceType),
                                                  vboxMedium.location(),
                                                  StorageSlot(controllerBus, iAttachmentPort, iAttachmentDevice), this);
@@ -3554 +3554 @@
         {
             /* Get GUI medium object: */
-            VBoxMedium vboxMedium = vboxGlobal().findMedium(strAttachmentMediumId);
+            UIMedium vboxMedium = vboxGlobal().findMedium(strAttachmentMediumId);
             /* Get COM medium object: */
             CMedium comMedium = vboxMedium.medium();
@@ -3591 +3591 @@
             {
                 /* Show error message: */
-                msgCenter().cannotAttachDevice(m_machine, vboxGlobal().mediumTypeToLocal(attachmentDeviceType),
+                msgCenter().cannotAttachDevice(m_machine, mediumTypeToLocal(attachmentDeviceType),
                                                  vboxMedium.location(),
                                                  StorageSlot(controllerBus, iAttachmentPort, iAttachmentDevice), this);

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

@@ -682 +682 @@
 private slots:
 
-    void mediumUpdated (const VBoxMedium &aMedium);
-    void mediumRemoved (VBoxDefs::MediumType aType, const QString &aMediumId);
+    void mediumUpdated (const UIMedium &aMedium);
+    void mediumRemoved (UIMediumType aType, const QString &aMediumId);
 
     void addController();
@@ -738 +738 @@
     void addChooseExistingMediumAction(QMenu *pOpenMediumMenu, const QString &strActionName);
     void addChooseHostDriveActions(QMenu *pOpenMediumMenu);
-    void addRecentMediumActions(QMenu *pOpenMediumMenu, VBoxDefs::MediumType recentMediumType);
+    void addRecentMediumActions(QMenu *pOpenMediumMenu, UIMediumType recentMediumType);
 
     bool updateStorageData();

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp

@@ -26 +26 @@
 VBoxMediaComboBox::VBoxMediaComboBox (QWidget *aParent)
     : QComboBox (aParent)
-    , mType (VBoxDefs::MediumType_Invalid)
+    , mType (UIMediumType_Invalid)
     , mLastId (QString::null)
     , mShowDiffs (false)
@@ -41 +41 @@
     connect (&vboxGlobal(), SIGNAL (mediumEnumStarted()),
              this, SLOT (mediumEnumStarted()));
-    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const VBoxMedium &)),
-             this, SLOT (mediumEnumerated (const VBoxMedium &)));
+    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const UIMedium &)),
+             this, SLOT (mediumEnumerated (const UIMedium &)));
 
     /* Setup update handlers */
-    connect (&vboxGlobal(), SIGNAL (mediumAdded (const VBoxMedium &)),
-             this, SLOT (mediumAdded (const VBoxMedium &)));
-    connect (&vboxGlobal(), SIGNAL (mediumUpdated (const VBoxMedium &)),
-             this, SLOT (mediumUpdated (const VBoxMedium &)));
-    connect (&vboxGlobal(), SIGNAL (mediumRemoved (VBoxDefs::MediumType, const QString &)),
-             this, SLOT (mediumRemoved (VBoxDefs::MediumType, const QString &)));
+    connect (&vboxGlobal(), SIGNAL (mediumAdded (const UIMedium &)),
+             this, SLOT (mediumAdded (const UIMedium &)));
+    connect (&vboxGlobal(), SIGNAL (mediumUpdated (const UIMedium &)),
+             this, SLOT (mediumUpdated (const UIMedium &)));
+    connect (&vboxGlobal(), SIGNAL (mediumRemoved (UIMediumType, const QString &)),
+             this, SLOT (mediumRemoved (UIMediumType, const QString &)));
 
     /* Setup other connections */
@@ -68 +68 @@
 
     VBoxMediaList list (vboxGlobal().currentMediaList());
-    foreach (VBoxMedium medium, list)
+    foreach (UIMedium medium, list)
         mediumAdded (medium);
 
     /* If at least one real medium present, process null medium */
-    if (count() > 1 && (!mShowNullItem || mType == VBoxDefs::MediumType_HardDisk))
+    if (count() > 1 && (!mShowNullItem || mType == UIMediumType_HardDisk))
     {
         removeItem (0);
@@ -129 +129 @@
 }
 
-void VBoxMediaComboBox::setType (VBoxDefs::MediumType aType)
+void VBoxMediaComboBox::setType (UIMediumType aType)
 {
     mType = aType;
@@ -173 +173 @@
 }
 
-void VBoxMediaComboBox::mediumEnumerated (const VBoxMedium &aMedium)
+void VBoxMediaComboBox::mediumEnumerated (const UIMedium &aMedium)
 {
     mediumUpdated (aMedium);
 }
 
-void VBoxMediaComboBox::mediumAdded (const VBoxMedium &aMedium)
+void VBoxMediaComboBox::mediumAdded (const UIMedium &aMedium)
 {
     if (aMedium.isNull() || aMedium.type() == mType)
     {
-        if (!mShowDiffs && aMedium.type() == VBoxDefs::MediumType_HardDisk)
+        if (!mShowDiffs && aMedium.type() == UIMediumType_HardDisk)
         {
             if (aMedium.parent() != NULL)
@@ -204 +204 @@
 }
 
-void VBoxMediaComboBox::mediumUpdated (const VBoxMedium &aMedium)
+void VBoxMediaComboBox::mediumUpdated (const UIMedium &aMedium)
 {
     if (aMedium.isNull() || aMedium.type() == mType)
@@ -220 +220 @@
 }
 
-void VBoxMediaComboBox::mediumRemoved (VBoxDefs::MediumType aType,
+void VBoxMediaComboBox::mediumRemoved (UIMediumType aType,
                                        const QString &aId)
 {
@@ -235 +235 @@
     /* If no real medium left, add the null medium */
     if (count() == 0)
-        mediumAdded (VBoxMedium());
+        mediumAdded (UIMedium());
 
     /* Emit the signal to ensure the parent dialog handles the change of
@@ -269 +269 @@
 
 
-void VBoxMediaComboBox::appendItem (const VBoxMedium &aMedium)
+void VBoxMediaComboBox::appendItem (const UIMedium &aMedium)
 {
     if (!mShowDiffs && aMedium.parent() != NULL)
@@ -292 +292 @@
 
     mMedia.append (Medium (aMedium.id(), aMedium.location(),
-                           aMedium.toolTipCheckRO (!mShowDiffs, mShowNullItem && mType != VBoxDefs::MediumType_HardDisk)));
+                           aMedium.toolTipCheckRO (!mShowDiffs, mShowNullItem && mType != UIMediumType_HardDisk)));
 
     insertItem (count(), aMedium.iconCheckRO (!mShowDiffs),
@@ -298 +298 @@
 }
 
-void VBoxMediaComboBox::replaceItem (int aIndex, const VBoxMedium &aMedium)
+void VBoxMediaComboBox::replaceItem (int aIndex, const UIMedium &aMedium)
 {
     AssertReturnVoid (aIndex >= 0 && aIndex < mMedia.size());
@@ -304 +304 @@
     mMedia [aIndex].id = aMedium.id();
     mMedia [aIndex].location = aMedium.location();
-    mMedia [aIndex].toolTip = aMedium.toolTipCheckRO (!mShowDiffs, mShowNullItem && mType != VBoxDefs::MediumType_HardDisk);
+    mMedia [aIndex].toolTip = aMedium.toolTipCheckRO (!mShowDiffs, mShowNullItem && mType != UIMediumType_HardDisk);
 
     setItemText (aIndex, aMedium.details (!mShowDiffs));

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.h

@@ -40 +40 @@
     QString id (int = -1) const;
     QString location (int = -1) const;
-    VBoxDefs::MediumType type() const { return mType; }
+    UIMediumType type() const { return mType; }
 
     void setCurrentItem (const QString &aItemId);
-    void setType (VBoxDefs::MediumType aMediumType);
+    void setType (UIMediumType aMediumType);
     void setMachineId (const QString &aMachineId = QString::null);
     void setNullItemPresent (bool aNullItemPresent);
@@ -53 +53 @@
 
     void mediumEnumStarted();
-    void mediumEnumerated (const VBoxMedium &);
+    void mediumEnumerated (const UIMedium &);
 
-    void mediumAdded (const VBoxMedium &);
-    void mediumUpdated (const VBoxMedium &);
-    void mediumRemoved (VBoxDefs::MediumType, const QString &);
+    void mediumAdded (const UIMedium &);
+    void mediumUpdated (const UIMedium &);
+    void mediumRemoved (UIMediumType, const QString &);
 
     void processActivated (int aIndex);
@@ -68 +68 @@
     void updateToolTip (int);
 
-    void appendItem (const VBoxMedium &);
-    void replaceItem (int, const VBoxMedium &);
+    void appendItem (const UIMedium &);
+    void replaceItem (int, const UIMedium &);
 
     bool findMediaIndex (const QString &aId, int &aIndex);
 
-    VBoxDefs::MediumType mType;
+    UIMediumType mType;
 
-    /** Obtruncated VBoxMedium structure. */
+    /** Obtruncated UIMedium structure. */
     struct Medium
     {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp

@@ -37 +37 @@
 {
     /* Get source virtual-disk using file-open dialog: */
-    QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(VBoxDefs::MediumType_HardDisk, thisImp());
+    QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_HardDisk, thisImp());
     if (!strMediumId.isNull())
     {
@@ -68 +68 @@
             {
                 m_pSourceDiskSelector->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
-                m_pSourceDiskSelector->setType(VBoxDefs::MediumType_HardDisk);
+                m_pSourceDiskSelector->setType(UIMediumType_HardDisk);
                 m_pSourceDiskSelector->setCurrentItem(sourceVirtualDisk.GetId());
                 m_pSourceDiskSelector->repopulate();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -53 +53 @@
                 {
                     m_pSourceDiskSelector->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
-                    m_pSourceDiskSelector->setType(VBoxDefs::MediumType_HardDisk);
+                    m_pSourceDiskSelector->setType(UIMediumType_HardDisk);
                     m_pSourceDiskSelector->setCurrentItem(sourceVirtualDisk.GetId());
                     m_pSourceDiskSelector->repopulate();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp

@@ -74 +74 @@
     /* Get chosen 'dvd' medium to mount: */
     QString mediumId = field("id").toString();
-    VBoxMedium vmedium = vboxGlobal().findMedium(mediumId);
+    UIMedium vmedium = vboxGlobal().findMedium(mediumId);
     CMedium medium = vmedium.medium(); // @todo r=dj can this be cached somewhere?
     /* Mount medium to the predefined port/device: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp

@@ -69 +69 @@
             {
                 m_pMediaSelector->setMachineId(strMachineId);
-                m_pMediaSelector->setType(VBoxDefs::MediumType_DVD);
+                m_pMediaSelector->setType(UIMediumType_DVD);
                 m_pMediaSelector->repopulate();
             }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -96 +96 @@
 
     /* Inform everybody there is a new medium: */
-    vboxGlobal().addMedium(VBoxMedium(m_virtualDisk, VBoxDefs::MediumType_HardDisk, KMediumState_Created));
+    vboxGlobal().addMedium(UIMedium(m_virtualDisk, UIMediumType_HardDisk, KMediumState_Created));
 
     return true;

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

@@ -207 +207 @@
             if (!strId.isNull())
             {
-                VBoxMedium vmedium = vboxGlobal().findMedium(strId);
+                UIMedium vmedium = vboxGlobal().findMedium(strId);
                 CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
                 machine.AttachDevice(strHdName, 0, 0, KDeviceType_HardDisk, medium);
                 if (!machine.isOk())
-                    msgCenter().cannotAttachDevice(machine, VBoxDefs::MediumType_HardDisk, field("virtualDiskLocation").toString(),
+                    msgCenter().cannotAttachDevice(machine, UIMediumType_HardDisk, field("virtualDiskLocation").toString(),
                                                    StorageSlot(ctrHdBus, 0, 0), this);
             }
@@ -218 +218 @@
             machine.AttachDevice(strDvdName, 1, 0, KDeviceType_DVD, CMedium());
             if (!machine.isOk())
-                msgCenter().cannotAttachDevice(machine, VBoxDefs::MediumType_DVD, QString(), StorageSlot(strDvdBus, 1, 0), this);
+                msgCenter().cannotAttachDevice(machine, UIMediumType_DVD, QString(), StorageSlot(strDvdBus, 1, 0), this);
 
 
@@ -225 +225 @@
                 machine.AttachDevice(strFloppyName, 0, 0, KDeviceType_Floppy, CMedium());
                 if (!machine.isOk())
-                    msgCenter().cannotAttachDevice(machine, VBoxDefs::MediumType_Floppy, QString(),
+                    msgCenter().cannotAttachDevice(machine, UIMediumType_Floppy, QString(),
                                                    StorageSlot(KStorageBus_Floppy, 0, 0), this);
             }

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

@@ -63 +63 @@
 {
     /* Get opened medium id: */
-    QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(VBoxDefs::MediumType_HardDisk, thisImp());
+    QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_HardDisk, thisImp());
     if (!strMediumId.isNull())
     {
@@ -116 +116 @@
     /* 3rd step: notify GUI about virtual-disk was deleted or show error if any: */
     if (fSuccess)
-        vboxGlobal().removeMedium(VBoxDefs::MediumType_HardDisk, strId);
+        vboxGlobal().removeMedium(UIMediumType_HardDisk, strId);
     else
         msgCenter().cannotDeleteHardDiskStorage(thisImp(), m_virtualDisk, progress);
@@ -141 +141 @@
             m_pDiskSelector = new VBoxMediaComboBox(this);
             {
-                m_pDiskSelector->setType(VBoxDefs::MediumType_HardDisk);
+                m_pDiskSelector->setType(UIMediumType_HardDisk);
                 m_pDiskSelector->repopulate();
             }

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

@@ -110 +110 @@
                 m_pDiskSelector = new VBoxMediaComboBox(m_pDiskCnt);
                 {
-                    m_pDiskSelector->setType(VBoxDefs::MediumType_HardDisk);
+                    m_pDiskSelector->setType(UIMediumType_HardDisk);
                     m_pDiskSelector->repopulate();
                 }