Settings: new json model structure
This commit is contained in:
parent
0c044c7b81
commit
2d47c2ed1b
10 changed files with 149 additions and 100 deletions
|
|
@ -8,7 +8,7 @@ Singleton {
|
|||
id: root
|
||||
|
||||
property var date: new Date()
|
||||
property string time: Settings.settings.use12HourClock ? Qt.formatDateTime(
|
||||
property string time: Settings.data.location.use12HourClock ? Qt.formatDateTime(
|
||||
date,
|
||||
"h:mm AP") : Qt.formatDateTime(
|
||||
date, "HH:mm")
|
||||
|
|
@ -36,7 +36,7 @@ Singleton {
|
|||
}
|
||||
let month = now.toLocaleDateString(Qt.locale(), "MMMM")
|
||||
let year = now.toLocaleDateString(Qt.locale(), "yyyy")
|
||||
return `${dayName}, ` + (Settings.settings.reverseDayMonth ? `${month} ${day}${suffix} ${year}` : `${day}${suffix} ${month} ${year}`)
|
||||
return `${dayName}, ` + (Settings.data.location.reverseDayMonth ? `${month} ${day}${suffix} ${year}` : `${day}${suffix} ${month} ${year}`)
|
||||
}
|
||||
|
||||
Timer {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue