Changeset 34329 in vbox for trunk

Timestamp:

Nov 24, 2010 3:18:40 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings / Storage page: Rework for 5370.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/VBoxProblemReporter.cpp (modified) (1 diff)
• src/globals/VBoxProblemReporter.h (modified) (1 diff)
• src/settings/machine/UIMachineSettingsStorage.cpp (modified) (32 diffs)
• src/settings/machine/UIMachineSettingsStorage.h (modified) (9 diffs)
• src/settings/machine/UIMachineSettingsStorage.ui (modified) (6 diffs)

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

@@ -381 +381 @@
         src/selector/UIVMDesktop.cpp \
         src/settings/UISettingsDialogSpecific.cpp \
+        src/settings/machine/UIMachineSettingsStorage.cpp \
         src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \
         src/runtime/UIActionsPool.cpp \

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

@@ -1286 +1286 @@
 }
 
-int VBoxProblemReporter::confirmRunNewHDWzdOrOFD (KDeviceType aDeviceType)
-{
-    switch (aDeviceType)
-    {
-        case KDeviceType_HardDisk:
-            return message (QApplication::activeWindow(), Info,
-                            tr ("<p>There are no unused medium 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> if you wish to open existing "
-                                "medium using file-open dialog.</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 medium available for the newly "
-                                "created attachment.</p>"
-                                "<p>Press the <b>Select</b> if you wish to open existing "
-                                "medium using file-open dialog.</p>"),
-                            0, /* aAutoConfirmId */
-                            QIMessageBox::No | QIMessageBox::Default,
-                            QIMessageBox::Cancel | QIMessageBox::Escape,
-                            0,
-                            tr ("&Select", "medium"));
-    }
-    return QIMessageBox::Cancel;
+int VBoxProblemReporter::askAboutHardDiskAttachmentCreation(QWidget *pParent,
+                                                            const QString &strControllerName)
+{
+    return message(pParent, Question,
+                   tr("<p>You are about to add a virtual hard disk to controller <b>%1</b>.</p>"
+                      "<p>Would you like to create a new, empty disk or select an existing one? "
+                      "You will be able to change the attached disk again at a later time "
+                      "if you wish using the button on the <b>Attributes</b> pane.</p>")
+                      .arg(strControllerName),
+                   0, /* aAutoConfirmId */
+                   QIMessageBox::Yes,
+                   QIMessageBox::No,
+                   QIMessageBox::Cancel | QIMessageBox::Default | QIMessageBox::Escape,
+                   tr("Create &new disk", "add attachment routine"),
+                   tr("&Choose existing disk", "add attachment routine"));
+}
+
+int VBoxProblemReporter::askAboutOpticalAttachmentCreation(QWidget *pParent,
+                                                           const QString &strControllerName)
+{
+    return message(pParent, Question,
+                   tr("<p>You are about to add a new CD/DVD drive to controller <b>%1</b>.</p>"
+                      "<p>Would you like to choose a virtual CD/DVD disk to insert into the drive "
+                      "or to leave it empty for now? "
+                      "You will be able to change the disk inserted later or pass through a physical disk "
+                      "using the button on the <b>Attributes</b> pane or while the machine is running using the <b>Device</b> menu.</p>")
+                      .arg(strControllerName),
+                   0, /* aAutoConfirmId */
+                   QIMessageBox::Yes,
+                   QIMessageBox::No,
+                   QIMessageBox::Cancel | QIMessageBox::Default | QIMessageBox::Escape,
+                   tr("&Choose disk", "add attachment routine"),
+                   tr("Leave &empty", "add attachment routine"));
+}
+
+int VBoxProblemReporter::askAboutFloppyAttachmentCreation(QWidget *pParent,
+                                                          const QString &strControllerName)
+{
+    return message(pParent, Question,
+                   tr("<p>You are about to add a new floppy drive to controller <b>%1</b>.</p>"
+                      "<p>Would you like to choose a virtual floppy disk to insert into the drive "
+                      "or to leave it empty for now? "
+                      "You will be able to change the disk inserted later or pass through a physical disk "
+                      "using the button on the <b>Attributes</b> pane or while the machine is running using the <b>Device</b> menu.</p>")
+                      .arg(strControllerName),
+                   0, /* aAutoConfirmId */
+                   QIMessageBox::Yes,
+                   QIMessageBox::No,
+                   QIMessageBox::Cancel | QIMessageBox::Default | QIMessageBox::Escape,
+                   tr("&Choose disk", "add attachment routine"),
+                   tr("Leave &empty", "add attachment routine"));
 }
 

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

@@ -260 +260 @@
     int confirmDetachAddControllerSlots (QWidget *aParent) const;
     int confirmChangeAddControllerSlots (QWidget *aParent) const;
-    int confirmRunNewHDWzdOrOFD (KDeviceType aDeviceType);
+
+    int askAboutHardDiskAttachmentCreation(QWidget *pParent, const QString &strControllerName);
+    int askAboutOpticalAttachmentCreation(QWidget *pParent, const QString &strControllerName);
+    int askAboutFloppyAttachmentCreation(QWidget *pParent, const QString &strControllerName);
 
     int confirmRemovingOfLastDVDDevice() const;

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

@@ -36 +36 @@
 #include <QTimer>
 #include <QCommonStyle>
-
-/* String Tags */
-const char *firstAvailableId = "first available";
 
 /* Type converters */
@@ -133 +130 @@
     mPool [FDAttachmentAddDis]       = QPixmap (":/fd_add_disabled_16px.png");
 
-    mPool [VMMEn]                    = QPixmap (":/select_file_16px.png");
-    mPool [VMMDis]                   = QPixmap (":/select_file_dis_16px.png");
+    mPool [ChooseExistingEn]         = QPixmap (":/select_file_16px.png");
+    mPool [ChooseExistingDis]        = QPixmap (":/select_file_dis_16px.png");
+    mPool [HDNewEn]                  = QPixmap (":/hd_new_16px.png");
+    mPool [HDNewDis]                 = QPixmap (":/hd_new_disabled_16px.png");
+    mPool [CDUnmountEnabled]         = QPixmap (":/cd_unmount_16px.png");
+    mPool [CDUnmountDisabled]        = QPixmap (":/cd_unmount_dis_16px.png");
+    mPool [FDUnmountEnabled]         = QPixmap (":/fd_unmount_16px.png");
+    mPool [FDUnmountDisabled]        = QPixmap (":/fd_unmount_dis_16px.png");
 }
 
