mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 11:28:07 +00:00
Fixes :
Hybrid mode conference video #LINQT-1869 fix switch size hide some chat header buttons if in call fix call notification display name #LINQT-2075
This commit is contained in:
parent
4e81981c07
commit
453d16250a
4 changed files with 14 additions and 9 deletions
|
|
@ -300,9 +300,10 @@ void Notifier::notifyReceivedCall(const shared_ptr<linphone::Call> &call) {
|
|||
auto model = CallCore::create(call);
|
||||
auto gui = new CallGui(model);
|
||||
gui->moveToThread(App::getInstance()->thread());
|
||||
QString displayName = call->getCallLog() && call->getCallLog()->getConferenceInfo()
|
||||
? Utils::coreStringToAppString(call->getCallLog()->getConferenceInfo()->getSubject())
|
||||
: Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName());
|
||||
auto callLog = call->getCallLog();
|
||||
auto displayName = callLog && callLog->getConferenceInfo()
|
||||
? Utils::coreStringToAppString(callLog->getConferenceInfo()->getSubject())
|
||||
: ToolModel::getDisplayName(call->getRemoteAddress());
|
||||
|
||||
// Accessibility alert
|
||||
//: New call from %1
|
||||
|
|
|
|||
|
|
@ -60,3 +60,4 @@ use_qrcode=0
|
|||
[video]
|
||||
auto_resize_preview_to_keep_ratio=1
|
||||
max_conference_size=vga
|
||||
other_display_mode=Hybrid
|
||||
|
|
@ -15,9 +15,6 @@ Control.Switch {
|
|||
pixelSize: Typography.p1.pixelSize
|
||||
weight: Typography.p1.weight
|
||||
}
|
||||
// Size properties
|
||||
implicitHeight: Utils.getSizeWithScreenRatio(20)
|
||||
implicitWidth: Math.round(implicitHeight * 1.6)
|
||||
// Border properties
|
||||
property color borderColor: "transparent"
|
||||
property color keyboardFocusedBorderColor: DefaultStyle.main2_900
|
||||
|
|
@ -28,8 +25,9 @@ Control.Switch {
|
|||
id: indicatorItem
|
||||
x: mainItem.leftPadding
|
||||
y: parent.height / 2 - height / 2
|
||||
height: mainItem.height
|
||||
width: mainItem.width
|
||||
// Size properties
|
||||
implicitHeight: Utils.getSizeWithScreenRatio(20)
|
||||
implicitWidth: Math.round(implicitHeight * 1.6)
|
||||
Rectangle {
|
||||
id: indicatorBackground
|
||||
anchors.fill: parent
|
||||
|
|
|
|||
|
|
@ -112,6 +112,9 @@ FocusScope {
|
|||
imageSource: AppIcons.lockSimpleOpen
|
||||
}
|
||||
Text {
|
||||
// hiding text if in call cause te view
|
||||
// has smaller width
|
||||
visible: !mainItem.call
|
||||
Layout.fillWidth: true
|
||||
color: DefaultStyle.warning_700
|
||||
//: This conversation is not encrypted !
|
||||
|
|
@ -132,6 +135,7 @@ FocusScope {
|
|||
RowLayout {
|
||||
spacing: Math.round(16 * DefaultStyle.dp)
|
||||
RoundButton {
|
||||
visible: !mainItem.call
|
||||
style: ButtonStyle.noBackground
|
||||
icon.source: AppIcons.phone
|
||||
onPressed: {
|
||||
|
|
@ -157,11 +161,12 @@ FocusScope {
|
|||
RoundButton {
|
||||
style: ButtonStyle.noBackground
|
||||
icon.source: AppIcons.videoCamera
|
||||
visible: !mainItem.chat?.core.isGroupChat || false
|
||||
visible: !mainItem.chat?.core.isGroupChat && !mainItem.call
|
||||
onPressed: mainItem.oneOneCall(true)
|
||||
}
|
||||
RoundButton {
|
||||
id: detailsPanelButton
|
||||
visible: !mainItem.call
|
||||
style: ButtonStyle.noBackground
|
||||
checkable: true
|
||||
checkedImageColor: DefaultStyle.main1_500_main
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue