Changeset 95222 in vbox for trunk/src

Timestamp:

Jun 8, 2022 10:16:27 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151741

Message:

FE/Qt/Ds: bugref:6899: Machine settings: System page accessibility improvements (part 9); Moving extended acceleration features stuff into separate UIAccelerationFeaturesEditor widget.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/editors/UIAccelerationFeaturesEditor.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProcessorFeaturesEditor.cpp ) (4 diffs)
• src/settings/editors/UIAccelerationFeaturesEditor.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIProcessorFeaturesEditor.h ) (6 diffs)
• src/settings/machine/UIMachineSettingsSystem.cpp (modified) (14 diffs)
• src/settings/machine/UIMachineSettingsSystem.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -893 +893 @@
         src/settings/UISettingsSelector.h \
         src/settings/UISettingsSerializer.h \
+        src/settings/editors/UIAccelerationFeaturesEditor.h \
         src/settings/editors/UIAudioControllerEditor.h \
         src/settings/editors/UIAudioFeaturesEditor.h \
@@ -1469 +1470 @@
         src/settings/UISettingsSelector.cpp \
         src/settings/UISettingsSerializer.cpp \
+        src/settings/editors/UIAccelerationFeaturesEditor.cpp \
         src/settings/editors/UIAudioControllerEditor.cpp \
         src/settings/editors/UIAudioFeaturesEditor.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIProcessorFeaturesEditor class implementation.
+ * VBox Qt GUI - UIAccelerationFeaturesEditor class implementation.
  */
 
@@ -20 +20 @@
 #include <QGridLayout>
 #include <QLabel>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-#include "UIProcessorFeaturesEditor.h"
+#include "UIAccelerationFeaturesEditor.h"
 
 
-UIProcessorFeaturesEditor::UIProcessorFeaturesEditor(QWidget *pParent /* = 0 */)
+UIAccelerationFeaturesEditor::UIAccelerationFeaturesEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fEnablePae(false)
-    , m_fEnableNestedVirtualization(false)
+    , m_fEnableVirtualization(false)
+    , m_fEnableNestedPaging(false)
     , m_pLabel(0)
-    , m_pCheckBoxEnablePae(0)
-    , m_pCheckBoxEnableNestedVirtualization(0)
+    , m_pCheckBoxEnableVirtualization(0)
+    , m_pCheckBoxEnableNestedPaging(0)
 {
     prepare();
 }
 
-void UIProcessorFeaturesEditor::setEnablePae(bool fOn)
+void UIAccelerationFeaturesEditor::setEnableVirtualization(bool fOn)
 {
     /* Update cached value and
      * check-box if value has changed: */
-    if (m_fEnablePae != fOn)
+    if (m_fEnableVirtualization != fOn)
     {
-        m_fEnablePae = fOn;
-        if (m_pCheckBoxEnablePae)
-            m_pCheckBoxEnablePae->setCheckState(m_fEnablePae ? Qt::Checked : Qt::Unchecked);
+        m_fEnableVirtualization = fOn;
+        if (m_pCheckBoxEnableVirtualization)
+            m_pCheckBoxEnableVirtualization->setCheckState(m_fEnableVirtualization ? Qt::Checked : Qt::Unchecked);
     }
 }
 
-bool UIProcessorFeaturesEditor::isEnabledPae() const
+bool UIAccelerationFeaturesEditor::isEnabledVirtualization() const
 {
-    return   m_pCheckBoxEnablePae
-           ? m_pCheckBoxEnablePae->checkState() == Qt::Checked
-           : m_fEnablePae;
+    return   m_pCheckBoxEnableVirtualization
+           ? m_pCheckBoxEnableVirtualization->checkState() == Qt::Checked
+           : m_fEnableVirtualization;
 }
 
-void UIProcessorFeaturesEditor::setEnablePaeAvailable(bool fAvailable)
+void UIAccelerationFeaturesEditor::setEnableVirtualizationAvailable(bool fAvailable)
 {
-    m_pCheckBoxEnablePae->setEnabled(fAvailable);
+    m_pCheckBoxEnableVirtualization->setEnabled(fAvailable);
 }
 
