From e42d90f9eeb6b169dcc8e7b3a58a0ea8450988c0 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Thu, 26 Dec 2024 18:02:56 +0100 Subject: [PATCH] fix #LINQT-1500 date time in local time zone --- Linphone/view/Control/Display/Meeting/MeetingListView.qml | 4 ++-- Linphone/view/Page/Main/Meeting/MeetingPage.qml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Linphone/view/Control/Display/Meeting/MeetingListView.qml b/Linphone/view/Control/Display/Meeting/MeetingListView.qml index 6494dc92a..be3375185 100644 --- a/Linphone/view/Control/Display/Meeting/MeetingListView.qml +++ b/Linphone/view/Control/Display/Meeting/MeetingListView.qml @@ -152,10 +152,10 @@ ListView { property var itemGui: $modelData // Do not use itemAtIndex because of caching items. Using getAt ensure to have a GUI property var previousConfInfoGui : mainItem.model.getAt(index-1) - property var dateTime: itemGui.core ? itemGui.core.dateTimeUtc : UtilsCpp.getCurrentDateTime() + property var dateTime: itemGui.core ? itemGui.core.dateTime : UtilsCpp.getCurrentDateTime() property string day : UtilsCpp.toDateDayNameString(dateTime) property string dateString: UtilsCpp.toDateString(dateTime) - property string previousDateString: previousConfInfoGui ? UtilsCpp.toDateString(previousConfInfoGui.core ? previousConfInfoGui.core.dateTimeUtc : UtilsCpp.getCurrentDateTimeUtc()) : '' + property string previousDateString: previousConfInfoGui ? UtilsCpp.toDateString(previousConfInfoGui.core ? previousConfInfoGui.core.dateTime : UtilsCpp.getCurrentDateTime()) : '' property bool isFirst : ListView.previousSection !== ListView.section property int topOffset: (dateDay.visible && !isFirst? 8 * DefaultStyle.dp : 0) property var endDateTime: itemGui.core ? itemGui.core.endDateTime : UtilsCpp.getCurrentDateTime() diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml index 22318eec2..5e1a1015a 100644 --- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml +++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml @@ -718,8 +718,8 @@ AbstractMainPage { } Text { text: mainItem.selectedConference - ? UtilsCpp.toDateString(mainItem.selectedConference.core?.dateTimeUtc) - + " | " + UtilsCpp.toDateHourString(mainItem.selectedConference.core?.dateTimeUtc) + ? UtilsCpp.toDateString(mainItem.selectedConference.core?.dateTime) + + " | " + UtilsCpp.toDateHourString(mainItem.selectedConference.core?.dateTime) + " - " + UtilsCpp.toDateHourString(mainItem.selectedConference.core?.endDateTime) : ''