Changeset 107148 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 26, 2024 2:00:36 PM (7 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10807: Windows: Wiping out all the code related to Global Interface page and Color Theme editor; That effectively enables new Windows Dark color theme of Qt 6.8.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/converter/UIConverterBackendGlobal.cpp (modified) (4 diffs)
• src/extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• src/extradata/UIExtraDataDefs.h (modified) (3 diffs)
• src/extradata/UIExtraDataManager.cpp (modified) (1 diff)
• src/extradata/UIExtraDataManager.h (modified) (1 diff)
• src/globals/UICommon.cpp (modified) (2 diffs)
• src/settings/UIAdvancedSettingsDialogSpecific.cpp (modified) (3 diffs)
• src/settings/editors/UIColorThemeEditor.cpp (deleted)
• src/settings/editors/UIColorThemeEditor.h (deleted)
• src/settings/global/UIGlobalSettingsInterface.cpp (deleted)
• src/settings/global/UIGlobalSettingsInterface.h (deleted)

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

@@ -875 +875 @@
         src/settings/editors/UIBootOrderEditor.h \
         src/settings/editors/UIChipsetEditor.h \
-        src/settings/editors/UIColorThemeEditor.h \
         src/settings/editors/UIDefaultMachineFolderEditor.h \
         src/settings/editors/UIDescriptionEditor.h \
@@ -926 +925 @@
         src/settings/global/UIGlobalSettingsLanguage.h \
         src/settings/global/UIGlobalSettingsDisplay.h \
-        src/settings/global/UIGlobalSettingsInterface.h \
         src/settings/machine/UIMachineSettingsAudio.h \
         src/settings/machine/UIMachineSettingsDisplay.h \
@@ -1460 +1458 @@
         src/settings/editors/UIBootOrderEditor.cpp \
         src/settings/editors/UIChipsetEditor.cpp \
-        src/settings/editors/UIColorThemeEditor.cpp \
         src/settings/editors/UIDefaultMachineFolderEditor.cpp \
         src/settings/editors/UIDescriptionEditor.cpp \
@@ -1511 +1508 @@
         src/settings/global/UIGlobalSettingsLanguage.cpp \
         src/settings/global/UIGlobalSettingsDisplay.cpp \
-        src/settings/global/UIGlobalSettingsInterface.cpp \
         src/settings/machine/UIMachineSettingsAudio.cpp \
         src/settings/machine/UIMachineSettingsDisplay.cpp \

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

@@ -1629 +1629 @@
 }
 
-/* QString <= UIColorThemeType: */
-template<> SHARED_LIBRARY_STUFF QString UIConverter::toString(const UIColorThemeType &colorThemeType) const
-{
-    QString strResult;
-    switch (colorThemeType)
-    {
-        case UIColorThemeType_Auto:  strResult = QApplication::translate("UICommon", "Follow System Settings", "color theme"); break;
-        case UIColorThemeType_Light: strResult = QApplication::translate("UICommon", "Light", "color theme"); break;
-        case UIColorThemeType_Dark:  strResult = QApplication::translate("UICommon", "Dark", "color theme"); break;
-        default:
-        {
-            AssertMsgFailed(("No text for color theme type=%d", colorThemeType));
-            break;
-        }
-    }
-    return strResult;
-}
-
-/* QString <= UIColorThemeType: */
-template<> SHARED_LIBRARY_STUFF QString UIConverter::toInternalString(const UIColorThemeType &colorThemeType) const
-{
-    QString strResult;
-    switch (colorThemeType)
-    {
-        case UIColorThemeType_Auto:  break;
-        case UIColorThemeType_Light: strResult = "Light"; break;
-        case UIColorThemeType_Dark:  strResult = "Dark"; break;
-        default:
-        {
-            AssertMsgFailed(("No text for color theme type=%d", colorThemeType));
-            break;
-        }
-    }
-    return strResult;
-}
-
-/* UIColorThemeType <= QString: */
-template<> UIColorThemeType SHARED_LIBRARY_STUFF UIConverter::fromInternalString<UIColorThemeType>(const QString &strColorThemeType) const
-{
-    if (strColorThemeType.compare("Light", Qt::CaseInsensitive) == 0)
-        return UIColorThemeType_Light;
-    if (strColorThemeType.compare("Dark", Qt::CaseInsensitive) == 0)
-        return UIColorThemeType_Dark;
-    return UIColorThemeType_Auto;
-}
-
 /* UILaunchMode <= QString: */
 template<> UILaunchMode SHARED_LIBRARY_STUFF UIConverter::fromInternalString<UILaunchMode>(const QString &strDefaultFrontendType) const
