Changeset 94515 in vbox for trunk

Timestamp:

Apr 7, 2022 2:13:41 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Machine settings: General page and particularly Disk Encryption stuff cleanup; Also a bit for Audio page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• editors/UIDiskEncryptionSettingsEditor.cpp (modified) (7 diffs)
• editors/UIDiskEncryptionSettingsEditor.h (modified) (1 diff)
• editors/UIMachineAudioFeaturesEditor.cpp (modified) (1 diff)
• machine/UIMachineSettingsGeneral.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDiskEncryptionSettingsEditor.cpp

@@ -34 +34 @@
     , m_pCheckboxFeature(0)
     , m_pWidgetSettings(0)
-    , m_pLabelCipher(0)
-    , m_pComboCipher(0)
-    , m_pLabelEncryptionPassword(0)
-    , m_pEditorEncryptionPassword(0)
-    , m_pLabelEncryptionPasswordConfirm(0)
-    , m_pEditorEncryptionPasswordConfirm(0)
+    , m_pLabelCipherType(0)
+    , m_pComboCipherType(0)
+    , m_pLabelPassword1(0)
+    , m_pEditorPassword1(0)
+    , m_pLabelPassword2(0)
+    , m_pEditorPassword2(0)
 {
     prepare();
@@ -77 +77 @@
 UIDiskEncryptionCipherType UIDiskEncryptionSettingsEditor::cipherType() const
 {
-    return m_pComboCipher ? m_pComboCipher->currentData().value<UIDiskEncryptionCipherType>() : m_enmCipherType;
+    return m_pComboCipherType ? m_pComboCipherType->currentData().value<UIDiskEncryptionCipherType>() : m_enmCipherType;
 }
 
 QString UIDiskEncryptionSettingsEditor::password1() const
 {
-    return m_pEditorEncryptionPassword ? m_pEditorEncryptionPassword->text() : m_strPassword1;
+    return m_pEditorPassword1 ? m_pEditorPassword1->text() : m_strPassword1;
 }
 
 QString UIDiskEncryptionSettingsEditor::password2() const
 {
-    return m_pEditorEncryptionPasswordConfirm ? m_pEditorEncryptionPasswordConfirm->text() : m_strPassword2;
+    return m_pEditorPassword2 ? m_pEditorPassword2->text() : m_strPassword2;
 }
 
@@ -98 +98 @@
     }
 
-    if (m_pLabelCipher)
-        m_pLabelCipher->setText(tr("Disk Encryption C&ipher:"));
-    if (m_pComboCipher)
-    {
-        for (int iIndex = 0; iIndex < m_pComboCipher->count(); ++iIndex)
+    if (m_pLabelCipherType)
+        m_pLabelCipherType->setText(tr("Disk Encryption C&ipher:"));
+    if (m_pComboCipherType)
+    {
+        for (int iIndex = 0; iIndex < m_pComboCipherType->count(); ++iIndex)
         {
-            const UIDiskEncryptionCipherType enmType = m_pComboCipher->itemData(iIndex).value<UIDiskEncryptionCipherType>();
-            m_pComboCipher->setItemText(iIndex, gpConverter->toString(enmType));
+            const UIDiskEncryptionCipherType enmType = m_pComboCipherType->itemData(iIndex).value<UIDiskEncryptionCipherType>();
+            m_pComboCipherType->setItemText(iIndex, gpConverter->toString(enmType));
         }
-        m_pComboCipher->setToolTip(tr("Holds the cipher to be used for encrypting the virtual machine disks."));
-    }
-
-    if (m_pLabelEncryptionPassword)
-        m_pLabelEncryptionPassword->setText(tr("E&nter New Password:"));
-    if (m_pEditorEncryptionPassword)
-        m_pEditorEncryptionPassword->setToolTip(tr("Holds the encryption password for disks attached to this virtual machine."));
-    if (m_pLabelEncryptionPasswordConfirm)
-        m_pLabelEncryptionPasswordConfirm->setText(tr("C&onfirm New Password:"));
-    if (m_pEditorEncryptionPasswordConfirm)
-        m_pEditorEncryptionPasswordConfirm->setToolTip(tr("Confirms the disk encryption password."));
+        m_pComboCipherType->setToolTip(tr("Holds the cipher to be used for encrypting the virtual machine disks."));
+    }
+
+    if (m_pLabelPassword1)
+        m_pLabelPassword1->setText(tr("E&nter New Password:"));
+    if (m_pEditorPassword1)
+        m_pEditorPassword1->setToolTip(tr("Holds the encryption password for disks attached to this virtual machine."));
+    if (m_pLabelPassword2)
+        m_pLabelPassword2->setText(tr("C&onfirm New Password:"));
+    if (m_pEditorPassword2)
+        m_pEditorPassword2->setToolTip(tr("Confirms the disk encryption password."));
 
     /* Translate Cipher type combo: */
-    m_pComboCipher->setItemText(0, tr("Leave Unchanged", "cipher type"));
+    m_pComboCipherType->setItemText(0, tr("Leave Unchanged", "cipher type"));
 }
 
@@ -173 +173 @@
 
                 /* Prepare encryption cipher label: */
-                m_pLabelCipher = new QLabel(m_pWidgetSettings);
-                if (m_pLabelCipher)
-                {
-                    m_pLabelCipher->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    m_pLayoutSettings->addWidget(m_pLabelCipher, 0, 0);
+                m_pLabelCipherType = new QLabel(m_pWidgetSettings);
+                if (m_pLabelCipherType)
+                {
+                    m_pLabelCipherType->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    m_pLayoutSettings->addWidget(m_pLabelCipherType, 0, 0);
                 }
                 /* Prepare encryption cipher combo: */
-                m_pComboCipher = new QComboBox(m_pWidgetSettings);
-                if (m_pComboCipher)
-                {
-                    if (m_pLabelCipher)
-                        m_pLabelCipher->setBuddy(m_pComboCipher);
-                    m_pLayoutSettings->addWidget(m_pComboCipher, 0, 1);
+                m_pComboCipherType = new QComboBox(m_pWidgetSettings);
+                if (m_pComboCipherType)
+                {
+                    if (m_pLabelCipherType)
+                        m_pLabelCipherType->setBuddy(m_pComboCipherType);
+                    m_pLayoutSettings->addWidget(m_pComboCipherType, 0, 1);
                 }
 
                 /* Prepare encryption password label: */
-                m_pLabelEncryptionPassword = new QLabel(m_pWidgetSettings);
-                if (m_pLabelEncryptionPassword)
-                {
-                    m_pLabelEncryptionPassword->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    m_pLayoutSettings->addWidget(m_pLabelEncryptionPassword, 1, 0);
+                m_pLabelPassword1 = new QLabel(m_pWidgetSettings);
+                if (m_pLabelPassword1)
+                {
+                    m_pLabelPassword1->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    m_pLayoutSettings->addWidget(m_pLabelPassword1, 1, 0);
                 }
                 /* Prepare encryption password editor: */
-                m_pEditorEncryptionPassword = new QLineEdit(m_pWidgetSettings);
-                if (m_pEditorEncryptionPassword)
-                {
-                    if (m_pLabelEncryptionPassword)
-                        m_pLabelEncryptionPassword->setBuddy(m_pEditorEncryptionPassword);
-                    m_pEditorEncryptionPassword->setEchoMode(QLineEdit::Password);
-
-                    m_pLayoutSettings->addWidget(m_pEditorEncryptionPassword, 1, 1);
+                m_pEditorPassword1 = new QLineEdit(m_pWidgetSettings);
+                if (m_pEditorPassword1)
+                {
+                    if (m_pLabelPassword1)
+                        m_pLabelPassword1->setBuddy(m_pEditorPassword1);
+                    m_pEditorPassword1->setEchoMode(QLineEdit::Password);
+
+                    m_pLayoutSettings->addWidget(m_pEditorPassword1, 1, 1);
                 }
 
                 /* Prepare encryption confirm password label: */
-                m_pLabelEncryptionPasswordConfirm = new QLabel(m_pWidgetSettings);
-                if (m_pLabelEncryptionPasswordConfirm)
-                {
-                    m_pLabelEncryptionPasswordConfirm->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    m_pLayoutSettings->addWidget(m_pLabelEncryptionPasswordConfirm, 2, 0);
+                m_pLabelPassword2 = new QLabel(m_pWidgetSettings);
+                if (m_pLabelPassword2)
+                {
+                    m_pLabelPassword2->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    m_pLayoutSettings->addWidget(m_pLabelPassword2, 2, 0);
                 }
                 /* Prepare encryption confirm password editor: */
-                m_pEditorEncryptionPasswordConfirm = new QLineEdit(m_pWidgetSettings);
-                if (m_pEditorEncryptionPasswordConfirm)
-                {
-                    if (m_pLabelEncryptionPasswordConfirm)
-                        m_pLabelEncryptionPasswordConfirm->setBuddy(m_pEditorEncryptionPasswordConfirm);
-                    m_pEditorEncryptionPasswordConfirm->setEchoMode(QLineEdit::Password);
-
-                    m_pLayoutSettings->addWidget(m_pEditorEncryptionPasswordConfirm, 2, 1);
+                m_pEditorPassword2 = new QLineEdit(m_pWidgetSettings);
+                if (m_pEditorPassword2)
+                {
+                    if (m_pLabelPassword2)
+                        m_pLabelPassword2->setBuddy(m_pEditorPassword2);
+                    m_pEditorPassword2->setEchoMode(QLineEdit::Password);
+
+                    m_pLayoutSettings->addWidget(m_pEditorPassword2, 2, 1);
                 }
             }
@@ -239 +239 @@
         connect(m_pCheckboxFeature, &QCheckBox::toggled,
                 this, &UIDiskEncryptionSettingsEditor::sltHandleFeatureToggled);
-    if (m_pComboCipher)
-        connect(m_pComboCipher, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    if (m_pComboCipherType)
+        connect(m_pComboCipherType, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                 this, &UIDiskEncryptionSettingsEditor::sigCipherChanged);
-    if (m_pEditorEncryptionPassword)
-        connect(m_pEditorEncryptionPassword, &QLineEdit::textEdited,
+    if (m_pEditorPassword1)
+        connect(m_pEditorPassword1, &QLineEdit::textEdited,
                 this, &UIDiskEncryptionSettingsEditor::sigPasswordChanged);
-    if (m_pEditorEncryptionPasswordConfirm)
-        connect(m_pEditorEncryptionPasswordConfirm, &QLineEdit::textEdited,
+    if (m_pEditorPassword2)
+        connect(m_pEditorPassword2, &QLineEdit::textEdited,
                 this, &UIDiskEncryptionSettingsEditor::sigPasswordChanged);
 }
@@ -252 +252 @@
 void UIDiskEncryptionSettingsEditor::repopulateCombo()
 {
-    if (m_pComboCipher)
+    if (m_pComboCipherType)
     {
         /* Clear combo first of all: */
-        m_pComboCipher->clear();
+        m_pComboCipherType->clear();
 
         /// @todo get supported auth types (API not implemented), not hardcoded!
@@ -269 +269 @@
         /* Populate combo finally: */
         foreach (const UIDiskEncryptionCipherType &enmType, cipherTypes)
-            m_pComboCipher->addItem(gpConverter->toString(enmType), QVariant::fromValue(enmType));
+            m_pComboCipherType->addItem(gpConverter->toString(enmType), QVariant::fromValue(enmType));
 
         /* Look for proper index to choose: */
-        const int iIndex = m_pComboCipher->findData(QVariant::fromValue(m_enmCipherType));
+        const int iIndex = m_pComboCipherType->findData(QVariant::fromValue(m_enmCipherType));
         if (iIndex != -1)
-            m_pComboCipher->setCurrentIndex(iIndex);
-    }
-}
+            m_pComboCipherType->setCurrentIndex(iIndex);
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDiskEncryptionSettingsEditor.h

@@ -110 +110 @@
         QWidget   *m_pWidgetSettings;
         /** Holds the cipher type label instance. */
-        QLabel    *m_pLabelCipher;
+        QLabel    *m_pLabelCipherType;
         /** Holds the cipher type combo instance. */
-        QComboBox *m_pComboCipher;
-        /** Holds the enter password label instance. */
-        QLabel    *m_pLabelEncryptionPassword;
-        /** Holds the enter password editor instance. */
-        QLineEdit *m_pEditorEncryptionPassword;
-        /** Holds the confirm password label instance. */
-        QLabel    *m_pLabelEncryptionPasswordConfirm;
-        /** Holds the confirm password editor instance. */
-        QLineEdit *m_pEditorEncryptionPasswordConfirm;
+        QComboBox *m_pComboCipherType;
+        /** Holds the password 1 label instance. */
+        QLabel    *m_pLabelPassword1;
+        /** Holds the password 1 editor instance. */
+        QLineEdit *m_pEditorPassword1;
+        /** Holds the password 2 label instance. */
+        QLabel    *m_pLabelPassword2;
+        /** Holds the password 2 editor instance. */
+        QLineEdit *m_pEditorPassword2;
     /** @} */
 };

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.cpp

@@ -23 +23 @@
 /* GUI includes: */
 #include "UIMachineAudioFeaturesEditor.h"
-#ifdef VBOX_WS_X11
-# include "VBoxUtils-x11.h"
-#endif
 
 

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

@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDir>
-#include <QLabel>
-#include <QLineEdit>
-#include <QTextEdit>
+#include <QFileInfo>
 #include <QVBoxLayout>
 
 /* GUI includes: */
 #include "QITabWidget.h"
-#include "QIWidgetValidator.h"
 #include "UIAddDiskEncryptionPasswordDialog.h"
 #include "UICommon.h"