diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-02 23:03:58 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-04 10:56:24 +0000 |
| commit | 1862fc5a32fd0523a56d24f2f90df3d9f54ba967 (patch) | |
| tree | 6b80f228ceef64cf5a42a3d9a016ed28172cc18c /src/imports/controls/doc | |
| parent | 0cb096251c4f5af79126e71cfa7a7f9e910dac95 (diff) | |
Rename CalendarView to MonthGrid
Let's reserve CalendarView for a bit higher level control that combines
MonthGrid, DayOfWeekRow and WeekNumberColumn, and provides built-in
navigation. CalendarView would use the not-so-extensible CalendarModel
internally, so we could get that out of the public API as well...
Change-Id: I43126ed4c87f54a5b24129b9d60c969f5bd58642
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png (renamed from src/imports/controls/doc/images/qtlabscalendar-calendarview-layout.png) | bin | 22876 -> 22876 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/images/qtlabscalendar-monthgrid.png (renamed from src/imports/controls/doc/images/qtlabscalendar-calendarview.png) | bin | 13614 -> 13614 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/src/qtlabscontrols-index.qdoc | 2 | ||||
| -rw-r--r-- | src/imports/controls/doc/src/qtlabscontrols.qdoc | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/doc/images/qtlabscalendar-calendarview-layout.png b/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png Binary files differindex c5182644..c5182644 100644 --- a/src/imports/controls/doc/images/qtlabscalendar-calendarview-layout.png +++ b/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png diff --git a/src/imports/controls/doc/images/qtlabscalendar-calendarview.png b/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png Binary files differindex 79d0ebc0..79d0ebc0 100644 --- a/src/imports/controls/doc/images/qtlabscalendar-calendarview.png +++ b/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png diff --git a/src/imports/controls/doc/src/qtlabscontrols-index.qdoc b/src/imports/controls/doc/src/qtlabscontrols-index.qdoc index e24b269a..557bc73a 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-index.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-index.qdoc @@ -219,7 +219,7 @@ \li \l [QtLabsControls] {Button} \row \li \l [QtQuickControls] {Calendar} - \li No equivalent; see \l [QML] {CalendarView} instead. + \li No equivalent; see \l [QML] {MonthGrid}, \l [QML] {DayOfWeekRow} and \l [QML] {WeekNumberColumn} instead. \row \li \l [QtQuickControls] {CheckBox} \li \l [QtLabsControls] {CheckBox} diff --git a/src/imports/controls/doc/src/qtlabscontrols.qdoc b/src/imports/controls/doc/src/qtlabscontrols.qdoc index 1ddfc967..10476f08 100644 --- a/src/imports/controls/doc/src/qtlabscontrols.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols.qdoc @@ -42,7 +42,7 @@ import Qt.labs.controls 1.0 \endcode - The CalendarView and related QML types can be imported using the + The calendar related QML types can be imported using the following statement: \badcode |
