Compare commits

..

2 Commits

4 changed files with 36 additions and 25 deletions

View File

@@ -37,6 +37,11 @@ Rectangle
UserConfiguration UserConfiguration
{ {
id: userConfiguration id: userConfiguration
configActivePalette: headerPalette
configDisabledTextColor: headerDisabledPalette.text
} }
required property SystemPalette headerPalette;
required property SystemPalette headerDisabledPalette;
} }

View File

@@ -7,49 +7,48 @@ Flickable {
id: flickable id: flickable
width: 200 width: 200
height: 200 height: 200
onDragStarted: console.info("Drag has started")
onDragEnded: console.info("Drag has ended")
GridLayout { GridLayout {
columns: 1 columns: 1
DayOfWeekRow { DayOfWeekRow {
locale: grid.locale locale: grid.locale
Layout.fillWidth: true Layout.fillWidth: true
} }
// 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: Text { delegate: Rectangle {
horizontalAlignment: Text.AlignHCenter color: model.today ? activePalette.dark: activePalette.light
verticalAlignment: Text.AlignVCenter border.color: model.date === currentDate ? "green": "transparent"
text: model.day border.width: 3
color: model.month === currentDate.getMonth() ? myPalette.text : disabledPalette.text width: 30
height: 20
Text {
anchors.centerIn: parent
font.pixelSize: 12
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: model.day
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;
} }

View File

@@ -27,6 +27,8 @@ Window {
Appheader Appheader
{ {
id: myHeader id: myHeader
headerPalette: myPalette
headerDisabledPalette: disabledPalette
} }
GridLayout { GridLayout {

View File

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