Changeset 55545 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 30, 2015 11:26:20 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99911

Message:

FE/Qt: 7676: Disk Encryption (DE) support: UIMedium should cache the encryption status during the enumeration and reflect in own details report.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMedium.cpp (modified) (4 diffs)
• UIMedium.h (modified) (2 diffs)

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

@@ -104 +104 @@
     m_fUsedInSnapshots = other.isUsedInSnapshots();
     m_fHostDrive = other.isHostDrive();
+    m_fEncrypted = other.isEncrypted();
 
     return *this;
@@ -170 +171 @@
     m_fUsedInSnapshots = false;
     m_fHostDrive = false;
+    m_fEncrypted = false;
 
     /* For non NULL medium: */
@@ -241 +243 @@
                     m_strRootId = parentMedium.GetId();
                     parentMedium = parentMedium.GetParent();
+                }
+
+                /* Check whether this medium is encrypted: */
+                if (m_strRootId != m_strId)
+                    m_fEncrypted = root().isEncrypted();
+                else
+                {
+                    QString strCipher;
+                    CMedium medium(m_medium);
+                    medium.GetEncryptionSettings(strCipher);
+                    m_fEncrypted = medium.isOk();
                 }
             }
@@ -474 +487 @@
             strDetails = QString("%1, ").arg(rootMedium.m_strHardDiskType);
         }
+
+        /* Add encryption status: */
+        if (m_fEncrypted)
+            strDetails += QString("%1, ").arg(VBoxGlobal::tr("Encrypted", "medium"));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.h

@@ -264 +264 @@
     bool isHostDrive() const { return m_fHostDrive; }
 
+    /** Returns whether this medium is encrypted. */
+    bool isEncrypted() const { return m_fEncrypted; }
+
     /** Returns whether this medium is attached to any VM (in the current state or in a snapshot) in which case
       * #usage() will contain a string with comma-separated VM names (with snapshot names, if any, in parenthesis). */
@@ -357 +360 @@
     /** Holds whether this medium corresponds to real host drive. */
     bool m_fHostDrive                : 1;
+    /** Holds whether this medium is encrypted. */
+    bool m_fEncrypted                : 1;
 
     /** Holds the NULL medium ID. */