@@ -406 +409 @@
     , mCtrName (aName)
     , mCtrType (0)
+    , mUseIoCache (false)
 {
     /* Check for proper parent type */
@@ -506 +510 @@
 }
 
-QStringList ControllerItem::ctrAllMediumIds (bool aShowDiffs) const
-{
-    QStringList allMediums;
-    foreach (const VBoxMedium &medium, vboxGlobal().currentMediaList())
-    {
-         foreach (const KDeviceType &deviceType, mCtrType->deviceTypeList())
-         {
-             if (medium.isNull() || medium.medium().GetDeviceType() == deviceType)
-             {
-                 /* In 'don't show diffs' mode we should only show hard-disks which are:
-                  * 1. Attached to 'current state' of this VM even if these are differencing disks.
-                  * 2. Not attached to this VM at all only if they are not differencing disks. */
-                 if (!aShowDiffs && medium.type() == VBoxDefs::MediumType_HardDisk)
-                 {
-                     if (medium.isAttachedInCurStateTo (parent()->machineId()) ||
-                         (!medium.medium().GetMachineIds().contains (parent()->machineId()) && !medium.parent()))
-                         allMediums << medium.id();
-                 }
-                 else allMediums << medium.id();
-                 break;
-             }
-         }
-    }
-    return allMediums;
-}
-
-QStringList ControllerItem::ctrUsedMediumIds() const
-{
-    QStringList usedImages;
-    for (int i = 0; i < mAttachments.size(); ++ i)
-    {
-        QString usedMediumId = static_cast <AttachmentItem*> (mAttachments [i])->attMediumId();
-        if (!vboxGlobal().findMedium (usedMediumId).isNull())
-            usedImages << usedMediumId;
-    }
-    return usedImages;
-}
-
 AbstractItem::ItemType ControllerItem::rtti() const
 {
@@ -606 +572 @@
     : AbstractItem (aParent)
     , mAttDeviceType (aDeviceType)
-    , mAttIsShowDiffs (false)
     , mAttIsHostDrive (false)
     , mAttIsPassthrough (false)
@@ -616 +581 @@
     AssertMsg (!attSlots().isEmpty(), ("There should be at least one available slot!\n"));
     mAttSlot = attSlots() [0];
-
-    /* Try to select unique medium for HD and empty medium for CD/FD device */
-    QStringList freeMediumIds (attMediumIds());
-    if (freeMediumIds.size() > 0)
-        setAttMediumId (freeMediumIds [0]);
 }
 
@@ -657 +617 @@
 }
 
