From bd6c7dadfd89838939c01ec089175cb67da6912f Mon Sep 17 00:00:00 2001 From: Black Date: Sun, 26 Jan 2020 14:05:10 -0800 Subject: [PATCH] Change dateFormat to follow system default. --- imports/Spectral/Component/Timeline/ImageDelegate.qml | 2 +- imports/Spectral/Component/Timeline/MessageDelegate.qml | 2 +- imports/Spectral/Component/Timeline/SectionDelegate.qml | 2 +- imports/Spectral/Component/Timeline/StateDelegate.qml | 2 +- imports/Spectral/Component/Timeline/VideoDelegate.qml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/imports/Spectral/Component/Timeline/ImageDelegate.qml b/imports/Spectral/Component/Timeline/ImageDelegate.qml index 228b3ec44..bbfebbd2e 100644 --- a/imports/Spectral/Component/Timeline/ImageDelegate.qml +++ b/imports/Spectral/Component/Timeline/ImageDelegate.qml @@ -108,7 +108,7 @@ RowLayout { contentItem: RowLayout { Label { - text: Qt.formatTime(time, "hh:mm AP") + text: Qt.formatTime(time) color: "white" font.pixelSize: 12 } diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml index dd6ebc9a7..4d53f18af 100644 --- a/imports/Spectral/Component/Timeline/MessageDelegate.qml +++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml @@ -262,7 +262,7 @@ ColumnLayout { } Label { - text: Qt.formatTime(time, "hh:mm AP") + text: Qt.formatTime(time) color: MPalette.lighter } } diff --git a/imports/Spectral/Component/Timeline/SectionDelegate.qml b/imports/Spectral/Component/Timeline/SectionDelegate.qml index fdc6c2945..8b6b514e2 100644 --- a/imports/Spectral/Component/Timeline/SectionDelegate.qml +++ b/imports/Spectral/Component/Timeline/SectionDelegate.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.12 import Spectral.Setting 0.1 Label { - text: section + " • " + Qt.formatTime(time, "hh:mm AP") + text: section + " • " + Qt.formatTime(time) color: MPalette.foreground font.pixelSize: 13 font.weight: Font.Medium diff --git a/imports/Spectral/Component/Timeline/StateDelegate.qml b/imports/Spectral/Component/Timeline/StateDelegate.qml index 59c5dd116..74220bc49 100644 --- a/imports/Spectral/Component/Timeline/StateDelegate.qml +++ b/imports/Spectral/Component/Timeline/StateDelegate.qml @@ -68,7 +68,7 @@ Control { Layout.fillWidth: true Layout.maximumWidth: messageListView.width - authorControl.width - row.spacing - (root.padding * 2) - text: display + " • " + Qt.formatTime(time, "hh:mm AP") + text: display + " • " + Qt.formatTime(time) color: MPalette.foreground font.pixelSize: 13 font.weight: Font.Medium diff --git a/imports/Spectral/Component/Timeline/VideoDelegate.qml b/imports/Spectral/Component/Timeline/VideoDelegate.qml index 70b57b9d6..abc8f7717 100644 --- a/imports/Spectral/Component/Timeline/VideoDelegate.qml +++ b/imports/Spectral/Component/Timeline/VideoDelegate.qml @@ -163,7 +163,7 @@ RowLayout { contentItem: RowLayout { Label { - text: Qt.formatTime(time, "hh:mm AP") + text: Qt.formatTime(time) color: "white" font.pixelSize: 12 }