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

Timestamp:

May 26, 2021 3:21:24 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10003: Introducing new GUI_ColorTheme extra-data flag and corresponding setter/getter; That stuff isn't yet handled anywhere.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (3 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (3 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (3 diffs)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012-2020 Oracle Corporation
+ * Copyright (C) 2012-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -105 +105 @@
 template<> SHARED_LIBRARY_STUFF bool canConvert<UIExtraDataMetaDefs::DetailsElementOptionTypeUserInterface>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<UIExtraDataMetaDefs::DetailsElementOptionTypeDescription>();
+template<> SHARED_LIBRARY_STUFF bool canConvert<UIColorThemeType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<UIToolType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<UIVisualStateType>();
@@ -217 +218 @@
 template<> SHARED_LIBRARY_STUFF QString toInternalString(const UIExtraDataMetaDefs::DetailsElementOptionTypeDescription &enmDetailsElementOptionTypeDescription);
 template<> SHARED_LIBRARY_STUFF UIExtraDataMetaDefs::DetailsElementOptionTypeDescription fromInternalString<UIExtraDataMetaDefs::DetailsElementOptionTypeDescription>(const QString &strDetailsElementOptionTypeDescription);
+template<> SHARED_LIBRARY_STUFF QString toString(const UIColorThemeType &colorThemeType);
+template<> SHARED_LIBRARY_STUFF QString toInternalString(const UIColorThemeType &colorThemeType);
+template<> SHARED_LIBRARY_STUFF UIColorThemeType fromInternalString<UIColorThemeType>(const QString &strColorThemeType);
 template<> SHARED_LIBRARY_STUFF QString toInternalString(const UIToolType &enmToolType);
 template<> SHARED_LIBRARY_STUFF UIToolType fromInternalString<UIToolType>(const QString &strToolType);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012-2020 Oracle Corporation
+ * Copyright (C) 2012-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -59 +59 @@
 template<> bool canConvert<UIExtraDataMetaDefs::DetailsElementOptionTypeUserInterface>() { return true; }
 template<> bool canConvert<UIExtraDataMetaDefs::DetailsElementOptionTypeDescription>() { return true; }
+template<> bool canConvert<UIColorThemeType>() { return true; }
 template<> bool canConvert<UIToolType>() { return true; }
 template<> bool canConvert<UIVisualStateType>() { return true; }
@@ -1506 +1507 @@
 }
 
+/* QString <= UIColorThemeType: */
+template<> QString toString(const UIColorThemeType &colorThemeType)
+{
+    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<> QString toInternalString(const UIColorThemeType &colorThemeType)
+{
+    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 fromInternalString<UIColorThemeType>(const QString &strColorThemeType)
+{
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys; QList<UIColorThemeType> values;
+    keys << "Light";  values << UIColorThemeType_Light;
+    keys << "Dark";   values << UIColorThemeType_Dark;
+    /* Auto type for unknown words: */
+    if (!keys.contains(strColorThemeType, Qt::CaseInsensitive))
+        return UIColorThemeType_Auto;
+    /* Corresponding type for known words: */
+    return values.at(keys.indexOf(QRegExp(strColorThemeType, Qt::CaseInsensitive)));
+}
+
 /* QString <= UIToolType: */
 template<> QString toInternalString(const UIToolType &enmToolType)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 /* General: */
 const char *UIExtraDataDefs::GUI_RestrictedDialogs = "GUI/RestrictedDialogs";
+const char *UIExtraDataDefs::GUI_ColorTheme = "GUI/ColorTheme";
 
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46 +46 @@
         /** Holds restricted dialogs. */
         SHARED_LIBRARY_STUFF extern const char *GUI_RestrictedDialogs;
+
+        /** Holds the color theme type. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_ColorTheme;
     /** @} */
 
@@ -879 +882 @@
 
 
+/** Common UI: Color Theme types. */
+enum UIColorThemeType
+{
+    UIColorThemeType_Auto,
+    UIColorThemeType_Light,
+    UIColorThemeType_Dark,
+};
+Q_DECLARE_METATYPE(UIColorThemeType);
+
+
 /** Tool item classes. */
 enum UIToolClass

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2020 Oracle Corporation
+ * Copyright (C) 2010-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2313 +2313 @@
 }
 
+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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2020 Oracle Corporation
+ * Copyright (C) 2010-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -162 +162 @@
         /** 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);
     /** @} */