-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 (mAttIsShowDiffs))
-    {
-        VBoxMedium medium = vboxGlobal().findMedium (mediumId);
-        if ((medium.isNull() && mAttDeviceType != KDeviceType_HardDisk) ||
-            (!medium.isNull() && medium.medium().GetDeviceType() == 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::attIsShowDiffs() const
-{
-    return mAttIsShowDiffs;
-}
-
 bool AttachmentItem::attIsHostDrive() const
 {
@@ -710 +639 @@
 void AttachmentItem::setAttMediumId (const QString &aAttMediumId)
 {
-    VBoxMedium medium;
-
-    /* Caching first available medium */
-    if (aAttMediumId == firstAvailableId && !attMediumIds (false).isEmpty())
-        medium = vboxGlobal().findMedium (attMediumIds (false) [0]);
-    /* Caching passed medium */
-    else if (!aAttMediumId.isEmpty())
-        medium = vboxGlobal().findMedium (aAttMediumId);
-
-    mAttMediumId = medium.id();
+    AssertMsg(!aAttMediumId.isEmpty(), ("Medium ID value can't be null/empty!\n"));
+    mAttMediumId = vboxGlobal().findMedium(aAttMediumId).id();
     cache();
 }
 
-void AttachmentItem::setAttIsShowDiffs (bool aAttIsShowDiffs)
-{
-    mAttIsShowDiffs = aAttIsShowDiffs;
-    cache();
-}
-
 void AttachmentItem::setAttIsPassthrough (bool aIsAttPassthrough)
 {
@@ -764 +679 @@
 
     /* Cache medium information */
-    mAttName = medium.name (!mAttIsShowDiffs);
-    mAttTip = medium.toolTipCheckRO (!mAttIsShowDiffs, mAttDeviceType != KDeviceType_HardDisk);
-    mAttPixmap = medium.iconCheckRO (!mAttIsShowDiffs);
+    mAttName = medium.name (true);
+    mAttTip = medium.toolTipCheckRO (true, mAttDeviceType != KDeviceType_HardDisk);
+    mAttPixmap = medium.iconCheckRO (true);
     mAttIsHostDrive = medium.isHostDrive();
 
     /* Cache additional information */
-    mAttSize = medium.size (!mAttIsShowDiffs);
-    mAttLogicalSize = medium.logicalSize (!mAttIsShowDiffs);
-    mAttLocation = medium.location (!mAttIsShowDiffs);
-    mAttFormat = medium.isNull() ? QString ("--") :
-        QString ("%1 (%2)").arg (medium.hardDiskType (!mAttIsShowDiffs))
-                           .arg (medium.hardDiskFormat (!mAttIsShowDiffs));
-    mAttUsage = medium.usage (!mAttIsShowDiffs);
+    mAttSize = medium.size (true);
+    mAttLogicalSize = medium.logicalSize (true);
+    mAttLocation = medium.location (true);
+    if (medium.isNull())
+    {
+        mAttFormat = QString("--");
+    }
+    else
+    {
+        switch (mAttDeviceType)
+        {
+            case KDeviceType_HardDisk:
+            {
+                mAttFormat = QString("%1 (%2)").arg(medium.hardDiskType(true)).arg(medium.hardDiskFormat(true));
+                break;
+            }
+            case KDeviceType_DVD:
+            case KDeviceType_Floppy:
+            {
+                mAttFormat = mAttIsHostDrive ? UIMachineSettingsStorage::tr("Host Drive") : UIMachineSettingsStorage::tr("Image");
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    mAttUsage = medium.usage (true);
 
     /* Fill empty attributes */
@@ -1138 +1073 @@
             return QString();
         }
-        case R_AttIsShowDiffs:
-        {
-            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
-                if (item->rtti() == AbstractItem::Type_AttachmentItem)
-                    return static_cast <AttachmentItem*> (item)->attIsShowDiffs();
-            return false;
-        }
         case R_AttIsHostDrive:
         {
@@ -1350 +1278 @@
             return false;
         }
-        case R_AttIsShowDiffs:
-        {
-            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
-                if (item->rtti() == AbstractItem::Type_AttachmentItem)
-                {
-                    static_cast <AttachmentItem*> (item)->setAttIsShowDiffs (aValue.toBool());
-                    emit dataChanged (aIndex, aIndex);
-                    return true;
-                }
-            return false;
-        }
         case R_AttIsPassthrough:
         {
@@ -1398 +1315 @@
 }
 
-QModelIndex StorageModel::addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType)
+QModelIndex StorageModel::addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType, const QString &strMediumId)
 {
     if (AbstractItem *parent = mRootItem->childById (aCtrId))
@@ -1405 +1322 @@
         QModelIndex parentIndex = index (parentPosition, 0, root());
         beginInsertRows (parentIndex, parent->childCount(), parent->childCount());
-        new AttachmentItem (parent, aDeviceType);
+        AttachmentItem *pItem = new AttachmentItem (parent, aDeviceType);
+        pItem->setAttMediumId(strMediumId);
         endInsertRows();
         return index (parent->childCount() - 1, 0, parentIndex);
@@ -1653 +1571 @@
 
 /**
+ * UI Medium ID Holder.
+ * Used for compliance with other storage page widgets
+ * which caching and holding corresponding information.
+ */
+class UIMediumIDHolder : public QObject
+{
+    Q_OBJECT;
+    
+public:
+
+    UIMediumIDHolder(QWidget *pParent) : QObject(pParent) {}
+
+    QString id() const { return m_strId; }
+    void setId(const QString &strId) { m_strId = strId; emit sigChanged(); }
+
+    VBoxDefs::MediumType type() const { return m_type; }
+    void setType(VBoxDefs::MediumType type) { m_type = type; }
+
+    bool isNull() const { return m_strId == VBoxMedium().id(); }
+
+signals:
+
+    void sigChanged();
+
+private:
+
+    QString m_strId;
+    VBoxDefs::MediumType m_type;
+};
+
+/**
  * QWidget class reimplementation.
  * Used as HD Settings widget.
@@ -1663 +1612 @@
     , mAddAttAction(0), mDelAttAction(0)
     , mAddHDAttAction(0), mAddCDAttAction(0), mAddFDAttAction(0)
+    , m_pMediumIdHolder(new UIMediumIDHolder(this))
     , mIsLoadingInProgress(0)
     , mIsPolished(false)
@@ -1751 +1701 @@
 #endif /* Q_WS_MAC */
 
-    /* Vdi Combo */
-    mCbVdi->setNullItemPresent (true);
-    mCbVdi->refresh();
-
-    /* Vmm Button */
-    mTbOpen->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap (PixmapPool::VMMEn),
-                                        PixmapPool::pool()->pixmap (PixmapPool::VMMDis)));
-    mTbNew->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentAddEn),
-                                        PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentAddDis)));
+    /* Setup choose-medium button: */
+    QMenu *pOpenMediumMenu = new QMenu(this);
+    mTbOpen->setMenu(pOpenMediumMenu);
 
     /* Info Pane initialization */
