Changeset 66579 in vbox

Timestamp:

Apr 14, 2017 4:02:52 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: Get rid of VBoxGlobalSettings: Moving GUI features handling into extra-data manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (5 diffs)
• VBoxGlobalSettings.h (modified) (3 diffs)
• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp

@@ -51 +51 @@
 {
     /* default settings */
-    guiFeatures = QString::null;
     languageId  = QString::null;
     maxGuestRes = QString::null;
@@ -61 +60 @@
 VBoxGlobalSettingsData::VBoxGlobalSettingsData (const VBoxGlobalSettingsData &that)
 {
-    guiFeatures = that.guiFeatures;
     languageId  = that.languageId;
     maxGuestRes = that.maxGuestRes;
@@ -76 +74 @@
 {
     return this == &that ||
-        (guiFeatures == that.guiFeatures &&
-         languageId  == that.languageId &&
+        (languageId  == that.languageId &&
          maxGuestRes == that.maxGuestRes &&
          remapScancodes == that.remapScancodes &&
@@ -103 +100 @@
 gPropertyMap[] =
 {
-    { "GUI/Customizations",                        "guiFeatures",             "\\S+", true },
     { "GUI/LanguageID",                            "languageId",              gVBoxLangIDRegExp, true },
     { "GUI/MaxGuestResolution",                    "maxGuestRes",             "\\d*[1-9]\\d*,\\d*[1-9]\\d*|any|auto", true },
@@ -110 +106 @@
     { "GUI/HostScreenSaverDisabled",               "hostScreenSaverDisabled", "true|false", true }
 };
-
-bool VBoxGlobalSettings::isFeatureActive (const char *aFeature) const
-{
-    QStringList featureList = data()->guiFeatures.split (',');
-    return featureList.contains (aFeature);
-}
 
 /**

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -37 +37 @@
 private:
 
-    QString guiFeatures;
     QString languageId;
     QString maxGuestRes;
@@ -52 +51 @@
 {
     Q_OBJECT
-    Q_PROPERTY (QString guiFeatures READ guiFeatures WRITE setGuiFeatures)
     Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
     Q_PROPERTY (QString maxGuestRes READ maxGuestRes WRITE setMaxGuestRes)
@@ -71 +69 @@
 
     // Properties
-
-    QString guiFeatures() const { return data()->guiFeatures; }
-    void setGuiFeatures (const QString &aFeatures)
-    {
-        mData()->guiFeatures = aFeatures;
-    }
-    bool isFeatureActive (const char*) const;
 
     QString languageId() const { return data()->languageId; }

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

@@ -90 +90 @@
 template<> bool canConvert<PreviewUpdateIntervalType>();
 template<> bool canConvert<EventHandlingType>();
+template<> bool canConvert<GUIFeatureType>();
 template<> bool canConvert<GlobalSettingsPageType>();
 template<> bool canConvert<MachineSettingsPageType>();
@@ -167 +168 @@
 template<> PreviewUpdateIntervalType fromInternalInteger<PreviewUpdateIntervalType>(const int &iPreviewUpdateIntervalType);
 template<> EventHandlingType fromInternalString<EventHandlingType>(const QString &strEventHandlingType);
+template<> QString toInternalString(const GUIFeatureType &guiFeatureType);
+template<> GUIFeatureType fromInternalString<GUIFeatureType>(const QString &strGuiFeatureType);
 template<> QString toInternalString(const GlobalSettingsPageType &globalSettingsPageType);
 template<> GlobalSettingsPageType fromInternalString<GlobalSettingsPageType>(const QString &strGlobalSettingsPageType);

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

@@ -57 +57 @@
 template<> bool canConvert<PreviewUpdateIntervalType>() { return true; }
 template<> bool canConvert<EventHandlingType>() { return true; }
+template<> bool canConvert<GUIFeatureType>() { return true; }
 template<> bool canConvert<GlobalSettingsPageType>() { return true; }
 template<> bool canConvert<MachineSettingsPageType>() { return true; }
@@ -1124 +1125 @@
 }
 
+/* QString <= GUIFeatureType: */
+template<> QString toInternalString(const GUIFeatureType &guiFeatureType)
+{
+    QString strResult;
+    switch (guiFeatureType)
+    {
+        case GUIFeatureType_NoSelector:  strResult = "noSelector"; break;
+        case GUIFeatureType_NoMenuBar:   strResult = "noMenuBar"; break;
+        case GUIFeatureType_NoStatusBar: strResult = "noStatusBar"; break;
+        default:
+        {
+            AssertMsgFailed(("No text for GUI feature type=%d", guiFeatureType));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* GUIFeatureType <= QString: */
+template<> GUIFeatureType fromInternalString<GUIFeatureType>(const QString &strGuiFeatureType)
+{
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys;      QList<GUIFeatureType> values;
+    keys << "noSelector";  values << GUIFeatureType_NoSelector;
+    keys << "noMenuBar";   values << GUIFeatureType_NoMenuBar;
+    keys << "noStatusBar"; values << GUIFeatureType_NoStatusBar;
+    /* None type for unknown words: */
+    if (!keys.contains(strGuiFeatureType, Qt::CaseInsensitive))
+        return GUIFeatureType_None;
+    /* Corresponding type for known words: */
+    return values.at(keys.indexOf(QRegExp(strGuiFeatureType, Qt::CaseInsensitive)));
+}
+
 /* QString <= GlobalSettingsPageType: */
 template<> QString toInternalString(const GlobalSettingsPageType &globalSettingsPageType)

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

@@ -45 +45 @@
 
 /* Settings: */
+const char* UIExtraDataDefs::GUI_Customizations = "GUI/Customizations";
 const char* UIExtraDataDefs::GUI_RestrictedGlobalSettingsPages = "GUI/RestrictedGlobalSettingsPages";
 const char* UIExtraDataDefs::GUI_RestrictedMachineSettingsPages = "GUI/RestrictedMachineSettingsPages";

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

@@ -65 +65 @@
     /** @name Settings
       * @{ */
+        /** Holds GUI feature list. */
+        extern const char* GUI_Customizations;
         /** Holds restricted Global Settings pages. */
         extern const char* GUI_RestrictedGlobalSettingsPages;
@@ -500 +502 @@
 };
 
+/** Common UI: GUI feature types. */
+enum GUIFeatureType
+{
+    GUIFeatureType_None        = 0,
+    GUIFeatureType_NoSelector  = RT_BIT(0),
+    GUIFeatureType_NoMenuBar   = RT_BIT(1),
+    GUIFeatureType_NoStatusBar = RT_BIT(2),
+    GUIFeatureType_All         = 0xFF
+};
+
 /** Common UI: Global settings page types. */
 enum GlobalSettingsPageType

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

@@ -2297 +2297 @@
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
+bool UIExtraDataManager::guiFeatureEnabled(GUIFeatureType enmFeature)
+{
+    /* Acquire GUI feature list: */
+    GUIFeatureType enmFeatures = GUIFeatureType_None;
+    foreach (const QString &strValue, extraDataStringList(GUI_Customizations))
+        enmFeatures = static_cast<GUIFeatureType>(enmFeatures | gpConverter->fromInternalString<GUIFeatureType>(strValue));
+    /* Return whether the requested feature is enabled: */
+    return enmFeatures & enmFeature;
+}
+
 QList<GlobalSettingsPageType> UIExtraDataManager::restrictedGlobalSettingsPages()
 {

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

@@ -179 +179 @@
     /** @name Settings
       * @{ */
+        /** Returns whether GUI @a enmFeature is enabled. */
+        bool guiFeatureEnabled(GUIFeatureType enmFeature);
+
         /** Returns restricted global settings pages. */
         QList<GlobalSettingsPageType> restrictedGlobalSettingsPages();

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

@@ -4821 +4821 @@
 void VBoxGlobal::showUI()
 {
-    /* Load application settings: */
-    VBoxGlobalSettings appSettings = settings();
-
     /* Show Selector UI: */
     if (!isVMConsoleProcess())
     {
         /* Make sure Selector UI is permitted, quit if not: */
-        if (appSettings.isFeatureActive("noSelector"))
+        if (gEDataManager->guiFeatureEnabled(GUIFeatureType_NoSelector))
         {
             msgCenter().cannotStartSelector();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1312 +1312 @@
         /* Menu-bar options: */
         {
-            const bool fEnabledGlobally = !vboxGlobal().settings().isFeatureActive("noMenuBar");
+            const bool fEnabledGlobally = !gEDataManager->guiFeatureEnabled(GUIFeatureType_NoMenuBar);
             const bool fEnabledForMachine = gEDataManager->menuBarEnabled(strMachineID);
             const bool fEnabled = fEnabledGlobally && fEnabledForMachine;
@@ -1326 +1326 @@
         /* Status-bar options: */
         {
-            const bool fEnabledGlobally = !vboxGlobal().settings().isFeatureActive("noStatusBar");
+            const bool fEnabledGlobally = !gEDataManager->guiFeatureEnabled(GUIFeatureType_NoStatusBar);
             const bool fEnabledForMachine = gEDataManager->statusBarEnabled(strMachineID);
             const bool fEnabled = fEnabledGlobally && fEnabledForMachine;