Changeset 94030 in vbox for trunk/src/VBox

Timestamp:

Mar 1, 2022 11:15:22 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: A bit of refactoring for UINameAndSystemEditor; Renaming members, fixing tool-tips and get rid of QIComboBox objects.

Location:

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

Files:

• UINameAndSystemEditor.cpp (modified) (21 diffs)
• UINameAndSystemEditor.h (modified) (3 diffs)

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

@@ -55 +55 @@
     , m_fSupportsHWVirtEx(false)
     , m_fSupportsLongMode(false)
-    , m_pMainLayout(0)
-    , m_pNameLabel(0)
-    , m_pPathLabel(0)
-    , m_pImageLabel(0)
-    , m_pEditionLabel(0)
+    , m_pLayout(0)
+    , m_pLabelName(0)
+    , m_pLabelPath(0)
+    , m_pLabelImage(0)
+    , m_pLabelEdition(0)
     , m_pLabelFamily(0)
     , m_pLabelType(0)
     , m_pIconType(0)
-    , m_pNameLineEdit(0)
-    , m_pPathSelector(0)
-    , m_pImageSelector(0)
-    , m_pEditionSelector(0)
+    , m_pEditorName(0)
+    , m_pSelectorPath(0)
+    , m_pSelectorImage(0)
+    , m_pComboEdition(0)
     , m_pComboFamily(0)
     , m_pComboType(0)
@@ -75 +75 @@
 void UINameAndSystemEditor::setMinimumLayoutIndent(int iIndent)
 {
-    if (m_pMainLayout)
-        m_pMainLayout->setColumnMinimumWidth(0, iIndent);
+    if (m_pLayout)
+        m_pLayout->setColumnMinimumWidth(0, iIndent);
 }
 
 void UINameAndSystemEditor::setNameStuffEnabled(bool fEnabled)
 {
-    if (m_pNameLabel)
-        m_pNameLabel->setEnabled(fEnabled);
-    if (m_pNameLineEdit)
-        m_pNameLineEdit->setEnabled(fEnabled);
+    if (m_pLabelName)
+        m_pLabelName->setEnabled(fEnabled);
+    if (m_pEditorName)
+        m_pEditorName->setEnabled(fEnabled);
 }
 
 void UINameAndSystemEditor::setPathStuffEnabled(bool fEnabled)
 {
-    if (m_pPathLabel)
-        m_pPathLabel->setEnabled(fEnabled);
-    if (m_pPathSelector)
-        m_pPathSelector->setEnabled(fEnabled);
+    if (m_pLabelPath)
+        m_pLabelPath->setEnabled(fEnabled);
+    if (m_pSelectorPath)
+        m_pSelectorPath->setEnabled(fEnabled);
 }
 
@@ -111 +111 @@
 void UINameAndSystemEditor::setName(const QString &strName)
 {
-    if (!m_pNameLineEdit)
+    if (!m_pEditorName)
         return;
-    m_pNameLineEdit->setText(strName);
+    m_pEditorName->setText(strName);
 }
 
 QString UINameAndSystemEditor::name() const
 {
-    if (!m_pNameLineEdit)
+    if (!m_pEditorName)
         return QString();
-    return m_pNameLineEdit->text();
+    return m_pEditorName->text();
 }
 
 void UINameAndSystemEditor::setPath(const QString &strPath)
 {
-    if (!m_pPathSelector)
+    if (!m_pSelectorPath)
         return;
-    m_pPathSelector->setPath(strPath);
+    m_pSelectorPath->setPath(strPath);
 }
 
 QString UINameAndSystemEditor::path() const
 {
-    if (!m_pPathSelector)
+    if (!m_pSelectorPath)
         return uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
-    return m_pPathSelector->path();
+    return m_pSelectorPath->path();
 }
 
 QString UINameAndSystemEditor::ISOImagePath() const
 {
-    if (!m_pImageSelector)
+    if (!m_pSelectorImage)
         return QString();
-    return m_pImageSelector->path();
+    return m_pSelectorImage->path();
 }
 
