Changeset 98654 in vbox

Timestamp:

Feb 20, 2023 3:00:22 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CConsole wrapper usage step-by-step; Encryption stuff this time.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -549 +549 @@
 {
     return uisession()->putEventMultiTouch(iCount, contacts, fIsTouchScreen, uScanTime);
+}
+
+bool UIMachine::addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend)
+{
+    return uisession()->addEncryptionPassword(strId, strPassword, fClearOnSuspend);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -411 +411 @@
     /** @} */
 
+    /** @name Storage stuff.
+     ** @{ */
+        /** Adds encryption password. */
+        bool addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend);
+    /** @} */
+
     /** @name USB stuff.
      ** @{ */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -273 +273 @@
 {
     return uisession()->machine();
-}
-
-CConsole& UIMachineLogic::console() const
-{
-    return uisession()->console();
 }
 
@@ -3016 +3011 @@
             /* Apply the disk encryption passwords: */
             foreach (const QString &strKey, encryptionPasswords.keys())
-            {
-                console().AddEncryptionPassword(strKey, encryptionPasswords.value(strKey), false);
-                if (!console().isOk())
-                    msgCenter().cannotAddDiskEncryptionPassword(console());
-            }
+                uimachine()->addEncryptionPassword(strKey,
+                                                   encryptionPasswords.value(strKey),
+                                                   false /* do NOT clear on suspend */);
         }
         else

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -55 +55 @@
 class UIVMInformationDialog;
 class CMachine;
-class CConsole;
 class CMouse;
 class CSnapshot;
@@ -111 +110 @@
     /** Returns the session's machine reference. */
     CMachine& machine() const;
-    /** Returns the session's console reference. */
-    CConsole& console() const;
 
     /** Returns the machine name. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -389 +389 @@
     if (!fSuccess)
         UINotificationMessage::cannotChangeMouseParameter(comMouse);
+    return fSuccess;
+}
+
+bool UISession::addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend)
+{
+    CConsole comConsole = console();
+    comConsole.AddEncryptionPassword(strId, strPassword, fClearOnSuspend);
+    const bool fSuccess = comConsole.isOk();
+    if (!fSuccess)
+        msgCenter().cannotAddDiskEncryptionPassword(comConsole);
     return fSuccess;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -276 +276 @@
     /** @} */
 
+    /** @name Storage stuff.
+     ** @{ */
+        /** Adds encryption password. */
+        bool addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend);
+    /** @} */
+
     /** @name USB stuff.
      ** @{ */