Changeset 87418 in vbox

Timestamp:

Jan 25, 2021 2:18:00 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9913: Global Preferences: Remove Extensions 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/globals/UICommon.cpp (modified) (1 diff)
• src/settings/UISettingsDialogSpecific.cpp (modified) (4 diffs)
• src/settings/global/UIGlobalSettingsExtension.cpp (deleted)
• src/settings/global/UIGlobalSettingsExtension.h (deleted)

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

@@ -861 +861 @@
         src/settings/editors/UIVisualStateEditor.h \
         src/settings/editors/UIVRDEAuthLibraryEditor.h \
-        src/settings/global/UIGlobalSettingsExtension.h \
         src/settings/global/UIGlobalSettingsGeneral.h \
         src/settings/global/UIGlobalSettingsInput.h \
@@ -1008 +1007 @@
         src/settings/editors/UILanguageSettingsEditor.cpp \
         src/settings/editors/UIShortcutConfigurationEditor.cpp \
-        src/settings/global/UIGlobalSettingsExtension.cpp \
         src/settings/machine/UIMachineSettingsNetwork.cpp \
         src/settings/machine/UIMachineSettingsSerial.cpp \
@@ -1392 +1390 @@
         src/settings/editors/UIVisualStateEditor.cpp \
         src/settings/editors/UIVRDEAuthLibraryEditor.cpp \
-        src/settings/global/UIGlobalSettingsExtension.cpp \
         src/settings/global/UIGlobalSettingsGeneral.cpp \
         src/settings/global/UIGlobalSettingsInput.cpp \

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

@@ -1869 +1869 @@
         case GlobalSettingsPageType_Language:   strResult = "Language"; break;
         case GlobalSettingsPageType_Display:    strResult = "Display"; break;
-        case GlobalSettingsPageType_Extensions: strResult = "Extensions"; break;
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         case GlobalSettingsPageType_Proxy:      strResult = "Proxy"; break;
@@ -1895 +1894 @@
     keys << "Language";   values << GlobalSettingsPageType_Language;
     keys << "Display";    values << GlobalSettingsPageType_Display;
-    keys << "Extensions"; values << GlobalSettingsPageType_Extensions;
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     keys << "Proxy";      values << GlobalSettingsPageType_Proxy;
@@ -1918 +1916 @@
         case GlobalSettingsPageType_Language:   return UIIconPool::pixmap(":/site_warning_16px.png");
         case GlobalSettingsPageType_Display:    return UIIconPool::pixmap(":/vrdp_warning_16px.png");
-        case GlobalSettingsPageType_Extensions: return UIIconPool::pixmap(":/extension_pack_warning_16px.png");
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         case GlobalSettingsPageType_Proxy:      return UIIconPool::pixmap(":/proxy_warning_16px.png");

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

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

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -3726 +3726 @@
         /* Show installation progress: */
         /** @todo move this tr into UIUpdateManager context */
-        msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIGlobalSettingsExtension",
-                                                                              "Extensions"),
+        msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIExtensionPackManagerWidget",
+                                                                                 "Extensions"),
                                             ":/progress_install_guest_additions_90px.png", pParent);
         if (!comProgress.GetCanceled())

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

@@ -32 +32 @@
 /* GUI includes: Global Preferences: */
 #include "UIGlobalSettingsDisplay.h"
-#include "UIGlobalSettingsExtension.h"
 #include "UIGlobalSettingsGeneral.h"
 #include "UIGlobalSettingsInput.h"
@@ -100 +99 @@
     m_pSelector->setItemText(GlobalSettingsPageType_Display, tr("Display"));
 
-    /* Extension page: */
-    m_pSelector->setItemText(GlobalSettingsPageType_Extensions, tr("Extensions"));
-
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* Proxy page: */
@@ -232 +228 @@
                     addItem(":/vrdp_32px.png", ":/vrdp_24px.png", ":/vrdp_16px.png",
                             iPageIndex, "#display", pSettingsPage);
-                    addPageHelpKeyword(iPageIndex, "globalsettings");
-                    break;
-                }
-                /* Extensions page: */
-                case GlobalSettingsPageType_Extensions:
-                {
-                    pSettingsPage = new UIGlobalSettingsExtension;
-                    addItem(":/extension_pack_32px.png", ":/extension_pack_24px.png", ":/extension_pack_16px.png",
-                            iPageIndex, "#extensions", pSettingsPage);
                     addPageHelpKeyword(iPageIndex, "globalsettings");
                     break;
@@ -302 +289 @@
 }
 
-bool UISettingsDialogGlobal::isPageAvailable(int iPageId) const
-{
-    switch (iPageId)
-    {
-        case GlobalSettingsPageType_Extensions:
-            return !uiCommon().virtualBox().GetExtensionPackManager().isNull();
-        default:
-            break;
-    }
+bool UISettingsDialogGlobal::isPageAvailable(int) const
+{
+    /* Add restrictions here.. */
     return true;
 }