@@ -2111 +2065 @@
         case GlobalSettingsPageType_Proxy:      strResult = "Proxy"; break;
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-        case GlobalSettingsPageType_Interface:  strResult = "Interface"; break;
         default:
         {
@@ -2140 +2093 @@
         return GlobalSettingsPageType_Proxy;
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-    if (strGlobalSettingsPageType.compare("Interface", Qt::CaseInsensitive) == 0)
-        return GlobalSettingsPageType_Interface;
     return GlobalSettingsPageType_Invalid;
 }
@@ -2160 +2111 @@
         case GlobalSettingsPageType_Proxy:      return UIIconPool::pixmap(":/proxy_warning_16px.png");
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-        case GlobalSettingsPageType_Interface:  return UIIconPool::pixmap(":/interface_warning_16px.png");
         default: AssertMsgFailed(("No pixmap for %d", type)); break;
     }

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

@@ -32 +32 @@
 /* General: */
 const char *UIExtraDataDefs::GUI_RestrictedDialogs = "GUI/RestrictedDialogs";
-const char *UIExtraDataDefs::GUI_ColorTheme = "GUI/ColorTheme";
 
 

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

@@ -53 +53 @@
         /** Holds restricted dialogs. */
         SHARED_LIBRARY_STUFF extern const char *GUI_RestrictedDialogs;
-
-        /** Holds the color theme type. */
-        SHARED_LIBRARY_STUFF extern const char *GUI_ColorTheme;
     /** @} */
 
@@ -872 +869 @@
     GlobalSettingsPageType_Proxy,
 #endif
-    GlobalSettingsPageType_Interface,
     GlobalSettingsPageType_Max
 };
@@ -936 +932 @@
     WizardMode_Expert
 };
-
-
-/** Common UI: Color Theme types. */
-enum UIColorThemeType
-{
-    UIColorThemeType_Auto,
-    UIColorThemeType_Light,
-    UIColorThemeType_Dark,
-};
-Q_DECLARE_METATYPE(UIColorThemeType);
 
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2334 +2334 @@
 }
 
