Changeset 87316 in vbox

Timestamp:

Jan 20, 2021 9:50:36 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9871: Global Preferences: Remove Network page.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/converter/UIConverterBackendGlobal.cpp (modified) (3 diffs)
• src/extradata/UIExtraDataDefs.h (modified) (1 diff)
• src/settings/UISettingsDialogSpecific.cpp (modified) (4 diffs)
• src/settings/global/UIGlobalSettingsNetwork.cpp (deleted)
• src/settings/global/UIGlobalSettingsNetwork.h (deleted)
• src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp (deleted)
• src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h (deleted)
• src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp (deleted)
• src/settings/global/UIGlobalSettingsPortForwardingDlg.h (deleted)

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

@@ -863 +863 @@
         src/settings/global/UIGlobalSettingsLanguage.h \
         src/settings/global/UIGlobalSettingsDisplay.h \
-        src/settings/global/UIGlobalSettingsNetwork.h \
-        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h \
-        src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
         src/settings/machine/UIMachineSettingsAudio.h \
         src/settings/machine/UIMachineSettingsDisplay.h \
@@ -1008 +1005 @@
         src/settings/editors/UIShortcutConfigurationEditor.cpp \
         src/settings/global/UIGlobalSettingsExtension.cpp \
-        src/settings/global/UIGlobalSettingsNetwork.cpp \
         src/settings/machine/UIMachineSettingsNetwork.cpp \
         src/settings/machine/UIMachineSettingsSerial.cpp \
@@ -1395 +1391 @@
         src/settings/global/UIGlobalSettingsLanguage.cpp \
         src/settings/global/UIGlobalSettingsDisplay.cpp \
-        src/settings/global/UIGlobalSettingsNetwork.cpp \
-        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp \
-        src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
         src/settings/machine/UIMachineSettingsAudio.cpp \
         src/settings/machine/UIMachineSettingsDisplay.cpp \

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

@@ -1867 +1867 @@
         case GlobalSettingsPageType_Language:   strResult = "Language"; break;
         case GlobalSettingsPageType_Display:    strResult = "Display"; break;
-        case GlobalSettingsPageType_Network:    strResult = "Network"; break;
         case GlobalSettingsPageType_Extensions: strResult = "Extensions"; break;
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -1894 +1893 @@
     keys << "Language";   values << GlobalSettingsPageType_Language;
     keys << "Display";    values << GlobalSettingsPageType_Display;
-    keys << "Network";    values << GlobalSettingsPageType_Network;
     keys << "Extensions"; values << GlobalSettingsPageType_Extensions;
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -1918 +1916 @@
         case GlobalSettingsPageType_Language:   return UIIconPool::pixmap(":/site_warning_16px.png");
         case GlobalSettingsPageType_Display:    return UIIconPool::pixmap(":/vrdp_warning_16px.png");
-        case GlobalSettingsPageType_Network:    return UIIconPool::pixmap(":/nw_warning_16px.png");
         case GlobalSettingsPageType_Extensions: return UIIconPool::pixmap(":/extension_pack_warning_16px.png");
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -824 +824 @@
     GlobalSettingsPageType_Language,
     GlobalSettingsPageType_Display,
-    GlobalSettingsPageType_Network,
     GlobalSettingsPageType_Extensions,
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -36 +36 @@
 #include "UIGlobalSettingsInput.h"
 #include "UIGlobalSettingsLanguage.h"
-#include "UIGlobalSettingsNetwork.h"
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 # include "UIGlobalSettingsProxy.h"
@@ -101 +100 @@
     m_pSelector->setItemText(GlobalSettingsPageType_Display, tr("Display"));
 
-    /* Network page: */
-    m_pSelector->setItemText(GlobalSettingsPageType_Network, tr("Network"));
-
     /* Extension page: */
     m_pSelector->setItemText(GlobalSettingsPageType_Extensions, tr("Extensions"));
@@ -236 +232 @@
                     addItem(":/vrdp_32px.png", ":/vrdp_24px.png", ":/vrdp_16px.png",
                             iPageIndex, "#display", pSettingsPage);
-                    addPageHelpKeyword(iPageIndex, "globalsettings");
-                    break;
-                }
-                /* Network page: */
-                case GlobalSettingsPageType_Network:
-                {
-                    pSettingsPage = new UIGlobalSettingsNetwork;
-                    addItem(":/nw_32px.png", ":/nw_24px.png", ":/nw_16px.png",
-                            iPageIndex, "#network", pSettingsPage);
                     addPageHelpKeyword(iPageIndex, "globalsettings");
                     break;
@@ -319 +306 @@
     switch (iPageId)
     {
-        case GlobalSettingsPageType_Network:
-        {
-#ifndef VBOX_WITH_NETFLT
-            return false;
-#endif
-            break;
-        }
         case GlobalSettingsPageType_Extensions:
             return !uiCommon().virtualBox().GetExtensionPackManager().isNull();