Add Popup::locale

Change-Id: I1f07318f3e018debd74e41bc0a1443c45def7bf3
Task-number: QTBUG-50984
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

5 files changed, 60 insertions, 7 deletions

diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp
index 93908f3d..0281e3c3 100644
--- a/src/templates/qquickapplicationwindow.cpp
+++ b/src/templates/qquickapplicationwindow.cpp
@@ -518,6 +518,12 @@ void QQuickApplicationWindow::setLocale(const QLocale &locale)
 
     d->locale = locale;
     QQuickControlPrivate::updateLocaleRecur(QQuickWindow::contentItem(), locale);
+
+    // TODO: internal QQuickPopupManager that provides reliable access to all QQuickPopup instances
+    const QList<QQuickPopup *> popups = QQuickWindow::contentItem()->findChildren<QQuickPopup *>();
+    for (QQuickPopup *popup : popups)
+        QQuickControlPrivate::get(static_cast<QQuickControl *>(popup->popupItem()))->updateLocale(locale, false); // explicit=false
+
     emit localeChanged();
 }
 
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index 96036d33..71e783e7 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
@@ -672,11 +672,6 @@ QLocale QQuickControlPrivate::calcLocale(const QQuickItem *item)
 {
     const QQuickItem *p = item;
     while (p) {
-        if (const QQuickPopupItem *popup = qobject_cast<const QQuickPopupItem *>(p)) {
-            item = popup;
-            break;
-        }
-
         if (const QQuickControl *control = qobject_cast<const QQuickControl *>(p))
             return control->locale();
 
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp
index e5ccb15b..25053967 100644
--- a/src/templates/qquickpopup.cpp
+++ b/src/templates/qquickpopup.cpp
@@ -409,6 +409,13 @@ void QQuickPopupItem::geometryChanged(const QRectF &newGeometry, const QRectF &o
     d->popup->geometryChanged(newGeometry, oldGeometry);
 }
 
+void QQuickPopupItem::localeChange(const QLocale &newLocale, const QLocale &oldLocale)
+{
+    Q_D(QQuickPopupItem);
+    QQuickControl::localeChange(newLocale, oldLocale);
+    d->popup->localeChange(newLocale, oldLocale);
+}
+
 void QQuickPopupItem::itemChange(ItemChange change, const ItemChangeData &data)
 {
     Q_D(QQuickPopupItem);
@@ -1199,6 +1206,31 @@ void QQuickPopup::resetBottomPadding()
 }
 
 /*!
+    \qmlproperty Locale Qt.labs.controls::Popup::locale
+
+    This property holds the locale of the popup.
+
+    \sa {LayoutMirroring}{LayoutMirroring}
+*/
+QLocale QQuickPopup::locale() const
+{
+    Q_D(const QQuickPopup);
+    return d->popupItem->locale();
+}
+
+void QQuickPopup::setLocale(const QLocale &locale)
+{
+    Q_D(QQuickPopup);
+    d->popupItem->setLocale(locale);
+}
+
+void QQuickPopup::resetLocale()
+{
+    Q_D(QQuickPopup);
+    d->popupItem->resetLocale();
+}
+
+/*!
     \qmlproperty font Qt.labs.controls::Popup::font
 
     This property holds the font currently set for the popup.
@@ -1256,8 +1288,12 @@ void QQuickPopup::setParentItem(QQuickItem *parent)
     d->parentItem = parent;
     if (d->positioner.parentItem())
         d->positioner.setParentItem(parent);
-    if (parent)
-        QQuickControlPrivate::get(d->popupItem)->resolveFont();
+    if (parent) {
+        QQuickControlPrivate *p = QQuickControlPrivate::get(d->popupItem);
+        p->resolveFont();
+        if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(parent->window()))
+            p->updateLocale(window->locale(), false); // explicit=false
+    }
     emit parentChanged();
 }
 
@@ -1742,6 +1778,13 @@ void QQuickPopup::itemChange(QQuickItem::ItemChange change, const QQuickItem::It
     }
 }
 
+void QQuickPopup::localeChange(const QLocale &newLocale, const QLocale &oldLocale)
+{
+    Q_UNUSED(newLocale);
+    Q_UNUSED(oldLocale);
+    emit localeChanged();
+}
+
 void QQuickPopup::marginsChange(const QMarginsF &newMargins, const QMarginsF &oldMargins)
 {
     Q_D(QQuickPopup);
diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h
index b5703746..33f44210 100644
--- a/src/templates/qquickpopup_p.h
+++ b/src/templates/qquickpopup_p.h
@@ -51,6 +51,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qmargins.h>
 #include <QtGui/qevent.h>
+#include <QtCore/qlocale.h>
 #include <QtGui/qfont.h>
 #include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
 #include <QtQml/qqml.h>
@@ -93,6 +94,7 @@ class Q_QUICKTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserSta
     Q_PROPERTY(qreal leftPadding READ leftPadding WRITE setLeftPadding RESET resetLeftPadding NOTIFY leftPaddingChanged FINAL)
     Q_PROPERTY(qreal rightPadding READ rightPadding WRITE setRightPadding RESET resetRightPadding NOTIFY rightPaddingChanged FINAL)
     Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged FINAL)
+    Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL)
     Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL)
     Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged FINAL)
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
@@ -191,6 +193,10 @@ public:
     void setBottomPadding(qreal padding);
     void resetBottomPadding();
 
+    QLocale locale() const;
+    void setLocale(const QLocale &locale);
+    void resetLocale();
+
     QFont font() const;
     void setFont(const QFont &font);
     void resetFont();
@@ -291,6 +297,7 @@ Q_SIGNALS:
     void rightPaddingChanged();
     void bottomPaddingChanged();
     void fontChanged();
+    void localeChanged();
     void parentChanged();
     void backgroundChanged();
     void contentItemChanged();
@@ -333,6 +340,7 @@ protected:
     virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem);
     virtual void fontChange(const QFont &newFont, const QFont &oldFont);
     virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+    virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale);
     virtual void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data);
     virtual void marginsChange(const QMarginsF &newMargins, const QMarginsF &oldMargins);
     virtual void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding);
diff --git a/src/templates/qquickpopup_p_p.h b/src/templates/qquickpopup_p_p.h
index acfe4ffc..5134eec6 100644
--- a/src/templates/qquickpopup_p_p.h
+++ b/src/templates/qquickpopup_p_p.h
@@ -107,6 +107,7 @@ protected:
     void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
     void fontChange(const QFont &newFont, const QFont &oldFont) override;
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
     void itemChange(ItemChange change, const ItemChangeData &data) override;
     void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;