mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-01 17:16:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Times offset on ICS and on conference creation (mainly because of Windows unmanaged Timezones)

Browse source
This commit is contained in:
Julien Wadel 2022-11-21 14:47:57 +01:00
parent 531f1cbae9
commit 6d23c90ba8
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
linphone-app/ui/views/App/Dialog/NewConference.qml
View file

@ -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) {