Skip to content
Snippets Groups Projects
Commit 86c1bf83 authored by Capucine Berthet's avatar Capucine Berthet Committed by Sébastien Blin
Browse files

CallInformationOverlay: new design

GitLab: #1417
Change-Id: I11267d130f83421f23656f65925996caded6c10b
parent f7bf2899
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,7 @@ Popup { ...@@ -28,6 +28,7 @@ Popup {
// convient access to closePolicy // convient access to closePolicy
property bool autoClose: true property bool autoClose: true
property alias backgroundColor: container.color property alias backgroundColor: container.color
property alias backgroundOpacity: container.background.opacity
property alias title: titleText.text property alias title: titleText.text
property var popupcontainerSubContentLoader: containerSubContentLoader property var popupcontainerSubContentLoader: containerSubContentLoader
......
...@@ -24,17 +24,15 @@ import net.jami.Constants 1.1 ...@@ -24,17 +24,15 @@ import net.jami.Constants 1.1
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import "../../commoncomponents" import "../../commoncomponents"
Popup { BaseModalDialog {
id: root id: root
property real maxHeight: parent.height * 40 / 100 property real maxHeight: parent.height * 40 / 100
property real maxTextWidth: parent.width * 30 / 100 property real maxTextWidth: parent.width * 20 / 100
property var advancedList property var advancedList
property var fps property var fps
maximumPopupWidth: popupContent.width + 2 * popupMargins
width: container.width
height: container.height
closePolicy: Popup.NoAutoClosed closePolicy: Popup.NoAutoClosed
onClosed: { onClosed: {
...@@ -48,43 +46,15 @@ Popup { ...@@ -48,43 +46,15 @@ Popup {
AvAdapter.setRendererInfo(); AvAdapter.setRendererInfo();
} }
background: Rectangle { backgroundColor: JamiTheme.darkGreyColor
color: JamiTheme.transparentColor backgroundOpacity: 0.77
}
Rectangle {
id: container
color: JamiTheme.blackColor
opacity: 0.85
radius: 10
width: windowContent.width
height: windowContent.height
PushButton {
id: closeButton
anchors.top: container.top
anchors.topMargin: 5
anchors.right: container.right
anchors.rightMargin: 5
normalColor: JamiTheme.transparentColor
imageColor: JamiTheme.callInfoColor
source: JamiResources.round_close_24dp_svg
circled: false
toolTipText: JamiStrings.close
onClicked: {
root.close();
}
}
RowLayout { popupContent: RowLayout {
id: windowContent id: windowContent
spacing: JamiTheme.callInformationBlockSpacing
ColumnLayout { ColumnLayout {
spacing: JamiTheme.callInformationBlockSpacing spacing: JamiTheme.callInformationBlockSpacing
Layout.margins: JamiTheme.callInformationlayoutMargins
Layout.preferredWidth: callInfoListview.width Layout.preferredWidth: callInfoListview.width
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
...@@ -92,7 +62,10 @@ Popup { ...@@ -92,7 +62,10 @@ Popup {
id: textTest id: textTest
color: JamiTheme.callInfoColor color: JamiTheme.callInfoColor
text: JamiStrings.callInformation text: JamiStrings.callInformation
font.pointSize: JamiTheme.titleFontPointSize font.pointSize: JamiTheme.menuFontSize
font.bold: true
Layout.maximumWidth: root.maxTextWidth
elide: Text.ElideRight
} }
ListView { ListView {
...@@ -101,11 +74,9 @@ Popup { ...@@ -101,11 +74,9 @@ Popup {
model: advancedList model: advancedList
Layout.preferredWidth: root.maxTextWidth Layout.preferredWidth: root.maxTextWidth
Layout.preferredHeight: contentItem.childrenRect.height < root.maxHeight ? contentItem.childrenRect.height : root.maxHeight Layout.preferredHeight: contentItem.childrenRect.height < root.maxHeight ? contentItem.childrenRect.height : root.maxHeight
spacing: JamiTheme.callInformationBlockSpacing
clip: true clip: true
delegate: Column { delegate: Column {
spacing: JamiTheme.callInformationElementsSpacing
Text { Text {
color: JamiTheme.callInfoColor color: JamiTheme.callInfoColor
...@@ -130,8 +101,11 @@ Popup { ...@@ -130,8 +101,11 @@ Popup {
property bool showAll: false property bool showAll: false
width: callInfoListview.width width: callInfoListview.width
bottomPadding: JamiTheme.callInformationBlockSpacing
topPadding: JamiTheme.callInformationBlockSpacing
RowLayout { RowLayout {
Text { Text {
color: JamiTheme.callInfoColor color: JamiTheme.callInfoColor
text: JamiStrings.sockets text: JamiStrings.sockets
...@@ -140,7 +114,7 @@ Popup { ...@@ -140,7 +114,7 @@ Popup {
width: socketLayout.width width: socketLayout.width
} }
PushButton { JamiPushButton {
source: socketLayout.showAll ? JamiResources.expand_less_24dp_svg : JamiResources.expand_more_24dp_svg source: socketLayout.showAll ? JamiResources.expand_less_24dp_svg : JamiResources.expand_more_24dp_svg
normalColor: JamiTheme.transparentColor normalColor: JamiTheme.transparentColor
Layout.preferredWidth: 20 Layout.preferredWidth: 20
...@@ -199,14 +173,16 @@ Popup { ...@@ -199,14 +173,16 @@ Popup {
ColumnLayout { ColumnLayout {
spacing: JamiTheme.callInformationBlockSpacing spacing: JamiTheme.callInformationBlockSpacing
Layout.margins: JamiTheme.callInformationlayoutMargins
Layout.preferredWidth: renderersInfoListview.width Layout.preferredWidth: renderersInfoListview.width
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Text { Text {
color: JamiTheme.callInfoColor color: JamiTheme.callInfoColor
text: JamiStrings.renderersInformation text: JamiStrings.renderersInformation
font.pointSize: JamiTheme.titleFontPointSize font.pointSize: JamiTheme.menuFontSize
font.bold: true
elide: Text.ElideRight
Layout.maximumWidth: root.maxTextWidth
} }
ListView { ListView {
...@@ -250,4 +226,3 @@ Popup { ...@@ -250,4 +226,3 @@ Popup {
} }
} }
} }
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment