mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-29 16:02:51 -05:00
Merge pull request #117 from Vantesh/master
Update time format to HH:MM
This commit is contained in:
@@ -250,7 +250,7 @@ Rectangle {
|
|||||||
if (modelData.allDay) {
|
if (modelData.allDay) {
|
||||||
return "All day"
|
return "All day"
|
||||||
} else {
|
} else {
|
||||||
let timeFormat = SettingsData.use24HourClock ? "H:mm" : "h:mm AP"
|
let timeFormat = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP"
|
||||||
let startTime = Qt.formatTime(
|
let startTime = Qt.formatTime(
|
||||||
modelData.start, timeFormat)
|
modelData.start, timeFormat)
|
||||||
if (modelData.start.toDateString(
|
if (modelData.start.toDateString(
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ Item {
|
|||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
text: SettingsData.use24HourClock ? Qt.formatTime(
|
text: SettingsData.use24HourClock ? Qt.formatTime(
|
||||||
systemClock.date,
|
systemClock.date,
|
||||||
"H:mm") : Qt.formatTime(
|
"HH:mm") : Qt.formatTime(
|
||||||
systemClock.date,
|
systemClock.date,
|
||||||
"h:mm AP")
|
"h:mm AP")
|
||||||
font.pixelSize: 120
|
font.pixelSize: 120
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ Rectangle {
|
|||||||
StyledText {
|
StyledText {
|
||||||
text: SettingsData.use24HourClock ? Qt.formatTime(
|
text: SettingsData.use24HourClock ? Qt.formatTime(
|
||||||
root.currentDate,
|
root.currentDate,
|
||||||
"H:mm") : Qt.formatTime(
|
"HH:mm") : Qt.formatTime(
|
||||||
root.currentDate, "h:mm AP")
|
root.currentDate, "h:mm AP")
|
||||||
font.pixelSize: Theme.fontSizeMedium - 1
|
font.pixelSize: Theme.fontSizeMedium - 1
|
||||||
color: Theme.surfaceText
|
color: Theme.surfaceText
|
||||||
|
|||||||
Reference in New Issue
Block a user