@@ -266 +266 @@
 void UINameAndSystemEditor::setNameFieldValidator(const QString &strValidator)
 {
-    if (!m_pNameLineEdit)
+    if (!m_pEditorName)
         return;
-    m_pNameLineEdit->setValidator(new QRegularExpressionValidator(QRegularExpression(strValidator), this));
+    m_pEditorName->setValidator(new QRegularExpressionValidator(QRegularExpression(strValidator), this));
 }
 
 void UINameAndSystemEditor::markNameEditor(bool fError)
 {
-    if (m_pNameLineEdit)
-        m_pNameLineEdit->mark(fError, tr("Invalid name"));
+    if (m_pEditorName)
+        m_pEditorName->mark(fError, tr("Invalid name"));
 }
 
 void UINameAndSystemEditor::markImageEditor(bool fError, const QString &strErrorMessage)
 {
-    if (m_pImageSelector)
-        m_pImageSelector->mark(fError, strErrorMessage);
+    if (m_pSelectorImage)
+        m_pSelectorImage->mark(fError, strErrorMessage);
 }
 
 void UINameAndSystemEditor::setEditionNameAndIndices(const QVector<QString> &names, const QVector<ulong> &ids)
 {
-    AssertReturnVoid(m_pEditionSelector && names.size() == ids.size());
-    m_pEditionSelector->clear();
+    AssertReturnVoid(m_pComboEdition && names.size() == ids.size());
+    m_pComboEdition->clear();
     for (int i = 0; i < names.size(); ++i)
-        m_pEditionSelector->addItem(names[i], QVariant::fromValue(ids[i]) /* user data */);
+        m_pComboEdition->addItem(names[i], QVariant::fromValue(ids[i]) /* user data */);
 }
 
 void UINameAndSystemEditor::setEditionSelectorEnabled(bool fEnabled)
 {
-    if (m_pEditionSelector)
-        m_pEditionSelector->setEnabled(fEnabled);
-    if (m_pEditionLabel)
-        m_pEditionLabel->setEnabled(fEnabled);
+    if (m_pComboEdition)
+        m_pComboEdition->setEnabled(fEnabled);
+    if (m_pLabelEdition)
+        m_pLabelEdition->setEnabled(fEnabled);
 }
 
 bool UINameAndSystemEditor::isEditionsSelectorEmpty() const
 {
-    if (m_pEditionSelector)
-        return m_pEditionSelector->count() == 0;
+    if (m_pComboEdition)
+        return m_pComboEdition->count() == 0;
     return true;
 }
@@ -309 +309 @@
 {
     int iWidth = 0;
-    if (m_pNameLabel)
-        iWidth = qMax(iWidth, m_pNameLabel->width());
-    if (m_pPathLabel)
-        iWidth = qMax(iWidth, m_pPathLabel->width());
-    if (m_pImageLabel)
-        iWidth = qMax(iWidth, m_pImageLabel->width());
-    if (m_pEditionLabel)
-        iWidth = qMax(iWidth, m_pEditionLabel->width());
+    if (m_pLabelName)
+        iWidth = qMax(iWidth, m_pLabelName->width());
+    if (m_pLabelPath)
+        iWidth = qMax(iWidth, m_pLabelPath->width());
+    if (m_pLabelImage)
+        iWidth = qMax(iWidth, m_pLabelImage->width());
+    if (m_pLabelEdition)
+        iWidth = qMax(iWidth, m_pLabelEdition->width());
     if (m_pLabelFamily)
         iWidth = qMax(iWidth, m_pLabelFamily->width());
@@ -326 +326 @@
 void UINameAndSystemEditor::retranslateUi()
 {
-    if (m_pNameLabel)
-        m_pNameLabel->setText(tr("&Name:"));
-    if (m_pPathLabel)
-        m_pPathLabel->setText(tr("&Folder:"));
-    if (m_pImageLabel)
-        m_pImageLabel->setText(tr("&ISO Image:"));
-    if (m_pEditionLabel)
-        m_pEditionLabel->setText(tr("&Edition:"));
+    if (m_pLabelName)
+        m_pLabelName->setText(tr("&Name:"));
+    if (m_pLabelPath)
+        m_pLabelPath->setText(tr("&Folder:"));
+    if (m_pLabelImage)
+        m_pLabelImage->setText(tr("&ISO Image:"));
+    if (m_pLabelEdition)
+        m_pLabelEdition->setText(tr("&Edition:"));
     if (m_pLabelFamily)
         m_pLabelFamily->setText(tr("&Type:"));
@@ -339 +339 @@
         m_pLabelType->setText(tr("&Version:"));
 
-    if (m_pPathSelector)
-        m_pPathSelector->setToolTip(tr("Selects the folder hosting the virtual machine."));
-    if (m_pNameLineEdit)
-        m_pNameLineEdit->setToolTip(tr("Holds the name for the new virtual machine."));
-
+    if (m_pEditorName)
+        m_pEditorName->setToolTip(tr("Holds the name for new virtual machine."));
+    if (m_pSelectorPath)
+        m_pSelectorPath->setToolTip(tr("Selects the folder hosting new virtual machine."));
     if (m_pComboFamily)
-    {
-        m_pComboFamily->setWhatsThis(tr("Select the operating system family that "
-                                        "you plan to install into this virtual machine."));
         m_pComboFamily->setToolTip(tr("Selects the operating system family that "
-                                        "you plan to install into this virtual machine."));
-    }
-
+                                      "you plan to install into this virtual machine."));
     if (m_pComboType)
