Changeset 101752 in vbox for trunk/src/VBox

Timestamp:

Nov 3, 2023 3:56:43 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: Reverting r159820 as it appears VM settings platform change isn't supported as it is.

Location:

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

Files:

• UIAdvancedSettingsDialogSpecific.cpp (modified) (2 diffs)
• UIAdvancedSettingsDialogSpecific.h (modified) (1 diff)
• machine/UIMachineSettingsGeneral.cpp (modified) (2 diffs)
• machine/UIMachineSettingsGeneral.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp

@@ -622 +622 @@
 }
 
-void UIAdvancedSettingsDialogMachine::sltHandlePlatformArchitectureChanged(KPlatformArchitecture enmArch)
-{
-    /* Update optional flags accordingly: */
-    QMap<QString, QVariant> optFlags = optionalFlags();
-    /* For x86 we no need the flag at all, removing if present: */
-    if (enmArch == KPlatformArchitecture_x86)
-        optFlags.remove("arch");
-    /* For ARM (and potentially rest) we need the flag: */
-    else if (enmArch == KPlatformArchitecture_ARM)
-        optFlags["arch"] = QVariant::fromValue(enmArch);
-    setOptionalFlags(optFlags);
-}
-
 void UIAdvancedSettingsDialogMachine::prepare()
 {
@@ -673 +660 @@
                 case MachineSettingsPageType_General:
                 {
-                    UIMachineSettingsGeneral *pSettingsPageGeneral = new UIMachineSettingsGeneral;
+                    pSettingsPage = new UIMachineSettingsGeneral;
                     addItem(":/machine_32px.png", ":/machine_24px.png", ":/machine_16px.png",
-                            iPageIndex, "#general", pSettingsPageGeneral);
+                            iPageIndex, "#general", pSettingsPage);
                     addPageHelpKeyword(iPageIndex, "generalsettings");
-                    connect(pSettingsPageGeneral, &UIMachineSettingsGeneral::sigPlatformArchitectureChanged,
-                            this, &UIAdvancedSettingsDialogMachine::sltHandlePlatformArchitectureChanged);
                     break;
                 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.h

@@ -144 +144 @@
     void sltMachineDataChanged(const QUuid &uMachineId);
 
-    /** Handles platform @a enmArch change. */
-    void sltHandlePlatformArchitectureChanged(KPlatformArchitecture enmArch);
-
 private:
 

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

@@ -503 +503 @@
 }
 
-void UIMachineSettingsGeneral::sltHandleOsTypeChanged()
-{
-    /* Compose new guest OS type: */
-    const CGuestOSType comNewType = uiCommon().virtualBox().GetGuestOSType(guestOSTypeId());
-    /* Notify listeners about new platform architecture: */
-    if (comNewType.isNotNull())
-    {
-        const KPlatformArchitecture enmArch = comNewType.GetPlatformArchitecture();
-        if (comNewType.isOk() && enmArch != KPlatformArchitecture_None)
-            emit sigPlatformArchitectureChanged(enmArch);
-    }
-
-    /* Revalidate the usual way as well: */
-    revalidate();
-}
-
 void UIMachineSettingsGeneral::sltHandleEncryptionCipherChanged()
 {
@@ -718 +702 @@
     /* Configure 'Basic' connections: */
     connect(m_pEditorNameAndSystem, &UINameAndSystemEditor::sigOsTypeChanged,
-            this, &UIMachineSettingsGeneral::sltHandleOsTypeChanged);
+            this, &UIMachineSettingsGeneral::revalidate);
     connect(m_pEditorNameAndSystem, &UINameAndSystemEditor::sigNameChanged,
             this, &UIMachineSettingsGeneral::revalidate);

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

@@ -51 +51 @@
     Q_OBJECT;
 
-signals:
-
-    /** Notifies listeners about platform @a enmArch changed. */
-    void sigPlatformArchitectureChanged(KPlatformArchitecture enmArch);
-
 public:
 
@@ -101 +96 @@
 
 private slots:
-
-    /** Handles OS type change. */
-    void sltHandleOsTypeChanged();
 
     /** Handles encryption cipher change. */