-void UIProcessorFeaturesEditor::setEnableNestedVirtualization(bool fOn)
+void UIAccelerationFeaturesEditor::setEnableNestedPaging(bool fOn)
 {
     /* Update cached value and
      * check-box if value has changed: */
-    if (m_fEnableNestedVirtualization != fOn)
+    if (m_fEnableNestedPaging != fOn)
     {
-        m_fEnableNestedVirtualization = fOn;
-        if (m_pCheckBoxEnableNestedVirtualization)
-            m_pCheckBoxEnableNestedVirtualization->setCheckState(m_fEnableNestedVirtualization ? Qt::Checked : Qt::Unchecked);
+        m_fEnableNestedPaging = fOn;
+        if (m_pCheckBoxEnableNestedPaging)
+            m_pCheckBoxEnableNestedPaging->setCheckState(m_fEnableNestedPaging ? Qt::Checked : Qt::Unchecked);
     }
 }
 
-bool UIProcessorFeaturesEditor::isEnabledNestedVirtualization() const
+bool UIAccelerationFeaturesEditor::isEnabledNestedPaging() const
 {
-    return   m_pCheckBoxEnableNestedVirtualization
-           ? m_pCheckBoxEnableNestedVirtualization->checkState() == Qt::Checked
-           : m_fEnableNestedVirtualization;
+    return   m_pCheckBoxEnableNestedPaging
+           ? m_pCheckBoxEnableNestedPaging->checkState() == Qt::Checked
+           : m_fEnableNestedPaging;
 }
 
-void UIProcessorFeaturesEditor::setEnableNestedVirtualizationAvailable(bool fAvailable)
+void UIAccelerationFeaturesEditor::setEnableNestedPagingAvailable(bool fAvailable)
 {
-    m_pCheckBoxEnableNestedVirtualization->setEnabled(fAvailable);
+    m_pCheckBoxEnableNestedPaging->setEnabled(fAvailable);
 }
 
