Changeset 95159 in vbox

Timestamp:

Jun 1, 2022 11:06:35 AM (3 years ago)

Author:

vboxsync

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

151655

Message:

FE/Qt/Ds: bugref:6899: Machine settings: System page accessibility improvements (part 1); Moving Chipset editor related stuff into separate UIChipsetEditor widget.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/editors/UIChipsetEditor.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedClipboardEditor.cpp ) (9 diffs)
• src/settings/editors/UIChipsetEditor.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedClipboardEditor.h ) (5 diffs)
• src/settings/machine/UIMachineSettingsSystem.cpp (modified) (15 diffs)
• src/settings/machine/UIMachineSettingsSystem.h (modified) (4 diffs)

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

@@ -900 +900 @@
         src/settings/editors/UIBaseMemoryEditor.h \
         src/settings/editors/UIBootOrderEditor.h \
+        src/settings/editors/UIChipsetEditor.h \
         src/settings/editors/UIColorThemeEditor.h \
         src/settings/editors/UIDefaultMachineFolderEditor.h \
@@ -1470 +1471 @@
         src/settings/editors/UIBaseMemoryEditor.cpp \
         src/settings/editors/UIBootOrderEditor.cpp \
+        src/settings/editors/UIChipsetEditor.cpp \
         src/settings/editors/UIColorThemeEditor.cpp \
         src/settings/editors/UIDefaultMachineFolderEditor.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UISharedClipboardEditor class implementation.
+ * VBox Qt GUI - UIChipsetEditor class implementation.
  */
 
@@ -25 +25 @@
 #include "UICommon.h"
 #include "UIConverter.h"
-#include "UISharedClipboardEditor.h"
+#include "UIChipsetEditor.h"
 
 /* COM includes: */
@@ -31 +31 @@
 
 
-UISharedClipboardEditor::UISharedClipboardEditor(QWidget *pParent /* = 0 */)
+UIChipsetEditor::UIChipsetEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_enmValue(KClipboardMode_Max)
+    , m_enmValue(KChipsetType_Max)
     , m_pLabel(0)
     , m_pCombo(0)
@@ -40 +40 @@
 }
 
-void UISharedClipboardEditor::setValue(KClipboardMode enmValue)
+void UIChipsetEditor::setValue(KChipsetType enmValue)
 {
     /* Update cached value and
@@ -51 +51 @@
 }
 
-KClipboardMode UISharedClipboardEditor::value() const
+KChipsetType UIChipsetEditor::value() const
 {
-    return m_pCombo ? m_pCombo->currentData().value<KClipboardMode>() : m_enmValue;
+    return m_pCombo ? m_pCombo->currentData().value<KChipsetType>() : m_enmValue;
 }
 
-int UISharedClipboardEditor::minimumLabelHorizontalHint() const
+int UIChipsetEditor::minimumLabelHorizontalHint() const
 {
     return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
-void UISharedClipboardEditor::setMinimumLayoutIndent(int iIndent)
+void UIChipsetEditor::setMinimumLayoutIndent(int iIndent)
 {
     if (m_pLayout)
@@ -67 +67 @@
 }
 
-void UISharedClipboardEditor::retranslateUi()
+void UIChipsetEditor::retranslateUi()
 {
     if (m_pLabel)
-        m_pLabel->setText(tr("&Shared Clipboard:"));
+        m_pLabel->setText(tr("&Chipset:"));
     if (m_pCombo)
     {
         for (int i = 0; i < m_pCombo->count(); ++i)
         {
-            const KClipboardMode enmType = m_pCombo->itemData(i).value<KClipboardMode>();
+            const KChipsetType enmType = m_pCombo->itemData(i).value<KChipsetType>();
             m_pCombo->setItemText(i, gpConverter->toString(enmType));
         }
-        m_pCombo->setToolTip(tr("Holds which clipboard data will be copied between the guest and the host OS. "
-                                "This feature requires Guest Additions to be installed in the guest OS."));
+        m_pCombo->setToolTip(tr("Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset "
+                                "emulation is experimental and not recommended except for guest systems (such as Mac OS X) "
+                                "which require it."));
     }
 }
 
-void UISharedClipboardEditor::prepare()
+void UIChipsetEditor::prepare()
 {
     /* Create main layout: */
@@ -111 +112 @@
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pCombo);
+                connect(m_pCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+                        this, &UIChipsetEditor::sigValueChanged);
                 pComboLayout->addWidget(m_pCombo);
             }
