Locale: expose NumberOptions to QML

As we want to specify how DoubleValidator and fromLocaleString handle
number separators, we need to expose NumberOptions to QML.

The referenced bug report is still unsolved, as we  we still lack a method
to change DoubleValidator's behavior and NumberOptions does not have a
value to ignore occurrences of separators at arbitray places.

Task-number: QTBUG-75110
Change-Id: I81f48439114cad12e0e977bab09b0aa4e240fbab
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

2 files changed, 41 insertions, 0 deletions

diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index dca13ac8d4..139074c648 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -478,6 +478,23 @@ ReturnedValue QQmlLocaleData::method_get_firstDayOfWeek(const QV4::FunctionObjec
     RETURN_RESULT(fdow);
 }
 
+ReturnedValue QQmlLocaleData::method_get_numberOptions(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) {
+    QV4::Scope scope(b);
+    const QLocale *locale = getThisLocale(scope, thisObject);
+    if (!locale)
+        return Encode::undefined();
+    int numberOptions = int(locale->numberOptions());
+    RETURN_RESULT(numberOptions);
+}
+
+ReturnedValue QQmlLocaleData::method_set_numberOptions(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc) {
+    QV4::Scope scope(b);
+    QLocale *locale = getThisLocale(scope, thisObject);
+    int const numberOptions = argc ? int(argv[0].toNumber()) : QLocale::DefaultNumberOptions;
+    locale->setNumberOptions(QLocale::NumberOptions {numberOptions});
+    return Encode::undefined();
+}
+
 ReturnedValue QQmlLocaleData::method_get_measurementSystem(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int)
 {
     QV4::Scope scope(b);
@@ -701,6 +718,7 @@ QV4LocaleDataDeletable::QV4LocaleDataDeletable(QV4::ExecutionEngine *engine)
     o->defineAccessorProperty(QStringLiteral("amText"), QQmlLocaleData::method_get_amText, nullptr);
     o->defineAccessorProperty(QStringLiteral("measurementSystem"), QQmlLocaleData::method_get_measurementSystem, nullptr);
     o->defineAccessorProperty(QStringLiteral("exponential"), QQmlLocaleData::method_get_exponential, nullptr);
+    o->defineAccessorProperty(QStringLiteral("numberOptions"), QQmlLocaleData::method_get_numberOptions, QQmlLocaleData::method_set_numberOptions);
 
     prototype.set(engine, o);
 }
@@ -873,6 +891,16 @@ ReturnedValue QQmlLocale::method_localeCompare(const QV4::FunctionObject *b, con
 */
 
 /*!
+    \qmlproperty enumeration QtQml::Locale::NumberOption
+
+    Holds a set of options for number-to-string and
+    string-to-number conversions.
+
+    \sa Number::toLocaleString()
+    \sa Number::fromLocaleString()
+*/
+
+/*!
     \qmlproperty string QtQml::Locale::percent
 
     Holds the percent character of this locale.
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index 10e0dfcc38..1d6fdb12a7 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -131,6 +131,16 @@ public:
         Saturday = Qt::Saturday
     };
     Q_ENUM(DayOfWeek)
+    enum NumberOptions {
+        DefaultNumberOptions = QLocale::DefaultNumberOptions,
+        OmitGroupSeparator = QLocale::OmitGroupSeparator,
+        RejectGroupSeparator = QLocale::RejectGroupSeparator,
+        OmitLeadingZeroInExponent = QLocale::OmitLeadingZeroInExponent,
+        RejectLeadingZeroInExponent = QLocale::RejectLeadingZeroInExponent,
+        IncludeTrailingZeroesAfterDot = QLocale::IncludeTrailingZeroesAfterDot,
+        RejectTrailingZeroesAfterDot = QLocale::RejectTrailingZeroesAfterDot
+    };
+    Q_ENUM(NumberOptions)
 
     static QV4::ReturnedValue locale(QV4::ExecutionEngine *engine, const QString &localeName);
     static QV4::ReturnedValue wrap(QV4::ExecutionEngine *engine, const QLocale &locale);
@@ -200,6 +210,9 @@ struct QQmlLocaleData : public QV4::Object
     static QV4::ReturnedValue method_get_exponential(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc);
     static QV4::ReturnedValue method_get_amText(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc);
     static QV4::ReturnedValue method_get_pmText(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc);
+
+    static QV4::ReturnedValue method_get_numberOptions(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc);
+    static QV4::ReturnedValue method_set_numberOptions(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc);
 };
 
 }