-int UIProcessorFeaturesEditor::minimumLabelHorizontalHint() const
+int UIAccelerationFeaturesEditor::minimumLabelHorizontalHint() const
 {
     return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
-void UIProcessorFeaturesEditor::setMinimumLayoutIndent(int iIndent)
+void UIAccelerationFeaturesEditor::setMinimumLayoutIndent(int iIndent)
 {
     if (m_pLayout)
@@ -95 +96 @@
 }
 
-void UIProcessorFeaturesEditor::retranslateUi()
+void UIAccelerationFeaturesEditor::retranslateUi()
 {
     if (m_pLabel)
-        m_pLabel->setText(tr("Extended Features:"));
-    if (m_pCheckBoxEnablePae)
+        m_pLabel->setText(tr("Hardware Virtualization:"));
+    if (m_pCheckBoxEnableVirtualization)
     {
-        m_pCheckBoxEnablePae->setText(tr("Enable PA&E/NX"));
-        m_pCheckBoxEnablePae->setToolTip(tr("When checked, the Physical Address Extension (PAE) feature of the host CPU will be "
-                                            "exposed to the virtual machine."));
+        m_pCheckBoxEnableVirtualization->setText(tr("Enable &VT-x/AMD-V"));
+        m_pCheckBoxEnableVirtualization->setToolTip(tr("When checked, the virtual machine will try to make use of the host "
+                                                       "CPU's hardware virtualization extensions such as Intel VT-x and AMD-V."));
     }
-    if (m_pCheckBoxEnableNestedVirtualization)
+    if (m_pCheckBoxEnableNestedPaging)
     {
-        m_pCheckBoxEnableNestedVirtualization->setText(tr("Enable Nested &VT-x/AMD-V"));
-        m_pCheckBoxEnableNestedVirtualization->setToolTip(tr("When checked, the nested hardware virtualization CPU feature will "
-                                                             "be exposed to the virtual machine."));
+        m_pCheckBoxEnableNestedPaging->setText(tr("Enable Nested Pa&ging"));
+        m_pCheckBoxEnableNestedPaging->setToolTip(tr("When checked, the virtual machine will try to make use of the nested "
+                                                     "paging extension of Intel VT-x and AMD-V."));
     }
 }
 
-void UIProcessorFeaturesEditor::prepare()
+void UIAccelerationFeaturesEditor::prepare()
 {
     /* Prepare main layout: */
@@ -122 +123 @@
         m_pLayout->setColumnStretch(1, 1);
 
-        /* Prepare label: */
-        m_pLabel = new QLabel(this);
-        if (m_pLabel)
+        /* Prepare label layout: */
+        QVBoxLayout *pLayoutLabel = new QVBoxLayout;
+        if (pLayoutLabel)
         {
-            m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            m_pLayout->addWidget(m_pLabel, 0, 0);
+            /* Prepare virtualization label: */
+            m_pLabel = new QLabel(this);
+            if (m_pLabel)
+            {
+                m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                pLayoutLabel->addWidget(m_pLabel);
+            }
+            /* Prepare placeholder: */
+            QWidget *pWidgetPlaceholder = new QWidget(this);
+            if (pWidgetPlaceholder)
+            {
+#ifndef VBOX_WITH_RAW_MODE
+                /* Hide placeholder when raw-mode is not supported: */
+                pWidgetPlaceholder->setVisible(false);
+#endif
+                pLayoutLabel->addWidget(pWidgetPlaceholder);
+            }
+
+            m_pLayout->addLayout(pLayoutLabel, 0, 0);
         }
-        /* Prepare 'enable PAE' check-box: */
-        m_pCheckBoxEnablePae = new QCheckBox(this);
-        if (m_pCheckBoxEnablePae)
+
+        /* Prepare widget layout: */
+        QVBoxLayout *pLayoutWidget = new QVBoxLayout;
+        if (pLayoutWidget)
         {
-            connect(m_pCheckBoxEnablePae, &QCheckBox::stateChanged,
-                    this, &UIProcessorFeaturesEditor::sigChangedPae);
-            m_pLayout->addWidget(m_pCheckBoxEnablePae, 0, 1);
-        }
-        /* Prepare 'enable nested virtualization' check-box: */
-        m_pCheckBoxEnableNestedVirtualization = new QCheckBox(this);
-        if (m_pCheckBoxEnableNestedVirtualization)
-        {
-            connect(m_pCheckBoxEnableNestedVirtualization, &QCheckBox::stateChanged,
-                    this, &UIProcessorFeaturesEditor::sigChangedNestedVirtualization);
-            m_pLayout->addWidget(m_pCheckBoxEnableNestedVirtualization, 1, 1);
+            /* Prepare 'enable PAE' check-box: */
+            m_pCheckBoxEnableVirtualization = new QCheckBox(this);
+            if (m_pCheckBoxEnableVirtualization)
+            {
+#ifndef VBOX_WITH_RAW_MODE
+                /* Hide check-box when raw-mode is not supported: */
+                m_pCheckBoxEnableVirtualization->setVisible(false);
+#endif
+                connect(m_pCheckBoxEnableVirtualization, &QCheckBox::stateChanged,
+                        this, &UIAccelerationFeaturesEditor::sigChangedVirtualization);
+                pLayoutWidget->addWidget(m_pCheckBoxEnableVirtualization);
+            }
+            /* Prepare 'enable nested virtualization' check-box: */
+            m_pCheckBoxEnableNestedPaging = new QCheckBox(this);
+            if (m_pCheckBoxEnableNestedPaging)
+            {
+                connect(m_pCheckBoxEnableNestedPaging, &QCheckBox::stateChanged,
+                        this, &UIAccelerationFeaturesEditor::sigChangedNestedPaging);
+                pLayoutWidget->addWidget(m_pCheckBoxEnableNestedPaging);
+            }
+
+            m_pLayout->addLayout(pLayoutWidget, 0, 1);
         }
     }

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIProcessorFeaturesEditor class declaration.
+ * VBox Qt GUI - UIAccelerationFeaturesEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UIProcessorFeaturesEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UIProcessorFeaturesEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIAccelerationFeaturesEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIAccelerationFeaturesEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -30 +30 @@
 class QLabel;
 
-/** QWidget subclass used as processor features editor. */
-class SHARED_LIBRARY_STUFF UIProcessorFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as acceleration features editor. */
+class SHARED_LIBRARY_STUFF UIAccelerationFeaturesEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -37 +37 @@
 signals:
 
-    /** Notifies listeners about PAE change. */
-    void sigChangedPae();
-    /** Notifies listeners about nested virtualization change. */
-    void sigChangedNestedVirtualization();
+    /** Notifies listeners about virtualization change. */
+    void sigChangedVirtualization();
+    /** Notifies listeners about nested paging change. */
+    void sigChangedNestedPaging();
 
 public:
 
     /** Constructs editor passing @a pParent to the base-class. */
-    UIProcessorFeaturesEditor(QWidget *pParent = 0);
+    UIAccelerationFeaturesEditor(QWidget *pParent = 0);
 
-    /** Defines whether 'enable PAE' feature in @a fOn. */
-    void setEnablePae(bool fOn);
-    /** Returns 'enable PAE' feature value. */
-    bool isEnabledPae() const;
-    /** Defines whether 'enable PAE' option @a fAvailable. */
-    void setEnablePaeAvailable(bool fAvailable);
+    /** Defines whether 'enable virtualization' feature in @a fOn. */
+    void setEnableVirtualization(bool fOn);
+    /** Returns 'enable virtualization' feature value. */
+    bool isEnabledVirtualization() const;
+    /** Defines whether 'enable virtualization' option @a fAvailable. */
+    void setEnableVirtualizationAvailable(bool fAvailable);
 
-    /** Defines whether 'enable nested virtualization' feature in @a fOn. */
-    void setEnableNestedVirtualization(bool fOn);
-    /** Returns 'enable nested virtualization' feature value. */
-    bool isEnabledNestedVirtualization() const;
-    /** Defines whether 'enable nested virtualization' option @a fAvailable. */
-    void setEnableNestedVirtualizationAvailable(bool fAvailable);
+    /** Defines whether 'enable nested paging' feature in @a fOn. */
+    void setEnableNestedPaging(bool fOn);
+    /** Returns 'enable nested paging' feature value. */
+    bool isEnabledNestedPaging() const;
+    /** Defines whether 'enable nested paging' option @a fAvailable. */
+    void setEnableNestedPagingAvailable(bool fAvailable);
 
     /** Returns minimum layout hint. */
@@ -78 +78 @@
     /** @name Values
      * @{ */
-        /** Holds the 'enable PAE' feature value. */
-        bool  m_fEnablePae;
-        /** Holds the 'enable nested virtualization' feature value. */
-        bool  m_fEnableNestedVirtualization;
+        /** Holds the 'enable virtualization' feature value. */
+        bool  m_fEnableVirtualization;
+        /** Holds the 'enable nested paging' feature value. */
+        bool  m_fEnableNestedPaging;
     /** @} */
 
@@ -90 +90 @@
         /** Holds the label instance. */
         QLabel      *m_pLabel;
-        /** Holds the 'enable PAE' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnablePae;
-        /** Holds the 'enable nested virtualization' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableNestedVirtualization;
+        /** Holds the 'enable virtualization' check-box instance. */
+        QCheckBox   *m_pCheckBoxEnableVirtualization;
+        /** Holds the 'enable nested paging' check-box instance. */
+        QCheckBox   *m_pCheckBoxEnableNestedPaging;
     /** @} */
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIProcessorFeaturesEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIAccelerationFeaturesEditor_h */

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

@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QCheckBox>
-#include <QComboBox>
-#include <QLabel>
 #include <QVBoxLayout>
 
 /* GUI includes: */
 #include "QITabWidget.h"
+#include "UIAccelerationFeaturesEditor.h"
 #include "UIBaseMemoryEditor.h"
 #include "UIBootOrderEditor.h"
 #include "UIChipsetEditor.h"
 #include "UICommon.h"
-#include "UIConverter.h"
+//#include "UIConverter.h"
 #include "UIErrorString.h"
 #include "UIExecutionCapEditor.h"
@@ -164 +162 @@
     , m_pTabAcceleration(0)
     , m_pEditorParavirtProvider(0)
-    , m_pLabelVirtualization(0)
-    , m_pCheckBoxVirtualization(0)
-    , m_pCheckBoxNestedPaging(0)
-{
-    /* Prepare: */
+    , m_pEditorAccelerationFeatures(0)
+{
     prepare();
 }
@@ -174 +169 @@
 UIMachineSettingsSystem::~UIMachineSettingsSystem()
 {
-    /* Cleanup: */
     cleanup();
 }
@@ -186 +180 @@
 bool UIMachineSettingsSystem::isHWVirtExEnabled() const
 {
-    return m_pCheckBoxVirtualization->isChecked();
+    return m_pEditorAccelerationFeatures->isEnabledVirtualization();
 }
 
@@ -197 +191 @@
 bool UIMachineSettingsSystem::isNestedPagingEnabled() const
 {
-    return m_pCheckBoxNestedPaging->isChecked();
+    return m_pEditorAccelerationFeatures->isEnabledNestedPaging();
 }
 
@@ -326 +320 @@
     if (m_pEditorParavirtProvider)
         m_pEditorParavirtProvider->setValue(oldSystemData.m_paravirtProvider);
-    if (m_pCheckBoxVirtualization)
-        m_pCheckBoxVirtualization->setChecked(oldSystemData.m_fEnabledHwVirtEx);
-    if (m_pCheckBoxNestedPaging)
-        m_pCheckBoxNestedPaging->setChecked(oldSystemData.m_fEnabledNestedPaging);
+    if (m_pEditorAccelerationFeatures)
+    {
+        m_pEditorAccelerationFeatures->setEnableVirtualization(oldSystemData.m_fEnabledHwVirtEx);
+        m_pEditorAccelerationFeatures->setEnableNestedPaging(oldSystemData.m_fEnabledNestedPaging);
+    }
 
     /* Polish page finally: */
@@ -396 +391 @@
      * Nested HW Virt Ex is requested. */
     newSystemData.m_fEnabledNestedPaging =    isNestedPagingEnabled()
-                                     || (   isNestedPagingSupported()
-                                         && isNestedHWVirtExEnabled());
+                                           || (   isNestedPagingSupported()
+                                               && isNestedHWVirtExEnabled());
 
     /* Cache new data: */
@@ -608 +603 @@
 
     /* Configure navigation for 'acceleration' tab: */
-    setTabOrder(m_pEditorParavirtProvider, m_pCheckBoxVirtualization);
-    setTabOrder(m_pCheckBoxVirtualization, m_pCheckBoxNestedPaging);
+    setTabOrder(m_pEditorParavirtProvider, m_pEditorAccelerationFeatures);
 }
 
@@ -621 +615 @@
     m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabMotherboard), tr("&Motherboard"));
     m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabProcessor), tr("&Processor"));
-    m_pLabelVirtualization->setText(tr("Hardware Virtualization:"));
-    m_pCheckBoxVirtualization->setToolTip(tr("When checked, the virtual machine will try to make use of the host CPU's hardware "
-                                             "virtualization extensions such as Intel VT-x and AMD-V."));
-    m_pCheckBoxVirtualization->setText(tr("Enable &VT-x/AMD-V"));
-    m_pCheckBoxNestedPaging->setToolTip(tr("When checked, the virtual machine will try to make use of the nested paging "
-                                           "extension of Intel VT-x and AMD-V."));
-    m_pCheckBoxNestedPaging->setText(tr("Enable Nested Pa&ging"));
     m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabAcceleration), tr("Acce&leration"));
 
@@ -649 +636 @@
     m_pEditorExecCap->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pEditorProcessorFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
+    iMinimumLayoutHint = 0;
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorParavirtProvider->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAccelerationFeatures->minimumLabelHorizontalHint());
+    m_pEditorParavirtProvider->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pEditorAccelerationFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
 }
 
@@ -673 +665 @@
     /* Polish 'Acceleration' availability: */
     m_pEditorParavirtProvider->setEnabled(isMachineOffline());
-    m_pLabelVirtualization->setEnabled(isMachineOffline());
-    m_pCheckBoxVirtualization->setEnabled(   (systemData.m_fSupportedHwVirtEx && isMachineOffline())
-                                          || (systemData.m_fEnabledHwVirtEx && isMachineOffline()));
-    m_pCheckBoxNestedPaging->setEnabled(   m_pCheckBoxVirtualization->isChecked()
-                                        && (   (systemData.m_fSupportedNestedPaging && isMachineOffline())
-                                            || (systemData.m_fEnabledNestedPaging && isMachineOffline())));
+    m_pEditorAccelerationFeatures->setEnabled(isMachineOffline());
+    m_pEditorAccelerationFeatures->setEnableVirtualizationAvailable(   (systemData.m_fSupportedHwVirtEx && isMachineOffline())
+                                                                    || (systemData.m_fEnabledHwVirtEx && isMachineOffline()));
+    m_pEditorAccelerationFeatures->setEnableNestedPagingAvailable(   m_pEditorAccelerationFeatures->isEnabledVirtualization()
+                                                                  && (   (systemData.m_fSupportedNestedPaging && isMachineOffline())
+                                                                      || (systemData.m_fEnabledNestedPaging && isMachineOffline())));
 }
 
