diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-05 13:00:56 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-07 17:07:34 +0000 |
commit | 9d8a6e06fc06ed0adfed84385ab6357245a46a37 (patch) | |
tree | d654248a910b55b934cfebec6d5aefc3c9b56b0e /src/imports/calendar | |
parent | c930f4adf8dd0829c4d3a00d48b70ca988721033 (diff) |
Add Control::locale
Change-Id: I6c6647de6d286a92b35bca09a45e82cd3343a623
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/imports/calendar')
-rw-r--r-- | src/imports/calendar/qquickdayofweekrow.cpp | 29 | ||||
-rw-r--r-- | src/imports/calendar/qquickdayofweekrow_p.h | 7 | ||||
-rw-r--r-- | src/imports/calendar/qquickmonthgrid.cpp | 29 | ||||
-rw-r--r-- | src/imports/calendar/qquickmonthgrid_p.h | 7 | ||||
-rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn.cpp | 27 | ||||
-rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn_p.h | 7 |
6 files changed, 29 insertions, 77 deletions
diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index 3c146c1f..8788ac95 100644 --- a/src/imports/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp @@ -48,8 +48,8 @@ QT_BEGIN_NAMESPACE \inqmlmodule Qt.labs.calendar \brief A row of names for the days in a week. - DayOfWeekRow presents day of week names in a row. The names of - the days are ordered and formatted using the specified \l locale. + DayOfWeekRow presents day of week names in a row. The names of the days + are ordered and formatted using the specified \l {Control::locale}{locale}. \image qtlabscalendar-dayofweekrow.png \snippet qtlabscalendar-dayofweekrow.qml 1 @@ -98,24 +98,6 @@ QQuickDayOfWeekRow::QQuickDayOfWeekRow(QQuickItem *parent) : Q_D(QQuickDayOfWeekRow); d->model = new QQuickDayOfWeekModel(this); d->source = QVariant::fromValue(d->model); - connect(d->model, &QQuickDayOfWeekModel::localeChanged, this, &QQuickDayOfWeekRow::localeChanged); -} - -/*! - \qmlproperty Locale Qt.labs.calendar::DayOfWeekRow::locale - - This property holds the locale that is used to format names of the days in a week. -*/ -QLocale QQuickDayOfWeekRow::locale() const -{ - Q_D(const QQuickDayOfWeekRow); - return d->model->locale(); -} - -void QQuickDayOfWeekRow::setLocale(const QLocale &locale) -{ - Q_D(QQuickDayOfWeekRow); - d->model->setLocale(locale); } /*! @@ -190,6 +172,13 @@ void QQuickDayOfWeekRow::geometryChanged(const QRectF &newGeometry, const QRectF d->resizeItems(); } +void QQuickDayOfWeekRow::localeChange(const QLocale &newLocale, const QLocale &oldLocale) +{ + Q_D(QQuickDayOfWeekRow); + QQuickControl::localeChange(newLocale, oldLocale); + d->model->setLocale(newLocale); +} + void QQuickDayOfWeekRow::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) { Q_D(QQuickDayOfWeekRow); diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h index 5161ed89..93916765 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -49,7 +49,6 @@ // #include <QtLabsTemplates/private/qquickcontrol_p.h> -#include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE @@ -59,16 +58,12 @@ class QQuickDayOfWeekRowPrivate; class QQuickDayOfWeekRow : public QQuickControl { Q_OBJECT - Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL) Q_PROPERTY(QVariant source READ source WRITE setSource NOTIFY sourceChanged FINAL) Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) public: explicit QQuickDayOfWeekRow(QQuickItem *parent = Q_NULLPTR); - QLocale locale() const; - void setLocale(const QLocale &locale); - QVariant source() const; void setSource(const QVariant &source); @@ -76,13 +71,13 @@ public: void setDelegate(QQmlComponent *delegate); Q_SIGNALS: - void localeChanged(); void sourceChanged(); void delegateChanged(); protected: void componentComplete() Q_DECL_OVERRIDE; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void localeChange(const QLocale &newLocale, const QLocale &oldLocale) Q_DECL_OVERRIDE; void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) Q_DECL_OVERRIDE; private: diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp index 432e15e5..ac49b62c 100644 --- a/src/imports/calendar/qquickmonthgrid.cpp +++ b/src/imports/calendar/qquickmonthgrid.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE MonthGrid presents a calendar month in a grid. The contents are calculated for a given \l month and \l year, using the specified - \l locale. + \l {Control::locale}{locale}. \image qtlabscalendar-monthgrid.png \snippet qtlabscalendar-monthgrid.qml 1 @@ -173,7 +173,6 @@ QQuickMonthGrid::QQuickMonthGrid(QQuickItem *parent) : d->source = QVariant::fromValue(d->model); connect(d->model, &QQuickMonthModel::monthChanged, this, &QQuickMonthGrid::monthChanged); connect(d->model, &QQuickMonthModel::yearChanged, this, &QQuickMonthGrid::yearChanged); - connect(d->model, &QQuickMonthModel::localeChanged, this, &QQuickMonthGrid::localeChanged); connect(d->model, &QQuickMonthModel::titleChanged, this, &QQuickMonthGrid::titleChanged); } @@ -245,23 +244,6 @@ void QQuickMonthGrid::setYear(int year) } /*! - \qmlproperty Locale Qt.labs.calendar::MonthGrid::locale - - This property holds the locale that is used to calculate the contents. -*/ -QLocale QQuickMonthGrid::locale() const -{ - Q_D(const QQuickMonthGrid); - return d->model->locale(); -} - -void QQuickMonthGrid::setLocale(const QLocale &locale) -{ - Q_D(QQuickMonthGrid); - d->model->setLocale(locale); -} - -/*! \internal \qmlproperty model Qt.labs.calendar::MonthGrid::source @@ -290,7 +272,7 @@ void QQuickMonthGrid::setSource(const QVariant &source) This property is provided for convenience. MonthGrid itself does not visualize the title. The default value consists of the month name, - formatted using \l locale, and the year number. + formatted using \l {Control::locale}{locale}, and the year number. */ QString QQuickMonthGrid::title() const { @@ -367,6 +349,13 @@ void QQuickMonthGrid::geometryChanged(const QRectF &newGeometry, const QRectF &o d->resizeItems(); } +void QQuickMonthGrid::localeChange(const QLocale &newLocale, const QLocale &oldLocale) +{ + Q_D(QQuickMonthGrid); + QQuickControl::localeChange(newLocale, oldLocale); + d->model->setLocale(newLocale); +} + void QQuickMonthGrid::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) { Q_D(QQuickMonthGrid); diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h index c7caa7f5..47be2f7c 100644 --- a/src/imports/calendar/qquickmonthgrid_p.h +++ b/src/imports/calendar/qquickmonthgrid_p.h @@ -49,7 +49,6 @@ // #include <QtLabsTemplates/private/qquickcontrol_p.h> -#include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE @@ -61,7 +60,6 @@ class QQuickMonthGrid : public QQuickControl Q_OBJECT Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL) Q_PROPERTY(int year READ year WRITE setYear NOTIFY yearChanged FINAL) - Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL) Q_PROPERTY(QVariant source READ source WRITE setSource NOTIFY sourceChanged FINAL) Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) @@ -75,9 +73,6 @@ public: int year() const; void setYear(int year); - QLocale locale() const; - void setLocale(const QLocale &locale); - QVariant source() const; void setSource(const QVariant &source); @@ -90,7 +85,6 @@ public: Q_SIGNALS: void monthChanged(); void yearChanged(); - void localeChanged(); void sourceChanged(); void titleChanged(); void delegateChanged(); @@ -103,6 +97,7 @@ Q_SIGNALS: protected: void componentComplete() Q_DECL_OVERRIDE; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void localeChange(const QLocale &newLocale, const QLocale &oldLocale) Q_DECL_OVERRIDE; void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) Q_DECL_OVERRIDE; void updatePolish() Q_DECL_OVERRIDE; diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index d39b1e0a..04890411 100644 --- a/src/imports/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE WeekNumberColumn presents week numbers in a column. The week numbers are calculated for a given \l month and \l year, using the specified - \l locale. + \l {Control::locale}{locale}. \image qtlabscalendar-weeknumbercolumn.png \snippet qtlabscalendar-weeknumbercolumn.qml 1 @@ -102,7 +102,6 @@ QQuickWeekNumberColumn::QQuickWeekNumberColumn(QQuickItem *parent) : d->source = QVariant::fromValue(d->model); connect(d->model, &QQuickWeekNumberModel::monthChanged, this, &QQuickWeekNumberColumn::monthChanged); connect(d->model, &QQuickWeekNumberModel::yearChanged, this, &QQuickWeekNumberColumn::yearChanged); - connect(d->model, &QQuickWeekNumberModel::localeChanged, this, &QQuickWeekNumberColumn::localeChanged); } /*! @@ -173,23 +172,6 @@ void QQuickWeekNumberColumn::setYear(int year) } /*! - \qmlproperty Locale Qt.labs.calendar::WeekNumberColumn::locale - - This property holds the locale that is used to calculate the week numbers. -*/ -QLocale QQuickWeekNumberColumn::locale() const -{ - Q_D(const QQuickWeekNumberColumn); - return d->model->locale(); -} - -void QQuickWeekNumberColumn::setLocale(const QLocale &locale) -{ - Q_D(QQuickWeekNumberColumn); - d->model->setLocale(locale); -} - -/*! \internal \qmlproperty model Qt.labs.calendar::WeekNumberColumn::source @@ -258,6 +240,13 @@ void QQuickWeekNumberColumn::geometryChanged(const QRectF &newGeometry, const QR d->resizeItems(); } +void QQuickWeekNumberColumn::localeChange(const QLocale &newLocale, const QLocale &oldLocale) +{ + Q_D(QQuickWeekNumberColumn); + QQuickControl::localeChange(newLocale, oldLocale); + d->model->setLocale(newLocale); +} + void QQuickWeekNumberColumn::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) { Q_D(QQuickWeekNumberColumn); diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index f23d2948..c1ebfbd7 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -49,7 +49,6 @@ // #include <QtLabsTemplates/private/qquickcontrol_p.h> -#include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE @@ -61,7 +60,6 @@ class QQuickWeekNumberColumn : public QQuickControl Q_OBJECT Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL) Q_PROPERTY(int year READ year WRITE setYear NOTIFY yearChanged FINAL) - Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL) Q_PROPERTY(QVariant source READ source WRITE setSource NOTIFY sourceChanged FINAL) Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) @@ -74,9 +72,6 @@ public: int year() const; void setYear(int year); - QLocale locale() const; - void setLocale(const QLocale &locale); - QVariant source() const; void setSource(const QVariant &source); @@ -86,13 +81,13 @@ public: Q_SIGNALS: void monthChanged(); void yearChanged(); - void localeChanged(); void sourceChanged(); void delegateChanged(); protected: void componentComplete() Q_DECL_OVERRIDE; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void localeChange(const QLocale &newLocale, const QLocale &oldLocale) Q_DECL_OVERRIDE; void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) Q_DECL_OVERRIDE; private: |