Changeset 55564 in vbox

Timestamp:

Apr 30, 2015 3:37:42 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Disk Encryption (DE) support: Reflect the Encryption Password ID information in VM Settings / Storage page and in Medium Manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMediumManager.cpp (modified) (5 diffs)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (7 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (3 diffs)
• settings/machine/UIMachineSettingsStorage.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -140 +140 @@
     /** Returns QString <i>storage details</i> of the wrapped UIMedium. */
     QString details() const { return m_medium.storageDetails(); }
+    /** Returns QString <i>encryption password ID</i> of the wrapped UIMedium. */
+    QString encryptionPasswordID() const { return m_medium.encryptionPasswordID(); }
 
     /** Returns QString <i>tool-tip</i> of the wrapped UIMedium. */
@@ -1205 +1207 @@
             prepareTreeWidget(type, type == UIMediumType_HardDisk ? 3 : 2);
             /* Prepare information-container: */
-            prepareInformationContainer(type, type == UIMediumType_HardDisk ? 6 : 3);
+            prepareInformationContainer(type, type == UIMediumType_HardDisk ? 7 : 3);
         }
     }
@@ -1610 +1612 @@
     {
         /* Acquire required details: */
-        QString strDetails = pCurrentItem->details();
-        QString strUsage = pCurrentItem->usage().isNull() ?
-                           formatFieldText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Attached</i>"), false) :
-                           formatFieldText(pCurrentItem->usage());
+        const QString strDetails = pCurrentItem->details();
+        const QString strUsage = pCurrentItem->usage().isNull() ?
+                                 formatFieldText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Attached</i>"), false) :
+                                 formatFieldText(pCurrentItem->usage());
+        const QString strEncryptionPasswordID = pCurrentItem->encryptionPasswordID().isNull() ?
+                                                formatFieldText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Encrypted</i>"), false) :
+                                                formatFieldText(pCurrentItem->encryptionPasswordID());
         const QString strID = pCurrentItem->id();
         if (infoField(UIMediumType_HardDisk, 0))
@@ -1626 +1631 @@
             infoField(UIMediumType_HardDisk, 4)->setText(strUsage);
         if (infoField(UIMediumType_HardDisk, 5))
-            infoField(UIMediumType_HardDisk, 5)->setText(strID);
+            infoField(UIMediumType_HardDisk, 5)->setText(strEncryptionPasswordID);
+        if (infoField(UIMediumType_HardDisk, 6))
+            infoField(UIMediumType_HardDisk, 6)->setText(strID);
     }
 
@@ -1803 +1810 @@
         infoLabel(UIMediumType_HardDisk, 4)->setText(QApplication::translate("VBoxMediaManagerDlg", "Attached to:"));
     if (infoLabel(UIMediumType_HardDisk, 5))
-        infoLabel(UIMediumType_HardDisk, 5)->setText(QApplication::translate("VBoxMediaManagerDlg", "UUID:"));
+        infoLabel(UIMediumType_HardDisk, 5)->setText(QApplication::translate("VBoxMediaManagerDlg", "Encrypted with key:"));
+    if (infoLabel(UIMediumType_HardDisk, 6))
+        infoLabel(UIMediumType_HardDisk, 6)->setText(QApplication::translate("VBoxMediaManagerDlg", "UUID:"));
 
     /* Translate CD tree-widget: */

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

@@ -866 +866 @@
 }
 
+QString AttachmentItem::attEncryptionPasswordID() const
+{
+    return m_strAttEncryptionPasswordID;
+}
+
 void AttachmentItem::cache()
 {
@@ -880 +885 @@
     mAttLogicalSize = medium.logicalSize (true);
     mAttLocation = medium.location (true);
+    m_strAttEncryptionPasswordID = QString("--");
     if (medium.isNull())
     {
@@ -892 +898 @@
                 mAttFormat = QString("%1 (%2)").arg(medium.hardDiskType(true)).arg(medium.hardDiskFormat(true));
                 mAttDetails = medium.storageDetails();
+                const QString strAttEncryptionPasswordID = medium.encryptionPasswordID();
+                if (!strAttEncryptionPasswordID.isNull())
+                    m_strAttEncryptionPasswordID = strAttEncryptionPasswordID;
                 break;
             }
@@ -1375 +1384 @@
                 if (item->rtti() == AbstractItem::Type_AttachmentItem)
                     return static_cast <AttachmentItem*> (item)->attUsage();
+            return QString();
+        }
+        case R_AttEncryptionPasswordID:
+        {
+            if (AbstractItem *pItem = static_cast<AbstractItem*>(aIndex.internalPointer()))
+                if (pItem->rtti() == AbstractItem::Type_AttachmentItem)
+                    return static_cast<AttachmentItem*>(pItem)->attEncryptionPasswordID();
             return QString();
         }
@@ -2022 +2038 @@
     mLbLocationValue->setFullSizeSelection (true);
     mLbUsageValue->setFullSizeSelection (true);
+    m_pLabelEncryptionValue->setFullSizeSelection(true);
 
     /* Setup connections: */
@@ -2781 +2798 @@
                 mLbLocationValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttLocation).toString()));
                 mLbUsageValue->setText (compressText (mStorageModel->data (index, StorageModel::R_AttUsage).toString()));
+                m_pLabelEncryptionValue->setText(compressText(mStorageModel->data(index, StorageModel::R_AttEncryptionPasswordID).toString()));
 
                 /* Showing Attachment Page */
@@ -3965 +3983 @@
     mLbUsage->setEnabled(isMachineInValidMode());
     mLbUsageValue->setEnabled(isMachineInValidMode());
+    m_pLabelEncryption->setEnabled(isMachineInValidMode());
+    m_pLabelEncryptionValue->setEnabled(isMachineInValidMode());
 
     /* Update action states: */

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

@@ -374 +374 @@
     QString attDetails() const;
     QString attUsage() const;
+    QString attEncryptionPasswordID() const;
 
 private:
@@ -411 +412 @@
     QString mAttDetails;
     QString mAttUsage;
+    QString m_strAttEncryptionPasswordID;
 };
 
@@ -465 +467 @@
         R_AttDetails,
         R_AttUsage,
+        R_AttEncryptionPasswordID,
 
         R_Margin,

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

@@ -571 +571 @@
          </widget>
         </item>
-        <item row="12" column="0" colspan="3" >
+        <item row="12" column="1">
+         <widget class="QLabel" name="m_pLabelEncryption">
+          <property name="text">
+           <string>Encrypted with key:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="12" column="2">
+         <widget class="QILabel" name="m_pLabelEncryptionValue">
+          <property name="sizePolicy">
+           <sizepolicy vsizetype="Preferred" hsizetype="Ignored">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="13" column="0" colspan="3" >
          <spacer name="mSp6" >
           <property name="orientation" >