Changeset 105887 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 28, 2024 11:04:18 AM (6 months ago)

Author:

vboxsync

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

164607

Message:

FE/Qt: bugref:10513: Wipe out a bit of remnants of previous VM Settings dialog; Will have to wipe corresponding NLS tags from .ts files as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (3 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• settings/UIAdvancedSettingsDialogSpecific.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -2177 +2177 @@
         case MachineSettingsPageType_Audio:     strResult = "Audio"; break;
         case MachineSettingsPageType_Network:   strResult = "Network"; break;
-        case MachineSettingsPageType_Ports:     strResult = "Ports"; break;
         case MachineSettingsPageType_Serial:    strResult = "Serial"; break;
         case MachineSettingsPageType_USB:       strResult = "USB"; break;
@@ -2206 +2205 @@
     if (strMachineSettingsPageType.compare("Network", Qt::CaseInsensitive) == 0)
         return MachineSettingsPageType_Network;
-    if (strMachineSettingsPageType.compare("Ports", Qt::CaseInsensitive) == 0)
-        return MachineSettingsPageType_Ports;
     if (strMachineSettingsPageType.compare("Serial", Qt::CaseInsensitive) == 0)
         return MachineSettingsPageType_Serial;
@@ -2230 +2227 @@
         case MachineSettingsPageType_Audio:     return UIIconPool::pixmap(":/sound_warning_16px.png");
         case MachineSettingsPageType_Network:   return UIIconPool::pixmap(":/nw_warning_16px.png");
-        case MachineSettingsPageType_Ports:     return UIIconPool::pixmap(":/serial_port_warning_16px.png");
         case MachineSettingsPageType_Serial:    return UIIconPool::pixmap(":/serial_port_warning_16px.png");
         case MachineSettingsPageType_USB:       return UIIconPool::pixmap(":/usb_warning_16px.png");

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -888 +888 @@
     MachineSettingsPageType_Audio,
     MachineSettingsPageType_Network,
-    MachineSettingsPageType_Ports,
     MachineSettingsPageType_Serial,
     MachineSettingsPageType_USB,

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

@@ -364 +364 @@
     /* Network page: */
     m_pSelector->setItemText(MachineSettingsPageType_Network, tr("Network"));
-
-    /* Ports page: */
-    m_pSelector->setItemText(MachineSettingsPageType_Ports, tr("Ports"));
 
     /* Serial page: */
@@ -698 +695 @@
                     break;
                 }
-                /* Ports page: */
-                case MachineSettingsPageType_Ports:
-                {
-                    addItem(":/serial_port_32px.png", ":/serial_port_24px.png", ":/serial_port_16px.png",
-                            iPageIndex, "#ports");
-                    break;
-                }
                 /* Serial page: */
                 case MachineSettingsPageType_Serial:
@@ -710 +700 @@
                     pSettingsPage = new UIMachineSettingsSerial;
                     addItem(":/serial_port_32px.png", ":/serial_port_24px.png", ":/serial_port_16px.png",
-                            iPageIndex, "#serialPorts", pSettingsPage, MachineSettingsPageType_Ports);
+                            iPageIndex, "#serialPorts", pSettingsPage);
                     addPageHelpKeyword(iPageIndex, "serialports");
                     break;
@@ -719 +709 @@
                     pSettingsPage = new UIMachineSettingsUSB;
                     addItem(":/usb_32px.png", ":/usb_24px.png", ":/usb_16px.png",
-                            iPageIndex, "#usb", pSettingsPage, MachineSettingsPageType_Ports);
+                            iPageIndex, "#usb", pSettingsPage);
                     addPageHelpKeyword(iPageIndex, "usb-support");
                     break;
@@ -788 +778 @@
     switch (iPageId)
     {
-        case MachineSettingsPageType_Serial:
-        {
-            /* Depends on ports availability: */
-            if (!isPageAvailable(MachineSettingsPageType_Ports))
-                return false;
-            break;
-        }
         case MachineSettingsPageType_USB:
         {
-            /* Depends on ports availability: */
-            if (!isPageAvailable(MachineSettingsPageType_Ports))
-                return false;
             /* Check if USB is implemented: */
             if (!m_machine.GetUSBProxyAvailable())