mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-05-07 14:44:01 +00:00
Fixes on Date picker (empty page on open) and Ephemeral deactivation.
This commit is contained in:
parent
7e281cc1a7
commit
8420dab6c5
2 changed files with 5 additions and 5 deletions
|
|
@ -37,7 +37,7 @@ Item{
|
|||
Text { // month year
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignCenter
|
||||
horizontalAlignment: Qt.AlignCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: new Date(monthList.currentYear, monthList.currentMonth-1, 15).toLocaleString(App.locale, 'MMMM yyyy')// 15 because of timezones that can change the date for localeString
|
||||
color: DatePickerStyle.title.colorModel.color
|
||||
font.pointSize: DatePickerStyle.title.pointSize
|
||||
|
|
@ -119,8 +119,8 @@ Item{
|
|||
property bool selected : text.text != '-'
|
||||
&& text.text && dayIndex >= 0
|
||||
&& cellDate.isEqual(monthList.selectedDate) // Do not use == as it will compare JS Date.
|
||||
width: grid.cellMinSize
|
||||
height: width
|
||||
Layout.preferredWidth: grid.cellMinSize
|
||||
Layout.preferredHeight: width
|
||||
|
||||
Rectangle { // index is 0 to 48
|
||||
anchors.centerIn: parent
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ DialogPlus {
|
|||
return 5;
|
||||
else
|
||||
return 5;
|
||||
onCurrentIndexChanged: dialog.timer = model[currentIndex].value
|
||||
model:[
|
||||
//: 'Disabled'
|
||||
{text:qsTr('disabled'), value:0},
|
||||
|
|
@ -121,8 +122,7 @@ DialogPlus {
|
|||
{ text:qsTr('nWeek', '', 1).arg(1), value:604800}
|
||||
]
|
||||
|
||||
onActivated: dialog.timer = model[index].value
|
||||
visible: chatRoomModel.canBeEphemeral
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue