diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-08 18:16:13 +0200 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-04-08 19:18:02 +0300 |
| commit | 7b971c28e6098b629b8e9e3e38a9465a3f1bd459 (patch) | |
| tree | c5c475894671c0cc7e38d59287d3c2d6ba46128b /src/imports/calendar | |
| parent | 1c0edf002a50a765a66349d733cf170f4a4024ef (diff) | |
Rename Style to Theme
Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/calendar')
| -rw-r--r-- | src/imports/calendar/CalendarView.qml | 4 | ||||
| -rw-r--r-- | src/imports/calendar/DayOfWeekRow.qml | 6 | ||||
| -rw-r--r-- | src/imports/calendar/WeekNumberColumn.qml | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml index 541c7d6b..f70f063b 100644 --- a/src/imports/calendar/CalendarView.qml +++ b/src/imports/calendar/CalendarView.qml @@ -45,9 +45,9 @@ AbstractCalendarView { width: grid.width ? grid.width / 7 : implicitWidth height: grid.height ? grid.height / 6 : implicitHeight opacity: model.month === control.month ? 1 : 0 - color: model.today ? control.Style.accentColor : control.Style.textColor + color: model.today ? control.Theme.accentColor : control.Theme.textColor text: model.day - padding: control.Style.padding + padding: control.Theme.padding } contentWidth: grid.implicitWidth diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index ef59ec5f..b6404c05 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -44,7 +44,7 @@ AbstractDayOfWeekRow { property Component delegate: Text { text: model.shortName font.bold: true - color: control.Style.textColor + color: control.Theme.textColor width: row.width ? row.width / 7 : implicitWidth height: row.height ? row.height : implicitHeight horizontalAlignment: Text.AlignHCenter @@ -57,8 +57,8 @@ AbstractDayOfWeekRow { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - topPadding: Style.padding - bottomPadding: Style.padding + topPadding: Theme.padding + bottomPadding: Theme.padding contentItem: Row { id: row diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index 732a914a..3d3092fe 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -44,7 +44,7 @@ AbstractWeekNumberColumn { property Component delegate: Text { text: model.weekNumber font.bold: true - color: control.Style.textColor + color: control.Theme.textColor width: column.width ? column.width : implicitWidth height: column.height ? column.height / 6 : implicitHeight horizontalAlignment: Text.AlignHCenter @@ -57,8 +57,8 @@ AbstractWeekNumberColumn { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - leftPadding: Style.padding - rightPadding: Style.padding + leftPadding: Theme.padding + rightPadding: Theme.padding contentItem: Column { id: column |