data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[do not squash] meeting set up : remove end date / all day switch

Browse source
This commit is contained in:
Gaelle Braud 2024-09-17 14:19:34 +02:00
parent 654a4a8f50
commit 9a98b865b4
1 changed files with 7 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Linphone/view/Item/Meeting/MeetingSetUp.qml
View file

@ -27,7 +27,6 @@ FocusScope {
Component.onCompleted: { Component.onCompleted: {
endHour.selectedDateTime = mainItem.conferenceInfoGui.core.endDateTime endHour.selectedDateTime = mainItem.conferenceInfoGui.core.endDateTime
startHour.selectedDateTime = mainItem.conferenceInfoGui.core.dateTime startHour.selectedDateTime = mainItem.conferenceInfoGui.core.dateTime
endDate.calendar.selectedDate = mainItem.conferenceInfoGui.core.endDateTime
startDate.calendar.selectedDate = mainItem.conferenceInfoGui.core.dateTime startDate.calendar.selectedDate = mainItem.conferenceInfoGui.core.dateTime
} }
@ -104,7 +103,7 @@ FocusScope {
focus: true focus: true
onActiveFocusChanged: if(activeFocus) selectAll() onActiveFocusChanged: if(activeFocus) selectAll()
onEditingFinished: mainItem.conferenceInfoGui.core.subject = text onEditingFinished: mainItem.conferenceInfoGui.core.subject = text
KeyNavigation.down: allDaySwitch KeyNavigation.down: startDate
} }
} }
} }
@ -125,17 +124,13 @@ FocusScope {
contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * DefaultStyle.dp
KeyNavigation.up: allDaySwitch KeyNavigation.up: confTitle
KeyNavigation.down: endDate KeyNavigation.down: startHour
KeyNavigation.left: startHour
KeyNavigation.right: startHour
onSelectedDateChanged: { onSelectedDateChanged: {
if (!selectedDate || selectedDate == mainItem.conferenceInfoGui.core.dateTime) return if (!selectedDate || selectedDate == mainItem.conferenceInfoGui.core.dateTime) return
mainItem.conferenceInfoGui.core.dateTime = UtilsCpp.createDateTime(selectedDate, allDaySwitch.isAllDay ? 0 : startHour.selectedHour, allDaySwitch.isAllDay ? 0 : startHour.selectedMin) mainItem.conferenceInfoGui.core.dateTime = UtilsCpp.createDateTime(selectedDate, startHour.selectedHour, startHour.selectedMin)
if (isCreation) { if (isCreation) {
startHour.selectedDateTime = UtilsCpp.createDateTime(selectedDate, startHour.selectedHour, startHour.selectedMin) startHour.selectedDateTime = UtilsCpp.createDateTime(selectedDate, startHour.selectedHour, startHour.selectedMin)
if (allDaySwitch.position === 0) endDate.calendar.selectedDate = UtilsCpp.addSecs(startHour.selectedDateTime, 3600)
else endDate.calendar.selectedDate = UtilsCpp.createDateTime(selectedDate, 23, 59)
} }
} }
} }
@ -146,31 +141,27 @@ FocusScope {
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * DefaultStyle.dp
} }
RowLayout { RowLayout {
visible: allDaySwitch.position === 0
TimeComboBox { TimeComboBox {
id: startHour id: startHour
visible: allDaySwitch.position === 0
indicator.visible: mainItem.isCreation indicator.visible: mainItem.isCreation
// Layout.fillWidth: true // Layout.fillWidth: true
Layout.preferredWidth: 94 * DefaultStyle.dp Layout.preferredWidth: 94 * DefaultStyle.dp
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * DefaultStyle.dp
background.visible: mainItem.isCreation background.visible: mainItem.isCreation
contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp
KeyNavigation.up: allDaySwitch KeyNavigation.up: startDate
KeyNavigation.down: endDate KeyNavigation.down: timeZoneCbox
KeyNavigation.left: startDate KeyNavigation.left: startDate
KeyNavigation.right: startDate KeyNavigation.right: endHour
onSelectedDateTimeChanged: { onSelectedDateTimeChanged: {
endHour.minTime = selectedDateTime endHour.minTime = selectedDateTime
endHour.maxTime = UtilsCpp.createDateTime(selectedDateTime, 23, 59) endHour.maxTime = UtilsCpp.createDateTime(selectedDateTime, 23, 59)
mainItem.conferenceInfoGui.core.dateTime = selectedDateTime mainItem.conferenceInfoGui.core.dateTime = selectedDateTime
endDate.calendar.selectedDate = UtilsCpp.addSecs(selectedDateTime, 3600)
endHour.selectedDateTime = UtilsCpp.addSecs(selectedDateTime, 3600) endHour.selectedDateTime = UtilsCpp.addSecs(selectedDateTime, 3600)
} }
} }
TimeComboBox { TimeComboBox {
id: endHour id: endHour
visible: allDaySwitch.position === 0
indicator.visible: mainItem.isCreation indicator.visible: mainItem.isCreation
Layout.preferredWidth: 94 * DefaultStyle.dp Layout.preferredWidth: 94 * DefaultStyle.dp
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * DefaultStyle.dp
@ -192,39 +183,7 @@ FocusScope {
} }
} }
} }
CalendarComboBox {
id: endDate
visible: allDaySwitch.position === 1
background.visible: mainItem.isCreation
indicator.visible: mainItem.isCreation
Layout.fillWidth: true
Layout.preferredHeight: 30 * DefaultStyle.dp
contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp
onSelectedDateChanged: if (selectedDate) mainItem.conferenceInfoGui.core.endDateTime = UtilsCpp.createDateTime(selectedDate, endHour.selectedHour, endHour.selectedMin)
}
}, },
RowLayout {
Item {
Layout.preferredWidth: 24 * DefaultStyle.dp
Layout.preferredHeight: 24 * DefaultStyle.dp
}
RowLayout {
Switch {
id: allDaySwitch
text: qsTr("Toute la journée")
onPositionChanged: {
if (position == 1) {
mainItem.conferenceInfoGui.core.dateTime = UtilsCpp.createDateTime(startDate.selectedDate, 0, 0)
mainItem.conferenceInfoGui.core.endDateTime = UtilsCpp.createDateTime(endDate.selectedDate, 23, 59)
} else {
mainItem.conferenceInfoGui.core.dateTime = UtilsCpp.createDateTime(startDate.selectedDate, startHour.selectedHour, startHour.selectedMin)
mainItem.conferenceInfoGui.core.endDateTime = UtilsCpp.createDateTime(endDate.selectedDate, endHour.selectedHour, endHour.selectedMin)
}
}
}
}
},
ComboBox { ComboBox {
id: timeZoneCbox id: timeZoneCbox