From 6d23c90ba8d3977fdd11956badf0628e7e10af69 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 21 Nov 2022 14:47:57 +0100 Subject: [PATCH] Fix Times offset on ICS and on conference creation (mainly because of Windows unmanaged Timezones) --- linphone-app/ui/views/App/Dialog/NewConference.qml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/linphone-app/ui/views/App/Dialog/NewConference.qml b/linphone-app/ui/views/App/Dialog/NewConference.qml index d58f8ea5b..c84cced70 100644 --- a/linphone-app/ui/views/App/Dialog/NewConference.qml +++ b/linphone-app/ui/views/App/Dialog/NewConference.qml @@ -20,8 +20,8 @@ DialogPlus { property bool isNew: !conferenceInfoModel || conferenceInfoModel.uri === '' property ConferenceInfoModel conferenceInfoModel: ConferenceInfoModel{} onConferenceInfoModelChanged: { - dateField.setDate(conferenceManager.conferenceInfoModel.dateTime); - timeField.setTime(conferenceManager.conferenceInfoModel.dateTime); + dateField.setDate(conferenceManager.conferenceInfoModel.dateTimeUtc); + timeField.setTime(conferenceManager.conferenceInfoModel.dateTimeUtc); selectedParticipants.setAddresses(conferenceInfoModel) } property bool forceSchedule : false @@ -319,12 +319,15 @@ DialogPlus { TextField{id: timeField; Layout.preferredWidth: parent.cellWidth color: NewConferenceStyle.fields.textColor; font.weight: NewConferenceStyle.fields.weight; font.pointSize: NewConferenceStyle.fields.pointSize function getTime(){ - return Date.fromLocaleTimeString(scheduleForm.locale, timeField.text, 'hh:mm') + return Date.fromLocaleTimeString(scheduleForm.locale, timeField._text, 'hh:mm') } function setTime(date){ - text = date.toLocaleTimeString(scheduleForm.locale, 'hh:mm') + _text = date.toLocaleTimeString(scheduleForm.locale, 'hh:mm') + text = UtilsCpp.toTimeString(date, 'hh:mm')// Display the unchanged time } - text: conferenceManager.conferenceInfoModel? conferenceManager.conferenceInfoModel.dateTime.toLocaleTimeString(scheduleForm.locale, 'hh:mm') : '' + // hidden time to be used from JS : JS Local time can be wrong on Windows because of daylights that are not takken account. + property string _text: conferenceManager.conferenceInfoModel? conferenceManager.conferenceInfoModel.dateTime.toLocaleTimeString(scheduleForm.locale, 'hh:mm') : '' + text: conferenceManager.conferenceInfoModel? UtilsCpp.toTimeString(conferenceManager.conferenceInfoModel.dateTimeUtc, 'hh:mm') : '' icon: 'drop_down_custom' onEditingFinished: if(rightStackView.currentItemType === 2) {