+    mLbHDFormatValue->setFullSizeSelection (true);
+    mLbCDFDTypeValue->setFullSizeSelection (true);
     mLbHDVirtualSizeValue->setFullSizeSelection (true);
     mLbHDActualSizeValue->setFullSizeSelection (true);
     mLbSizeValue->setFullSizeSelection (true);
     mLbLocationValue->setFullSizeSelection (true);
-    mLbHDFormatValue->setFullSizeSelection (true);
     mLbUsageValue->setFullSizeSelection (true);
 
@@ -1808 +1753 @@
     connect (mCbSlot, SIGNAL (activated (int)), this, SLOT (setInformation()));
     connect (mCbIoCache, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
-    connect (mCbVdi, SIGNAL (activated (int)), this, SLOT (setInformation()));
-    connect (mTbOpen, SIGNAL (clicked (bool)), this, SLOT (sltOpenMedium()));
-    connect (mTbNew, SIGNAL (clicked (bool)), this, SLOT (sltNewMedium()));
-    connect (mCbShowDiffs, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
+    connect (m_pMediumIdHolder, SIGNAL (sigChanged()), this, SLOT (setInformation()));
+    connect (mTbOpen, SIGNAL (clicked (bool)), mTbOpen, SLOT (showMenu()));
+    connect (pOpenMediumMenu, SIGNAL (aboutToShow()), this, SLOT (sltPrepareOpenMediumMenu()));
     connect (mCbPassthrough, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
 
@@ -1892 +1836 @@
 {
     /* Apply internal variables data to QWidget(s): */
-    mCbVdi->setMachineId(m_cache.m_strMachineId);
     mStorageModel->setMachineId(m_cache.m_strMachineId);
     for (int iControllerIndex = 0; iControllerIndex < m_cache.m_items.size(); ++iControllerIndex)
@@ -1907 +1850 @@
             /* Get iterated attachment: */
             const UIStorageAttachmentData &attachmentData = controllerData.m_items[iAttachmentIndex];
-            QModelIndex attachmentIndex = mStorageModel->addAttachment(controllerId, attachmentData.m_attachmentType);
+            QModelIndex attachmentIndex = mStorageModel->addAttachment(controllerId, attachmentData.m_attachmentType, attachmentData.m_strAttachmentMediumId);
             StorageSlot attachmentStorageSlot(controllerData.m_controllerBus,
                                               attachmentData.m_iAttachmentPort,
@@ -1913 +1856 @@
             mStorageModel->setData(attachmentIndex, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
             mStorageModel->setData(attachmentIndex, attachmentData.m_fAttachmentPassthrough, StorageModel::R_AttIsPassthrough);
-            mStorageModel->setData(attachmentIndex, attachmentData.m_strAttachmentMediumId, StorageModel::R_AttMediumId);
         }
     }
@@ -2119 +2061 @@
         /* Second column indent minimum width */
         QList <QLabel*> labelsList;
-        labelsList << mLbSlot << mLbVdi
+        labelsList << mLbMedium << mLbHDFormat << mLbCDFDType
                    << mLbHDVirtualSize << mLbHDActualSize << mLbSize
-                   << mLbLocation << mLbHDFormat << mLbUsage;
+                   << mLbLocation << mLbUsage;
         int maxWidth = 0;
         QFontMetrics metrics (font());
@@ -2166 +2108 @@
             if (attMediumId == aMediumId)
             {
-                mStorageModel->setData (attIndex, firstAvailableId, StorageModel::R_AttMediumId);
+                mStorageModel->setData (attIndex, VBoxMedium().id(), StorageModel::R_AttMediumId);
                 if (mValidator) mValidator->revalidate();
             }
@@ -2345 +2287 @@
                 mCbSlot->setToolTip (mCbSlot->itemText (mCbSlot->currentIndex()));
 
-                /* Getting Show Diffs state */
-                bool isShowDiffs = mStorageModel->data (index, StorageModel::R_AttIsShowDiffs).toBool();
-                mCbShowDiffs->setChecked (isShowDiffs);
-
                 /* Getting Attachment Medium */
                 KDeviceType device = mStorageModel->data (index, StorageModel::R_AttDevice).value <KDeviceType>();
@@ -2354 +2292 @@
                 {
                     case KDeviceType_HardDisk:
-                        mLbVdi->setText(tr("Hard &Disk:"));
-                        mTbOpen->setWhatsThis(tr("Open hard disk image file using file-open dialog."));
-                        mTbOpen->setToolTip(tr("Open hard disk image file"));
-                        mTbNew->setVisible(true);
+                        mLbMedium->setText(tr("Hard &Disk:"));
+                        mTbOpen->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap(PixmapPool::HDAttachmentNormal)));
+                        mTbOpen->setWhatsThis(tr("Choose or create a virtual hard disk file. The virtual machine will see "
+                                                 "the data in the file as the contents of the virtual hard disk."));
+                        mTbOpen->setToolTip(tr("Set up the virtual hard disk"));
                         break;
                     case KDeviceType_DVD:
-                        mLbVdi->setText(tr("&CD/DVD Device:"));
-                        mTbOpen->setWhatsThis(tr("Open CD/DVD image file using file-open dialog."));
-                        mTbOpen->setToolTip(tr("Open CD/DVD image file"));
-                        mTbNew->setVisible(false);
+                        mLbMedium->setText(tr("CD/DVD &Drive:"));
+                        mTbOpen->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap(PixmapPool::CDAttachmentNormal)));
+                        mTbOpen->setWhatsThis(tr("Choose a virtual CD/DVD disk or a physical drive to use with the virtual drive. "
+                                                 "The virtual machine will see a disk inserted into the drive with the data "
+                                                 "in the file or on the disk in the physical drive as its contents."));
+                        mTbOpen->setToolTip(tr("Set up the virtual CD/DVD drive"));
                         break;
                     case KDeviceType_Floppy:
-                        mLbVdi->setText(tr("&Floppy Device:"));
-                        mTbOpen->setWhatsThis(tr("Open floppy image file using file-open dialog."));
-                        mTbOpen->setToolTip(tr("Open floppy image file"));
-                        mTbNew->setVisible(false);
+                        mLbMedium->setText(tr("Floppy &Drive:"));
+                        mTbOpen->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap(PixmapPool::FDAttachmentNormal)));
+                        mTbOpen->setWhatsThis(tr("Choose a virtual floppy disk or a physical drive to use with the virtual drive. "
+                                                 "The virtual machine will see a disk inserted into the drive with the data "
+                                                 "in the file or on the disk in the physical drive as its contents."));
+                        mTbOpen->setToolTip(tr("Set up the virtual floppy drive"));
                         break;
                     default:
                         break;
                 }
