mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-05-07 14:44:01 +00:00
Remove invitation filter in conference list.
Fix participants size in ICS when expanded.
This commit is contained in:
Julien Wadel
parent
f282944f19
commit
d4be006a8c
17 changed files with 38 additions and 109 deletions
|
|
@ -812,11 +812,6 @@ Server url ikke konfigureret.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -812,11 +812,6 @@ Server URL ist nicht konfiguriert.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -812,11 +812,6 @@ Server URL not configured.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation>Conference URL has been copied</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation>Invitations</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -812,11 +812,6 @@ URL del servidor no configurada.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -812,11 +812,6 @@ URL du serveur non configurée.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -806,11 +806,6 @@ A kiszolgáló URL-je nincs konfigurálva.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -812,11 +812,6 @@ URL del server non configurato.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation>L'URL della conferenze è stato copiato</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -806,11 +806,6 @@
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -818,11 +818,6 @@ Nesukonfigūruotas serverio url.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -812,11 +812,6 @@ URL do servidor não configurado.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -818,11 +818,6 @@
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation>URL конференции скопирован</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -812,11 +812,6 @@ Serverwebbadressen är inte konfigurerad.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -806,11 +806,6 @@ Sunucu url'si yapılandırılmadı.</translation>
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -818,11 +818,6 @@
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -806,11 +806,6 @@
|
|||
<extracomment>'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>conferencesInvitedFilter</source>
|
||||
<extracomment>'Invitations' : Filter conferences on invited conferences (where we are not the organizer).</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ConfirmDialog</name>
|
||||
|
|
|
|||
|
|
@ -122,13 +122,15 @@ Loader{
|
|||
RowLayout {
|
||||
id: participantsRow
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: ChatCalendarMessageStyle.participants.iconSize
|
||||
Layout.fillHeight: true
|
||||
Layout.minimumHeight: mainItem.isExpanded ? expandedParticipantsList.minimumHeight : ChatCalendarMessageStyle.participants.iconSize
|
||||
Layout.leftMargin: 5
|
||||
Layout.rightMargin: 15
|
||||
|
||||
spacing: ChatCalendarMessageStyle.participants.spacing
|
||||
|
||||
Icon{
|
||||
Layout.alignment: Qt.AlignTop
|
||||
icon: ChatCalendarMessageStyle.participants.icon
|
||||
iconSize: ChatCalendarMessageStyle.participants.iconSize
|
||||
overwriteColor: ChatCalendarMessageStyle.participants.color
|
||||
|
|
@ -137,13 +139,44 @@ Loader{
|
|||
Text {
|
||||
id: participantsList
|
||||
Layout.fillWidth: true
|
||||
visible: !mainItem.isExpanded
|
||||
color: ChatCalendarMessageStyle.participants.color
|
||||
elide: Text.ElideRight
|
||||
font.pointSize: ChatCalendarMessageStyle.participants.pointSize
|
||||
text: mainItem.conferenceInfoModel.displayNamesToString
|
||||
}
|
||||
}
|
||||
ScrollableListView{
|
||||
id: expandedParticipantsList
|
||||
property int minimumHeight: Math.min( count * ChatCalendarMessageStyle.lineHeight, layout.height/(descriptionTitle.visible?3:2))
|
||||
Layout.fillWidth: true
|
||||
Layout.minimumHeight: minimumHeight
|
||||
spacing: 0
|
||||
visible: mainItem.isExpanded
|
||||
onVisibleChanged: model= mainItem.conferenceInfoModel.getParticipants()
|
||||
|
||||
delegate: Row{
|
||||
spacing: 5
|
||||
width: expandedParticipantsList.contentWidth
|
||||
height: ChatCalendarMessageStyle.lineHeight
|
||||
Text{
|
||||
id: displayName
|
||||
text: modelData.displayName
|
||||
color: ChatCalendarMessageStyle.description.color
|
||||
font.pointSize: ChatCalendarMessageStyle.description.pointSize
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
Text{
|
||||
width: expandedParticipantsList.contentWidth - displayName.width - parent.spacing // parent.width is not enough. Force width
|
||||
text: '('+modelData.address+')'
|
||||
color: ChatCalendarMessageStyle.description.color
|
||||
font.pointSize: ChatCalendarMessageStyle.description.pointSize
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
}
|
||||
}
|
||||
ActionButton{
|
||||
visible: mainItem.gotoButtonMode >= 0
|
||||
Layout.alignment: Qt.AlignTop
|
||||
Layout.preferredHeight: iconSize
|
||||
Layout.preferredWidth: height
|
||||
isCustom: true
|
||||
|
|
@ -160,33 +193,7 @@ Loader{
|
|||
Layout.topMargin: 5
|
||||
visible: mainItem.isExpanded
|
||||
spacing: 0
|
||||
ScrollableListView{
|
||||
id: expandedParticipantsList
|
||||
Layout.fillWidth: true
|
||||
Layout.minimumHeight: Math.min( count * ChatCalendarMessageStyle.lineHeight, parent.height/(descriptionTitle.visible?3:2))
|
||||
Layout.leftMargin: 10
|
||||
spacing: 0
|
||||
visible: mainItem.isExpanded
|
||||
onVisibleChanged: model= mainItem.conferenceInfoModel.getParticipants()
|
||||
|
||||
delegate: Row{
|
||||
spacing: 5
|
||||
width: expandedParticipantsList.width
|
||||
height: ChatCalendarMessageStyle.lineHeight
|
||||
Text{text: modelData.displayName
|
||||
color: ChatCalendarMessageStyle.description.color
|
||||
font.pointSize: ChatCalendarMessageStyle.description.pointSize
|
||||
elide: Text.ElideRight
|
||||
wrapMode: TextEdit.WordWrap
|
||||
}
|
||||
Text{text: '('+modelData.address+')'
|
||||
color: ChatCalendarMessageStyle.description.color
|
||||
font.pointSize: ChatCalendarMessageStyle.description.pointSize
|
||||
elide: Text.ElideRight
|
||||
wrapMode: TextEdit.WordWrap
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Text{
|
||||
id: descriptionTitle
|
||||
Layout.fillWidth: true
|
||||
|
|
|
|||
|
|
@ -63,15 +63,12 @@ Item{
|
|||
|
||||
//: 'Scheduled' : Filter conferences on scheduled status.
|
||||
qsTr('conferencesScheduledFilter'),
|
||||
|
||||
//: 'Invitations' : Filter conferences on invited conferences (where we are not the organizer).
|
||||
qsTr('conferencesInvitedFilter'),
|
||||
]
|
||||
capitalization: Font.AllUppercase
|
||||
selectedButton: mainItem.filterType
|
||||
onClicked: {
|
||||
if(button <= 2)
|
||||
mainItem.filterType = (button === 0 ? ConferenceInfoProxyModel.Ended : button === 1 ?ConferenceInfoProxyModel.Scheduled : ConferenceInfoProxyModel.Invitations);
|
||||
if(button <= 1)
|
||||
mainItem.filterType = (button === 0 ? ConferenceInfoProxyModel.Ended : ConferenceInfoProxyModel.Scheduled);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue