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

Timestamp:

Mar 13, 2015 5:17:57 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Runtime UI: Disk Encryption (DE) support: Simplify description label to use QLabel instead of QILabel; Add Disk Encryption dialog title.

Location:

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

Files:

• UIAddDiskEncryptionPasswordDialog.cpp (modified) (5 diffs)
• UIAddDiskEncryptionPasswordDialog.h (modified) (3 diffs)
• UIMachineLogic.cpp (modified) (1 diff)

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

@@ -22 +22 @@
 /* Qt includes: */
 # include <QVBoxLayout>
+# include <QLabel>
 # include <QLineEdit>
 # include <QTableView>
@@ -30 +31 @@
 
 /* GUI includes: */
-# include "QILabel.h"
 # include "QIDialogButtonBox.h"
 # include "QIWithRetranslateUI.h"
@@ -374 +374 @@
 }
 
-UIAddDiskEncryptionPasswordDialog::UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const EncryptedMediumMap &encryptedMediums)
+UIAddDiskEncryptionPasswordDialog::UIAddDiskEncryptionPasswordDialog(QWidget *pParent,
+                                                                     const QString &strMachineName,
+                                                                     const EncryptedMediumMap &encryptedMediums)
     : QIWithRetranslateUI<QDialog>(pParent)
+    , m_strMachineName(strMachineName)
     , m_encryptedMediums(encryptedMediums)
     , m_pLabelDescription(0)
@@ -403 +406 @@
         {
             /* Create description label: */
-            m_pLabelDescription = new QILabel;
-            m_pLabelDescription->useSizeHintForWidth(450);
-            m_pLabelDescription->updateGeometry();
+            m_pLabelDescription = new QLabel;
             AssertPtrReturnVoid(m_pLabelDescription);
             {
-                /* Configure description label: */
-                m_pLabelDescription->setWordWrap(true);
                 /* Add label into layout: */
                 pInputLayout->addWidget(m_pLabelDescription);
@@ -439 +438 @@
 void UIAddDiskEncryptionPasswordDialog::retranslateUi()
 {
+    /* Translate the dialog title: */
+    setWindowTitle(tr("%1 - Disk Encryption").arg(m_strMachineName));
+
+    /* Translate the description label: */
     AssertPtrReturnVoid(m_pLabelDescription);
     m_pLabelDescription->setText(tr("This virtual machine is password protected. "

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

@@ -28 +28 @@
 /* Forward declarations: */
 class UIEncryptionDataTable;
-class QILabel;
+class QLabel;
 
 /* Type definitions: */
@@ -44 +44 @@
     /** Constructor.
       * @param pParent          being passed to the base-class,
+      * @param strMachineName   holds the name of the machine we show this dialog for,
       * @param encryptedMediums contains the lists of medium ids (values) encrypted with passwords with ids (keys). */
-    UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const EncryptedMediumMap &encryptedMediums);
+    UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const QString &strMachineName, const EncryptedMediumMap &encryptedMediums);
 
     /** Returns the shallow copy of the encryption password map
@@ -59 +60 @@
     void retranslateUi();
 
+    /** Holds the name of the machine we show this dialog for. */
+    const QString m_strMachineName;
+
     /** Holds the encrypted medium map reference. */
     const EncryptedMediumMap &m_encryptedMediums;
 
     /** Holds the description label instance. */
-    QILabel *m_pLabelDescription;
+    QLabel *m_pLabelDescription;
     /** Holds the encryption-data table instance. */
     UIEncryptionDataTable *m_pTableEncryptionData;

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

@@ -2437 +2437 @@
         /* Create corresponding dialog: */
         QPointer<UIAddDiskEncryptionPasswordDialog> pDlg =
-             new UIAddDiskEncryptionPasswordDialog(activeMachineWindow(), encryptedMediums);
+             new UIAddDiskEncryptionPasswordDialog(activeMachineWindow(),
+                                                   machineName(),
+                                                   encryptedMediums);
         /* Execute it and acquire the result: */
         if (pDlg->exec() == QDialog::Accepted)