-                mCbVdi->setType (typeToLocal (device));
-                mCbVdi->setShowDiffs (isShowDiffs);
-                mCbVdi->setCurrentItem (mStorageModel->data (index, StorageModel::R_AttMediumId).toString());
-                mCbVdi->refresh();
+                m_pMediumIdHolder->setType(typeToLocal(device));
+                m_pMediumIdHolder->setId(mStorageModel->data(index, StorageModel::R_AttMediumId).toString());
 
                 /* Getting Passthrough state */
                 bool isHostDrive = mStorageModel->data (index, StorageModel::R_AttIsHostDrive).toBool();
-                mCbPassthrough->setEnabled (isHostDrive);
+                mCbPassthrough->setVisible (device == KDeviceType_DVD && isHostDrive);
                 mCbPassthrough->setChecked (isHostDrive && mStorageModel->data (index, StorageModel::R_AttIsPassthrough).toBool());
 
@@ -2388 +2329 @@
 
                 /* Getting Other Information */
+                mLbHDFormatValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttFormat).toString()));
+                mLbCDFDTypeValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttFormat).toString()));
                 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()));
 
@@ -2443 +2385 @@
             }
             /* Setting Attachment Medium */
-            else if (sdr == mCbVdi)
-                mStorageModel->setData (index, mCbVdi->id(), StorageModel::R_AttMediumId);
-            else if (sdr == mCbShowDiffs)
-                mStorageModel->setData (index, mCbShowDiffs->isChecked(), StorageModel::R_AttIsShowDiffs);
+            else if (sdr == m_pMediumIdHolder)
+                mStorageModel->setData (index, m_pMediumIdHolder->id(), StorageModel::R_AttMediumId);
             else if (sdr == mCbPassthrough)
             {
@@ -2462 +2402 @@
 }
 
