QQuickApplicationWindow: add locale property

Change-Id: I1292d1fb856710e38add8d77ae6e3dac28137cd9
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

5 files changed, 152 insertions, 0 deletions

diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp
index d2625a7b..46f07d3e 100644
--- a/src/templates/qquickapplicationwindow.cpp
+++ b/src/templates/qquickapplicationwindow.cpp
@@ -120,6 +120,7 @@ public:
     QQuickItem *footer;
     QQuickOverlay *overlay;
     QFont font;
+    QLocale locale;
     QQuickItem *activeFocusControl;
     QQuickApplicationWindow *q_ptr;
 };
@@ -410,6 +411,28 @@ void QQuickApplicationWindowPrivate::updateFont(const QFont &f)
     emit q->fontChanged();
 }
 
+QLocale QQuickApplicationWindow::locale() const
+{
+    Q_D(const QQuickApplicationWindow);
+    return d->locale;
+}
+
+void QQuickApplicationWindow::setLocale(const QLocale &locale)
+{
+    Q_D(QQuickApplicationWindow);
+    if (d->locale == locale)
+        return;
+
+    d->locale = locale;
+    QQuickControlPrivate::updateLocaleRecur(contentItem(), locale);
+    emit localeChanged();
+}
+
+void QQuickApplicationWindow::resetLocale()
+{
+    setLocale(QLocale());
+}
+
 QQuickApplicationWindowAttached *QQuickApplicationWindow::qmlAttachedProperties(QObject *object)
 {
     return new QQuickApplicationWindowAttached(object);
diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h
index a2069cd8..c9e619be 100644
--- a/src/templates/qquickapplicationwindow_p.h
+++ b/src/templates/qquickapplicationwindow_p.h
@@ -51,6 +51,7 @@
 #include <QtQuick/private/qquickwindowmodule_p.h>
 #include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
 #include <QtGui/qfont.h>
+#include <QtCore/qlocale.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -69,6 +70,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImp
     Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL)
     Q_PROPERTY(QQuickOverlay *overlay READ overlay CONSTANT FINAL)
     Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged)
+    Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL)
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
@@ -92,6 +94,10 @@ public:
     void setFont(const QFont &);
     void resetFont();
 
+    QLocale locale() const;
+    void setLocale(const QLocale &locale);
+    void resetLocale();
+
     static QQuickApplicationWindowAttached *qmlAttachedProperties(QObject *object);
 
 Q_SIGNALS:
@@ -99,6 +105,7 @@ Q_SIGNALS:
     void headerChanged();
     void footerChanged();
     void fontChanged();
+    void localeChanged();
 
 protected:
     bool isComponentComplete() const;
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index 97a85d4b..d1abafe2 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
@@ -659,6 +659,9 @@ QLocale QQuickControlPrivate::calcLocale() const
         p = p->parentItem();
     }
 
+    if (QQuickApplicationWindow *w = qobject_cast<QQuickApplicationWindow *>(q->window()))
+        return w->locale();
+
     return QLocale();
 }
 
diff --git a/tests/auto/applicationwindow/data/locale.qml b/tests/auto/applicationwindow/data/locale.qml
new file mode 100644
index 00000000..59c42f85
--- /dev/null
+++ b/tests/auto/applicationwindow/data/locale.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import Qt.labs.controls 1.0
+import Qt.labs.templates 1.0 as T
+
+ApplicationWindow {
+    objectName: "appWin"
+    width: 400
+    height: 400
+
+    property alias mainItem: mainItem
+
+    T.Control {
+        id: mainItem
+        objectName: "mainItem"
+        anchors.fill: parent
+        property alias item_2: _item_2;
+        property alias item_3: _item_3;
+        T.Control {
+            id: _item_2
+            objectName: "_item_2"
+            T.Control {
+                id: _item_3
+                objectName: "_item_3"
+            }
+        }
+    }
+}
diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp
index 63d0acff..8256f16b 100644
--- a/tests/auto/applicationwindow/tst_applicationwindow.cpp
+++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp
@@ -65,6 +65,7 @@ private slots:
     void implicitFill();
     void attachedProperties();
     void font();
+    void locale();
     void activeFocusControl_data();
     void activeFocusControl();
 };
@@ -491,6 +492,57 @@ void tst_applicationwindow::font()
     QCOMPARE(item6->font(), font);
 }
 
+void tst_applicationwindow::locale()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.loadUrl(testFileUrl("locale.qml"));
+    QObject* created = component.create();
+    QScopedPointer<QObject> cleanup(created);
+    QVERIFY(created);
+
+    QQuickApplicationWindow* window = qobject_cast<QQuickApplicationWindow*>(created);
+    QVERIFY(window);
+    QVERIFY(!window->isVisible());
+    QCOMPARE(window->width(), 400);
+    QCOMPARE(window->height(), 400);
+
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QLocale l = window->locale();
+
+    QQuickControl *mainItem = window->property("mainItem").value<QQuickControl*>();
+    QVERIFY(mainItem);
+    QCOMPARE(mainItem->width(), 400.0);
+    QCOMPARE(mainItem->height(), 400.0);
+    QCOMPARE(mainItem->locale(), l);
+
+    QQuickControl *item2 = mainItem->property("item_2").value<QQuickControl*>();
+    QVERIFY(item2);
+    QQuickControl *item3 = mainItem->property("item_3").value<QQuickControl*>();
+    QVERIFY(item3);
+
+    QCOMPARE(item2->locale(), l);
+    QCOMPARE(item3->locale(), l);
+
+    l = QLocale("en_US");
+    window->setLocale(l);
+
+    QCOMPARE(window->locale(), l);
+    QCOMPARE(mainItem->locale(), l);
+    QCOMPARE(item2->locale(), l);
+    QCOMPARE(item3->locale(), l);
+
+    l = QLocale("ar_EG");
+    window->setLocale(l);
+
+    QCOMPARE(window->locale(), l);
+    QCOMPARE(mainItem->locale(), l);
+    QCOMPARE(item2->locale(), l);
+    QCOMPARE(item3->locale(), l);
+}
+
 void tst_applicationwindow::activeFocusControl_data()
 {
     QTest::addColumn<QByteArray>("containerName");