fix #LINQT-1675 enable video switch in settings
This commit is contained in:
parent
e620af3f3e
commit
b2d20b72e9
7 changed files with 113 additions and 102 deletions
|
|
@ -189,7 +189,7 @@ ColumnLayout {
|
|||
button.onClicked: console.debug("[ContactLayout.qml] TODO : open conversation")
|
||||
}
|
||||
LabelButton {
|
||||
visible: !mainItem.isConference
|
||||
visible: !mainItem.isConference && SettingsCpp.videoEnabled
|
||||
width: 56 * DefaultStyle.dp
|
||||
height: 56 * DefaultStyle.dp
|
||||
button.icon.width: 24 * DefaultStyle.dp
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ FocusScope {
|
|||
}
|
||||
IconButton {
|
||||
id: videoCallButton
|
||||
visible: SettingsCpp.videoEnabled
|
||||
Layout.preferredWidth: 45 * DefaultStyle.dp
|
||||
Layout.preferredHeight: 45 * DefaultStyle.dp
|
||||
icon.width: 24 * DefaultStyle.dp
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import QtQuick
|
|||
import QtQuick.Controls.Basic as Control
|
||||
import QtQuick.Layouts
|
||||
import Linphone
|
||||
import SettingsCpp 1.0
|
||||
import SettingsCpp
|
||||
|
||||
ColumnLayout {
|
||||
id: mainItem
|
||||
|
|
@ -193,6 +193,7 @@ ColumnLayout {
|
|||
}
|
||||
ColumnLayout {
|
||||
spacing: 12 * DefaultStyle.dp
|
||||
visible: SettingsCpp.videoEnabled
|
||||
RowLayout {
|
||||
spacing: 8 * DefaultStyle.dp
|
||||
EffectImage {
|
||||
|
|
|
|||
|
|
@ -55,6 +55,12 @@ AbstractSettingsLayout {
|
|||
subTitleText: qsTr("Activer les tonalités")
|
||||
propertyName: "callToneIndicationsEnabled"
|
||||
propertyOwner: SettingsCpp
|
||||
}
|
||||
SwitchSetting {
|
||||
titleText: qsTr("Vidéo")
|
||||
subTitleText: qsTr("Autoriser la vidéo")
|
||||
propertyName: "videoEnabled"
|
||||
propertyOwner: SettingsCpp
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ RowLayout {
|
|||
spacing: 16 * DefaultStyle.dp
|
||||
CheckableButton {
|
||||
id: videoButton
|
||||
visible: SettingsCpp.videoEnabled
|
||||
iconUrl: AppIcons.videoCamera
|
||||
checkedIconUrl: AppIcons.videoCameraSlash
|
||||
checked: !mainItem.localVideoEnabled
|
||||
|
|
|
|||
|
|
@ -409,6 +409,7 @@ FriendGui{
|
|||
"[ContactLayout.qml] TODO : open conversation")
|
||||
}
|
||||
LabelButton {
|
||||
visible: SettingsCpp.videoEnabled
|
||||
button.icon.source: AppIcons.videoCamera
|
||||
label: qsTr("Appel vidéo")
|
||||
width: 56 * DefaultStyle.dp
|
||||
|
|
|
|||
|
|
@ -1200,6 +1200,7 @@ AbstractWindow {
|
|||
spacing: 10 * DefaultStyle.dp
|
||||
CheckableButton {
|
||||
id: videoCameraButton
|
||||
visible: SettingsCpp.videoEnabled
|
||||
enabled: mainWindow.conferenceInfo
|
||||
|| (mainWindow.callState === LinphoneEnums.CallState.Connected
|
||||
|| mainWindow.callState
|
||||
|
|
|
|||
Loading…
Reference in a new issue