Changeset 23223 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 22, 2009 3:50:03 PM (15 years ago)

Author:

vboxsync

Message:

API: big medium handling change and lots of assorted other cleanups and fixes

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (3 diffs)
• VBoxManage/VBoxInternalManage.cpp (modified) (1 diff)
• VBoxManage/VBoxManage.cpp (modified) (6 diffs)
• VBoxManage/VBoxManageDisk.cpp (modified) (30 diffs)
• VBoxManage/VBoxManageGuestProp.cpp (modified) (1 diff)
• VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManage/VBoxManageInfo.cpp (modified) (7 diffs)
• VBoxManage/VBoxManageList.cpp (modified) (14 diffs)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (24 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (8 diffs)
• VBoxShell/vboxshell.py (modified) (2 diffs)
• VirtualBox/Makefile.kmk (modified) (4 diffs)
• VirtualBox/VBoxUI.pro (modified) (1 diff)
• VirtualBox/VirtualBox.qrc (modified) (1 diff)
• VirtualBox/include/COMWrappers.xsl (modified) (43 diffs)
• VirtualBox/include/QILabelSeparator.h (modified) (4 diffs)
• VirtualBox/include/VBoxConsoleView.h (modified) (1 diff)
• VirtualBox/include/VBoxConsoleWnd.h (modified) (2 diffs)
• VirtualBox/include/VBoxDefs.h (modified) (1 diff)
• VirtualBox/include/VBoxGlobal.h (modified) (9 diffs)
• VirtualBox/include/VBoxMediaComboBox.h (modified) (4 diffs)
• VirtualBox/include/VBoxMediaManagerDlg.h (modified) (4 diffs)
• VirtualBox/include/VBoxMedium.h (modified) (13 diffs)
• VirtualBox/include/VBoxNewHDWzd.h (modified) (2 diffs)
• VirtualBox/include/VBoxNewVMWzd.h (modified) (1 diff)
• VirtualBox/include/VBoxProblemReporter.h (modified) (3 diffs)
• VirtualBox/include/VBoxToolBar.h (modified) (4 diffs)
• VirtualBox/include/VBoxVMFirstRunWzd.h (modified) (1 diff)
• VirtualBox/include/VBoxVMSettingsCD.h (deleted)
• VirtualBox/include/VBoxVMSettingsFD.h (deleted)
• VirtualBox/include/VBoxVMSettingsHD.h (modified) (5 diffs)
• VirtualBox/src/QILabelSeparator.cpp (modified) (6 diffs)
• VirtualBox/src/VBoxConsoleView.cpp (modified) (3 diffs)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (20 diffs)
• VirtualBox/src/VBoxGlobal.cpp (modified) (35 diffs)
• VirtualBox/src/VBoxMediaComboBox.cpp (modified) (5 diffs)
• VirtualBox/src/VBoxMediaManagerDlg.cpp (modified) (46 diffs)
• VirtualBox/src/VBoxMedium.cpp (modified) (14 diffs)
• VirtualBox/src/VBoxNewHDWzd.cpp (modified) (5 diffs)
• VirtualBox/src/VBoxNewVMWzd.cpp (modified) (4 diffs)
• VirtualBox/src/VBoxProblemReporter.cpp (modified) (7 diffs)
• VirtualBox/src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxSettingsDialogSpecific.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxSettingsSelector.cpp (modified) (1 diff)
• VirtualBox/src/VBoxVMFirstRunWzd.cpp (modified) (10 diffs)
• VirtualBox/src/VBoxVMInformationDlg.cpp (modified) (6 diffs)
• VirtualBox/src/VBoxVMSettingsCD.cpp (deleted)
• VirtualBox/src/VBoxVMSettingsFD.cpp (deleted)
• VirtualBox/src/VBoxVMSettingsHD.cpp (modified) (7 diffs)
• VirtualBox/ui/VBoxMediaManagerDlg.ui (modified) (1 diff)
• VirtualBox/ui/VBoxVMSettingsCD.ui (deleted)
• VirtualBox/ui/VBoxVMSettingsFD.ui (deleted)
• VirtualBox/ui/VBoxVMSettingsHD.ui (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -179 +179 @@
     }
 
-    STDMETHOD(OnDVDDriveChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnFloppyDriveChange)()
-    {
-        return S_OK;
-    }
-
     STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
     {
@@ -215 +205 @@
 
     STDMETHOD(OnStorageControllerChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnMediumChange)(IMediumAttachment * /* aMediumAttachment */)
     {
         return S_OK;
@@ -916 +911 @@
 
         Event *e;
-        
+
         while (gEventQ->waitForEvent (&e) && e)
           gEventQ->handleEvent (e);

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -1352 +1352 @@
     if (fRegister)
     {
-        ComPtr<IHardDisk> hardDisk;
+        ComPtr<IMedium> hardDisk;
         CHECK_ERROR(aVirtualBox, OpenHardDisk(filename, AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), hardDisk.asOutParam()));
     }

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -1142 +1142 @@
                 break;
             }
-            ComPtr<IDVDDrive> dvdDrive;
-            sessionMachine->COMGETTER(DVDDrive)(dvdDrive.asOutParam());
-            ASSERT(dvdDrive);
+
+            ComPtr<IMedium> dvdMedium;
 
             /* unmount? */
             if (!strcmp(a->argv[2], "none"))
             {
-                CHECK_ERROR(dvdDrive, Unmount());
+                /* nothing to do, NULL object will cause unmount */
             }
             /* host drive? */
@@ -1156 +1155 @@
                 ComPtr<IHost> host;
                 CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-                com::SafeIfaceArray <IHostDVDDrive> hostDVDs;
-                rc = host->COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(hostDVDs));
-
-                ComPtr<IHostDVDDrive> hostDVDDrive;
-                rc = host->FindHostDVDDrive(Bstr(a->argv[2] + 5), hostDVDDrive.asOutParam());
-                if (!hostDVDDrive)
-                {
-                    errorArgument("Invalid host DVD drive name");
+
+                rc = host->FindHostDVDDrive(Bstr(a->argv[2] + 5), dvdMedium.asOutParam());
+                if (!dvdMedium)
+                {
+                    errorArgument("Invalid host DVD drive name \"%s\"",
+                                  a->argv[2] + 5);
                     rc = E_FAIL;
                     break;
                 }
-                CHECK_ERROR(dvdDrive, CaptureHostDrive(hostDVDDrive));
             }
             else
@@ -1173 +1169 @@
                 /* first assume it's a UUID */
                 Bstr uuid(a->argv[2]);
-                ComPtr<IDVDImage> dvdImage;
-                rc = a->virtualBox->GetDVDImage(uuid, dvdImage.asOutParam());
-                if (FAILED(rc) || !dvdImage)
+                rc = a->virtualBox->GetDVDImage(uuid, dvdMedium.asOutParam());
+                if (FAILED(rc) || !dvdMedium)
                 {
                     /* must be a filename, check if it's in the collection */
-                    rc = a->virtualBox->FindDVDImage(Bstr(a->argv[2]), dvdImage.asOutParam());
+                    rc = a->virtualBox->FindDVDImage(Bstr(a->argv[2]), dvdMedium.asOutParam());
                     /* not registered, do that on the fly */
-                    if (!dvdImage)
+                    if (!dvdMedium)
                     {
                         Bstr emptyUUID;
-                        CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(a->argv[2]), emptyUUID, dvdImage.asOutParam()));
+                        CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(a->argv[2]), emptyUUID, dvdMedium.asOutParam()));
                     }
                 }
-                if (!dvdImage)
+                if (!dvdMedium)
                 {
                     rc = E_FAIL;
                     break;
                 }
-                dvdImage->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(dvdDrive, MountImage(uuid));
-            }
+            }
+
+            /** @todo generalize this, allow arbitrary number of DVD drives
+             * and as a consequence multiple attachments and different
+             * storage controllers. */
+            if (dvdMedium)
+                dvdMedium->COMGETTER(Id)(uuid.asOutParam());
+            else
+                uuid = Guid().toString();
+            CHECK_ERROR(machine, MountMedium(Bstr("IDE"), 1, 0, uuid));
         }
         else if (!strcmp(a->argv[1], "floppyattach"))
@@ -1204 +1206 @@
             }
 
-            ComPtr<IFloppyDrive> floppyDrive;
-            sessionMachine->COMGETTER(FloppyDrive)(floppyDrive.asOutParam());
-            ASSERT(floppyDrive);
+            ComPtr<IMedium> floppyMedium;
 
             /* unmount? */
             if (!strcmp(a->argv[2], "none"))
             {
-                CHECK_ERROR(floppyDrive, Unmount());
+                /* nothing to do, NULL object will cause unmount */
             }
             /* host drive? */
@@ -1218 +1218 @@
                 ComPtr<IHost> host;
                 CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-                com::SafeIfaceArray <IHostFloppyDrive> hostFloppies;
-                rc = host->COMGETTER(FloppyDrives)(ComSafeArrayAsOutParam(hostFloppies));
-                CheckComRCReturnRC (rc);
-                ComPtr<IHostFloppyDrive> hostFloppyDrive;
-                host->FindHostFloppyDrive(Bstr(a->argv[2] + 5), hostFloppyDrive.asOutParam());
-                if (!hostFloppyDrive)
-                {
-                    errorArgument("Invalid host floppy drive name");
+                host->FindHostFloppyDrive(Bstr(a->argv[2] + 5), floppyMedium.asOutParam());
+                if (!floppyMedium)
+                {
+                    errorArgument("Invalid host floppy drive name \"%s\"",
+                                  a->argv[2] + 5);
                     rc = E_FAIL;
                     break;
                 }
-                CHECK_ERROR(floppyDrive, CaptureHostDrive(hostFloppyDrive));
             }
             else
@@ -1235 +1231 @@
                 /* first assume it's a UUID */
                 Bstr uuid(a->argv[2]);
-                ComPtr<IFloppyImage> floppyImage;
-                rc = a->virtualBox->GetFloppyImage(uuid, floppyImage.asOutParam());
-                if (FAILED(rc) || !floppyImage)
+                rc = a->virtualBox->GetFloppyImage(uuid, floppyMedium.asOutParam());
+                if (FAILED(rc) || !floppyMedium)
                 {
                     /* must be a filename, check if it's in the collection */
-                    rc = a->virtualBox->FindFloppyImage(Bstr(a->argv[2]), floppyImage.asOutParam());
+                    rc = a->virtualBox->FindFloppyImage(Bstr(a->argv[2]), floppyMedium.asOutParam());
                     /* not registered, do that on the fly */
-                    if (!floppyImage)
+                    if (!floppyMedium)
                     {
                         Bstr emptyUUID;
-                        CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(a->argv[2]), emptyUUID, floppyImage.asOutParam()));
+                        CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(a->argv[2]), emptyUUID, floppyMedium.asOutParam()));
                     }
                 }
-                if (!floppyImage)
+                if (!floppyMedium)
                 {
                     rc = E_FAIL;
                     break;
                 }
-                floppyImage->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(floppyDrive, MountImage(uuid));
-            }
+            }
+            floppyMedium->COMGETTER(Id)(uuid.asOutParam());
+            CHECK_ERROR(machine, MountMedium(Bstr("FD"), 0, 0, uuid));
         }
 #ifdef VBOX_WITH_MEM_BALLOONING

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -59 +59 @@
 
 
-static int parseDiskVariant(const char *psz, HardDiskVariant_T *pDiskVariant)
+static int parseDiskVariant(const char *psz, MediumVariant_T *pDiskVariant)
 {
     int rc = VINF_SUCCESS;
@@ -76 +76 @@
             // variant, whereas the other flags are cumulative.
             if (!RTStrNICmp(psz, "standard", len))
-                DiskVariant = HardDiskVariant_Standard;
+                DiskVariant = MediumVariant_Standard;
             else if (   !RTStrNICmp(psz, "fixed", len)
                      || !RTStrNICmp(psz, "static", len))
-                DiskVariant |= HardDiskVariant_Fixed;
+                DiskVariant |= MediumVariant_Fixed;
             else if (!RTStrNICmp(psz, "Diff", len))
-                DiskVariant |= HardDiskVariant_Diff;
+                DiskVariant |= MediumVariant_Diff;
             else if (!RTStrNICmp(psz, "split2g", len))
-                DiskVariant |= HardDiskVariant_VmdkSplit2G;
+                DiskVariant |= MediumVariant_VmdkSplit2G;
             else if (   !RTStrNICmp(psz, "stream", len)
                      || !RTStrNICmp(psz, "streamoptimized", len))
-                DiskVariant |= HardDiskVariant_VmdkStreamOptimized;
+                DiskVariant |= MediumVariant_VmdkStreamOptimized;
             else if (!RTStrNICmp(psz, "esx", len))
-                DiskVariant |= HardDiskVariant_VmdkESX;
+                DiskVariant |= MediumVariant_VmdkESX;
             else
                 rc = VERR_PARSE_ERROR;
@@ -99 +99 @@
 
     if (RT_SUCCESS(rc))
-        *pDiskVariant = (HardDiskVariant_T)DiskVariant;
+        *pDiskVariant = (MediumVariant_T)DiskVariant;
     return rc;
 }
 
-static int parseDiskType(const char *psz, HardDiskType_T *pDiskType)
+static int parseDiskType(const char *psz, MediumType_T *pDiskType)
 {
     int rc = VINF_SUCCESS;
-    HardDiskType_T DiskType = HardDiskType_Normal;
+    MediumType_T DiskType = MediumType_Normal;
     if (!RTStrICmp(psz, "normal"))
-        DiskType = HardDiskType_Normal;
+        DiskType = MediumType_Normal;
     else if (!RTStrICmp(psz, "immutable"))
-        DiskType = HardDiskType_Immutable;
+        DiskType = MediumType_Immutable;
     else if (!RTStrICmp(psz, "writethrough"))
-        DiskType = HardDiskType_Writethrough;
+        DiskType = MediumType_Writethrough;
     else
         rc = VERR_PARSE_ERROR;
@@ -178 +178 @@
     uint64_t sizeMB = 0;
     Bstr format = "VDI";
-    HardDiskVariant_T DiskVariant = HardDiskVariant_Standard;
+    MediumVariant_T DiskVariant = MediumVariant_Standard;
     Bstr comment;
     bool fRemember = false;
-    HardDiskType_T DiskType = HardDiskType_Normal;
+    MediumType_T DiskType = MediumType_Normal;
 
     int c;
@@ -207 +207 @@
             {
                 unsigned uDiskVariant = (unsigned)DiskVariant;
-                uDiskVariant |= HardDiskVariant_Fixed;
-                DiskVariant = (HardDiskVariant_T)uDiskVariant;
+                uDiskVariant |= MediumVariant_Fixed;
+                DiskVariant = (MediumVariant_T)uDiskVariant;
                 break;
             }
@@ -229 +229 @@
                 vrc = parseDiskType(ValueUnion.psz, &DiskType);
                 if (    RT_FAILURE(vrc)
-                    ||  (DiskType != HardDiskType_Normal && DiskType != HardDiskType_Writethrough))
+                    ||  (DiskType != MediumType_Normal && DiskType != MediumType_Writethrough))
                     return errorArgument("Invalid hard disk type '%s'", ValueUnion.psz);
                 break;
@@ -257 +257 @@
         return errorSyntax(USAGE_CREATEHD, "Parameters --filename and --size are required");
 
-    ComPtr<IHardDisk> hardDisk;
+    ComPtr<IMedium> hardDisk;
     CHECK_ERROR(a->virtualBox, CreateHardDisk(format, filename, hardDisk.asOutParam()));
     if (SUCCEEDED(rc) && hardDisk)
@@ -294 +294 @@
                     CHECK_ERROR(hardDisk, COMGETTER(Id)(uuid.asOutParam()));
 
-                    if (DiskType == HardDiskType_Writethrough)
+                    if (DiskType == MediumType_Writethrough)
                     {
-                        CHECK_ERROR(hardDisk, COMSETTER(Type)(HardDiskType_Writethrough));
+                        CHECK_ERROR(hardDisk, COMSETTER(Type)(MediumType_Writethrough));
                     }
 
@@ -346 +346 @@
     HRESULT rc;
     int vrc;
-    ComPtr<IHardDisk> hardDisk;
-    HardDiskType_T DiskType;
+    ComPtr<IMedium> hardDisk;
+    MediumType_T DiskType;
     bool AutoReset = false;
     bool fModifyDiskType = false, fModifyAutoReset = false, fModifyCompact = false;;
@@ -425 +425 @@
         if (SUCCEEDED(rc) && hardDisk)
         {
-            HardDiskType_T hddType;
+            MediumType_T hddType;
             CHECK_ERROR(hardDisk, COMGETTER(Type)(&hddType));
 
@@ -518 +518 @@
     Bstr src, dst;
     Bstr format;
-    HardDiskVariant_T DiskVariant = HardDiskVariant_Standard;
+    MediumVariant_T DiskVariant = MediumVariant_Standard;
     bool fExisting = false;
     bool fRemember = false;
     bool fSetDiskType = false;
-    HardDiskType_T DiskType = HardDiskType_Normal;
+    MediumType_T DiskType = MediumType_Normal;
 
     int c;
@@ -540 +540 @@
             {
                 unsigned uDiskVariant = (unsigned)DiskVariant;
-                uDiskVariant |= HardDiskVariant_Fixed;
-                DiskVariant = (HardDiskVariant_T)uDiskVariant;
+                uDiskVariant |= MediumVariant_Fixed;
+                DiskVariant = (MediumVariant_T)uDiskVariant;
                 break;
             }
@@ -596 +596 @@
     if (dst.isEmpty())
         return errorSyntax(USAGE_CLONEHD, "Mandatory output file parameter missing");
-    if (fExisting && (!format.isEmpty() || DiskVariant != HardDiskType_Normal))
+    if (fExisting && (!format.isEmpty() || DiskVariant != MediumType_Normal))
         return errorSyntax(USAGE_CLONEHD, "Specified options which cannot be used with --existing");
 
-    ComPtr<IHardDisk> srcDisk;
-    ComPtr<IHardDisk> dstDisk;
+    ComPtr<IMedium> srcDisk;
+    ComPtr<IMedium> dstDisk;
     bool fSrcUnknown = false;
     bool fDstUnknown = false;
@@ -668 +668 @@
             {
                 /* Perform accessibility check now. */
-                MediaState_T state;
+                MediumState_T state;
                 CHECK_ERROR_BREAK(dstDisk, COMGETTER(State)(&state));
             }
@@ -760 +760 @@
 
             case 'm':   // --variant
-                HardDiskVariant_T DiskVariant;
+                MediumVariant_T DiskVariant;
                 rc = parseDiskVariant(ValueUnion.psz, &DiskVariant);
                 if (RT_FAILURE(rc))
@@ -950 +950 @@
     Bstr comment;
     bool fIntNet = false;
-    HardDiskType_T DiskType = HardDiskType_Normal;
+    MediumType_T DiskType = MediumType_Normal;
 
     int c;
@@ -1029 +1029 @@
     do
     {
-        ComPtr<IHardDisk> hardDisk;
+        ComPtr<IMedium> hardDisk;
         /** @todo move the location stuff to Main, which can use pfnComposeName
          * from the disk backends to construct the location properly. Also do
@@ -1096 +1096 @@
                            ComSafeArrayAsInParam (values)));
 
-        if (DiskType != HardDiskType_Normal)
+        if (DiskType != MediumType_Normal)
         {
             CHECK_ERROR(hardDisk, COMSETTER(Type)(DiskType));
@@ -1157 +1157 @@
         return errorSyntax(USAGE_SHOWHDINFO, "Disk name or UUID required");
 
-    ComPtr<IHardDisk> hardDisk;
+    ComPtr<IMedium> hardDisk;
     bool unknown = false;
     /* first guess is that it's a UUID */
@@ -1200 +1200 @@
         /// @todo NEWMEDIA check accessibility of all parents
         /// @todo NEWMEDIA print the full state value
-        MediaState_T state;
+        MediumState_T state;
         CHECK_ERROR_BREAK (hardDisk, COMGETTER(State)(&state));
-        RTPrintf("Accessible:           %s\n", state != MediaState_Inaccessible ? "yes" : "no");
-
-        if (state == MediaState_Inaccessible)
+        RTPrintf("Accessible:           %s\n", state != MediumState_Inaccessible ? "yes" : "no");
+
+        if (state == MediumState_Inaccessible)
         {
             Bstr err;
@@ -1225 +1225 @@
         RTPrintf("Current size on disk: %llu MBytes\n", actualSize >> 20);
 
-        ComPtr <IHardDisk> parent;
+        ComPtr <IMedium> parent;
         hardDisk->COMGETTER(Parent) (parent.asOutParam());
 
-        HardDiskType_T type;
+        MediumType_T type;
         hardDisk->COMGETTER(Type)(&type);
         const char *typeStr = "unknown";
         switch (type)
         {
-            case HardDiskType_Normal:
+            case MediumType_Normal:
                 if (!parent.isNull())
                     typeStr = "normal (differencing)";
@@ -1239 +1239 @@
                     typeStr = "normal (base)";
                 break;
-            case HardDiskType_Immutable:
+            case MediumType_Immutable:
                 typeStr = "immutable";
                 break;
-            case HardDiskType_Writethrough:
+            case MediumType_Writethrough:
                 typeStr = "writethrough";
                 break;
@@ -1317 +1317 @@
     } cmd = CMD_NONE;
     const char *Filename = NULL;
-    HardDiskType_T DiskType = HardDiskType_Normal;
+    MediumType_T DiskType = MediumType_Normal;
     bool fDiskType = false;
     bool fSetImageId = false;
@@ -1409 +1409 @@
     if (cmd == CMD_DISK)
     {
-        ComPtr<IHardDisk> hardDisk;
+        ComPtr<IMedium> hardDisk;
         Bstr ImageIdStr = BstrFmt("%RTuuid", &ImageId);
         Bstr ParentIdStr = BstrFmt("%RTuuid", &ParentId);
@@ -1429 +1429 @@
         {
             /* change the type if requested */
-            if (DiskType != HardDiskType_Normal)
+            if (DiskType != MediumType_Normal)
             {
                 CHECK_ERROR(hardDisk, COMSETTER(Type)(DiskType));
@@ -1439 +1439 @@
         if (fDiskType || fSetImageId || fSetParentId)
             return errorSyntax(USAGE_OPENMEDIUM, "Invalid option for DVD images");
-        ComPtr<IDVDImage> dvdImage;
+        ComPtr<IMedium> dvdImage;
         rc = a->virtualBox->OpenDVDImage(Bstr(Filename), Bstr(), dvdImage.asOutParam());
         if (rc == VBOX_E_FILE_ERROR)
@@ -1459 +1459 @@
         if (fDiskType || fSetImageId || fSetParentId)
             return errorSyntax(USAGE_OPENMEDIUM, "Invalid option for floppy images");
-        ComPtr<IFloppyImage> floppyImage;
+        ComPtr<IMedium> floppyImage;
          rc = a->virtualBox->OpenFloppyImage(Bstr(Filename), Bstr(), floppyImage.asOutParam());
         if (rc == VBOX_E_FILE_ERROR)
@@ -1559 +1559 @@
     if (cmd == CMD_DISK)
     {
-        ComPtr<IHardDisk> hardDisk;
+        ComPtr<IMedium> hardDisk;
         rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
         /* not a UUID or not registered? Then it must be a filename */
@@ -1574 +1574 @@
     if (cmd == CMD_DVD)
     {
-        ComPtr<IDVDImage> dvdImage;
+        ComPtr<IMedium> dvdImage;
         rc = a->virtualBox->GetDVDImage(uuid, dvdImage.asOutParam());
         /* not a UUID or not registered? Then it must be a filename */
@@ -1589 +1589 @@
     if (cmd == CMD_FLOPPY)
     {
-        ComPtr<IFloppyImage> floppyImage;
+        ComPtr<IMedium> floppyImage;
         rc = a->virtualBox->GetFloppyImage(uuid, floppyImage.asOutParam());
         /* not a UUID or not registered? Then it must be a filename */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

@@ -118 +118 @@
     }
 
-    STDMETHOD(OnMediaRegistered)(IN_BSTR mediaId,
-                                 DeviceType_T mediaType, BOOL registered)
+    STDMETHOD(OnMediumRegistered)(IN_BSTR mediaId,
+                                  DeviceType_T mediaType, BOOL registered)
     {
         NOREF(mediaId);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -164 +164 @@
                  "                            [--dvd none|<uuid>|<filename>|host:<drive>]\n"
                  "                            [--dvdpassthrough on|off]\n"
-                 "                            [--floppy disabled|empty|<uuid>|\n"
+                 "                            [--floppy disabled|none|<uuid>|\n"
                  "                                      <filename>|host:<drive>]\n"
 #if defined(VBOX_WITH_NETFLT)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -443 +443 @@
 #endif
 
-    ComPtr<IFloppyDrive> floppyDrive;
-    rc = machine->COMGETTER(FloppyDrive)(floppyDrive.asOutParam());
-    if (SUCCEEDED(rc) && floppyDrive)
-    {
-        BOOL fFloppyEnabled;
-        floppyDrive->COMGETTER(Enabled)(&fFloppyEnabled);
-        Utf8Str pszFloppy = "invalid";
-        if (fFloppyEnabled)
-        {
-            DriveState_T floppyState;
-            floppyDrive->COMGETTER(State)(&floppyState);
-            switch (floppyState)
-            {
-                case DriveState_ImageMounted:
+    /*
+     * Floppy.
+     */
+    ComPtr<IStorageController> FloppyCtl;
+    bool                       fFloppyEnabled = false;
+
+    rc = machine->GetStorageControllerByName(Bstr("FD"), FloppyCtl.asOutParam());
+    if (SUCCEEDED(rc))
+        fFloppyEnabled = true;
+
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("floppy=\"%s\"\n", fFloppyEnabled ? "on" : "off");
+    else
+        RTPrintf("Floppy:          %s\n", fFloppyEnabled ? "enabled" : "disabled");
+
+    /*
+     * Floppy drives and media
+     */
+    if (fFloppyEnabled)
+    {
+        ComPtr<IMedium> floppyMedium;
+        Bstr  filePath;
+        ULONG cFloppyPorts;
+
+        FloppyCtl->COMGETTER(PortCount)(&cFloppyPorts);
+        for (ULONG i = 0; i < cFloppyPorts; ++ i)
+        {
+            rc = machine->GetMedium(Bstr("FD"), 0, i, floppyMedium.asOutParam());
+            if (SUCCEEDED(rc) && floppyMedium)
+            {
+                floppyMedium->COMGETTER(Location)(filePath.asOutParam());
+                floppyMedium->COMGETTER(Id)(uuid.asOutParam());
+                if (details == VMINFO_MACHINEREADABLE)
                 {
-                    ComPtr<IFloppyImage> floppyImage;
-                    rc = floppyDrive->GetImage(floppyImage.asOutParam());
-                    if (SUCCEEDED(rc) && floppyImage)
-                    {
-                        Bstr imagePath;
-                        floppyImage->COMGETTER(Location)(imagePath.asOutParam());
-                        Bstr imageGuid;
-                        floppyImage->COMGETTER(Id)(imageGuid.asOutParam());
-                        if (details == VMINFO_MACHINEREADABLE)
-                        {
-                            RTPrintf("FloppyImageUUID=\"%s\"\n", Utf8Str(imageGuid).raw());
-                            pszFloppy = Utf8StrFmt("%lS", imagePath.raw());
-                        }
-                        else
-                            pszFloppy = Utf8StrFmt("%lS (UUID: %s)", imagePath.raw(), Utf8Str(imageGuid).raw());
-                    }
-                    break;
+                    RTPrintf("floppy%d=\"%lS\"\n", i, filePath.raw());
+                    RTPrintf("FloppyImageUUID%d=\"%s\"\n", i, Utf8Str(uuid).raw());
                 }
-
-                case DriveState_HostDriveCaptured:
-                {
-                    ComPtr<IHostFloppyDrive> hostFloppyDrive;
-                    rc = floppyDrive->GetHostDrive(hostFloppyDrive.asOutParam());
-                    if (SUCCEEDED(rc) && floppyDrive)
-                    {
-                        Bstr driveName;
-                        hostFloppyDrive->COMGETTER(Name)(driveName.asOutParam());
-                        if (details == VMINFO_MACHINEREADABLE)
-                            pszFloppy = Utf8StrFmt("host:%lS", driveName.raw());
-                        else
-                            pszFloppy = Utf8StrFmt("Host drive %lS", driveName.raw());
-                    }
-                    break;
-                }
-
-                case DriveState_NotMounted:
-                {
-                    pszFloppy = "empty";
-                    break;
-                }
-            }
-        }
-        else
-        {
-            pszFloppy = "disabled";
-        }
-        if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("floppy=\"%s\"\n", pszFloppy.raw());
-        else
-            RTPrintf("Floppy:          %s\n", pszFloppy.raw());
+                else
+                    RTPrintf("Floppy %d:        %lS (UUID: %s)\n", i, filePath.raw(), Utf8Str(uuid).raw());
+            }
+            else
+            {
+                if (details == VMINFO_MACHINEREADABLE)
+                    RTPrintf("floppy%d=\"none\"\n",i);
+            }
+        }
     }
 
@@ -533 +514 @@
     if (fSataEnabled)
     {
-        ComPtr<IHardDisk> hardDisk;
+        ComPtr<IMedium> hardDisk;
         Bstr  filePath;
         ULONG cSataPorts;
@@ -540 +521 @@
         for (ULONG i = 0; i < cSataPorts; ++ i)
         {
-            rc = machine->GetHardDisk(Bstr("SATA"), i, 0, hardDisk.asOutParam());
+            rc = machine->GetMedium(Bstr("SATA"), i, 0, hardDisk.asOutParam());
             if (SUCCEEDED(rc) && hardDisk)
             {
@@ -595 +576 @@
     }
 
-    ComPtr<IHardDisk> hardDisk;
+    ComPtr<IMedium> hardDisk;
     Bstr filePath;
-    rc = machine->GetHardDisk(Bstr("IDE"), 0, 0, hardDisk.asOutParam());
+    rc = machine->GetMedium(Bstr("IDE"), 0, 0, hardDisk.asOutParam());
     if (SUCCEEDED(rc) && hardDisk)
     {
@@ -615 +596 @@
             RTPrintf("hda=\"none\"\n");
     }
-    rc = machine->GetHardDisk(Bstr("IDE"), 0, 1, hardDisk.asOutParam());
+    rc = machine->GetMedium(Bstr("IDE"), 0, 1, hardDisk.asOutParam());
     if (SUCCEEDED(rc) && hardDisk)
     {
@@ -633 +614 @@
             RTPrintf("hdb=\"none\"\n");
     }
-    rc = machine->GetHardDisk(Bstr("IDE"), 1, 1, hardDisk.asOutParam());
+    rc = machine->GetMedium(Bstr("IDE"), 1, 1, hardDisk.asOutParam());
     if (SUCCEEDED(rc) && hardDisk)
     {
@@ -651 +632 @@
             RTPrintf("hdd=\"none\"\n");
     }
-    ComPtr<IDVDDrive> dvdDrive;
-    rc = machine->COMGETTER(DVDDrive)(dvdDrive.asOutParam());
-    if (SUCCEEDED(rc) && dvdDrive)
-    {
-        ComPtr<IDVDImage> dvdImage;
-        rc = dvdDrive->GetImage(dvdImage.asOutParam());
-        if (SUCCEEDED(rc) && dvdImage)
-        {
-            rc = dvdImage->COMGETTER(Location)(filePath.asOutParam());
-            if (SUCCEEDED(rc) && filePath)
-            {
-                rc = dvdImage->COMGETTER(Id)(uuid.asOutParam());
-                if (details == VMINFO_MACHINEREADABLE)
-                {
-                    RTPrintf("dvd=\"%lS\"\n", filePath.raw());
-                    RTPrintf("DvdImageUUID=\"%s\"\n", Utf8Str(uuid).raw());
-                }
-                else
-                    RTPrintf("DVD:             %lS (UUID: %s)\n", filePath.raw(), Utf8Str(uuid).raw());
-            }
+    ComPtr<IMedium> dvdMedium;
+    rc = machine->GetMedium(Bstr("IDE"), 1, 0, dvdMedium.asOutParam());
+    if (SUCCEEDED(rc) && dvdMedium)
+    {
+        dvdMedium->COMGETTER(Location)(filePath.asOutParam());
+        dvdMedium->COMGETTER(Id)(uuid.asOutParam());
+        if (details == VMINFO_MACHINEREADABLE)
+        {
+            RTPrintf("dvd=\"%lS\"\n", filePath.raw());
+            RTPrintf("DvdImageUUID=\"%s\"\n", Utf8Str(uuid).raw());
         }
         else
-        {
-            ComPtr<IHostDVDDrive> hostDVDDrive;
-            rc = dvdDrive->GetHostDrive(hostDVDDrive.asOutParam());
-            if (SUCCEEDED(rc) && hostDVDDrive)
-            {
-                Bstr name;
-                hostDVDDrive->COMGETTER(Name)(name.asOutParam());
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("dvd=\"host:%lS\"\n", name.raw());
-                else
-                    RTPrintf("DVD:             Host drive %lS", name.raw());
-            }
-            else
-            {
-                if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("dvd=\"none\"\n");
-                else
-                    RTPrintf("DVD:             empty");
-            }
-            BOOL fPassthrough;
-            dvdDrive->COMGETTER(Passthrough)(&fPassthrough);
-            if (details == VMINFO_MACHINEREADABLE)
-            {
-                RTPrintf("dvdpassthrough=\"%s\"\n", fPassthrough ? "on" : "off");
-            }
-            else
-            {
-                if (fPassthrough)
-                    RTPrintf(" (passthrough enabled)");
-                RTPrintf("\n");
-            }
-        }
+            RTPrintf("DVD:             %lS (UUID: %s)\n", filePath.raw(), Utf8Str(uuid).raw());
+
+        BOOL fPassthrough;
+        ComPtr<IMediumAttachment> dvdAttachment;
+        machine->GetMediumAttachment(Bstr("IDE"), 1, 0, dvdAttachment.asOutParam());
+        dvdAttachment->COMGETTER(Passthrough)(&fPassthrough);
+        if (details == VMINFO_MACHINEREADABLE)
+        {
+            RTPrintf("dvdpassthrough=\"%s\"\n", fPassthrough ? "on" : "off");
+        }
+        else
+        {
+            if (fPassthrough)
+                RTPrintf(" (passthrough enabled)");
+            RTPrintf("\n");
+        }
+    }
+    else
+    {
+        if (details == VMINFO_MACHINEREADABLE)
+            RTPrintf("dvd=\"none\"\n");
+        else
+            RTPrintf("DVD:             empty");
     }
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -97 +97 @@
         { "hostdvds",           LISTHOSTDVDS, RTGETOPT_REQ_NOTHING },
         { "hostfloppies",       LISTHOSTFLOPPIES, RTGETOPT_REQ_NOTHING },
-        { "hostifs",             LISTBRIDGEDIFS, RTGETOPT_REQ_NOTHING }, /* backward compatibility */
-        { "bridgedifs",          LISTBRIDGEDIFS, RTGETOPT_REQ_NOTHING },
+        { "hostifs",            LISTBRIDGEDIFS, RTGETOPT_REQ_NOTHING }, /* backward compatibility */
+        { "bridgedifs",         LISTBRIDGEDIFS, RTGETOPT_REQ_NOTHING },
 #if defined(VBOX_WITH_NETFLT)
-        { "hostonlyifs",          LISTHOSTONLYIFS, RTGETOPT_REQ_NOTHING },
+        { "hostonlyifs",        LISTHOSTONLYIFS, RTGETOPT_REQ_NOTHING },
 #endif
         { "hostinfo",           LISTHOSTINFO, RTGETOPT_REQ_NOTHING },
@@ -270 +270 @@
             ComPtr<IHost> host;
             CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-            com::SafeIfaceArray <IHostDVDDrive> coll;
+            com::SafeIfaceArray <IMedium> coll;
             CHECK_ERROR(host, COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(coll)));
             if (SUCCEEDED(rc))
@@ -276 +276 @@
                 for (size_t i = 0; i < coll.size(); ++ i)
                 {
-                    ComPtr<IHostDVDDrive> dvdDrive = coll[i];
+                    ComPtr<IMedium> dvdDrive = coll[i];
+                    Bstr uuid;
+                    dvdDrive->COMGETTER(Id)(uuid.asOutParam());
+                    RTPrintf("UUID:         %s\n", Utf8Str(uuid).raw());
                     Bstr name;
                     dvdDrive->COMGETTER(Name)(name.asOutParam());
-                    RTPrintf("Name:        %lS\n\n", name.raw());
+                    RTPrintf("Name:         %lS\n\n", name.raw());
                 }
             }
@@ -289 +292 @@
             ComPtr<IHost> host;
             CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-            com::SafeIfaceArray <IHostFloppyDrive> coll;
+            com::SafeIfaceArray <IMedium> coll;
             CHECK_ERROR(host, COMGETTER(FloppyDrives)(ComSafeArrayAsOutParam(coll)));
             if (SUCCEEDED(rc))
@@ -295 +298 @@
                 for (size_t i = 0; i < coll.size(); ++i)
                 {
-                    ComPtr<IHostFloppyDrive> floppyDrive = coll[i];
+                    ComPtr<IMedium> floppyDrive = coll[i];
+                    Bstr uuid;
+                    floppyDrive->COMGETTER(Id)(uuid.asOutParam());
+                    RTPrintf("UUID:         %s\n", Utf8Str(uuid).raw());
                     Bstr name;
                     floppyDrive->COMGETTER(Name)(name.asOutParam());
-                    RTPrintf("Name:        %lS\n\n", name.raw());
+                    RTPrintf("Name:         %lS\n\n", name.raw());
                 }
             }
@@ -430 +436 @@
             CHECK_ERROR(a->virtualBox,
                         COMGETTER(SystemProperties) (systemProperties.asOutParam()));
-            com::SafeIfaceArray <IHardDiskFormat> hardDiskFormats;
+            com::SafeIfaceArray <IMediumFormat> mediumFormats;
             CHECK_ERROR(systemProperties,
-                        COMGETTER(HardDiskFormats) (ComSafeArrayAsOutParam (hardDiskFormats)));
+                        COMGETTER(MediumFormats) (ComSafeArrayAsOutParam (mediumFormats)));
 
             RTPrintf("Supported hard disk backends:\n\n");
-            for (size_t i = 0; i < hardDiskFormats.size(); ++ i)
+            for (size_t i = 0; i < mediumFormats.size(); ++ i)
             {
                 /* General information */
                 Bstr id;
-                CHECK_ERROR(hardDiskFormats [i],
+                CHECK_ERROR(mediumFormats [i],
                             COMGETTER(Id) (id.asOutParam()));
 
                 Bstr description;
-                CHECK_ERROR(hardDiskFormats [i],
+                CHECK_ERROR(mediumFormats [i],
                             COMGETTER(Id) (description.asOutParam()));
 
                 ULONG caps;
-                CHECK_ERROR(hardDiskFormats [i],
+                CHECK_ERROR(mediumFormats [i],
                             COMGETTER(Capabilities) (&caps));
 
@@ -455 +461 @@
                 /* File extensions */
                 com::SafeArray <BSTR> fileExtensions;
-                CHECK_ERROR(hardDiskFormats [i],
+                CHECK_ERROR(mediumFormats [i],
                             COMGETTER(FileExtensions) (ComSafeArrayAsOutParam (fileExtensions)));
                 for (size_t a = 0; a < fileExtensions.size(); ++ a)
@@ -471 +477 @@
                 com::SafeArray <ULONG> propertyFlags;
                 com::SafeArray <BSTR> propertyDefaults;
-                CHECK_ERROR(hardDiskFormats [i],
+                CHECK_ERROR(mediumFormats [i],
                             DescribeProperties (ComSafeArrayAsOutParam (propertyNames),
                                                 ComSafeArrayAsOutParam (propertyDescriptions),
@@ -504 +510 @@
         case LISTHDDS:
         {
-            com::SafeIfaceArray<IHardDisk> hdds;
+            com::SafeIfaceArray<IMedium> hdds;
             CHECK_ERROR(a->virtualBox, COMGETTER(HardDisks)(ComSafeArrayAsOutParam (hdds)));
             for (size_t i = 0; i < hdds.size(); ++ i)
             {
-                ComPtr<IHardDisk> hdd = hdds[i];
+                ComPtr<IMedium> hdd = hdds[i];
                 Bstr uuid;
                 hdd->COMGETTER(Id)(uuid.asOutParam());
@@ -518 +524 @@
                 hdd->COMGETTER(Location)(filepath.asOutParam());
                 RTPrintf("Location:     %lS\n", filepath.raw());
-                MediaState_T enmState;
+                MediumState_T enmState;
                 /// @todo NEWMEDIA check accessibility of all parents
                 /// @todo NEWMEDIA print the full state value
                 hdd->COMGETTER(State)(&enmState);
-                RTPrintf("Accessible:   %s\n", enmState != MediaState_Inaccessible ? "yes" : "no");
+                RTPrintf("Accessible:   %s\n", enmState != MediumState_Inaccessible ? "yes" : "no");
+
+                MediumType_T type;
+                hdd->COMGETTER(Type)(&type);
+                const char *typeStr = "unknown";
+                switch (type)
+                {
+                    case MediumType_Normal:
+                        typeStr = "normal";
+                        break;
+                    case MediumType_Immutable:
+                        typeStr = "immutable";
+                        break;
+                    case MediumType_Writethrough:
+                        typeStr = "writethrough";
+                        break;
+                }
+                RTPrintf("Type:         %s\n", typeStr);
+
                 com::SafeArray<BSTR> machineIds;
                 hdd->COMGETTER(MachineIds)(ComSafeArrayAsOutParam(machineIds));
@@ -547 +571 @@
         case LISTDVDS:
         {
-            com::SafeIfaceArray<IDVDImage> dvds;
+            com::SafeIfaceArray<IMedium> dvds;
             CHECK_ERROR(a->virtualBox, COMGETTER(DVDImages)(ComSafeArrayAsOutParam(dvds)));
             for (size_t i = 0; i < dvds.size(); ++ i)
             {
-                ComPtr<IDVDImage> dvdImage = dvds[i];
+                ComPtr<IMedium> dvdImage = dvds[i];
                 Bstr uuid;
                 dvdImage->COMGETTER(Id)(uuid.asOutParam());
@@ -558 +582 @@
                 dvdImage->COMGETTER(Location)(filePath.asOutParam());
                 RTPrintf("Path:       %lS\n", filePath.raw());
-                MediaState_T enmState;
+                MediumState_T enmState;
                 dvdImage->COMGETTER(State)(&enmState);
-                RTPrintf("Accessible: %s\n", enmState != MediaState_Inaccessible ? "yes" : "no");
+                RTPrintf("Accessible: %s\n", enmState != MediumState_Inaccessible ? "yes" : "no");
                 /** @todo usage */
                 RTPrintf("\n");
@@ -569 +593 @@
         case LISTFLOPPIES:
         {
-            com::SafeIfaceArray<IFloppyImage> floppies;
+            com::SafeIfaceArray<IMedium> floppies;
             CHECK_ERROR(a->virtualBox, COMGETTER(FloppyImages)(ComSafeArrayAsOutParam(floppies)));
             for (size_t i = 0; i < floppies.size(); ++ i)
             {
-                ComPtr<IFloppyImage> floppyImage = floppies[i];
+                ComPtr<IMedium> floppyImage = floppies[i];
                 Bstr uuid;
                 floppyImage->COMGETTER(Id)(uuid.asOutParam());
@@ -580 +604 @@
                 floppyImage->COMGETTER(Location)(filePath.asOutParam());
                 RTPrintf("Path:       %lS\n", filePath.raw());
-                MediaState_T enmState;
+                MediumState_T enmState;
                 floppyImage->COMGETTER(State)(&enmState);
-                RTPrintf("Accessible: %s\n", enmState != MediaState_Inaccessible ? "yes" : "no");
+                RTPrintf("Accessible: %s\n", enmState != MediumState_Inaccessible ? "yes" : "no");
                 /** @todo usage */
                 RTPrintf("\n");

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1072 +1072 @@
             if (!strcmp(firmware, "efi"))
             {
-                CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_Efi));
+                CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_EFI));
             }
             else if (!strcmp(firmware, "bios"))
             {
-                CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_Bios));
+                CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_BIOS));
             }
             else
@@ -1174 +1174 @@
             if (!strcmp(hdds[0], "none"))
             {
-                machine->DetachHardDisk(Bstr("IDE"), 0, 0);
+                machine->DetachDevice(Bstr("IDE"), 0, 0);
             }
             else
@@ -1180 +1180 @@
                 /* first guess is that it's a UUID */
                 Bstr uuid(hdds[0]);
-                ComPtr<IHardDisk> hardDisk;
+                ComPtr<IMedium> hardDisk;
                 rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
                 /* not successful? Then it must be a filename */
@@ -1195 +1195 @@
                 {
                     hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                    CHECK_ERROR(machine, AttachHardDisk(uuid, Bstr("IDE"), 0, 0));
+                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE"), 0, 0, DeviceType_HardDisk, uuid));
                 }
                 else
@@ -1207 +1207 @@
             if (!strcmp(hdds[1], "none"))
             {
-                machine->DetachHardDisk(Bstr("IDE"), 0, 1);
+                machine->DetachDevice(Bstr("IDE"), 0, 1);
             }
             else
@@ -1213 +1213 @@
                 /* first guess is that it's a UUID */
                 Bstr uuid(hdds[1]);
-                ComPtr<IHardDisk> hardDisk;
+                ComPtr<IMedium> hardDisk;
                 rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
                 /* not successful? Then it must be a filename */
@@ -1228 +1228 @@
                 {
                     hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                    CHECK_ERROR(machine, AttachHardDisk(uuid, Bstr("IDE"), 0, 1));
+                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE"), 0, 1, DeviceType_HardDisk, uuid));
                 }
                 else
@@ -1240 +1240 @@
             if (!strcmp(hdds[2], "none"))
             {
-                machine->DetachHardDisk(Bstr("IDE"), 1, 1);
+                machine->DetachDevice(Bstr("IDE"), 1, 1);
             }
             else
@@ -1246 +1246 @@
                 /* first guess is that it's a UUID */
                 Bstr uuid(hdds[2]);
-                ComPtr<IHardDisk> hardDisk;
+                ComPtr<IMedium> hardDisk;
                 rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
                 /* not successful? Then it must be a filename */
@@ -1261 +1261 @@
                 {
                     hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                    CHECK_ERROR(machine, AttachHardDisk(uuid, Bstr("IDE"), 1, 1));
+                    CHECK_ERROR(machine, AttachDevice(Bstr("IDE"), 1, 1, DeviceType_HardDisk, uuid));
                 }
                 else
@@ -1271 +1271 @@
         if (dvd)
         {
-            ComPtr<IDVDDrive> dvdDrive;
-            machine->COMGETTER(DVDDrive)(dvdDrive.asOutParam());
-            ASSERT(dvdDrive);
+            ComPtr<IMedium> dvdMedium;
 
             /* unmount? */
             if (!strcmp(dvd, "none"))
             {
-                CHECK_ERROR(dvdDrive, Unmount());
+                /* nothing to do, NULL object will cause unmount */
             }
             /* host drive? */
@@ -1285 +1283 @@
                 ComPtr<IHost> host;
                 CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-                com::SafeIfaceArray <IHostDVDDrive> hostDVDs;
-                rc = host->COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(hostDVDs));
-
-                ComPtr<IHostDVDDrive> hostDVDDrive;
-                rc = host->FindHostDVDDrive(Bstr(dvd + 5), hostDVDDrive.asOutParam());
-                if (!hostDVDDrive)
+                rc = host->FindHostDVDDrive(Bstr(dvd + 5), dvdMedium.asOutParam());
+                if (!dvdMedium)
                 {
                     /* 2nd try: try with the real name, important on Linux+libhal */
@@ -1296 +1290 @@
                     if (RT_FAILURE(RTPathReal(dvd + 5, szPathReal, sizeof(szPathReal))))
                     {
-                        errorArgument("Invalid host DVD drive name");
+                        errorArgument("Invalid host DVD drive name \"%s\"", dvd + 5);
                         rc = E_FAIL;
                         break;
                     }
-                    rc = host->FindHostDVDDrive(Bstr(szPathReal), hostDVDDrive.asOutParam());
-                    if (!hostDVDDrive)
-                    {
-                        errorArgument("Invalid host DVD drive name");
+                    rc = host->FindHostDVDDrive(Bstr(szPathReal), dvdMedium.asOutParam());
+                    if (!dvdMedium)
+                    {
+                        errorArgument("Invalid host DVD drive name \"%s\"", dvd + 5);
                         rc = E_FAIL;
                         break;
                     }
                 }
-                CHECK_ERROR(dvdDrive, CaptureHostDrive(hostDVDDrive));
             }
             else
@@ -1314 +1307 @@
                 /* first assume it's a UUID */
                 Bstr uuid(dvd);
-                ComPtr<IDVDImage> dvdImage;
-                rc = a->virtualBox->GetDVDImage(uuid, dvdImage.asOutParam());
-                if (FAILED(rc) || !dvdImage)
+                rc = a->virtualBox->GetDVDImage(uuid, dvdMedium.asOutParam());
+                if (FAILED(rc) || !dvdMedium)
                 {
                     /* must be a filename, check if it's in the collection */
-                    rc = a->virtualBox->FindDVDImage(Bstr(dvd), dvdImage.asOutParam());
+                    rc = a->virtualBox->FindDVDImage(Bstr(dvd), dvdMedium.asOutParam());
                     /* not registered, do that on the fly */
-                    if (!dvdImage)
+                    if (!dvdMedium)
                     {
                         Bstr emptyUUID;
-                        CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(dvd), emptyUUID, dvdImage.asOutParam()));
-                    }
-                }
-                if (!dvdImage)
+                        CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(dvd), emptyUUID, dvdMedium.asOutParam()));
+                    }
+                }
+                if (!dvdMedium)
                 {
                     rc = E_FAIL;
                     break;
                 }
-
-                dvdImage->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(dvdDrive, MountImage(uuid));
-            }
+            }
+
+            /** @todo generalize this, allow arbitrary number of DVD drives
+             * and as a consequence multiple attachments and different
+             * storage controllers. */
+            dvdMedium->COMGETTER(Id)(uuid.asOutParam());
+            CHECK_ERROR(machine, MountMedium(Bstr("IDE"), 1, 0, uuid));
         }
         if (dvdpassthrough)
         {
-            ComPtr<IDVDDrive> dvdDrive;
-            machine->COMGETTER(DVDDrive)(dvdDrive.asOutParam());
-            ASSERT(dvdDrive);
-
-            CHECK_ERROR(dvdDrive, COMSETTER(Passthrough)(!strcmp(dvdpassthrough, "on")));
+            ComPtr<IMediumAttachment> dvdAttachment;
+            machine->GetMediumAttachment(Bstr("IDE"), 1, 0, dvdAttachment.asOutParam());
+            ASSERT(dvdAttachment);
+
+            CHECK_ERROR(dvdAttachment, COMSETTER(Passthrough)(!strcmp(dvdpassthrough, "on")));
         }
         if (idecontroller)
@@ -1371 +1366 @@
         if (floppy)
         {
-            ComPtr<IFloppyDrive> floppyDrive;
-            machine->COMGETTER(FloppyDrive)(floppyDrive.asOutParam());
-            ASSERT(floppyDrive);
+            ComPtr<IMedium> floppyMedium;
+            ComPtr<IMediumAttachment> floppyAttachment;
+            machine->GetMediumAttachment(Bstr("FD"), 0, 0, floppyAttachment.asOutParam());
 
             /* disable? */
@@ -1379 +1374 @@
             {
                 /* disable the controller */
-                CHECK_ERROR(floppyDrive, COMSETTER(Enabled)(false));
+                if (floppyAttachment)
+                    CHECK_ERROR(machine, DetachDevice(Bstr("FD"), 0, 0));
             }
             else
             {
                 /* enable the controller */
-                CHECK_ERROR(floppyDrive, COMSETTER(Enabled)(true));
+                if (!floppyAttachment)
+                    CHECK_ERROR(machine, AttachDevice(Bstr("FD"), 0, 0, DeviceType_Floppy, NULL));
 
                 /* unmount? */
-                if (!strcmp(floppy, "empty"))
-                {
-                    CHECK_ERROR(floppyDrive, Unmount());
+                if (    !strcmp(floppy, "none")
+                    ||  !strcmp(floppy, "empty"))   // deprecated
+                {
+                    /* nothing to do, NULL object will cause unmount */
                 }
                 /* host drive? */
@@ -1396 +1394 @@
                     ComPtr<IHost> host;
                     CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-                    com::SafeIfaceArray <IHostFloppyDrive> hostFloppies;
-                    CHECK_ERROR(host, COMGETTER(FloppyDrives)(ComSafeArrayAsOutParam(hostFloppies)));
-                    ComPtr<IHostFloppyDrive> hostFloppyDrive;
-                    rc = host->FindHostFloppyDrive(Bstr(floppy + 5), hostFloppyDrive.asOutParam());
-                    if (!hostFloppyDrive)
-                    {
-                        errorArgument("Invalid host floppy drive name");
+                    rc = host->FindHostFloppyDrive(Bstr(floppy + 5), floppyMedium.asOutParam());
+                    if (!floppyMedium)
+                    {
+                        errorArgument("Invalid host floppy drive name \"%s\"", floppy + 5);
                         rc = E_FAIL;
                         break;
                     }
-                    CHECK_ERROR(floppyDrive, CaptureHostDrive(hostFloppyDrive));
                 }
                 else
@@ -1412 +1406 @@
                     /* first assume it's a UUID */
                     Bstr uuid(floppy);
-                    ComPtr<IFloppyImage> floppyImage;
-                    rc = a->virtualBox->GetFloppyImage(uuid, floppyImage.asOutParam());
-                    if (FAILED(rc) || !floppyImage)
+                    rc = a->virtualBox->GetFloppyImage(uuid, floppyMedium.asOutParam());
+                    if (FAILED(rc) || !floppyMedium)
                     {
                         /* must be a filename, check if it's in the collection */
-                        rc = a->virtualBox->FindFloppyImage(Bstr(floppy), floppyImage.asOutParam());
+                        rc = a->virtualBox->FindFloppyImage(Bstr(floppy), floppyMedium.asOutParam());
                         /* not registered, do that on the fly */
-                        if (!floppyImage)
+                        if (!floppyMedium)
                         {
                             Bstr emptyUUID;
-                            CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(floppy), emptyUUID, floppyImage.asOutParam()));
+                            CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(floppy), emptyUUID, floppyMedium.asOutParam()));
                         }
                     }
-                    if (!floppyImage)
+                    if (!floppyMedium)
                     {
                         rc = E_FAIL;
                         break;
                     }
-
-                    floppyImage->COMGETTER(Id)(uuid.asOutParam());
-                    CHECK_ERROR(floppyDrive, MountImage(uuid));
-                }
+                }
+                floppyMedium->COMGETTER(Id)(uuid.asOutParam());
+                CHECK_ERROR(machine, MountMedium(Bstr("FD"), 0, 0, uuid));
             }
         }
@@ -1975 +1967 @@
                 if (!strcmp(hdds[i], "none"))
                 {
-                    machine->DetachHardDisk(Bstr("SATA"), i-4, 0);
+                    machine->DetachDevice(Bstr("SATA"), i-4, 0);
                 }
                 else
@@ -1981 +1973 @@
                     /* first guess is that it's a UUID */
                     Bstr uuid(hdds[i]);
-                    ComPtr<IHardDisk> hardDisk;
+                    ComPtr<IMedium> hardDisk;
                     rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
                     /* not successful? Then it must be a filename */
@@ -1996 +1988 @@
                     {
                         hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                        CHECK_ERROR(machine, AttachHardDisk(uuid, Bstr("SATA"), i-4, 0));
+                        CHECK_ERROR(machine, AttachDevice(Bstr("SATA"), i-4, 0, DeviceType_HardDisk, uuid));
                     }
                     else
@@ -2062 +2054 @@
                 if (!strcmp(hdds[i], "none"))
                 {
-                    rc = machine->DetachHardDisk(Bstr("LsiLogic"), i-34, 0);
+                    rc = machine->DetachDevice(Bstr("LsiLogic"), i-34, 0);
                     if (!SUCCEEDED(rc))
-                        CHECK_ERROR(machine, DetachHardDisk(Bstr("BusLogic"), i-34, 0));
+                        CHECK_ERROR(machine, DetachDevice(Bstr("BusLogic"), i-34, 0));
                 }
                 else
@@ -2070 +2062 @@
                     /* first guess is that it's a UUID */
                     Bstr uuid(hdds[i]);
-                    ComPtr<IHardDisk> hardDisk;
+                    ComPtr<IMedium> hardDisk;
                     rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
                     /* not successful? Then it must be a filename */
@@ -2085 +2077 @@
                     {
                         hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                        rc = machine->AttachHardDisk(uuid, Bstr("LsiLogic"), i-34, 0);
+                        rc = machine->AttachDevice(Bstr("LsiLogic"), i-34, 0, DeviceType_HardDisk, uuid);
                         if (!SUCCEEDED(rc))
-                            CHECK_ERROR(machine, AttachHardDisk(uuid, Bstr("BusLogic"), i-34, 0));
+                            CHECK_ERROR(machine, AttachDevice(Bstr("BusLogic"), i-34, 0, DeviceType_HardDisk, uuid));
                     }
                     else

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -327 +327 @@
     }
 
-    STDMETHOD(OnMediaRegistered) (IN_BSTR mediaId, DeviceType_T mediaType,
+    STDMETHOD(OnMediumRegistered)(IN_BSTR mediaId, DeviceType_T mediaType,
                                   BOOL registered)
     {
@@ -493 +493 @@
     }
 
-    STDMETHOD(OnDVDDriveChange)()
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnFloppyDriveChange)()
-    {
-        return S_OK;
-    }
-
     STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
     {
@@ -540 +530 @@
 
     STDMETHOD(OnStorageControllerChange) ()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnMediumChange)(IMediumAttachment * /*aMediumAttachment*/)
     {
         return S_OK;
@@ -1447 +1442 @@
         }
     }
-    if (FAILED (rc))
+    if (FAILED(rc))
         break;
 
@@ -1527 +1522 @@
          */
         Bstr hdaFileBstr = hdaFile;
-        ComPtr<IHardDisk> hardDisk;
+        ComPtr<IMedium> hardDisk;
         virtualBox->FindHardDisk(hdaFileBstr, hardDisk.asOutParam());
         if (!hardDisk)
@@ -1543 +1538 @@
             Bstr uuid;
             hardDisk->COMGETTER(Id)(uuid.asOutParam());
-            gMachine->DetachHardDisk(Bstr("IDE"), 0, 0);
-            gMachine->AttachHardDisk(uuid, Bstr("IDE"), 0, 0);
+            gMachine->DetachDevice(Bstr("IDE"), 0, 0);
+            gMachine->AttachDevice(Bstr("IDE"), 0, 0, DeviceType_HardDisk, uuid);
             /// @todo why is this attachment saved?
         }
@@ -1560 +1555 @@
     do
     {
-        ComPtr<IFloppyDrive> drive;
-        CHECK_ERROR_BREAK (gMachine, COMGETTER(FloppyDrive)(drive.asOutParam()));
-
-        /*
-         * First special case 'none' to unmount
-         */
-        if (!strcmp (fdaFile, "none"))
-        {
-            CHECK_ERROR_BREAK (drive, Unmount());
-            break;
-        }
-
-        Bstr medium = fdaFile;
-        bool done = false;
-
-        /* Assume it's a host drive name */
-        {
+        ComPtr<IMedium> floppyMedium;
+
+        /* unmount? */
+        if (!strcmp(fdaFile, "none"))
+        {
+            /* nothing to do, NULL object will cause unmount */
+        }
+        else
+        {
+            Bstr medium = fdaFile;
+
+            /* Assume it's a host drive name */
             ComPtr <IHost> host;
-            CHECK_ERROR_BREAK (virtualBox, COMGETTER(Host)(host.asOutParam()));
-            com::SafeIfaceArray <IHostFloppyDrive> coll;
-            CHECK_ERROR_BREAK (host, COMGETTER(FloppyDrives)(ComSafeArrayAsOutParam(coll)));
-            ComPtr <IHostFloppyDrive> hostDrive;
-            rc = host->FindHostFloppyDrive (medium, hostDrive.asOutParam());
-            if (SUCCEEDED (rc))
-            {
-                done = true;
-                CHECK_ERROR_BREAK (drive, CaptureHostDrive (hostDrive));
-            }
-        }
-
-        /* Must be an image */
-        if (!done)
-        {
-            /* try to find an existing one */
-            ComPtr<IFloppyImage> image;
-            rc = virtualBox->FindFloppyImage (medium, image.asOutParam());
-            if (FAILED (rc))
-            {
-                /* try to add to the list */
-                RTPrintf ("Adding floppy image '%S'...\n", fdaFile);
-                CHECK_ERROR_BREAK (virtualBox, OpenFloppyImage (medium, Bstr(),
-                                                                image.asOutParam()));
-            }
-
-            /* attach */
-            Bstr uuid;
-            image->COMGETTER(Id)(uuid.asOutParam());
-            CHECK_ERROR_BREAK (drive, MountImage (uuid));
-        }
+            CHECK_ERROR_BREAK(virtualBox, COMGETTER(Host)(host.asOutParam()));
+            rc = host->FindHostFloppyDrive(medium, floppyMedium.asOutParam());
+            if (FAILED(rc))
+            {
+                /* try to find an existing one */
+                rc = virtualBox->FindFloppyImage(medium, floppyMedium.asOutParam());
+                if (FAILED(rc))
+                {
+                    /* try to add to the list */
+                    RTPrintf("Adding floppy image '%S'...\n", fdaFile);
+                    CHECK_ERROR_BREAK(virtualBox, OpenFloppyImage(medium, Bstr(),
+                                                                  floppyMedium.asOutParam()));
+                }
+            }
+        }
+        Bstr id;
+        floppyMedium->COMGETTER(Id)(id.asOutParam());
+        CHECK_ERROR(gMachine, MountMedium(Bstr("FD"), 0, 0, id));
     }
     while (0);
-    if (FAILED (rc))
+    if (FAILED(rc))
         goto leave;
 
@@ -1620 +1597 @@
     do
     {
-        ComPtr<IDVDDrive> drive;
-        CHECK_ERROR_BREAK (gMachine, COMGETTER(DVDDrive)(drive.asOutParam()));
-
-        /*
-         * First special case 'none' to unmount
-         */
-        if (!strcmp (cdromFile, "none"))
-        {
-            CHECK_ERROR_BREAK (drive, Unmount());
-            break;
-        }
-
-        Bstr medium = cdromFile;
-        bool done = false;
-
-        /* Assume it's a host drive name */
-        {
+        ComPtr<IMedium> dvdMedium;
+
+        /* unmount? */
+        if (!strcmp(cdromFile, "none"))
+        {
+            /* nothing to do, NULL object will cause unmount */
+        }
+        else
+        {
+            Bstr medium = cdromFile;
+
+            /* Assume it's a host drive name */
             ComPtr <IHost> host;
-            CHECK_ERROR_BREAK (virtualBox, COMGETTER(Host)(host.asOutParam()));
-            SafeIfaceArray <IHostDVDDrive> coll;
-            CHECK_ERROR_BREAK (host, COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(coll)));
-            ComPtr <IHostDVDDrive> hostDrive;
-            rc = host->FindHostDVDDrive (medium, hostDrive.asOutParam());
-            if (SUCCEEDED (rc))
-            {
-                done = true;
-                CHECK_ERROR_BREAK (drive, CaptureHostDrive (hostDrive));
-            }
-        }
-
-        /* Must be an image */
-        if (!done)
-        {
-            /* try to find an existing one */
-            ComPtr <IDVDImage> image;
-            rc = virtualBox->FindDVDImage (medium, image.asOutParam());
-            if (FAILED (rc))
-            {
-                /* try to add to the list */
-                RTPrintf ("Adding ISO image '%S'...\n", cdromFile);
-                CHECK_ERROR_BREAK (virtualBox, OpenDVDImage (medium, Bstr(),
-                                                             image.asOutParam()));
-            }
-
-            /* attach */
-            Bstr uuid;
-            image->COMGETTER(Id)(uuid.asOutParam());
-            CHECK_ERROR_BREAK (drive, MountImage (uuid));
-        }
+            CHECK_ERROR_BREAK(virtualBox, COMGETTER(Host)(host.asOutParam()));
+            rc = host->FindHostDVDDrive(medium,dvdMedium.asOutParam());
+            if (FAILED(rc))
+            {
+                /* try to find an existing one */
+                rc = virtualBox->FindDVDImage(medium, dvdMedium.asOutParam());
+                if (FAILED(rc))
+                {
+                    /* try to add to the list */
+                    RTPrintf("Adding ISO image '%S'...\n", cdromFile);
+                    CHECK_ERROR_BREAK(virtualBox, OpenDVDImage(medium, Bstr(),
+                                                               dvdMedium.asOutParam()));
+                }
+            }
+        }
+        Bstr id;
+        dvdMedium->COMGETTER(Id)(id.asOutParam());
+        CHECK_ERROR(gMachine, MountMedium(Bstr("IDE"), 1, 0, id));
     }
     while (0);
-    if (FAILED (rc))
+    if (FAILED(rc))
         goto leave;
 

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -52 +52 @@
         print  "%s: onAdditionsStateChange" %(self.mach.name)
 
-    def onDVDDriveChange(self):
-        print  "%s: onDVDDriveChange" %(self.mach.name)
-
-    def onFloppyDriveChange(self):
-        print  "%s: onFloppyDriveChange" %(self.mach.name)
-
     def onNetworkAdapterChange(self, adapter):
         print  "%s: onNetworkAdapterChange" %(self.mach.name)
@@ -69 +63 @@
     def onStorageControllerChange(self):
         print  "%s: onStorageControllerChange" %(self.mach.name)
+
+    def onMediumChange(self, attachment):
+        print  "%s: onMediumChange" %(self.mach.name)
 
     def onVRDPServerChange(self):

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

@@ -273 +273 @@
         include/QIFileDialog.h \
         include/QIAdvancedSlider.h \
+        include/QISplitter.h \
+        include/QITreeView.h \
         include/VBoxFilePathSelectorWidget.h \
         include/VBoxOSTypeSelectorButton.h \
@@ -307 +309 @@
         include/VBoxVMSettingsDisplay.h \
         include/VBoxVMSettingsHD.h \
-        include/VBoxVMSettingsCD.h \
-        include/VBoxVMSettingsFD.h \
         include/VBoxVMSettingsAudio.h \
         include/VBoxVMSettingsNetwork.h \
@@ -371 +371 @@
         src/QILineEdit.cpp \
         src/QIHelpButton.cpp \
+        src/QISplitter.cpp \
+        src/QITreeView.cpp \
         src/VBoxGuestRAMSlider.cpp \
         src/VBoxFilePathSelectorWidget.cpp \
@@ -406 +408 @@
         src/VBoxVMSettingsDisplay.cpp \
         src/VBoxVMSettingsHD.cpp \
-        src/VBoxVMSettingsCD.cpp \
-        src/VBoxVMSettingsFD.cpp \
         src/VBoxVMSettingsAudio.cpp \
         src/VBoxVMSettingsNetwork.cpp \

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -43 +43 @@
     ui/VBoxVMSettingsDisplay.ui \
     ui/VBoxVMSettingsHD.ui \
-    ui/VBoxVMSettingsCD.ui \
-    ui/VBoxVMSettingsFD.ui \
     ui/VBoxVMSettingsAudio.ui \
     ui/VBoxVMSettingsNetwork.ui \

trunk/src/VBox/Frontends/VirtualBox/VirtualBox.qrc

@@ -343 +343 @@
     <file alias="restore_16px.png">images/restore_16px.png</file>
     <file alias="close_16px.png">images/close_16px.png</file>
+    <file alias="plus_10px.png">images/plus_10px.png</file>
+    <file alias="plus_disabled_10px.png">images/plus_disabled_10px.png</file>
+    <file alias="minus_10px.png">images/minus_10px.png</file>
+    <file alias="minus_disabled_10px.png">images/minus_disabled_10px.png</file>
  </qresource>
  </RCC>

trunk/src/VBox/Frontends/VirtualBox/include/COMWrappers.xsl

@@ -224 +224 @@
   <!-- forward declarations -->
   <xsl:text>// forward declarations&#x0A;&#x0A;</xsl:text>
-  <xsl:for-each select="interface | collection | enumerator">
+  <xsl:for-each select="interface">
     <xsl:text>class C</xsl:text>
     <xsl:value-of select="substring(@name,2)"/>
@@ -250 +250 @@
   <xsl:apply-templates select="
       if |
-      interface[not(@internal='yes')] |
-      collection[not(@internal='yes')] |
-      enumerator[not(@internal='yes')]
+      interface[not(@internal='yes')]
     "
     mode="declare"
@@ -260 +258 @@
   <xsl:apply-templates select="
       if |
-      interface[not(@internal='yes')] |
-      collection[not(@internal='yes')] |
-      enumerator[not(@internal='yes')]
+      interface[not(@internal='yes')]
     "
     mode="define"
@@ -272 +268 @@
  *  interface declarations
 -->
-<xsl:template match="interface | collection | enumerator" mode="declare">
+<xsl:template match="interface" mode="declare">
 
   <xsl:text>// </xsl:text>
@@ -295 +291 @@
   <xsl:text>&gt; Base;&#x0A;&#x0A;</xsl:text>
 
-  <xsl:if test="name()='collection'">
-    <xsl:text>    // collection stuff&#x0A;&#x0A;</xsl:text>
-    <xsl:text>    ULONG GetCount () const;&#x0A;</xsl:text>
-    <xsl:text>    </xsl:text>
-    <xsl:apply-templates select="@type"/>
-    <xsl:text> GetItemAt (ULONG index) const;&#x0A;</xsl:text>
-    <xsl:text>    </xsl:text>
-    <xsl:apply-templates select="@enumerator"/>
-    <xsl:text> Enumerate () const;&#x0A;&#x0A;</xsl:text>
-  </xsl:if>
-
-  <xsl:if test="name()='enumerator'">
-    <xsl:text>    // enumerator stuff&#x0A;&#x0A;</xsl:text>
-    <xsl:text>    BOOL HasMore () const;&#x0A;</xsl:text>
-    <xsl:text>    </xsl:text>
-    <xsl:apply-templates select="@type"/>
-    <xsl:text> GetNext () const;&#x0A;&#x0A;</xsl:text>
-    <xsl:text>    // friend wrappers&#x0A;&#x0A;</xsl:text>
-    <xsl:text>    friend class CUnknown;&#x0A;</xsl:text>
-    <xsl:variable name="name" select="@name"/>
-    <xsl:variable name="parent" select=".."/>
-    <!-- for definitions inside <if> -->
-    <xsl:if test="name(..)='if'">
-      <xsl:for-each select="
-        preceding-sibling::collection | following-sibling::collection |
-        ../preceding-sibling::if[@target=$parent/@target]/collection |
-        ../following-sibling::if[@target=$parent/@target]/collection
-      ">
-        <xsl:if test="@enumerator=$name">
-          <xsl:text>    friend class C</xsl:text>
-          <xsl:value-of select="substring(@name,2)"/>
-          <xsl:text>;&#x0A;</xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:if>
-    <!-- for definitions outside <if> (i.e. inside <library>) -->
-    <xsl:if test="name(..)!='if'">
-      <xsl:for-each select="
-        preceding-sibling::collection | following-sibling::collection
-      ">
-        <xsl:if test="@enumerator=$name">
-          <xsl:text>    friend class C</xsl:text>
-          <xsl:value-of select="substring(@name,2)"/>
-          <xsl:text>;&#x0A;</xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:if>
-
-  <xsl:if test="name()='interface' or name()='collection'">
+  <xsl:if test="name()='interface'">
     <xsl:call-template name="declareMembers"/>
   </xsl:if>
@@ -368 +315 @@
           <xsl:with-param name="iface" select="
             preceding-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             following-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             ../preceding-sibling::if[@target=../@target]/
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             ../following-sibling::if[@target=../@target]/
-              *[(self::interface or self::collection) and @name=$iface/@extends]
+              *[self::interface and @name=$iface/@extends]
           "/>
         </xsl:call-template>
@@ -383 +330 @@
           <xsl:with-param name="iface" select="
             preceding-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             following-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends]
+              *[self::interface and @name=$iface/@extends]
           "/>
         </xsl:call-template>
@@ -410 +357 @@
           <xsl:with-param name="iface" select="
             preceding-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             following-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             ../preceding-sibling::if[@target=../@target]/
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             ../following-sibling::if[@target=../@target]/
-              *[(self::interface or self::collection) and @name=$iface/@extends]
+              *[self::interface and @name=$iface/@extends]
           "/>
         </xsl:call-template>
@@ -425 +372 @@
           <xsl:with-param name="iface" select="
             preceding-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             following-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends]
+              *[self::interface and @name=$iface/@extends]
           "/>
         </xsl:call-template>
@@ -541 +488 @@
   <xsl:if test="name(..)='if'">
     <xsl:for-each select="
-      preceding-sibling::*[self::interface or self::collection or self::enumerator] |
-      following-sibling::*[self::interface or self::collection or self::enumerator] |
-      ../preceding-sibling::*[self::interface or self::collection or self::enumerator] |
-      ../following-sibling::*[self::interface or self::collection or self::enumerator] |
-      ../preceding-sibling::if[@target=$parent/@target]/*[self::interface or self::collection or self::enumerator] |
-      ../following-sibling::if[@target=$parent/@target]/*[self::interface or self::collection or self::enumerator]
+      preceding-sibling::*[self::interface] |
+      following-sibling::*[self::interface] |
+      ../preceding-sibling::*[self::interface] |
+      ../following-sibling::*[self::interface] |
+      ../preceding-sibling::if[@target=$parent/@target]/*[self::interface] |
+      ../following-sibling::if[@target=$parent/@target]/*[self::interface]
     ">
       <xsl:if test="
-        ((name()='interface' or name()='collection')
+        ((name()='interface')
          and
          ((name(..)!='if' and (if[@target=$parent/@target]/method/param[@type=$name]
@@ -556 +503 @@
           or
           (.//method/param[@type=$name] or attribute[@type=$name])))
-        or
-        (name(..)='if' and (name()='collection' or name()='enumerator') and @type=$name)
       ">
         <xsl:text>    friend class C</xsl:text>
@@ -568 +513 @@
   <xsl:if test="name(..)!='if'">
     <xsl:for-each select="
-      preceding-sibling::*[self::interface or self::collection or self::enumerator] |
-      following-sibling::*[self::interface or self::collection or self::enumerator] |
-      preceding-sibling::if/*[self::interface or self::collection or self::enumerator] |
-      following-sibling::if/*[self::interface or self::collection or self::enumerator]
+      preceding-sibling::*[self::interface] |
+      following-sibling::*[self::interface] |
+      preceding-sibling::if/*[self::interface] |
+      following-sibling::if/*[self::interface]
     ">
       <xsl:if test="
-        ((name()='interface' or name()='collection')
-         and
-         (.//method/param[@type=$name] or attribute[@type=$name]))
-        or
-        ((name()='collection' or name()='enumerator') and @type=$name)
+        name()='interface' and (.//method/param[@type=$name] or attribute[@type=$name])
       ">
         <xsl:text>    friend class C</xsl:text>
@@ -590 +531 @@
 
 <!-- attribute declarations -->
-<xsl:template match="interface//attribute | collection//attribute" mode="declare">
-  <xsl:if test="@array">
-    <xsl:message terminate="yes">
-      <xsl:value-of select="concat(../../@name,'::',../@name,'::',@name,': ')"/>
-      <xsl:text>'array' attributes are not supported, use 'safearray="yes"' instead.</xsl:text>
-    </xsl:message>
-  </xsl:if>
+<xsl:template match="interface//attribute" mode="declare">
   <xsl:apply-templates select="parent::node()" mode="begin"/>
   <xsl:apply-templates select="@if" mode="begin"/>
@@ -612 +547 @@
 
 <!-- method declarations -->
-<xsl:template match="interface//method | collection//method" mode="declare">
+<xsl:template match="interface//method" mode="declare">
   <xsl:apply-templates select="parent::node()" mode="begin"/>
   <xsl:apply-templates select="@if" mode="begin"/>
@@ -624 +559 @@
  *  interface definitions
 -->
-<xsl:template match="interface | collection | enumerator" mode="define">
+<xsl:template match="interface" mode="define">
 
   <xsl:text>// </xsl:text>
@@ -630 +565 @@
   <xsl:text> wrapper&#x0A;&#x0A;</xsl:text>
 
-  <xsl:if test="name()='collection'">
-    <!-- GetCount -->
-    <xsl:text>inline ULONG C</xsl:text>
-    <xsl:value-of select="substring(@name,2)"/>
-    <xsl:text>::GetCount () const&#x0A;{&#x0A;</xsl:text>
-    <xsl:text>    ULONG count = 0;&#x0A;</xsl:text>
-    <xsl:text>    Assert (mIface);&#x0A;</xsl:text>
-    <xsl:text>    if (!mIface)&#x0A;        return count;&#x0A;</xsl:text>
-    <xsl:text>    mRC = mIface->COMGETTER(Count) (&amp;count);&#x0A;</xsl:text>
-    <xsl:call-template name="tryComposeFetchErrorInfo"/>
-    <xsl:text>    return count;&#x0A;</xsl:text>
-    <xsl:text>}&#x0A;&#x0A;</xsl:text>
-    <!-- GetItemAt -->
-    <xsl:text>inline </xsl:text>
-    <xsl:apply-templates select="@type"/>
-    <xsl:text> C</xsl:text>
-    <xsl:value-of select="substring(@name,2)"/>
-    <xsl:text>::GetItemAt (ULONG index) const&#x0A;{&#x0A;</xsl:text>
-    <xsl:text>    </xsl:text><xsl:apply-templates select="@type"/>
-    <xsl:text> item;&#x0A;</xsl:text>
-    <xsl:text>    Assert (mIface);&#x0A;</xsl:text>
-    <xsl:text>    if (!mIface)&#x0A;        return item;&#x0A;</xsl:text>
-    <xsl:text>    mRC = mIface->GetItemAt (index, &amp;item.mIface);&#x0A;</xsl:text>
-    <xsl:call-template name="tryComposeFetchErrorInfo"/>
-    <xsl:text>    return item;&#x0A;</xsl:text>
-    <xsl:text>}&#x0A;&#x0A;</xsl:text>
-    <!-- Enumerate -->
-    <xsl:text>inline </xsl:text>
-    <xsl:apply-templates select="@enumerator"/>
-    <xsl:text> C</xsl:text>
-    <xsl:value-of select="substring(@name,2)"/>
-    <xsl:text>::Enumerate () const&#x0A;{&#x0A;</xsl:text>
-    <xsl:text>    </xsl:text><xsl:apply-templates select="@enumerator"/>
-    <xsl:text> enumerator;&#x0A;</xsl:text>
-    <xsl:text>    Assert (mIface);&#x0A;</xsl:text>
-    <xsl:text>    if (!mIface)&#x0A;        return enumerator;&#x0A;</xsl:text>
-    <xsl:text>    mRC = mIface->Enumerate (&amp;enumerator.mIface);&#x0A;</xsl:text>
-    <xsl:call-template name="tryComposeFetchErrorInfo"/>
-    <xsl:text>    return enumerator;&#x0A;</xsl:text>
-    <xsl:text>}&#x0A;&#x0A;</xsl:text>
-  </xsl:if>
-
-  <xsl:if test="name()='enumerator'">
-    <!-- HasMore -->
-    <xsl:text>inline BOOL C</xsl:text>
-    <xsl:value-of select="substring(@name,2)"/>
-    <xsl:text>::HasMore () const&#x0A;{&#x0A;</xsl:text>
-    <xsl:text>    BOOL more = FALSE;&#x0A;</xsl:text>
-    <xsl:text>    Assert (mIface);&#x0A;</xsl:text>
-    <xsl:text>    if (!mIface)&#x0A;        return more;&#x0A;</xsl:text>
-    <xsl:text>    mRC = mIface->HasMore (&amp;more);&#x0A;</xsl:text>
-    <xsl:call-template name="tryComposeFetchErrorInfo"/>
-    <xsl:text>    return more;&#x0A;</xsl:text>
-    <xsl:text>}&#x0A;&#x0A;</xsl:text>
-    <!-- GetNext -->
-    <xsl:text>inline </xsl:text>
-    <xsl:apply-templates select="@type"/>
-    <xsl:text> C</xsl:text>
-    <xsl:value-of select="substring(@name,2)"/>
-    <xsl:text>::GetNext () const&#x0A;{&#x0A;</xsl:text>
-    <xsl:text>    </xsl:text><xsl:apply-templates select="@type"/>
-    <xsl:text> next;&#x0A;</xsl:text>
-    <xsl:text>    Assert (mIface);&#x0A;</xsl:text>
-    <xsl:text>    if (!mIface)&#x0A;        return next;&#x0A;</xsl:text>
-    <xsl:text>    mRC = mIface->GetNext (&amp;next.mIface);&#x0A;</xsl:text>
-    <xsl:call-template name="tryComposeFetchErrorInfo"/>
-    <xsl:text>    return next;&#x0A;</xsl:text>
-    <xsl:text>}&#x0A;&#x0A;</xsl:text>
-  </xsl:if>
-
-  <xsl:if test="name()='interface' or name()='collection'">
+  <xsl:if test="name()='interface'">
     <xsl:call-template name="defineMembers"/>
   </xsl:if>
@@ -722 +587 @@
           <xsl:with-param name="iface" select="
             preceding-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             following-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             ../preceding-sibling::if[@target=../@target]/
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             ../following-sibling::if[@target=../@target]/
-              *[(self::interface or self::collection) and @name=$iface/@extends]
+              *[self::interface and @name=$iface/@extends]
           "/>
         </xsl:call-template>
@@ -737 +602 @@
           <xsl:with-param name="iface" select="
             preceding-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             following-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends]
+              *[self::interface and @name=$iface/@extends]
           "/>
         </xsl:call-template>
@@ -764 +629 @@
           <xsl:with-param name="iface" select="
             preceding-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             following-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             ../preceding-sibling::if[@target=../@target]/
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             ../following-sibling::if[@target=../@target]/
-              *[(self::interface or self::collection) and @name=$iface/@extends]
+              *[self::interface and @name=$iface/@extends]
           "/>
         </xsl:call-template>
@@ -779 +644 @@
           <xsl:with-param name="iface" select="
             preceding-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends] |
+              *[self::interface and @name=$iface/@extends] |
             following-sibling::
-              *[(self::interface or self::collection) and @name=$iface/@extends]
+              *[self::interface and @name=$iface/@extends]
           "/>
         </xsl:call-template>
@@ -800 +665 @@
 
 <!-- attribute definitions -->
-<xsl:template match="interface//attribute | collection//attribute" mode="define">
-
-  <xsl:param name="namespace" select="(ancestor::interface | ancestor::collection)[1]"/>
+<xsl:template match="interface//attribute" mode="define">
+
+  <xsl:param name="namespace" select="ancestor::interface[1]"/>
 
   <xsl:apply-templates select="parent::node()" mode="begin"/>
@@ -825 +690 @@
 
 <!-- method definitions -->
-<xsl:template match="interface//method | collection//method" mode="define">
-
-  <xsl:param name="namespace" select="(ancestor::interface | ancestor::collection)[1]"/>
+<xsl:template match="interface//method" mode="define">
+
+  <xsl:param name="namespace" select="ancestor::interface[1]"/>
 
   <xsl:apply-templates select="parent::node()" mode="begin"/>
@@ -869 +734 @@
  *      actual interface node for which this method is being defined
  *      (necessary to properly set a class name for inherited methods).
- *      If not specified, will default to the parent interface/collection
+ *      If not specified, will default to the parent interface
  *      node of the method being defined.
 -->
@@ -875 +740 @@
   <xsl:param name="return" select="param[@dir='return']"/>
   <xsl:param name="define" select="''"/>
-  <xsl:param name="namespace" select="(ancestor::interface | ancestor::collection)[1]"/>
+  <xsl:param name="namespace" select="ancestor::interface[1]"/>
   <xsl:choose>
     <!-- no return value -->
@@ -1111 +976 @@
  *  appropriate base class name that provides error info functionality
  *  (depending on the mode parameter). Does nothing if the current
- *  entity (interface, collection or enumerator) does not support error info.
+ *  interface does not support error info.
  *
  *  @param mode
@@ -1120 +985 @@
   <xsl:param name="mode" select="''"/>
   <xsl:variable name="ifaceSupportsErrorInfo" select="
-    (ancestor-or-self::interface |
-     ancestor-or-self::collection |
-     ancestor-or-self::enumerator)[1]/@supportsErrorInfo
+    ancestor-or-self::interface[1]/@supportsErrorInfo
   "/>
   <xsl:variable name="librarySupportsErrorInfo" select="ancestor::library/@supportsErrorInfo"/>
@@ -1188 +1051 @@
     </xsl:when>
     <!-- string types -->
-    <xsl:when test="@type = 'wstring'">
+    <xsl:when test="@type = 'wstring' or @type = 'uuid'">
       <xsl:choose>
         <xsl:when test="$isIn">
@@ -1199 +1062 @@
         <xsl:when test="$isOut">
           <xsl:text>BSTROut (a</xsl:text>
-          <xsl:call-template name="capitalize">
-            <xsl:with-param name="str" select="@name"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:when>
-    <!-- uuid type -->
-    <xsl:when test="@type = 'uuid'">
-      <xsl:choose>
-        <xsl:when test="$isIn">
-          <xsl:text>GUIDIn (a</xsl:text>
-          <xsl:call-template name="capitalize">
-            <xsl:with-param name="str" select="@name"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:when>
-        <xsl:when test="$isOut">
-          <xsl:text>GUIDOut (a</xsl:text>
           <xsl:call-template name="capitalize">
             <xsl:with-param name="str" select="@name"/>
@@ -1255 +1099 @@
     <xsl:when test="
       @type='$unknown' or
-      ((ancestor::library/enumerator[@name=current()/@type]) or
-       (ancestor::library/if[@target=$self_target]/enumerator[@name=current()/@type])
-      ) or
       ((ancestor::library/interface[@name=current()/@type]) or
        (ancestor::library/if[@target=$self_target]/interface[@name=current()/@type])
-      ) or
-      ((ancestor::library/collection[@name=current()/@type]) or
-       (ancestor::library/if[@target=$self_target]/collection[@name=current()/@type])
       )
     ">
@@ -1328 +1166 @@
  *  attribute/parameter type conversion (returns plain Qt type name)
 -->
-<xsl:template match="
-  attribute/@type | param/@type |
-  enumerator/@type | collection/@type | collection/@enumerator
-">
+<xsl:template match="attribute/@type | param/@type">
   <xsl:variable name="self_target" select="current()/ancestor::if/@target"/>
 
-  <xsl:if test="../@array and ../@safearray='yes'">
-    <xsl:message terminate="yes">
-      <xsl:value-of select="concat(../../../@name,'::',../../@name,'::',../@name,': ')"/>
-      <xsl:text>either 'array' or 'safearray="yes"' attribute is allowed, but not both!</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="../@array and ((name(..)='param' and ../@dir='return') or (name(..)='attribute'))">
-    <xsl:message terminate="yes">
-      <xsl:value-of select="concat(../../../@name,'::',../../@name,'::',../@name,': ')"/>
-      <xsl:text>return 'array' parameters and 'array' attributes are not supported, use 'safearray="yes"' instead.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
   <xsl:choose>
-    <!-- modifiers (ignored for 'enumeration' attributes)-->
+    <!-- modifiers -->
     <xsl:when test="name(current())='type' and ../@mod">
-      <xsl:if test="../@safearray">
+      <xsl:if test="../@safearray and ../@mod='ptr'">
         <xsl:message terminate="yes">
           <xsl:value-of select="concat(../../../@name,'::',../../@name,'::',../@name,': ')"/>
           <xsl:text>either 'safearray' or 'mod' attribute is allowed, but not both!</xsl:text>
-        </xsl:message>
-      </xsl:if>
-      <xsl:if test="../@array">
-        <xsl:message terminate="yes">
-          <xsl:value-of select="concat(../../../@name,'::',../../@name,'::',../@name,': ')"/>
-          <xsl:text>either 'array' or 'mod' attribute is allowed, but not both!</xsl:text>
         </xsl:message>
       </xsl:if>
@@ -1376 +1191 @@
             <xsl:when test=".='unsigned long'">ULONG *</xsl:when>
             <xsl:when test=".='unsigned long long'">ULONG64 *</xsl:when>
-            <xsl:when test=".='char'">CHAR *</xsl:when>
-            <!--<xsl:when test=".='string'">??</xsl:when-->
-            <xsl:when test=".='wchar'">OLECHAR *</xsl:when>
-            <!--<xsl:when test=".='wstring'">??</xsl:when-->
             <xsl:otherwise>
               <xsl:message terminate="yes">
@@ -1390 +1201 @@
             </xsl:otherwise>
           </xsl:choose>
+        </xsl:when>
+        <xsl:when test="../@mod='string'">
+          <xsl:if test="../@safearray">
+            <xsl:text>QVector &lt;</xsl:text>
+          </xsl:if>
+          <xsl:choose>
+            <!-- standard types -->
+            <!--xsl:when test=".='result'">??</xsl:when-->
+            <xsl:when test=".='uuid'">QString</xsl:when>
+            <xsl:otherwise>
+              <xsl:message terminate="yes">
+                <xsl:value-of select="concat(../../../@name,'::',../../@name,'::',../@name,': ')"/>
+                <xsl:text>attribute 'mod=</xsl:text>
+                <xsl:value-of select="concat('&quot;',../@mod,'&quot;')"/>
+                <xsl:text>' cannot be used with type </xsl:text>
+                <xsl:value-of select="concat('&quot;',current(),'&quot;!')"/>
+              </xsl:message>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:if test="../@safearray">
+            <xsl:text>&gt;</xsl:text>
+          </xsl:if>
         </xsl:when>
         <xsl:otherwise>
@@ -1435 +1268 @@
             <!-- custom interface types -->
             <xsl:when test="
-              (name(current())='enumerator' and
-               ((ancestor::library/enumerator[@name=current()]) or
-                (ancestor::library/if[@target=$self_target]/enumerator[@name=current()]))
-              ) or
               ((ancestor::library/interface[@name=current()]) or
                (ancestor::library/if[@target=$self_target]/interface[@name=current()])
-              ) or
-              ((ancestor::library/collection[@name=current()]) or
-               (ancestor::library/if[@target=$self_target]/collection[@name=current()])
               )
             ">
@@ -1471 +1297 @@
  *  types.
 -->
-<xsl:template match="
-  attribute/@type | param/@type |
-  enumerator/@type | collection/@type | collection/@enumerator
-" mode="initializer">
+<xsl:template match="attribute/@type | param/@type" mode="initializer">
 
   <xsl:variable name="self_target" select="current()/ancestor::if/@target"/>
@@ -1482 +1305 @@
     <xsl:when test="../@safearray">
     </xsl:when>
-    <!-- modifiers (ignored for 'enumeration' attributes)-->
+    <!-- modifiers -->
     <xsl:when test="name(current())='type' and ../@mod">
       <xsl:choose>
@@ -1497 +1320 @@
             <xsl:when test=".='unsigned long'"> = NULL</xsl:when>
             <xsl:when test=".='unsigned long long'"> = NULL</xsl:when>
-            <xsl:when test=".='char'"> = NULL</xsl:when>
-            <!--<xsl:when test=".='string'">??</xsl:when-->
-            <xsl:when test=".='wchar'"> = NULL</xsl:when>
-            <!--<xsl:when test=".='wstring'">??</xsl:when-->
+            <xsl:otherwise>
+              <xsl:message terminate="yes">
+                <xsl:value-of select="concat(../../../@name,'::',../../@name,'::',../@name,': ')"/>
+                <xsl:text>attribute 'mod=</xsl:text>
+                <xsl:value-of select="concat('&quot;',../@mod,'&quot;')"/>
+                <xsl:text>' cannot be used with type </xsl:text>
+                <xsl:value-of select="concat('&quot;',current(),'&quot;!')"/>
+              </xsl:message>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+        <xsl:when test="../@mod='string'">
+          <xsl:choose>
+            <!-- standard types -->
+            <!--xsl:when test=".='result'">??</xsl:when-->
+            <xsl:when test=".='uuid'"></xsl:when>
             <xsl:otherwise>
               <xsl:message terminate="yes">
@@ -1571 +1406 @@
       ) or
       .='$unknown' or
-      ((ancestor::library/enumerator[@name=current()]) or
-       (ancestor::library/if[@target=$self_target]/enumerator[@name=current()])
-      ) or
       ((ancestor::library/interface[@name=current()]) or
        (ancestor::library/if[@target=$self_target]/interface[@name=current()])
-      ) or
-      ((ancestor::library/collection[@name=current()]) or
-       (ancestor::library/if[@target=$self_target]/collection[@name=current()])
       )
     ">
@@ -1616 +1445 @@
         <!-- <param> context -->
         <xsl:when test="name(..)='param'">
-          <xsl:choose>
-            <xsl:when test="../@array">
-              <xsl:apply-templates select="."/>
-              <xsl:text> *</xsl:text>
-              <xsl:if test="../@dir='out'">
-                <xsl:text> &amp;</xsl:text>
-              </xsl:if>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="."/>
-              <xsl:if test="../@dir='out'">
-                <xsl:text> &amp;</xsl:text>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
+          <xsl:apply-templates select="."/>
+          <xsl:if test="../@dir='out'">
+            <xsl:text> &amp;</xsl:text>
+          </xsl:if>
         </xsl:when>
       </xsl:choose>
@@ -1642 +1460 @@
  *  (basically, copied from midl.xsl)
 -->
-<xsl:template match="
-  attribute/@type | param/@type |
-  enumerator/@type | collection/@type | collection/@enumerator
-" mode="com">
+<xsl:template match="attribute/@type | param/@type" mode="com">
 
   <xsl:variable name="self_target" select="current()/ancestor::if/@target"/>
 
   <xsl:choose>
-    <!-- modifiers (ignored for 'enumeration' attributes)-->
+    <!-- modifiers -->
     <xsl:when test="name(current())='type' and ../@mod">
       <xsl:choose>
@@ -1665 +1480 @@
             <xsl:when test=".='unsigned long'">ULONG *</xsl:when>
             <xsl:when test=".='unsigned long long'">ULONG64 *</xsl:when>
-            <xsl:when test=".='char'">CHAR *</xsl:when>
-            <!--xsl:when test=".='string'">??</xsl:when-->
-            <xsl:when test=".='wchar'">OLECHAR *</xsl:when>
-            <!--xsl:when test=".='wstring'">??</xsl:when-->
+            <xsl:otherwise>
+              <xsl:message terminate="yes">
+                <xsl:value-of select="concat(../../../@name,'::',../../@name,'::',../@name,': ')"/>
+                <xsl:text>attribute 'mod=</xsl:text>
+                <xsl:value-of select="concat('&quot;',../@mod,'&quot;')"/>
+                <xsl:text>' cannot be used with type </xsl:text>
+                <xsl:value-of select="concat('&quot;',current(),'&quot;!')"/>
+              </xsl:message>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+        <xsl:when test="../@mod='string'">
+          <xsl:choose>
+            <!-- standard types -->
+            <!--xsl:when test=".='result'">??</xsl:when-->
+            <xsl:when test=".='uuid'">BSTR</xsl:when>
             <xsl:otherwise>
               <xsl:message terminate="yes">
@@ -1721 +1548 @@
             <!-- custom interface types -->
             <xsl:when test="
-              (name(current())='enumerator' and
-               ((ancestor::library/enumerator[@name=current()]) or
-                (ancestor::library/if[@target=$self_target]/enumerator[@name=current()]))
-              ) or
               ((ancestor::library/interface[@name=current()]) or
                (ancestor::library/if[@target=$self_target]/interface[@name=current()])
-              ) or
-              ((ancestor::library/collection[@name=current()]) or
-               (ancestor::library/if[@target=$self_target]/collection[@name=current()])
               )
             ">
@@ -1768 +1588 @@
 
   <xsl:variable name="is_iface" select="(
-    ((ancestor::library/enumerator[@name=current()/@type]) or
-     (ancestor::library/if[@target=$self_target]/enumerator[@name=current()/@type])
-    ) or
     ((ancestor::library/interface[@name=current()/@type]) or
      (ancestor::library/if[@target=$self_target]/interface[@name=current()/@type])
-    ) or
-    ((ancestor::library/collection[@name=current()/@type]) or
-     (ancestor::library/if[@target=$self_target]/collection[@name=current()/@type])
     )
   )"/>
@@ -1806 +1620 @@
             </xsl:when>
             <!-- GUID is special too -->
-            <xsl:when test="@type='uuid'">
+            <xsl:when test="@type='uuid' and @mod!='string'">
               <xsl:text>    com::SafeGUIDArray </xsl:text>
             </xsl:when>

trunk/src/VBox/Frontends/VirtualBox/include/QILabelSeparator.h

@@ -24 +24 @@
 #define __QILabelSeparator_h__
 
-/* Qt includes */
+/* Global includes */
 #include <QWidget>
 
+/* Global forwards */
 class QLabel;
 
@@ -35 +36 @@
 public:
 
-    QILabelSeparator (QWidget *aParent = NULL, Qt::WindowFlags aFlags = 0);
-    QILabelSeparator (const QString &aText, QWidget *aParent = NULL, Qt::WindowFlags aFlags = 0);
+    QILabelSeparator (QWidget *aParent = 0, Qt::WindowFlags aFlags = 0);
+    QILabelSeparator (const QString &aText, QWidget *aParent = 0, Qt::WindowFlags aFlags = 0);
 
+    QString text() const;
     void setBuddy (QWidget *aBuddy);
 
@@ -44 +46 @@
     void clear();
     void setText (const QString &aText);
-    QString text() const;
 
 protected:
@@ -50 +51 @@
     virtual void init();
 
-    /* Protected member vars */
     QLabel *mLabel;
 };

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -155 +155 @@
     void machineStateChanged (KMachineState state);
     void additionsStateChanged (const QString &, bool, bool, bool);
-    void mediaDriveChanged (VBoxDefs::MediaType aType);
+    void mediaDriveChanged (VBoxDefs::MediumType aType);
     void networkStateChange();
     void usbStateChange();

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -240 +240 @@
     void updateNetworkAdaptersState();
     void updateUsbState();
-    void updateMediaDriveState (VBoxDefs::MediaType aType);
+    void updateMediaDriveState (VBoxDefs::MediumType aType);
     void updateSharedFoldersState();
 
@@ -358 +358 @@
     bool no_auto_close : 1;
 
-    QMap <QAction *, CHostDVDDrive> hostDVDMap;
-    QMap <QAction *, CHostFloppyDrive> hostFloppyMap;
+    QMap <QAction *, CMedium> hostDVDMap;
+    QMap <QAction *, CMedium> hostFloppyMap;
 
     QRect mNormalGeo;

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

@@ -69 +69 @@
 struct VBoxDefs
 {
-    /** Media type. */
-    enum MediaType
+    /** Medium type. */
+    enum MediumType
     {
-        MediaType_Invalid,
-        MediaType_HardDisk,
-        MediaType_DVD,
-        MediaType_Floppy,
-        MediaType_All
+        MediumType_Invalid,
+        MediumType_HardDisk,
+        MediumType_DVD,
+        MediumType_Floppy,
+        MediumType_All
     };
 

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

@@ -245 +245 @@
 };
 
+struct StorageSlot
+{
+    StorageSlot() : bus (KStorageBus_Null), port (0), device (0) {}
+    StorageSlot (const StorageSlot &aOther) : bus (aOther.bus), port (aOther.port), device (aOther.device) {}
+    StorageSlot (KStorageBus aBus, LONG aPort, LONG aDevice) : bus (aBus), port (aPort), device (aDevice) {}
+    StorageSlot& operator= (const StorageSlot &aOther) { bus = aOther.bus; port = aOther.port; device = aOther.device; return *this; }
+    bool operator== (const StorageSlot &aOther) const { return bus == aOther.bus && port == aOther.port && device == aOther.device; }
+    bool operator!= (const StorageSlot &aOther) const { return bus != aOther.bus || port != aOther.port || device != aOther.device; }
+    bool isNull() { return bus == KStorageBus_Null; }
+    KStorageBus bus; LONG port; LONG device;
+};
+Q_DECLARE_METATYPE (StorageSlot);
+
 // VBoxGlobal class
 ////////////////////////////////////////////////////////////////////////////////
@@ -383 +396 @@
             case KStorageControllerType_LsiLogic:
             case KStorageControllerType_BusLogic: sb = KStorageBus_SCSI; break;
+            case KStorageControllerType_I82078: sb = KStorageBus_Floppy; break;
             default:
               AssertMsgFailed (("toStorageBusType: %d not handled\n", aControllerType)); break;
@@ -395 +409 @@
     LONG toStorageDevice (KStorageBus aBus, LONG aChannel, const QString &aDevice) const;
 
-    QString toFullString (KStorageBus aBus, LONG aChannel, LONG aDevice) const;
-
-    QString toString (KHardDiskType t) const
+    QString toFullString (StorageSlot aSlot) const;
+    StorageSlot toStorageSlot (const QString &aSlot) const;
+
+    QString toString (KMediumType t) const
     {
         AssertMsg (!mDiskTypes.value (t).isNull(), ("No text for %d", t));
@@ -404 +419 @@
 
     /**
-     * Similar to toString (KHardDiskType), but returns 'Differencing' for
+     * Similar to toString (KMediumType), but returns 'Differencing' for
      * normal hard disks that have a parent.
      */
-    QString hardDiskTypeString (const CHardDisk &aHD) const
+    QString mediumTypeString (const CMedium &aHD) const
     {
         if (!aHD.GetParent().isNull())
         {
-            Assert (aHD.GetType() == KHardDiskType_Normal);
+            Assert (aHD.GetType() == KMediumType_Normal);
             return mDiskTypes_Differencing;
         }
@@ -456 +471 @@
     }
 
-    KStorageControllerType toIDEControllerType (const QString &s) const
+    KStorageControllerType toControllerType (const QString &s) const
     {
         QULongStringHash::const_iterator it =
@@ -593 +608 @@
     /* details generators */
 
-    QString details (const CHardDisk &aHD, bool aPredictDiff);
+    QString details (const CMedium &aHD, bool aPredictDiff);
 
     QString details (const CUSBDevice &aDevice) const;
@@ -635 +650 @@
     void addMedium (const VBoxMedium &);
     void updateMedium (const VBoxMedium &);
-    void removeMedium (VBoxDefs::MediaType, const QString &);
+    void removeMedium (VBoxDefs::MediumType, const QString &);
 
     bool findMedium (const CMedium &, VBoxMedium &) const;
+    VBoxMedium findMedium (const QString &aMediumId) const;
 
     /** Compact version of #findMediumTo(). Asserts if not found. */
@@ -674 +690 @@
     QString helpFile() const;
 
+    static QIcon iconSet (const QPixmap &aNormal,
+                          const QPixmap &aDisabled = QPixmap(),
+                          const QPixmap &aActive = QPixmap());
     static QIcon iconSet (const char *aNormal,
                           const char *aDisabled = NULL,
@@ -787 +806 @@
 
     /** Emitted when the media is removed using #removeMedia(). */
-    void mediumRemoved (VBoxDefs::MediaType, const QString &);
+    void mediumRemoved (VBoxDefs::MediumType, const QString &);
 
     /* signals emitted when the VirtualBox callback is called by the server

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

@@ -46 +46 @@
 
     void setCurrentItem (const QString &aItemId);
-    void setType (VBoxDefs::MediaType aMediaType);
+    void setType (VBoxDefs::MediumType aMediumType);
     void setMachineId (const QString &aMachineId = QString::null);
+    void setNullItemPresent (bool aNullItemPresent);
 
     void setShowDiffs (bool aShowDiffs);
@@ -59 +60 @@
     void mediumAdded (const VBoxMedium &);
     void mediumUpdated (const VBoxMedium &);
-    void mediumRemoved (VBoxDefs::MediaType, const QString &);
+    void mediumRemoved (VBoxDefs::MediumType, const QString &);
 
     void processActivated (int aIndex);
@@ -77 +78 @@
     bool findMediaIndex (const QString &aId, int &aIndex);
 
-    VBoxDefs::MediaType mType;
+    VBoxDefs::MediumType mType;
 
     /** Obtruncated VBoxMedium structure. */
@@ -98 +99 @@
 
     bool mShowDiffs : 1;
+    bool mNullItemPresent : 1;
 
     QString mMachineId;

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

@@ -50 +50 @@
     ~VBoxMediaManagerDlg();
 
-    void setup (VBoxDefs::MediaType aType, bool aDoSelect,
+    void setup (VBoxDefs::MediumType aType, bool aDoSelect,
                 bool aRefresh = true,
                 const CMachine &aSessionMachine = CMachine(),
@@ -78 +78 @@
     void mediumAdded (const VBoxMedium &aMedium);
     void mediumUpdated (const VBoxMedium &aMedium);
-    void mediumRemoved (VBoxDefs::MediaType aType, const QString &aId);
+    void mediumRemoved (VBoxDefs::MediumType aType, const QString &aId);
 
     void mediumEnumStarted();
@@ -103 +103 @@
 private:
 
-    QTreeWidget* treeWidget (VBoxDefs::MediaType aType) const;
-    VBoxDefs::MediaType currentTreeWidgetType() const;
+    QTreeWidget* treeWidget (VBoxDefs::MediumType aType) const;
+    VBoxDefs::MediumType currentTreeWidgetType() const;
     QTreeWidget* currentTreeWidget() const;
 
@@ -112 +112 @@
     void setCurrentItem (QTreeWidget *aTree, QTreeWidgetItem *aItem);
 
-    void addMediumToList (const QString &aLocation, VBoxDefs::MediaType aType);
+    void addMediumToList (const QString &aLocation, VBoxDefs::MediumType aType);
 
     MediaItem* createHardDiskItem (QTreeWidget *aTree, const VBoxMedium &aMedium) const;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxMedium.h

@@ -24 +24 @@
 #define __VBoxMedium_h__
 
-#include "COMDefs.h"
-
-/* Qt includes */
+/* Global includes */
 #include <QPixmap>
 #include <QLinkedList>
+
+/* Local includes */
+#include "COMDefs.h"
 
 /**
@@ -45 +46 @@
  * the medium itself.
  *
- * Note that this class "abuses" the KMediaState_NotCreated state value to
+ * Note that this class "abuses" the KMediumState_NotCreated state value to
  * indicate that the accessibility check of the given medium (see
  * #blockAndQueryState()) has not been done yet and therefore some parameters
  * such as #size() are meaningless because they can be read only from the
- * accessible medium. The real KMediaState_NotCreated state is not necessary
+ * accessible medium. The real KMediumState_NotCreated state is not necessary
  * because this class is only used with created (existing) media.
  */
@@ -58 +59 @@
     /**
      * Creates a null medium descriptor which is not associated with any medium.
-     * The state field is set to KMediaState_NotCreated.
+     * The state field is set to KMediumState_NotCreated.
      */
     VBoxMedium()
-        : mType (VBoxDefs::MediaType_Invalid)
-        , mState (KMediaState_NotCreated)
-        , mIsReadOnly (false), mIsUsedInSnapshots (false)
-        , mParent (NULL) {}
+        : mType (VBoxDefs::MediumType_Invalid)
+        , mState (KMediumState_NotCreated)
+        , mIsReadOnly (false)
+        , mIsUsedInSnapshots (false)
+        , mParent (0) { refresh(); }
 
     /**
      * Creates a media descriptor associated with the given medium.
      *
-     * The state field remain KMediaState_NotCreated until #blockAndQueryState()
+     * The state field remain KMediumState_NotCreated until #blockAndQueryState()
      * is called. All precomposed strings are filled up by implicitly calling
      * #refresh(), see the #refresh() details for more info.
@@ -77 +79 @@
      * disk media.
      */
-    VBoxMedium (const CMedium &aMedium, VBoxDefs::MediaType aType,
-                VBoxMedium *aParent = NULL)
-        : mMedium (aMedium), mType (aType)
-        , mState (KMediaState_NotCreated)
-        , mIsReadOnly (false), mIsUsedInSnapshots (false)
-        , mParent (aParent) { init(); }
+    VBoxMedium (const CMedium &aMedium, VBoxDefs::MediumType aType, VBoxMedium *aParent = 0)
+        : mMedium (aMedium)
+        , mType (aType)
+        , mState (KMediumState_NotCreated)
+        , mIsReadOnly (false)
+        , mIsUsedInSnapshots (false)
+        , mParent (aParent) { refresh(); }
 
     /**
@@ -89 +92 @@
      * creation.
      */
-    VBoxMedium (const CMedium &aMedium, VBoxDefs::MediaType aType,
-                KMediaState aState)
-        : mMedium (aMedium), mType (aType)
+    VBoxMedium (const CMedium &aMedium, VBoxDefs::MediumType aType, KMediumState aState)
+        : mMedium (aMedium)
+        , mType (aType)
         , mState (aState)
-        , mIsReadOnly (false), mIsUsedInSnapshots (false)
-        , mParent (NULL) { init(); }
+        , mIsReadOnly (false)
+        , mIsUsedInSnapshots (false)
+        , mParent (0) { refresh(); }
 
     void blockAndQueryState();
     void refresh();
 
-    const CMedium &medium() const { return mMedium; };
-
-    VBoxDefs::MediaType type() const { return mType; }
+    const CMedium &medium() const { return mMedium; }
+
+    VBoxDefs::MediumType type() const { return mType; }
 
     /**
@@ -109 +113 @@
      * @param aNoDiffs  @c true to enable user-friendly "don't show diffs" mode.
      */
-    KMediaState state (bool aNoDiffs = false) const
+    KMediumState state (bool aNoDiffs = false) const
     {
         unconst (this)->checkNoDiffs (aNoDiffs);
@@ -131 +135 @@
     }
 
-    const CHardDisk &hardDisk() const { return mHardDisk; }
-    const CDVDImage &dvdImage() const { return mDVDImage; }
-    const CFloppyImage &floppyImage() const { return mFloppyImage; }
-
     QString id() const { return mId; }
-
-    QString location (bool aNoDiffs = false) const
-        { return aNoDiffs ? root().mLocation : mLocation; }
-    QString name (bool aNoDiffs = false) const
-        { return aNoDiffs ? root().mName : mName; }
-
-    QString size (bool aNoDiffs = false) const
-        { return aNoDiffs ? root().mSize : mSize; }
-
-    QString hardDiskFormat (bool aNoDiffs = false) const
-        { return aNoDiffs ? root().mHardDiskFormat : mHardDiskFormat; }
-    QString hardDiskType (bool aNoDiffs = false) const
-        { return aNoDiffs ? root().mHardDiskType : mHardDiskType; }
-    QString logicalSize (bool aNoDiffs = false) const
-        { return aNoDiffs ? root().mLogicalSize : mLogicalSize; }
-
-    QString usage (bool aNoDiffs = false) const
-    { return aNoDiffs ? root().mUsage : mUsage; }
+    QString name (bool aNoDiffs = false) const { return aNoDiffs ? root().mName : mName; }
+    QString location (bool aNoDiffs = false) const { return aNoDiffs ? root().mLocation : mLocation; }
+    QString size (bool aNoDiffs = false) const { return aNoDiffs ? root().mSize : mSize; }
+    QString logicalSize (bool aNoDiffs = false) const { return aNoDiffs ? root().mLogicalSize : mLogicalSize; }
+    QString hardDiskFormat (bool aNoDiffs = false) const { return aNoDiffs ? root().mHardDiskFormat : mHardDiskFormat; }
+    QString hardDiskType (bool aNoDiffs = false) const { return aNoDiffs ? root().mHardDiskType : mHardDiskType; }
+    QString usage (bool aNoDiffs = false) const { return aNoDiffs ? root().mUsage : mUsage; }
 
     /**
@@ -171 +160 @@
     /**
      * Returns @c true if this medium is attached to any VM in any snapshot.
-     * which case #usage() will contain a string with comma-sparated VM names.
      */
     bool isUsedInSnapshots() const { return mIsUsedInSnapshots; }
 
     /**
-     * Returns @c true if this medium is attached to the given machine in the
-     * current state.
-     */
-    bool isAttachedInCurStateTo (const QString &aMachineId) const
-        { return mCurStateMachineIds.indexOf (aMachineId) >= 0; }
+     * Returns @c true if this medium corresponds to real host drive.
+     */
+    bool isHostDrive() const { return mIsHostDrive; }
+
+    /**
+     * Returns @c true if this medium is attached to the given machine in the current state.
+     */
+    bool isAttachedInCurStateTo (const QString &aMachineId) const { return mCurStateMachineIds.indexOf (aMachineId) >= 0; }
 
     /**
@@ -186 +177 @@
      * to in their current state (i.e. excluding snapshots).
      */
-    const QList <QString> &curStateMachineIds() const
-        { return mCurStateMachineIds; }
+    const QList <QString> &curStateMachineIds() const { return mCurStateMachineIds; }
 
     /**
@@ -196 +186 @@
     VBoxMedium &root() const;
 
-    QString toolTip(bool aNoDiffs = false, bool aCheckRO = false) const;
+    QString toolTip (bool aNoDiffs = false, bool aCheckRO = false) const;
     QPixmap icon (bool aNoDiffs = false, bool aCheckRO = false) const;
 
     /** Shortcut to <tt>#toolTip (aNoDiffs, true)</tt>. */
-    QString toolTipCheckRO (bool aNoDiffs = false) const
-        { return toolTip (aNoDiffs, true); }
+    QString toolTipCheckRO (bool aNoDiffs = false) const { return toolTip (aNoDiffs, true); }
 
     /** Shortcut to <tt>#icon (aNoDiffs, true)</tt>. */
-    QPixmap iconCheckRO (bool aNoDiffs = false) const
-        { return icon (aNoDiffs, true); }
-
-    QString details (bool aNoDiffs = false, bool aPredictDiff = false,
-                     bool aUseHTML = false) const;
+    QPixmap iconCheckRO (bool aNoDiffs = false) const { return icon (aNoDiffs, true); }
+
+    QString details (bool aNoDiffs = false, bool aPredictDiff = false, bool aUseHTML = false) const;
 
     /** Shortcut to <tt>#details (aNoDiffs, aPredictDiff, true)</tt>. */
-    QString detailsHTML (bool aNoDiffs = false, bool aPredictDiff = false) const
-        { return details (aNoDiffs, aPredictDiff, true); }
+    QString detailsHTML (bool aNoDiffs = false, bool aPredictDiff = false) const { return details (aNoDiffs, aPredictDiff, true); }
 
     /** Returns @c true if this media descriptor is a null object. */
@@ -219 +205 @@
 private:
 
-    void init();
-
     void checkNoDiffs (bool aNoDiffs);
 
     CMedium mMedium;
 
-    VBoxDefs::MediaType mType;
-
-    KMediaState mState;
+    VBoxDefs::MediumType mType;
+
+    KMediumState mState;
     QString mLastAccessError;
     COMResult mResult;
-
-    CHardDisk mHardDisk;
-    CDVDImage mDVDImage;
-    CFloppyImage mFloppyImage;
 
     QString mId;
@@ -249 +229 @@
     bool mIsReadOnly        : 1;
     bool mIsUsedInSnapshots : 1;
+    bool mIsHostDrive       : 1;
 
     QList <QString> mCurStateMachineIds;
@@ -260 +241 @@
     struct NoDiffs
     {
-        NoDiffs() : isSet (false), state (KMediaState_NotCreated) {}
+        NoDiffs() : isSet (false), state (KMediumState_NotCreated) {}
 
         bool isSet : 1;
 
-        KMediaState state;
+        KMediumState state;
         COMResult result;
         QString toolTip;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxNewHDWzd.h

@@ -39 +39 @@
     VBoxNewHDWzd (QWidget *aParent = 0);
 
-    CHardDisk hardDisk() { return mHD; }
+    CMedium hardDisk() { return mHD; }
     void setRecommendedFileName (const QString &aName);
     void setRecommendedSize (quint64 aSize);
@@ -66 +66 @@
 
     QIWidgetValidator *mWValNameAndSize;
-    CHardDisk          mHD;
+    CMedium            mHD;
     int                mSliderScale;
     quint64            mMaxVDISize;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxNewVMWzd.h

@@ -69 +69 @@
     QIWidgetValidator *mWvalMemory;
     QIWidgetValidator *mWvalHDD;
-    CHardDisk mHardDisk;
+    CMedium mHardDisk;
     CMachine mMachine;
 };

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -239 +239 @@
     int confirmDeleteHardDiskStorage (QWidget *aParent,
                                       const QString &aLocation);
-    void cannotDeleteHardDiskStorage (QWidget *aParent, const CHardDisk &aHD,
+    void cannotDeleteHardDiskStorage (QWidget *aParent, const CMedium &aHD,
                                       const CProgress &aProgress);
 
     int confirmDetachAddControllerSlots (QWidget *aParent) const;
     int confirmChangeAddControllerSlots (QWidget *aParent) const;
-    int confirmRunNewHDWzdOrVDM (QWidget* aParent);
+    int confirmRunNewHDWzdOrVDM (KDeviceType aDeviceType);
 
     void cannotCreateHardDiskStorage (QWidget *aParent, const CVirtualBox &aVBox,
                                       const QString &aLocaiton,
-                                      const CHardDisk &aHD,
+                                      const CMedium &aHD,
                                       const CProgress &aProgress);
     void cannotAttachHardDisk (QWidget *aParent, const CMachine &aMachine,
@@ -262 +262 @@
                             const VBoxMedium &aMedium, const COMResult &aResult);
     void cannotOpenMedium (QWidget *aParent, const CVirtualBox &aVBox,
-                           VBoxDefs::MediaType aType, const QString &aLocation);
+                           VBoxDefs::MediumType aType, const QString &aLocation);
     void cannotCloseMedium (QWidget *aParent, const VBoxMedium &aMedium,
                             const COMResult &aResult);
@@ -358 +358 @@
                            const QString &errorMsg) const;
 
-    static QString toAccusative (VBoxDefs::MediaType aType);
+    static QString toAccusative (VBoxDefs::MediumType aType);
 
     static QString formatRC (HRESULT aRC);

trunk/src/VBox/Frontends/VirtualBox/include/VBoxToolBar.h

@@ -26 +26 @@
 #include <QGlobalStatic> /* for Q_WS_MAC */
 #ifdef Q_WS_MAC
-# include "VBoxUtils.h"
+#include "VBoxUtils.h"
 #endif
 
@@ -49 +49 @@
     VBoxToolBar (QWidget *aParent)
         : QToolBar (aParent)
-        , mMainWindow (qobject_cast<QMainWindow*> (aParent))
+        , mMainWindow (qobject_cast <QMainWindow*> (aParent))
     {
         setFloatable (false);
         setMovable (false);
+
+        /* Remove that ugly frame panel around the toolbar.
+         * Doing that currently for Cleanlooks & Windows styles. */
+        if (qobject_cast <QCleanlooksStyle*> (QToolBar::style()) ||
+            qobject_cast <QWindowsStyle*> (QToolBar::style()))
+            setStyleSheet ("QToolBar { border: 0px none black; }");
+
         if (layout())
             layout()->setContentsMargins (0, 0, 0, 0);;
 
         setContextMenuPolicy (Qt::NoContextMenu);
-
-        /* Remove that ugly frame panel around the toolbar. */
-        /* I'm not sure if we should do this generally on linux for that mass
-         * of KDE styles. But maybe some of them are based on CleanLooks so
-         * they are looking ok also. */
-        QStyle *style = NULL;
-        if (!style)
-            /* Check for cleanlooks style */
-            style = qobject_cast<QCleanlooksStyle*> (QToolBar::style());
-        if (!style)
-            /* Check for windows style */
-            style = qobject_cast<QWindowsStyle*> (QToolBar::style());
-        if (style)
-            setStyleSheet ("QToolBar { border: 0px none black; }");
     }
 
-    void setMacToolbar ()
+#ifdef Q_WS_MAC
+    void setMacToolbar()
     {
-#ifdef Q_WS_MAC
         if (mMainWindow)
         {
             mMainWindow->setUnifiedTitleAndToolBarOnMac (true);
-# ifndef QT_MAC_USE_COCOA
+#ifndef QT_MAC_USE_COCOA
             WindowRef window = ::darwinToNativeWindow (this);
             EventHandlerUPP eventHandler = ::NewEventHandlerUPP (VBoxToolBar::macEventFilter);
@@ -90 +83 @@
                                        RT_ELEMENTS (eventTypes), eventTypes,
                                        NULL, NULL);
-# endif /* !QT_MAC_USE_COCOA */
+#endif /* !QT_MAC_USE_COCOA */
         }
-#endif /* Q_WS_MAC */
     }
 
-#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
+#ifndef QT_MAC_USE_COCOA
     static pascal OSStatus macEventFilter (EventHandlerCallRef aNextHandler,
                                            EventRef aEvent, void * /* aUserData */)
@@ -117 +109 @@
         return CallNextEventHandler (aNextHandler, aEvent);
     }
-#endif /* Q_WS_MAC && !QT_MAC_USE_COCOA */
+#endif /* !QT_MAC_USE_COCOA */
 
     void setShowToolBarButton (bool aShow)
     {
-#ifdef Q_WS_MAC
         ::darwinSetShowsToolbarButton (this, aShow);
-#else  /* Q_WS_MAC */
-        Q_UNUSED (aShow);
-#endif /* !Q_WS_MAC */
     }
+#endif /* Q_WS_MAC */
 
-    void setUsesTextLabel (bool enable)
+    void setUsesTextLabel (bool aEnable)
     {
         Qt::ToolButtonStyle tbs = Qt::ToolButtonTextUnderIcon;
-        if (!enable)
+        if (!aEnable)
             tbs = Qt::ToolButtonIconOnly;
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMFirstRunWzd.h

@@ -57 +57 @@
     QIWidgetValidator         *mWvalType;
     CMachine                   mMachine;
-    QVector <CHostDVDDrive>    mHostDVDs;
-    QVector <CHostFloppyDrive> mHostFloppys;
+    QVector <CMedium>          mHostDVDs;
+    QVector <CMedium>          mHostFloppys;
 };
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 #define __VBoxVMSettingsHD_h__
 
+/* Global includes */
+#include <QItemDelegate>
+#include <QPointer>
+
+/* Local includes */
 #include "VBoxSettingsPage.h"
 #include "VBoxVMSettingsHD.gen.h"
 #include "COMDefs.h"
-#include "VBoxMediaComboBox.h"
-
-/* Qt includes */
-#include <QComboBox>
-
-/** Register type to store slot data */
-class SlotValue
-{
-public:
-    SlotValue()
-        : bus (KStorageBus_Null), channel (0), device (0)
-        , name (QString::null) {}
-    SlotValue (KStorageBus aBus, LONG aChannel, LONG aDevice)
-        : bus (aBus), channel (aChannel), device (aDevice)
-        , name (vboxGlobal().toFullString (aBus, aChannel, aDevice)) {}
-    SlotValue (const SlotValue &aOther)
-        : bus (aOther.bus), channel (aOther.channel), device (aOther.device)
-        , name (aOther.name) {}
-
-    SlotValue& operator= (const SlotValue &aOther)
+
+/* Local forwardes */
+class AttachmentItem;
+class ControllerItem;
+
+/* Internal Types */
+typedef QList <StorageSlot> SlotsList;
+typedef QList <KDeviceType> DeviceTypeList;
+typedef QList <KStorageControllerType> ControllerTypeList;
+Q_DECLARE_METATYPE (SlotsList);
+Q_DECLARE_METATYPE (DeviceTypeList);
+Q_DECLARE_METATYPE (ControllerTypeList);
+
+/* Pixmap Storage Pool */
+class PixmapPool : public QObject
+{
+    Q_OBJECT;
+
+public:
+
+    enum PixmapType
     {
-        bus     = aOther.bus;
-        channel = aOther.channel;
-        device  = aOther.device;
-        name    = aOther.name;
-        return *this;
-    }
-
-    bool operator== (const SlotValue &aOther)
+        InvalidPixmap     = -1,
+
+        AddControllerEn   =  0,
+        AddControllerDis  =  1,
+        DelControllerEn   =  2,
+        DelControllerDis  =  3,
+
+        AddAttachmentEn   =  4,
+        AddAttachmentDis  =  5,
+        DelAttachmentEn   =  6,
+        DelAttachmentDis  =  7,
+
+        IDEController     =  8,
+        SATAController    =  9,
+        SCSIController    = 10,
+        FloppyController  = 11,
+
+        HDAttachmentEn    = 12,
+        HDAttachmentDis   = 13,
+        CDAttachmentEn    = 14,
+        CDAttachmentDis   = 15,
+        FDAttachmentEn    = 16,
+        FDAttachmentDis   = 17,
+
+        PlusEn            = 18,
+        PlusDis           = 19,
+        MinusEn           = 20,
+        MinusDis          = 21,
+
+        UnknownEn         = 22,
+
+        VMMEn             = 23,
+        VMMDis            = 24,
+
+        MaxIndex
+    };
+
+    static PixmapPool* pool (QObject *aParent = 0);
+
+    QPixmap pixmap (PixmapType aType) const;
+
+protected:
+
+    PixmapPool (QObject *aParent);
+
+    static QPointer <PixmapPool> mThis;
+
+private:
+
+    QVector <QPixmap> mPool;
+};
+
+/* Abstract Controller Type */
+class AbstractControllerType
+{
+public:
+
+    AbstractControllerType (KStorageBus aBusType, KStorageControllerType aCtrType);
+    virtual ~AbstractControllerType() {}
+
+    KStorageBus busType() const;
+    KStorageControllerType ctrType() const;
+    ControllerTypeList ctrTypes() const;
+    PixmapPool::PixmapType pixmap() const;
+
+    void setCtrType (KStorageControllerType aCtrType);
+
+    virtual DeviceTypeList deviceTypeList() const = 0;
+
+protected:
+
+    virtual KStorageControllerType first() const = 0;
+    virtual uint size() const = 0;
+
+    KStorageBus mBusType;
+    KStorageControllerType mCtrType;
+    PixmapPool::PixmapType mPixmap;
+};
+
+/* IDE Controller Type */
+class IDEControllerType : public AbstractControllerType
+{
+public:
+
+    IDEControllerType (KStorageControllerType aSubType);
+
+private:
+
+    DeviceTypeList deviceTypeList() const;
+
+    KStorageControllerType first() const;
+    uint size() const;
+};
+
+/* SATA Controller Type */
+class SATAControllerType : public AbstractControllerType
+{
+public:
+
+    SATAControllerType (KStorageControllerType aSubType);
+
+private:
+
+    DeviceTypeList deviceTypeList() const;
+
+    KStorageControllerType first() const;
+    uint size() const;
+};
+
+/* SCSI Controller Type */
+class SCSIControllerType : public AbstractControllerType
+{
+public:
+
+    SCSIControllerType (KStorageControllerType aSubType);
+
+private:
+
+    DeviceTypeList deviceTypeList() const;
+
+    KStorageControllerType first() const;
+    uint size() const;
+};
+
+/* Floppy Controller Type */
+class FloppyControllerType : public AbstractControllerType
+{
+public:
+
+    FloppyControllerType (KStorageControllerType aSubType);
+
+private:
+
+    DeviceTypeList deviceTypeList() const;
+
+    KStorageControllerType first() const;
+    uint size() const;
+};
+
+/* Abstract Item */
+class AbstractItem
+{
+public:
+
+    enum ItemType
     {
-        return bus     == aOther.bus &&
-               channel == aOther.channel &&
-               device  == aOther.device;
-    }
-
-    bool operator!= (const SlotValue &aOther)
+        Type_InvalidItem    = 0,
+        Type_RootItem       = 1,
+        Type_ControllerItem = 2,
+        Type_AttachmentItem = 3
+    };
+
+    AbstractItem (AbstractItem *aParent = 0);
+    virtual ~AbstractItem();
+
+    AbstractItem* parent();
+    QUuid id();
+
+    virtual ItemType rtti() const = 0;
+    virtual AbstractItem* childByPos (int aIndex) = 0;
+    virtual AbstractItem* childById (const QUuid &aId) = 0;
+    virtual int posOfChild (AbstractItem *aItem) const = 0;
+    virtual int childCount() const = 0;
+    virtual QString text() const = 0;
+    virtual QString tip() const = 0;
+    virtual QPixmap pixmap() = 0;
+
+protected:
+
+    virtual void addChild (AbstractItem *aItem) = 0;
+    virtual void delChild (AbstractItem *aItem) = 0;
+
+    AbstractItem *mParent;
+    QUuid         mId;
+};
+Q_DECLARE_METATYPE (AbstractItem::ItemType);
+
+/* Root Item */
+class RootItem : public AbstractItem
+{
+public:
+
+    RootItem();
+   ~RootItem();
+
+    ItemType rtti() const;
+    AbstractItem* childByPos (int aIndex);
+    AbstractItem* childById (const QUuid &aId);
+    int posOfChild (AbstractItem *aItem) const;
+    int childCount() const;
+    QString text() const;
+    QString tip() const;
+    QPixmap pixmap();
+
+private:
+
+    void addChild (AbstractItem *aItem);
+    void delChild (AbstractItem *aItem);
+
+    QList <AbstractItem*> mControllers;
+};
+
+/* Controller Item */
+class ControllerItem : public AbstractItem
+{
+public:
+
+    ControllerItem (AbstractItem *aParent, const QString &aName, KStorageBus aBusType,
+                    KStorageControllerType aControllerType);
+   ~ControllerItem();
+
+    ItemType rtti() const;
+    AbstractItem* childByPos (int aIndex);
+    AbstractItem* childById (const QUuid &aId);
+    int posOfChild (AbstractItem *aItem) const;
+    int childCount() const;
+    QString text() const;
+    QString tip() const;
+    QPixmap pixmap();
+
+    KStorageBus ctrBusType() const;
+    QString ctrName() const;
+    KStorageControllerType ctrType() const;
+    ControllerTypeList ctrTypes() const;
+
+    void setCtrName (const QString &aCtrName);
+    void setCtrType (KStorageControllerType aCtrType);
+
+    SlotsList ctrAllSlots() const;
+    SlotsList ctrUsedSlots() const;
+    DeviceTypeList ctrDeviceTypeList() const;
+    QStringList ctrAllMediumIds() const;
+    QStringList ctrUsedMediumIds() const;
+
+private:
+
+    void addChild (AbstractItem *aItem);
+    void delChild (AbstractItem *aItem);
+
+    QString mCtrName;
+    AbstractControllerType *mCtrType;
+    QList <AbstractItem*> mAttachments;
+};
+
+/* Attachment Item */
+class AttachmentItem : public AbstractItem
+{
+public:
+
+    AttachmentItem (AbstractItem *aParent, KDeviceType aDeviceType);
+
+    ItemType rtti() const;
+    AbstractItem* childByPos (int aIndex);
+    AbstractItem* childById (const QUuid &aId);
+    int posOfChild (AbstractItem *aItem) const;
+    int childCount() const;
+    QString text() const;
+    QString tip() const;
+    QPixmap pixmap();
+
+    StorageSlot attSlot() const;
+    SlotsList attSlots() const;
+    KDeviceType attDeviceType() const;
+    DeviceTypeList attDeviceTypes() const;
+    QString attMediumId() const;
+    QStringList attMediumIds (bool aFilter = true) const;
+    bool attIsHostDrive() const;
+    bool attIsPassthrough() const;
+
+    void setAttSlot (const StorageSlot &aAttSlot);
+    void setAttDevice (KDeviceType aAttDeviceType);
+    void setAttMediumId (const QString &aAttMediumId);
+    void setAttIsPassthrough (bool aPassthrough);
+
+    QString attSize() const;
+    QString attLogicalSize() const;
+    QString attLocation() const;
+    QString attFormat() const;
+    QString attUsage() const;
+
+private:
+
+    void cache (const VBoxMedium &aMedium);
+
+    void addChild (AbstractItem *aItem);
+    void delChild (AbstractItem *aItem);
+
+    KDeviceType mAttDeviceType;
+
+    StorageSlot mAttSlot;
+    QString mAttMediumId;
+    bool mAttIsHostDrive;
+    bool mAttIsPassthrough;
+
+    QString mAttName;
+    QString mAttTip;
+    QPixmap mAttPixmap;
+
+    QString mAttSize;
+    QString mAttLogicalSize;
+    QString mAttLocation;
+    QString mAttFormat;
+    QString mAttUsage;
+};
+
+/* Storage Model */
+class StorageModel : public QAbstractItemModel
+{
+    Q_OBJECT;
+
+public:
+
+    enum DataRole
     {
-        return ! (*this == aOther);
-    }
-
-    KStorageBus bus;
-    LONG        channel;
-    LONG        device;
-    QString     name;
-};
-Q_DECLARE_METATYPE (SlotValue);
-
-/** Register type to store disk data */
-class DiskValue
-{
-public:
-    DiskValue()
-        : id (QString::null)
-        , name (QString::null), tip (QString::null), pix (QPixmap()) {}
-    DiskValue (const QString &aId);
-    DiskValue (const DiskValue &aOther)
-        : id (aOther.id)
-        , name (aOther.name), tip (aOther.tip), pix (aOther.pix) {}
-
-    DiskValue& operator= (const DiskValue &aOther)
-    {
-        id   = aOther.id;
-        name = aOther.name;
-        tip  = aOther.tip;
-        pix  = aOther.pix;
-        return *this;
-    }
-
-    bool operator== (const DiskValue &aOther)
-    {
-        return id == aOther.id;
-    }
-
-    bool operator!= (const DiskValue &aOther)
-    {
-        return ! (*this == aOther);
-    }
-
-    QString id;
-    QString name;
-    QString tip;
-    QPixmap pix;
-};
-Q_DECLARE_METATYPE (DiskValue);
-
-/** Declare type to store both slot&disk data */
-class Attachment
-{
-public:
-    Attachment (SlotValue aSlot, DiskValue aDisk)
-        : slot (aSlot), disk (aDisk) {}
-
-    /* Define sorting rules */
-    bool operator< (const Attachment &aOther) const
-    {
-        return (slot.bus <  aOther.slot.bus) ||
-               (slot.bus == aOther.slot.bus && slot.channel <  aOther.slot.channel) ||
-               (slot.bus == aOther.slot.bus && slot.channel == aOther.slot.channel && slot.device <  aOther.slot.device);
-    }
-
-    SlotValue slot;
-    DiskValue disk;
-};
-
-/**
- * QAbstractTableModel class reimplementation.
- * Used to feat slot/disk selection mechanism.
- */
-class AttachmentsModel : public QAbstractTableModel
+        R_ItemId = Qt::UserRole + 1,
+        R_ItemPixmap,
+        R_ItemPixmapRect,
+        R_ItemName,
+        R_ItemNamePoint,
+        R_ItemType,
+        R_IsController,
+        R_IsAttachment,
+
+        R_IsMoreControllersPossible,
+        R_IsMoreAttachmentsPossible,
+
+        R_CtrName,
+        R_CtrType,
+        R_CtrTypes,
+        R_CtrDevices,
+        R_CtrBusType,
+
+        R_AttSlot,
+        R_AttSlots,
+        R_AttDevice,
+        R_AttDevices,
+        R_AttMediumId,
+        R_AttIsHostDrive,
+        R_AttIsPassthrough,
+        R_AttSize,
+        R_AttLogicalSize,
+        R_AttLocation,
+        R_AttFormat,
+        R_AttUsage,
+
+        R_Margin,
+        R_Spacing,
+        R_IconSize,
+
+        R_HDPixmapEn,
+        R_HDPixmapDis,
+        R_CDPixmapEn,
+        R_CDPixmapDis,
+        R_FDPixmapEn,
+        R_FDPixmapDis,
+        R_HDPixmapRect,
+        R_CDPixmapRect,
+        R_FDPixmapRect,
+
+        R_PlusPixmapEn,
+        R_PlusPixmapDis,
+        R_MinusPixmapEn,
+        R_MinusPixmapDis,
+        R_AdderPoint
+    };
+
+    StorageModel (QObject *aParent);
+   ~StorageModel();
+
+    int rowCount (const QModelIndex &aParent = QModelIndex()) const;
+    int columnCount (const QModelIndex &aParent = QModelIndex()) const;
+
+    QModelIndex root() const;
+    QModelIndex index (int aRow, int aColumn, const QModelIndex &aParent = QModelIndex()) const;
+    QModelIndex parent (const QModelIndex &aIndex) const;
+
+    QVariant data (const QModelIndex &aIndex, int aRole) const;
+    bool setData (const QModelIndex &aIndex, const QVariant &aValue, int aRole);
+
+    QModelIndex addController (const QString &aCtrName, KStorageBus aBusType, KStorageControllerType aCtrType);
+    void delController (const QUuid &aCtrId);
+
+    QModelIndex addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType);
+    void delAttachment (const QUuid &aCtrId, const QUuid &aAttId);
+
+private:
+
+    Qt::ItemFlags flags (const QModelIndex &aIndex) const;
+
+    AbstractItem *mRootItem;
+
+    QPixmap mPlusPixmapEn;
+    QPixmap mPlusPixmapDis;
+
+    QPixmap mMinusPixmapEn;
+    QPixmap mMinusPixmapDis;
+};
+
+/* Storage Delegate */
+class StorageDelegate : public QItemDelegate
 {
     Q_OBJECT;
@@ -141 +459 @@
 public:
 
-    AttachmentsModel (QITableView *aParent, int aSlotId, int aDiskId)
-        : QAbstractTableModel (aParent), mParent (aParent)
-        , mSlotId (aSlotId), mDiskId (aDiskId) {}
-
-    Qt::ItemFlags flags (const QModelIndex &aIndex) const;
-
-    int columnCount (const QModelIndex &aParent = QModelIndex()) const
-        { NOREF (aParent); return 2; }
-    int rowCount (const QModelIndex &aParent = QModelIndex()) const
-        { NOREF (aParent); return mUsedSlotsList.count() + 1; }
-
-    QVariant data (const QModelIndex &aIndex,
-                   int aRole = Qt::DisplayRole) const;
-    bool setData (const QModelIndex &aIndex,
-                  const QVariant &aValue,
-                  int aRole = Qt::EditRole);
-    QVariant headerData (int aSection,
-                         Qt::Orientation aOrientation,
-                         int aRole = Qt::DisplayRole) const;
-
-    void addItem (const SlotValue &aSlot = SlotValue(),
-                  const DiskValue &aDisk = DiskValue());
-    void delItem (int aIndex);
-
-    const QList<SlotValue>& usedSlotsList() { return mUsedSlotsList; }
-    const QList<DiskValue>& usedDisksList() { return mUsedDisksList; }
-    QList<Attachment> fullUsedList();
-
-    void removeAddController();
-    void updateDisks();
-
-private:
-
-    QITableView *mParent;
-    QList<SlotValue> mUsedSlotsList;
-    QList<DiskValue> mUsedDisksList;
-    int mSlotId;
-    int mDiskId;
-};
-
-/**
- * QComboBox class reimplementation.
- * Used as editor for HD Attachment SLOT field.
- */
-class SlotEditor : public QComboBox
-{
-    Q_OBJECT;
-    Q_PROPERTY (QVariant slot READ slot WRITE setSlot USER true);
-
-public:
-
-    SlotEditor (QWidget *aParent);
-
-    QVariant slot() const;
-    void setSlot (QVariant aSlot);
-
-signals:
-
-    void readyToCommit (QWidget *aThis);
-
-private slots:
-
-    void onActivate();
-
-private:
-
-#if 0 /* F2 key binding left for future releases... */
-    void keyPressEvent (QKeyEvent *aEvent);
-#endif
-
-    void populate (const SlotValue &aIncluding);
-
-    QList<SlotValue> mList;
-};
-
-/**
- * VBoxMediaComboBox class reimplementation.
- * Used as editor for HD Attachment DISK field.
- */
-class DiskEditor : public VBoxMediaComboBox
-{
-    Q_OBJECT;
-    Q_PROPERTY (QVariant disk READ disk WRITE setDisk USER true);
-
-public:
-
-    static DiskEditor* activeEditor();
-
-    DiskEditor (QWidget *aParent);
-   ~DiskEditor();
-
-    QVariant disk() const;
-    void setDisk (QVariant aDisk);
-
-signals:
-
-    void readyToCommit (QWidget *aThis);
-
-protected:
-
-    void paintEvent (QPaintEvent *aEvent);
-    void initStyleOption (QStyleOptionComboBox *aOption) const;
-
-private slots:
-
-    void onActivate();
-
-private:
-
-#if 0 /* F2 key binding left for future releases... */
-    void keyPressEvent (QKeyEvent *aEvent);
-#endif
-
-    static DiskEditor *mInstance;
-};
-
-/**
- * Singleton QObject class reimplementation.
- * Used to make selected HD Attachments slots unique &
- * stores some specific data used for HD Settings.
- */
-class HDSettings : public QObject
-{
-    Q_OBJECT;
-
-public:
-
-    static HDSettings* instance (QWidget *aParent = 0,
-                                 AttachmentsModel *aWatched = 0);
-
-    QList<SlotValue> slotsList (const SlotValue &aIncluding = SlotValue(),
-                                bool aFilter = false) const;
-    QList<DiskValue> disksList() const;
-
-    bool tryToChooseUniqueDisk (DiskValue &aResult) const;
-
-    const CMachine& machine() const { return mMachine; }
-    void setMachine (const CMachine &aMachine) { mMachine = aMachine; }
-
-    int addCount() const { return mAddCount; }
-    void setAddCount (int aAddCount, KStorageBus aAddBus)
-    {
-        if (mAddCount != aAddCount ||
-            aAddBus != mAddBus)
-        {
-            mAddCount = aAddCount;
-            mAddBus = aAddBus;
-            makeAddControllerList();
-        }
-    }
-
-    bool showDiffs() const { return mShowDiffs; }
-    void setShowDiffs (bool aShowDiffs)
-    {
-        mShowDiffs = aShowDiffs;
-        update();
-    }
-
-protected:
-
-    HDSettings (QWidget *aParent, AttachmentsModel *aWatched);
-    virtual ~HDSettings();
-
-private slots:
-
-    void update()
-    {
-        makeMediumList();
-        mModel->updateDisks();
-    }
-
-private:
-
-    void makeIDEList();
-    void makeAddControllerList();
-    void makeMediumList();
-
-
-    static HDSettings *mInstance;
-
-    AttachmentsModel *mModel;
-    CMachine mMachine;
-
-    QList<SlotValue> mIDEList;
-    QList<SlotValue> mAddControllerList;
-    QList<DiskValue> mDisksList;
-
-    int mAddCount;
-    KStorageBus mAddBus;
-    bool mShowDiffs;
+    StorageDelegate (QObject *aParent);
+
+private:
+
+    void paint (QPainter *aPainter, const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const;
 };
 
@@ -348 +481 @@
 signals:
 
-    void hdChanged();
+    void mediumChanged();
 
 protected:
@@ -358 +491 @@
     bool revalidate (QString &aWarning, QString &aTitle);
 
-    void setOrderAfter (QWidget *aWidget);
-
     void retranslateUi();
 
+    void showEvent (QShowEvent *aEvent);
+
 private slots:
 
-    void addAttachment();
+    void addController();
+    void addIDEController();
+    void addSATAController();
+    void addSCSIController();
+    void addFloppyController();
+    void delController();
+
+    void addAttachment (KDeviceType aDeviceType = KDeviceType_Null);
     void delAttachment();
-    void showMediaManager();
-
-    void onAddControllerCheckToggled (int);
-    void onAddControllerTypeChanged (int aIndex);
-    bool checkAddControllers (int aWhat);
-    void onShowDiffsCheckToggled (int);
-
-    void updateActions (const QModelIndex &aIndex);
-
-private:
-
-    /* events */
-    bool eventFilter (QObject *aObj, QEvent *aEvent);
-    void showEvent (QShowEvent *aEvent);
-
-    /* private functions */
-    QString getWithMediaManager (const QString &aInitialId = QString::null);
+
+    void getInformation();
+    void setInformation();
+
+    void onVmmInvoked();
+
+    void updateActionsState();
+
+    void onRowInserted (const QModelIndex &aParent, int aIndex);
+    void onRowRemoved();
+
+    void onCurrentItemChanged();
+
+    void onContextMenuRequested (const QPoint &aPosition);
+
+    void onDrawItemBranches (QPainter *aPainter, const QRect &aRect, const QModelIndex &aIndex);
+
+    void onMouseClicked (QMouseEvent *aEvent);
+
+private:
+
     QString getWithNewHDWizard();
-    int maxNameLength() const;
-    void removeFocus();
-    KStorageControllerType currentControllerType() const
-    {
-        return static_cast<KStorageControllerType> (mCbControllerType->itemData (mCbControllerType->currentIndex()).toInt());
-    }
-    KStorageBus currentBusType() const
-    {
-        return vboxGlobal().toStorageBusType (currentControllerType());
-    }
-    int currentMaxPortCount() const
-    {
-        int c = 0;
-        switch (currentBusType())
-        {
-            case KStorageBus_IDE: c = 2; break;
-            case KStorageBus_SATA: c = 30; break;
-            case KStorageBus_SCSI: c = 16; break;
-            default: break;
-        }
-        return c;
-    }
-
-    /* variables */
+    QString getWithMediaManager (VBoxDefs::MediumType aMediumType);
+
+    void updateAdditionalObjects (KDeviceType aType);
+
     CMachine mMachine;
-    AttachmentsModel *mModel;
     QIWidgetValidator *mValidator;
 
-    QAction *mNewAction;
-    QAction *mDelAction;
-    QAction *mVdmAction;
-
-    bool mWasTableSelected;
-    bool mPolished;
-
-    int mLastSelAddControllerIndex;
+    StorageModel *mStorageModel;
+
+    QAction *mAddCtrAction;
+    QAction *mAddIDECtrAction;
+    QAction *mAddSATACtrAction;
+    QAction *mAddSCSICtrAction;
+    QAction *mAddFloppyCtrAction;
+    QAction *mDelCtrAction;
+    QAction *mAddAttAction;
+    QAction *mDelAttAction;
+
+    bool mIsLoadingInProgress;
+    bool mIsPolished;
 };
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
  */
 
+/* Global includes */
+#include <QLabel>
+#include <QHBoxLayout>
+
+/* Local includes */
 #include "QILabelSeparator.h"
 #include "VBoxGlobal.h"
 
-/* Qt includes */
-#include <QLabel>
-#include <QHBoxLayout>
-
 QILabelSeparator::QILabelSeparator (QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
     : QWidget (aParent, aFlags)
-    , mLabel (NULL)
+    , mLabel (0)
 {
     init();
@@ -37 +38 @@
 QILabelSeparator::QILabelSeparator (const QString &aText, QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
     : QWidget (aParent, aFlags)
-    , mLabel (NULL)
+    , mLabel (0)
 {
     init();
     setText (aText);
+}
+
+QString QILabelSeparator::text() const
+{
+    return mLabel->text();
 }
 
@@ -58 +64 @@
 }
 
-QString QILabelSeparator::text() const
-{
-    return mLabel->text();
-}
-
 void QILabelSeparator::init()
 {
@@ -71 +72 @@
     separator->setEnabled (false);
     separator->setContentsMargins (0, 0, 0, 0);
-//    separator->setStyleSheet ("QFrame {border: 1px outset black; }");
+    // separator->setStyleSheet ("QFrame {border: 1px outset black; }");
     separator->setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
 
@@ -79 +80 @@
     layout->addWidget (separator, Qt::AlignBottom);
 }
+

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

@@ -343 +343 @@
 {
 public:
-    MediaDriveChangeEvent (VBoxDefs::MediaType aType)
+    MediaDriveChangeEvent (VBoxDefs::MediumType aType)
         : QEvent ((QEvent::Type) VBoxDefs::MediaDriveChangeEventType)
         , mType (aType) {}
-    VBoxDefs::MediaType type() const { return mType; }
+    VBoxDefs::MediumType type() const { return mType; }
 private:
-    VBoxDefs::MediaType mType;
+    VBoxDefs::MediumType mType;
 };
 
@@ -516 +516 @@
     }
 
-    STDMETHOD(OnDVDDriveChange)()
-    {
-        LogFlowFunc (("DVD Drive changed\n"));
-        QApplication::postEvent (mView,
-            new MediaDriveChangeEvent (VBoxDefs::MediaType_DVD));
-        return S_OK;
-    }
-
-    STDMETHOD(OnFloppyDriveChange)()
-    {
-        LogFlowFunc (("Floppy Drive changed\n"));
-        QApplication::postEvent (mView,
-            new MediaDriveChangeEvent (VBoxDefs::MediaType_Floppy));
-        return S_OK;
-    }
-
     STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
     {
@@ -544 +528 @@
         //QApplication::postEvent (mView,
         //    new StorageControllerChangeEvent ());
+        return S_OK;
+    }
+
+    STDMETHOD(OnMediumChange)(IMediumAttachment *aMediumAttachment)
+    {
+        CMediumAttachment att(aMediumAttachment);
+        switch (att.GetType())
+        {
+            case KDeviceType_Floppy:
+                QApplication::postEvent(mView,
+                    new MediaDriveChangeEvent(VBoxDefs::MediumType_Floppy));
+                break;
+            case KDeviceType_DVD:
+                QApplication::postEvent(mView,
+                    new MediaDriveChangeEvent(VBoxDefs::MediumType_DVD));
+                break;
+            default:
+                /* @todo later add hard disk change as well */
+                break;
+        }
         return S_OK;
     }

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

@@ -962 +962 @@
     connect (console, SIGNAL (additionsStateChanged (const QString&, bool, bool, bool)),
              this, SLOT (updateAdditionsState (const QString &, bool, bool, bool)));
-    connect (console, SIGNAL (mediaDriveChanged (VBoxDefs::MediaType)),
-             this, SLOT (updateMediaDriveState (VBoxDefs::MediaType)));
+    connect (console, SIGNAL (mediaDriveChanged (VBoxDefs::MediumType)),
+             this, SLOT (updateMediaDriveState (VBoxDefs::MediumType)));
     connect (console, SIGNAL (usbStateChange()),
              this, SLOT (updateUsbState()));
@@ -1860 +1860 @@
     {
         mDevicesMountFloppyMenu->setEnabled (isRunningOrPaused);
-        CFloppyDrive floppy = cmachine.GetFloppyDrive();
-        KDriveState state = floppy.GetState();
-        bool mounted = state != KDriveState_NotMounted;
+        CMedium floppy = cmachine.GetMedium("FD", 0, 0);
+        bool mounted = !floppy.isNull();
         mDevicesUnmountFloppyAction->setEnabled (isRunningOrPaused && mounted);
         fd_light->setState (mounted ? KDeviceActivity_Idle : KDeviceActivity_Null);
@@ -1868 +1867 @@
                           "%1</qt>",
                           "Floppy tooltip");
+#if 0
+        /// @todo MEDIUM resurrect host dvd/floppy stuff deleted in r51247
+#endif
         QString name;
-        switch (state)
-        {
-            case KDriveState_HostDriveCaptured:
-            {
-                CHostFloppyDrive drv = floppy.GetHostDrive();
-                QString drvName = drv.GetName();
-                QString description = drv.GetDescription();
-                QString fullName = description.isEmpty() ?
-                    drvName :
-                    QString ("%1 (%2)").arg (description, drvName);
-                name = tr ("<br><nobr><b>Host Drive</b>: %1</nobr>",
-                           "Floppy tooltip").arg (fullName);
-                break;
-            }
-            case KDriveState_ImageMounted:
-            {
-                name = tr ("<br><nobr><b>Image</b>: %1</nobr>",
-                           "Floppy tooltip")
-                    .arg (QDir::toNativeSeparators (floppy.GetImage().GetLocation()));
-                break;
-            }
-            case KDriveState_NotMounted:
-            {
-                name = tr ("<br><nobr><b>No media mounted</b></nobr>",
-                           "Floppy tooltip");
-                break;
-            }
-            default:
-                AssertMsgFailed (("Invalid floppy drive state: %d\n", state));
-        }
+        if (mounted)
+            name = tr ("<br><nobr><b>Image</b>: %1</nobr>",
+                       "Floppy tooltip")
+                .arg (QDir::toNativeSeparators (floppy.GetLocation()));
+        else
+            name = tr ("<br><nobr><b>No media mounted</b></nobr>",
+                       "Floppy tooltip");
         fd_light->setToolTip (tip.arg (name));
     }
@@ -1904 +1883 @@
     {
         mDevicesMountDVDMenu->setEnabled (isRunningOrPaused);
-        CDVDDrive dvd = cmachine.GetDVDDrive();
-        KDriveState state = dvd.GetState();
-        bool mounted = state != KDriveState_NotMounted;
+        CMedium dvd = cmachine.GetMedium("IDE", 1, 0);
+        bool mounted = !dvd.isNull();
         mDevicesUnmountDVDAction->setEnabled (isRunningOrPaused && mounted);
         cd_light->setState (mounted ? KDeviceActivity_Idle : KDeviceActivity_Null);
@@ -1912 +1890 @@
                           "%1</qt>",
                           "DVD-ROM tooltip");
+#if 0
+        /// @todo MEDIUM resurrect host dvd/floppy stuff deleted in r51247
+#endif
         QString name;
-        switch (state)
-        {
-            case KDriveState_HostDriveCaptured:
-            {
-                CHostDVDDrive drv = dvd.GetHostDrive();
-                QString drvName = drv.GetName();
-                QString description = drv.GetDescription();
-                QString fullName = description.isEmpty() ?
-                    drvName :
-                    QString ("%1 (%2)").arg (description, drvName);
-                name = tr ("<br><nobr><b>Host Drive</b>: %1</nobr>",
-                           "DVD-ROM tooltip").arg (fullName);
-                break;
-            }
-            case KDriveState_ImageMounted:
-            {
-                name = tr ("<br><nobr><b>Image</b>: %1</nobr>",
-                           "DVD-ROM tooltip")
-                    .arg (QDir::toNativeSeparators (dvd.GetImage().GetLocation()));
-                break;
-            }
-            case KDriveState_NotMounted:
-            {
-                name = tr ("<br><nobr><b>No media mounted</b></nobr>",
-                           "DVD-ROM tooltip");
-                break;
-            }
-            default:
-                AssertMsgFailed (("Invalid DVD drive state: %d\n", state));
-        }
+        if (mounted)
+            name = tr ("<br><nobr><b>Image</b>: %1</nobr>",
+                       "DVD-ROM tooltip")
+                .arg (QDir::toNativeSeparators (dvd.GetLocation()));
+        else
+            name = tr ("<br><nobr><b>No media mounted</b></nobr>",
+                       "DVD-ROM tooltip");
         cd_light->setToolTip (tip.arg (name));
     }
@@ -1952 +1910 @@
         QString data;
         bool hasDisks = false;
-        CHardDiskAttachmentVector vec = cmachine.GetHardDiskAttachments();
-        for (CHardDiskAttachmentVector::ConstIterator hda = vec.begin();
+        CMediumAttachmentVector vec = cmachine.GetMediumAttachments();
+        for (CMediumAttachmentVector::ConstIterator hda = vec.begin();
              hda != vec.end(); ++ hda)
         {
-            CHardDisk hd = hda->GetHardDisk();
+            if (hda->GetType() != KDeviceType_HardDisk)
+                continue;
+
+            CMedium hd = hda->GetMedium();
             const QString ctlName = hda->GetController();
             CStorageController ctl = cmachine.GetStorageControllerByName(ctlName);
@@ -2830 +2791 @@
     VBoxMediaManagerDlg dlg (this);
 
-    dlg.setup (VBoxDefs::MediaType_Floppy, true /* aDoSelect */,
+    dlg.setup (VBoxDefs::MediumType_Floppy, true /* aDoSelect */,
                true /* aRefresh */, csession.GetMachine());
 
     if (dlg.exec() == QDialog::Accepted)
     {
-        CFloppyDrive drv = csession.GetMachine().GetFloppyDrive();
-
-        drv.MountImage (dlg.selectedId());
-
-        AssertWrapperOk (drv);
-        if (drv.isOk())
+        CMachine m = csession.GetMachine();
+
+        m.MountMedium ("FD", 0, 0, dlg.selectedId());
+
+        AssertWrapperOk (m);
+        if (m.isOk())
         {
             if (mIsAutoSaveMedia)
             {
-                CMachine m = csession.GetMachine();
                 m.SaveSettings();
                 if (!m.isOk())
@@ -2857 +2817 @@
     if (!console) return;
 
-    CFloppyDrive drv = csession.GetMachine().GetFloppyDrive();
-    drv.Unmount();
-    if (drv.isOk())
+    CMachine m = csession.GetMachine();
+    m.MountMedium ("FD", 0, 0, NULL);
+    if (m.isOk())
     {
         if (mIsAutoSaveMedia)
         {
-            CMachine m = csession.GetMachine();
             m.SaveSettings();
             if (!m.isOk())
@@ -2870 +2829 @@
     }
 
-    if (drv.GetState() != KDriveState_NotMounted)
+    if (!m.GetMedium ("FD", 0, 0).isNull())
     {
         /* Looks like Main make no force unmounting here
@@ -2890 +2849 @@
     VBoxMediaManagerDlg dlg (this);
 
-    dlg.setup (VBoxDefs::MediaType_DVD, true /* aDoSelect */,
+    dlg.setup (VBoxDefs::MediumType_DVD, true /* aDoSelect */,
                true /* aRefresh */, csession.GetMachine());
 
     if (dlg.exec() == QDialog::Accepted)
     {
-        CDVDDrive drv = csession.GetMachine().GetDVDDrive();
-
-        drv.MountImage (dlg.selectedId());
-
-        AssertWrapperOk (drv);
-        if (drv.isOk())
+        CMachine m = csession.GetMachine();
+
+        m.MountMedium ("IDE", 1, 0, dlg.selectedId());
+
+        AssertWrapperOk (m);
+        if (m.isOk())
         {
             if (mIsAutoSaveMedia)
             {
-                CMachine m = csession.GetMachine();
                 m.SaveSettings();
                 if (!m.isOk())
@@ -2918 +2876 @@
     if (!console) return;
 
-    CDVDDrive drv = csession.GetMachine().GetDVDDrive();
-    drv.Unmount();
-    AssertWrapperOk (drv);
-    if (drv.isOk())
+    CMachine m = csession.GetMachine();
+    m.MountMedium ("IDE", 1, 0, NULL);
+    AssertWrapperOk (m);
+    if (m.isOk())
     {
         if (mIsAutoSaveMedia)
         {
-            CMachine m = csession.GetMachine();
             m.SaveSettings();
             if (!m.isOk())
@@ -2932 +2889 @@
     }
 
-    if (drv.GetState() != KDriveState_NotMounted)
+    if (!m.GetMedium("IDE", 1, 0).isNull())
     {
         /* Looks like Main make no force unmounting here
@@ -2999 +2956 @@
                             .arg (vbox.GetVersion().remove ("_OSE"));
 
-    CDVDImageVector vec = vbox.GetDVDImages();
-    for (CDVDImageVector::ConstIterator it = vec.begin();
+    CMediumVector vec = vbox.GetDVDImages();
+    for (CMediumVector::ConstIterator it = vec.begin();
          it != vec.end(); ++ it)
     {
@@ -3032 +2989 @@
     QString uuid;
 
-    CDVDImage image = vbox.FindDVDImage (aSource);
+    CMedium image = vbox.FindDVDImage (aSource);
     if (image.isNull())
     {
@@ -3044 +3001 @@
     if (!vbox.isOk())
         return vboxProblem().cannotOpenMedium (this, vbox,
-                                               VBoxDefs::MediaType_DVD, aSource);
+                                               VBoxDefs::MediumType_DVD, aSource);
 
     Assert (!uuid.isNull());
-    CDVDDrive drv = csession.GetMachine().GetDVDDrive();
-    drv.MountImage (uuid);
-    AssertWrapperOk (drv);
-    if (drv.isOk())
+    CMachine m = csession.GetMachine();
+    m.MountMedium ("IDE", 1, 0, uuid);
+    AssertWrapperOk (m);
+    if (m.isOk())
     {
         if (mIsAutoSaveMedia)
         {
-            CMachine m = csession.GetMachine();
             m.SaveSettings();
             if (!m.isOk())
@@ -3164 +3120 @@
     mDevicesMountFloppyMenu->clear();
 
-    CHostFloppyDrive selected = csession.GetMachine().GetFloppyDrive().GetHostDrive();
+    CMedium selected = csession.GetMachine().GetMedium("FD", 0, 0);
 
     hostFloppyMap.clear();
-    CHostFloppyDriveVector drvvec =
+    CMediumVector drvvec =
         vboxGlobal().virtualBox().GetHost().GetFloppyDrives();
     for (int i = 0; i < drvvec.size(); ++i)
     {
-        CHostFloppyDrive hostFloppy = drvvec[i];
+        CMedium hostFloppy = drvvec[i];
         /** @todo set icon */
         QString drvName = hostFloppy.GetName();
@@ -3211 +3167 @@
     mDevicesMountDVDMenu->clear();
 
-    CHostDVDDrive selected = csession.GetMachine().GetDVDDrive().GetHostDrive();
+    CMedium selected = csession.GetMachine().GetMedium("IDE", 2, 0);
 
     hostDVDMap.clear();
-    CHostDVDDriveVector drvvec =
+    CMediumVector drvvec =
         vboxGlobal().virtualBox().GetHost().GetDVDDrives();
     for (int i = 0; i < drvvec.size(); ++i)
     {
-        CHostDVDDrive hostDVD = drvvec[i];
+        CMedium hostDVD = drvvec[i];
         /** @todo set icon */
         QString drvName = hostDVD.GetName();
@@ -3280 +3236 @@
     if (!console) return;
 
-    CHostFloppyDrive d = hostFloppyMap [aAction];
+    CMedium d = hostFloppyMap [aAction];
     /* if null then some other item but host drive is selected */
     if (d.isNull()) return;
 
-    CFloppyDrive drv = csession.GetMachine().GetFloppyDrive();
-    drv.CaptureHostDrive (d);
-    AssertWrapperOk (drv);
-
-    if (drv.isOk())
+    CMachine m = csession.GetMachine();
+    m.MountMedium ("FD", 0, 0, d.GetId());
+    AssertWrapperOk (m);
+
+    if (m.isOk())
     {
         if (mIsAutoSaveMedia)
         {
-            CMachine m = csession.GetMachine();
             m.SaveSettings();
             if (!m.isOk())
@@ -3307 +3262 @@
     if (!console) return;
 
-    CHostDVDDrive d = hostDVDMap [aAction];
+    CMedium d = hostDVDMap [aAction];
     /* if null then some other item but host drive is selected */
     if (d.isNull()) return;
 
-    CDVDDrive drv = csession.GetMachine().GetDVDDrive();
-    drv.CaptureHostDrive (d);
-    AssertWrapperOk (drv);
-
-    if (drv.isOk())
+    CMachine m = csession.GetMachine();
+    m.MountMedium ("IDE", 1, 0, d.GetId());
+    AssertWrapperOk (m);
+
+    if (m.isOk())
     {
         if (mIsAutoSaveMedia)
         {
-            CMachine m = csession.GetMachine();
             m.SaveSettings();
             if (!m.isOk())
@@ -3638 +3592 @@
 }
 
-void VBoxConsoleWnd::updateMediaDriveState (VBoxDefs::MediaType aType)
-{
-    Assert (aType == VBoxDefs::MediaType_DVD || aType == VBoxDefs::MediaType_Floppy);
-    updateAppearanceOf (aType == VBoxDefs::MediaType_DVD ? DVDStuff :
-                        aType == VBoxDefs::MediaType_Floppy ? FloppyStuff :
+void VBoxConsoleWnd::updateMediaDriveState (VBoxDefs::MediumType aType)
+{
+    Assert (aType == VBoxDefs::MediumType_DVD || aType == VBoxDefs::MediumType_Floppy);
+    updateAppearanceOf (aType == VBoxDefs::MediumType_DVD ? DVDStuff :
+                        aType == VBoxDefs::MediumType_Floppy ? FloppyStuff :
                         AllStuff);
 }

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

@@ -389 +389 @@
     }
 
-    STDMETHOD(OnMediaRegistered) (IN_BSTR id, DeviceType_T type,
-                                  BOOL registered)
+    STDMETHOD(OnMediumRegistered) (IN_BSTR id, DeviceType_T type,
+                                   BOOL registered)
     {
         /** @todo */
@@ -953 +953 @@
 
 /**
- * Returns a string representation of the given channel number on the given
- * storage bus. Complementary to #toStorageChannel (KStorageBus, const
- * QString &) const.
+ * Returns a string representation of the given channel number on the given storage bus.
+ * Complementary to #toStorageChannel (KStorageBus, const QString &) const.
  */
 QString VBoxGlobal::toString (KStorageBus aBus, LONG aChannel) const
@@ -970 +969 @@
                 break;
             }
-
-            AssertMsgFailedBreak (("Invalid channel %d\n", aChannel));
+            AssertMsgFailed (("Invalid IDE channel %d\n", aChannel));
+            break;
         }
         case KStorageBus_SATA:
+        case KStorageBus_SCSI:
         {
             channel = mStorageBusChannels [2].arg (aChannel);
             break;
         }
-        case KStorageBus_SCSI:
-        {
-            channel = mStorageBusChannels [2].arg (aChannel);
+        case KStorageBus_Floppy:
+        {
+            AssertMsgFailed (("Floppy have no channels, only devices\n"));
             break;
         }
         default:
-            AssertFailedBreak();
+        {
+            AssertMsgFailed (("Invalid bus type %d\n", aBus));
+            break;
+        }
     }
 
@@ -992 +995 @@
 
 /**
- * Returns a channel number on the given storage bus corresponding to the given
- * string representation. Complementary to #toString (KStorageBus, LONG) const.
+ * Returns a channel number on the given storage bus corresponding to the given string representation.
+ * Complementary to #toString (KStorageBus, LONG) const.
  */
 LONG VBoxGlobal::toStorageChannel (KStorageBus aBus, const QString &aChannel) const
@@ -1003 +1006 @@
         case KStorageBus_IDE:
         {
-            QLongStringHash::const_iterator it =
-                qFind (mStorageBusChannels.begin(), mStorageBusChannels.end(),
-                       aChannel);
-            AssertMsgBreak (it != mStorageBusChannels.end(),
-                            ("No value for {%s}\n", aChannel.toLatin1().constData()));
+            QLongStringHash::const_iterator it = qFind (mStorageBusChannels.begin(), mStorageBusChannels.end(), aChannel);
+            AssertMsgBreak (it != mStorageBusChannels.end(), ("No value for {%s}\n", aChannel.toLatin1().constData()));
             channel = it.key();
             break;
@@ -1014 +1014 @@
         case KStorageBus_SCSI:
         {
-            /// @todo use regexp to properly extract the %1 text
             QString tpl = mStorageBusChannels [2].arg ("");
             if (aChannel.startsWith (tpl))
@@ -1021 +1020 @@
                 break;
             }
-
-            AssertMsgFailedBreak (("Invalid channel {%s}\n", aChannel.toLatin1().constData()));
+            AssertMsgFailed (("Invalid channel {%s}\n", aChannel.toLatin1().constData()));
             break;
         }
+        case KStorageBus_Floppy:
+        {
+            channel = 0;
+            break;
+        }
         default:
-            AssertFailedBreak();
+        {
+            AssertMsgFailed (("Invalid bus type %d\n", aBus));
+            break;
+        }
     }
 
@@ -1033 +1039 @@
 
 /**
- * Returns a string representation of the given device number of the given
- * channel on the given storage bus. Complementary to #toStorageDevice
- * (KStorageBus, LONG, const QString &) const.
+ * Returns a string representation of the given device number of the given channel on the given storage bus.
+ * Complementary to #toStorageDevice (KStorageBus, LONG, const QString &) const.
  */
 QString VBoxGlobal::toString (KStorageBus aBus, LONG aChannel, LONG aDevice) const
@@ -1052 +1057 @@
                 break;
             }
-
-            AssertMsgFailedBreak (("Invalid device %d\n", aDevice));
+            AssertMsgFailed (("Invalid device %d\n", aDevice));
+            break;
         }
         case KStorageBus_SATA:
         case KStorageBus_SCSI:
         {
-            AssertMsgBreak (aDevice == 0, ("Invalid device %d\n", aDevice));
-            /* always empty so far for SATA */
-            device = "";
+            AssertMsgFailed (("SATA & SCSI have no devices, only channels\n"));
             break;
         }
+        case KStorageBus_Floppy:
+        {
+            AssertMsgBreak (aChannel == 0, ("Invalid channel %d\n", aChannel));
+            device = mStorageBusDevices [2].arg (aDevice);
+            break;
+        }
         default:
-            AssertFailedBreak();
+        {
+            AssertMsgFailed (("Invalid bus type %d\n", aBus));
+            break;
+        }
     }
 
@@ -1072 +1084 @@
 
 /**
- * Returns a device number of the given channel on the given storage bus
- * corresponding to the given string representation. Complementary to #toString
- * (KStorageBus, LONG, LONG) const.
- */
-LONG VBoxGlobal::toStorageDevice (KStorageBus aBus, LONG aChannel,
-                                  const QString &aDevice) const
+ * Returns a device number of the given channel on the given storage bus corresponding to the given string representation.
+ * Complementary to #toString (KStorageBus, LONG, LONG) const.
+ */
+LONG VBoxGlobal::toStorageDevice (KStorageBus aBus, LONG aChannel, const QString &aDevice) const
 {
     NOREF (aChannel);
@@ -1087 +1097 @@
         case KStorageBus_IDE:
         {
-            QLongStringHash::const_iterator it =
-                qFind (mStorageBusDevices.begin(), mStorageBusDevices.end(),
-                       aDevice);
-            AssertMsg (it != mStorageBusDevices.end(),
-                       ("No value for {%s}", aDevice.toLatin1().constData()));
+            QLongStringHash::const_iterator it = qFind (mStorageBusDevices.begin(), mStorageBusDevices.end(), aDevice);
+            AssertMsgBreak (it != mStorageBusDevices.end(), ("No value for {%s}", aDevice.toLatin1().constData()));
             device = it.key();
             break;
@@ -1098 +1105 @@
         case KStorageBus_SCSI:
         {
-            AssertMsgBreak(aDevice.isEmpty(), ("Invalid device {%s}\n", aDevice.toLatin1().constData()));
-            /* always zero for SATA so far. */
+            device = 0;
             break;
         }
+        case KStorageBus_Floppy:
+        {
+            AssertMsgBreak (aChannel == 0, ("Invalid channel %d\n", aChannel));
+            QString tpl = mStorageBusDevices [2].arg ("");
+            if (aDevice.startsWith (tpl))
+            {
+                device = aDevice.right (aDevice.length() - tpl.length()).toLong();
+                break;
+            }
+            AssertMsgFailed (("Invalid device {%s}\n", aDevice.toLatin1().constData()));
+            break;
+        }
         default:
-            AssertFailedBreak();
+        {
+            AssertMsgFailed (("Invalid bus type %d\n", aBus));
+            break;
+        }
     }
 
@@ -1110 +1131 @@
 
 /**
- * Returns a full string representation of the given device of the given channel
- * on the given storage bus. Complementary to #toStorageParams (KStorageBus,
- * LONG, LONG) const.
- */
-QString VBoxGlobal::toFullString (KStorageBus aBus, LONG aChannel,
-                                  LONG aDevice) const
-{
-    QString device;
-
-    switch (aBus)
+ * Returns a full string representation of the given device of the given channel on the given storage bus.
+ * Complementary to #toStorageSlot (const QString &) const.
+ */
+QString VBoxGlobal::toFullString (StorageSlot aSlot) const
+{
+    QString device (vboxGlobal().toString (aSlot.bus) + ' ');
+
+    switch (aSlot.bus)
     {
         case KStorageBus_IDE:
         {
-            device = QString ("%1 %2 %3")
-                .arg (vboxGlobal().toString (aBus))
-                .arg (vboxGlobal().toString (aBus, aChannel))
-                .arg (vboxGlobal().toString (aBus, aChannel, aDevice));
+            device += vboxGlobal().toString (aSlot.bus, aSlot.port) + ' ' +
+                      vboxGlobal().toString (aSlot.bus, aSlot.port, aSlot.device);
             break;
         }
@@ -1132 +1149 @@
         case KStorageBus_SCSI:
         {
-            /* we only have one SATA/SCSI device so far which is always zero */
-            device = QString ("%1 %2")
-                .arg (vboxGlobal().toString (aBus))
-                .arg (vboxGlobal().toString (aBus, aChannel));
+            device += vboxGlobal().toString (aSlot.bus, aSlot.port);
             break;
         }
+        case KStorageBus_Floppy:
+        {
+            device += vboxGlobal().toString (aSlot.bus, aSlot.port, aSlot.device);
+            break;
+        }
         default:
-            AssertFailedBreak();
+        {
+            AssertMsgFailed (("Invalid bus type %d\n", aSlot.bus));
+            break;
+        }
     }
 
     return device;
+}
+
+/**
+ * Returns a StorageSlot based on the given device of the given channel on the given storage bus.
+ * Complementary to #toFullString (StorageSlot) const.
+ */
+StorageSlot VBoxGlobal::toStorageSlot (const QString &aSlot) const
+{
+    StorageSlot result;
+
+    result.bus = toStorageBusType (aSlot.section (' ', 0, 0));
+    QString other (aSlot.section (' ', 1));
+
+    switch (result.bus)
+    {
+        case KStorageBus_IDE:
+        {
+            result.port = toStorageChannel (result.bus, other.section (' ', 0, 0));
+            result.device = toStorageDevice (result.bus, result.port, other.section (' ', 1));
+            break;
+        }
+        case KStorageBus_SATA:
+        case KStorageBus_SCSI:
+        {
+            result.port = toStorageChannel (result.bus, other);
+            result.device = toStorageDevice (result.bus, result.port, QString::null);
+            break;
+        }
+        case KStorageBus_Floppy:
+        {
+            result.port = toStorageChannel (result.bus, QString::null);
+            result.device = toStorageDevice (result.bus, result.port, other);
+            break;
+        }
+        default:
+        {
+            AssertMsgFailed (("Invalid bus type %d\n", result.bus));
+            break;
+        }
+    }
+
+    return result;
 }
 
@@ -1291 +1355 @@
  *       @todo in VBoxMedium::details()).
  */
-QString VBoxGlobal::details (const CHardDisk &aHD,
-                             bool aPredictDiff)
-{
-    CMedium cmedium (aHD);
+QString VBoxGlobal::details (const CMedium &aMedium, bool aPredictDiff)
+{
+    CMedium cmedium (aMedium);
     VBoxMedium medium;
 
     if (!findMedium (cmedium, medium))
     {
-        /* media may be new and not alredy in the media list, request refresh */
+        /* Medium may be new and not already in the media list, request refresh */
         startEnumeratingMedia();
         if (!findMedium (cmedium, medium))
-        {
-            /// @todo Still not found. Means that we are trying to get details
-            /// of a hard disk that was deleted by a third party before we got a
-            /// chance to complete the task. Returning null in this case should
-            /// be OK, For more information, see *** in VBoxMedium::etails().
-            return QString::null;
-        }
+            /* Medium might be deleted already, return null string */
+            return QString();
     }
 
@@ -1597 +1655 @@
     }
 
-    /* Hard Disks */
+    /* Storage */
     {
         /* Rows including section header and footer */
@@ -1604 +1662 @@
         QString item;
 
-        CHardDiskAttachmentVector vec = aMachine.GetHardDiskAttachments();
+        CMediumAttachmentVector vec = aMachine.GetMediumAttachments();
         for (int i = 0; i < vec.size(); ++ i)
         {
-            CHardDiskAttachment hda = vec [i];
-            CHardDisk hd = hda.GetHardDisk();
+            CMediumAttachment ma = vec [i];
+            CMedium medium = ma.GetMedium();
 
             /// @todo for the explaination of the below isOk() checks, see ***
             /// in VBoxMedium::details().
-            if (hda.isOk())
+            if (ma.isOk())
             {
-                const QString controller = hda.GetController();
+                const QString controller = ma.GetController();
                 KStorageBus bus;
 
-                CStorageController ctrl = aMachine.GetStorageControllerByName(controller);
+                CStorageController ctrl = aMachine.GetStorageControllerByName (controller);
                 bus = ctrl.GetBus();
 
-                LONG port   = hda.GetPort();
-                LONG device = hda.GetDevice();
+                LONG port   = ma.GetPort();
+                LONG device = ma.GetDevice();
                 item += QString (sSectionItemTpl2)
-                        .arg (toFullString (bus, port, device))
-                        .arg (details (hd, false));
+                        .arg (toFullString (StorageSlot (bus, port, device)))
+                        .arg (details (medium, false));
                 ++ rows;
             }
@@ -1632 +1690 @@
         {
             item = QString (sSectionItemTpl1)
-                   .arg (tr ("Not Attached", "details report (HDDs)"));
+                   .arg (tr ("Not Attached", "details report (Storage)"));
             ++ rows;
         }
@@ -1639 +1697 @@
             .arg (rows) /* rows */
             .arg (":/hd_16px.png", /* icon */
-                  "#hdds", /* link */
-                  tr ("Hard Disks", "details report"), /* title */
-                  item); /* items */
-    }
-
-    /* DVD */
-    {
-        QString item;
-
-        CDVDDrive dvd = aMachine.GetDVDDrive();
-        switch (dvd.GetState())
-        {
-            case KDriveState_NotMounted:
-                item = QString (sSectionItemTpl1)
-                       .arg (tr ("Not mounted", "details report (DVD)"));
-                break;
-            case KDriveState_ImageMounted:
-            {
-                CDVDImage img = dvd.GetImage();
-                item = QString (sSectionItemTpl2)
-                       .arg (tr ("Image", "details report (DVD)"),
-                             locationForHTML (img.GetName()));
-                break;
-            }
-            case KDriveState_HostDriveCaptured:
-            {
-                CHostDVDDrive drv = dvd.GetHostDrive();
-                QString drvName = drv.GetName();
-                QString description = drv.GetDescription();
-                QString fullName = description.isEmpty() ?
-                    drvName :
-                    QString ("%1 (%2)").arg (description, drvName);
-                item = QString (sSectionItemTpl2)
-                       .arg (tr ("Host Drive", "details report (DVD)"),
-                             fullName);
-                break;
-            }
-            default:
-                AssertMsgFailed (("Invalid DVD state: %d", dvd.GetState()));
-        }
-
-        report += sectionTpl
-            .arg (2 + 1) /* rows */
-            .arg (":/cd_16px.png", /* icon */
-                  "#dvd", /* link */
-                  tr ("CD/DVD-ROM", "details report"), /* title */
-                  item); // items
-    }
-
-    /* Floppy */
-    {
-        QString item;
-
-        CFloppyDrive floppy = aMachine.GetFloppyDrive();
-        switch (floppy.GetState())
-        {
-            case KDriveState_NotMounted:
-                item = QString (sSectionItemTpl1)
-                       .arg (tr ("Not mounted", "details report (floppy)"));
-                break;
-            case KDriveState_ImageMounted:
-            {
-                CFloppyImage img = floppy.GetImage();
-                item = QString (sSectionItemTpl2)
-                       .arg (tr ("Image", "details report (floppy)"),
-                             locationForHTML (img.GetName()));
-                break;
-            }
-            case KDriveState_HostDriveCaptured:
-            {
-                CHostFloppyDrive drv = floppy.GetHostDrive();
-                QString drvName = drv.GetName();
-                QString description = drv.GetDescription();
-                QString fullName = description.isEmpty() ?
-                    drvName :
-                    QString ("%1 (%2)").arg (description, drvName);
-                item = QString (sSectionItemTpl2)
-                       .arg (tr ("Host Drive", "details report (floppy)"),
-                             fullName);
-                break;
-            }
-            default:
-                AssertMsgFailed (("Invalid floppy state: %d", floppy.GetState()));
-        }
-
-        report += sectionTpl
-            .arg (2 + 1) /* rows */
-            .arg (":/fd_16px.png", /* icon */
-                  "#floppy", /* link */
-                  tr ("Floppy", "details report"), /* title */
+                  "#storage", /* link */
+                  tr ("Storage", "details report"), /* title */
                   item); /* items */
     }
@@ -2179 +2149 @@
 
 /**
- * Appends the given list of hard disks and all their children to the media
- * list. To be called only from VBoxGlobal::startEnumeratingMedia().
- */
-static
-void AddHardDisksToList (const CHardDiskVector &aVector,
-                         VBoxMediaList &aList,
-                         VBoxMediaList::iterator aWhere,
-                         VBoxMedium *aParent = 0)
+ * Appends the NULL medium to the media list.
+ * For using with VBoxGlobal::startEnumeratingMedia() only.
+ */
+static void addNullMediumToList (VBoxMediaList &aList, VBoxMediaList::iterator aWhere)
+{
+    VBoxMedium medium;
+    aList.insert (aWhere, medium);
+}
+
+/**
+ * Appends the given list of mediums to the media list.
+ * For using with VBoxGlobal::startEnumeratingMedia() only.
+ */
+static void addMediumsToList (const CMediumVector &aVector,
+                              VBoxMediaList &aList,
+                              VBoxMediaList::iterator aWhere,
+                              VBoxDefs::MediumType aType,
+                              VBoxMedium *aParent = 0)
 {
     VBoxMediaList::iterator first = aWhere;
 
-    /* First pass: Add siblings sorted */
-    for (CHardDiskVector::ConstIterator it = aVector.begin();
-         it != aVector.end(); ++ it)
+    for (CMediumVector::ConstIterator it = aVector.begin(); it != aVector.end(); ++ it)
     {
         CMedium cmedium (*it);
-        VBoxMedium medium (cmedium, VBoxDefs::MediaType_HardDisk, aParent);
+        VBoxMedium medium (cmedium, aType, aParent);
 
         /* Search for a proper alphabetic position */
@@ -2209 +2187 @@
             -- first;
     }
+}
+
+/**
+ * Appends the given list of hard disks and all their children to the media list.
+ * For using with VBoxGlobal::startEnumeratingMedia() only.
+ */
+static void addHardDisksToList (const CMediumVector &aVector,
+                                VBoxMediaList &aList,
+                                VBoxMediaList::iterator aWhere,
+                                VBoxMedium *aParent = 0)
+{
+    VBoxMediaList::iterator first = aWhere;
+
+    /* First pass: Add siblings sorted */
+    for (CMediumVector::ConstIterator it = aVector.begin(); it != aVector.end(); ++ it)
+    {
+        CMedium cmedium (*it);
+        VBoxMedium medium (cmedium, VBoxDefs::MediumType_HardDisk, aParent);
+
+        /* Search for a proper alphabetic position */
+        VBoxMediaList::iterator jt = first;
+        for (; jt != aWhere; ++ jt)
+            if ((*jt).name().localeAwareCompare (medium.name()) > 0)
+                break;
+
+        aList.insert (jt, medium);
+
+        /* Adjust the first item if inserted before it */
+        if (jt == first)
+            -- first;
+    }
 
     /* Second pass: Add children */
     for (VBoxMediaList::iterator it = first; it != aWhere;)
     {
-        CHardDiskVector children = (*it).hardDisk().GetChildren();
+        CMediumVector children = (*it).medium().GetChildren();
         VBoxMedium *parent = &(*it);
 
         ++ it; /* go to the next sibling before inserting children */
-        AddHardDisksToList (children, aList, it, parent);
+        addHardDisksToList (children, aList, it, parent);
     }
 }
@@ -2264 +2273 @@
     /* composes a list of all currently known media & their children */
     mMediaList.clear();
-    {
-        AddHardDisksToList (mVBox.GetHardDisks(), mMediaList, mMediaList.end());
-    }
-    {
-        VBoxMediaList::iterator first = mMediaList.end();
-
-        CDVDImageVector vec = mVBox.GetDVDImages();
-        for (CDVDImageVector::ConstIterator it = vec.begin();
-             it != vec.end(); ++ it)
-        {
-            CMedium cmedium (*it);
-            VBoxMedium medium (cmedium, VBoxDefs::MediaType_DVD);
-
-            /* Search for a proper alphabetic position */
-            VBoxMediaList::iterator jt = first;
-            for (; jt != mMediaList.end(); ++ jt)
-                if ((*jt).name().localeAwareCompare (medium.name()) > 0)
-                    break;
-
-            mMediaList.insert (jt, medium);
-
-            /* Adjust the first item if inserted before it */
-            if (jt == first)
-                -- first;
-        }
-    }
-    {
-        VBoxMediaList::iterator first = mMediaList.end();
-
-        CFloppyImageVector vec = mVBox.GetFloppyImages();
-        for (CFloppyImageVector::ConstIterator it = vec.begin();
-             it != vec.end(); ++ it)
-        {
-            CMedium cmedium (*it);
-            VBoxMedium medium (cmedium, VBoxDefs::MediaType_Floppy);
-
-            /* Search for a proper alphabetic position */
-            VBoxMediaList::iterator jt = first;
-            for (; jt != mMediaList.end(); ++ jt)
-                if ((*jt).name().localeAwareCompare (medium.name()) > 0)
-                    break;
-
-            mMediaList.insert (jt, medium);
-
-            /* Adjust the first item if inserted before it */
-            if (jt == first)
-                -- first;
-        }
-    }
+    addNullMediumToList (mMediaList, mMediaList.end());
+    addHardDisksToList (mVBox.GetHardDisks(), mMediaList, mMediaList.end());
+    addMediumsToList (mVBox.GetHost().GetDVDDrives(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_DVD);
+    addMediumsToList (mVBox.GetDVDImages(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_DVD);
+    addMediumsToList (mVBox.GetHost().GetFloppyDrives(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_Floppy);
+    addMediumsToList (mVBox.GetFloppyImages(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_Floppy);
 
     /* enumeration thread class */
@@ -2382 +2348 @@
     VBoxMediaList::iterator it = mMediaList.begin();
 
-    if (aMedium.type() == VBoxDefs::MediaType_HardDisk)
+    if (aMedium.type() == VBoxDefs::MediumType_HardDisk)
     {
         VBoxMediaList::iterator parent = mMediaList.end();
@@ -2388 +2354 @@
         for (; it != mMediaList.end(); ++ it)
         {
-            if ((*it).type() != VBoxDefs::MediaType_HardDisk)
+            if ((*it).type() != VBoxDefs::MediumType_HardDisk)
                 break;
 
@@ -2417 +2383 @@
         {
             /* skip HardDisks that come first */
-            if ((*it).type() == VBoxDefs::MediaType_HardDisk)
+            if ((*it).type() == VBoxDefs::MediumType_HardDisk)
                 continue;
 
             /* skip DVD when inserting Floppy */
-            if (aMedium.type() == VBoxDefs::MediaType_Floppy &&
-                (*it).type() == VBoxDefs::MediaType_DVD)
+            if (aMedium.type() == VBoxDefs::MediumType_Floppy &&
+                (*it).type() == VBoxDefs::MediumType_DVD)
                 continue;
 
             if ((*it).name().localeAwareCompare (aMedium.name()) > 0 ||
-                (aMedium.type() == VBoxDefs::MediaType_DVD &&
-                 (*it).type() == VBoxDefs::MediaType_Floppy))
+                (aMedium.type() == VBoxDefs::MediumType_DVD &&
+                 (*it).type() == VBoxDefs::MediumType_Floppy))
                 break;
         }
@@ -2464 +2430 @@
  * @sa #currentMediaList()
  */
-void VBoxGlobal::removeMedium (VBoxDefs::MediaType aType, const QString &aId)
+void VBoxGlobal::removeMedium (VBoxDefs::MediumType aType, const QString &aId)
 {
     VBoxMediaList::Iterator it;
@@ -2506 +2472 @@
 bool VBoxGlobal::findMedium (const CMedium &aObj, VBoxMedium &aMedium) const
 {
-    for (VBoxMediaList::ConstIterator it = mMediaList.begin();
-         it != mMediaList.end(); ++ it)
-    {
-        if ((*it).medium() == aObj)
+    for (VBoxMediaList::ConstIterator it = mMediaList.begin(); it != mMediaList.end(); ++ it)
+    {
+        if (((*it).medium().isNull() && aObj.isNull()) ||
+            (!(*it).medium().isNull() && !aObj.isNull() && (*it).medium().GetId() == aObj.GetId()))
         {
             aMedium = (*it);
@@ -2515 +2481 @@
         }
     }
-
     return false;
+}
+
+/**
+ *  Searches for a VBoxMedum object with the given medium id attribute.
+ *
+ *  @return VBoxMedum if found which is invalid otherwise.
+ */
+VBoxMedium VBoxGlobal::findMedium (const QString &aMediumId) const
+{
+    for (VBoxMediaList::ConstIterator it = mMediaList.begin(); it != mMediaList.end(); ++ it)
+        if ((*it).id() == aMediumId)
+            return *it;
+    return VBoxMedium();
 }
 
@@ -2623 +2601 @@
     mDeviceTypes [KDeviceType_SharedFolder] =   tr ("Shared Folder", "DeviceType");
 
-    mStorageBuses [KStorageBus_IDE] =   tr ("IDE", "StorageBus");
-    mStorageBuses [KStorageBus_SATA] =  tr ("SATA", "StorageBus");
-    mStorageBuses [KStorageBus_SCSI] =  tr ("SCSI", "StorageBus");
+    mStorageBuses [KStorageBus_IDE] =       tr ("IDE", "StorageBus");
+    mStorageBuses [KStorageBus_SATA] =      tr ("SATA", "StorageBus");
+    mStorageBuses [KStorageBus_SCSI] =      tr ("SCSI", "StorageBus");
+    mStorageBuses [KStorageBus_Floppy] =    tr ("Floppy", "StorageBus");
 
     mStorageBusChannels [0] =   tr ("Primary", "StorageBusChannel");
@@ -2633 +2612 @@
     mStorageBusDevices [0] =    tr ("Master", "StorageBusDevice");
     mStorageBusDevices [1] =    tr ("Slave", "StorageBusDevice");
-
-    mDiskTypes [KHardDiskType_Normal] =         tr ("Normal", "DiskType");
-    mDiskTypes [KHardDiskType_Immutable] =      tr ("Immutable", "DiskType");
-    mDiskTypes [KHardDiskType_Writethrough] =   tr ("Writethrough", "DiskType");
+    mStorageBusDevices [2] =    tr ("Device %1", "StorageBusDevice");
+
+    mDiskTypes [KMediumType_Normal] =           tr ("Normal", "DiskType");
+    mDiskTypes [KMediumType_Immutable] =        tr ("Immutable", "DiskType");
+    mDiskTypes [KMediumType_Writethrough] =     tr ("Writethrough", "DiskType");
     mDiskTypes_Differencing =                   tr ("Differencing", "DiskType");
 
@@ -2718 +2698 @@
     mStorageControllerTypes [KStorageControllerType_BusLogic] =
         tr ("BusLogic", "StorageControllerType");
+    mStorageControllerTypes [KStorageControllerType_I82078] =
+        tr ("I82078", "StorageControllerType");
 
     mUSBDeviceStates [KUSBDeviceState_NotSupported] =
@@ -3013 +2995 @@
                                  .arg (suffix);
     return manual;
+}
+
+QIcon VBoxGlobal::iconSet (const QPixmap &aNormal,
+                           const QPixmap &aDisabled,
+                           const QPixmap &aActive)
+{
+    QIcon iconSet;
+
+    Assert (aNormal);
+        iconSet.addPixmap (aNormal, QIcon::Normal);
+
+    if (!aDisabled.isNull())
+        iconSet.addPixmap (aDisabled, QIcon::Disabled);
+
+    if (!aActive.isNull())
+        iconSet.addPixmap (aActive, QIcon::Active);
+
+    return iconSet;
 }
 
@@ -4035 +4035 @@
 {
     CSystemProperties systemProperties = vboxGlobal().virtualBox().GetSystemProperties();
-    QVector<CHardDiskFormat> hardDiskFormats = systemProperties.GetHardDiskFormats();
+    QVector<CMediumFormat> mediumFormats = systemProperties.GetMediumFormats();
     QList< QPair<QString, QString> > backendPropList;
-    for (int i = 0; i < hardDiskFormats.size(); ++ i)
+    for (int i = 0; i < mediumFormats.size(); ++ i)
     {
         /* File extensions */
-        QVector <QString> fileExtensions = hardDiskFormats [i].GetFileExtensions();
+        QVector <QString> fileExtensions = mediumFormats [i].GetFileExtensions();
         QStringList f;
         for (int a = 0; a < fileExtensions.size(); ++ a)
@@ -4046 +4046 @@
         /* Create a pair out of the backend description and all suffix's. */
         if (!f.isEmpty())
-            backendPropList << QPair<QString, QString> (hardDiskFormats [i].GetName(), f.join(" "));
+            backendPropList << QPair<QString, QString> (mediumFormats [i].GetName(), f.join(" "));
     }
     return backendPropList;
@@ -4231 +4231 @@
             if (!ev->mLast)
             {
-                if (ev->mMedium.state() == KMediaState_Inaccessible &&
+                if (ev->mMedium.state() == KMediumState_Inaccessible &&
                     !ev->mMedium.result().isOk())
                     vboxProblem().cannotGetMediaAccessibility (ev->mMedium);

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

@@ -29 +29 @@
 VBoxMediaComboBox::VBoxMediaComboBox (QWidget *aParent)
     : QComboBox (aParent)
-    , mType (VBoxDefs::MediaType_Invalid)
+    , mType (VBoxDefs::MediumType_Invalid)
     , mLastId (QString::null)
     , mShowDiffs (false)
+    , mNullItemPresent (false)
     , mMachineId (QString::null)
 {
@@ -51 +52 @@
     connect (&vboxGlobal(), SIGNAL (mediumUpdated (const VBoxMedium &)),
              this, SLOT (mediumUpdated (const VBoxMedium &)));
-    connect (&vboxGlobal(), SIGNAL (mediumRemoved (VBoxDefs::MediaType, const QString &)),
-             this, SLOT (mediumRemoved (VBoxDefs::MediaType, const QString &)));
+    connect (&vboxGlobal(), SIGNAL (mediumRemoved (VBoxDefs::MediumType, const QString &)),
+             this, SLOT (mediumRemoved (VBoxDefs::MediumType, const QString &)));
 
     /* Setup other connections */
@@ -134 +135 @@
 }
 
-void VBoxMediaComboBox::setType (VBoxDefs::MediaType aType)
+void VBoxMediaComboBox::setType (VBoxDefs::MediumType aType)
 {
     mType = aType;
@@ -142 +143 @@
 {
     mMachineId = aMachineId;
+}
+
+void VBoxMediaComboBox::setNullItemPresent (bool aNullItemPresent)
+{
+    mNullItemPresent = aNullItemPresent;
+    refresh();
 }
 
@@ -180 +187 @@
 void VBoxMediaComboBox::mediumAdded (const VBoxMedium &aMedium)
 {
-    if (mType != aMedium.type())
-        return;
-
-    if (!mShowDiffs && aMedium.type() == VBoxDefs::MediaType_HardDisk)
+    if ((aMedium.isNull() && mNullItemPresent && mType != VBoxDefs::MediumType_HardDisk) ||
+        (aMedium.type() == mType))
     {
-        if (aMedium.parent() != NULL)
+        if (!mShowDiffs && aMedium.type() == VBoxDefs::MediumType_HardDisk)
         {
-            /* In !mShowDiffs mode, we ignore all diffs except ones that are
-             * directly attached to the related VM in the current state */
-            if (!aMedium.isAttachedInCurStateTo (mMachineId))
-                return;
+            if (aMedium.parent() != NULL)
+            {
+                /* In !mShowDiffs mode, we ignore all diffs except ones that are
+                 * directly attached to the related VM in the current state */
+                if (!aMedium.isAttachedInCurStateTo (mMachineId))
+                    return;
+            }
         }
+
+        appendItem (aMedium);
+
+        /* Activate the required item if there is any */
+        if (aMedium.id() == mLastId)
+            setCurrentItem (aMedium.id());
+        /* Select last added item if there is no item selected */
+        else if (currentText().isEmpty())
+            QComboBox::setCurrentIndex (count() - 1);
     }
-
-    appendItem (aMedium);
-
-    /* Activate the required item if there is any */
-    if (aMedium.id() == mLastId)
-        setCurrentItem (aMedium.id());
-    /* Select last added item if there is no item selected */
-    else if (currentText().isEmpty())
-        QComboBox::setCurrentIndex (count() - 1);
 }
 
 void VBoxMediaComboBox::mediumUpdated (const VBoxMedium &aMedium)
 {
-    if (mType != aMedium.type())
-        return;
-
-    int index;
-    if (!findMediaIndex (aMedium.id(), index))
-        return;
-
-    replaceItem (index, aMedium);
-
-    /* Emit the signal to ensure the parent dialog handles the change of
-     * the selected item's data */
-    emit activated (currentIndex());
-}
-
-void VBoxMediaComboBox::mediumRemoved (VBoxDefs::MediaType aType,
+    if ((aMedium.isNull() && mNullItemPresent && mType != VBoxDefs::MediumType_HardDisk) ||
+        (aMedium.type() == mType))
+    {
+        int index;
+        if (!findMediaIndex (aMedium.id(), index))
+            return;
+
+        replaceItem (index, aMedium);
+
+        /* Emit the signal to ensure the parent dialog handles the change of
+         * the selected item's data */
+        emit activated (currentIndex());
+    }
+}
+
+void VBoxMediaComboBox::mediumRemoved (VBoxDefs::MediumType aType,
                                        const QString &aId)
 {

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

@@ -88 +88 @@
     void refreshAll();
 
-    VBoxDefs::MediaType type() const { return mMedium.type(); }
-
-    KMediaState state() const { return mMedium.state (!mManager->showDiffs()); }
+    VBoxDefs::MediumType type() const { return mMedium.type(); }
+
+    KMediumState state() const { return mMedium.state (!mManager->showDiffs()); }
 
     QString id() const { return mMedium.id(); }
@@ -126 +126 @@
 //    {
 //        QColorGroup cGroup (aColorGroup);
-//        if (mStatus == KMediaState_NotCreated)
+//        if (mStatus == KMediumState_NotCreated)
 //            cGroup.setColor (QColorGroup::Text, cGroup.mid());
 //        Q3ListViewItem::paintCell (aPainter, cGroup, aColumn, aWidth, aSlign);
@@ -234 +234 @@
                                           Qt::WindowFlags aFlags /* = Qt::Dialog */)
     : QIWithRetranslateUI2 <QIMainDialog> (aParent, aFlags)
-    , mType (VBoxDefs::MediaType_Invalid)
+    , mType (VBoxDefs::MediumType_Invalid)
     , mShowDiffs (true)
     , mSetupMode (false)
@@ -456 +456 @@
  *                          a machine from its settings dialog.
  * @param aSelectId         Which medium to make selected? (ignored when @a
- *                          aType is VBoxDefs::MediaType_All)
+ *                          aType is VBoxDefs::MediumType_All)
  * @param aShowDiffs        @c true to show differencing hard disks initially
  *                          (ignored if @a aSessionMachine is null assuming
  *                          @c true).
  */
-void VBoxMediaManagerDlg::setup (VBoxDefs::MediaType aType, bool aDoSelect,
+void VBoxMediaManagerDlg::setup (VBoxDefs::MediumType aType, bool aDoSelect,
                                  bool aRefresh /* = true */,
                                  const CMachine &aSessionMachine /* = CMachine() */,
@@ -479 +479 @@
     switch (aType)
     {
-        case VBoxDefs::MediaType_HardDisk: mHDSelectedId = aSelectId; break;
-        case VBoxDefs::MediaType_DVD:      mDVDSelectedId = aSelectId; break;
-        case VBoxDefs::MediaType_Floppy:   mFloppySelectedId = aSelectId; break;
-        case VBoxDefs::MediaType_All: break;
+        case VBoxDefs::MediumType_HardDisk: mHDSelectedId = aSelectId; break;
+        case VBoxDefs::MediumType_DVD:      mDVDSelectedId = aSelectId; break;
+        case VBoxDefs::MediumType_Floppy:   mFloppySelectedId = aSelectId; break;
+        case VBoxDefs::MediumType_All: break;
         default:
             AssertFailedReturnVoid();
@@ -488 +488 @@
 
     mTwImages->setTabEnabled (HDTab,
-                              aType == VBoxDefs::MediaType_All ||
-                              aType == VBoxDefs::MediaType_HardDisk);
+                              aType == VBoxDefs::MediumType_All ||
+                              aType == VBoxDefs::MediumType_HardDisk);
     mTwImages->setTabEnabled (CDTab,
-                              aType == VBoxDefs::MediaType_All ||
-                              aType == VBoxDefs::MediaType_DVD);
+                              aType == VBoxDefs::MediumType_All ||
+                              aType == VBoxDefs::MediumType_DVD);
     mTwImages->setTabEnabled (FDTab,
-                              aType == VBoxDefs::MediaType_All ||
-                              aType == VBoxDefs::MediaType_Floppy);
+                              aType == VBoxDefs::MediumType_All ||
+                              aType == VBoxDefs::MediumType_Floppy);
 
     mDoSelect = aDoSelect;
@@ -518 +518 @@
              this, SLOT (mediumUpdated (const VBoxMedium &)));
     /* Listen to "media remove" signals */
-    connect (&vboxGlobal(), SIGNAL (mediumRemoved (VBoxDefs::MediaType, const QString &)),
-             this, SLOT (mediumRemoved (VBoxDefs::MediaType, const QString &)));
+    connect (&vboxGlobal(), SIGNAL (mediumRemoved (VBoxDefs::MediumType, const QString &)),
+             this, SLOT (mediumRemoved (VBoxDefs::MediumType, const QString &)));
 
     if (aRefresh && !vboxGlobal().isMediaEnumerationStarted())
@@ -533 +533 @@
         {
             mediumAdded (*it);
-            if ((*it).state() != KMediaState_NotCreated)
+            if ((*it).state() != KMediumState_NotCreated)
                 mProgressBar->setValue (++ index);
         }
@@ -569 +569 @@
         connect (vboxGlobal().mainWindow(), SIGNAL (closing()), mModelessDialog, SLOT (close()));
         mModelessDialog->setAttribute (Qt::WA_DeleteOnClose);
-        mModelessDialog->setup (VBoxDefs::MediaType_All,
+        mModelessDialog->setup (VBoxDefs::MediumType_All,
                                 false /* aDoSelect */, aRefresh);
 
@@ -754 +754 @@
 {
     /* Ignore non-interesting aMedium */
-    if (mType != VBoxDefs::MediaType_All && mType != aMedium.type())
+    if ((aMedium.isNull()) ||
+        (mType != VBoxDefs::MediumType_All && mType != aMedium.type()) ||
+        (aMedium.isHostDrive()))
         return;
 
-    if (!mShowDiffs && aMedium.type() == VBoxDefs::MediaType_HardDisk)
+    if (!mShowDiffs && aMedium.type() == VBoxDefs::MediumType_HardDisk)
     {
         if (aMedium.parent() && !mSessionMachineId.isNull())
@@ -782 +784 @@
     switch (aMedium.type())
     {
-        case VBoxDefs::MediaType_HardDisk:
+        case VBoxDefs::MediumType_HardDisk:
         {
             item = createHardDiskItem (mHardDiskView, aMedium);
@@ -799 +801 @@
             break;
         }
-        case VBoxDefs::MediaType_DVD:
+        case VBoxDefs::MediumType_DVD:
         {
             item = new MediaItem (mDVDView, aMedium, this);
@@ -816 +818 @@
             break;
         }
-        case VBoxDefs::MediaType_Floppy:
+        case VBoxDefs::MediumType_Floppy:
         {
             item = new MediaItem (mFloppyView, aMedium, this);
@@ -855 +857 @@
 {
     /* Ignore non-interesting aMedium */
-    if (mType != VBoxDefs::MediaType_All && mType != aMedium.type())
+    if ((aMedium.isNull()) ||
+        (mType != VBoxDefs::MediumType_All && mType != aMedium.type()) ||
+        (aMedium.isHostDrive()))
         return;
 
@@ -862 +866 @@
     switch (aMedium.type())
     {
-        case VBoxDefs::MediaType_HardDisk:
+        case VBoxDefs::MediumType_HardDisk:
         {
             item = searchItem (mHardDiskView, aMedium.id());
             break;
         }
-        case VBoxDefs::MediaType_DVD:
+        case VBoxDefs::MediumType_DVD:
         {
             item = searchItem (mDVDView, aMedium.id());
             break;
         }
-        case VBoxDefs::MediaType_Floppy:
+        case VBoxDefs::MediumType_Floppy:
         {
             item = searchItem (mFloppyView, aMedium.id());
@@ -896 +900 @@
 }
 
-void VBoxMediaManagerDlg::mediumRemoved (VBoxDefs::MediaType aType,
+void VBoxMediaManagerDlg::mediumRemoved (VBoxDefs::MediumType aType,
                                          const QString &aId)
 {
     /* Ignore non-interesting aMedium */
-    if (mType != VBoxDefs::MediaType_All && mType != aType)
+    if (mType != VBoxDefs::MediumType_All && mType != aType)
         return;
 
@@ -963 +967 @@
 void VBoxMediaManagerDlg::mediumEnumerated (const VBoxMedium &aMedium)
 {
-    AssertReturnVoid (aMedium.state() != KMediaState_NotCreated);
-
     mediumUpdated (aMedium);
 
@@ -982 +984 @@
 void VBoxMediaManagerDlg::doNewMedium()
 {
-    AssertReturnVoid (currentTreeWidgetType() == VBoxDefs::MediaType_HardDisk);
+    AssertReturnVoid (currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk);
 
     VBoxNewHDWzd dlg (this);
@@ -988 +990 @@
     if (dlg.exec() == QDialog::Accepted)
     {
-        CHardDisk hd = dlg.hardDisk();
+        CMedium hd = dlg.hardDisk();
         /* Select the newly created hard disk */
         MediaItem *item = searchItem (mHardDiskView, hd.GetId());
@@ -1003 +1005 @@
     QString title;
     QString filter;
-    VBoxDefs::MediaType type = currentTreeWidgetType();
+    VBoxDefs::MediumType type = currentTreeWidgetType();
 
     QString dir;
-    if (item && item->state() != KMediaState_Inaccessible
-             && item->state() != KMediaState_NotCreated)
+    if (item && item->state() != KMediumState_Inaccessible
+             && item->state() != KMediumState_NotCreated)
         dir = QFileInfo (item->location().trimmed()).absolutePath();
 
     if (dir.isEmpty())
-        if (type == VBoxDefs::MediaType_HardDisk)
+        if (type == VBoxDefs::MediumType_HardDisk)
             dir = mVBox.GetSystemProperties().GetDefaultHardDiskFolder();
 
@@ -1019 +1021 @@
     switch (type)
     {
-        case VBoxDefs::MediaType_HardDisk:
+        case VBoxDefs::MediumType_HardDisk:
         {
             /// @todo NEWMEDIA use CSystemProperties::GetHardDIskFormats to detect
@@ -1042 +1044 @@
             break;
         }
-        case VBoxDefs::MediaType_DVD:
+        case VBoxDefs::MediumType_DVD:
         {
             filter = tr ("CD/DVD-ROM images (*.iso);;"
@@ -1049 +1051 @@
             break;
         }
-        case VBoxDefs::MediaType_Floppy:
+        case VBoxDefs::MediumType_Floppy:
         {
             filter = tr ("Floppy images (*.img);;"
@@ -1057 +1059 @@
         }
         default:
-            AssertMsgFailed (("Selected tree should be equal to one item in VBoxDefs::MediaType.\n"));
+            AssertMsgFailed (("Selected tree should be equal to one item in VBoxDefs::MediumType.\n"));
             break;
     }
@@ -1080 +1082 @@
     QString id = item->id();
     AssertReturnVoid (!id.isNull());
-    VBoxDefs::MediaType type = item->type();
+    VBoxDefs::MediumType type = item->type();
 
     if (!vboxProblem().confirmRemoveMedium (this, item->medium()))
@@ -1089 +1091 @@
     switch (type)
     {
-        case VBoxDefs::MediaType_HardDisk:
+        case VBoxDefs::MediumType_HardDisk:
         {
             bool deleteStorage = false;
@@ -1101 +1103 @@
              * will give a corresponding hint. Therefore, once the code is
              * changed below, the hint should be re-checked for validity. */
-            if (item->state() != KMediaState_Inaccessible)
+            if (item->state() != KMediumState_Inaccessible)
             {
                 int rc = vboxProblem().
@@ -1110 +1112 @@
             }
 
-            CHardDisk hardDisk = item->medium().hardDisk();
+            CMedium hardDisk = item->medium().medium();
 
             if (deleteStorage)
@@ -1126 +1128 @@
 
                 if (success)
-                    vboxGlobal().removeMedium (VBoxDefs::MediaType_HardDisk, id);
+                    vboxGlobal().removeMedium (VBoxDefs::MediumType_HardDisk, id);
                 else
                     vboxProblem().cannotDeleteHardDiskStorage (this, hardDisk,
@@ -1141 +1143 @@
             break;
         }
-        case VBoxDefs::MediaType_DVD:
-        {
-            CDVDImage image = item->medium().dvdImage();
+        case VBoxDefs::MediumType_DVD:
+        {
+            CMedium image = item->medium().medium();
             image.Close();
             result = image;
             break;
         }
-        case VBoxDefs::MediaType_Floppy:
-        {
-            CFloppyImage image = item->medium().floppyImage();
+        case VBoxDefs::MediumType_Floppy:
+        {
+            CMedium image = item->medium().medium();
             image.Close();
             result = image;
@@ -1246 +1248 @@
     switch (aMedium.type())
     {
-        case VBoxDefs::MediaType_HardDisk:
-        {
-            CHardDiskAttachmentVector vec =machine.GetHardDiskAttachments();
+        case VBoxDefs::MediumType_HardDisk:
+        {
+            CMediumAttachmentVector vec = machine.GetMediumAttachments();
             for (int i = 0; i < vec.size(); ++ i)
             {
-                CHardDiskAttachment hda = vec [i];
-                if (hda.GetHardDisk().GetId() == aMedium.id())
+                CMediumAttachment hda = vec [i];
+                if (hda.GetMedium().GetId() == aMedium.id())
                 {
-                    machine.DetachHardDisk(hda.GetController(),
-                                           hda.GetPort(),
-                                           hda.GetDevice());
+                    machine.DetachDevice(hda.GetController(),
+                                         hda.GetPort(),
+                                         hda.GetDevice());
                     if (!machine.isOk())
                     {
@@ -1271 +1273 @@
             break;
         }
-        case VBoxDefs::MediaType_DVD:
-        {
-            CDVDDrive drive = machine.GetDVDDrive();
-            drive.Unmount();
-            if (!drive.isOk())
+        case VBoxDefs::MediumType_DVD:
+        {
+            machine.MountMedium ("IDE", 1, 0, NULL);
+            if (!machine.isOk())
             {
                 vboxProblem().cannotUnmountMedium (this, machine, aMedium,
-                                                   COMResult (drive));
+                                                   COMResult (machine));
                 success = false;
             }
             break;
         }
-        case VBoxDefs::MediaType_Floppy:
-        {
-            CFloppyDrive drive = machine.GetFloppyDrive();
-            drive.Unmount();
-            if (!drive.isOk())
+        case VBoxDefs::MediumType_Floppy:
+        {
+            machine.MountMedium ("FD", 0, 0, NULL);
+            if (!machine.isOk())
             {
                 vboxProblem().cannotUnmountMedium (this, machine, aMedium,
-                                                   COMResult (drive));
+                                                   COMResult (machine));
                 success = false;
             }
@@ -1316 +1316 @@
 }
 
-QTreeWidget* VBoxMediaManagerDlg::treeWidget (VBoxDefs::MediaType aType) const
+QTreeWidget* VBoxMediaManagerDlg::treeWidget (VBoxDefs::MediumType aType) const
 {
     QTreeWidget* tree = 0;
     switch (aType)
     {
-        case VBoxDefs::MediaType_HardDisk:
+        case VBoxDefs::MediumType_HardDisk:
             tree = mHardDiskView;
             break;
-        case VBoxDefs::MediaType_DVD:
+        case VBoxDefs::MediumType_DVD:
             tree = mDVDView;
             break;
-        case VBoxDefs::MediaType_Floppy:
+        case VBoxDefs::MediumType_Floppy:
             tree = mFloppyView;
             break;
@@ -1337 +1337 @@
 }
 
-VBoxDefs::MediaType VBoxMediaManagerDlg::currentTreeWidgetType() const
-{
-    VBoxDefs::MediaType type = VBoxDefs::MediaType_Invalid;
+VBoxDefs::MediumType VBoxMediaManagerDlg::currentTreeWidgetType() const
+{
+    VBoxDefs::MediumType type = VBoxDefs::MediumType_Invalid;
     switch (mTwImages->currentIndex ())
     {
         case HDTab:
-            type = VBoxDefs::MediaType_HardDisk;
+            type = VBoxDefs::MediumType_HardDisk;
             break;
         case CDTab:
-            type = VBoxDefs::MediaType_DVD;
+            type = VBoxDefs::MediumType_DVD;
             break;
         case FDTab:
-            type = VBoxDefs::MediaType_Floppy;
+            type = VBoxDefs::MediumType_Floppy;
             break;
         default:
@@ -1424 +1424 @@
 
     /* New and Add are now enabled even when enumerating since it should be safe */
-    bool newEnabled     = currentTreeWidgetType() == VBoxDefs::MediaType_HardDisk;
+    bool newEnabled     = currentTreeWidgetType() == VBoxDefs::MediumType_HardDisk;
     bool addEnabled     = true;
 //  bool editEnabled    = notInEnum && item && checkMediumFor (item, Action_Edit);
@@ -1551 +1551 @@
 
 void VBoxMediaManagerDlg::addMediumToList (const QString &aLocation,
-                                           VBoxDefs::MediaType aType)
+                                           VBoxDefs::MediumType aType)
 {
     AssertReturnVoid (!aLocation.isEmpty());
@@ -1560 +1560 @@
     switch (aType)
     {
-        case VBoxDefs::MediaType_HardDisk:
-        {
-            CHardDisk hd = mVBox.OpenHardDisk(aLocation, KAccessMode_ReadWrite, false, "", false, "");
+        case VBoxDefs::MediumType_HardDisk:
+        {
+            CMedium hd = mVBox.OpenHardDisk(aLocation, KAccessMode_ReadWrite, false, "", false, "");
             if (mVBox.isOk())
             {
                 medium = VBoxMedium (CMedium (hd),
-                                     VBoxDefs::MediaType_HardDisk,
-                                     KMediaState_Created);
+                                     VBoxDefs::MediumType_HardDisk,
+                                     KMediumState_Created);
             }
             break;
         }
-        case VBoxDefs::MediaType_DVD:
-        {
-            CDVDImage image = mVBox.OpenDVDImage (aLocation, uuid);
+        case VBoxDefs::MediumType_DVD:
+        {
+            CMedium image = mVBox.OpenDVDImage (aLocation, uuid);
             if (mVBox.isOk())
             {
                 medium = VBoxMedium (CMedium (image),
-                                     VBoxDefs::MediaType_DVD,
-                                     KMediaState_Created);
+                                     VBoxDefs::MediumType_DVD,
+                                     KMediumState_Created);
             }
             break;
         }
-        case VBoxDefs::MediaType_Floppy:
-        {
-            CFloppyImage image = mVBox.OpenFloppyImage (aLocation, uuid);
+        case VBoxDefs::MediumType_Floppy:
+        {
+            CMedium image = mVBox.OpenFloppyImage (aLocation, uuid);
             if (mVBox.isOk())
             {
                 medium = VBoxMedium (CMedium (image),
-                                     VBoxDefs::MediaType_Floppy,
-                                     KMediaState_Created);
+                                     VBoxDefs::MediumType_Floppy,
+                                     KMediumState_Created);
             }
             break;
@@ -1606 +1606 @@
                                                     const VBoxMedium &aMedium) const
 {
-    AssertReturn (!aMedium.hardDisk().isNull(), 0);
+    AssertReturn (!aMedium.medium().isNull(), 0);
 
     MediaItem *item = 0;
 
-    CHardDisk parent = aMedium.hardDisk().GetParent();
+    CMedium parent = aMedium.medium().GetParent();
     if (parent.isNull())
     {
@@ -1635 +1635 @@
     switch (aItem->type())
     {
-        case VBoxDefs::MediaType_HardDisk:
+        case VBoxDefs::MediumType_HardDisk:
             tab = HDTab;
             icon = &mHardDiskIcon;
             inaccessible = &mHardDisksInaccessible;
             break;
-        case VBoxDefs::MediaType_DVD:
+        case VBoxDefs::MediumType_DVD:
             tab = CDTab;
             icon = &mDVDImageIcon;
             inaccessible = &mDVDImagesInaccessible;
             break;
-        case VBoxDefs::MediaType_Floppy:
+        case VBoxDefs::MediumType_Floppy:
             tab = FDTab;
             icon = &mFloppyImageIcon;
@@ -1662 +1662 @@
             /* Does it change the overall state? */
             if (*inaccessible ||
-                aItem->state() != KMediaState_Inaccessible)
+                aItem->state() != KMediumState_Inaccessible)
                 break; /* no */
 
@@ -1679 +1679 @@
             {
                 /* Does it change the overall state? */
-                if ((*inaccessible && aItem->state() == KMediaState_Inaccessible) ||
-                    (!*inaccessible && aItem->state() != KMediaState_Inaccessible))
+                if ((*inaccessible && aItem->state() == KMediumState_Inaccessible) ||
+                    (!*inaccessible && aItem->state() != KMediumState_Inaccessible))
                     break; /* no */
 
                 /* Is the given item in charge? */
-                if (!*inaccessible && aItem->state() == KMediaState_Inaccessible)
+                if (!*inaccessible && aItem->state() == KMediumState_Inaccessible)
                     *inaccessible = true; /* yes */
                 else
@@ -1703 +1703 @@
                 {
                     if (*it != aItem &&
-                        (*it)->state() == KMediaState_Inaccessible)
+                        (*it)->state() == KMediumState_Inaccessible)
                     {
                         *inaccessible = true;
@@ -1765 +1765 @@
             switch (aItem->state())
             {
-                case KMediaState_NotCreated:
-                case KMediaState_Inaccessible:
-                case KMediaState_LockedRead:
-                case KMediaState_LockedWrite:
+                case KMediumState_NotCreated:
+                case KMediumState_Inaccessible:
+                case KMediumState_LockedRead:
+                case KMediumState_LockedWrite:
                     return false;
                 default:
@@ -1804 +1804 @@
         switch (currentTreeWidgetType())
         {
-            case VBoxDefs::MediaType_HardDisk:
+            case VBoxDefs::MediumType_HardDisk:
             {
                 QList < QPair <QString, QString> > filterList = vboxGlobal().HDDBackends();
@@ -1820 +1820 @@
                 break;
             }
-            case VBoxDefs::MediaType_DVD:
+            case VBoxDefs::MediumType_DVD:
                 err |= (suffix != "iso");
                 break;
-            case VBoxDefs::MediaType_Floppy:
+            case VBoxDefs::MediumType_Floppy:
                 err |= (suffix != "img");
                 break;
             default:
-                AssertMsgFailed (("Selected tree should be equal to one item in VBoxDefs::MediaType.\n"));
+                AssertMsgFailed (("Selected tree should be equal to one item in VBoxDefs::MediumType.\n"));
                 break;
         }
@@ -1839 +1839 @@
     {
         QString file = u.toLocalFile();
-        VBoxDefs::MediaType type = currentTreeWidgetType();
+        VBoxDefs::MediumType type = currentTreeWidgetType();
         addMediumToList (file, type);
     }

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

@@ -21 +21 @@
  */
 
+/* Global includes */
+#include <QDir>
+
+/* Local includes */
 #include "VBoxMedium.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-
-/* Qt includes */
-#include <QDir>
-
-void VBoxMedium::init()
-{
-    AssertReturnVoid (!mMedium.isNull());
-
-    switch (mType)
-    {
-        case VBoxDefs::MediaType_HardDisk:
-        {
-            mHardDisk = mMedium;
-            AssertReturnVoid (!mHardDisk.isNull());
-            break;
-        }
-        case VBoxDefs::MediaType_DVD:
-        {
-            mDVDImage = mMedium;
-            AssertReturnVoid (!mDVDImage.isNull());
-            Assert (mParent == NULL);
-            break;
-        }
-        case VBoxDefs::MediaType_Floppy:
-        {
-            mFloppyImage = mMedium;
-            AssertReturnVoid (!mFloppyImage.isNull());
-            Assert (mParent == NULL);
-            break;
-        }
-        default:
-            AssertFailed();
-    }
-
-    refresh();
-}
 
 /**
@@ -77 +45 @@
 void VBoxMedium::blockAndQueryState()
 {
+    if (mMedium.isNull()) return;
+
     mState = mMedium.GetState();
 
-    /* save the result to distinguish between inaccessible and e.g.
-     * uninitialized objects */
+    /* Save the result to distinguish between inaccessible and e.g. uninitialized objects */
     mResult = COMResult (mMedium);
 
     if (!mResult.isOk())
     {
-        mState = KMediaState_Inaccessible;
+        mState = KMediumState_Inaccessible;
         mLastAccessError = QString::null;
     }
@@ -100 +69 @@
  *
  * Note that some string such as #size() are meaningless if the media state is
- * KMediaState_NotCreated (i.e. the medium has not yet been checked for
+ * KMediumState_NotCreated (i.e. the medium has not yet been checked for
  * accessibility).
  */
 void VBoxMedium::refresh()
 {
-    mId = mMedium.GetId();
-    mLocation = mMedium.GetLocation();
-    mName = mMedium.GetName();
-
-    if (mType == VBoxDefs::MediaType_HardDisk)
-    {
-        /// @todo NEWMEDIA use CSystemProperties::GetHardDIskFormats to see if the
-        /// given hard disk format is a file
-        mLocation = QDir::toNativeSeparators (mLocation);
-        mHardDiskFormat = mHardDisk.GetFormat();
-        mHardDiskType = vboxGlobal().hardDiskTypeString (mHardDisk);
-
-        mIsReadOnly = mHardDisk.GetReadOnly();
-
-        /* adjust the parent if necessary (note that mParent must always point
+    /* Detect basic parameters */
+    mId = mMedium.isNull() ? QUuid().toString().remove ('{').remove ('}') : mMedium.GetId();
+
+    mIsHostDrive = mMedium.isNull() ? false : mMedium.GetHostDrive();
+
+    mName = mMedium.isNull() ? VBoxGlobal::tr ("Not Set", "medium") :
+            !mIsHostDrive ? mMedium.GetName() :
+            VBoxGlobal::tr ("Host Drive '%1'", "medium").arg (QDir::toNativeSeparators (mMedium.GetLocation()));
+
+    mLocation = mMedium.isNull() || mIsHostDrive ? QString ("--") :
+                QDir::toNativeSeparators (mMedium.GetLocation());
+
+    if (mType == VBoxDefs::MediumType_HardDisk)
+    {
+        mHardDiskFormat = mMedium.GetFormat();
+        mHardDiskType = vboxGlobal().mediumTypeString (mMedium);
+        mIsReadOnly = mMedium.GetReadOnly();
+
+        /* Adjust the parent if necessary (note that mParent must always point
          * to an item from VBoxGlobal::currentMediaList()) */
-
-        CHardDisk parent = mHardDisk.GetParent();
+        CMedium parent = mMedium.GetParent();
         Assert (!parent.isNull() || mParent == NULL);
 
-        if (!parent.isNull() &&
-            (mParent == NULL || mParent->mHardDisk != parent))
-        {
-            /* search for the parent (must be there) */
+        if (!parent.isNull() && (mParent == NULL || mParent->mMedium != parent))
+        {
+            /* Search for the parent (must be there) */
             const VBoxMediaList &list = vboxGlobal().currentMediaList();
-            for (VBoxMediaList::const_iterator it = list.begin();
-                 it != list.end(); ++ it)
+            for (VBoxMediaList::const_iterator it = list.begin(); it != list.end(); ++ it)
             {
-                if ((*it).mType != VBoxDefs::MediaType_HardDisk)
+                if ((*it).mType != VBoxDefs::MediumType_HardDisk)
                     break;
 
-                if ((*it).mHardDisk == parent)
+                if ((*it).mMedium == parent)
                 {
-                    /* we unconst here because by the const list we don't mean
-                     * const items */
                     mParent = unconst (&*it);
                     break;
@@ -145 +113 @@
             }
 
-            Assert (mParent != NULL && mParent->mHardDisk == parent);
+            Assert (mParent != NULL && mParent->mMedium == parent);
         }
     }
     else
     {
-        mLocation = QDir::toNativeSeparators (mLocation);
         mHardDiskFormat = QString::null;
         mHardDiskType = QString::null;
-
         mIsReadOnly = false;
     }
 
-    if (mState != KMediaState_Inaccessible &&
-        mState != KMediaState_NotCreated)
+    /* Detect sizes */
+    if (mState != KMediumState_Inaccessible && mState != KMediumState_NotCreated && !mIsHostDrive)
     {
         mSize = vboxGlobal().formatSize (mMedium.GetSize());
-        if (mType == VBoxDefs::MediaType_HardDisk)
-            mLogicalSize = vboxGlobal()
-                .formatSize (mHardDisk.GetLogicalSize() * _1M);
+        if (mType == VBoxDefs::MediumType_HardDisk)
+            mLogicalSize = vboxGlobal().formatSize (mMedium.GetLogicalSize() * _1M);
         else
             mLogicalSize = mSize;
@@ -172 +137 @@
     }
 
-    /* detect usage */
-
-    mUsage = QString::null; /* important: null means not used! */
-
-    mCurStateMachineIds.clear();
-
-    QVector <QString> machineIds = mMedium.GetMachineIds();
-    if (machineIds.size() > 0)
-    {
-        QString usage;
-
-        CVirtualBox vbox = vboxGlobal().virtualBox();
-
-        for (QVector <QString>::ConstIterator it = machineIds.begin();
-             it != machineIds.end(); ++ it)
-        {
-            CMachine machine = vbox.GetMachine (*it);
-
-            QString name = machine.GetName();
-            QString snapshots;
-
-            QVector <QString> snapIds = mMedium.GetSnapshotIds (*it);
-            for (QVector <QString>::ConstIterator jt = snapIds.begin();
-                 jt != snapIds.end(); ++ jt)
+    /* Detect usage */
+    mUsage = QString::null;
+    if (!mMedium.isNull())
+    {
+        mCurStateMachineIds.clear();
+        QVector <QString> machineIds = mMedium.GetMachineIds();
+        if (machineIds.size() > 0)
+        {
+            QString usage;
+
+            CVirtualBox vbox = vboxGlobal().virtualBox();
+
+            for (QVector <QString>::ConstIterator it = machineIds.begin(); it != machineIds.end(); ++ it)
             {
-                if (*jt == *it)
+                CMachine machine = vbox.GetMachine (*it);
+
+                QString name = machine.GetName();
+                QString snapshots;
+
+                QVector <QString> snapIds = mMedium.GetSnapshotIds (*it);
+                for (QVector <QString>::ConstIterator jt = snapIds.begin(); jt != snapIds.end(); ++ jt)
                 {
-                    /* the medium is attached to the machine in the current
-                     * state, we don't distinguish this for now by always
-                     * giving the VM name in front of snapshot names. */
-
-                    mCurStateMachineIds.push_back (*jt);
-                    continue;
+                    if (*jt == *it)
+                    {
+                        /* the medium is attached to the machine in the current
+                         * state, we don't distinguish this for now by always
+                         * giving the VM name in front of snapshot names. */
+
+                        mCurStateMachineIds.push_back (*jt);
+                        continue;
+                    }
+
+                    CSnapshot snapshot = machine.GetSnapshot (*jt);
+                    if (!snapshots.isNull())
+                        snapshots += ", ";
+                    snapshots += snapshot.GetName();
                 }
 
-                CSnapshot snapshot = machine.GetSnapshot (*jt);
+                if (!usage.isNull())
+                    usage += ", ";
+
+                usage += name;
+
                 if (!snapshots.isNull())
-                    snapshots += ", ";
-                snapshots += snapshot.GetName();
+                {
+                    usage += QString (" (%2)").arg (snapshots);
+                    mIsUsedInSnapshots = true;
+                }
+                else
+                    mIsUsedInSnapshots = false;
             }
 
-            if (!usage.isNull())
-                usage += ", ";
-
-            usage += name;
-
-            if (!snapshots.isNull())
+            Assert (!usage.isEmpty());
+            mUsage = usage;
+        }
+    }
+
+    /* Compose the tooltip */
+    if (mMedium.isNull())
+    {
+        mToolTip = VBoxGlobal::tr ("<nobr><b>Null&nbsp;Medium</b></nobr><br>"
+                                   "This medium corresponds to empty device "
+                                   "which could be mounted at runtime.");
+    }
+    else
+    {
+        mToolTip = QString ("<nobr><b>%1</b></nobr>").arg (mIsHostDrive ? mName : mLocation);
+
+        if (mType == VBoxDefs::MediumType_HardDisk)
+        {
+            mToolTip += VBoxGlobal::tr (
+                "<br><nobr>Type&nbsp;(Format):&nbsp;&nbsp;%2&nbsp;(%3)</nobr>", "hard disk")
+                .arg (mHardDiskType).arg (mHardDiskFormat);
+        }
+
+        mToolTip += VBoxGlobal::tr (
+            "<br><nobr>Attached&nbsp;to:&nbsp;&nbsp;%1</nobr>", "medium")
+            .arg (mUsage.isNull() ? VBoxGlobal::tr ("<i>Not&nbsp;Attached</i>", "medium") : mUsage);
+
+        switch (mState)
+        {
+            case KMediumState_NotCreated:
             {
-                usage += QString (" (%2)").arg (snapshots);
-                mIsUsedInSnapshots = true;
+                mToolTip += VBoxGlobal::tr ("<br><i>Checking accessibility...</i>", "medium");
+                break;
             }
-            else
-                mIsUsedInSnapshots = false;
-        }
-
-        Assert (!usage.isEmpty());
-        mUsage = usage;
-    }
-
-    /* compose the tooltip (makes sense to keep the format in sync with
-     * VBoxMediaManagerDlg::languageChangeImp() and
-     * VBoxMediaManagerDlg::processCurrentChanged()) */
-
-    mToolTip = QString ("<nobr><b>%1</b></nobr>").arg (mLocation);
-
-    if (mType == VBoxDefs::MediaType_HardDisk)
-    {
-        mToolTip += VBoxGlobal::tr (
-            "<br><nobr>Type&nbsp;(Format):&nbsp;&nbsp;%2&nbsp;(%3)</nobr>",
-            "hard disk")
-            .arg (mHardDiskType)
-            .arg (mHardDiskFormat);
-    }
-
-    mToolTip += VBoxGlobal::tr (
-        "<br><nobr>Attached to:&nbsp;&nbsp;%1</nobr>", "medium")
-        .arg (mUsage.isNull() ?
-              VBoxGlobal::tr ("<i>Not&nbsp;Attached</i>", "medium") :
-              mUsage);
-
-    switch (mState)
-    {
-        case KMediaState_NotCreated:
-        {
-            mToolTip += VBoxGlobal::tr ("<br><i>Checking accessibility...</i>",
-                                        "medium");
-            break;
-        }
-        case KMediaState_Inaccessible:
-        {
-            if (mResult.isOk())
+            case KMediumState_Inaccessible:
             {
-                /* not accessibile */
-                mToolTip += QString ("<hr>%1").
-                    arg (VBoxGlobal::highlight (mLastAccessError,
-                                                true /* aToolTip */));
+                if (mResult.isOk())
+                {
+                    /* not accessibile */
+                    mToolTip += QString ("<hr>%1").
+                        arg (VBoxGlobal::highlight (mLastAccessError,
+                                                    true /* aToolTip */));
+                }
+                else
+                {
+                    /* accessibility check (eg GetState()) itself failed */
+                    mToolTip = VBoxGlobal::tr (
+                        "<hr>Failed to check media accessibility.<br>%1.", "medium").
+                        arg (VBoxProblemReporter::formatErrorInfo (mResult));
+                }
+                break;
             }
-            else
-            {
-                /* accessibility check (eg GetState()) itself failed */
-                mToolTip = VBoxGlobal::tr (
-                    "<hr>Failed to check media accessibility.<br>%1.",
-                    "medium").
-                    arg (VBoxProblemReporter::formatErrorInfo (mResult));
-            }
-            break;
-        }
-        default:
-            break;
+            default:
+                break;
+        }
     }
 
@@ -312 +275 @@
  *                  accordingly.
  */
-QString VBoxMedium::toolTip (bool aNoDiffs /*= false*/,
-                             bool aCheckRO /*= false*/) const
+QString VBoxMedium::toolTip (bool aNoDiffs /*= false*/, bool aCheckRO /*= false*/) const
 {
     unconst (this)->checkNoDiffs (aNoDiffs);
@@ -323 +285 @@
             "<hr><img src=%1/>&nbsp;Attaching this hard disk will "
             "be performed indirectly using a newly created "
-            "differencing hard disk.",
-            "medium").
-            arg (":/new_16px.png");
+            "differencing hard disk.", "medium").arg (":/new_16px.png");
 
     return tip;
@@ -349 +309 @@
     QPixmap icon;
 
-    if (state (aNoDiffs) == KMediaState_Inaccessible)
-        icon = result (aNoDiffs).isOk() ?
-            vboxGlobal().warningIcon() : vboxGlobal().errorIcon();
+    if (state (aNoDiffs) == KMediumState_Inaccessible)
+        icon = result (aNoDiffs).isOk() ? vboxGlobal().warningIcon() : vboxGlobal().errorIcon();
 
     if (aCheckRO && mIsReadOnly)
-        icon = VBoxGlobal::
-            joinPixmaps (icon, QPixmap (":/new_16px.png"));
+        icon = VBoxGlobal::joinPixmaps (icon, QPixmap (":/new_16px.png"));
 
     return icon;
@@ -402 +360 @@
     // exceptions everywhere (or check the result after every method call). See
     // also Defect #2149.
+
+    if (mMedium.isNull() || mIsHostDrive)
+        return mName;
+
     if (!mMedium.isOk())
         return QString::null;
@@ -408 +370 @@
 
     VBoxMedium *root = unconst (this);
-    KMediaState state = mState;
-
-    if (mType == VBoxDefs::MediaType_HardDisk)
+    KMediumState state = mState;
+
+    if (mType == VBoxDefs::MediumType_HardDisk)
     {
         if (aNoDiffs)
@@ -416 +378 @@
             root = &this->root();
 
-            bool isDiff =
-                (!aPredictDiff && mParent != NULL) ||
-                (aPredictDiff && mIsReadOnly);
+            bool isDiff = (!aPredictDiff && mParent != NULL) || (aPredictDiff && mIsReadOnly);
 
             details = isDiff && aUseHTML ?
@@ -428 +388 @@
 
             /* we cannot get the logical size if the root is not checked yet */
-            if (root->mState == KMediaState_NotCreated)
-                state = KMediaState_NotCreated;
+            if (root->mState == KMediumState_NotCreated)
+                state = KMediumState_NotCreated;
         }
         else
@@ -442 +402 @@
     switch (state)
     {
-        case KMediaState_NotCreated:
+        case KMediumState_NotCreated:
             str = VBoxGlobal::tr ("Checking...", "medium");
             details += aUseHTML ? QString ("<i>%1</i>").arg (str) : str;
             break;
-        case KMediaState_Inaccessible:
+        case KMediumState_Inaccessible:
             str = VBoxGlobal::tr ("Inaccessible", "medium");
             details += aUseHTML ? QString ("<b>%1</b>").arg (str) : str;
             break;
         default:
-            details += mType == VBoxDefs::MediaType_HardDisk ?
+            details += mType == VBoxDefs::MediumType_HardDisk ?
                        root->mLogicalSize : root->mSize;
             break;
@@ -481 +441 @@
     /* detect the overall (worst) state of the given hard disk chain */
     mNoDiffs.state = mState;
-    for (VBoxMedium *cur = mParent; cur != NULL;
-         cur = cur->mParent)
-    {
-        if (cur->mState == KMediaState_Inaccessible)
+    for (VBoxMedium *cur = mParent; cur != NULL; cur = cur->mParent)
+    {
+        if (cur->mState == KMediumState_Inaccessible)
         {
             mNoDiffs.state = cur->mState;

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

@@ -148 +148 @@
 
     /* Name and Size page */
-    /// @todo NEWMEDIA use extension as reported by CHardDiskFormat
+    /// @todo NEWMEDIA use extension as reported by CMediumFormat
     static ulong HDNumber = 0;
     mLeName->setText (QString ("NewHardDisk%1.vdi").arg (++ HDNumber));
@@ -375 +375 @@
 bool VBoxNewHDWzd::createHardDisk()
 {
-    KHardDiskVariant variant = KHardDiskVariant_Standard;
+    KMediumVariant variant = KMediumVariant_Standard;
     QString loc = location();
 
@@ -385 +385 @@
     CProgress progress;
 
-    CHardDisk hd = vbox.CreateHardDisk(QString ("VDI"), loc);
+    CMedium hd = vbox.CreateHardDisk(QString ("VDI"), loc);
 
     if (!vbox.isOk())
@@ -395 +395 @@
 
     if (!isDynamicStorage())
-        variant = (KHardDiskVariant)(KHardDiskVariant_Standard | KHardDiskVariant_Fixed);
+        variant = (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_Fixed);
 
     progress = hd.CreateBaseStorage (mCurrentSize, variant);
@@ -417 +417 @@
     /* Inform everybody there is a new medium */
     vboxGlobal().addMedium (VBoxMedium (CMedium (hd),
-                                        VBoxDefs::MediaType_HardDisk,
-                                        KMediaState_Created));
+                                        VBoxDefs::MediumType_HardDisk,
+                                        KMediumState_Created));
 
     mHD = hd;

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

@@ -68 +68 @@
     QSpacerItem *spacer = new QSpacerItem (wid, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
     hdLayout->addItem (spacer, 2, 0);
-    mHDCombo->setType (VBoxDefs::MediaType_HardDisk);
+    mHDCombo->setType (VBoxDefs::MediumType_HardDisk);
     mHDCombo->repopulate();
     mTbVmm->setIcon (VBoxGlobal::iconSet (":/select_file_16px.png",
@@ -168 +168 @@
 {
     VBoxMediaManagerDlg dlg (this);
-    dlg.setup (VBoxDefs::MediaType_HardDisk, true);
+    dlg.setup (VBoxDefs::MediumType_HardDisk, true);
 
     if (dlg.exec() == QDialog::Accepted)
@@ -369 +369 @@
         {
             CMachine m = session.GetMachine();
-            m.AttachHardDisk (mHDCombo->id(), QString("IDE"), 0, 0);
+            m.AttachDevice ("IDE", 0, 0, KDeviceType_HardDisk, mHDCombo->id());
             if (m.isOk())
             {
@@ -419 +419 @@
 
         if (success)
-            vboxGlobal().removeMedium (VBoxDefs::MediaType_HardDisk, id);
+            vboxGlobal().removeMedium (VBoxDefs::MediumType_HardDisk, id);
         else
             vboxProblem().cannotDeleteHardDiskStorage (this, mHardDisk,

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

@@ -1011 +1011 @@
             .arg (aMedium.location());
 
-    if (aMedium.type() == VBoxDefs::MediaType_HardDisk)
-    {
-        if (aMedium.state() == KMediaState_Inaccessible)
+    if (aMedium.type() == VBoxDefs::MediumType_HardDisk)
+    {
+        if (aMedium.state() == KMediumState_Inaccessible)
             msg +=
                 tr ("Note that this hard disk is inaccessible so that its "
@@ -1069 +1069 @@
 
 void VBoxProblemReporter::cannotDeleteHardDiskStorage (QWidget *aParent,
-                                                       const CHardDisk &aHD,
+                                                       const CMedium &aHD,
                                                        const CProgress &aProgress)
 {
-    /* below, we use CHardDisk (aHD) to preserve current error info
+    /* below, we use CMedium (aHD) to preserve current error info
      * for formatErrorInfo() */
 
     message (aParent, Error,
         tr ("Failed to delete the storage unit of the hard disk <b>%1</b>.")
-            .arg (CHardDisk (aHD).GetLocation()),
+            .arg (CMedium (aHD).GetLocation()),
         !aHD.isOk() ? formatErrorInfo (aHD) :
         !aProgress.isOk() ? formatErrorInfo (aProgress) :
@@ -1107 +1107 @@
 }
 
-int VBoxProblemReporter::confirmRunNewHDWzdOrVDM (QWidget* aParent)
-{
-    return message (aParent, Info,
-        tr ("<p>There are no unused hard disks available for the newly created "
-            "attachment.</p>"
-            "<p>Press the <b>Create</b> button to start the <i>New Virtual "
-            "Disk</i> wizard and create a new hard disk, or press the "
-            "<b>Select</b> button to open the <i>Virtual Media Manager</i> "
-            "and select what to do.</p>"),
-        0, /* aAutoConfirmId */
-        QIMessageBox::Yes,
-        QIMessageBox::No | QIMessageBox::Default,
-        QIMessageBox::Cancel | QIMessageBox::Escape,
-        tr ("&Create", "hard disk"),
-        tr ("Select", "hard disk"));
+int VBoxProblemReporter::confirmRunNewHDWzdOrVDM (KDeviceType aDeviceType)
+{
+    switch (aDeviceType)
+    {
+        case KDeviceType_HardDisk:
+            return message (QApplication::activeWindow(), Info,
+                            tr ("<p>There are no unused mediums available for the newly "
+                                "created attachment.</p>"
+                                "<p>Press the <b>Create</b> button to start the <i>New "
+                                "Virtual Disk</i> wizard and create a new medium, "
+                                "or press the <b>Select</b> button to open the <i>Virtual "
+                                "Media Manager</i> and select what to do.</p>"),
+                            0, /* aAutoConfirmId */
+                            QIMessageBox::Yes,
+                            QIMessageBox::No | QIMessageBox::Default,
+                            QIMessageBox::Cancel | QIMessageBox::Escape,
+                            tr ("&Create", "medium"),
+                            tr ("&Select", "medium"));
+        default:
+            return message (QApplication::activeWindow(), Info,
+                            tr ("<p>There are no unused mediums available for the newly "
+                                "created attachment.</p>"
+                                "<p>Press the <b>Select</b> button to open the <i>Virtual "
+                                "Media Manager</i> and select what to do.</p>"),
+                            0, /* aAutoConfirmId */
+                            QIMessageBox::No | QIMessageBox::Default,
+                            QIMessageBox::Cancel | QIMessageBox::Escape,
+                            0,
+                            tr ("&Select", "medium"));
+    }
+    return QIMessageBox::Cancel;
 }
 
 void VBoxProblemReporter::cannotCreateHardDiskStorage (
     QWidget *aParent, const CVirtualBox &aVBox, const QString &aLocation,
-    const CHardDisk &aHD, const CProgress &aProgress)
+    const CMedium &aHD, const CProgress &aProgress)
 {
     message (aParent, Error,
@@ -1145 +1161 @@
             "to the slot <i>%2</i> of the machine <b>%3</b>.")
             .arg (aLocation)
-            .arg (vboxGlobal().toFullString (aBus, aChannel, aDevice))
+            .arg (vboxGlobal().toFullString (StorageSlot (aBus, aChannel, aDevice)))
             .arg (CMachine (aMachine).GetName()),
         formatErrorInfo (aMachine));
@@ -1158 +1174 @@
             "from the slot <i>%2</i> of the machine <b>%3</b>.")
             .arg (aLocation)
-            .arg (vboxGlobal().toFullString (aBus, aChannel, aDevice))
+            .arg (vboxGlobal().toFullString (StorageSlot (aBus, aChannel, aDevice)))
             .arg (CMachine (aMachine).GetName()),
          formatErrorInfo (aMachine));
@@ -1195 +1211 @@
 void VBoxProblemReporter::cannotOpenMedium (
     QWidget *aParent, const CVirtualBox &aVBox,
-    VBoxDefs::MediaType aType, const QString &aLocation)
+    VBoxDefs::MediumType aType, const QString &aLocation)
 {
     /** @todo (translation-related): the gender of "the" in translations
@@ -2171 +2187 @@
 
 /* static */
-QString VBoxProblemReporter::toAccusative (VBoxDefs::MediaType aType)
+QString VBoxProblemReporter::toAccusative (VBoxDefs::MediumType aType)
 {
     QString type =
-        aType == VBoxDefs::MediaType_HardDisk ?
+        aType == VBoxDefs::MediumType_HardDisk ?
             tr ("hard disk", "failed to close ...") :
-        aType == VBoxDefs::MediaType_DVD ?
+        aType == VBoxDefs::MediumType_DVD ?
             tr ("CD/DVD image", "failed to close ...") :
-        aType == VBoxDefs::MediaType_Floppy ?
+        aType == VBoxDefs::MediumType_Floppy ?
             tr ("floppy image", "failed to close ...") :
         QString::null;

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

@@ -907 +907 @@
             CMachine machine = session.GetMachine();
             /* Detach all attached Hard Disks */
-            CHardDiskAttachmentVector vec = machine.GetHardDiskAttachments();
+            CMediumAttachmentVector vec = machine.GetMediumAttachments();
             for (int i = 0; i < vec.size(); ++ i)
             {
-                CHardDiskAttachment hda = vec [i];
+                CMediumAttachment hda = vec [i];
                 const QString ctlName = hda.GetController();
 
-                machine.DetachHardDisk(ctlName, hda.GetPort(), hda.GetDevice());
+                machine.DetachDevice(ctlName, hda.GetPort(), hda.GetDevice());
                 if (!machine.isOk())
                 {
                     CStorageController ctl = machine.GetStorageControllerByName(ctlName);
                     vboxProblem().cannotDetachHardDisk (this, machine,
-                        vboxGlobal().getMedium (CMedium (hda.GetHardDisk())).location(),
+                        vboxGlobal().getMedium (CMedium (hda.GetMedium())).location(),
                         ctl.GetBus(), hda.GetPort(), hda.GetDevice());
                 }
@@ -1604 +1604 @@
         VBoxMediaList::const_iterator it;
         for (it = list.begin(); it != list.end(); ++ it)
-            if ((*it).state() == KMediaState_Inaccessible)
+            if ((*it).state() == KMediumState_Inaccessible)
                 break;
 

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

@@ -39 +39 @@
 #include "VBoxVMSettingsDisplay.h"
 #include "VBoxVMSettingsHD.h"
-#include "VBoxVMSettingsCD.h"
-#include "VBoxVMSettingsFD.h"
 #include "VBoxVMSettingsAudio.h"
 #include "VBoxVMSettingsNetwork.h"
@@ -271 +269 @@
     if (isAvailable (StorageId))
     {
+        prefPage = new VBoxVMSettingsHD();
+        connect (prefPage, SIGNAL (storageChanged()), this, SLOT (resetFirstRunFlag()));
         addItem (":/hd_32px.png", ":/hd_disabled_32px.png",
                  ":/hd_16px.png", ":/hd_disabled_16px.png",
-                 StorageId, "#storage");
-
-        /* HD page */
-        if (isAvailable (HDId))
-        {
-            prefPage = new VBoxVMSettingsHD();
-            connect (prefPage, SIGNAL (hdChanged()), this, SLOT (resetFirstRunFlag()));
-            addItem (":/hd_32px.png", ":/hd_disabled_32px.png",
-                     ":/hd_16px.png", ":/hd_disabled_16px.png",
-                     HDId, "#hdds", prefPage, StorageId);
-        }
-
-        /* CD page */
-        if (isAvailable (CDId))
-        {
-            prefPage = new VBoxVMSettingsCD();
-            connect (prefPage, SIGNAL (cdChanged()), this, SLOT (resetFirstRunFlag()));
-            addItem (":/cd_32px.png", ":/cd_disabled_32px.png",
-                     ":/cd_16px.png", ":/cd_disabled_16px.png",
-                     CDId, "#dvd", prefPage, StorageId);
-        }
-
-        /* FD page */
-        if (isAvailable (FDId))
-        {
-            prefPage = new VBoxVMSettingsFD();
-            connect (prefPage, SIGNAL (fdChanged()), this, SLOT (resetFirstRunFlag()));
-            addItem (":/fd_32px.png", ":/fd_disabled_32px.png",
-                     ":/fd_16px.png", ":/fd_disabled_16px.png",
-                     FDId, "#floppy", prefPage, StorageId);
-        }
+                 StorageId, "#storage", prefPage, StorageId);
     }
 

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

@@ -368 +368 @@
     mTbSelector->setUsesTextLabel (true);
     mTbSelector->setIconSize (QSize (32, 32));
+#ifdef Q_WS_MAC
     mTbSelector->setShowToolBarButton (false);
+#endif /* Q_WS_MAC */
     /* Init the action group for house keeping */
     mActionGroup = new QActionGroup (this);

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

@@ -36 +36 @@
 
     /* Hide unnecessary text labels */
-    CHardDiskAttachmentVector vec = mMachine.GetHardDiskAttachments();
+    CMediumAttachmentVector vec = mMachine.GetMediumAttachments();
     if (vec.size() != 0)
     {
@@ -119 +119 @@
         if (mRbHost->isChecked())
         {
-            CHostDVDDrive hostDrive = mHostDVDs [mCbHost->currentIndex()];
+            CMedium hostDrive = mHostDVDs [mCbHost->currentIndex()];
             if (!hostDrive.isNull())
-            {
-                CDVDDrive virtualDrive = mMachine.GetDVDDrive();
-                virtualDrive.CaptureHostDrive (hostDrive);
-            }
+                mMachine.MountMedium ("IDE", 1, 0, hostDrive.GetId());
         }
         else if (mRbImage->isChecked())
-        {
-            CDVDDrive virtualDrive = mMachine.GetDVDDrive();
-            virtualDrive.MountImage (mCbImage->id());
-        }
+            mMachine.MountMedium ("IDE", 1, 0, mCbImage->id());
     }
     /* Floppy Media selected */
@@ -137 +131 @@
         if (mRbHost->isChecked())
         {
-            CHostFloppyDrive hostDrive = mHostFloppys [mCbHost->currentIndex()];
+            CMedium hostDrive = mHostFloppys [mCbHost->currentIndex()];
             if (!hostDrive.isNull())
-            {
-                CFloppyDrive virtualDrive = mMachine.GetFloppyDrive();
-                virtualDrive.CaptureHostDrive (hostDrive);
-            }
+                mMachine.MountMedium ("IDE", 1, 0, hostDrive.GetId());
         }
         else if (mRbImage->isChecked())
-        {
-            CFloppyDrive virtualDrive = mMachine.GetFloppyDrive();
-            virtualDrive.MountImage (mCbImage->id());
-        }
+            mMachine.MountMedium ("IDE", 1, 0, mCbImage->id());
     }
 
@@ -176 +164 @@
     {
         /* Search for the host dvd-drives */
-        CHostDVDDriveVector coll =
+        CMediumVector coll =
             vboxGlobal().virtualBox().GetHost().GetDVDDrives();
         mHostDVDs.resize (coll.size());
@@ -182 +170 @@
         for (int id = 0; id < coll.size(); ++id)
         {
-            CHostDVDDrive hostDVD = coll[id];
+            CMedium hostDVD = coll[id];
             QString name = hostDVD.GetName();
             QString description = hostDVD.GetDescription();
@@ -192 +180 @@
 
         /* Switch media images type to DVD */
-        mCbImage->setType (VBoxDefs::MediaType_DVD);
+        mCbImage->setType (VBoxDefs::MediumType_DVD);
     }
     /* Floppy media type selected */
@@ -198 +186 @@
     {
         /* Search for the host floppy-drives */
-        CHostFloppyDriveVector coll =
+        CMediumVector coll =
             vboxGlobal().virtualBox().GetHost().GetFloppyDrives();
         mHostFloppys.resize (coll.size());
@@ -204 +192 @@
         for (int id = 0; id < coll.size(); ++id)
         {
-            CHostFloppyDrive hostFloppy = coll[id];
+            CMedium hostFloppy = coll[id];
             QString name = hostFloppy.GetName();
             QString description = hostFloppy.GetDescription();
@@ -214 +202 @@
 
         /* Switch media images type to FD */
-        mCbImage->setType (VBoxDefs::MediaType_Floppy);
+        mCbImage->setType (VBoxDefs::MediumType_Floppy);
     }
 
@@ -236 +224 @@
 void VBoxVMFirstRunWzd::openMediaManager()
 {
-    VBoxDefs::MediaType type =
-        mRbCdType->isChecked() ? VBoxDefs::MediaType_DVD :
-        mRbFdType->isChecked() ? VBoxDefs::MediaType_Floppy :
-        VBoxDefs::MediaType_Invalid;
-
-    AssertReturnVoid (type != VBoxDefs::MediaType_Invalid);
+    VBoxDefs::MediumType type =
+        mRbCdType->isChecked() ? VBoxDefs::MediumType_DVD :
+        mRbFdType->isChecked() ? VBoxDefs::MediumType_Floppy :
+        VBoxDefs::MediumType_Invalid;
+
+    AssertReturnVoid (type != VBoxDefs::MediumType_Invalid);
 
     VBoxMediaManagerDlg dlg (this);

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

@@ -488 +488 @@
 
         /* IDE Hard Disk (Primary Master) */
-        if (!m.GetHardDisk(ideCtl, 0, 0).isNull())
+        if (!m.GetMedium(ideCtl, 0, 0).isNull())
         {
             hdStat += formatHardDisk (ideCtl, 0, 0, "IDE00");
@@ -495 +495 @@
 
         /* IDE Hard Disk (Primary Slave) */
-        if (!m.GetHardDisk(ideCtl, 0, 1).isNull())
+        if (!m.GetMedium(ideCtl, 0, 1).isNull())
         {
             hdStat += formatHardDisk (ideCtl, 0, 1, "IDE01");
@@ -502 +502 @@
 
         /* IDE Hard Disk (Secondary Slave) */
-        if (!m.GetHardDisk(ideCtl, 1, 1).isNull())
+        if (!m.GetMedium(ideCtl, 1, 1).isNull())
         {
             hdStat += formatHardDisk (ideCtl, 1, 1, "IDE11");
@@ -511 +511 @@
         for (int i = 0; i < 30; ++ i)
         {
-            if (!m.GetHardDisk(sataCtl, i, 0).isNull())
+            if (!m.GetMedium(sataCtl, i, 0).isNull())
             {
                 hdStat += formatHardDisk (sataCtl, i, 0,
@@ -529 +529 @@
             for (int i = 0; i < 16; ++ i)
             {
-                if (!m.GetHardDisk(scsiCtl, i, 0).isNull())
+                if (!m.GetMedium(scsiCtl, i, 0).isNull())
                 {
                     hdStat += formatHardDisk (scsiCtl, i, 0,
@@ -614 +614 @@
         return QString::null;
 
-    CStorageController ctl = mSession.GetMachine().GetStorageControllerByName(ctlName);
-
-    CHardDisk hd = mSession.GetMachine().GetHardDisk(ctlName, aChannel, aDevice);
+    CStorageController ctl = mSession.GetMachine().GetStorageControllerByName (ctlName);
+
+    CMedium hd = mSession.GetMachine().GetMedium (ctlName, aChannel, aDevice);
     QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
-    QString name = vboxGlobal().toFullString (ctl.GetBus(), aChannel, aDevice);
+    QString name = vboxGlobal().toFullString (StorageSlot (ctl.GetBus(), aChannel, aDevice));
     QString result = hd.isNull() ? QString::null : header.arg (name);
     result += composeArticle (aBelongsTo);

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
  */
 
-
+/* Global Includes */
+#include <QHeaderView>
+#include <QItemEditorFactory>
+#include <QMetaProperty>
+#include <QMouseEvent>
+#include <QScrollBar>
+#include <QStylePainter>
+#include <QTimer>
+
+/* Local Includes */
 #include "VBoxVMSettingsHD.h"
 #include "VBoxGlobal.h"
@@ -30 +39 @@
 #include "VBoxNewHDWzd.h"
 
-/* Qt includes */
-#include <QHeaderView>
-#include <QItemEditorFactory>
-#include <QMetaProperty>
-#include <QScrollBar>
-#include <QStylePainter>
-
-/**
- * Clear the focus from the current focus owner on guard creation.
- * And put it into the desired object on guard deletion.
- *
- * Here this is used to temporary remove the focus from the attachments
- * table to close the temporary editor of this table to prevent
- * any side-process (enumeration) influencing model's data.
- */
-class FocusGuardBlock
-{
-public:
-    FocusGuardBlock (QWidget *aReturnTo) : mReturnTo (aReturnTo)
-    {
-        if (QApplication::focusWidget())
-        {
-            QApplication::focusWidget()->clearFocus();
-            qApp->processEvents();
-        }
-    }
-   ~FocusGuardBlock()
-    {
-        mReturnTo->setFocus();
-        qApp->processEvents();
-    }
-
-private:
-    QWidget *mReturnTo;
-};
-
-/** Type to store disk data */
-DiskValue::DiskValue (const QString &aId)
-    : id (aId)
-    , name (QString::null), tip (QString::null), pix (QPixmap())
-{
-    if (aId.isNull())
-        return;
-
-    VBoxMedium medium = vboxGlobal().getMedium (
-        CMedium (vboxGlobal().virtualBox().GetHardDisk(aId)));
-    medium.refresh();
-    bool noDiffs = !HDSettings::instance()->showDiffs();
-    name = medium.details (noDiffs);
-    tip = medium.toolTipCheckRO (noDiffs);
-    pix = medium.iconCheckRO (noDiffs);
-}
-
-/**
- * QAbstractTableModel class reimplementation.
- * Used to feat slot/disk selection mechanism.
- */
-Qt::ItemFlags AttachmentsModel::flags (const QModelIndex &aIndex) const
-{
-    return aIndex.row() == rowCount() - 1 ?
-        QAbstractItemModel::flags (aIndex) ^ Qt::ItemIsSelectable :
-        QAbstractItemModel::flags (aIndex) | Qt::ItemIsEditable;
-}
-
-QVariant AttachmentsModel::data (const QModelIndex &aIndex, int aRole) const
+/* String Tags */
+const char *firstAvailable = "first available";
+
+/* Type converters */
+VBoxDefs::MediumType typeToLocal (KDeviceType aType)
+{
+    VBoxDefs::MediumType result = VBoxDefs::MediumType_Invalid;
+    switch (aType)
+    {
+        case KDeviceType_HardDisk:
+            result = VBoxDefs::MediumType_HardDisk;
+            break;
+        case KDeviceType_DVD:
+            result = VBoxDefs::MediumType_DVD;
+            break;
+        case KDeviceType_Floppy:
+            result = VBoxDefs::MediumType_Floppy;
+            break;
+        default:
+            AssertMsgFailed (("Incorrect medium type!\n"));
+            break;
+    }
+    return result;
+}
+
+
+KDeviceType typeToGlobal (VBoxDefs::MediumType aType)
+{
+    KDeviceType result = KDeviceType_Null;
+    switch (aType)
+    {
+        case VBoxDefs::MediumType_HardDisk:
+            result = KDeviceType_HardDisk;
+            break;
+        case VBoxDefs::MediumType_DVD:
+            result = KDeviceType_DVD;
+            break;
+        case VBoxDefs::MediumType_Floppy:
+            result = KDeviceType_Floppy;
+            break;
+        default:
+            AssertMsgFailed (("Incorrect device type!\n"));
+            break;
+    }
+    return result;
+}
+
+QString compressText (const QString &aText)
+{
+    return QString ("<nobr><compact elipsis=\"end\">%1</compact></nobr>").arg (aText);
+}
+
+
+/* Pixmap Storage */
+QPointer <PixmapPool> PixmapPool::mThis = 0;
+
+PixmapPool* PixmapPool::pool (QObject *aParent)
+{
+    if (!mThis)
+    {
+        AssertMsg (aParent, ("This object must have parent!\n"));
+        mThis = new PixmapPool (aParent);
+    }
+    else
+    {
+        AssertMsg (!aParent, ("Parent already set!\n"));
+    }
+    return mThis;
+}
+
+PixmapPool::PixmapPool (QObject *aParent)
+    : QObject (aParent)
+{
+    mPool.resize (MaxIndex);
+
+    mPool [AddControllerEn]  = QPixmap (":/add_host_iface_16px.png"); // TODO Update Icon!!!
+    mPool [AddControllerDis] = QPixmap (":/add_host_iface_disabled_16px.png"); // TODO Update Icon!!!
+    mPool [DelControllerEn]  = QPixmap (":/remove_host_iface_16px.png"); // TODO Update Icon!!!
+    mPool [DelControllerDis] = QPixmap (":/remove_host_iface_disabled_16px.png"); // TODO Update Icon!!!
+
+    mPool [AddAttachmentEn]  = QPixmap (":/vdm_add_16px.png"); // TODO Update Icon!!!
+    mPool [AddAttachmentDis] = QPixmap (":/vdm_add_disabled_16px.png"); // TODO Update Icon!!!
+    mPool [DelAttachmentEn]  = QPixmap (":/vdm_remove_16px.png"); // TODO Update Icon!!!
+    mPool [DelAttachmentDis] = QPixmap (":/vdm_remove_disabled_16px.png"); // TODO Update Icon!!!
+
+    mPool [IDEController]    = QPixmap (":/ide_16px.png");
+    mPool [SATAController]   = QPixmap (":/sata_16px.png");
+    mPool [SCSIController]   = QPixmap (":/scsi_16px.png");
+    mPool [FloppyController] = QPixmap (":/fd_16px.png"); // TODO Update Icon!!!
+
+    mPool [HDAttachmentEn]   = QPixmap (":/hd_16px.png"); // TODO Update Icon!!!
+    mPool [HDAttachmentDis]  = QPixmap (":/hd_disabled_16px.png"); // TODO Update Icon!!!
+    mPool [CDAttachmentEn]   = QPixmap (":/cd_16px.png");
+    mPool [CDAttachmentDis]  = QPixmap (":/cd_disabled_16px.png");
+    mPool [FDAttachmentEn]   = QPixmap (":/fd_16px.png");
+    mPool [FDAttachmentDis]  = QPixmap (":/fd_disabled_16px.png");
+
+    mPool [PlusEn]           = QPixmap (":/plus_10px.png");
+    mPool [PlusDis]          = QPixmap (":/plus_disabled_10px.png");
+    mPool [MinusEn]          = QPixmap (":/minus_10px.png");
+    mPool [MinusDis]         = QPixmap (":/minus_disabled_10px.png");
+
+    mPool [UnknownEn]        = QPixmap (":/help_16px.png");
+
+    mPool [VMMEn]            = QPixmap (":/select_file_16px.png");
+    mPool [VMMDis]           = QPixmap (":/select_file_dis_16px.png");
+}
+
+QPixmap PixmapPool::pixmap (PixmapType aType) const
+{
+    return aType > InvalidPixmap && aType < MaxIndex ? mPool [aType] : 0;
+}
+
+/* Abstract Controller Type */
+AbstractControllerType::AbstractControllerType (KStorageBus aBusType, KStorageControllerType aCtrType)
+    : mBusType (aBusType)
+    , mCtrType (aCtrType)
+    , mPixmap (PixmapPool::InvalidPixmap)
+{
+    AssertMsg (mBusType != KStorageBus_Null, ("Wrong Bus Type {%d}!\n", mBusType));
+    AssertMsg (mCtrType != KStorageControllerType_Null, ("Wrong Controller Type {%d}!\n", mCtrType));
+
+    switch (mBusType)
+    {
+        case KStorageBus_IDE:
+            mPixmap = PixmapPool::IDEController;
+            break;
+        case KStorageBus_SATA:
+            mPixmap = PixmapPool::SATAController;
+            break;
+        case KStorageBus_SCSI:
+            mPixmap = PixmapPool::SCSIController;
+            break;
+        case KStorageBus_Floppy:
+            mPixmap = PixmapPool::FloppyController;
+            break;
+        default:
+            break;
+    }
+
+    AssertMsg (mPixmap != PixmapPool::InvalidPixmap, ("Bus pixmap was not set!\n"));
+}
+
+KStorageBus AbstractControllerType::busType() const
+{
+    return mBusType;
+}
+
+KStorageControllerType AbstractControllerType::ctrType() const
+{
+    return mCtrType;
+}
+
+ControllerTypeList AbstractControllerType::ctrTypes() const
+{
+    ControllerTypeList result;
+    for (uint i = first(); i < first() + size(); ++ i)
+        result << (KStorageControllerType) i;
+    return result;
+}
+
+PixmapPool::PixmapType AbstractControllerType::pixmap() const
+{
+    return mPixmap;
+}
+
+void AbstractControllerType::setCtrType (KStorageControllerType aCtrType)
+{
+    mCtrType = aCtrType;
+}
+
+/* IDE Controller Type */
+IDEControllerType::IDEControllerType (KStorageControllerType aSubType)
+    : AbstractControllerType (KStorageBus_IDE, aSubType)
+{
+}
+
+DeviceTypeList IDEControllerType::deviceTypeList() const
+{
+    return DeviceTypeList() << KDeviceType_HardDisk << KDeviceType_DVD;
+}
+
+KStorageControllerType IDEControllerType::first() const
+{
+    return KStorageControllerType_PIIX3;
+}
+
+uint IDEControllerType::size() const
+{
+    return 3;
+}
+
+/* SATA Controller Type */
+SATAControllerType::SATAControllerType (KStorageControllerType aSubType)
+    : AbstractControllerType (KStorageBus_SATA, aSubType)
+{
+}
+
+DeviceTypeList SATAControllerType::deviceTypeList() const
+{
+    return DeviceTypeList() << KDeviceType_HardDisk << KDeviceType_DVD;
+}
+
+KStorageControllerType SATAControllerType::first() const
+{
+    return KStorageControllerType_IntelAhci;
+}
+
+uint SATAControllerType::size() const
+{
+    return 1;
+}
+
+/* SCSI Controller Type */
+SCSIControllerType::SCSIControllerType (KStorageControllerType aSubType)
+    : AbstractControllerType (KStorageBus_SCSI, aSubType)
+{
+}
+
+DeviceTypeList SCSIControllerType::deviceTypeList() const
+{
+    return DeviceTypeList() << KDeviceType_HardDisk << KDeviceType_DVD;
+}
+
+KStorageControllerType SCSIControllerType::first() const
+{
+    return KStorageControllerType_LsiLogic;
+}
+
+uint SCSIControllerType::size() const
+{
+    return 2;
+}
+
+/* Floppy Controller Type */
+FloppyControllerType::FloppyControllerType (KStorageControllerType aSubType)
+    : AbstractControllerType (KStorageBus_Floppy, aSubType)
+{
+}
+
+DeviceTypeList FloppyControllerType::deviceTypeList() const
+{
+    return DeviceTypeList() << KDeviceType_Floppy;
+}
+
+KStorageControllerType FloppyControllerType::first() const
+{
+    return KStorageControllerType_I82078;
+}
+
+uint FloppyControllerType::size() const
+{
+    return 1;
+}
+
+/* Abstract Item */
+AbstractItem::AbstractItem (AbstractItem *aParent)
+    : mParent (aParent)
+    , mId (QUuid::createUuid())
+{
+    if (mParent) mParent->addChild (this);
+}
+
+AbstractItem::~AbstractItem()
+{
+    if (mParent) mParent->delChild (this);
+}
+
+AbstractItem* AbstractItem::parent()
+{
+    return mParent;
+}
+
+QUuid AbstractItem::id()
+{
+    return mId;
+}
+
+/* Root Item */
+RootItem::RootItem()
+    : AbstractItem (0)
+{
+}
+
+RootItem::~RootItem()
+{
+    while (!mControllers.isEmpty())
+        delete mControllers.first();
+}
+
+AbstractItem::ItemType RootItem::rtti() const
+{
+    return Type_RootItem;
+}
+
+AbstractItem* RootItem::childByPos (int aIndex)
+{
+    return mControllers [aIndex];
+}
+
+AbstractItem* RootItem::childById (const QUuid &aId)
+{
+    for (int i = 0; i < childCount(); ++ i)
+        if (mControllers [i]->id() == aId)
+            return mControllers [i];
+    return 0;
+}
+
+int RootItem::posOfChild (AbstractItem *aItem) const
+{
+    return mControllers.indexOf (aItem);
+}
+
+int RootItem::childCount() const
+{
+    return mControllers.size();
+}
+
+QString RootItem::text() const
+{
+    return QString();
+}
+
+QString RootItem::tip() const
+{
+    return QString();
+}
+
+QPixmap RootItem::pixmap()
+{
+    return QPixmap();
+}
+
+void RootItem::addChild (AbstractItem *aItem)
+{
+    mControllers << aItem;
+}
+
+void RootItem::delChild (AbstractItem *aItem)
+{
+    mControllers.removeAll (aItem);
+}
+
+/* Controller Item */
+ControllerItem::ControllerItem (AbstractItem *aParent, const QString &aName,
+                                KStorageBus aBusType, KStorageControllerType aControllerType)
+    : AbstractItem (aParent)
+    , mCtrName (aName)
+    , mCtrType (0)
+{
+    /* Check for proper parent type */
+    AssertMsg (mParent->rtti() == AbstractItem::Type_RootItem, ("Incorrect parent type!\n"));
+
+    /* Select default type */
+    switch (aBusType)
+    {
+        case KStorageBus_IDE:
+            mCtrType = new IDEControllerType (aControllerType);
+            break;
+        case KStorageBus_SATA:
+            mCtrType = new SATAControllerType (aControllerType);
+            break;
+        case KStorageBus_SCSI:
+            mCtrType = new SCSIControllerType (aControllerType);
+            break;
+        case KStorageBus_Floppy:
+            mCtrType = new FloppyControllerType (aControllerType);
+            break;
+        default:
+            AssertMsgFailed (("Wrong Controller Type {%d}!\n", aBusType));
+            break;
+    }
+}
+
+ControllerItem::~ControllerItem()
+{
+    delete mCtrType;
+    while (!mAttachments.isEmpty())
+        delete mAttachments.first();
+}
+
+AbstractItem::ItemType ControllerItem::rtti() const
+{
+    return Type_ControllerItem;
+}
+
+AbstractItem* ControllerItem::childByPos (int aIndex)
+{
+    return mAttachments [aIndex];
+}
+
+AbstractItem* ControllerItem::childById (const QUuid &aId)
+{
+    for (int i = 0; i < childCount(); ++ i)
+        if (mAttachments [i]->id() == aId)
+            return mAttachments [i];
+    return 0;
+}
+
+int ControllerItem::posOfChild (AbstractItem *aItem) const
+{
+    return mAttachments.indexOf (aItem);
+}
+
+int ControllerItem::childCount() const
+{
+    return mAttachments.size();
+}
+
+QString ControllerItem::text() const
+{
+    return ctrName();
+}
+
+QString ControllerItem::tip() const
+{
+    return QString();
+}
+
+QPixmap ControllerItem::pixmap()
+{
+    return PixmapPool::pool()->pixmap (mCtrType->pixmap());
+}
+
+KStorageBus ControllerItem::ctrBusType() const
+{
+    return mCtrType->busType();
+}
+
+QString ControllerItem::ctrName() const
+{
+    return mCtrName;
+}
+
+KStorageControllerType ControllerItem::ctrType() const
+{
+    return mCtrType->ctrType();
+}
+
+ControllerTypeList ControllerItem::ctrTypes() const
+{
+    return mCtrType->ctrTypes();
+}
+
+void ControllerItem::setCtrName (const QString &aCtrName)
+{
+    mCtrName = aCtrName;
+}
+
+void ControllerItem::setCtrType (KStorageControllerType aCtrType)
+{
+    mCtrType->setCtrType (aCtrType);
+}
+
+SlotsList ControllerItem::ctrAllSlots() const
+{
+    SlotsList allSlots;
+    CSystemProperties sp = vboxGlobal().virtualBox().GetSystemProperties();
+    for (ULONG i = 0; i < sp.GetMaxPortCountForStorageBus (mCtrType->busType()); ++ i)
+        for (ULONG j = 0; j < sp.GetMaxDevicesPerPortForStorageBus (mCtrType->busType()); ++ j)
+            allSlots << StorageSlot (mCtrType->busType(), i, j);
+    return allSlots;
+}
+
+SlotsList ControllerItem::ctrUsedSlots() const
+{
+    SlotsList usedSlots;
+    for (int i = 0; i < mAttachments.size(); ++ i)
+        usedSlots << static_cast <AttachmentItem*> (mAttachments [i])->attSlot();
+    return usedSlots;
+}
+
+DeviceTypeList ControllerItem::ctrDeviceTypeList() const
+{
+     return mCtrType->deviceTypeList();
+}
+
+QStringList ControllerItem::ctrAllMediumIds() const
+{
+    QStringList allImages;
+    for (VBoxMediaList::const_iterator it = vboxGlobal().currentMediaList().begin();
+         it != vboxGlobal().currentMediaList().end(); ++ it)
+    {
+         foreach (KDeviceType deviceType, mCtrType->deviceTypeList())
+         {
+             if ((*it).isNull() || typeToGlobal ((*it).type()) == deviceType)
+             {
+                 allImages << (*it).id();
+                 break;
+             }
+         }
+    }
+    return allImages;
+}
+
+QStringList ControllerItem::ctrUsedMediumIds() const
+{
+    QStringList usedImages;
+    for (int i = 0; i < mAttachments.size(); ++ i)
+        usedImages << static_cast <AttachmentItem*> (mAttachments [i])->attMediumId();
+    return usedImages;
+}
+
+void ControllerItem::addChild (AbstractItem *aItem)
+{
+    mAttachments << aItem;
+}
+
+void ControllerItem::delChild (AbstractItem *aItem)
+{
+    mAttachments.removeAll (aItem);
+}
+
+/* Attachment Item */
+AttachmentItem::AttachmentItem (AbstractItem *aParent, KDeviceType aDeviceType)
+    : AbstractItem (aParent)
+    , mAttDeviceType (aDeviceType)
+    , mAttIsHostDrive (false)
+    , mAttIsPassthrough (false)
+{
+    /* Check for proper parent type */
+    AssertMsg (mParent->rtti() == AbstractItem::Type_ControllerItem, ("Incorrect parent type!\n"));
+
+    /* Select default slot */
+    AssertMsg (!attSlots().isEmpty(), ("There should be at least one available slot!\n"));
+    mAttSlot = attSlots() [0];
+
+    /* Try to select unique medium */
+    QStringList freeMediumIds (attMediumIds());
+    switch (mAttDeviceType)
+    {
+        case KDeviceType_HardDisk:
+            if (freeMediumIds.size() > 0)
+                setAttMediumId (freeMediumIds [0]);
+            break;
+        case KDeviceType_DVD:
+        case KDeviceType_Floppy:
+            if (freeMediumIds.size() > 1)
+                setAttMediumId (freeMediumIds [1]);
+            break;
+        default:
+            break;
+    }
+}
+
+AbstractItem::ItemType AttachmentItem::rtti() const
+{
+    return Type_AttachmentItem;
+}
+
+AbstractItem* AttachmentItem::childByPos (int /* aIndex */)
+{
+    return 0;
+}
+
+AbstractItem* AttachmentItem::childById (const QUuid& /* aId */)
+{
+    return 0;
+}
+
+int AttachmentItem::posOfChild (AbstractItem* /* aItem */) const
+{
+    return 0;
+}
+
+int AttachmentItem::childCount() const
+{
+    return 0;
+}
+
+QString AttachmentItem::text() const
+{
+    return mAttName;
+}
+
+QString AttachmentItem::tip() const
+{
+    return mAttTip;
+}
+
+QPixmap AttachmentItem::pixmap()
+{
+    if (mAttPixmap.isNull())
+    {
+        switch (mAttDeviceType)
+        {
+            case KDeviceType_HardDisk:
+                mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentEn);
+                break;
+            case KDeviceType_DVD:
+                mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentEn);
+                break;
+            case KDeviceType_Floppy:
+                mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentEn);
+                break;
+            default:
+                break;
+        }
+    }
+    return mAttPixmap;
+}
+
+StorageSlot AttachmentItem::attSlot() const
+{
+    return mAttSlot;
+}
+
+SlotsList AttachmentItem::attSlots() const
+{
+    ControllerItem *ctr = static_cast <ControllerItem*> (mParent);
+
+    /* Filter list from used slots */
+    SlotsList allSlots (ctr->ctrAllSlots());
+    SlotsList usedSlots (ctr->ctrUsedSlots());
+    foreach (StorageSlot usedSlot, usedSlots)
+        if (usedSlot != mAttSlot)
+            allSlots.removeAll (usedSlot);
+
+    return allSlots;
+}
+
+KDeviceType AttachmentItem::attDeviceType() const
+{
+    return mAttDeviceType;
+}
+
+DeviceTypeList AttachmentItem::attDeviceTypes() const
+{
+    return static_cast <ControllerItem*> (mParent)->ctrDeviceTypeList();
+}
+
+QString AttachmentItem::attMediumId() const
+{
+    return mAttMediumId;
+}
+
+QStringList AttachmentItem::attMediumIds (bool aFilter) const
+{
+    ControllerItem *ctr = static_cast <ControllerItem*> (mParent);
+    QStringList allMediumIds;
+
+    /* Populate list of suitable medium ids */
+    foreach (QString mediumId, ctr->ctrAllMediumIds())
+    {
+        VBoxMedium medium = vboxGlobal().findMedium (mediumId);
+        if ((medium.isNull() && mAttDeviceType != KDeviceType_HardDisk) ||
+            (!medium.isNull() && typeToGlobal (medium.type()) == mAttDeviceType))
+            allMediumIds << mediumId;
+    }
+
+    if (aFilter)
+    {
+        /* Filter list from used medium ids */
+        QStringList usedMediumIds (ctr->ctrUsedMediumIds());
+        foreach (QString usedMediumId, usedMediumIds)
+            if (usedMediumId != mAttMediumId)
+                allMediumIds.removeAll (usedMediumId);
+    }
+
+    return allMediumIds;
+}
+
+bool AttachmentItem::attIsHostDrive() const
+{
+    return mAttIsHostDrive;
+}
+
+bool AttachmentItem::attIsPassthrough() const
+{
+    return mAttIsPassthrough;
+}
+
+void AttachmentItem::setAttSlot (const StorageSlot &aAttSlot)
+{
+    mAttSlot = aAttSlot;
+}
+
+void AttachmentItem::setAttDevice (KDeviceType aAttDeviceType)
+{
+    mAttDeviceType = aAttDeviceType;
+}
+
+void AttachmentItem::setAttMediumId (const QString &aAttMediumId)
+{
+    VBoxMedium medium;
+
+    /* Caching first available medium */
+    if (aAttMediumId == firstAvailable && !attMediumIds (false).isEmpty())
+        medium = vboxGlobal().findMedium (attMediumIds (false) [0]);
+    /* Caching passed medium */
+    else if (!aAttMediumId.isEmpty())
+        medium = vboxGlobal().findMedium (aAttMediumId);
+
+    cache (medium);
+}
+
+void AttachmentItem::setAttIsPassthrough (bool aIsAttPassthrough)
+{
+    mAttIsPassthrough = aIsAttPassthrough;
+}
+
+QString AttachmentItem::attSize() const
+{
+    return mAttSize;
+}
+
+QString AttachmentItem::attLogicalSize() const
+{
+    return mAttLogicalSize;
+}
+
+QString AttachmentItem::attLocation() const
+{
+    return mAttLocation;
+}
+
+QString AttachmentItem::attFormat() const
+{
+    return mAttFormat;
+}
+
+QString AttachmentItem::attUsage() const
+{
+    return mAttUsage;
+}
+
+void AttachmentItem::cache (const VBoxMedium &aMedium)
+{
+    mAttMediumId = aMedium.id();
+
+    /* Cache medium information */
+    mAttName = aMedium.name (true);
+    mAttTip = aMedium.toolTipCheckRO (true);
+    mAttPixmap = aMedium.iconCheckRO (true);
+    mAttIsHostDrive = aMedium.isHostDrive();
+
+    /* Cache additional information */
+    mAttSize = aMedium.size();
+    mAttLogicalSize = aMedium.logicalSize();
+    mAttLocation = aMedium.location();
+    mAttFormat = QString ("%1 (%2)").arg (aMedium.hardDiskType()).arg (aMedium.hardDiskFormat());
+    mAttUsage = aMedium.usage();
+
+    /* Fill empty attributes */
+    if (mAttUsage.isEmpty())
+        mAttUsage = QString ("--");
+}
+
+void AttachmentItem::addChild (AbstractItem* /* aItem */)
+{
+}
+
+void AttachmentItem::delChild (AbstractItem* /* aItem */)
+{
+}
+
+/* Storage model */
+StorageModel::StorageModel (QObject *aParent)
+    : QAbstractItemModel (aParent)
+    , mRootItem (new RootItem)
+{
+}
+
+StorageModel::~StorageModel()
+{
+    delete mRootItem;
+}
+
+int StorageModel::rowCount (const QModelIndex &aParent) const
+{
+    return !aParent.isValid() ? 1 /* only root item has invalid parent */ :
+           static_cast <AbstractItem*> (aParent.internalPointer())->childCount();
+}
+
+int StorageModel::columnCount (const QModelIndex &aParent) const
+{
+    return 1;
+}
+
+QModelIndex StorageModel::root() const
+{
+    return index (0, 0);
+}
+
+QModelIndex StorageModel::index (int aRow, int aColumn, const QModelIndex &aParent) const
+{
+    if (!hasIndex (aRow, aColumn, aParent))
+        return QModelIndex();
+
+    AbstractItem *item = !aParent.isValid() ? mRootItem :
+                         static_cast <AbstractItem*> (aParent.internalPointer())->childByPos (aRow);
+
+    return item ? createIndex (aRow, aColumn, item) : QModelIndex();
+}
+
+QModelIndex StorageModel::parent (const QModelIndex &aIndex) const
+{
+    if (!aIndex.isValid())
+        return QModelIndex();
+
+    AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer());
+    AbstractItem *parentOfItem = item->parent();
+    AbstractItem *parentOfParent = parentOfItem ? parentOfItem->parent() : 0;
+    int position = parentOfParent ? parentOfParent->posOfChild (parentOfItem) : 0;
+
+    if (parentOfItem)
+        return createIndex (position, 0, parentOfItem);
+    else
+        return QModelIndex();
+}
+
+QVariant StorageModel::data (const QModelIndex &aIndex, int aRole) const
 {
     if (!aIndex.isValid())
         return QVariant();
 
-    if (aIndex.row() < 0 || aIndex.row() >= rowCount())
-        return QVariant();
-
     switch (aRole)
     {
-        case Qt::DisplayRole:
-        {
-            if (aIndex.row() == rowCount() - 1)
-                return QVariant();
-            else if (aIndex.column() == 0)
-                return QVariant (mUsedSlotsList [aIndex.row()].name);
-            else if (aIndex.column() == 1)
-                return QVariant (mUsedDisksList [aIndex.row()].name);
-
-            Assert (0);
-            return QVariant();
-        }
-        case Qt::DecorationRole:
-        {
-            return aIndex.row() != rowCount() - 1 &&
-                   aIndex.column() == 1 &&
-                   (aIndex != mParent->currentIndex() ||
-                    !DiskEditor::activeEditor())
-                   ? QVariant (mUsedDisksList [aIndex.row()].pix) : QVariant();
-        }
-        case Qt::EditRole:
-        {
-            if (aIndex.column() == 0)
-                return QVariant (mSlotId, &mUsedSlotsList [aIndex.row()]);
-            else if (aIndex.column() == 1)
-                return QVariant (mDiskId, &mUsedDisksList [aIndex.row()]);
-
-            Assert (0);
-            return QVariant();
+        /* Basic Attributes: */
+        case Qt::FontRole:
+        {
+            return QVariant (qApp->font());
+        }
+        case Qt::SizeHintRole:
+        {
+            QFontMetrics fm (data (aIndex, Qt::FontRole).value <QFont>());
+            int minimumHeight = qMax (fm.height(), data (aIndex, R_IconSize).toInt());
+            int margin = data (aIndex, R_Margin).toInt();
+            return QSize (1 /* ignoring width */, 2 * margin + minimumHeight);
         }
         case Qt::ToolTipRole:
         {
-            if (aIndex.row() == rowCount() - 1)
-                return QVariant (tr ("Double-click to add a new attachment"));
-
-            return QVariant (mUsedDisksList [aIndex.row()].tip);
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                return item->tip();
+            return QString();
+        }
+
+        /* Advanced Attributes: */
+        case R_ItemId:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                return item->id().toString();
+            return QUuid().toString();
+        }
+        case R_ItemPixmap:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                return item->pixmap();
+            return QPixmap();
+        }
+        case R_ItemPixmapRect:
+        {
+            int margin = data (aIndex, R_Margin).toInt();
+            int width = data (aIndex, R_IconSize).toInt();
+            return QRect (margin, margin, width, width);
+        }
+        case R_ItemName:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                return item->text();
+            return QString();
+        }
+        case R_ItemNamePoint:
+        {
+            int margin = data (aIndex, R_Margin).toInt();
+            int spacing = data (aIndex, R_Spacing).toInt();
+            int width = data (aIndex, R_IconSize).toInt();
+            QFontMetrics fm (data (aIndex, Qt::FontRole).value <QFont>());
+            QSize sizeHint = data (aIndex, Qt::SizeHintRole).toSize();
+            return QPoint (margin + width + 2 * spacing,
+                           sizeHint.height() / 2 + fm.ascent() / 2 - 1 /* base line */);
+        }
+        case R_ItemType:
+        {
+            QVariant result (QVariant::fromValue (AbstractItem::Type_InvalidItem));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                result.setValue (item->rtti());
+            return result;
+        }
+        case R_IsController:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                return item->rtti() == AbstractItem::Type_ControllerItem;
+            return false;
+        }
+        case R_IsAttachment:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                return item->rtti() == AbstractItem::Type_AttachmentItem;
+            return false;
+        }
+
+        case R_IsMoreControllersPossible:
+        {
+            return rowCount (root()) < 16;
+        }
+        case R_IsMoreAttachmentsPossible:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+            {
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                {
+                    ControllerItem *ctr = static_cast <ControllerItem*> (item);
+                    CSystemProperties sp = vboxGlobal().virtualBox().GetSystemProperties();
+                    return (uint) rowCount (aIndex) < sp.GetMaxPortCountForStorageBus (ctr->ctrBusType()) *
+                                                      sp.GetMaxDevicesPerPortForStorageBus (ctr->ctrBusType());
+                }
+            }
+            return false;
+        }
+
+        case R_CtrName:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                    return static_cast <ControllerItem*> (item)->ctrName();
+            return QString();
+        }
+        case R_CtrType:
+        {
+            QVariant result (QVariant::fromValue (KStorageControllerType_Null));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                    result.setValue (static_cast <ControllerItem*> (item)->ctrType());
+            return result;
+        }
+        case R_CtrTypes:
+        {
+            QVariant result (QVariant::fromValue (ControllerTypeList()));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                    result.setValue (static_cast <ControllerItem*> (item)->ctrTypes());
+            return result;
+        }
+        case R_CtrDevices:
+        {
+            QVariant result (QVariant::fromValue (DeviceTypeList()));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                    result.setValue (static_cast <ControllerItem*> (item)->ctrDeviceTypeList());
+            return result;
+        }
+        case R_CtrBusType:
+        {
+            QVariant result (QVariant::fromValue (KStorageBus_Null));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                    result.setValue (static_cast <ControllerItem*> (item)->ctrBusType());
+            return result;
+        }
+
+        case R_AttSlot:
+        {
+            QVariant result (QVariant::fromValue (StorageSlot()));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    result.setValue (static_cast <AttachmentItem*> (item)->attSlot());
+            return result;
+        }
+        case R_AttSlots:
+        {
+            QVariant result (QVariant::fromValue (SlotsList()));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    result.setValue (static_cast <AttachmentItem*> (item)->attSlots());
+            return result;
+        }
+        case R_AttDevice:
+        {
+            QVariant result (QVariant::fromValue (KDeviceType_Null));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    result.setValue (static_cast <AttachmentItem*> (item)->attDeviceType());
+            return result;
+        }
+        case R_AttDevices:
+        {
+            QVariant result (QVariant::fromValue (DeviceTypeList()));
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    result.setValue (static_cast <AttachmentItem*> (item)->attDeviceTypes());
+            return result;
+        }
+        case R_AttMediumId:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attMediumId();
+            return QString();
+        }
+        case R_AttIsHostDrive:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attIsHostDrive();
+            return false;
+        }
+        case R_AttIsPassthrough:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attIsPassthrough();
+            return false;
+        }
+        case R_AttSize:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attSize();
+            return QString();
+        }
+        case R_AttLogicalSize:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attLogicalSize();
+            return QString();
+        }
+        case R_AttLocation:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attLocation();
+            return QString();
+        }
+        case R_AttFormat:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attFormat();
+            return QString();
+        }
+        case R_AttUsage:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast <AttachmentItem*> (item)->attUsage();
+            return QString();
+        }
+        case R_Margin:
+        {
+            return 4;
+        }
+        case R_Spacing:
+        {
+            return 4;
+        }
+        case R_IconSize:
+        {
+            return 16;
+        }
+
+        case R_HDPixmapEn:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentEn);
+        }
+        case R_HDPixmapDis:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentDis);
+        }
+        case R_CDPixmapEn:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentEn);
+        }
+        case R_CDPixmapDis:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentDis);
+        }
+        case R_FDPixmapEn:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentEn);
+        }
+        case R_FDPixmapDis:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentDis);
+        }
+        case R_HDPixmapRect:
+        {
+            int margin = data (aIndex, R_Margin).toInt();
+            int spacing = data (aIndex, R_Spacing).toInt();
+            int width = data (aIndex, R_IconSize).toInt();
+            return QRect (0 - width - spacing - width - margin, margin, width, width);
+        }
+        case R_CDPixmapRect:
+        {
+            int margin = data (aIndex, R_Margin).toInt();
+            int width = data (aIndex, R_IconSize).toInt();
+            return QRect (0 - width - margin, margin, width, width);
+        }
+        case R_FDPixmapRect:
+        {
+            int margin = data (aIndex, R_Margin).toInt();
+            int width = data (aIndex, R_IconSize).toInt();
+            return QRect (0 - width - margin, margin, width, width);
+        }
+
+        case R_PlusPixmapEn:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::PlusEn);
+        }
+        case R_PlusPixmapDis:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::PlusDis);
+        }
+        case R_MinusPixmapEn:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::MinusEn);
+        }
+        case R_MinusPixmapDis:
+        {
+            return PixmapPool::pool()->pixmap (PixmapPool::MinusDis);
+        }
+        case R_AdderPoint:
+        {
+            int margin = data (aIndex, R_Margin).toInt();
+            return QPoint (margin + 6, margin + 6);
         }
         default:
-        {
-            return QVariant();
-        }
-    }
-}
-
-bool AttachmentsModel::setData (const QModelIndex &aIndex,
-                                const QVariant &aValue,
-                                int /* aRole = Qt::EditRole */)
+            break;
+    }
+    return QVariant();
+}
+
+bool StorageModel::setData (const QModelIndex &aIndex, const QVariant &aValue, int aRole)
 {
     if (!aIndex.isValid())
-        return false;
-
-    if (aIndex.row() < 0 || aIndex.row() >= rowCount())
-        return false;
-
-    if (aIndex.column() == 0)
-    {
-        SlotValue newSlot = aValue.isValid() ?
-            aValue.value <SlotValue>() : SlotValue();
-        if (mUsedSlotsList [aIndex.row()] != newSlot)
-        {
-            mUsedSlotsList [aIndex.row()] = newSlot;
-            emit dataChanged (aIndex, aIndex);
-            return true;
-        }
-        return false;
-    } else
-    if (aIndex.column() == 1)
-    {
-        DiskValue newDisk = aValue.isValid() ?
-            aValue.value <DiskValue>() : DiskValue();
-        if (mUsedDisksList [aIndex.row()] != newDisk)
-        {
-            mUsedDisksList [aIndex.row()] = newDisk;
-            emit dataChanged (aIndex, aIndex);
-            return true;
-        }
-        return false;
-    }
-    Assert (0);
+        return QAbstractItemModel::setData (aIndex, aValue, aRole);
+
+    switch (aRole)
+    {
+        case R_CtrName:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                {
+                    static_cast <ControllerItem*> (item)->setCtrName (aValue.toString());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        case R_CtrType:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                {
+                    static_cast <ControllerItem*> (item)->setCtrType (aValue.value <KStorageControllerType>());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        case R_AttSlot:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                {
+                    static_cast <AttachmentItem*> (item)->setAttSlot (aValue.value <StorageSlot>());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        case R_AttDevice:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                {
+                    static_cast <AttachmentItem*> (item)->setAttDevice (aValue.value <KDeviceType>());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        case R_AttMediumId:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                {
+                    static_cast <AttachmentItem*> (item)->setAttMediumId (aValue.toString());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        case R_AttIsPassthrough:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_AttachmentItem)
+                {
+                    static_cast <AttachmentItem*> (item)->setAttIsPassthrough (aValue.toBool());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        default:
+            break;
+    }
+
     return false;
 }
 
-QVariant AttachmentsModel::headerData (int aSection,
-                                       Qt::Orientation aOrientation,
-                                       int aRole) const
-{
-    if (aRole != Qt::DisplayRole)
-        return QVariant();
-
-    if (aOrientation == Qt::Horizontal)
-        return aSection ? tr ("Hard Disk") : tr ("Slot");
-    else
-        return QVariant();
-}
-
-void AttachmentsModel::addItem (const SlotValue &aSlot, const DiskValue &aDisk)
-{
-    beginInsertRows (QModelIndex(), rowCount() - 1, rowCount() - 1);
-    mUsedSlotsList.append (aSlot);
-    mUsedDisksList.append (aDisk);
+QModelIndex StorageModel::addController (const QString &aCtrName, KStorageBus aBusType, KStorageControllerType aCtrType)
+{
+    beginInsertRows (root(), mRootItem->childCount(), mRootItem->childCount());
+    new ControllerItem (mRootItem, aCtrName, aBusType, aCtrType);
     endInsertRows();
-}
-
-void AttachmentsModel::delItem (int aIndex)
-{
-    beginRemoveRows (QModelIndex(), aIndex, aIndex);
-    mUsedSlotsList.removeAt (aIndex);
-    mUsedDisksList.removeAt (aIndex);
-    endRemoveRows();
-}
-
-QList <Attachment> AttachmentsModel::fullUsedList()
-{
-    QList <Attachment> list;
-    QList <SlotValue> slts = usedSlotsList();
-    QList <DiskValue> dsks = usedDisksList();
-    for (int i = 0; i < slts.size(); ++ i)
-        list << Attachment (slts [i], dsks [i]);
-    qSort (list.begin(), list.end());
-    return list;
-}
-
-void AttachmentsModel::removeAddController()
-{
-    int i=0;
-    while (i < mUsedSlotsList.size())
-    {
-        if (mUsedSlotsList.at (i).bus == KStorageBus_SATA ||
-            mUsedSlotsList.at (i).bus == KStorageBus_SCSI)
-            /* We have to use delItem cause then all views are informed about
-               the update */
-            delItem (i);
-        else
-            ++i;
-    }
-}
-
-void AttachmentsModel::updateDisks()
-{
-    QList <DiskValue> newDisks (HDSettings::instance()->disksList());
-    for (int i = 0; i < mUsedDisksList.size(); ++ i)
-    {
-        if (newDisks.isEmpty())
-            mUsedDisksList [i] = DiskValue();
-        else if (newDisks.contains (mUsedDisksList [i]))
-            mUsedDisksList [i] = DiskValue (mUsedDisksList [i].id);
-        else
-            mUsedDisksList [i] = DiskValue (newDisks [0].id);
-    }
-    emit dataChanged (index (0, 1), index (rowCount() - 1, 1));
-}
-
-/**
- * QComboBox class reimplementation.
- * Used as editor for HD Attachment SLOT field.
- */
-SlotEditor::SlotEditor (QWidget *aParent)
-    : QComboBox (aParent)
-{
-    connect (this, SIGNAL (currentIndexChanged (int)), this, SLOT (onActivate()));
-    connect (this, SIGNAL (readyToCommit (QWidget*)),
-             parent()->parent(), SLOT (commitData (QWidget*)));
-}
-
-QVariant SlotEditor::slot() const
-{
-    int current = currentIndex();
-    QVariant result;
-    if (current >= 0 && current < mList.size())
-        result.setValue (mList [current]);
-    return result;
-}
-
-void SlotEditor::setSlot (QVariant aSlot)
-{
-    SlotValue val (aSlot.value <SlotValue>());
-    populate (val);
-    int current = findText (val.name);
-    setCurrentIndex (current == -1 ? 0 : current);
-}
-
-void SlotEditor::onActivate()
-{
-    emit readyToCommit (this);
-}
-
-#if 0 /* F2 key binding left for future releases... */
-void SlotEditor::keyPressEvent (QKeyEvent *aEvent)
-{
-    /* Make F2 key to show the popup. */
-    if (aEvent->key() == Qt::Key_F2)
-    {
-        aEvent->accept();
-        showPopup();
-    }
-    else
-        aEvent->ignore();
-    QComboBox::keyPressEvent (aEvent);
-}
-#endif
-
-void SlotEditor::populate (const SlotValue &aIncluding)
-{
-    clear(), mList.clear();
-    QList <SlotValue> list (HDSettings::instance()->slotsList (aIncluding, true));
-    for (int i = 0; i < list.size() ; ++ i)
-    {
-        insertItem (i, list [i].name);
-        mList << list [i];
-    }
-}
-
-/**
- * VBoxMediaComboBox class reimplementation.
- * Used as editor for HD Attachment DISK field.
- */
-DiskEditor* DiskEditor::mInstance = 0;
-DiskEditor* DiskEditor::activeEditor()
-{
-    return mInstance;
-}
-
-DiskEditor::DiskEditor (QWidget *aParent)
-    : VBoxMediaComboBox (aParent)
-{
-    mInstance = this;
-    setIconSize (QSize (iconSize().width() * 2 + 2, iconSize().height()));
-    Assert (!HDSettings::instance()->machine().isNull());
-    setType (VBoxDefs::MediaType_HardDisk);
-    setMachineId (HDSettings::instance()->machine().GetId());
-    setShowDiffs (HDSettings::instance()->showDiffs());
-    connect (this, SIGNAL (currentIndexChanged (int)), this, SLOT (onActivate()));
-    connect (this, SIGNAL (readyToCommit (QWidget *)),
-             parent()->parent(), SLOT (commitData (QWidget *)));
-    refresh();
-}
-DiskEditor::~DiskEditor()
-{
-    if (mInstance == this)
-        mInstance = 0;
-}
-
-QVariant DiskEditor::disk() const
-{
-    int current = currentIndex();
-    QVariant result;
-    if (current >= 0 && current < count())
-        result.setValue (DiskValue (id (current)));
-    return result;
-}
-
-void DiskEditor::setDisk (QVariant aDisk)
-{
-    setCurrentItem (DiskValue (aDisk.value <DiskValue>()).id);
-}
-
-void DiskEditor::paintEvent (QPaintEvent*)
-{
-    /* Create the style painter to paint the elements. */
-    QStylePainter painter (this);
-    painter.setPen (palette().color (QPalette::Text));
-    /* Initialize combo-box options and draw the elements. */
-    QStyleOptionComboBox options;
-    initStyleOption (&options);
-    painter.drawComplexControl (QStyle::CC_ComboBox, options);
-    painter.drawControl (QStyle::CE_ComboBoxLabel, options);
-}
-
-void DiskEditor::initStyleOption (QStyleOptionComboBox *aOption) const
-{
-    /* The base version of Qt4::QComboBox ignores the fact what each
-     * combo-box item can have the icon of different size and uses the
-     * maximum possible icon-size to draw the icon then performing
-     * paintEvent(). As a result, stand-alone icons are painted using
-     * the same huge region as the merged paired icons, so we have to
-     * perform the size calculation ourself... */
-
-    /* Init all style option by default... */
-    VBoxMediaComboBox::initStyleOption (aOption);
-    /* But calculate the icon size ourself. */
-    QIcon currentItemIcon (itemIcon (currentIndex()));
-    QPixmap realPixmap (currentItemIcon.pixmap (iconSize()));
-    aOption->iconSize = realPixmap.size();
-}
-
-void DiskEditor::onActivate()
-{
-    emit readyToCommit (this);
-}
-
-#if 0 /* F2 key binding left for future releases... */
-void DiskEditor::keyPressEvent (QKeyEvent *aEvent)
-{
-    /* Make F2 key to show the popup. */
-    if (aEvent->key() == Qt::Key_F2)
-    {
-        aEvent->accept();
-        showPopup();
-    }
-    else
-        aEvent->ignore();
-    VBoxMediaComboBox::keyPressEvent (aEvent);
-}
-#endif
-
-/**
- * Singleton QObject class reimplementation.
- * Used to make selected HD Attachments slots unique &
- * stores some local data used for HD Settings.
- */
-HDSettings* HDSettings::mInstance = 0;
-HDSettings* HDSettings::instance (QWidget *aParent,
-                                  AttachmentsModel *aWatched)
-{
-    if (!mInstance)
-    {
-        Assert (aParent && aWatched);
-        mInstance = new HDSettings (aParent, aWatched);
-    }
-    return mInstance;
-}
-
-HDSettings::HDSettings (QWidget *aParent, AttachmentsModel *aWatched)
-    : QObject (aParent)
-    , mModel (aWatched)
-    , mAddCount (0)
-    , mAddBus (KStorageBus_Null)
-    , mShowDiffs (false)
-{
-    makeIDEList();
-    makeAddControllerList();
-}
-
-HDSettings::~HDSettings()
-{
-    mInstance = 0;
-}
-
-QList <SlotValue> HDSettings::slotsList (const SlotValue &aIncluding,
-                                         bool aFilter /* = false */) const
-{
-    /* Compose the full slots list */
-    QList <SlotValue> list (mIDEList + mAddControllerList);
-    if (!aFilter)
-        return list;
-
-    /* Current used list */
-    QList <SlotValue> usedList (mModel->usedSlotsList());
-
-    /* Filter the list */
-    foreach (SlotValue value, usedList)
-        if (value != aIncluding)
-            list.removeAll (value);
-
-    return list;
-}
-
-QList <DiskValue> HDSettings::disksList() const
-{
-    return mDisksList;
-}
-
-bool HDSettings::tryToChooseUniqueDisk (DiskValue &aResult) const
-{
-    bool status = false;
-
-    /* Current used list */
-    QList <DiskValue> usedList (mModel->usedDisksList());
-
-    /* Select the first available disk initially */
-    aResult = mDisksList.isEmpty() ? DiskValue() : mDisksList [0];
-
-    /* Search for first not busy disk */
-    for (int i = 0; i < mDisksList.size(); ++ i)
-        if (!usedList.contains (mDisksList [i]))
-        {
-            aResult = mDisksList [i];
-            status = true;
-            break;
-        }
-
-    return status;
-}
-
-void HDSettings::makeIDEList()
-{
-    mIDEList.clear();
-
-    /* IDE Primary Master */
-    mIDEList << SlotValue (KStorageBus_IDE, 0, 0);
-    /* IDE Primary Slave */
-    mIDEList << SlotValue (KStorageBus_IDE, 0, 1);
-    /* IDE Secondary Slave */
-    mIDEList << SlotValue (KStorageBus_IDE, 1, 1);
-}
-
-void HDSettings::makeAddControllerList()
-{
-    mAddControllerList.clear();
-
-    for (int i = 0; i < mAddCount; ++ i)
-        mAddControllerList << SlotValue (mAddBus, i, 0);
-}
-
-void HDSettings::makeMediumList()
-{
-    mDisksList.clear();
-    VBoxMediaList list (vboxGlobal().currentMediaList());
-    foreach (VBoxMedium medium, list)
-    {
-        /* Filter out unnecessary mediums */
-        if (medium.type() != VBoxDefs::MediaType_HardDisk)
-            continue;
-
-        /* If !mShowDiffs we ignore all diffs except ones that are
-         * directly attached to the related VM in the current state */
-        if (!mShowDiffs && medium.parent() &&
-            !medium.isAttachedInCurStateTo (mMachine.GetId()))
-            continue;
-
-        /* If !mShowDiffs we have to replace the root medium with his
-         * differencing child which is directly used if the parent is found. */
-        if (!mShowDiffs && medium.parent())
-        {
-            int index = mDisksList.indexOf (DiskValue (medium.root().id()));
-            if (index != -1)
+    return index (mRootItem->childCount() - 1, 0, root());
+}
+
+void StorageModel::delController (const QUuid &aCtrId)
+{
+    if (AbstractItem *item = mRootItem->childById (aCtrId))
+    {
+        int itemPosition = mRootItem->posOfChild (item);
+        beginRemoveRows (root(), itemPosition, itemPosition);
+        delete item;
+        endRemoveRows();
+    }
+}
+
+QModelIndex StorageModel::addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType)
+{
+    if (AbstractItem *parent = mRootItem->childById (aCtrId))
+    {
+        int parentPosition = mRootItem->posOfChild (parent);
+        QModelIndex parentIndex = index (parentPosition, 0, root());
+        beginInsertRows (parentIndex, parent->childCount(), parent->childCount());
+        new AttachmentItem (parent, aDeviceType);
+        endInsertRows();
+        return index (parent->childCount() - 1, 0, parentIndex);
+    }
+    return QModelIndex();
+}
+
+void StorageModel::delAttachment (const QUuid &aCtrId, const QUuid &aAttId)
+{
+    if (AbstractItem *parent = mRootItem->childById (aCtrId))
+    {
+        int parentPosition = mRootItem->posOfChild (parent);
+        if (AbstractItem *item = parent->childById (aAttId))
+        {
+            int itemPosition = parent->posOfChild (item);
+            beginRemoveRows (index (parentPosition, 0, root()), itemPosition, itemPosition);
+            delete item;
+            endRemoveRows();
+        }
+    }
+}
+
+Qt::ItemFlags StorageModel::flags (const QModelIndex &aIndex) const
+{
+    return !aIndex.isValid() ? QAbstractItemModel::flags (aIndex) :
+           Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+
+/* Storage Delegate */
+StorageDelegate::StorageDelegate (QObject *aParent)
+    : QItemDelegate (aParent)
+{
+}
+
+void StorageDelegate::paint (QPainter *aPainter, const QStyleOptionViewItem &aOption, const QModelIndex &aIndex) const
+{
+    if (!aIndex.isValid()) return;
+
+    /* Initialize variables */
+    QStyle::State state = aOption.state;
+    QRect rect = aOption.rect;
+    const StorageModel *model = qobject_cast <const StorageModel*> (aIndex.model());
+    Assert (model);
+
+    aPainter->save();
+
+    /* Draw selection backgroung */
+    if (state & QStyle::State_Selected)
+    {
+        QPalette::ColorGroup cg = (state & QStyle::State_Enabled && state & QStyle::State_Active) ? QPalette::Normal :
+                                  (state & QStyle::State_Enabled) ? QPalette::Inactive : QPalette::Disabled;
+        aPainter->fillRect (rect, aOption.palette.brush (cg, QPalette::Highlight));
+    }
+
+    aPainter->translate (rect.x(), rect.y());
+
+    /* Draw Item Pixmap */
+    aPainter->drawPixmap (model->data (aIndex, StorageModel::R_ItemPixmapRect).toRect().topLeft(),
+                          model->data (aIndex, StorageModel::R_ItemPixmap).value <QPixmap>());
+
+    /* Draw expand/collapse Pixmap */
+    if (model->hasChildren (aIndex))
+    {
+        QPixmap expander = state & QStyle::State_Open ?
+                           model->data (aIndex, StorageModel::R_MinusPixmapEn).value <QPixmap>() :
+                           model->data (aIndex, StorageModel::R_PlusPixmapEn).value <QPixmap>();
+        aPainter->drawPixmap (model->data (aIndex, StorageModel::R_AdderPoint).toPoint(), expander);
+    }
+
+    /* Draw compressed item name */
+    int margin = model->data (aIndex, StorageModel::R_Margin).toInt();
+    int iconWidth = model->data (aIndex, StorageModel::R_IconSize).toInt();
+    int spacing = model->data (aIndex, StorageModel::R_Spacing).toInt();
+    QPoint textPosition = model->data (aIndex, StorageModel::R_ItemNamePoint).toPoint();
+    int textWidth = rect.width() - textPosition.x();
+    if (model->data (aIndex, StorageModel::R_IsController).toBool() && state & QStyle::State_Selected)
+    {
+        textWidth -= (2 * spacing + iconWidth + margin);
+        if (model->data (aIndex, StorageModel::R_CtrBusType).value <KStorageBus>() != KStorageBus_Floppy)
+            textWidth -= (spacing + iconWidth);
+    }
+    QString text (model->data (aIndex, StorageModel::R_ItemName).toString());
+    QString shortText (text);
+    QFont font = model->data (aIndex, Qt::FontRole).value <QFont>();
+    QFontMetrics fm (font);
+    while ((shortText.size() > 1) && (fm.width (shortText) + fm.width ("...") > textWidth))
+        shortText.truncate (shortText.size() - 1);
+    if (shortText != text)
+        shortText += "...";
+    aPainter->setFont (font);
+    aPainter->drawText (textPosition, shortText);
+
+    /* Draw Controller Additions */
+    if (model->data (aIndex, StorageModel::R_IsController).toBool() && state & QStyle::State_Selected)
+    {
+        DeviceTypeList devicesList (model->data (aIndex, StorageModel::R_CtrDevices).value <DeviceTypeList>());
+        for (int i = 0; i < devicesList.size(); ++ i)
+        {
+            KDeviceType deviceType = devicesList [i];
+
+            QRect deviceRect;
+            QPixmap devicePixmap;
+            switch (deviceType)
             {
-                mDisksList.replace (index, DiskValue (medium.id()));
-                continue;
+                case KDeviceType_HardDisk:
+                {
+                    deviceRect = model->data (aIndex, StorageModel::R_HDPixmapRect).value <QRect>();
+                    devicePixmap = model->data (aIndex, StorageModel::R_IsMoreAttachmentsPossible).toBool() ?
+                                   model->data (aIndex, StorageModel::R_HDPixmapEn).value <QPixmap>() :
+                                   model->data (aIndex, StorageModel::R_HDPixmapDis).value <QPixmap>();
+                    break;
+                }
+                case KDeviceType_DVD:
+                {
+                    deviceRect = model->data (aIndex, StorageModel::R_CDPixmapRect).value <QRect>();
+                    devicePixmap = model->data (aIndex, StorageModel::R_IsMoreAttachmentsPossible).toBool() ?
+                                   model->data (aIndex, StorageModel::R_CDPixmapEn).value <QPixmap>() :
+                                   model->data (aIndex, StorageModel::R_CDPixmapDis).value <QPixmap>();
+                    break;
+                }
+                case KDeviceType_Floppy:
+                {
+                    deviceRect = model->data (aIndex, StorageModel::R_FDPixmapRect).value <QRect>();
+                    devicePixmap = model->data (aIndex, StorageModel::R_IsMoreAttachmentsPossible).toBool() ?
+                                   model->data (aIndex, StorageModel::R_FDPixmapEn).value <QPixmap>() :
+                                   model->data (aIndex, StorageModel::R_FDPixmapDis).value <QPixmap>();
+                    break;
+                }
+                default:
+                    break;
             }
-        }
-
-        mDisksList.append (DiskValue (medium.id()));
-    }
+            QPixmap adderPixmap = model->data (aIndex, StorageModel::R_IsMoreAttachmentsPossible).toBool() ?
+                                  model->data (aIndex, StorageModel::R_PlusPixmapEn).value <QPixmap>() :
+                                  model->data (aIndex, StorageModel::R_PlusPixmapDis).value <QPixmap>();
+
+            aPainter->drawPixmap (QPoint (rect.width() + deviceRect.x(), deviceRect.y()), devicePixmap);
+            aPainter->drawPixmap (QPoint (rect.width() + deviceRect.x() + 6, deviceRect.y() + 6), adderPixmap);
+        }
+    }
+
+    aPainter->restore();
+
+    drawFocus (aPainter, aOption, rect);
 }
 
@@ -546 +1419 @@
 VBoxVMSettingsHD::VBoxVMSettingsHD()
     : mValidator (0)
-    , mWasTableSelected (false)
-    , mPolished (false)
-    , mLastSelAddControllerIndex (0)
+    , mIsPolished (false)
 {
     /* Apply UI decorations */
     Ui::VBoxVMSettingsHD::setupUi (this);
 
-    /* Setup model/view factory */
-    int idHDSlot = qRegisterMetaType <SlotValue>();
-    int idHDDisk = qRegisterMetaType <DiskValue>();
-    QItemEditorFactory *factory = new QItemEditorFactory;
-    QItemEditorCreatorBase *slotCreator =
-        new QStandardItemEditorCreator <SlotEditor>();
-    QItemEditorCreatorBase *diskCreator =
-        new QStandardItemEditorCreator <DiskEditor>();
-    factory->registerEditor ((QVariant::Type)idHDSlot, slotCreator);
-    factory->registerEditor ((QVariant::Type)idHDDisk, diskCreator);
-    QItemEditorFactory::setDefaultFactory (factory);
-
-    /* Setup view-model */
-    mModel = new AttachmentsModel (mTwAts, idHDSlot, idHDDisk);
-    connect (mModel, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
-             this, SIGNAL (hdChanged()));
-
-    /* Initialize HD Settings */
-    HDSettings::instance (mTwAts, mModel);
-
-    /* Setup table-view */
-    mTwAts->setMinimumHeight (100);
-    mTwAts->verticalHeader()->setDefaultSectionSize (
-        (int) (mTwAts->fontMetrics().height() * 1.30 /* 130% of font height */));
-    mTwAts->verticalHeader()->hide();
-    mTwAts->horizontalHeader()->setStretchLastSection (true);
-    mTwAts->setModel (mModel);
-    mTwAts->setToolTip (mModel->data (mModel->index (mModel->rowCount() - 1, 0),
-                                      Qt::ToolTipRole).toString());
-
-    /* Prepare actions */
-    mNewAction = new QAction (mTwAts);
-    mDelAction = new QAction (mTwAts);
-    mVdmAction = new QAction (mTwAts);
-
-    mTwAts->addAction (mNewAction);
-    mTwAts->addAction (mDelAction);
-    mTwAts->addAction (mVdmAction);
-
-    mNewAction->setShortcut (QKeySequence ("Ins"));
-    mDelAction->setShortcut (QKeySequence ("Del"));
-    mVdmAction->setShortcut (QKeySequence ("Ctrl+Space"));
-
-    mNewAction->setIcon (VBoxGlobal::iconSet (":/vdm_add_16px.png",
-                                              ":/vdm_add_disabled_16px.png"));
-    mDelAction->setIcon (VBoxGlobal::iconSet (":/vdm_remove_16px.png",
-                                              ":/vdm_remove_disabled_16px.png"));
-    mVdmAction->setIcon (VBoxGlobal::iconSet (":/select_file_16px.png",
-                                              ":/select_file_dis_16px.png"));
-
-    /* Prepare toolbar */
-    VBoxToolBar *toolBar = new VBoxToolBar (mGbAts);
-    toolBar->setUsesTextLabel (false);
-    toolBar->setIconSize (QSize (16, 16));
-    toolBar->setOrientation (Qt::Vertical);
-    toolBar->addAction (mNewAction);
-    toolBar->addAction (mDelAction);
-    toolBar->addAction (mVdmAction);
-    mGbAts->layout()->addWidget (toolBar);
+    /* Enumerate Mediums */
+    vboxGlobal().startEnumeratingMedia();
+
+    /* Initialize pixmap pool */
+    PixmapPool::pool (this);
+
+    /* Controller Actions */
+    mAddCtrAction = new QAction (this);
+    mAddCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::AddControllerEn),
+                                                 PixmapPool::pool()->pixmap (PixmapPool::AddControllerDis)));
+
+    mAddIDECtrAction = new QAction (this);
+    mAddIDECtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::IDEController)));
+
+    mAddSATACtrAction = new QAction (this);
+    mAddSATACtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::SATAController)));
+
+    mAddSCSICtrAction = new QAction (this);
+    mAddSCSICtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::SCSIController)));
+
+    mAddFloppyCtrAction = new QAction (this);
+    mAddFloppyCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::FloppyController)));
+
+    mDelCtrAction = new QAction (this);
+    mDelCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::DelControllerEn),
+                                                 PixmapPool::pool()->pixmap (PixmapPool::DelControllerDis)));
+
+    /* Attachment Actions */
+    mAddAttAction = new QAction (this);
+    mAddAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::AddAttachmentEn),
+                                                 PixmapPool::pool()->pixmap (PixmapPool::AddAttachmentDis)));
+
+    mDelAttAction = new QAction (this);
+    mDelAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::DelAttachmentEn),
+                                                 PixmapPool::pool()->pixmap (PixmapPool::DelAttachmentDis)));
+
+    /* Storage Model/View */
+    mStorageModel = new StorageModel (mTwStorageTree);
+    StorageDelegate *storageDelegate = new StorageDelegate (mTwStorageTree);
+    mTwStorageTree->setContextMenuPolicy (Qt::CustomContextMenu);
+    mTwStorageTree->setModel (mStorageModel);
+    mTwStorageTree->setItemDelegate (storageDelegate);
+    mTwStorageTree->setRootIndex (mStorageModel->root());
+    mTwStorageTree->setCurrentIndex (mStorageModel->root());
+
+    /* Storage ToolBar */
+    mTbStorageBar->setIconSize (QSize (16, 16));
+    mTbStorageBar->addAction (mAddAttAction);
+    mTbStorageBar->addAction (mDelAttAction);
+    mTbStorageBar->addAction (mAddCtrAction);
+    mTbStorageBar->addAction (mDelCtrAction);
+
+    /* Vdi Combo */
+    mCbVdi->setNullItemPresent (true);
+
+    /* Vmm Button */
+    mTbVmm->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::VMMEn),
+                                          PixmapPool::pool()->pixmap (PixmapPool::VMMDis)));
+
+    /* Info Pane initialization */
+    mLbHDVirtualSizeValue->setFullSizeSelection (true);
+    mLbHDActualSizeValue->setFullSizeSelection (true);
+    mLbSizeValue->setFullSizeSelection (true);
+    mLbLocationValue->setFullSizeSelection (true);
+    mLbHDFormatValue->setFullSizeSelection (true);
+    mLbUsageValue->setFullSizeSelection (true);
 
     /* Setup connections */
-    connect (mNewAction, SIGNAL (triggered (bool)),
-             this, SLOT (addAttachment()));
-    connect (mDelAction, SIGNAL (triggered (bool)),
-             this, SLOT (delAttachment()));
-    connect (mVdmAction, SIGNAL (triggered (bool)),
-             this, SLOT (showMediaManager()));
-
-    connect (mAddControllerCheck, SIGNAL (stateChanged (int)),
-             this, SLOT (onAddControllerCheckToggled (int)));
-    connect (mCbControllerType, SIGNAL (currentIndexChanged (int)),
-             this, SLOT (onAddControllerTypeChanged (int)));
-    connect (mShowDiffsCheck, SIGNAL (stateChanged (int)),
-             this, SLOT (onShowDiffsCheckToggled (int)));
-
-    connect (mTwAts, SIGNAL (currentChanged (const QModelIndex &)),
-             this, SLOT (updateActions (const QModelIndex &)));
-
-    connect (&vboxGlobal(), SIGNAL (mediumAdded (const VBoxMedium &)),
-             HDSettings::instance(), SLOT (update()));
-    connect (&vboxGlobal(), SIGNAL (mediumUpdated (const VBoxMedium &)),
-             HDSettings::instance(), SLOT (update()));
-    connect (&vboxGlobal(), SIGNAL (mediumRemoved (VBoxDefs::MediaType, const QString &)),
-             HDSettings::instance(), SLOT (update()));
-
-    /* IDE Controller Type */
-    mCbIDEController->addItem (""); /* KIDEControllerType_PIIX3 */
-    mCbIDEController->addItem (""); /* KIDEControllerType_PIIX4 */
-    mCbIDEController->addItem (""); /* KIDEControllerType_ICH6  */
-
-
-    /* Additional Controller Type */
-    mCbControllerType->addItem ("", KStorageControllerType_IntelAhci);
-    mCbControllerType->addItem ("", KStorageControllerType_LsiLogic);
-    mCbControllerType->addItem ("", KStorageControllerType_BusLogic);
-
-    /* Install global event filter */
-    qApp->installEventFilter (this);
+    connect (mAddCtrAction, SIGNAL (triggered (bool)), this, SLOT (addController()));
+    connect (mAddIDECtrAction, SIGNAL (triggered (bool)), this, SLOT (addIDEController()));
+    connect (mAddSATACtrAction, SIGNAL (triggered (bool)), this, SLOT (addSATAController()));
+    connect (mAddSCSICtrAction, SIGNAL (triggered (bool)), this, SLOT (addSCSIController()));
+    connect (mAddFloppyCtrAction, SIGNAL (triggered (bool)), this, SLOT (addFloppyController()));
+    connect (mDelCtrAction, SIGNAL (triggered (bool)), this, SLOT (delController()));
+    connect (mAddAttAction, SIGNAL (triggered (bool)), this, SLOT (addAttachment()));
+    connect (mDelAttAction, SIGNAL (triggered (bool)), this, SLOT (delAttachment()));
+    connect (mStorageModel, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
+             this, SLOT (onRowInserted (const QModelIndex&, int)));
+    connect (mStorageModel, SIGNAL (rowsRemoved (const QModelIndex&, int, int)),
+             this, SLOT (onRowRemoved()));
+    connect (mTwStorageTree, SIGNAL (currentItemChanged (const QModelIndex&, const QModelIndex&)),
+             this, SLOT (onCurrentItemChanged()));
+    connect (mTwStorageTree, SIGNAL (customContextMenuRequested (const QPoint&)),
+             this, SLOT (onContextMenuRequested (const QPoint&)));
+    connect (mTwStorageTree, SIGNAL (drawItemBranches (QPainter*, const QRect&, const QModelIndex&)),
+             this, SLOT (onDrawItemBranches (QPainter *, const QRect &, const QModelIndex &)));
+    connect (mTwStorageTree, SIGNAL (mousePressed (QMouseEvent*)),
+             this, SLOT (onMouseClicked (QMouseEvent*)));
+    connect (mTwStorageTree, SIGNAL (mouseDoubleClicked (QMouseEvent*)),
+             this, SLOT (onMouseClicked (QMouseEvent*)));
+    connect (mLeName, SIGNAL (textEdited (const QString&)), this, SLOT (setInformation()));
+    connect (mCbType, SIGNAL (activated (int)), this, SLOT (setInformation()));
+    connect (mCbSlot, SIGNAL (activated (int)), this, SLOT (setInformation()));
+    connect (mCbDevice, SIGNAL (activated (int)), this, SLOT (setInformation()));
+    connect (mCbVdi, SIGNAL (activated (int)), this, SLOT (setInformation()));
+    connect (mTbVmm, SIGNAL (clicked (bool)), this, SLOT (onVmmInvoked()));
+    connect (mCbPassthrough, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
+
+    /* Update actions */
+    updateActionsState();
 
     /* Applying language settings */
     retranslateUi();
+
+    /* Initial setup */
+    setMinimumWidth (500);
+    mSplitter->setSizes (QList<int>() << 0.45 * minimumWidth() << 0.55 * minimumWidth());
 }
 
@@ -659 +1536 @@
 {
     mMachine = aMachine;
-    HDSettings::instance()->setMachine (mMachine);
-
-    /* IDE controller type */
-    const QString ideName = QString ("IDE");
-    CStorageController ideCtl = aMachine.GetStorageControllerByName (ideName);
-    mCbIDEController->setCurrentIndex (mCbIDEController->
-        findText (vboxGlobal().toString (ideCtl.GetControllerType())));
-
-    /* For now we search for the first one which isn't IDE */
-    CStorageController addController;
-    QVector<CStorageController> scs = mMachine.GetStorageControllers();
-    foreach (const CStorageController &sc, scs)
-        if (sc.GetBus() != KStorageBus_IDE)
-        {
-            addController = sc;
-            break;
-        }
-    if (!addController.isNull())
-        mCbControllerType->setCurrentIndex (mCbControllerType->findData (addController.GetControllerType()));
-    else
-        mCbControllerType->setCurrentIndex (0);
-
-    mAddControllerCheck->setChecked (!addController.isNull());
-
-    onAddControllerCheckToggled (mAddControllerCheck->checkState());
-    onShowDiffsCheckToggled (mShowDiffsCheck->checkState());
-
-    /* Load attachments list */
-    CHardDiskAttachmentVector vec = mMachine.GetHardDiskAttachments();
-    for (int i = 0; i < vec.size(); ++ i)
-    {
-        CHardDiskAttachment hda = vec [i];
-        CStorageController  ctl = mMachine.GetStorageControllerByName(hda.GetController());
-
-        SlotValue slot (ctl.GetBus(), hda.GetPort(), hda.GetDevice());
-        DiskValue disk (hda.GetHardDisk().GetId());
-        mModel->addItem (slot, disk);
-    }
-
-    /* Initially select the first table item & update the actions */
-    mTwAts->setCurrentIndex (mModel->index (0, 1));
-    updateActions (mTwAts->currentIndex());
-
-    /* Validate if possible */
-    if (mValidator)
-        mValidator->revalidate();
+
+    /* Load currently present controllers & attachments */
+    CStorageControllerVector controllers = mMachine.GetStorageControllers();
+    foreach (const CStorageController &controller, controllers)
+    {
+        QString controllerName = controller.GetName();
+        QModelIndex ctrIndex = mStorageModel->addController (controllerName, controller.GetBus(), controller.GetControllerType());
+        QUuid ctrId = QUuid (mStorageModel->data (ctrIndex, StorageModel::R_ItemId).toString());
+
+        CMediumAttachmentVector attachments = mMachine.GetMediumAttachmentsOfController (controllerName);
+        foreach (const CMediumAttachment &attachment, attachments)
+        {
+            QModelIndex attIndex = mStorageModel->addAttachment (ctrId, attachment.GetType());
+            mStorageModel->setData (attIndex, QVariant::fromValue (StorageSlot (controller.GetBus(), attachment.GetPort(), attachment.GetDevice())), StorageModel::R_AttSlot);
+            CMedium medium (attachment.GetMedium());
+            VBoxMedium vboxMedium;
+            vboxGlobal().findMedium (medium, vboxMedium);
+            mStorageModel->setData (attIndex, vboxMedium.id(), StorageModel::R_AttMediumId);
+            mStorageModel->setData (attIndex, attachment.GetPassthrough(), StorageModel::R_AttIsPassthrough);
+        }
+    }
 }
 
 void VBoxVMSettingsHD::putBackTo()
 {
-    /* IDE controller type */
-    const QString ideName = QString ("IDE");
-    CStorageController ideCtl = mMachine.GetStorageControllerByName(ideName);
-    ideCtl.SetControllerType (vboxGlobal().toIDEControllerType (mCbIDEController->currentText()));
-
-    /* Detach all attached Hard Disks */
-    CHardDiskAttachmentVector vec = mMachine.GetHardDiskAttachments();
-    for (int i = 0; i < vec.size(); ++ i)
-    {
-        CHardDiskAttachment hda = vec [i];
-
-        mMachine.DetachHardDisk(hda.GetController(), hda.GetPort(), hda.GetDevice());
-
-        /* [dsen] check this */
-        if (!mMachine.isOk())
-        {
-            CStorageController ctl = mMachine.GetStorageControllerByName (hda.GetController());
-            vboxProblem().cannotDetachHardDisk (this, mMachine,
-                vboxGlobal().getMedium (CMedium (hda.GetHardDisk())).location(),
-                ctl.GetBus(), hda.GetPort(), hda.GetDevice());
-        }
-    }
-
-    /* Clear all storage controllers beside the IDE one */
-    CStorageController addController;
-    QVector <CStorageController> scs = mMachine.GetStorageControllers();
-    foreach (const CStorageController &sc, scs)
-        if (sc.GetBus() != KStorageBus_IDE)
-            mMachine.RemoveStorageController (sc.GetName());
-
-    /* Now add an additional controller if the user has enabled this */
-    CStorageController addCtl;
-    if (mAddControllerCheck->isChecked())
-    {
-        KStorageControllerType sct = currentControllerType();
-        KStorageBus sv = currentBusType();
-        addCtl = mMachine.AddStorageController (vboxGlobal().toString (sv), sv);
-        addCtl.SetControllerType (sct);
-    }
-
-    /* On SATA it is possible to set the max port count. We want not wasting resources
-     * so we try to find the port with the highest number & set it as max port count.
-     * But first set it to the maximum because we get errors if there are more hard
-     * disks than currently activated ports. */
-    if (!addCtl.isNull() &&
-        addCtl.GetBus() == KStorageBus_SATA)
-        addCtl.SetPortCount (30);
-
-    /* Attach all listed Hard Disks */
-    LONG maxSATAPort = 1;
-    QString ctrlName;
-    QList <Attachment> list (mModel->fullUsedList());
-    for (int i = 0; i < list.size(); ++ i)
-    {
-        ctrlName = vboxGlobal().toString (list [i].slot.bus);
-        if (list [i].slot.bus == KStorageBus_SATA)
-        {
-            maxSATAPort = maxSATAPort < (list [i].slot.channel + 1) ?
-                          (list [i].slot.channel + 1) : maxSATAPort;
-        }
-
-        mMachine.AttachHardDisk (list [i].disk.id,
-                                 ctrlName, list [i].slot.channel, list [i].slot.device);
-        /* [dsen] check this */
-        if (!mMachine.isOk())
-            vboxProblem().cannotAttachHardDisk (this, mMachine,
-                vboxGlobal().getMedium (CMedium (vboxGlobal().virtualBox()
-                .GetHardDisk (list [i].disk.id))).location(),
-                list [i].slot.bus, list [i].slot.channel, list [i].slot.device);
-    }
-
-    /* Set the maximum port count if the additional controller is a SATA controller. */
-    if (!addCtl.isNull() &&
-        addCtl.GetBus() == KStorageBus_SATA)
-        addCtl.SetPortCount (maxSATAPort);
+    /* Remove currently present controllers & attachments */
+    CStorageControllerVector controllers = mMachine.GetStorageControllers();
+    foreach (const CStorageController &controller, controllers)
+    {
+        QString controllerName (controller.GetName());
+        CMediumAttachmentVector attachments = mMachine.GetMediumAttachmentsOfController (controllerName);
+        foreach (const CMediumAttachment &attachment, attachments)
+            mMachine.DetachDevice (controllerName, attachment.GetPort(), attachment.GetDevice());
+        mMachine.RemoveStorageController (controllerName);
+    }
+
+    /* Save created controllers & attachments */
+    QModelIndex rootIndex = mStorageModel->root();
+    for (int i = 0; i < mStorageModel->rowCount (rootIndex); ++ i)
+    {
+        QModelIndex ctrIndex = rootIndex.child (i, 0);
+        QString ctrName = mStorageModel->data (ctrIndex, StorageModel::R_CtrName).toString();
+        KStorageBus ctrBusType = mStorageModel->data (ctrIndex, StorageModel::R_CtrBusType).value <KStorageBus>();
+        KStorageControllerType ctrType = mStorageModel->data (ctrIndex, StorageModel::R_CtrType).value <KStorageControllerType>();
+        CStorageController ctr = mMachine.AddStorageController (ctrName, ctrBusType);
+        ctr.SetControllerType (ctrType);
+        for (int j = 0; j < mStorageModel->rowCount (ctrIndex); ++ j)
+        {
+            QModelIndex attIndex = ctrIndex.child (j, 0);
+            StorageSlot attStorageSlot = mStorageModel->data (attIndex, StorageModel::R_AttSlot).value <StorageSlot>();
+            KDeviceType attDeviceType = mStorageModel->data (attIndex, StorageModel::R_AttDevice).value <KDeviceType>();
+            QString attMediumId = mStorageModel->data (attIndex, StorageModel::R_AttMediumId).toString();
+            mMachine.AttachDevice (ctrName, attStorageSlot.port, attStorageSlot.device, attDeviceType, attMediumId);
+            CMediumAttachment attachment = mMachine.GetMediumAttachment (ctrName, attStorageSlot.port, attStorageSlot.device);
+            attachment.SetPassthrough (mStorageModel->data (attIndex, StorageModel::R_AttIsHostDrive).toBool() &&
+                                       mStorageModel->data (attIndex, StorageModel::R_AttIsPassthrough).toBool());
+        }
+    }
 }
 
@@ -789 +1599 @@
 {
     mValidator = aVal;
-    connect (mModel, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
-             mValidator, SLOT (revalidate()));
+    // TODO Setup Validation!
 }
 
 bool VBoxVMSettingsHD::revalidate (QString &aWarning, QString &)
 {
-    QList <SlotValue> slotList (mModel->usedSlotsList());
-    QList <DiskValue> diskList (mModel->usedDisksList());
-    for (int i = 0; i < diskList.size(); ++ i)
-    {
-        /* Check for emptiness */
-        if (diskList [i].id.isNull())
-        {
-            aWarning = tr ("No hard disk is selected for <i>%1</i>")
-                           .arg (slotList [i].name);
-            break;
-        }
-
-        /* Check for coincidence */
-        if (diskList.count (diskList [i]) > 1)
-        {
-            int first = diskList.indexOf (diskList [i]);
-            int second = diskList.indexOf (diskList [i], first + 1);
-            Assert (first != -1 && second != -1);
-            aWarning = tr ("<i>%1</i> uses the hard disk that is "
-                           "already attached to <i>%2</i>")
-                           .arg (slotList [second].name,
-                                 slotList [first].name);
-            break;
-        }
-    }
-
+    // TODO Perform Validation!
     return aWarning.isNull();
-}
-
-void VBoxVMSettingsHD::setOrderAfter (QWidget *aWidget)
-{
-    setTabOrder (aWidget, mCbIDEController);
-    setTabOrder (mCbIDEController, mAddControllerCheck);
-    setTabOrder (mAddControllerCheck, mCbControllerType);
-    setTabOrder (mCbControllerType, mTwAts);
-    setTabOrder (mTwAts, mShowDiffsCheck);
 }
 
@@ -838 +1613 @@
     Ui::VBoxVMSettingsHD::retranslateUi (this);
 
-    /* IDE Controller Type */
-    mCbIDEController->setItemText (0, vboxGlobal().toString (KStorageControllerType_PIIX3));
-    mCbIDEController->setItemText (1, vboxGlobal().toString (KStorageControllerType_PIIX4));
-    mCbIDEController->setItemText (2, vboxGlobal().toString (KStorageControllerType_ICH6));
-
-    /* Additional Controller Type */
-    mCbControllerType->setItemText (0, QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SATA))
-                                                          .arg (vboxGlobal().toString (KStorageControllerType_IntelAhci)));
-    mCbControllerType->setItemText (1, QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SCSI))
-                                                          .arg (vboxGlobal().toString (KStorageControllerType_LsiLogic)));
-    mCbControllerType->setItemText (2, QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SCSI))
-                                                          .arg (vboxGlobal().toString (KStorageControllerType_BusLogic)));
-
-    /* Attachments List */
-    mNewAction->setText (tr ("&Add Attachment"));
-    mDelAction->setText (tr ("&Remove Attachment"));
-    mVdmAction->setText (tr ("&Select Hard Disk"));
-
-    mNewAction->setToolTip (mNewAction->text().remove ('&') +
-        QString (" (%1)").arg (mNewAction->shortcut().toString()));
-    mDelAction->setToolTip (mDelAction->text().remove ('&') +
-        QString (" (%1)").arg (mDelAction->shortcut().toString()));
-    mVdmAction->setToolTip (mVdmAction->text().remove ('&') +
-        QString (" (%1)").arg (mVdmAction->shortcut().toString()));
-
-    mNewAction->setWhatsThis (tr ("Adds a new hard disk attachment."));
-    mDelAction->setWhatsThis (tr ("Removes the highlighted hard disk attachment."));
-    mVdmAction->setWhatsThis (tr ("Invokes the Virtual Media Manager to select "
-                                  "a hard disk to attach to the currently "
-                                  "highlighted slot."));
-}
-
-void VBoxVMSettingsHD::addAttachment()
-{
-    /* Temporary disable corresponding action now to prevent calling it again
-     * before it will be disabled by current-changed processing. This can
-     * happens if the user just pressed & hold the shortcut combination. */
-    mNewAction->setEnabled (false);
-
-    QString newId;
-
-    {   /* Clear the focus */
-        FocusGuardBlock guard (mTwAts);
-
-        bool uniqueDiskSelected = false;
-        HDSettings *hds = HDSettings::instance();
-
-        {   /* Add new item with default values */
-            SlotValue slot (hds->slotsList (SlotValue(), true) [0]);
-            DiskValue disk;
-            uniqueDiskSelected = hds->tryToChooseUniqueDisk (disk);
-            mModel->addItem (slot, disk);
-        }   /* Add new item with default values */
-
-        /* If there are not enough unique disks */
-        if (!uniqueDiskSelected)
-        {
-            /* Ask the user for method to add new disk */
-            int confirm = vboxProblem().confirmRunNewHDWzdOrVDM (this);
-            newId = confirm == QIMessageBox::Yes ? getWithNewHDWizard() :
-                    confirm == QIMessageBox::No ? getWithMediaManager() : QString::null;
-        }
-    }   /* Clear the focus */
-
-    /* Set the right column of new index to be the current */
-    mTwAts->setCurrentIndex (mModel->index (mModel->rowCount() - 2, 1));
-
-    if (!newId.isNull())
-    {
-        /* Compose & apply resulting disk */
-        QVariant newValue;
-        newValue.setValue (DiskValue (newId));
-        mModel->setData (mTwAts->currentIndex(), newValue);
-    }
-
-    /* Validate if possible */
-    if (mValidator)
-        mValidator->revalidate();
-    emit hdChanged();
+    mAddCtrAction->setShortcut (QKeySequence ("Ins"));
+    mDelCtrAction->setShortcut (QKeySequence ("Del"));
+    mAddAttAction->setShortcut (QKeySequence ("+"));
+    mDelAttAction->setShortcut (QKeySequence ("-"));
+
+    mAddCtrAction->setText (tr ("Add Controller"));
+    mAddIDECtrAction->setText (tr ("Add IDE Controller"));
+    mAddSATACtrAction->setText (tr ("Add SATA Controller"));
+    mAddSCSICtrAction->setText (tr ("Add SCSI Controller"));
+    mAddFloppyCtrAction->setText (tr ("Add Floppy Controller"));
+    mDelCtrAction->setText (tr ("Remove Controller"));
+    mAddAttAction->setText (tr ("Add Attachment"));
+    mDelAttAction->setText (tr ("Remove Attachment"));
+
+    mAddCtrAction->setWhatsThis (tr ("Adds a new controller to the end of Storage Tree."));
+    mDelCtrAction->setWhatsThis (tr ("Removes controller highlighted in Storage Tree."));
+    mAddAttAction->setWhatsThis (tr ("Adds a new attachment to the Storage Tree using "
+                                     "currently selected controller as parent."));
+    mDelAttAction->setWhatsThis (tr ("Removes attachment highlighted in Storage Tree."));
+
+    mAddCtrAction->setToolTip (mAddCtrAction->text().remove ('&') +
+        QString (" (%1)").arg (mAddCtrAction->shortcut().toString()));
+    mDelCtrAction->setToolTip (mDelCtrAction->text().remove ('&') +
+        QString (" (%1)").arg (mDelCtrAction->shortcut().toString()));
+    mAddAttAction->setToolTip (mAddAttAction->text().remove ('&') +
+        QString (" (%1)").arg (mAddAttAction->shortcut().toString()));
+    mDelAttAction->setToolTip (mDelAttAction->text().remove ('&') +
+        QString (" (%1)").arg (mDelAttAction->shortcut().toString()));
+}
+
+void VBoxVMSettingsHD::showEvent (QShowEvent *aEvent)
+{
+    if (!mIsPolished)
+    {
+        mIsPolished = true;
+
+        /* First column indent */
+        mLtEmpty->setColumnMinimumWidth (0, 10);
+        mLtController->setColumnMinimumWidth (0, 10);
+        mLtAttachment->setColumnMinimumWidth (0, 10);
+
+        /* Second column indent minimum width */
+        QList <QLabel*> labelsList;
+        labelsList << mLbSlot << mLbDevice << mLbVdi
+                   << mLbHDVirtualSize << mLbHDActualSize << mLbSize
+                   << mLbLocation << mLbHDFormat << mLbUsage;
+        int maxWidth = 0;
+        QFontMetrics metrics (font());
+        foreach (QLabel *label, labelsList)
+        {
+            int width = metrics.width (label->text());
+            maxWidth = width > maxWidth ? width : maxWidth;
+        }
+        mLtAttachment->setColumnMinimumWidth (1, maxWidth);
+    }
+    VBoxSettingsPage::showEvent (aEvent);
+}
+
+void VBoxVMSettingsHD::addController()
+{
+    QMenu menu;
+    menu.addAction (mAddIDECtrAction);
+    menu.addAction (mAddSATACtrAction);
+    menu.addAction (mAddSCSICtrAction);
+    menu.addAction (mAddFloppyCtrAction);
+    menu.exec (QCursor::pos());
+}
+
+void VBoxVMSettingsHD::addIDEController()
+{
+    // TODO Generate Unique Name!
+    mStorageModel->addController (tr ("IDE Controller"), KStorageBus_IDE, KStorageControllerType_PIIX3);
+}
+
+void VBoxVMSettingsHD::addSATAController()
+{
+    // TODO Generate Unique Name!
+    mStorageModel->addController (tr ("SATA Controller"), KStorageBus_SATA, KStorageControllerType_IntelAhci);
+}
+
+void VBoxVMSettingsHD::addSCSIController()
+{
+    // TODO Generate Unique Name!
+    mStorageModel->addController (tr ("SCSI Controller"), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
+}
+
+void VBoxVMSettingsHD::addFloppyController()
+{
+    // TODO Generate Unique Name!
+    mStorageModel->addController (tr ("Floppy Controller"), KStorageBus_Floppy, KStorageControllerType_I82078);
+}
+
+void VBoxVMSettingsHD::delController()
+{
+    QModelIndex index = mTwStorageTree->currentIndex();
+    if (!mStorageModel->data (index, StorageModel::R_IsController).toBool()) return;
+
+    mStorageModel->delController (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()));
+}
+
+void VBoxVMSettingsHD::addAttachment (KDeviceType aDeviceType)
+{
+    QModelIndex index = mTwStorageTree->currentIndex();
+    if (!mStorageModel->data (index, StorageModel::R_IsController).toBool()) return;
+
+    if (aDeviceType == KDeviceType_Null)
+        aDeviceType = mStorageModel->data (index, StorageModel::R_CtrDevices).value <DeviceTypeList>() [0];
+
+    mStorageModel->addAttachment (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()), aDeviceType);
 }
 
 void VBoxVMSettingsHD::delAttachment()
 {
-    Assert (mTwAts->currentIndex().isValid());
-
-    /* Temporary disable corresponding action now to prevent calling it again
-     * before it will be disabled by current-changed processing. This can
-     * happens if the user just pressed & hold the shortcut combination. */
-    mDelAction->setEnabled (false);
-
-    /* Clear the focus */
-    FocusGuardBlock guard (mTwAts);
-
-    /* Storing current attributes */
-    int row = mTwAts->currentIndex().row();
-    int col = mTwAts->currentIndex().column();
-
-    /* Erase current index */
-    mTwAts->setCurrentIndex (QModelIndex());
-
-    /* Calculate new current index */
-    int newRow = row < mModel->rowCount() - 2 ? row :
-                 row > 0 ? row - 1 : -1;
-    QModelIndex next = newRow == -1 ? mModel->index (0, col) :
-                                      mModel->index (newRow, col);
-
-    /* Delete current index */
-    mModel->delItem (row);
-
-    /* Set the new index to be the current */
-    mTwAts->setCurrentIndex (next);
-    updateActions (next);
-
-    if (mValidator)
-        mValidator->revalidate();
-    emit hdChanged();
-}
-
-void VBoxVMSettingsHD::showMediaManager()
-{
-    Assert (mTwAts->currentIndex().isValid());
-
-    /* Clear the focus */
-    FocusGuardBlock guard (mTwAts);
-
-    DiskValue current (mModel->data (mTwAts->currentIndex(), Qt::EditRole)
-                       .value <DiskValue>());
-
-    QString id = getWithMediaManager (current.id);
-
+    QModelIndex index = mTwStorageTree->currentIndex();
+    QModelIndex parent = index.parent();
+    if (!index.isValid() || !parent.isValid() ||
+        !mStorageModel->data (index, StorageModel::R_IsAttachment).toBool() ||
+        !mStorageModel->data (parent, StorageModel::R_IsController).toBool())
+        return;
+
+    mStorageModel->delAttachment (QUuid (mStorageModel->data (parent, StorageModel::R_ItemId).toString()),
+                                  QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()));
+}
+
+void VBoxVMSettingsHD::getInformation()
+{
+    mIsLoadingInProgress = true;
+
+    QModelIndex index = mTwStorageTree->currentIndex();
+    if (!index.isValid() || index == mStorageModel->root())
+    {
+        /* Showing Initial Page */
+        mSwRightPane->setCurrentIndex (0);
+    }
+    else
+    {
+        switch (mStorageModel->data (index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
+        {
+            case AbstractItem::Type_ControllerItem:
+            {
+                /* Getting Controller Name */
+                mLeName->setText (mStorageModel->data (index, StorageModel::R_CtrName).toString());
+
+                /* Getting Controller Sub type */
+                mCbType->clear();
+                ControllerTypeList controllerTypeList (mStorageModel->data (index, StorageModel::R_CtrTypes).value <ControllerTypeList>());
+                for (int i = 0; i < controllerTypeList.size(); ++ i)
+                    mCbType->insertItem (mCbType->count(), vboxGlobal().toString (controllerTypeList [i]));
+                KStorageControllerType type = mStorageModel->data (index, StorageModel::R_CtrType).value <KStorageControllerType>();
+                int ctrPos = mCbType->findText (vboxGlobal().toString (type));
+                mCbType->setCurrentIndex (ctrPos == -1 ? 0 : ctrPos);
+
+                /* Showing Controller Page */
+                mSwRightPane->setCurrentIndex (1);
+                break;
+            }
+            case AbstractItem::Type_AttachmentItem:
+            {
+                /* Getting Attachment Slot */
+                mCbSlot->clear();
+                SlotsList slotsList (mStorageModel->data (index, StorageModel::R_AttSlots).value <SlotsList>());
+                for (int i = 0; i < slotsList.size(); ++ i)
+                    mCbSlot->insertItem (mCbSlot->count(), vboxGlobal().toFullString (slotsList [i]));
+                StorageSlot slt = mStorageModel->data (index, StorageModel::R_AttSlot).value <StorageSlot>();
+                int attSlotPos = mCbSlot->findText (vboxGlobal().toFullString (slt));
+                mCbSlot->setCurrentIndex (attSlotPos == -1 ? 0 : attSlotPos);
+
+                /* Getting Attachment Device */
+                mCbDevice->clear();
+                DeviceTypeList deviceTypeList (mStorageModel->data (index, StorageModel::R_AttDevices).value <DeviceTypeList>());
+                for (int i = 0; i < deviceTypeList.size(); ++ i)
+                    mCbDevice->insertItem (mCbDevice->count(), vboxGlobal().toString (deviceTypeList [i]));
+                KDeviceType device = mStorageModel->data (index, StorageModel::R_AttDevice).value <KDeviceType>();
+                int attDevicePos = mCbDevice->findText (vboxGlobal().toString (device));
+                mCbDevice->setCurrentIndex (attDevicePos == -1 ? 0 : attDevicePos);
+
+                /* Getting Attachment Medium */
+                mCbVdi->setType (typeToLocal (device));
+                mCbVdi->setCurrentItem (mStorageModel->data (index, StorageModel::R_AttMediumId).toString());
+                mCbVdi->refresh();
+
+                /* Getting Passthrough state */
+                bool isHostDrive = mStorageModel->data (index, StorageModel::R_AttIsHostDrive).toBool();
+                mCbPassthrough->setEnabled (isHostDrive);
+                mCbPassthrough->setChecked (isHostDrive && mStorageModel->data (index, StorageModel::R_AttIsPassthrough).toBool());
+
+                /* Update optional widgets visibility */
+                updateAdditionalObjects (device);
+
+                /* Getting Other Information */
+                mLbHDVirtualSizeValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttLogicalSize).toString()));
+                mLbHDActualSizeValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttSize).toString()));
+                mLbSizeValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttSize).toString()));
+                mLbLocationValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttLocation).toString()));
+                mLbHDFormatValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttFormat).toString()));
+                mLbUsageValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttUsage).toString()));
+
+                /* Showing Attachment Page */
+                mSwRightPane->setCurrentIndex (2);
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    mIsLoadingInProgress = false;
+}
+
+void VBoxVMSettingsHD::setInformation()
+{
+    QModelIndex index = mTwStorageTree->currentIndex();
+    if (mIsLoadingInProgress || !index.isValid() || index == mStorageModel->root()) return;
+
+    QObject *sdr = sender();
+    switch (mStorageModel->data (index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
+    {
+        case AbstractItem::Type_ControllerItem:
+        {
+            /* Setting Controller Name */
+            if (sdr == mLeName)
+                mStorageModel->setData (index, mLeName->text(), StorageModel::R_CtrName);
+            /* Setting Controller Sub-Type */
+            else if (sdr == mCbType)
+            {
+                KStorageControllerType type = vboxGlobal().toControllerType (mCbType->currentText());
+                mStorageModel->setData (index, QVariant::fromValue (type), StorageModel::R_CtrType);
+            }
+            break;
+        }
+        case AbstractItem::Type_AttachmentItem:
+        {
+            /* Setting Attachment Slot */
+            if (sdr == mCbSlot)
+            {
+                StorageSlot slt = vboxGlobal().toStorageSlot (mCbSlot->currentText());
+                mStorageModel->setData (index, QVariant::fromValue (slt), StorageModel::R_AttSlot);
+            }
+            /* Setting Attachment Device-Type */
+            else if (sdr == mCbDevice)
+            {
+                KDeviceType device = vboxGlobal().toDeviceType (mCbDevice->currentText());
+                mStorageModel->setData (index, QVariant::fromValue (device), StorageModel::R_AttDevice);
+                mCbVdi->setType (typeToLocal (device));
+                mCbVdi->refresh();
+            }
+            /* Setting Attachment Medium */
+            else if (sdr == mCbVdi)
+                mStorageModel->setData (index, mCbVdi->id(), StorageModel::R_AttMediumId);
+            else if (sdr == mCbPassthrough)
+            {
+                if (mStorageModel->data (index, StorageModel::R_AttIsHostDrive).toBool())
+                    mStorageModel->setData (index, mCbPassthrough->isChecked(), StorageModel::R_AttIsPassthrough);
+            }
+            break;
+        }
+        default:
+            break;
+    }
+
+    getInformation();
+}
+
+void VBoxVMSettingsHD::onVmmInvoked()
+{
+    QString id = getWithMediaManager (typeToLocal (vboxGlobal().toDeviceType (mCbDevice->currentText())));
     if (!id.isNull())
-    {
-        /* Compose & apply resulting disk */
-        QVariant newValue;
-        newValue.setValue (DiskValue (id));
-        mModel->setData (mTwAts->currentIndex(), newValue);
-    }
-}
-
-void VBoxVMSettingsHD::updateActions (const QModelIndex& /* aIndex */)
-{
-    mNewAction->setEnabled (mModel->rowCount() - 1 <
-        HDSettings::instance()->slotsList().count());
-    mDelAction->setEnabled (mTwAts->currentIndex().row() != mModel->rowCount() - 1);
-    mVdmAction->setEnabled (mTwAts->currentIndex().row() != mModel->rowCount() - 1 &&
-                            mTwAts->currentIndex().column() == 1);
-}
-
-void VBoxVMSettingsHD::onAddControllerCheckToggled (int aState)
-{
-    removeFocus();
-    if (mAddControllerCheck->checkState() == Qt::Unchecked)
-        if (checkAddControllers (0))
-        {
-            /* Switch check-box back to "Qt::Checked" */
-            mAddControllerCheck->blockSignals (true);
-            mAddControllerCheck->setCheckState (Qt::Checked);
-            mAddControllerCheck->blockSignals (false);
-            /* The user cancel the request so do nothing */
+        mCbVdi->setCurrentItem (id);
+}
+
+void VBoxVMSettingsHD::updateActionsState()
+{
+    QModelIndex index = mTwStorageTree->currentIndex();
+
+    mAddCtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
+    mAddIDECtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
+    mAddSATACtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
+    mAddSCSICtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
+    mAddFloppyCtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
+    mAddAttAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsController).toBool() &&
+                               mStorageModel->data (index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
+
+    mDelCtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsController).toBool());
+    mDelAttAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsAttachment).toBool());
+}
+
+void VBoxVMSettingsHD::onRowInserted (const QModelIndex &aParent, int aPosition)
+{
+    QModelIndex index = mStorageModel->index (aPosition, 0, aParent);
+
+    switch (mStorageModel->data (index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
+    {
+        case AbstractItem::Type_ControllerItem:
+        {
+            /* Select the newly created Controller Item */
+            mTwStorageTree->setCurrentIndex (index);
+            break;
+        }
+        case AbstractItem::Type_AttachmentItem:
+        {
+            /* Expand parent if it is not expanded yet */
+            if (!mTwStorageTree->isExpanded (aParent))
+                mTwStorageTree->setExpanded (aParent, true);
+
+            /* Check if no medium was selected for this attachment */
+            if (mStorageModel->data (index, StorageModel::R_AttMediumId).toString().isEmpty())
+            {
+                /* Ask the user for the method to select medium */
+                KDeviceType deviceType = mStorageModel->data (index, StorageModel::R_AttDevice).value <KDeviceType>();
+                int askResult = vboxProblem().confirmRunNewHDWzdOrVDM (deviceType);
+                QString mediumId = askResult == QIMessageBox::Yes ? getWithNewHDWizard() :
+                                   askResult == QIMessageBox::No ? getWithMediaManager (typeToLocal (deviceType)) : QString();
+                if (mediumId.isNull())
+                    mediumId = firstAvailable;
+                mStorageModel->setData (index, mediumId, StorageModel::R_AttMediumId);
+            }
+            break;
+        }
+        default:
+            break;
+    }
+
+    updateActionsState();
+    getInformation();
+}
+
+void VBoxVMSettingsHD::onRowRemoved()
+{
+    updateActionsState();
+    getInformation();
+}
+
+void VBoxVMSettingsHD::onCurrentItemChanged()
+{
+    updateActionsState();
+    getInformation();
+}
+
+void VBoxVMSettingsHD::onContextMenuRequested (const QPoint &aPosition)
+{
+    QModelIndex index = mTwStorageTree->indexAt (aPosition);
+    if (!index.isValid()) return addController();
+
+    QMenu menu;
+    switch (mStorageModel->data (index, StorageModel::R_ItemType).value <AbstractItem::ItemType>())
+    {
+        case AbstractItem::Type_ControllerItem:
+        {
+            menu.addAction (mAddAttAction);
+            menu.addAction (mDelCtrAction);
+            break;
+        }
+        case AbstractItem::Type_AttachmentItem:
+        {
+            menu.addAction (mDelAttAction);
+            break;
+        }
+        default:
+            break;
+    }
+    if (!menu.isEmpty())
+        menu.exec (mTwStorageTree->viewport()->mapToGlobal (aPosition));
+}
+
+void VBoxVMSettingsHD::onDrawItemBranches (QPainter *aPainter, const QRect &aRect, const QModelIndex &aIndex)
+{
+    if (!aIndex.parent().isValid() || !aIndex.parent().parent().isValid()) return;
+
+    aPainter->save();
+    aPainter->translate (aRect.x(), aRect.y());
+
+    int rows = mStorageModel->rowCount (aIndex.parent());
+
+    // TODO Draw Correct Braches!
+
+    if (aIndex.row() == 0)
+        aPainter->drawLine (QPoint (aRect.width() / 2, 2), QPoint (aRect.width() / 2, aRect.height() / 2));
+    else
+        aPainter->drawLine (QPoint (aRect.width() / 2, 0), QPoint (aRect.width() / 2, aRect.height() / 2));
+
+    if (aIndex.row() < rows - 1)
+        aPainter->drawLine (QPoint (aRect.width() / 2, aRect.height() / 2), QPoint (aRect.width() / 2, aRect.height()));
+
+    aPainter->drawLine (QPoint (aRect.width() / 2, aRect.height() / 2), QPoint (aRect.width() - 2, aRect.height() / 2));
+
+    aPainter->restore();
+}
+
+void VBoxVMSettingsHD::onMouseClicked (QMouseEvent *aEvent)
+{
+    QModelIndex index = mTwStorageTree->indexAt (aEvent->pos());
+    QRect indexRect = mTwStorageTree->visualRect (index);
+
+    /* Process expander icon */
+    if (mStorageModel->data (index, StorageModel::R_IsController).toBool())
+    {
+        QRect expanderRect = mStorageModel->data (index, StorageModel::R_ItemPixmapRect).toRect();
+        expanderRect.translate (indexRect.x(), indexRect.y());
+        if (expanderRect.contains (aEvent->pos()))
+        {
+            aEvent->setAccepted (true);
+            mTwStorageTree->setExpanded (index, !mTwStorageTree->isExpanded (index));
             return;
         }
-
-    mCbControllerType->setEnabled (aState == Qt::Checked);
-    HDSettings::instance()->setAddCount (mAddControllerCheck->checkState() == Qt::Checked ?
-                                         currentMaxPortCount() : 0,
-                                         currentBusType());
-    updateActions (mTwAts->currentIndex());
-}
-
-void VBoxVMSettingsHD::onAddControllerTypeChanged (int aIndex)
-{
-    removeFocus();
-    if (checkAddControllers (1))
-    {
-        /* Switch check-box back to "Qt::Checked" */
-        mCbControllerType->blockSignals (true);
-        mCbControllerType->setCurrentIndex (mLastSelAddControllerIndex);
-        mCbControllerType->blockSignals (false);
-        /* The user cancel the request so do nothing */
-        return;
-    }
-
-    /* Save the new index for later roll back */
-    mLastSelAddControllerIndex = aIndex;
-
-    HDSettings::instance()->setAddCount (mAddControllerCheck->checkState() == Qt::Checked ?
-                                         currentMaxPortCount() : 0,
-                                         currentBusType());
-    updateActions (mTwAts->currentIndex());
-}
-
-bool VBoxVMSettingsHD::checkAddControllers (int aWhat)
-{
-    /* Search the list for at least one SATA/SCSI port in */
-    QList <SlotValue> list (mModel->usedSlotsList());
-    int firstAddPort = 0;
-    for (; firstAddPort < list.size(); ++ firstAddPort)
-        if (list [firstAddPort].bus == KStorageBus_SATA ||
-            list [firstAddPort].bus == KStorageBus_SCSI)
-            break;
-
-    /* If list contains at least one SATA/SCSI port */
-    if (firstAddPort < list.size())
-    {
-        int result = 0;
-        if (aWhat == 0)
-            result = vboxProblem().confirmDetachAddControllerSlots (this);
-        else
-            result = vboxProblem().confirmChangeAddControllerSlots (this);
-        if (result != QIMessageBox::Ok)
-            return true;
-        else
-        {
-            removeFocus();
-            /* Delete additional controller items */
-            mModel->removeAddController();
-
-            /* Set column #1 of first index to be the current */
-            mTwAts->setCurrentIndex (mModel->index (0, 1));
-
-            if (mValidator)
-                mValidator->revalidate();
-        }
-    }
-    return false;
-}
-
-void VBoxVMSettingsHD::onShowDiffsCheckToggled (int aState)
-{
-    removeFocus();
-    HDSettings::instance()->setShowDiffs (aState == Qt::Checked);
-}
-
-bool VBoxVMSettingsHD::eventFilter (QObject *aObject, QEvent *aEvent)
-{
-    if (!aObject->isWidgetType())
-        return QWidget::eventFilter (aObject, aEvent);
-
-    QWidget *widget = static_cast <QWidget*> (aObject);
-    if (widget->inherits ("SlotEditor") ||
-        widget->inherits ("DiskEditor"))
-    {
-        if (aEvent->type() == QEvent::KeyPress)
-        {
-            QKeyEvent *e = static_cast <QKeyEvent*> (aEvent);
-            QModelIndex cur = mTwAts->currentIndex();
-            switch (e->key())
+    }
+
+    /* Process add-attachment icons */
+    if (mStorageModel->data (index, StorageModel::R_IsController).toBool() &&
+        mTwStorageTree->currentIndex() == index)
+    {
+        DeviceTypeList devicesList (mStorageModel->data (index, StorageModel::R_CtrDevices).value <DeviceTypeList>());
+        for (int i = 0; i < devicesList.size(); ++ i)
+        {
+            KDeviceType deviceType = devicesList [i];
+
+            QRect deviceRect;
+            switch (deviceType)
             {
-                case Qt::Key_Up:
+                case KDeviceType_HardDisk:
                 {
-                    if (cur.row() > 0)
-                        mTwAts->setCurrentIndex (mModel->index (cur.row() - 1,
-                                                                cur.column()));
-                    return true;
+                    deviceRect = mStorageModel->data (index, StorageModel::R_HDPixmapRect).toRect();
+                    break;
                 }
-                case Qt::Key_Down:
+                case KDeviceType_DVD:
                 {
-                    if (cur.row() < mModel->rowCount() - 1)
-                        mTwAts->setCurrentIndex (mModel->index (cur.row() + 1,
-                                                                cur.column()));
-                    return true;
+                    deviceRect = mStorageModel->data (index, StorageModel::R_CDPixmapRect).toRect();
+                    break;
                 }
-                case Qt::Key_Right:
+                case KDeviceType_Floppy:
                 {
-                    if (cur.column() == 0)
-                        mTwAts->setCurrentIndex (mModel->index (cur.row(), 1));
-                    return true;
-                }
-                case Qt::Key_Left:
-                {
-                    if (cur.column() == 1)
-                        mTwAts->setCurrentIndex (mModel->index (cur.row(), 0));
-                    return true;
-                }
-                case Qt::Key_Tab:
-                {
-                    focusNextPrevChild (true);
-                    return true;
-                }
-                case Qt::Key_Backtab:
-                {
-                    /* Due to table on getting focus back from the child
-                     * put it instantly to this child again, make a hack
-                     * to put focus to the real previous owner. */
-                    mAddControllerCheck->setFocus();
-                    return true;
+                    deviceRect = mStorageModel->data (index, StorageModel::R_FDPixmapRect).toRect();
+                    break;
                 }
                 default:
                     break;
             }
-        } else
-        if (aEvent->type() == QEvent::WindowDeactivate)
-        {
-            /* Store focus state if it is on temporary editor. */
-            if (widget->hasFocus())
-                mWasTableSelected = true;
-        }
-    } else
-    if (widget == mTwAts->viewport() &&
-        aEvent->type() == QEvent::MouseButtonDblClick)
-    {
-        QMouseEvent *e = static_cast <QMouseEvent*> (aEvent);
-        QModelIndex index = mTwAts->indexAt (e->pos());
-        if (mNewAction->isEnabled() &&
-            (index.row() == mModel->rowCount() - 1 || !index.isValid()))
-            addAttachment();
-    } else
-    if (aEvent->type() == QEvent::WindowActivate)
-    {
-        if (mWasTableSelected)
-        {
-            /* Restore focus state if it was on temporary editor. */
-            mWasTableSelected = false;
-            mTwAts->setFocus();
-        }
-    }
-
-    return QWidget::eventFilter (aObject, aEvent);
-}
-
-void VBoxVMSettingsHD::showEvent (QShowEvent *aEvent)
-{
-    QWidget::showEvent (aEvent);
-
-    if (mPolished)
-        return;
-    mPolished = true;
-
-    /* Some delayed polishing */
-    mTwAts->horizontalHeader()->resizeSection (0,
-        style()->pixelMetric (QStyle::PM_ScrollBarExtent, 0, this) +
-        maxNameLength() + 9 * 2 /* 2 margins */);
-
-    /* Activate edit triggers only now to avoid influencing
-     * HD Attachments table during data loading. */
-    mTwAts->setEditTriggers (QAbstractItemView::CurrentChanged |
-                             QAbstractItemView::SelectedClicked |
-                             QAbstractItemView::EditKeyPressed);
-
-    /* That little hack allows avoid one of qt4 children focusing bug */
-    QWidget *current = QApplication::focusWidget();
-    mTwAts->setFocus (Qt::TabFocusReason);
-    if (current)
-        current->setFocus (Qt::TabFocusReason);
-}
-
-QString VBoxVMSettingsHD::getWithMediaManager (const QString &aInitialId)
+            deviceRect.translate (indexRect.x() + indexRect.width(), indexRect.y());
+
+            if (deviceRect.contains (aEvent->pos()))
+            {
+                aEvent->setAccepted (true);
+                if (mAddAttAction->isEnabled())
+                    addAttachment (deviceType);
+                return;
+            }
+        }
+    }
+}
+
+QString VBoxVMSettingsHD::getWithNewHDWizard()
+{
+    /* Run New HD Wizard */
+    VBoxNewHDWzd dlg (this);
+
+    return dlg.exec() == QDialog::Accepted ? dlg.hardDisk().GetId() : QString();
+}
+
+QString VBoxVMSettingsHD::getWithMediaManager (VBoxDefs::MediumType aMediumType)
 {
     /* Run Media Manager */
     VBoxMediaManagerDlg dlg (this);
-    dlg.setup (VBoxDefs::MediaType_HardDisk,
+    dlg.setup (aMediumType,
                true /* do select? */,
                false /* do refresh? */,
                mMachine,
-               aInitialId,
-               HDSettings::instance()->showDiffs());
-
-    return dlg.exec() == QDialog::Accepted ? dlg.selectedId() : QString::null;
-}
-
-QString VBoxVMSettingsHD::getWithNewHDWizard()
-{
-    /* Run New HD Wizard */
-    VBoxNewHDWzd dlg (this);
-
-    return dlg.exec() == QDialog::Accepted ? dlg.hardDisk().GetId() : QString::null;
-}
-
-int VBoxVMSettingsHD::maxNameLength() const
-{
-    QList <SlotValue> slts (HDSettings::instance()->slotsList());
-    int nameLength = 0;
-    for (int i = 0; i < slts.size(); ++ i)
-    {
-        int length = mTwAts->fontMetrics().width (slts [i].name);
-        nameLength = length > nameLength ? length : nameLength;
-    }
-    return nameLength;
-}
-
-void VBoxVMSettingsHD::removeFocus()
-{
-#ifdef Q_WS_MAC
-    /* On the Mac checkboxes aren't focus aware. Therewith a editor widget get
-     * not closed by clicking on the checkbox. As a result the content of the
-     * currently used editor (QComboBox) isn't updated. So manually remove the
-     * focus to force the closing of any open editor widget. */
-    QWidget *focusWidget = qApp->focusWidget();
-    if (focusWidget)
-        focusWidget->clearFocus();
-#endif /* Q_WS_MAC */
-}
-
+               QString(),
+               false);
+
+    return dlg.exec() == QDialog::Accepted ? dlg.selectedId() : QString();
+}
+
+void VBoxVMSettingsHD::updateAdditionalObjects (KDeviceType aType)
+{
+    mCbShowDiffs->setVisible (aType == KDeviceType_HardDisk);
+    mCbPassthrough->setVisible (aType == KDeviceType_DVD);
+
+    mLbHDVirtualSize->setVisible (aType == KDeviceType_HardDisk);
+    mLbHDVirtualSizeValue->setVisible (aType == KDeviceType_HardDisk);
+
+    mLbHDActualSize->setVisible (aType == KDeviceType_HardDisk);
+    mLbHDActualSizeValue->setVisible (aType == KDeviceType_HardDisk);
+
+    mLbSize->setVisible (aType != KDeviceType_HardDisk);
+    mLbSizeValue->setVisible (aType != KDeviceType_HardDisk);
+
+    mLbHDFormat->setVisible (aType == KDeviceType_HardDisk);
+    mLbHDFormatValue->setVisible (aType == KDeviceType_HardDisk);
+}
+

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

@@ -116 +116 @@
               </widget>
              </item>
-             <item row="0" column="1" colspan="2" >
+             <item row="0" column="1" >
               <widget class="QILabel" name="mHdsPane1" >
                <property name="sizePolicy" >

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsHD.ui

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <comment>
  VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
@@ -19 +19 @@
  </comment>
  <class>VBoxVMSettingsHD</class>
- <widget class="QWidget" name="VBoxVMSettingsHD">
-  <property name="geometry">
+ <widget class="QWidget" name="VBoxVMSettingsHD" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>352</width>
-    <height>335</height>
+    <width>800</width>
+    <height>700</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="mLtMain">
+  <layout class="QVBoxLayout" name="mLtMain" >
    <item>
-    <widget class="QLabel" name="mLbIDEController" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QISplitter" native="1" name="mSplitter" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="text" >
-      <string>IDE &amp;Controller Type</string>
+     <property name="handleWidth" >
+      <number>4</number>
      </property>
-     <property name="buddy" >
-      <cstring>mCbIDEController</cstring>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="mLtIDEControllers">
-     <item>
-      <spacer name="mSpIDEController">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+     <widget class="QWidget" native="1" name="mWtLeftPane" >
+      <layout class="QVBoxLayout" name="mLtLeftPane" >
+       <property name="leftMargin" >
+        <number>0</number>
        </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
+       <property name="topMargin" >
+        <number>0</number>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>0</height>
-        </size>
+       <property name="rightMargin" >
+        <number>10</number>
        </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QComboBox" name="mCbIDEController" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+       <property name="bottomMargin" >
+        <number>0</number>
        </property>
-       <property name="whatsThis" >
-        <string>Defines the type of the virtual IDE controller. Depending on this value, VirtualBox will provide different virtual IDE hardware devices to the guest OS.</string>
-       </property>
+       <item>
+        <widget class="QILabelSeparator" native="1" name="mLsLeftPane" >
+         <property name="text" >
+          <string>&amp;Storage Tree</string>
+         </property>
+         <property name="buddy" >
+          <cstring>mTwStorageTree</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="mLtStorage" >
+         <property name="spacing" >
+          <number>0</number>
+         </property>
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QITreeView" native="1" name="mTwStorageTree" >
+           <property name="whatsThis" >
+            <string>Contains all the created storage controllers and all the attached mediums representing virtual images and real host-drives.</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="mLtStorageBar" >
+           <item>
+            <spacer name="mSp1" >
+             <property name="orientation" >
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0" >
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="VBoxToolBar" native="1" name="mTbStorageBar" />
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QStackedWidget" name="mSwRightPane" >
+      <widget class="QWidget" name="mWtEmpty">
+       <layout class="QGridLayout" name="mLtEmpty" >
+        <property name="leftMargin" >
+         <number>10</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <item row="0" column="0" colspan="2" >
+         <widget class="QILabelSeparator" native="1" name="mLsEmpty" >
+          <property name="text" >
+           <string>Information</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QLabel" name="mLbInfo" >
+          <property name="text" >
+           <string>Storage Tree supports multiple storage controllers of any type. Currently there are no storage controllers created.</string>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" colspan="2" >
+         <spacer name="mSp2" >
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="mAddControllerCheck">
-     <property name="whatsThis">
-      <string>When checked, enables an additional virtual controller (either SATA or SCSI) of this machine.</string>
-     </property>
-     <property name="text">
-      <string>&amp;Enable Additional Controller</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="mLtAddControllers">
-     <item>
-      <spacer name="mSpAddControllers">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QComboBox" name="mCbControllerType">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
+      <widget class="QWidget" name="mWtController" >
+       <layout class="QGridLayout" name="mLtController" >
+        <property name="leftMargin" >
+         <number>10</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <item row="0" column="0" colspan="3" >
+         <widget class="QILabelSeparator" native="1" name="mLsParameters" >
+          <property name="text" >
+           <string>Attributes</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QLabel" name="mLbName" >
+          <property name="text" >
+           <string>&amp;Name:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>mLeName</cstring>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2" >
+         <widget class="QLineEdit" name="mLeName" >
+          <property name="whatsThis" >
+           <string>Allows to edit the name of the storage controller currently selected in the Storage Tree.</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1" >
+         <widget class="QLabel" name="mLbType" >
+          <property name="text" >
+           <string>&amp;Type:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>mCbType</cstring>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2" >
+         <widget class="QComboBox" name="mCbType" >
+          <property name="whatsThis" >
+           <string>Allows to select the sub-type of the storage controller currently selected in the Storage Tree.</string>
+          </property>
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0" colspan="3" >
+         <spacer name="mSp3" >
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QILabelSeparator" name="label">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>&amp;Attachments</string>
-     </property>
-     <property name="buddy">
-      <cstring>mTwAts</cstring>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="mGbAts" native="true">
-     <layout class="QHBoxLayout">
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QITableView" name="mTwAts">
-        <property name="contextMenuPolicy">
-         <enum>Qt::ActionsContextMenu</enum>
-        </property>
-        <property name="whatsThis">
-         <string>Lists all hard disks attached to this machine. Use a mouse click or the &lt;tt&gt;Space&lt;/tt&gt; key on the highlighted item to activate the drop-down list and choose the desired value. Use the context menu or buttons to the right to add or remove hard disk attachments.</string>
-        </property>
-        <property name="horizontalScrollBarPolicy">
-         <enum>Qt::ScrollBarAlwaysOff</enum>
-        </property>
-        <property name="editTriggers">
-         <set>QAbstractItemView::NoEditTriggers</set>
-        </property>
-        <property name="tabKeyNavigation">
-         <bool>false</bool>
-        </property>
-        <property name="selectionMode">
-         <enum>QAbstractItemView::SingleSelection</enum>
-        </property>
-        <property name="showGrid">
-         <bool>false</bool>
-        </property>
-        <property name="gridStyle">
-         <enum>Qt::NoPen</enum>
-        </property>
-        <property name="cornerButtonEnabled">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="mShowDiffsCheck">
-     <property name="whatsThis">
-      <string>If checked, it will show differencing hard disks actually attached to the slots instead of their base hard disks (shown in case of indirect attachments) and will also let attach other differencing hard disks explicitly. Check this only if you need a complex hard disk setup.</string>
-     </property>
-     <property name="text">
-      <string>&amp;Show Differencing Hard Disks</string>
-     </property>
+      <widget class="QWidget" name="mWtAttachment" >
+       <layout class="QGridLayout" name="mLtAttachment" >
+        <property name="leftMargin" >
+         <number>10</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <item row="0" column="0" colspan="4" >
+         <widget class="QILabelSeparator" native="1" name="mLsAttributes" >
+          <property name="text" >
+           <string>Attributes</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QLabel" name="mLbSlot" >
+          <property name="text" >
+           <string>S&amp;lot:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>mCbSlot</cstring>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2" colspan="2" >
+         <widget class="QComboBox" name="mCbSlot" >
+          <property name="whatsThis" >
+           <string>Allows to select the slot of the storage attachment currently selected in the Storage Tree. The list of the currently available slots depends on parent controller type of this attachment and takes into account slots already used by the other attachments of the same parent.</string>
+          </property>
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1" >
+         <widget class="QLabel" name="mLbDevice" >
+          <property name="text" >
+           <string>&amp;Device:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>mCbDevice</cstring>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2" colspan="2" >
+         <widget class="QComboBox" name="mCbDevice" >
+          <property name="whatsThis" >
+           <string>Allows to select the type of the device represented by the currently selected attachment. The list of possible device types depends on parent controller type.</string>
+          </property>
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1" >
+         <widget class="QLabel" name="mLbVdi" >
+          <property name="text" >
+           <string>&amp;Medium:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>mCbVdi</cstring>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2" >
+         <widget class="VBoxMediaComboBox" native="1" name="mCbVdi" >
+          <property name="whatsThis" >
+           <string>Allows to select the medium assigned for the currently selected attachment according to device type of this attachment. Available mediums list could contain virtual images and real host drives corresponding to device type currently chosen for this attachment.</string>
+          </property>
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="3" >
+         <widget class="QToolButton" name="mTbVmm" >
+          <property name="whatsThis" >
+           <string>Invokes the Virtual Media Manager to select a medium to mount.</string>
+          </property>
+          <property name="toolTip" >
+           <string>Open Virtual Media Manager</string>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="autoRaise" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="2" colspan="2" >
+         <widget class="QCheckBox" name="mCbShowDiffs">
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="whatsThis">
+           <string>If checked, it will show differencing hard disks actually attached to the slots instead of their base hard disks (shown in case of indirect attachments) and will also let attach other differencing hard disks explicitly. Check this only if you need a complex hard disk setup.</string>
+          </property>
+          <property name="text">
+           <string>D&amp;ifferencing Disks</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="2" colspan="2" >
+         <widget class="QCheckBox" name="mCbPassthrough" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="whatsThis" >
+           <string>When checked, allows the guest to send ATAPI commands directly to the host drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</string>
+          </property>
+          <property name="text" >
+           <string>&amp;Passthrough</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="0" colspan="4" >
+         <widget class="QILabelSeparator" native="1" name="mLsInformation" >
+          <property name="text" >
+           <string>Information</string>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="1" >
+         <widget class="QLabel" name="mLbHDVirtualSize" >
+          <property name="text" >
+           <string>Virtual Size:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="2" colspan="2" >
+         <widget class="QILabel" name="mLbHDVirtualSizeValue" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="8" column="1" >
+         <widget class="QLabel" name="mLbHDActualSize" >
+          <property name="text" >
+           <string>Actual Size:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="8" column="2" colspan="2" >
+         <widget class="QILabel" name="mLbHDActualSizeValue" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="9" column="1" >
+         <widget class="QLabel" name="mLbSize" >
+          <property name="text" >
+           <string>Size:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="9" column="2" colspan="2" >
+         <widget class="QILabel" name="mLbSizeValue" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="10" column="1" >
+         <widget class="QLabel" name="mLbLocation" >
+          <property name="text" >
+           <string>Location:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="10" column="2" colspan="2" >
+         <widget class="QILabel" name="mLbLocationValue" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="11" column="1" >
+         <widget class="QLabel" name="mLbHDFormat" >
+          <property name="text" >
+           <string>Type (Format):</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="11" column="2" colspan="2" >
+         <widget class="QILabel" name="mLbHDFormatValue" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="12" column="1" >
+         <widget class="QLabel" name="mLbUsage" >
+          <property name="text" >
+           <string>Attached To:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="12" column="2" colspan="2" >
+         <widget class="QILabel" name="mLbUsageValue" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="13" column="0" colspan="4" >
+         <spacer name="mSp6" >
+          <property name="orientation" >
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </widget>
     </widget>
    </item>
@@ -185 +525 @@
  <customwidgets>
   <customwidget>
-   <class>QITableView</class>
-   <extends>QTableView</extends>
-   <header>VBoxSettingsUtils.h</header>
+   <class>QISplitter</class>
+   <extends>QSplitter</extends>
+   <header>QISplitter.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
@@ -193 +534 @@
    <extends>QLabel</extends>
    <header>QILabelSeparator.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>QITreeView</class>
+   <extends>QTreeView</extends>
+   <header>QITreeView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>VBoxToolBar</class>
+   <extends>QWidget</extends>
+   <header>VBoxToolBar.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>VBoxMediaComboBox</class>
+   <extends>QComboBox</extends>
+   <header>VBoxMediaComboBox.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>QILabel</class>
+   <extends>QLabel</extends>
+   <header>QILabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
+ <connections/>
 </ui>