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

Fix crash and audio only layout.

Browse source 
Fix waiting room error text position.
This commit is contained in:
Julien Wadel 2022-07-13 21:29:35 +02:00
parent c14607ad22
commit 1eed0c806d
26 changed files with 99 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linphone-app/assets/languages/da.ts
View file

@ -3405,6 +3405,11 @@ Klik her: <a href="%1">%1</a>
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/de.ts
View file

@ -3405,6 +3405,11 @@ Klicken Sie hier: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/en.ts
View file

@ -3428,6 +3428,11 @@ Click here: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation>This call is being recorded.</translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation>Waiting for another participant...</translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/es.ts
View file

@ -3405,6 +3405,11 @@ Haga clic aquí: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/fr_FR.ts
View file

@ -3405,6 +3405,11 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/hu.ts
View file

@ -3392,6 +3392,11 @@ Kattintson ide: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/it.ts
View file

@ -3405,6 +3405,11 @@ Clicca: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/ja.ts
View file

@ -3392,6 +3392,11 @@
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/lt.ts
View file

@ -3418,6 +3418,11 @@ Spustelėkite čia: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/pt_BR.ts
View file

@ -3405,6 +3405,11 @@ Clique aqui: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/ru.ts
View file

@ -3418,6 +3418,11 @@
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/sv.ts
View file

@ -3405,6 +3405,11 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/tr.ts
View file

@ -3392,6 +3392,11 @@ Buraya tıklayın: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/uk.ts
View file

@ -3418,6 +3418,11 @@
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

5
linphone-app/assets/languages/zh_CN.ts
View file

@ -3392,6 +3392,11 @@
<extracomment>&apos;This call is being recorded.&apos; : Warn the user that the remote is currently recording the call.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>videoConferenceWaitParticipantMessage</source>
<extracomment>&apos;Waiting for another participant...&apos; : Waiting message for more participant.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VideoConferenceFullscreen</name>

22
linphone-app/src/components/conference/ConferenceModel.cpp
View file