@@ -685 +677 @@
     /* Update Nested Paging checkbox: */
     AssertPtrReturnVoid(m_pCache);
-    m_pCheckBoxNestedPaging->setEnabled(   m_pCheckBoxVirtualization->isChecked()
-                                        && (   (m_pCache->base().m_fSupportedNestedPaging && isMachineOffline())
-                                            || (m_pCache->base().m_fEnabledNestedPaging && isMachineOffline())));
+    m_pEditorAccelerationFeatures->setEnableNestedPagingAvailable(   m_pEditorAccelerationFeatures->isEnabledVirtualization()
+                                                                  && (   (m_pCache->base().m_fSupportedNestedPaging && isMachineOffline())
+                                                                      || (m_pCache->base().m_fEnabledNestedPaging && isMachineOffline())));
 
     /* Revalidate: */
@@ -819 +811 @@
             m_pEditorParavirtProvider = new UIParavirtProviderEditor(m_pTabAcceleration);
             if (m_pEditorParavirtProvider)
-                pLayoutAcceleration->addWidget(m_pEditorParavirtProvider, 0, 0, 1, 3);
-
-            /* Prepare virtualization label layout: */
-            QVBoxLayout *pLayoutVirtualizationLabel = new QVBoxLayout;
-            if (pLayoutVirtualizationLabel)
-            {
-                /* Prepare virtualization label: */
-                m_pLabelVirtualization = new QLabel(m_pTabAcceleration);
-                if (m_pLabelVirtualization)
-                {
-                    m_pLabelVirtualization->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    pLayoutVirtualizationLabel->addWidget(m_pLabelVirtualization);
-                }
-                /* Prepare placeholder: */
-                QWidget *pWidgetPlaceholder = new QWidget(m_pTabAcceleration);
-                if (pWidgetPlaceholder)
-                {
-#ifndef VBOX_WITH_RAW_MODE
-                    /* Hide placeholder when raw-mode is not supported: */
-                    pWidgetPlaceholder->setVisible(false);
-#endif
-
-                    pLayoutVirtualizationLabel->addWidget(pWidgetPlaceholder);
-                }
-
-                pLayoutAcceleration->addLayout(pLayoutVirtualizationLabel, 1, 0);
-            }
-            /* Prepare virtualization stuff layout: */
-            QVBoxLayout *pLayoutVirtualizationStuff = new QVBoxLayout;
-            if (pLayoutVirtualizationStuff)
-            {
-                /* Prepare virtualization check-box: */
-                m_pCheckBoxVirtualization = new QCheckBox(m_pTabAcceleration);
-                if (m_pCheckBoxVirtualization)
-                {
-#ifndef VBOX_WITH_RAW_MODE
-                    /* Hide HW Virt Ex checkbox when raw-mode is not supported: */
-                    m_pCheckBoxVirtualization->setVisible(false);
-#endif
-
-                    pLayoutVirtualizationStuff->addWidget(m_pCheckBoxVirtualization);
-                }
-                /* Prepare nested paging check-box: */
-                m_pCheckBoxNestedPaging = new QCheckBox(m_pTabAcceleration);
-                if (m_pCheckBoxNestedPaging)
-                    pLayoutVirtualizationStuff->addWidget(m_pCheckBoxNestedPaging);
-
-                pLayoutAcceleration->addLayout(pLayoutVirtualizationStuff, 1, 1);
-            }
+                pLayoutAcceleration->addWidget(m_pEditorParavirtProvider, 0, 0, 1, 2);
+
+            /* Prepare acceleration features editor: */
+            m_pEditorAccelerationFeatures = new UIAccelerationFeaturesEditor(m_pTabAcceleration);
+            if (m_pEditorAccelerationFeatures)
+                pLayoutAcceleration->addWidget(m_pEditorAccelerationFeatures, 1, 0);
 
             m_pTabWidget->addTab(m_pTabAcceleration, QString());
