Passed down the palette configurations to the subcomponents through the
creation stack
This commit is contained in:
@@ -37,6 +37,11 @@ Rectangle
|
|||||||
UserConfiguration
|
UserConfiguration
|
||||||
{
|
{
|
||||||
id: userConfiguration
|
id: userConfiguration
|
||||||
|
configActivePalette: headerPalette
|
||||||
|
configDisabledTextColor: headerDisabledPalette.text
|
||||||
}
|
}
|
||||||
|
|
||||||
|
required property SystemPalette headerPalette;
|
||||||
|
required property SystemPalette headerDisabledPalette;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,32 +16,19 @@ Flickable {
|
|||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
|
|
||||||
// We don't need a week column for the moment
|
|
||||||
// WeekNumberColumn {
|
|
||||||
// month: grid.month
|
|
||||||
// year: grid.year
|
|
||||||
// locale: grid.locale
|
|
||||||
// Layout.fillHeight: true
|
|
||||||
// delegate: Text {
|
|
||||||
// text: weekNumber
|
|
||||||
// horizontalAlignment: Text.AlignHCenter
|
|
||||||
// verticalAlignment: Text.AlignVCenter
|
|
||||||
// color: myPalette.text
|
|
||||||
// required property int weekNumber
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
MonthGrid {
|
MonthGrid {
|
||||||
|
|
||||||
id: grid
|
id: grid
|
||||||
month: Calendar.November
|
month: Calendar.January
|
||||||
year: currentDate.getFullYear()
|
year: currentDate.getFullYear()
|
||||||
locale: Qt.locale("en_US")
|
locale: Qt.locale("en_US")
|
||||||
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
delegate: Rectangle {
|
delegate: Rectangle {
|
||||||
color: model.today ? "transparent": myPalette.accent
|
color: model.today ? activePalette.dark: activePalette.light
|
||||||
|
border.color: model.date === currentDate ? "green": "transparent"
|
||||||
|
border.width: 3
|
||||||
width: 30
|
width: 30
|
||||||
height: 20
|
height: 20
|
||||||
|
|
||||||
@@ -51,13 +38,17 @@ Flickable {
|
|||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
text: model.day
|
text: model.day
|
||||||
color: model.month === currentDate.getMonth() ? myPalette.text : disabledPalette.text
|
color: model.month === currentDate.getMonth() ? activePalette.text : disabledTextColor
|
||||||
}
|
}
|
||||||
|
|
||||||
required property var model
|
required property var model
|
||||||
}
|
}
|
||||||
|
|
||||||
|
property date currentlySelectedDate: currentDate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
required property date currentDate
|
required property date currentDate
|
||||||
|
required property SystemPalette activePalette;
|
||||||
|
required property color disabledTextColor;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ Window {
|
|||||||
Appheader
|
Appheader
|
||||||
{
|
{
|
||||||
id: myHeader
|
id: myHeader
|
||||||
|
headerPalette: myPalette
|
||||||
|
headerDisabledPalette: disabledPalette
|
||||||
}
|
}
|
||||||
|
|
||||||
GridLayout {
|
GridLayout {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Dialog {
|
|||||||
|
|
||||||
TextField {
|
TextField {
|
||||||
id: nameField
|
id: nameField
|
||||||
color: myPalette.text
|
color: configActivePalette.text
|
||||||
width: 400
|
width: 400
|
||||||
placeholderText: "Enter the new user's username"
|
placeholderText: "Enter the new user's username"
|
||||||
}
|
}
|
||||||
@@ -38,11 +38,16 @@ Dialog {
|
|||||||
CalendarGrid {
|
CalendarGrid {
|
||||||
id: dateOfBirthGrid
|
id: dateOfBirthGrid
|
||||||
currentDate: dateOfBirth
|
currentDate: dateOfBirth
|
||||||
|
activePalette: configActivePalette;
|
||||||
|
disabledTextColor: configDisabledTextColor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
property date dateOfBirth: new Date()
|
property date dateOfBirth: new Date()
|
||||||
property date dateOfDeath: new Date()
|
property date dateOfDeath: new Date()
|
||||||
|
|
||||||
|
required property SystemPalette configActivePalette;
|
||||||
|
required property color configDisabledTextColor;
|
||||||
|
|
||||||
standardButtons: Dialog.Ok | Dialog.Cancel
|
standardButtons: Dialog.Ok | Dialog.Cancel
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user