@ -71,16 +71,18 @@ ConferenceModel::~ConferenceModel(){
bool ConferenceModel::updateLocalParticipant(){
bool changed = false;
// First try to use findParticipant
auto localParticipant = mConference->findParticipant(mConference->getCall()->getCallLog()->getLocalAddress());
// Me is not in participants, use Me().
if( !localParticipant)
localParticipant = mConference->getMe();
if( localParticipant && (!mLocalParticipant || mLocalParticipant->getParticipant() != localParticipant) ) {
mLocalParticipant = QSharedPointer<ParticipantModel>::create(localParticipant);
qDebug() << "Is Admin: " << localParticipant->isAdmin() << " " << mLocalParticipant->getAdminStatus();
changed = true;
emit localParticipantChanged();
if(mConference && mConference->getCall()){
// First try to use findParticipant
auto localParticipant = mConference->findParticipant(mConference->getCall()->getCallLog()->getLocalAddress());
// Me is not in participants, use Me().
if( !localParticipant)
localParticipant = mConference->getMe();
if( localParticipant && (!mLocalParticipant || mLocalParticipant->getParticipant() != localParticipant) ) {
mLocalParticipant = QSharedPointer<ParticipantModel>::create(localParticipant);
qDebug() << "Is Admin: " << localParticipant->isAdmin() << " " << mLocalParticipant->getAdminStatus();
changed = true;
emit localParticipantChanged();
}
}
return changed;
}

2
linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml
View file

@ -5,7 +5,7 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'Busy'
property color color: ColorsList.add(sectionName+'_indicator', 'i').color
property color color: ColorsList.add(sectionName+'_indicator', 'q').color
property int duration: 1250
property int nSpheres: 8
}

1
linphone-app/ui/modules/Linphone/Account/AccountStatus.qml
View file

@ -52,6 +52,7 @@ Item {
BusyIndicator {
anchors.fill:parent
running: AccountSettingsModel.registrationState === AccountSettingsModel.RegistrationStateInProgress
color: AccountStatusStyle.busyColor
}
Icon {

1
linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
View file

@ -10,6 +10,7 @@ QtObject {
property string sectionName: 'AccountStatus'
property int horizontalSpacing: 8
property int verticalSpacing: 2
property color busyColor: ColorsList.add(sectionName+'_spinner', 'i').color
property QtObject presenceLevel: QtObject {
property int bottomMargin: 1

6
linphone-app/ui/views/App/Calls/VideoConference.qml
View file

@ -293,8 +293,12 @@ Rectangle {
}
Text{
Layout.alignment: Qt.AlignCenter
text: conference.callModel.conferenceVideoLayout == LinphoneEnums.ConferenceLayoutGrid && !conference.callModel.videoEnabled
//: 'Waiting for another participant...' : Waiting message for more participant.
? qsTr('videoConferenceWaitParticipantMessage')
//: 'Video conference is not ready. Please Wait...' : Waiting message for starting conference.
text: qsTr('videoConferenceWaitMessage')
: qsTr('videoConferenceWaitMessage')
color: VideoConferenceStyle.buzyColor
}
}

2
linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
View file

@ -46,7 +46,7 @@ Item {
function clearAll(layoutMode){
if( layoutMode != LinphoneEnums.ConferenceLayoutActiveSpeaker){
cameraView.cameraEnabled = false
mainItem.cameraEnabled = false
miniViews.model = []
}
}

3
linphone-app/ui/views/App/Calls/WaitingRoom.qml
View file

@ -41,7 +41,7 @@ Rectangle {
anchors.fill: parent
ColumnLayout{
Layout.alignment: Qt.AlignCenter
Layout.bottomMargin: (mainItem.conferenceInfoModel && mainItem.callModel ? 10 : 40) - (errorArea.visible ? errorArea.height + 10: 0)
Layout.bottomMargin: (mainItem.conferenceInfoModel && mainItem.callModel ? 10 : 40)
spacing: 10
BusyIndicator {
Layout.alignment: Qt.AlignCenter
@ -103,6 +103,7 @@ Rectangle {
Text {
id: errorArea
Layout.fillWidth: true
Layout.preferredHeight: implicitHeight
Layout.bottomMargin: 10
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter

6
linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml
View file

@ -60,12 +60,6 @@ QtObject {
property int spacing: 10
property int topMargin: 26
property QtObject busyIndicator: QtObject {
property color color: ColorsList.add(sectionName+'_header_busy', 'g').color
property int height: 30
property int width: 30
}
property QtObject contactDescription: QtObject {
property int height: 50
property int width: 150

2
linphone-app/ui/views/App/Styles/Calls/CallStyle.qml
View file

@ -61,7 +61,7 @@ QtObject {
property int topMargin: 26
property QtObject busyIndicator: QtObject {
property color color: ColorsList.add(sectionName+'_header_busy', 'g').color
property color color: ColorsList.add(sectionName+'_header_busy', 'q').color
property int height: 30
property int width: 30
}

6
linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml
View file

@ -118,12 +118,6 @@ QtObject {
property int spacing: 10
property int topMargin: 26
property QtObject busyIndicator: QtObject {
property color color: ColorsList.add(sectionName+'_header_busy', 'g').color
property int height: 30
property int width: 30
}
property QtObject contactDescription: QtObject {
property int height: 50
property int width: 150

109
linphone-app/ui/views/App/Styles/Calls/WaitingRoomStyle.qml
View file

@ -24,115 +24,6 @@ QtObject {
property int displayNamePointSize: Units.dp * 10
property int addressPointSize: Units.dp * 8
}
/*
property QtObject grid: QtObject {
property int spacing: 5
property QtObject cell: QtObject {
property int height: 145
property int spacing: 5
property int width: 154
property QtObject contactDescription: QtObject {
property color color: ColorsList.add(sectionName+'_username', 'q').color
property int pointSize: Units.dp * 12
property int weight: Font.Bold
}
}
}
property QtObject actionArea: QtObject {
property int height: 100
property int iconSize: 40
property int leftButtonsGroupMargin: 50
property int lowWidth: 650
property int rightButtonsGroupMargin: 50
property QtObject userVideo: QtObject {
property int height: 200
property int width: 130
property int heightReference: 1200 // height and width are fixed from these references
property int widthReference: 780
}
property QtObject vu: QtObject {
property int spacing: 5
}
property QtObject callError: QtObject {
property color color: ColorsList.add(sectionName+'_action_error', 'i').color
property int pointSize: Units.dp * 12
}
}
property QtObject container: QtObject {
property int margins: 15
property QtObject avatar: QtObject {
property color backgroundColor: ColorsList.add(sectionName+'_container_avatar_bg', 'n').color
property int maxSize: 300
}
property QtObject pause: QtObject {
property color color: ColorsList.add(sectionName+'_container_pause', 'g90').color
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_container_pause_text', 'q').color
property int pointSizeFactor: 5
}
}
}
property QtObject header: QtObject {
property int buttonIconSize: 40
property int iconSize: 16
property int leftMargin: 20
property int rightMargin: 20
property int spacing: 10
property int topMargin: 26
property QtObject busyIndicator: QtObject {
property color color: ColorsList.add(sectionName+'_header_busy', 'g').color
property int height: 30
property int width: 30
}
property QtObject contactDescription: QtObject {
property int height: 50
property int width: 150
}
property QtObject elapsedTime: QtObject {
property color color: ColorsList.add(sectionName+'_header_elapsed_time', 'j').color
property int pointSize: Units.dp * 10
property QtObject fullscreen: QtObject {
property int pointSize: Units.dp * 12
}
}
property QtObject stats: QtObject {
property int relativeY: 90
}
}
property QtObject zrtpArea: QtObject {
property int height: 50
property QtObject buttons: QtObject {
property int spacing: 10
}
property QtObject text: QtObject {
property color colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j').color
property color colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i').color
property int pointSize: Units.dp * 10
property int wordsSpacing: 5
}
}
*/
property QtObject callError: QtObject {
property color color: ColorsList.add(sectionName+'_action_error', 'q').color
property int pointSize: Units.dp * 12