qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Control::locale 

Change-Id: I6c6647de6d286a92b35bca09a45e82cd3343a623
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
This commit is contained in:
J-P Nurmi 2015-12-05 13:00:56 +01:00
parent c930f4adf8
commit 9d8a6e06fc
12 changed files with 83 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/imports/calendar/qquickdayofweekrow.cpp
View File

@ -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);

7
src/imports/calendar/qquickdayofweekrow_p.h
View File

@ -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:

29
src/imports/calendar/qquickmonthgrid.cpp
View File

@ -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);
}
@ -244,23 +243,6 @@ void QQuickMonthGrid::setYear(int year)
d->model->setYear(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);

7
src/imports/calendar/qquickmonthgrid_p.h
View File

@ -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;

27
src/imports/calendar/qquickweeknumbercolumn.cpp
View File

@ -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);
}
/*!
@ -172,23 +171,6 @@ void QQuickWeekNumberColumn::setYear(int year)
d->model->setYear(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);

7
src/imports/calendar/qquickweeknumbercolumn_p.h
View File

@ -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:

31
src/templates/qquickcontrol.cpp
View File

@ -659,6 +659,29 @@ void QQuickControl::setLayoutDirection(Qt::LayoutDirection direction)
}
}
/*!
\qmlproperty Locale Qt.labs.calendar::Control::locale
This property holds the locale of the control.
\sa mirrored, {LayoutMirroring}{LayoutMirroring}
*/
QLocale QQuickControl::locale() const
{
Q_D(const QQuickControl);
return d->locale;
}
void QQuickControl::setLocale(const QLocale &locale)
{
Q_D(QQuickControl);
if (d->locale != locale) {
localeChange(locale, d->locale);
d->locale = locale;
emit localeChanged();
}
}
/*!
\qmlproperty bool Qt.labs.controls::Control::mirrored
\readonly
@ -668,7 +691,7 @@ void QQuickControl::setLayoutDirection(Qt::LayoutDirection direction)
This property is provided for convenience. A control is considered mirrored
when its visual layout direction is right-to-left.
\sa effectiveLayoutDirection, {LayoutMirroring}{LayoutMirroring}
\sa locale, {LayoutMirroring}{LayoutMirroring}
*/
bool QQuickControl::isMirrored() const
{
@ -797,4 +820,10 @@ void QQuickControl::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
Q_UNUSED(oldItem);
}
void QQuickControl::localeChange(const QLocale &newLocale, const QLocale &oldLocale)
{
Q_UNUSED(newLocale);
Q_UNUSED(oldLocale);
}
QT_END_NAMESPACE

7
src/templates/qquickcontrol_p.h
View File

@ -48,6 +48,7 @@
// We mean it.
//
#include <QtCore/qlocale.h>
#include <QtQuick/qquickitem.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
@ -69,6 +70,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickControl : public QQuickItem
Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL)
Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged FINAL)
Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged FINAL)
Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL)
Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL)
Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL)
@ -111,6 +113,9 @@ public:
Qt::LayoutDirection effectiveLayoutDirection() const;
void setLayoutDirection(Qt::LayoutDirection direction);
QLocale locale() const;
void setLocale(const QLocale &locale);
bool isMirrored() const;
QQuickItem *background() const;
@ -131,6 +136,7 @@ Q_SIGNALS:
void spacingChanged();
void layoutDirectionChanged();
void effectiveLayoutDirectionChanged();
void localeChanged();
void mirroredChanged();
void backgroundChanged();
void contentItemChanged();
@ -153,6 +159,7 @@ protected:
virtual void mirrorChange();
virtual void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding);
virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem);
virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale);
#ifndef QT_NO_ACCESSIBILITY
virtual void accessibilityActiveChanged(bool active);

1
src/templates/qquickcontrol_p_p.h
View File