-void UIMachineSettingsStorage::sltOpenMedium()
-{
-    QString id = vboxGlobal().openMediumWithFileOpenDialog(mCbVdi->type(), this);
-    if (!id.isNull())
-        mCbVdi->setCurrentItem(id);
-}
-
-void UIMachineSettingsStorage::sltNewMedium()
-{
-    QString id = getWithNewHDWizard();
-    if (!id.isNull())
-        mCbVdi->setCurrentItem (id);
+void UIMachineSettingsStorage::sltPrepareOpenMediumMenu()
+{
+    /* This slot should be called only by open-medium menu: */
+    QMenu *pOpenMediumMenu = qobject_cast<QMenu*>(sender());
+    AssertMsg(pOpenMediumMenu, ("Can't access open-medium menu!\n"));
+    if (pOpenMediumMenu)
+    {
+        /* Eraze menu initially: */
+        pOpenMediumMenu->clear();
+        /* Depending on current medium type: */
+        switch (m_pMediumIdHolder->type())
+        {
+            case VBoxDefs::MediumType_HardDisk:
+            {
+                /* Add "Create a new virtual hard disk" action: */
+                QAction *pCreateNewHardDisk = pOpenMediumMenu->addAction(tr("Create a new hard disk..."));
+                pCreateNewHardDisk->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap(PixmapPool::HDNewEn),
+                                                                PixmapPool::pool()->pixmap(PixmapPool::HDNewDis)));
+                connect(pCreateNewHardDisk, SIGNAL(triggered(bool)), this, SLOT(sltCreateNewHardDisk()));
+                /* Add "Choose a virtual hard disk file" action: */
+                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose a virtual hard disk file..."));
+                break;
+            }
+            case VBoxDefs::MediumType_DVD:
+            {
+                /* Add "Choose a virtual CD/DVD disk file" action: */
+                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose a CD/DVD disk image..."));
+                /* Add "Choose a physical drive" actions: */
+                addChooseHostDriveActions(pOpenMediumMenu);
+                /* Add "Eject current medium" action: */
+                pOpenMediumMenu->addSeparator();
+                QAction *pEjectCurrentMedium = pOpenMediumMenu->addAction(tr("Remove disk from virtual drive"));
+                pEjectCurrentMedium->setEnabled(!m_pMediumIdHolder->isNull());
+                pEjectCurrentMedium->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap(PixmapPool::CDUnmountEnabled),
+                                                                 PixmapPool::pool()->pixmap(PixmapPool::CDUnmountDisabled)));
+                connect(pEjectCurrentMedium, SIGNAL(triggered(bool)), this, SLOT(sltUnmountDevice()));
+                break;
+            }
+            case VBoxDefs::MediumType_Floppy:
+            {
+                /* Add "Choose a virtual floppy disk file" action: */
+                addChooseExistingMediumAction(pOpenMediumMenu, tr("Choose a floppy disk image..."));
+                /* Add "Choose a physical drive" actions: */
+                addChooseHostDriveActions(pOpenMediumMenu);
+                /* Add "Eject current medium" action: */
+                pOpenMediumMenu->addSeparator();
+                QAction *pEjectCurrentMedium = pOpenMediumMenu->addAction(tr("Remove disk from virtual drive"));
+                pEjectCurrentMedium->setEnabled(!m_pMediumIdHolder->isNull());
+                pEjectCurrentMedium->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap(PixmapPool::FDUnmountEnabled),
+                                                                 PixmapPool::pool()->pixmap(PixmapPool::FDUnmountDisabled)));
+                connect(pEjectCurrentMedium, SIGNAL(triggered(bool)), this, SLOT(sltUnmountDevice()));
+                break;
+            }
+            default:
+                break;
+        }
+    }
+}
+
+void UIMachineSettingsStorage::sltCreateNewHardDisk()
+{
+    QString strMediumId = getWithNewHDWizard();
+    if (!strMediumId.isNull())
+        m_pMediumIdHolder->setId(strMediumId);
+}
+
+void UIMachineSettingsStorage::sltUnmountDevice()
+{
+    m_pMediumIdHolder->setId(VBoxMedium().id());
+}
+
+void UIMachineSettingsStorage::sltChooseExistingMedium()
+{
+    QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(m_pMediumIdHolder->type(), this);
+    if (!strMediumId.isNull())
+        m_pMediumIdHolder->setId(strMediumId);
+}
+
+void UIMachineSettingsStorage::sltChooseHostDrive()
+{
+    /* This slot should be called ONLY by choose-host-drive action: */
+    QAction *pChooseHostDriveAction = qobject_cast<QAction*>(sender());
+    AssertMsg(pChooseHostDriveAction, ("Can't access choose-host-drive action!\n"));
+    if (pChooseHostDriveAction)
+        m_pMediumIdHolder->setId(pChooseHostDriveAction->data().toString());
 }
 
@@ -2523 +2536 @@
             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().confirmRunNewHDWzdOrOFD (deviceType);
-                QString mediumId = askResult == QIMessageBox::Yes ? getWithNewHDWizard() :
-                                   askResult == QIMessageBox::No ? vboxGlobal().openMediumWithFileOpenDialog(typeToLocal (deviceType), this) : QString();
-                if (mediumId.isNull())
-                    mediumId = firstAvailableId;
-                mStorageModel->setData (index, mediumId, StorageModel::R_AttMediumId);
-            }
             break;
         }
@@ -2801 +2801 @@
 }
 