-UIColorThemeType UIExtraDataManager::colorTheme()
-{
-    return gpConverter->fromInternalString<UIColorThemeType>(extraDataString(GUI_ColorTheme));
-}
-
-void UIExtraDataManager::setColorTheme(const UIColorThemeType &enmType)
-{
-    setExtraDataString(GUI_ColorTheme, gpConverter->toInternalString(enmType));
-}
-
 QStringList UIExtraDataManager::suppressedMessages(const QUuid &uID /* = GlobalID */)
 {

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

@@ -190 +190 @@
         /** Defines a list of restricted dialogs. */
         void setRestrictedDialogTypes(UIExtraDataMetaDefs::DialogType enmTypes, const QUuid &uID);
-
-        /** Returns color theme type. */
-        UIColorThemeType colorTheme();
-        /** Defines color theme @a enmType. */
-        void setColorTheme(const UIColorThemeType &enmType);
     /** @} */
 

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

@@ -817 +817 @@
 bool UICommon::isWindowsInDarkMode() const
 {
-    /* Load saved color theme: */
-    UIColorThemeType enmColorTheme = gEDataManager->colorTheme();
-
-    /* Check whether we have dark system theme requested: */
-    if (enmColorTheme == UIColorThemeType_Auto)
-    {
-        QSettings settings("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
-                           QSettings::NativeFormat);
-        if (settings.value("AppsUseLightTheme") == 0)
-            enmColorTheme = UIColorThemeType_Dark;
-    }
-
-    /* Return result: */
-    return enmColorTheme == UIColorThemeType_Dark;
+    /* Check if Windows registry has no Light flag, that means system will use Dark mode: */
+    QSettings settings("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                       QSettings::NativeFormat);
+    return settings.value("AppsUseLightTheme") == 0;
 }
 
@@ -920 +910 @@
     }
 
-#elif defined(VBOX_WS_WIN)
-
-    /* For the Dark mode! */
-    if (isInDarkMode())
-    {
-        qApp->setStyle(QStyleFactory::create("Fusion"));
-        QPalette darkPalette;
-        QColor windowColor1 = QColor(59, 60, 61);
-        QColor windowColor2 = QColor(63, 64, 65);
-        QColor baseColor1 = QColor(46, 47, 48);
-        QColor baseColor2 = QColor(56, 57, 58);
-        QColor disabledColor = QColor(113, 114, 115);
-        darkPalette.setColor(QPalette::Window, windowColor1);
-        darkPalette.setColor(QPalette::WindowText, Qt::white);
-        darkPalette.setColor(QPalette::Disabled, QPalette::WindowText, disabledColor);
-        darkPalette.setColor(QPalette::Base, baseColor1);
-        darkPalette.setColor(QPalette::AlternateBase, baseColor2);
-        darkPalette.setColor(QPalette::PlaceholderText, disabledColor);
-        darkPalette.setColor(QPalette::Text, Qt::white);
-        darkPalette.setColor(QPalette::Disabled, QPalette::Text, disabledColor);
-        darkPalette.setColor(QPalette::Button, windowColor2);
-        darkPalette.setColor(QPalette::ButtonText, Qt::white);
-        darkPalette.setColor(QPalette::Disabled, QPalette::ButtonText, disabledColor);
-        darkPalette.setColor(QPalette::BrightText, Qt::red);
-        darkPalette.setColor(QPalette::Link, QColor(179, 214, 242));
-        darkPalette.setColor(QPalette::Highlight, QColor(29, 84, 92));
-        darkPalette.setColor(QPalette::HighlightedText, Qt::white);
-        darkPalette.setColor(QPalette::Disabled, QPalette::HighlightedText, disabledColor);
-        qApp->setPalette(darkPalette);
-        qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2b2b2b; border: 1px solid #737373; }");
-    }
-
-#else /* Linux, BSD, Solaris */
+#elif defined(VBOX_WS_NIX) /* Linux, BSD, Solaris */
 
     /* For the Dark mode! */

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

@@ -47 +47 @@
 #include "UIGlobalSettingsInput.h"
 #include "UIGlobalSettingsLanguage.h"
-#ifdef VBOX_WS_WIN
-# include "UIGlobalSettingsInterface.h"
-#endif
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 # include "UIGlobalSettingsProxy.h"
@@ -113 +110 @@
 #endif
 
-#ifdef VBOX_WS_WIN
-    /* Interface page: */
-    m_pSelector->setItemText(GlobalSettingsPageType_Interface, tr("Interface"));
-#endif
-
     /* Polish the selector: */
     m_pSelector->polish();
@@ -258 +250 @@
                 }
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-#ifdef VBOX_WS_WIN
-                /* Interface page: */
-                case GlobalSettingsPageType_Interface:
-                {
-                    pSettingsPage = new UIGlobalSettingsInterface;
-                    addItem(":/interface_32px.png", ":/interface_24px.png", ":/interface_16px.png",
-                            iPageIndex, "#userInterface", pSettingsPage);
-                    addPageHelpKeyword(iPageIndex, "preferences");
-                    break;
-                }
-#endif /* VBOX_WS_WIN */
                 default:
                     break;