Changeset 23225 in vbox

Timestamp:

Sep 22, 2009 4:02:40 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: merged New Storage UI: 'Show Diffs' support.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMSettingsHD.h (modified) (5 diffs)
• src/VBoxMediaManagerDlg.cpp (modified) (1 diff)
• src/VBoxVMSettingsHD.cpp (modified) (14 diffs)

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

@@ -320 +320 @@
     QString attMediumId() const;
     QStringList attMediumIds (bool aFilter = true) const;
+    bool attIsShowDiffs() const;
     bool attIsHostDrive() const;
     bool attIsPassthrough() const;
@@ -326 +327 @@
     void setAttDevice (KDeviceType aAttDeviceType);
     void setAttMediumId (const QString &aAttMediumId);
+    void setAttIsShowDiffs (bool aAttIsShowDiffs);
     void setAttIsPassthrough (bool aPassthrough);
 
@@ -336 +338 @@
 private:
 
-    void cache (const VBoxMedium &aMedium);
+    void cache();
 
     void addChild (AbstractItem *aItem);
@@ -345 +347 @@
     StorageSlot mAttSlot;
     QString mAttMediumId;
+    bool mAttIsShowDiffs;
     bool mAttIsHostDrive;
     bool mAttIsPassthrough;
@@ -391 +394 @@
         R_AttDevices,
         R_AttMediumId,
+        R_AttIsShowDiffs,
         R_AttIsHostDrive,
         R_AttIsPassthrough,

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

@@ -775 +775 @@
 
             item->setMedium (aMedium);
+
+            /* Check if swapped diff disk is required one */
+            if (item->id() == mHDSelectedId)
+            {
+                setCurrentItem (mHardDiskView, item);
+                mHDSelectedId = QString::null;
+            }
+
             updateTabIcons (item, ItemAction_Updated);
             return;

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

@@ -556 +556 @@
     : AbstractItem (aParent)
     , mAttDeviceType (aDeviceType)
+    , mAttIsShowDiffs (false)
     , mAttIsHostDrive (false)
     , mAttIsPassthrough (false)
@@ -701 +702 @@
 }
 
+bool AttachmentItem::attIsShowDiffs() const
+{
+    return mAttIsShowDiffs;
+}
+
 bool AttachmentItem::attIsHostDrive() const
 {
@@ -732 +738 @@
         medium = vboxGlobal().findMedium (aAttMediumId);
 
-    cache (medium);
+    mAttMediumId = medium.id();
+    cache();
+}
+
+void AttachmentItem::setAttIsShowDiffs (bool aAttIsShowDiffs)
+{
+    mAttIsShowDiffs = aAttIsShowDiffs;
+    cache();
 }
 
@@ -765 +778 @@
 }
 
-void AttachmentItem::cache (const VBoxMedium &aMedium)
-{
-    mAttMediumId = aMedium.id();
+void AttachmentItem::cache()
+{
+    VBoxMedium medium = vboxGlobal().findMedium (mAttMediumId);
 
     /* Cache medium information */
-    mAttName = aMedium.name (true);
-    mAttTip = aMedium.toolTipCheckRO (true);
-    mAttPixmap = aMedium.iconCheckRO (true);
-    mAttIsHostDrive = aMedium.isHostDrive();
+    mAttName = medium.name (!mAttIsShowDiffs);
+    mAttTip = medium.toolTipCheckRO (!mAttIsShowDiffs);
+    mAttPixmap = medium.iconCheckRO (!mAttIsShowDiffs);
+    mAttIsHostDrive = medium.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();
+    mAttSize = medium.size (!mAttIsShowDiffs);
+    mAttLogicalSize = medium.logicalSize (!mAttIsShowDiffs);
+    mAttLocation = medium.location (!mAttIsShowDiffs);
+    mAttFormat = QString ("%1 (%2)").arg (medium.hardDiskType (!mAttIsShowDiffs))
+                                    .arg (medium.hardDiskFormat (!mAttIsShowDiffs));
+    mAttUsage = medium.usage (!mAttIsShowDiffs);
 
     /* Fill empty attributes */
@@ -1029 +1043 @@
             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:
         {
@@ -1219 +1240 @@
                 {
                     static_cast <AttachmentItem*> (item)->setAttMediumId (aValue.toString());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            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;
@@ -1520 +1552 @@
     connect (mCbVdi, SIGNAL (activated (int)), this, SLOT (setInformation()));
     connect (mTbVmm, SIGNAL (clicked (bool)), this, SLOT (onVmmInvoked()));
+    connect (mCbShowDiffs, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
     connect (mCbPassthrough, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
 
@@ -1536 +1569 @@
 {
     mMachine = aMachine;
+
+    /* Set the machine id for the media-combo */
+    mCbVdi->setMachineId (mMachine.GetId());
 
     /* Load currently present controllers & attachments */
@@ -1789 +1825 @@
                 mCbDevice->setCurrentIndex (attDevicePos == -1 ? 0 : attDevicePos);
 
+                /* Getting Show Diffs state */
+                bool isShowDiffs = mStorageModel->data (index, StorageModel::R_AttIsShowDiffs).toBool();
+                mCbShowDiffs->setChecked (isShowDiffs);
+
                 /* Getting Attachment Medium */
                 mCbVdi->setType (typeToLocal (device));
+                mCbVdi->setShowDiffs (isShowDiffs);
                 mCbVdi->setCurrentItem (mStorageModel->data (index, StorageModel::R_AttMediumId).toString());
                 mCbVdi->refresh();
@@ -1837 +1878 @@
             /* Setting Controller Sub-Type */
             else if (sdr == mCbType)
-            {
-                KStorageControllerType type = vboxGlobal().toControllerType (mCbType->currentText());
-                mStorageModel->setData (index, QVariant::fromValue (type), StorageModel::R_CtrType);
-            }
+                mStorageModel->setData (index, QVariant::fromValue (vboxGlobal().toControllerType (mCbType->currentText())),
+                                        StorageModel::R_CtrType);
             break;
         }
@@ -1847 +1886 @@
             /* Setting Attachment Slot */
             if (sdr == mCbSlot)
-            {
-                StorageSlot slt = vboxGlobal().toStorageSlot (mCbSlot->currentText());
-                mStorageModel->setData (index, QVariant::fromValue (slt), StorageModel::R_AttSlot);
-            }
+                mStorageModel->setData (index, QVariant::fromValue (vboxGlobal().toStorageSlot (mCbSlot->currentText())),
+                                        StorageModel::R_AttSlot);
             /* Setting Attachment Device-Type */
             else if (sdr == mCbDevice)
@@ -1857 +1894 @@
                 mStorageModel->setData (index, QVariant::fromValue (device), StorageModel::R_AttDevice);
                 mCbVdi->setType (typeToLocal (device));
+                mCbVdi->setShowDiffs (mCbShowDiffs->isChecked());
                 mCbVdi->refresh();
             }
@@ -1862 +1900 @@
             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 == mCbPassthrough)
             {
@@ -2078 +2118 @@
                false /* do refresh? */,
                mMachine,
-               QString(),
-               false);
+               mCbVdi->id(),
+               mCbShowDiffs->isChecked());
 
     return dlg.exec() == QDialog::Accepted ? dlg.selectedId() : QString();