-    {
-        m_pComboType->setWhatsThis(tr("Select the operating system type that "
-                                      "you plan to install into this virtual machine "
-                                      "(called a guest operating system)."));
         m_pComboType->setToolTip(tr("Selects the operating system type that "
-                                      "you plan to install into this virtual machine "
-                                      "(called a guest operating system)."));
-    }
-    if (m_pImageSelector)
-        m_pImageSelector->setToolTip(tr("Selects an ISO image to be attached to the new virtual machine or used in attended install."));
+                                    "you plan to install into this virtual machine "
+                                    "(called a guest operating system)."));
+    if (m_pSelectorImage)
+        m_pSelectorImage->setToolTip(tr("Selects an ISO image to be attached to the new "
+                                        "virtual machine or used in attended install."));
 }
 
@@ -473 +463 @@
 {
     /* Prepare main-layout: */
-    m_pMainLayout = new QGridLayout(this);
-    if (m_pMainLayout)
-    {
-        m_pMainLayout->setContentsMargins(0, 0, 0, 0);
-        m_pMainLayout->setColumnStretch(0, 0);
-        m_pMainLayout->setColumnStretch(1, 1);
+    m_pLayout = new QGridLayout(this);
+    if (m_pLayout)
+    {
+        m_pLayout->setContentsMargins(0, 0, 0, 0);
+        m_pLayout->setColumnStretch(0, 0);
+        m_pLayout->setColumnStretch(1, 1);
 
         int iRow = 0;
@@ -485 +475 @@
         {
             /* Prepare name label: */
-            m_pNameLabel = new QLabel(this);
-            if (m_pNameLabel)
-            {
-                m_pNameLabel->setAlignment(Qt::AlignRight);
-                m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-
-                m_pMainLayout->addWidget(m_pNameLabel, iRow, 0);
+            m_pLabelName = new QLabel(this);
+            if (m_pLabelName)
+            {
+                m_pLabelName->setAlignment(Qt::AlignRight);
+                m_pLabelName->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+                m_pLayout->addWidget(m_pLabelName, iRow, 0);
             }
             /* Prepare name editor: */
-            m_pNameLineEdit = new QILineEdit(this);
-            if (m_pNameLineEdit)
-            {
-                m_pNameLabel->setBuddy(m_pNameLineEdit);
-                m_pMainLayout->addWidget(m_pNameLineEdit, iRow, 1, 1, 2);
+            m_pEditorName = new QILineEdit(this);
+            if (m_pEditorName)
+            {
+                m_pLabelName->setBuddy(m_pEditorName);
+                m_pLayout->addWidget(m_pEditorName, iRow, 1, 1, 2);
             }
             ++iRow;
@@ -506 +496 @@
         {
             /* Prepare path label: */
-            m_pPathLabel = new QLabel(this);
-            if (m_pPathLabel)
-            {
-                m_pPathLabel->setAlignment(Qt::AlignRight);
-                m_pPathLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-
-                m_pMainLayout->addWidget(m_pPathLabel, iRow, 0);
+            m_pLabelPath = new QLabel(this);
+            if (m_pLabelPath)
+            {
+                m_pLabelPath->setAlignment(Qt::AlignRight);
+                m_pLabelPath->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+                m_pLayout->addWidget(m_pLabelPath, iRow, 0);
             }
             /* Prepare path selector: */
-            m_pPathSelector = new UIFilePathSelector(this);
-            if (m_pPathSelector)
-            {
-                m_pPathLabel->setBuddy(m_pPathSelector->focusProxy());
+            m_pSelectorPath = new UIFilePathSelector(this);
+            if (m_pSelectorPath)
+            {
+                m_pLabelPath->setBuddy(m_pSelectorPath->focusProxy());
                 QString strDefaultMachineFolder = uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
-                m_pPathSelector->setPath(strDefaultMachineFolder);
-                m_pPathSelector->setDefaultPath(strDefaultMachineFolder);
-
-                m_pMainLayout->addWidget(m_pPathSelector, iRow, 1, 1, 2);
+                m_pSelectorPath->setPath(strDefaultMachineFolder);
+                m_pSelectorPath->setDefaultPath(strDefaultMachineFolder);
+
+                m_pLayout->addWidget(m_pSelectorPath, iRow, 1, 1, 2);
             }
             ++iRow;
@@ -531 +521 @@
         {
             /* Prepare image label: */
-            m_pImageLabel = new QLabel(this);
-            if (m_pImageLabel)
-            {
-                m_pImageLabel->setAlignment(Qt::AlignRight);
-                m_pImageLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                m_pMainLayout->addWidget(m_pImageLabel, iRow, 0);
+            m_pLabelImage = new QLabel(this);
+            if (m_pLabelImage)
+            {
+                m_pLabelImage->setAlignment(Qt::AlignRight);
+                m_pLabelImage->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+                m_pLayout->addWidget(m_pLabelImage, iRow, 0);
             }
             /* Prepare image selector: */
-            m_pImageSelector = new UIFilePathSelector(this);
-            if (m_pImageSelector)
-            {
-                m_pImageLabel->setBuddy(m_pImageSelector->focusProxy());
-                m_pImageSelector->setResetEnabled(false);
-                m_pImageSelector->setMode(UIFilePathSelector::Mode_File_Open);
-                m_pImageSelector->setFileDialogFilters("ISO Images(*.iso *.ISO)");
-                m_pImageSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
-                m_pImageSelector->setRecentMediaListType(UIMediumDeviceType_DVD);
-                m_pMainLayout->addWidget(m_pImageSelector, iRow, 1, 1, 2);
+            m_pSelectorImage = new UIFilePathSelector(this);
+            if (m_pSelectorImage)
+            {
+                m_pLabelImage->setBuddy(m_pSelectorImage->focusProxy());
+                m_pSelectorImage->setResetEnabled(false);
+                m_pSelectorImage->setMode(UIFilePathSelector::Mode_File_Open);
+                m_pSelectorImage->setFileDialogFilters("ISO Images(*.iso *.ISO)");
+                m_pSelectorImage->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
+                m_pSelectorImage->setRecentMediaListType(UIMediumDeviceType_DVD);
+                m_pLayout->addWidget(m_pSelectorImage, iRow, 1, 1, 2);
             }
             ++iRow;
@@ -556 +546 @@
         {
             /* Prepare edition label: */
-            m_pEditionLabel = new QLabel(this);
-            if (m_pEditionLabel)
-            {
-                m_pEditionLabel->setAlignment(Qt::AlignRight);
-                m_pEditionLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-
-                m_pMainLayout->addWidget(m_pEditionLabel, iRow, 0);
-            }
-            /* Prepare image selector: */
-            m_pEditionSelector = new QIComboBox(this);
-            if (m_pEditionSelector)
-            {
-                m_pEditionLabel->setBuddy(m_pEditionSelector->focusProxy());
-                m_pMainLayout->addWidget(m_pEditionSelector, iRow, 1, 1, 2);
+            m_pLabelEdition = new QLabel(this);
+            if (m_pLabelEdition)
+            {
+                m_pLabelEdition->setAlignment(Qt::AlignRight);
+                m_pLabelEdition->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+                m_pLayout->addWidget(m_pLabelEdition, iRow, 0);
+            }
+            /* Prepare edition combo: */
+            m_pComboEdition = new QComboBox(this);
+            if (m_pComboEdition)
+            {
+                m_pLabelEdition->setBuddy(m_pComboEdition->focusProxy());
+                m_pLayout->addWidget(m_pComboEdition, iRow, 1, 1, 2);
             }
             ++iRow;
@@ -583 +573 @@
                 m_pLabelFamily->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-                m_pMainLayout->addWidget(m_pLabelFamily, iRow, 0);
+                m_pLayout->addWidget(m_pLabelFamily, iRow, 0);
             }
             /* Prepare VM OS family combo: */
@@ -590 +580 @@
             {
                 m_pLabelFamily->setBuddy(m_pComboFamily);
-                m_pMainLayout->addWidget(m_pComboFamily, iRow, 1);
+                m_pLayout->addWidget(m_pComboFamily, iRow, 1);
             }
 
@@ -603 +593 @@
                 m_pLabelType->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-                m_pMainLayout->addWidget(m_pLabelType, iRow, 0);
+                m_pLayout->addWidget(m_pLabelType, iRow, 0);
             }
             /* Prepare VM OS type combo: */
@@ -610 +600 @@
             {
                 m_pLabelType->setBuddy(m_pComboType);
-                m_pMainLayout->addWidget(m_pComboType, iRow, 1);
+                m_pLayout->addWidget(m_pComboType, iRow, 1);
             }
 
@@ -631 +621 @@
 
                 /* Add into layout: */
-                m_pMainLayout->addLayout(pLayoutIcon, iIconRow, 2, 2, 1);
+                m_pLayout->addLayout(pLayoutIcon, iIconRow, 2, 2, 1);
             }
 
@@ -640 +630 @@
     }
     /* Set top most widget of the 2nd column as focus proxy: */
-    for (int i = 0; i < m_pMainLayout->rowCount(); ++i)
-    {
-        QLayoutItem *pItem = m_pMainLayout->itemAtPosition(i, 1);
+    for (int i = 0; i < m_pLayout->rowCount(); ++i)
+    {
+        QLayoutItem *pItem = m_pLayout->itemAtPosition(i, 1);
         if (pItem && pItem->widget())
         {
@@ -688 +678 @@
 {
     /* Prepare connections: */
-    if (m_pNameLineEdit)
-        connect(m_pNameLineEdit, &QILineEdit::textChanged,
+    if (m_pEditorName)
+        connect(m_pEditorName, &QILineEdit::textChanged,
                 this, &UINameAndSystemEditor::sigNameChanged);
-    if (m_pPathSelector)
-        connect(m_pPathSelector, &UIFilePathSelector::pathChanged,
+    if (m_pSelectorPath)
+        connect(m_pSelectorPath, &UIFilePathSelector::pathChanged,
                 this, &UINameAndSystemEditor::sigPathChanged);
     if (m_pComboFamily)
@@ -700 +690 @@
         connect(m_pComboType, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                 this, &UINameAndSystemEditor::sltTypeChanged);
-    if (m_pImageSelector)
-        connect(m_pImageSelector, &UIFilePathSelector::pathChanged,
+    if (m_pSelectorImage)
+        connect(m_pSelectorImage, &UIFilePathSelector::pathChanged,
                 this, &UINameAndSystemEditor::sigImageChanged);
-    if (m_pEditionSelector)
-        connect(m_pEditionSelector, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+    if (m_pComboEdition)
+        connect(m_pComboEdition, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                 this, &UINameAndSystemEditor::sltSelectedEditionsChanged);
 }
@@ -710 +700 @@
 ulong UINameAndSystemEditor::selectedEditionIndex() const
 {
-    if (!m_pEditionSelector || m_pEditionSelector->count() == 0)
+    if (!m_pComboEdition || m_pComboEdition->count() == 0)
         return 0;
-    return m_pEditionSelector->currentData().value<ulong>();
-}
+    return m_pComboEdition->currentData().value<ulong>();
+}

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

@@ -37 +37 @@
 class QGridLayout;
 class QLabel;
-class QIComboBox;
 class QILineEdit;
 class QString;
@@ -204 +203 @@
 
     /** Holds the main layout instance. */
-    QGridLayout *m_pMainLayout;
+    QGridLayout *m_pLayout;
 
     /** Holds the VM name label instance. */
-    QLabel *m_pNameLabel;
+    QLabel *m_pLabelName;
     /** Holds the VM path label instance. */
-    QLabel *m_pPathLabel;
+    QLabel *m_pLabelPath;
     /** Holds the ISO image label instance. */
-    QLabel *m_pImageLabel;
+    QLabel *m_pLabelImage;
     /** Holds the edition label instance. */
-    QLabel *m_pEditionLabel;
+    QLabel *m_pLabelEdition;
     /** Holds the VM OS family label instance. */
     QLabel *m_pLabelFamily;
@@ -222 +221 @@
 
     /** Holds the VM name editor instance. */
-    QILineEdit         *m_pNameLineEdit;
+    QILineEdit         *m_pEditorName;
     /** Holds the VM path editor instance. */
-    UIFilePathSelector *m_pPathSelector;
+    UIFilePathSelector *m_pSelectorPath;
     /** Holds the file selector for ISO image (either for unattended install or to be attached to vm). */
-    UIFilePathSelector *m_pImageSelector;
-    /** Combobox to select an image out of selected ISO image (currently only Windows ISO have this). */
-    QIComboBox *m_pEditionSelector;
+    UIFilePathSelector *m_pSelectorImage;
+    /** Holds the VM OS edition combo (currently only Windows ISO have this). */
+    QComboBox          *m_pComboEdition;
     /** Holds the VM OS family combo instance. */
     QComboBox          *m_pComboFamily;