diff --git a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml index dd2ec1842..245149dfb 100644 --- a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml +++ b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml @@ -73,15 +73,22 @@ Item { visible: droppableTextArea.enabled - onClicked: fileDialog.open() - - FileDialog { - id: fileDialog - - folder: shortcuts.home - title: qsTr('fileChooserTitle') - - onAccepted: _emitFiles(fileDialog.fileUrls) + onClicked: fileDialogLoader.active=true + Loader{// Qt display warnings on open this FileDialog. A loader is used to avoid printing warnings each time a chat is shown. + id: fileDialogLoader + active: false + sourceComponent: Component{ + FileDialog { + id: fileDialog + + folder: shortcuts.home + title: qsTr('fileChooserTitle') + + onAccepted: {_emitFiles(fileDialog.fileUrls);fileDialogLoader.active = false} + onRejected: fileDialogLoader.active = false + Component.onCompleted: fileDialog.open() + } + } } tooltipText: droppableTextArea.dropEnabled ? qsTr('attachmentTooltip') diff --git a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml index 8cbe26d55..318a90945 100644 --- a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml +++ b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml @@ -32,7 +32,6 @@ Avatar { } username: (mainItem.isPaused || !_username) ? '' : _username -onUsernameChanged: console.log(username) Text { anchors.fill: parent color: CallStyle.container.pause.text.color diff --git a/linphone-app/ui/modules/Linphone/Chat/Chat.qml b/linphone-app/ui/modules/Linphone/Chat/Chat.qml index 5c1ff0572..36163e19a 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Chat.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Chat.qml @@ -399,7 +399,8 @@ Rectangle { Layout.leftMargin: ChatStyle.sendArea.backgroundBorder.width maxHeight: container.height - textAreaBorders.height replyChatRoomModel: proxyModel.chatRoomModel - + replyRightMargin: textArea.textRightMargin + replyLeftMargin: textArea.textLeftMargin } // ------------------------------------------------------------------------- // Send area. diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatMessagePreview.qml b/linphone-app/ui/modules/Linphone/Chat/ChatMessagePreview.qml index 46e9c1d13..f0c1485a2 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatMessagePreview.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatMessagePreview.qml @@ -19,6 +19,8 @@ ColumnLayout{ property int fitHeight: (replyPreview.visible ? replyPreview.height + replySeparator.height: 0 ) + (audioPreview.visible ? audioPreview.height + audioSeparator.height: 0) + (filesPreview.visible ? filesPreview.height + filesSeparator.height: 0) + property alias replyRightMargin: replyPreview.rightMargin + property alias replyLeftMargin: replyPreview.leftMargin spacing: 0 Layout.preferredHeight: fitHeight Layout.maximumHeight: fitHeight> maxHeight ? maxHeight : fitHeight // ?? just using maxHeight doesn't work. diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml b/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml index 6539a6496..b7eeddd74 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml @@ -19,8 +19,8 @@ Rectangle{ property ChatRoomModel chatRoomModel property int maxHeight : parent.maxHeight Layout.preferredHeight: visible ? Math.min(messageContentsList.height + replyPreviewHeaderArea.implicitHeight + 15, replyPreviewBlock.maxHeight) : 0 - property int leftMargin: textArea.textLeftMargin - property int rightMargin: textArea.textRightMargin + property int leftMargin: 10 + property int rightMargin: 10 color: ChatStyle.replyPreview.backgroundColor radius: 10 diff --git a/linphone-app/ui/modules/Linphone/Dialog/MultimediaParametersDialog.qml b/linphone-app/ui/modules/Linphone/Dialog/MultimediaParametersDialog.qml index 0932b0701..eb41438fd 100644 --- a/linphone-app/ui/modules/Linphone/Dialog/MultimediaParametersDialog.qml +++ b/linphone-app/ui/modules/Linphone/Dialog/MultimediaParametersDialog.qml @@ -174,7 +174,7 @@ DialogPlus { Timer { interval: 50 repeat: true - running: SettingsModel.captureGraphRunning || call + running: SettingsModel.captureGraphRunning || call || false onTriggered: call ? parent.value = call.microVu : parent.value = SettingsModel.getMicVolume() }