@ -115,6 +115,7 @@ public:
qreal bottomPadding;
qreal spacing;
Qt::LayoutDirection layoutDirection;
QLocale locale;
QQuickItem *background;
QQuickItem *contentItem;
QQuickAccessibleAttached *accessibleAttached;

27
src/templates/qquickspinbox.cpp
View File

@ -113,7 +113,6 @@ public:
int repeatTimer;
QQuickSpinButton *up;
QQuickSpinButton *down;
QLocale locale;
QValidator *validator;
QJSValue textFromValue;
QJSValue valueFromText;
@ -336,26 +335,6 @@ void QQuickSpinBox::setStepSize(int step)
}
}
/*!
\qmlproperty Locale Qt.labs.controls::SpinBox::locale
This property holds the locale that is used to format the value.
*/
QLocale QQuickSpinBox::locale() const
{
Q_D(const QQuickSpinBox);
return d->locale;
}
void QQuickSpinBox::setLocale(const QLocale &locale)
{
Q_D(QQuickSpinBox);
if (d->locale != locale) {
d->locale = locale;
emit localeChanged();
}
}
/*!
\qmlproperty Validator Qt.labs.controls::SpinBox::validator
@ -364,7 +343,7 @@ void QQuickSpinBox::setLocale(const QLocale &locale)
\snippet SpinBox.qml validator
\sa textFromValue, valueFromText, locale
\sa textFromValue, valueFromText, {Control::locale}{locale}
*/
QValidator *QQuickSpinBox::validator() const
{
@ -398,7 +377,7 @@ void QQuickSpinBox::setValidator(QValidator *validator)
textFromValue: function(value, locale) { return Number(value).toLocaleString(locale, 'f', 0); }
\endcode
\sa valueFromText, validator, locale
\sa valueFromText, validator, {Control::locale}{locale}
*/
QJSValue QQuickSpinBox::textFromValue() const
{
@ -434,7 +413,7 @@ void QQuickSpinBox::setTextFromValue(const QJSValue &callback)
valueFromText: function(text, locale) { return Number.fromLocaleString(locale, text); }
\endcode
\sa textFromValue, validator, locale
\sa textFromValue, validator, {Control::locale}{locale}
*/
QJSValue QQuickSpinBox::valueFromText() const
{

5
src/templates/qquickspinbox_p.h
View File

@ -65,7 +65,6 @@ class Q_LABSTEMPLATES_EXPORT QQuickSpinBox : public QQuickControl
Q_PROPERTY(int to READ to WRITE setTo NOTIFY toChanged FINAL)
Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged FINAL)
Q_PROPERTY(int stepSize READ stepSize WRITE setStepSize NOTIFY stepSizeChanged FINAL)
Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL)
Q_PROPERTY(QValidator *validator READ validator WRITE setValidator NOTIFY validatorChanged FINAL)
Q_PROPERTY(QJSValue textFromValue READ textFromValue WRITE setTextFromValue NOTIFY textFromValueChanged FINAL)
Q_PROPERTY(QJSValue valueFromText READ valueFromText WRITE setValueFromText NOTIFY valueFromTextChanged FINAL)
@ -87,9 +86,6 @@ public:
int stepSize() const;
void setStepSize(int step);
QLocale locale() const;
void setLocale(const QLocale &locale);
QValidator *validator() const;
void setValidator(QValidator *validator);
@ -111,7 +107,6 @@ Q_SIGNALS:
void toChanged();
void valueChanged();
void stepSizeChanged();
void localeChanged();
void validatorChanged();
void textFromValueChanged();
void valueFromTextChanged();

13
tests/auto/controls/data/tst_control.qml
View File

@ -656,4 +656,17 @@ TestCase {
control4.destroy()
}
function test_locale() {
var control = component.createObject(testCase)
verify(control)
control.locale = Qt.locale("en_US")
compare(control.locale.name, "en_US")
control.locale = Qt.locale("nb_NO")
compare(control.locale.name, "nb_NO")
control.destroy()
}
}