-void UIMachineSettingsStorage::addAttachmentWrapper (KDeviceType aDevice)
+void UIMachineSettingsStorage::addAttachmentWrapper(KDeviceType deviceType)
 {
     QModelIndex index = mTwStorageTree->currentIndex();
-    Assert (mStorageModel->data (index, StorageModel::R_IsController).toBool());
-    Assert (mStorageModel->data (index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
-
-    mStorageModel->addAttachment (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()), aDevice);
-    mStorageModel->sort();
-    emit storageChanged();
-    if (mValidator) mValidator->revalidate();
+    Assert(mStorageModel->data(index, StorageModel::R_IsController).toBool());
+    Assert(mStorageModel->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
+    QString strControllerName(mStorageModel->data(index, StorageModel::R_CtrName).toString());
+
+    QString strMediumId;
+    switch (deviceType)
+    {
+        case KDeviceType_HardDisk:
+        {
+            int iAnswer = vboxProblem().askAboutHardDiskAttachmentCreation(this, strControllerName);
+            if (iAnswer == QIMessageBox::Yes)
+                strMediumId = getWithNewHDWizard();
+            else if (iAnswer == QIMessageBox::No)
+                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(VBoxDefs::MediumType_HardDisk, this);
+            break;
+        }
+        case KDeviceType_DVD:
+        {
+            int iAnswer = vboxProblem().askAboutOpticalAttachmentCreation(this, strControllerName);
+            if (iAnswer == QIMessageBox::Yes)
+                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(VBoxDefs::MediumType_DVD, this);
+            else if (iAnswer == QIMessageBox::No)
+                strMediumId = vboxGlobal().findMedium(strMediumId).id();
+            break;
+        }
+        case KDeviceType_Floppy:
+        {
+            int iAnswer = vboxProblem().askAboutFloppyAttachmentCreation(this, strControllerName);
+            if (iAnswer == QIMessageBox::Yes)
+                strMediumId = vboxGlobal().openMediumWithFileOpenDialog(VBoxDefs::MediumType_Floppy, this);
+            else if (iAnswer == QIMessageBox::No)
+                strMediumId = vboxGlobal().findMedium(strMediumId).id();
+            break;
+        }
+    }
+
+    if (!strMediumId.isEmpty())
+    {
+        mStorageModel->addAttachment(QUuid(mStorageModel->data(index, StorageModel::R_ItemId).toString()), deviceType, strMediumId);
+        mStorageModel->sort();
+        emit storageChanged();
+        if (mValidator)
+            mValidator->revalidate();
+    }
 }
 
@@ -2829 +2866 @@
 void UIMachineSettingsStorage::updateAdditionalObjects (KDeviceType aType)
 {
-    mCbShowDiffs->setVisible (aType == KDeviceType_HardDisk);
-    mCbPassthrough->setVisible (aType == KDeviceType_DVD);
+    mLbHDFormat->setVisible (aType == KDeviceType_HardDisk);
+    mLbHDFormatValue->setVisible (aType == KDeviceType_HardDisk);
+
+    mLbCDFDType->setVisible (aType != KDeviceType_HardDisk);
+    mLbCDFDTypeValue->setVisible (aType != KDeviceType_HardDisk);
 
     mLbHDVirtualSize->setVisible (aType == KDeviceType_HardDisk);
@@ -2840 +2880 @@
     mLbSize->setVisible (aType != KDeviceType_HardDisk);
     mLbSizeValue->setVisible (aType != KDeviceType_HardDisk);
-
-    mLbHDFormat->setVisible (aType == KDeviceType_HardDisk);
-    mLbHDFormatValue->setVisible (aType == KDeviceType_HardDisk);
 }
 
@@ -2883 +2920 @@
 }
 
+void UIMachineSettingsStorage::addChooseExistingMediumAction(QMenu *pOpenMediumMenu, const QString &strActionName)
+{
+    QAction *pChooseExistingMedium = pOpenMediumMenu->addAction(strActionName);
+    pChooseExistingMedium->setIcon(UIIconPool::iconSet(PixmapPool::pool()->pixmap(PixmapPool::ChooseExistingEn),
+                                                       PixmapPool::pool()->pixmap(PixmapPool::ChooseExistingDis)));
+    connect(pChooseExistingMedium, SIGNAL(triggered(bool)), this, SLOT(sltChooseExistingMedium()));
+}
+
+void UIMachineSettingsStorage::addChooseHostDriveActions(QMenu *pOpenMediumMenu)
+{
+    const VBoxMediaList &mediums = vboxGlobal().currentMediaList();
+    VBoxMediaList::const_iterator it;
+    for (it = mediums.begin(); it != mediums.end(); ++it)
+    {
+        const VBoxMedium &medium = *it;
+        if (medium.isHostDrive() && m_pMediumIdHolder->type() == medium.type())
+        {
+            QAction *pHostDriveAction = pOpenMediumMenu->addAction(medium.name());
+            pHostDriveAction->setData(medium.id());
+            connect(pHostDriveAction, SIGNAL(triggered(bool)), this, SLOT(sltChooseHostDrive()));
+        }
+    }
+}
+
+#include "UIMachineSettingsStorage.moc"
+

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

@@ -39 +39 @@
 class AttachmentItem;
 class ControllerItem;
+class UIMediumIDHolder;
 
 /* Internal Types */
@@ -110 +111 @@
         FDAttachmentAddDis       = 36,
 
-        VMMEn                    = 37,
-        VMMDis                   = 38,
+        ChooseExistingEn         = 37,
+        ChooseExistingDis        = 38,
+        HDNewEn                  = 39,
+        HDNewDis                 = 40,
+        CDUnmountEnabled         = 41,
+        CDUnmountDisabled        = 42,
+        FDUnmountEnabled         = 43,
+        FDUnmountDisabled        = 44,
 
         MaxIndex
@@ -313 +320 @@
     SlotsList ctrUsedSlots() const;
     DeviceTypeList ctrDeviceTypeList() const;
-    QStringList ctrAllMediumIds (bool aShowDiffs) const;
-    QStringList ctrUsedMediumIds() const;
 
     void setAttachments(const QList<AbstractItem*> &attachments) { mAttachments = attachments; }
@@ -349 +354 @@
     DeviceTypeList attDeviceTypes() const;
     QString attMediumId() const;
-    QStringList attMediumIds (bool aFilter = true) const;
-    bool attIsShowDiffs() const;
     bool attIsHostDrive() const;
     bool attIsPassthrough() const;
@@ -357 +360 @@
     void setAttDevice (KDeviceType aAttDeviceType);
     void setAttMediumId (const QString &aAttMediumId);
-    void setAttIsShowDiffs (bool aAttIsShowDiffs);
     void setAttIsPassthrough (bool aPassthrough);
 
@@ -490 +492 @@
     void delController (const QUuid &aCtrId);
 
-    QModelIndex addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType);
+    QModelIndex addAttachment (const QUuid &aCtrId, KDeviceType aDeviceType, const QString &strMediumId);
     void delAttachment (const QUuid &aCtrId, const QUuid &aAttId);
 