@@ -129 +132 @@
 }
 
-void UISharedClipboardEditor::populateCombo()
+void UIChipsetEditor::populateCombo()
 {
     if (m_pCombo)
@@ -136 +139 @@
         m_pCombo->clear();
 
-        /* Load currently supported audio driver types: */
+        /* Load currently supported values: */
         CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
-        m_supportedValues = comProperties.GetSupportedClipboardModes();
+        m_supportedValues = comProperties.GetSupportedChipsetTypes();
 
         /* Make sure requested value if sane is present as well: */
-        if (   m_enmValue != KClipboardMode_Max
+        if (   m_enmValue != KChipsetType_Max
             && !m_supportedValues.contains(m_enmValue))
             m_supportedValues.prepend(m_enmValue);
 
         /* Update combo with all the supported values: */
-        foreach (const KClipboardMode &enmType, m_supportedValues)
+        foreach (const KChipsetType &enmType, m_supportedValues)
             m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UISharedClipboardEditor class declaration.
+ * VBox Qt GUI - UIChipsetEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UISharedClipboardEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UISharedClipboardEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIChipsetEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIChipsetEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -37 +37 @@
 class QLabel;
 
-/** QWidget subclass used as a shared clipboard editor. */
-class SHARED_LIBRARY_STUFF UISharedClipboardEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as a chipset editor. */
+class SHARED_LIBRARY_STUFF UIChipsetEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about value change. */
+    void sigValueChanged();
 
 public:
 
     /** Constructs editor passing @a pParent to the base-class. */
-    UISharedClipboardEditor(QWidget *pParent = 0);
+    UIChipsetEditor(QWidget *pParent = 0);
 
     /** Defines editor @a enmValue. */
-    void setValue(KClipboardMode enmValue);
+    void setValue(KChipsetType enmValue);
     /** Returns editor value. */
-    KClipboardMode value() const;
+    KChipsetType value() const;
 
     /** Returns the vector of supported values. */
-    QVector<KClipboardMode> supportedValues() const { return m_supportedValues; }
+    QVector<KChipsetType> supportedValues() const { return m_supportedValues; }
 
     /** Returns minimum layout hint. */
@@ -73 +78 @@
 
     /** Holds the value to be selected. */
-    KClipboardMode  m_enmValue;
+    KChipsetType  m_enmValue;
 
     /** Holds the vector of supported values. */
-    QVector<KClipboardMode>  m_supportedValues;
+    QVector<KChipsetType>  m_supportedValues;
 
     /** Holds the main layout instance. */
@@ -86 +91 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UISharedClipboardEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIChipsetEditor_h */

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

@@ -30 +30 @@
 #include "UIBaseMemoryEditor.h"
 #include "UIBootOrderEditor.h"
+#include "UIChipsetEditor.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -160 +161 @@
     , m_pLabelBootOrder(0)
     , m_pEditorBootOrder(0)
-    , m_pLabelChipset(0)
-    , m_pComboChipset(0)
+    , m_pEditorChipset(0)
     , m_pLabelPointingHID(0)
     , m_pComboPointingHID(0)
@@ -239 +239 @@
 KChipsetType UIMachineSettingsSystem::chipsetType() const
 {
-    return m_pComboChipset->currentData().value<KChipsetType>();
+    return m_pEditorChipset->value();
 }
 
@@ -319 +319 @@
     /* We are doing that *now* because these combos have
      * dynamical content which depends on cashed value: */
-    repopulateComboChipsetType();
     repopulateComboPointingHIDType();
     repopulateComboParavirtProviderType();
@@ -328 +327 @@
     if (m_pEditorBootOrder)
         m_pEditorBootOrder->setValue(oldSystemData.m_bootItems);
-    if (m_pComboChipset)
-    {
-        const int iChipsetTypePosition = m_pComboChipset->findData(oldSystemData.m_chipsetType);
-        m_pComboChipset->setCurrentIndex(iChipsetTypePosition == -1 ? 0 : iChipsetTypePosition);
-    }
+    if (m_pEditorChipset)
+        m_pEditorChipset->setValue(oldSystemData.m_chipsetType);
     if (m_pComboPointingHID)
     {
@@ -393 +389 @@
     if (m_pEditorBootOrder)
         newSystemData.m_bootItems = m_pEditorBootOrder->value();
-    if (m_pComboChipset)
-        newSystemData.m_chipsetType = m_pComboChipset->currentData().value<KChipsetType>();
+    if (m_pEditorChipset)
+        newSystemData.m_chipsetType = m_pEditorChipset->value();
     if (m_pComboPointingHID)
         newSystemData.m_pointingHIDType = m_pComboPointingHID->currentData().value<KPointingHIDType>();
     if (   m_pCheckBoxAPIC
         && m_pSliderProcessorCount
-        && m_pComboChipset)
+        && m_pEditorChipset)
         newSystemData.m_fEnabledIoApic =    m_pCheckBoxAPIC->isChecked()
                                          || m_pSliderProcessorCount->value() > 1
-                                         || m_pComboChipset->currentData().value<KChipsetType>() == KChipsetType_ICH9;
+                                         || m_pEditorChipset->value() == KChipsetType_ICH9;
     if (m_pCheckBoxEFI)
         newSystemData.m_fEnabledEFI = m_pCheckBoxEFI->isChecked();
@@ -482 +478 @@
 
         /* Chipset type vs IO-APIC test: */
-        if (m_pComboChipset->currentData().value<KChipsetType>() == KChipsetType_ICH9 && !m_pCheckBoxAPIC->isChecked())
+        if (m_pEditorChipset->value() == KChipsetType_ICH9 && !m_pCheckBoxAPIC->isChecked())
         {
             message.second << tr(
@@ -632 +628 @@
     setTabOrder(m_pTabWidget->focusProxy(), m_pEditorBaseMemory);
     setTabOrder(m_pEditorBaseMemory, m_pEditorBootOrder);
-    setTabOrder(m_pEditorBootOrder, m_pComboChipset);
-    setTabOrder(m_pComboChipset, m_pComboPointingHID);
+    setTabOrder(m_pEditorBootOrder, m_pEditorChipset);
+    setTabOrder(m_pEditorChipset, m_pComboPointingHID);
     setTabOrder(m_pComboPointingHID, m_pCheckBoxAPIC);
     setTabOrder(m_pCheckBoxAPIC, m_pCheckBoxEFI);
@@ -661 +657 @@
                                         "checkboxes on the left to enable or disable individual boot devices. "
                                         "Move items up and down to change the device order."));
-    m_pLabelChipset->setText(tr("&Chipset:"));
-    m_pComboChipset->setToolTip(tr("Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset "
-                                   "emulation is experimental and not recommended except for guest systems (such as Mac OS X) "
-                                   "which require it."));
     m_pLabelPointingHID->setText(tr("&Pointing Device:"));
     m_pComboPointingHID->setToolTip(tr("Determines whether the emulated pointing device is a standard PS/2 mouse, "
@@ -725 +717 @@
 
     /* Retranslate combo-boxes: */
-    retranslateComboChipsetType();
     retranslateComboPointingHIDType();
     retranslateComboParavirtProvider();
+
+    /* These editors have own labels, but we want them to be properly layouted according to each other: */
+    int iMinimumLayoutHint = 0;
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelBaseMemory->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelBootOrder->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorChipset->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelPointingHID->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelExtendedMotherboard->minimumSizeHint().width());
+    m_pEditorChipset->setMinimumLayoutIndent(iMinimumLayoutHint);
 }
 
@@ -740 +740 @@
     m_pLabelBootOrder->setEnabled(isMachineOffline());
     m_pEditorBootOrder->setEnabled(isMachineOffline());
-    m_pLabelChipset->setEnabled(isMachineOffline());
-    m_pComboChipset->setEnabled(isMachineOffline());
+    m_pEditorChipset->setEnabled(isMachineOffline());
     m_pLabelPointingHID->setEnabled(isMachineOffline());
     m_pComboPointingHID->setEnabled(isMachineOffline());
@@ -915 +914 @@
             }
 
-            /* Prepare chipset label: */
-            m_pLabelChipset = new QLabel(m_pTabMotherboard);
-            if (m_pLabelChipset)
-            {
-                m_pLabelChipset->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutMotherboard->addWidget(m_pLabelChipset, 4, 0);
-            }
-            /* Prepare chipset combo: */
-            m_pComboChipset = new QComboBox(m_pTabMotherboard);
-            if (m_pComboChipset)
-            {
-                if (m_pLabelChipset)
-                    m_pLabelChipset->setBuddy(m_pComboChipset);
-                m_pComboChipset->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-                m_pComboChipset->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-
-                pLayoutMotherboard->addWidget(m_pComboChipset, 4, 1);
-            }
+            /* Prepare chipset editor: */
+            m_pEditorChipset = new UIChipsetEditor(m_pTabMotherboard);
+            if (m_pEditorChipset)
+                pLayoutMotherboard->addWidget(m_pEditorChipset, 4, 0, 1, 2);
 
             /* Prepare pointing HID label: */
@@ -1238 +1223 @@
 {
     /* Configure 'Motherboard' connections: */
-    connect(m_pComboChipset, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_pEditorChipset, &UIChipsetEditor::sigValueChanged,
             this, &UIMachineSettingsSystem::revalidate);
     connect(m_pComboPointingHID, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
@@ -1268 +1253 @@
 }
 
-void UIMachineSettingsSystem::repopulateComboChipsetType()
-{
-    AssertPtrReturnVoid(m_pComboChipset);
-    {
-        /* Clear combo first of all: */
-        m_pComboChipset->clear();
-
-        /* Load currently supported chipset types: */
-        CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
-        QVector<KChipsetType> chipsetTypes = comProperties.GetSupportedChipsetTypes();
-        /* Take into account currently cached value: */
-        const KChipsetType enmCachedValue = m_pCache->base().m_chipsetType;
-        if (!chipsetTypes.contains(enmCachedValue))
-            chipsetTypes.prepend(enmCachedValue);
-
-        /* Populate combo finally: */
-        foreach (const KChipsetType &enmType, chipsetTypes)
-            m_pComboChipset->addItem(gpConverter->toString(enmType), QVariant::fromValue(enmType));
-    }
-}
-
 void UIMachineSettingsSystem::repopulateComboPointingHIDType()
 {
@@ -1328 +1292 @@
         foreach (const KParavirtProvider &enmProvider, supportedProviderTypes)
             m_pComboParavirtProvider->addItem(gpConverter->toString(enmProvider), QVariant::fromValue(enmProvider));
-    }
-}
-
-void UIMachineSettingsSystem::retranslateComboChipsetType()
-{
-    /* For each the element in m_pComboChipset: */
-    for (int iIndex = 0; iIndex < m_pComboChipset->count(); ++iIndex)
-    {
-        /* Apply retranslated text: */
-        const KChipsetType enmType = m_pComboChipset->currentData().value<KChipsetType>();
-        m_pComboChipset->setItemText(iIndex, gpConverter->toString(enmType));
     }
 }

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

@@ -37 +37 @@
 class UIBaseMemoryEditor;
 class UIBootOrderEditor;
+class UIChipsetEditor;
 
 /** Machine settings: System page. */
@@ -136 +137 @@
     void cleanup();
 
-    /** Repopulates Chipset type combo-box. */
-    void repopulateComboChipsetType();
     /** Repopulates Pointing HID type combo-box. */
     void repopulateComboPointingHIDType();
@@ -143 +142 @@
     void repopulateComboParavirtProviderType();
 
-    /** Retranslates Chipset type combo-box. */
-    void retranslateComboChipsetType();
     /** Retranslates Pointing HID type combo-box. */
     void retranslateComboPointingHIDType();
@@ -191 +188 @@
         /** Holds the boot order editor instance. */
         UIBootOrderEditor  *m_pEditorBootOrder;
-        /** Holds the chipset label instance. */
-        QLabel             *m_pLabelChipset;
-        /** Holds the chipset combo instance. */
-        QComboBox          *m_pComboChipset;
+        /** Holds the chipset editor instance. */
+        UIChipsetEditor    *m_pEditorChipset;
         /** Holds the pointing HID label instance. */
         QLabel             *m_pLabelPointingHID;