diff options
Diffstat (limited to 'desktop/island/calendar/CalendarPanel.qml')
| -rw-r--r-- | desktop/island/calendar/CalendarPanel.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/island/calendar/CalendarPanel.qml b/desktop/island/calendar/CalendarPanel.qml index d28a856..fef672c 100644 --- a/desktop/island/calendar/CalendarPanel.qml +++ b/desktop/island/calendar/CalendarPanel.qml @@ -226,8 +226,8 @@ Item { delegate: TimeCell { required property int index width: (panel.gridWidth - 10) / 6 - label: Cal.pad(index) - on: hours.cur.slice(0, 3) === label + ":" + label: Cal.hourLabel(index, Prefs.island.h12) + on: hours.cur.slice(0, 2) === Cal.pad(index) onClicked: editor.pickTime(index, null) } } @@ -291,7 +291,7 @@ Item { Text { text: panel.selected === "" ? "" : Qt.formatDate(new Date(+panel.selected.slice(0, 4), +panel.selected.slice(5, 7) - 1, - +panel.selected.slice(8, 10)), "dddd d MMMM") + +panel.selected.slice(8, 10)), Cal.dayFmt(Prefs.island.dateFormat, true)) color: Theme.text font { family: Theme.fontFamily; pixelSize: Theme.fontSize - 2; bold: true } } @@ -327,9 +327,9 @@ Item { Text { id: when x: 16 - width: 82 + width: Prefs.island.h12 ? 92 : 82 anchors.verticalCenter: parent.verticalCenter - text: Cal.timeLabel(row.modelData, panel.selected) + text: Cal.timeLabel(row.modelData, panel.selected, Prefs.island.h12) color: Theme.subtext font { family: Theme.fontFamily; pixelSize: Theme.fontSize - 5 } } |