@@ -895 +844 @@
 
     /* Configure 'Acceleration' connections: */
-    connect(m_pCheckBoxVirtualization, &QCheckBox::stateChanged,
+    connect(m_pEditorAccelerationFeatures, &UIAccelerationFeaturesEditor::sigChangedVirtualization,
             this, &UIMachineSettingsSystem::sltHandleHwVirtExToggle);
-    connect(m_pCheckBoxNestedPaging, &QCheckBox::stateChanged,
+    connect(m_pEditorAccelerationFeatures, &UIAccelerationFeaturesEditor::sigChangedNestedPaging,
             this, &UIMachineSettingsSystem::revalidate);
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -28 +28 @@
 struct UIDataSettingsMachineSystem;
 typedef UISettingsCache<UIDataSettingsMachineSystem> UISettingsCacheMachineSystem;
-class QCheckBox;
-class QComboBox;
-class QLabel;
 class QITabWidget;
+class UIAccelerationFeaturesEditor;
 class UIBaseMemoryEditor;
 class UIBootOrderEditor;
@@ -174 +172 @@
 
         /** Holds the 'Acceleration' tab instance. */
-        QWidget                  *m_pTabAcceleration;
+        QWidget                      *m_pTabAcceleration;
         /** Holds the paravirtualization provider editor instance. */
-        UIParavirtProviderEditor *m_pEditorParavirtProvider;
-        /** Holds the virtualization label instance. */
-        QLabel                   *m_pLabelVirtualization;
-        /** Holds the virtualization check-box instance. */
-        QCheckBox                *m_pCheckBoxVirtualization;
-        /** Holds the nested paging check-box instance. */
-        QCheckBox                *m_pCheckBoxNestedPaging;
+        UIParavirtProviderEditor     *m_pEditorParavirtProvider;
+        /** Holds the acceleration features editor instance. */
+        UIAccelerationFeaturesEditor *m_pEditorAccelerationFeatures;
    /** @} */
 };