Changeset 105273 in vbox for trunk/src

Timestamp:

Jul 11, 2024 1:51:10 PM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10384: VM settings / System page: Reworking totally wrong r161581; Same idea, just take into account that the widgets can be hidden already, don't show them ourselves.

Location:

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

Files:

• UIMachineSettingsSystem.cpp (modified) (4 diffs)
• UIMachineSettingsSystem.h (modified) (1 diff)

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

@@ -625 +625 @@
 {
     /* Update some stuff: */
-    updateOptionSet();
     updateMinimumLayoutHint();
+
+    /* Some options hidden for ARM machines: */
+    const KPlatformArchitecture enmArch = optionalFlags().contains("arch")
+                                        ? optionalFlags().value("arch").value<KPlatformArchitecture>()
+                                        : KPlatformArchitecture_x86;
+    const bool fARMMachine = enmArch == KPlatformArchitecture_ARM;
+    if (fARMMachine)
+    {
+        if (m_pEditorChipset)
+            m_pEditorChipset->hide();
+        if (m_pEditorTpm)
+            m_pEditorTpm->hide();
+        if (m_pEditorProcessorFeatures)
+            m_pEditorProcessorFeatures->hide();
+    }
 }
 
@@ -660 +674 @@
                                                                       || (systemData.m_fEnabledNestedPaging && isMachineOffline()));
     }
-
-    /* Update option set: */
-    updateOptionSet();
 }
 
@@ -674 +685 @@
     prepareWidgets();
     prepareConnections();
-
-    /* Update option set: */
-    updateOptionSet();
 
     /* Apply language settings: */
@@ -895 +903 @@
         connect(m_pEditorAccelerationFeatures, &UIAccelerationFeaturesEditor::sigChangedNestedPaging,
                 this, &UIMachineSettingsSystem::revalidate);
-}
-
-void UIMachineSettingsSystem::updateOptionSet()
-{
-    /* Load currently propagated arch type: */
-    const KPlatformArchitecture enmArch = optionalFlags().contains("arch")
-                                        ? optionalFlags().value("arch").value<KPlatformArchitecture>()
-                                        : KPlatformArchitecture_x86;
-
-    /* Some options visible only for x86 machines: */
-    const bool fx86 = enmArch == KPlatformArchitecture_x86;
-    if (m_pEditorChipset)
-        m_pEditorChipset->setVisible(fx86);
-    if (m_pEditorTpm)
-        m_pEditorTpm->setVisible(fx86);
-    m_pEditorProcessorFeatures->setVisible(fx86);
 }
 

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

@@ -138 +138 @@
     /** Prepares connections. */
     void prepareConnections();
-    /** Updates option set. */
-    void updateOptionSet();
     /** Cleanups all. */
     void cleanup();