@@ -630 +632 @@
     void setInformation();
 
-    void sltOpenMedium();
-    void sltNewMedium();
+    void sltPrepareOpenMediumMenu();
+    void sltCreateNewHardDisk();
+    void sltUnmountDevice();
+    void sltChooseExistingMedium();
+    void sltChooseHostDrive();
 
     void updateActionsState();
@@ -659 +664 @@
 
     uint32_t deviceCount (KDeviceType aType) const;
+
+    void addChooseExistingMediumAction(QMenu *pOpenMediumMenu, const QString &strActionName);
+    void addChooseHostDriveActions(QMenu *pOpenMediumMenu);
 
     QIWidgetValidator *mValidator;
@@ -677 +685 @@
     QAction *mAddFDAttAction;
 
+    UIMediumIDHolder *m_pMediumIdHolder;
+
     bool mIsLoadingInProgress;
     bool mIsPolished;

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

@@ -256 +256 @@
         </item>
         <item row="1" column="1" >
-         <widget class="QLabel" name="mLbSlot" >
-          <property name="text" >
-           <string>S&amp;lot:</string>
-          </property>
+         <widget class="QLabel" name="mLbMedium" >
           <property name="buddy" >
-           <cstring>mCbSlot</cstring>
+           <cstring>mTbOpen</cstring>
           </property>
           <property name="alignment" >
@@ -269 +266 @@
         </item>
         <item row="1" column="2" >
-         <widget class="QComboBox" name="mCbSlot" >
-          <property name="whatsThis" >
-           <string>Selects the slot on the storage controller used by this attachment. The available slots depend on the type of the controller and other attachments on it.</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="mLbVdi" >
-          <property name="buddy" >
-           <cstring>mCbVdi</cstring>
-          </property>
-          <property name="alignment" >
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
+         <layout class="QHBoxLayout" name="mLtContainer" >
+          <property name="leftMargin" >
+           <number>0</number>
+          </property>
+          <property name="topMargin" >
+           <number>0</number>
+           </property>
+          <property name="rightMargin" >
+           <number>0</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>0</number>
+          </property>
+          <property name="spacing" >
+           <number>1</number>
+          </property>
+          <item>
+           <widget class="QComboBox" name="mCbSlot" >
+            <property name="whatsThis" >
+             <string>Selects the slot on the storage controller used by this attachment. The available slots depend on the type of the controller and other attachments on it.</string>
+            </property>
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QIToolButton" name="mTbOpen" >
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="autoRaise" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </item>
         <item row="2" column="2" >
-         <widget class="QWidget" name="mWtContainer" >
-          <layout class="QHBoxLayout" name="mLtContainer" >
-           <property name="leftMargin" >
-            <number>0</number>
-           </property>
-           <property name="topMargin" >
-            <number>0</number>
-            </property>
-           <property name="rightMargin" >
-            <number>0</number>
-           </property>
-           <property name="bottomMargin" >
-            <number>0</number>
-           </property>
-           <property name="spacing" >
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="VBoxMediaComboBox" native="1" name="mCbVdi" >
-             <property name="whatsThis" >
-              <string>Selects the virtual disk image or the host drive used by this attachment.</string>
-             </property>
-             <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QIToolButton" name="mTbOpen" >
-             <property name="text" >
-              <string/>
-             </property>
-             <property name="autoRaise" >
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QIToolButton" name="mTbNew" >
-             <property name="whatsThis" >
-              <string>Create hard disk image file using New Hard Disk wizard.</string>
-             </property>
-             <property name="toolTip" >
-              <string>Create hard disk image file</string>
-             </property>
-             <property name="text" >
-              <string/>
-             </property>
-             <property name="autoRaise" >
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="3" column="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, shows the differencing hard disks that are attached to slots rather than their base hard disks (shown for indirect attachments) and allows explicit attaching of differencing hard disks. 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="4" column="2" >
          <widget class="QCheckBox" name="mCbPassthrough" >
           <property name="sizePolicy" >
@@ -383 +323 @@
          </widget>
         </item>
-        <item row="5" column="0" colspan="3" >
+        <item row="3" column="0" colspan="3" >
          <widget class="QILabelSeparator" native="1" name="mLsInformation" >
           <property name="text" >
            <string>Information</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" 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="4" column="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="5" column="1" >
+         <widget class="QLabel" name="mLbCDFDType" >
+          <property name="text" >
+           <string>Type:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="2" >
+         <widget class="QILabel" name="mLbCDFDTypeValue" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
          </widget>
@@ -471 +451 @@
         </item>
         <item row="10" column="1" >
-         <widget class="QLabel" name="mLbHDFormat" >
-          <property name="text" >
-           <string>Type (Format):</string>
+         <widget class="QLabel" name="mLbUsage" >
+          <property name="text" >
+           <string>Attached To:</string>
           </property>
           <property name="alignment" >
@@ -481 +461 @@
         </item>
         <item row="10" column="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="11" 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="11" column="2" >
          <widget class="QILabel" name="mLbUsageValue" >
           <property name="sizePolicy" >
@@ -510 +470 @@
          </widget>
         </item>
-        <item row="12" column="0" colspan="3" >
+        <item row="11" column="0" colspan="3" >
          <spacer name="mSp6" >
           <property name="orientation" >