aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/snippets/data
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-02 23:03:58 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-04 10:56:24 +0000
commit1862fc5a32fd0523a56d24f2f90df3d9f54ba967 (patch)
tree6b80f228ceef64cf5a42a3d9a016ed28172cc18c /tests/auto/snippets/data
parent0cb096251c4f5af79126e71cfa7a7f9e910dac95 (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 'tests/auto/snippets/data')
-rw-r--r--tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml2
-rw-r--r--tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml6
-rw-r--r--tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid-layout.qml (renamed from tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml)10
-rw-r--r--tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid.qml (renamed from tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml)2
-rw-r--r--tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml10
5 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml
index ca13e815..200ac5f4 100644
--- a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml
+++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml
@@ -17,7 +17,7 @@ ListView {
to: new Date(2015, 11, 31)
}
- delegate: CalendarView {
+ delegate: MonthGrid {
width: listview.width
height: listview.height
diff --git a/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml
index 88267b2c..e30208d7 100644
--- a/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml
+++ b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml
@@ -5,12 +5,12 @@ import Qt.labs.calendar 1.0
//! [1]
ColumnLayout {
DayOfWeekRow {
- locale: view.locale
+ locale: grid.locale
Layout.fillWidth: true
}
- CalendarView {
- id: view
+ MonthGrid {
+ id: grid
month: 11
year: 2015
locale: Qt.locale("en_US")
diff --git a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml b/tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid-layout.qml
index ec32368b..f250650d 100644
--- a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml
+++ b/tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid-layout.qml
@@ -14,15 +14,15 @@ GridLayout {
}
WeekNumberColumn {
- month: view.month
- year: view.year
- locale: view.locale
+ month: grid.month
+ year: grid.year
+ locale: grid.locale
Layout.fillHeight: true
}
- CalendarView {
- id: view
+ MonthGrid {
+ id: grid
month: 11
year: 2015
locale: Qt.locale("en_US")
diff --git a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml b/tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid.qml
index e1cad178..1b5b90ce 100644
--- a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml
+++ b/tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
import Qt.labs.calendar 1.0
//! [1]
-CalendarView {
+MonthGrid {
month: 11
year: 2015
locale: Qt.locale("en_US")
diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml
index 47a260fa..228dd4f5 100644
--- a/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml
+++ b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml
@@ -5,14 +5,14 @@ import Qt.labs.calendar 1.0
//! [1]
RowLayout {
WeekNumberColumn {
- month: view.month
- year: view.year
- locale: view.locale
+ month: grid.month
+ year: grid.year
+ locale: grid.locale
Layout.fillHeight: true
}
- CalendarView {
- id: view
+ MonthGrid {
+ id: grid
month: 11
year: 2015
locale: Qt.locale("en_US")