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

Timestamp:

Apr 13, 2007 9:31:17 AM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed: It was impossible to set GUI/LanguageID to null (i.e. delete this key to reset the language to the default).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VMGlobalSettings.cpp (modified) (3 diffs)

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

@@ -91 +91 @@
     const char *name;
     const char *rx;
+    bool canDelete;
 }
 gPropertyMap[] =
 {
-    { "GUI/Input/HostKey",      "hostKey",      "\\d*[1-9]\\d*" },
-    { "GUI/Input/AutoCapture",  "autoCapture",  "true|false" },
-    { "GUI/Customizations",     "guiFeatures",  "\\S+" },
+    { "GUI/Input/HostKey",      "hostKey",      "\\d*[1-9]\\d*", true },
+    { "GUI/Input/AutoCapture",  "autoCapture",  "true|false", true },
+    { "GUI/Customizations",     "guiFeatures",  "\\S+", true },
     /* LanguageID regexp must correlate with gVBoxLangIDRegExp in
      * VBoxGlobal.cpp */
-    { "GUI/LanguageID",         "languageId",   "(([a-z]{2})(_([A-Z]{2}))?)|(built_in)" },
+    { "GUI/LanguageID",         "languageId",   "(([a-z]{2})(_([A-Z]{2}))?)|(built_in)", true },
 };
 
@@ -223 +224 @@
 void VMGlobalSettings::setPropertyPrivate (int index, const QString &value)
 {
-    if (!QRegExp (gPropertyMap [index].rx).exactMatch (value))
-    {
-        last_err = tr ("The value '%1' of the key '%2' doesn't match the "
-                       "regexp constraint '%3'.")
-                       .arg (value, gPropertyMap [index].publicName,
-                             gPropertyMap [index].rx);
-        return;
+    if (value.isNull())
+    {
+        if (!gPropertyMap [index].canDelete)
+        {
+            last_err = tr ("Cannot delete the key '%1'.")
+                .arg (gPropertyMap [index].publicName);
+            return;
+        }
+    }
+    else
+    {
+        if (!QRegExp (gPropertyMap [index].rx).exactMatch (value))
+        {
+            last_err = tr ("The value '%1' of the key '%2' doesn't match the "
+                           "regexp constraint '%3'.")
+                .arg (value, gPropertyMap [index].publicName,
+                      gPropertyMap [index].rx);
+            return;
+        }
     }
 
@@ -241 +254 @@
         Assert (ok);
         if (ok)
+        {
+            last_err = QString::null;
             emit propertyChanged (gPropertyMap [index].publicName,
                                   gPropertyMap [index].name);
-    }
-}
-
+        }
+    }
+}
+