Changeset 91029 in vbox

Timestamp:

Aug 31, 2021 11:48:58 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Moving encryption password stuff related warning from UIMessageCenter to UINotificationCenter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• widgets/UIAddDiskEncryptionPasswordDialog.cpp (modified) (2 diffs)

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

@@ -567 +567 @@
              .arg(strKey, CMachine(machine).GetName(), strValue),
           UIErrorString::formatErrorInfo(machine));
-}
-
-void UIMessageCenter::warnAboutInvalidEncryptionPassword(const QString &strPasswordId, QWidget *pParent /* = 0 */)
-{
-    alert(pParent, MessageType_Error,
-          tr("Encryption password for <nobr>ID = '%1'</nobr> is invalid.")
-             .arg(strPasswordId));
 }
 

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

@@ -271 +271 @@
     void cannotSetExtraData(const CVirtualBox &vbox, const QString &strKey, const QString &strValue);
     void cannotSetExtraData(const CMachine &machine, const QString &strKey, const QString &strValue);
-    void warnAboutInvalidEncryptionPassword(const QString &strPasswordId, QWidget *pParent = 0);
     void cannotAcquireVirtualBoxParameter(const CVirtualBox &comVBox, QWidget *pParent = 0) const;
     void cannotAcquireSessionParameter(const CSession &comSession, QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -86 +86 @@
                                                    "This is currently not possible because the guest does not support "
                                                    "software shutdown."));
+}
+
+/* static */
+void UINotificationMessage::warnAboutInvalidEncryptionPassword(const QString &strPasswordId)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Invalid Password ..."),
+        QApplication::translate("UIMessageCenter", "Encryption password for <nobr>ID = '%1'</nobr> is invalid.")
+                                                   .arg(strPasswordId));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -69 +69 @@
     /** Notifies about inability to send ACPI shutdown. */
     static void cannotSendACPIToMachine();
+    /** Notifies about invalid encryption password.
+      * @param  strPasswordId  Brings password ID. */
+    static void warnAboutInvalidEncryptionPassword(const QString &strPasswordId);
 
     /** Reminds about keyboard auto capturing. */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp

@@ -35 +35 @@
 #include "UIIconPool.h"
 #include "UIMedium.h"
-#include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 
 /* Other VBox includes: */
@@ -509 +509 @@
         if (!isPasswordValid(uMediumId, strPassword))
         {
-            msgCenter().warnAboutInvalidEncryptionPassword(strPasswordId, this);
+            UINotificationMessage::warnAboutInvalidEncryptionPassword(strPasswordId);
             AssertPtrReturnVoid(m_pTableEncryptionData);
             m_pTableEncryptionData->setFocus();