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

Bypassing dp sizes

Browse source
This commit is contained in:
Julien Wadel 2024-10-17 13:21:39 +02:00
parent 0727b08818
commit ef013c8e1d
105 changed files with 2441 additions and 2429 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Linphone/tool/Utils.cpp
View file

@ -55,6 +55,11 @@ char *Utils::rstrstr(const char *a, const char *b) {
return nullptr; return nullptr;
} }
double Utils::getPixelDensity(int x, int y) { // Get the pixel density on the screen at (x,y)
auto screen = QGuiApplication::screenAt(QPoint(x, y));
return screen ? screen->devicePixelRatio() : 1.0;
}
VariantObject *Utils::getDisplayName(const QString &address) { VariantObject *Utils::getDisplayName(const QString &address) {
QStringList splitted = address.split(":"); QStringList splitted = address.split(":");
if (splitted.size() > 0 && splitted[0] == "sip") splitted.removeFirst(); if (splitted.size() > 0 && splitted[0] == "sip") splitted.removeFirst();

2
Linphone/tool/Utils.hpp
View file

@ -53,7 +53,7 @@ class Utils : public QObject {
public: public:
Utils(QObject *parent = nullptr) : QObject(parent) { Utils(QObject *parent = nullptr) : QObject(parent) {
} }
Q_INVOKABLE static double getPixelDensity(int x, int y); // Get the pixel density on the screen at (x,y)
Q_INVOKABLE static VariantObject *getDisplayName(const QString &address); Q_INVOKABLE static VariantObject *getDisplayName(const QString &address);
Q_INVOKABLE static QString getUsername(const QString &address); Q_INVOKABLE static QString getUsername(const QString &address);
Q_INVOKABLE static QString getGivenNameFromFullName(const QString &fullName); Q_INVOKABLE static QString getGivenNameFromFullName(const QString &fullName);

14
Linphone/view/Control/Button/Button.qml
View file

@ -12,10 +12,10 @@ Control.Button {
property color borderColor: DefaultStyle.grey_0 property color borderColor: DefaultStyle.grey_0
readonly property color pressedColor: Qt.darker(color, 1.1) readonly property color pressedColor: Qt.darker(color, 1.1)
property bool inversedColors: false property bool inversedColors: false
property int textSize: 18 * DefaultStyle.dp property int textSize: 18 * mainWindow.dp
property int textWeight: 600 * DefaultStyle.dp property int textWeight: 600 * mainWindow.dp
property var textHAlignment: Text.AlignHCenter property var textHAlignment: Text.AlignHCenter
property int radius: 48 * DefaultStyle.dp property int radius: 48 * mainWindow.dp
property color textColor: DefaultStyle.grey_0 property color textColor: DefaultStyle.grey_0
property bool underline: activeFocus || containsMouse property bool underline: activeFocus || containsMouse
property bool shadowEnabled: enabled && (activeFocus || containsMouse) property bool shadowEnabled: enabled && (activeFocus || containsMouse)
@ -24,10 +24,10 @@ Control.Button {
property bool asynchronous: true property bool asynchronous: true
hoverEnabled: true hoverEnabled: true
activeFocusOnTab: true activeFocusOnTab: true
// leftPadding: 20 * DefaultStyle.dp // leftPadding: 20 * mainWindow.dp
// rightPadding: 20 * DefaultStyle.dp // rightPadding: 20 * mainWindow.dp
// topPadding: 11 * DefaultStyle.dp // topPadding: 11 * mainWindow.dp
// bottomPadding: 11 * DefaultStyle.dp // bottomPadding: 11 * mainWindow.dp
implicitHeight: contentItem.implicitHeight + bottomPadding + topPadding implicitHeight: contentItem.implicitHeight + bottomPadding + topPadding
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
MouseArea { MouseArea {

20
Linphone/view/Control/Button/CalendarComboBox.qml
View file

@ -14,24 +14,24 @@ ComboBox {
id: contentText id: contentText
text: Qt.formatDate(calendar.selectedDate, "ddd d, MMMM") text: Qt.formatDate(calendar.selectedDate, "ddd d, MMMM")
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 15 * DefaultStyle.dp anchors.leftMargin: 15 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
popup: Control.Popup { popup: Control.Popup {
id: popupItem id: popupItem
y: mainItem.height y: mainItem.height
width: 321 * DefaultStyle.dp width: 321 * mainWindow.dp
height: 270 * DefaultStyle.dp height: 270 * mainWindow.dp
closePolicy: Popup.NoAutoClose closePolicy: Popup.NoAutoClose
topPadding: 25 * DefaultStyle.dp topPadding: 25 * mainWindow.dp
bottomPadding: 24 * DefaultStyle.dp bottomPadding: 24 * mainWindow.dp
leftPadding: 21 * DefaultStyle.dp leftPadding: 21 * mainWindow.dp
rightPadding: 19 * DefaultStyle.dp rightPadding: 19 * mainWindow.dp
onOpened: calendar.forceActiveFocus() onOpened: calendar.forceActiveFocus()
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
@ -39,7 +39,7 @@ ComboBox {
id: calendarBg id: calendarBg
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: 16 * DefaultStyle.dp radius: 16 * mainWindow.dp
border.color: DefaultStyle.main1_500_main border.color: DefaultStyle.main1_500_main
border.width: calendar.activeFocus? 1 : 0 border.width: calendar.activeFocus? 1 : 0
} }

8
Linphone/view/Control/Button/CheckBox.qml
View file

@ -7,16 +7,16 @@ Control.CheckBox {
id: mainItem id: mainItem
property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered
indicator: Item{ indicator: Item{
implicitWidth: 20 * DefaultStyle.dp implicitWidth: 20 * mainWindow.dp
implicitHeight: 20 * DefaultStyle.dp implicitHeight: 20 * mainWindow.dp
x: (parent.width - width) / 2 x: (parent.width - width) / 2
y: (parent.height - height) / 2 y: (parent.height - height) / 2
Rectangle { Rectangle {
id: backgroundArea id: backgroundArea
anchors.fill: parent anchors.fill: parent
radius: 3 * DefaultStyle.dp radius: 3 * mainWindow.dp
border.color: DefaultStyle.main1_500_main border.color: DefaultStyle.main1_500_main
border.width: 2.2 * DefaultStyle.dp border.width: 2.2 * mainWindow.dp
// color: mainItem.checked ? DefaultStyle.main1_500_main : "transparent" // color: mainItem.checked ? DefaultStyle.main1_500_main : "transparent"
EffectImage { EffectImage {
visible: mainItem.checked visible: mainItem.checked

48
Linphone/view/Control/Button/ComboBox.qml
View file

@ -13,9 +13,9 @@ Control.ComboBox {
// Layout.preferredHeight: mainItem.height // Layout.preferredHeight: mainItem.height
property alias listView: listView property alias listView: listView
property string constantImageSource property string constantImageSource
property int pixelSize: 14 * DefaultStyle.dp property int pixelSize: 14 * mainWindow.dp
property int weight: 400 * DefaultStyle.dp property int weight: 400 * mainWindow.dp
property int leftMargin: 10 * DefaultStyle.dp property int leftMargin: 10 * mainWindow.dp
property bool oneLine: false property bool oneLine: false
property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered
@ -46,7 +46,7 @@ Control.ComboBox {
Rectangle { Rectangle {
id: buttonBackground id: buttonBackground
anchors.fill: parent anchors.fill: parent
radius: 63 * DefaultStyle.dp radius: 63 * mainWindow.dp
color: mainItem.enabled ? DefaultStyle.grey_100 : DefaultStyle.grey_200 color: mainItem.enabled ? DefaultStyle.grey_100 : DefaultStyle.grey_200
border.color: mainItem.enabled border.color: mainItem.enabled
? mainItem.activeFocus ? mainItem.activeFocus
@ -68,14 +68,14 @@ Control.ComboBox {
} }
contentItem: Item { contentItem: Item {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 10 * DefaultStyle.dp anchors.leftMargin: 10 * mainWindow.dp
anchors.rightMargin: indicImage.width + 10 * DefaultStyle.dp anchors.rightMargin: indicImage.width + 10 * mainWindow.dp
Image { Image {
id: selectedItemImg id: selectedItemImg
source: mainItem.constantImageSource ? mainItem.constantImageSource : "" source: mainItem.constantImageSource ? mainItem.constantImageSource : ""
visible: source != "" visible: source != ""
sourceSize.width: 24 * DefaultStyle.dp sourceSize.width: 24 * mainWindow.dp
width: visible ? 24 * DefaultStyle.dp : 0 width: visible ? 24 * mainWindow.dp : 0
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
@ -93,9 +93,9 @@ Control.ComboBox {
weight: mainItem.weight weight: mainItem.weight
} }
anchors.left: selectedItemImg.right anchors.left: selectedItemImg.right
anchors.leftMargin: selectedItemImg.visible ? 5 * DefaultStyle.dp : 10 * DefaultStyle.dp anchors.leftMargin: selectedItemImg.visible ? 5 * mainWindow.dp : 10 * mainWindow.dp
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 * DefaultStyle.dp anchors.rightMargin: 20 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -118,10 +118,10 @@ Control.ComboBox {
id: indicImage id: indicImage
z: 1 z: 1
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 10 * DefaultStyle.dp anchors.rightMargin: 10 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
source: AppIcons.downArrow source: AppIcons.downArrow
width: 14 * DefaultStyle.dp width: 14 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
} }
@ -130,7 +130,7 @@ Control.ComboBox {
y: mainItem.height - 1 y: mainItem.height - 1
width: mainItem.width width: mainItem.width
implicitHeight: contentItem.implicitHeight implicitHeight: contentItem.implicitHeight
padding: 1 * DefaultStyle.dp padding: 1 * mainWindow.dp
//height: Math.min(implicitHeight, 300) //height: Math.min(implicitHeight, 300)
onOpened: { onOpened: {
@ -150,7 +150,7 @@ Control.ComboBox {
highlight: Rectangle { highlight: Rectangle {
width: listView.width width: listView.width
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
y: listView.currentItem? listView.currentItem.y : 0 y: listView.currentItem? listView.currentItem.y : 0
} }
@ -171,12 +171,12 @@ Control.ComboBox {
Image { Image {
id: delegateImg id: delegateImg
visible: source != "" visible: source != ""
width: visible ? 20 * DefaultStyle.dp : 0 width: visible ? 20 * mainWindow.dp : 0
sourceSize.width: 20 * DefaultStyle.dp sourceSize.width: 20 * mainWindow.dp
source: typeof(modelData) != "undefined" && modelData.img ? modelData.img : "" source: typeof(modelData) != "undefined" && modelData.img ? modelData.img : ""
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: visible ? 10 * DefaultStyle.dp : 0 anchors.leftMargin: visible ? 10 * mainWindow.dp : 0
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -192,14 +192,14 @@ Control.ComboBox {
maximumLineCount: 1 maximumLineCount: 1
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: delegateImg.right anchors.left: delegateImg.right
anchors.leftMargin: delegateImg.visible ? 5 * DefaultStyle.dp : 10 * DefaultStyle.dp anchors.leftMargin: delegateImg.visible ? 5 * mainWindow.dp : 10 * mainWindow.dp
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 * DefaultStyle.dp anchors.rightMargin: 20 * mainWindow.dp
} }
MouseArea { MouseArea {
@ -209,7 +209,7 @@ Control.ComboBox {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
opacity: 0.1 opacity: 0.1
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
visible: parent.containsMouse visible: parent.containsMouse
} }
@ -227,11 +227,11 @@ Control.ComboBox {
background: Item { background: Item {
implicitWidth: mainItem.width implicitWidth: mainItem.width
implicitHeight: 30 * DefaultStyle.dp implicitHeight: 30 * mainWindow.dp
Rectangle { Rectangle {
id: cboxBg id: cboxBg
anchors.fill: parent anchors.fill: parent
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
} }
MultiEffect { MultiEffect {
anchors.fill: cboxBg anchors.fill: cboxBg

46
Linphone/view/Control/Button/CountryIndicatorCombobox.qml
View file

@ -17,8 +17,8 @@ ColumnLayout {
text: mainItem.label text: mainItem.label
color: combobox.activeFocus ? DefaultStyle.main1_500_main : DefaultStyle.main2_600 color: combobox.activeFocus ? DefaultStyle.main1_500_main : DefaultStyle.main2_600
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
bold: true bold: true
} }
} }
@ -34,7 +34,7 @@ ColumnLayout {
background: Rectangle { background: Rectangle {
implicitWidth: mainItem.implicitWidth implicitWidth: mainItem.implicitWidth
implicitHeight: mainItem.implicitHeight implicitHeight: mainItem.implicitHeight
radius: 63 * DefaultStyle.dp radius: 63 * mainWindow.dp
color: mainItem.enableBackgroundColor ? DefaultStyle.grey_100 : "transparent" color: mainItem.enableBackgroundColor ? DefaultStyle.grey_100 : "transparent"
border.color: mainItem.enableBackgroundColors border.color: mainItem.enableBackgroundColors
? (mainItem.errorMessage.length > 0 ? (mainItem.errorMessage.length > 0
@ -47,14 +47,14 @@ ColumnLayout {
contentItem: Item { contentItem: Item {
anchors.fill: parent anchors.fill: parent
readonly property var currentItem: combobox.model.getAt(combobox.currentIndex) readonly property var currentItem: combobox.model.getAt(combobox.currentIndex)
anchors.leftMargin: 15 * DefaultStyle.dp anchors.leftMargin: 15 * mainWindow.dp
Text { Text {
id: selectedItemFlag id: selectedItemFlag
visible: text.length > 0 visible: text.length > 0
font.pixelSize: 21 * DefaultStyle.dp font.pixelSize: 21 * mainWindow.dp
text: parent.currentItem ? parent.currentItem.flag : "" text: parent.currentItem ? parent.currentItem.flag : ""
font.family: DefaultStyle.emojiFont font.family: DefaultStyle.emojiFont
anchors.rightMargin: 5 * DefaultStyle.dp anchors.rightMargin: 5 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
// Rectangle{ // Rectangle{
@ -62,7 +62,7 @@ ColumnLayout {
// visible: false // visible: false
// layer.enabled: true // layer.enabled: true
// anchors.centerIn: selectedItemFlag // anchors.centerIn: selectedItemFlag
// radius: 600 * DefaultStyle.dp // radius: 600 * mainWindow.dp
// width: selectedItemFlag.width/2 // width: selectedItemFlag.width/2
// height: selectedItemFlag.height/2 // height: selectedItemFlag.height/2
// } // }
@ -77,7 +77,7 @@ ColumnLayout {
// maskSource: mask // maskSource: mask
// } // }
Text { Text {
leftPadding: 5 * DefaultStyle.dp leftPadding: 5 * mainWindow.dp
text: parent.currentItem ? "+" + parent.currentItem.countryCallingCode : "" text: parent.currentItem ? "+" + parent.currentItem.countryCallingCode : ""
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
anchors.right: parent.right anchors.right: parent.right
@ -85,8 +85,8 @@ ColumnLayout {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
elide: Text.ElideRight elide: Text.ElideRight
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -100,8 +100,8 @@ ColumnLayout {
popup: Control.Popup { popup: Control.Popup {
id: listPopup id: listPopup
y: combobox.height - 1 y: combobox.height - 1
width: 311 * DefaultStyle.dp width: 311 * mainWindow.dp
height: 250 * DefaultStyle.dp height: 250 * mainWindow.dp
contentItem: ListView { contentItem: ListView {
id: listView id: listView
@ -112,14 +112,14 @@ ColumnLayout {
keyNavigationEnabled: true keyNavigationEnabled: true
keyNavigationWraps: true keyNavigationWraps: true
maximumFlickVelocity: 1500 maximumFlickVelocity: 1500
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
highlight: Rectangle { highlight: Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
width: listView.width width: listView.width
height: listView.height height: listView.height
color: DefaultStyle.main2_300 color: DefaultStyle.main2_300
// radius: 15 * DefaultStyle.dp // radius: 15 * mainWindow.dp
y: listView.currentItem? listView.currentItem.y : 0 y: listView.currentItem? listView.currentItem.y : 0
} }
@ -128,13 +128,13 @@ ColumnLayout {
height: combobox.height height: combobox.height
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 20 * DefaultStyle.dp anchors.leftMargin: 20 * mainWindow.dp
Text { Text {
id: delegateImg id: delegateImg
visible: text.length > 0 visible: text.length > 0
text: $modelData.flag text: $modelData.flag
font { font {
pixelSize: 28 * DefaultStyle.dp pixelSize: 28 * mainWindow.dp
family: DefaultStyle.emojiFont family: DefaultStyle.emojiFont
} }
} }
@ -145,14 +145,14 @@ ColumnLayout {
elide: Text.ElideRight elide: Text.ElideRight
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
Rectangle { Rectangle {
id: separator id: separator
width: 1 * DefaultStyle.dp width: 1 * mainWindow.dp
height: combobox.height / 2 height: combobox.height / 2
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
@ -162,8 +162,8 @@ ColumnLayout {
elide: Text.ElideRight elide: Text.ElideRight
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
Item { Item {
@ -176,7 +176,7 @@ ColumnLayout {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
opacity: 0.1 opacity: 0.1
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
visible: parent.containsMouse visible: parent.containsMouse
} }
@ -198,7 +198,7 @@ ColumnLayout {
Rectangle { Rectangle {
id: popupBg id: popupBg
anchors.fill: parent anchors.fill: parent
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
} }
MultiEffect { MultiEffect {

4
Linphone/view/Control/Button/HelpIconLabelButton.qml
View file

@ -8,7 +8,7 @@ MouseArea {
property string iconSource property string iconSource
property string title property string title
property string subTitle property string subTitle
property int iconSize: 32 * DefaultStyle.dp property int iconSize: 32 * mainWindow.dp
property bool shadowEnabled: containsMouse || activeFocus property bool shadowEnabled: containsMouse || activeFocus
hoverEnabled: true hoverEnabled: true
width: content.implicitWidth width: content.implicitWidth
@ -36,7 +36,7 @@ MouseArea {
ColumnLayout { ColumnLayout {
width: implicitWidth width: implicitWidth
height: implicitHeight height: implicitHeight
Layout.leftMargin: 16 * DefaultStyle.dp Layout.leftMargin: 16 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: mainItem.title text: mainItem.title

8
Linphone/view/Control/Button/IconLabelButton.qml
View file

@ -8,12 +8,12 @@ Item{
property string iconSource property string iconSource
property string text property string text
property color color: DefaultStyle.main2_600 property color color: DefaultStyle.main2_600
property int iconSize: 17 * DefaultStyle.dp property int iconSize: 17 * mainWindow.dp
property int textSize: 14 * DefaultStyle.dp property int textSize: 14 * mainWindow.dp
property int textWeight: 400 * DefaultStyle.dp property int textWeight: 400 * mainWindow.dp
property color backgroundColor: DefaultStyle.grey_0 property color backgroundColor: DefaultStyle.grey_0
readonly property color backgroundPressedColor: Qt.darker(backgroundColor, 1.1) readonly property color backgroundPressedColor: Qt.darker(backgroundColor, 1.1)
property int radius: 5 * DefaultStyle.dp property int radius: 5 * mainWindow.dp
property bool shadowEnabled: mainItem.activeFocus// || containsMouse property bool shadowEnabled: mainItem.activeFocus// || containsMouse
property alias containsMouse: mouseArea.containsMouse property alias containsMouse: mouseArea.containsMouse

8
Linphone/view/Control/Button/MediumButton.qml
View file

@ -10,8 +10,8 @@ Button {
textWeight: Typography.b3.weight textWeight: Typography.b3.weight
color: DefaultStyle.main1_100 color: DefaultStyle.main1_100
textColor: DefaultStyle.main1_500_main textColor: DefaultStyle.main1_500_main
leftPadding: 16 * DefaultStyle.dp leftPadding: 16 * mainWindow.dp
rightPadding: 16 * DefaultStyle.dp rightPadding: 16 * mainWindow.dp
topPadding: 10 * DefaultStyle.dp topPadding: 10 * mainWindow.dp
bottomPadding: 10 * DefaultStyle.dp bottomPadding: 10 * mainWindow.dp
} }

18
Linphone/view/Control/Button/PopupButton.qml
View file

@ -10,17 +10,17 @@ Button {
property bool shadowEnabled: mainItem.activeFocus || hovered property bool shadowEnabled: mainItem.activeFocus || hovered
property alias popupBackgroundColor: popupBackground.color property alias popupBackgroundColor: popupBackground.color
checked: popup.visible checked: popup.visible
implicitWidth: 24 * DefaultStyle.dp implicitWidth: 24 * mainWindow.dp
implicitHeight: 24 * DefaultStyle.dp implicitHeight: 24 * mainWindow.dp
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
leftPadding: 0 leftPadding: 0
rightPadding: 0 rightPadding: 0
topPadding: 0 topPadding: 0
bottomPadding: 0 bottomPadding: 0
icon.source: AppIcons.more icon.source: AppIcons.more
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
function close() { function close() {
popup.close() popup.close()
} }
@ -41,7 +41,7 @@ Button {
anchors.fill: parent anchors.fill: parent
visible: mainItem.checked || mainItem.shadowEnabled visible: mainItem.checked || mainItem.shadowEnabled
color: mainItem.checked ? DefaultStyle.main2_300 : DefaultStyle.grey_100 color: mainItem.checked ? DefaultStyle.main2_300 : DefaultStyle.grey_100
radius: 40 * DefaultStyle.dp radius: 40 * mainWindow.dp
} }
MultiEffect { MultiEffect {
enabled: mainItem.shadowEnabled enabled: mainItem.shadowEnabled
@ -70,7 +70,7 @@ Button {
x: 0 x: 0
y: mainItem.height y: mainItem.height
closePolicy: Popup.CloseOnPressOutsideParent | Popup.CloseOnPressOutside | Popup.CloseOnEscape closePolicy: Popup.CloseOnPressOutsideParent | Popup.CloseOnPressOutside | Popup.CloseOnEscape
padding: 10 * DefaultStyle.dp padding: 10 * mainWindow.dp
parent: mainItem // Explicit define for coordinates references. parent: mainItem // Explicit define for coordinates references.
onVisibleChanged: { onVisibleChanged: {
@ -96,7 +96,7 @@ Button {
id: popupBackground id: popupBackground
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: 16 * DefaultStyle.dp radius: 16 * mainWindow.dp
} }
MultiEffect { MultiEffect {
source: popupBackground source: popupBackground

4
Linphone/view/Control/Button/RadioButton.qml
View file

@ -11,7 +11,7 @@ Control.RadioButton {
property string imgUrl property string imgUrl
property bool checkOnClick: true property bool checkOnClick: true
property color color property color color
property int indicatorSize: 16 * DefaultStyle.dp property int indicatorSize: 16 * mainWindow.dp
property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered
//onClicked: if (checkOnClick && !mainItem.checked) mainItem.toggle() //onClicked: if (checkOnClick && !mainItem.checked) mainItem.toggle()
@ -33,7 +33,7 @@ Control.RadioButton {
radius: mainItem.indicatorSize/2 radius: mainItem.indicatorSize/2
color: "transparent" color: "transparent"
border.color: mainItem.color border.color: mainItem.color
border.width: 2 * DefaultStyle.dp border.width: 2 * mainWindow.dp
Rectangle { Rectangle {
width: parent.width/2 width: parent.width/2
height: parent.height/2 height: parent.height/2

42
Linphone/view/Control/Button/SecurityRadioButton.qml
View file

@ -21,18 +21,18 @@ Control.RadioButton {
background: Rectangle { background: Rectangle {
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
border.color: mainItem.checked ? mainItem.color : "transparent" border.color: mainItem.checked ? mainItem.color : "transparent"
radius: 20 * DefaultStyle.dp radius: 20 * mainWindow.dp
} }
indicator: RowLayout { indicator: RowLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 13 * DefaultStyle.dp anchors.leftMargin: 13 * mainWindow.dp
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 8 * DefaultStyle.dp anchors.topMargin: 8 * mainWindow.dp
spacing: 4 * DefaultStyle.dp spacing: 4 * mainWindow.dp
Rectangle { Rectangle {
implicitWidth: 16 * DefaultStyle.dp implicitWidth: 16 * mainWindow.dp
implicitHeight: 16 * DefaultStyle.dp implicitHeight: 16 * mainWindow.dp
radius: implicitWidth/2 radius: implicitWidth/2
border.color: mainItem.color border.color: mainItem.color
@ -51,7 +51,7 @@ Control.RadioButton {
text: mainItem.title text: mainItem.title
font.bold: true font.bold: true
color: DefaultStyle.grey_900 color: DefaultStyle.grey_900
font.pixelSize: 16 * DefaultStyle.dp font.pixelSize: 16 * mainWindow.dp
} }
Button { Button {
padding: 0 padding: 0
@ -59,12 +59,12 @@ Control.RadioButton {
visible: false visible: false
} }
icon.source: AppIcons.info icon.source: AppIcons.info
Layout.preferredWidth: 2 * DefaultStyle.dp Layout.preferredWidth: 2 * mainWindow.dp
Layout.preferredHeight: 2 * DefaultStyle.dp Layout.preferredHeight: 2 * mainWindow.dp
width: 2 * DefaultStyle.dp width: 2 * mainWindow.dp
height: 2 * DefaultStyle.dp height: 2 * mainWindow.dp
icon.width: 2 * DefaultStyle.dp icon.width: 2 * mainWindow.dp
icon.height: 2 * DefaultStyle.dp icon.height: 2 * mainWindow.dp
} }
} }
@ -73,27 +73,27 @@ Control.RadioButton {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 13 * DefaultStyle.dp anchors.leftMargin: 13 * mainWindow.dp
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.bottomMargin: 10 * DefaultStyle.dp Layout.bottomMargin: 10 * mainWindow.dp
Layout.rightMargin: 10 * DefaultStyle.dp Layout.rightMargin: 10 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Text { Text {
id: innerText id: innerText
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
Layout.preferredWidth: 220 * DefaultStyle.dp Layout.preferredWidth: 220 * mainWindow.dp
Layout.preferredHeight: 100 * DefaultStyle.dp Layout.preferredHeight: 100 * mainWindow.dp
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
text: mainItem.contentText text: mainItem.contentText
Layout.fillHeight: true Layout.fillHeight: true
} }
Image { Image {
id: image id: image
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: 100 * DefaultStyle.dp Layout.preferredWidth: 100 * mainWindow.dp
Layout.preferredHeight: 100 * DefaultStyle.dp Layout.preferredHeight: 100 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: mainItem.imgUrl source: mainItem.imgUrl
} }

2
Linphone/view/Control/Button/Settings/ComboSetting.qml
View file

@ -6,7 +6,7 @@ import 'qrc:/Linphone/view/Control/Tool/Helper/utils.js' as Utils
ComboBox { ComboBox {
id: comboBox id: comboBox
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
property string propertyName property string propertyName
property var propertyOwner property var propertyOwner
property alias entries: comboBox.model property alias entries: comboBox.model

4
Linphone/view/Control/Button/Settings/SwitchSetting.qml
View file

@ -10,8 +10,8 @@ RowLayout {
property string propertyName property string propertyName
property var propertyOwner property var propertyOwner
property bool enabled: true property bool enabled: true
spacing : 20 * DefaultStyle.dp spacing : 20 * mainWindow.dp
Layout.minimumHeight: 32 * DefaultStyle.dp Layout.minimumHeight: 32 * mainWindow.dp
ColumnLayout { ColumnLayout {
Text { Text {
text: titleText text: titleText

14
Linphone/view/Control/Button/Slider.qml
View file

@ -11,14 +11,14 @@ Control.Slider {
background: Item{ background: Item{
x: mainItem.leftPadding x: mainItem.leftPadding
y: mainItem.topPadding + mainItem.availableHeight / 2 - height / 2 y: mainItem.topPadding + mainItem.availableHeight / 2 - height / 2
implicitWidth: 200 * DefaultStyle.dp implicitWidth: 200 * mainWindow.dp
implicitHeight: 4 * DefaultStyle.dp implicitHeight: 4 * mainWindow.dp
width: mainItem.availableWidth width: mainItem.availableWidth
height: implicitHeight height: implicitHeight
Rectangle { Rectangle {
id: sliderBackground id: sliderBackground
anchors.fill: parent anchors.fill: parent
radius: 30 * DefaultStyle.dp radius: 30 * mainWindow.dp
// TODO : change the colors when mockup indicates their names // TODO : change the colors when mockup indicates their names
color: DefaultStyle.grey_850 color: DefaultStyle.grey_850
@ -30,7 +30,7 @@ Control.Slider {
GradientStop { position: 0.0; color: "#FF9E79" } GradientStop { position: 0.0; color: "#FF9E79" }
GradientStop { position: 1.0; color: "#FE5E00" } GradientStop { position: 1.0; color: "#FE5E00" }
} }
radius: 40 * DefaultStyle.dp radius: 40 * mainWindow.dp
} }
} }
MultiEffect { MultiEffect {
@ -49,12 +49,12 @@ Control.Slider {
handle: Item { handle: Item {
x: mainItem.leftPadding + mainItem.visualPosition * (mainItem.availableWidth - width) x: mainItem.leftPadding + mainItem.visualPosition * (mainItem.availableWidth - width)
y: mainItem.topPadding + mainItem.availableHeight / 2 - height / 2 y: mainItem.topPadding + mainItem.availableHeight / 2 - height / 2
implicitWidth: 16 * DefaultStyle.dp implicitWidth: 16 * mainWindow.dp
implicitHeight: 16 * DefaultStyle.dp implicitHeight: 16 * mainWindow.dp
Rectangle { Rectangle {
id: handleRect id: handleRect
anchors.fill: parent anchors.fill: parent
radius: 30 * DefaultStyle.dp radius: 30 * mainWindow.dp
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
} }
MultiEffect { MultiEffect {

8
Linphone/view/Control/Button/SmallButton.qml
View file

@ -10,8 +10,8 @@ Button {
textWeight: Typography.b2.weight textWeight: Typography.b2.weight
color: DefaultStyle.main1_100 color: DefaultStyle.main1_100
textColor: DefaultStyle.main1_500_main textColor: DefaultStyle.main1_500_main
leftPadding: 12 * DefaultStyle.dp leftPadding: 12 * mainWindow.dp
rightPadding: 12 * DefaultStyle.dp rightPadding: 12 * mainWindow.dp
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
} }

18
Linphone/view/Control/Button/Switch.qml
View file

@ -9,27 +9,27 @@ Control.Switch {
property bool shadowEnabled: mainItem.hovered || mainItem.activeFocus property bool shadowEnabled: mainItem.hovered || mainItem.activeFocus
hoverEnabled: true hoverEnabled: true
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
indicator: Item{ indicator: Item{
implicitWidth: 32 * DefaultStyle.dp implicitWidth: 32 * mainWindow.dp
implicitHeight: 20 * DefaultStyle.dp implicitHeight: 20 * mainWindow.dp
x: mainItem.leftPadding x: mainItem.leftPadding
y: parent.height / 2 - height / 2 y: parent.height / 2 - height / 2
Rectangle { Rectangle {
id: indicatorBackground id: indicatorBackground
anchors.fill: parent anchors.fill: parent
radius: 10 * DefaultStyle.dp radius: 10 * mainWindow.dp
color: mainItem.checked? DefaultStyle.success_500main : DefaultStyle.main2_400 color: mainItem.checked? DefaultStyle.success_500main : DefaultStyle.main2_400
Rectangle { Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
property int margin: 4 * DefaultStyle.dp property int margin: 4 * mainWindow.dp
x: mainItem.checked ? parent.width - width - margin : margin x: mainItem.checked ? parent.width - width - margin : margin
width: 12 * DefaultStyle.dp width: 12 * mainWindow.dp
height: 12 * DefaultStyle.dp height: 12 * mainWindow.dp
radius: 10 * DefaultStyle.dp radius: 10 * mainWindow.dp
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
Behavior on x { Behavior on x {
NumberAnimation{duration: 100} NumberAnimation{duration: 100}

46
Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml
View file

@ -49,8 +49,8 @@ Item{
RowLayout{ RowLayout{
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: 10 * DefaultStyle.dp anchors.rightMargin: 10 * mainWindow.dp
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
Control.StackView { Control.StackView {
id: mainStackView id: mainStackView
@ -62,21 +62,21 @@ Item{
id: waitingForOthersComponent id: waitingForOthersComponent
Rectangle { Rectangle {
color: DefaultStyle.grey_600 color: DefaultStyle.grey_600
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
ColumnLayout { ColumnLayout {
anchors.centerIn: parent anchors.centerIn: parent
spacing: 22 * DefaultStyle.dp spacing: 22 * mainWindow.dp
width: waitText.implicitWidth width: waitText.implicitWidth
Text { Text {
id: waitText id: waitText
text: qsTr("Waiting for other participants...") text: qsTr("Waiting for other participants...")
Layout.preferredHeight: 67 * DefaultStyle.dp Layout.preferredHeight: 67 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 30 * DefaultStyle.dp pixelSize: 30 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
Item { Item {
@ -87,10 +87,10 @@ Item{
icon.source: AppIcons.shareNetwork icon.source: AppIcons.shareNetwork
contentImageColor: DefaultStyle.main2_400 contentImageColor: DefaultStyle.main2_400
text: qsTr("Share invitation") text: qsTr("Share invitation")
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
anchors.centerIn: parent anchors.centerIn: parent
textColor: DefaultStyle.main2_400 textColor: DefaultStyle.main2_400
onClicked: { onClicked: {
@ -129,23 +129,23 @@ Item{
ListView{ ListView{
id: sideStickers id: sideStickers
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: 300 * DefaultStyle.dp Layout.preferredWidth: 300 * mainWindow.dp
Layout.rightMargin: 10 * DefaultStyle.dp Layout.rightMargin: 10 * mainWindow.dp
Layout.bottomMargin: 10 * DefaultStyle.dp Layout.bottomMargin: 10 * mainWindow.dp
visible: allDevices.count > 2 || !!mainItem.conference?.core.isScreenSharingEnabled visible: allDevices.count > 2 || !!mainItem.conference?.core.isScreenSharingEnabled
//spacing: 15 * DefaultStyle.dp // bugged? First item has twice margins //spacing: 15 * mainWindow.dp // bugged? First item has twice margins
model: allDevices model: allDevices
snapMode: ListView.SnapOneItem snapMode: ListView.SnapOneItem
clip: true clip: true
delegate: Item{ // Spacing workaround delegate: Item{ // Spacing workaround
visible: $modelData && mainItem.callState != LinphoneEnums.CallState.End && mainItem.callState != LinphoneEnums.CallState.Released visible: $modelData && mainItem.callState != LinphoneEnums.CallState.End && mainItem.callState != LinphoneEnums.CallState.Released
&& ($modelData.core.address != activeSpeakerAddress || mainItem.conference?.core.isScreenSharingEnabled) || false && ($modelData.core.address != activeSpeakerAddress || mainItem.conference?.core.isScreenSharingEnabled) || false
height: visible ? (180 + 15) * DefaultStyle.dp : 0 height: visible ? (180 + 15) * mainWindow.dp : 0
width: 300 * DefaultStyle.dp width: 300 * mainWindow.dp
Sticker { Sticker {
previewEnabled: index == 0 // before anchors for priority initialization previewEnabled: index == 0 // before anchors for priority initialization
anchors.fill: parent anchors.fill: parent
anchors.bottomMargin: 15 * DefaultStyle.dp// Spacing anchors.bottomMargin: 15 * mainWindow.dp// Spacing
qmlName: 'S_'+index qmlName: 'S_'+index
visible: parent.visible visible: parent.visible
participantDevice: $modelData participantDevice: $modelData
@ -162,12 +162,12 @@ Item{
previewEnabled: true previewEnabled: true
visible: !sideStickers.visible visible: !sideStickers.visible
onVisibleChanged: console.log(visible + " : " +allDevices.count) onVisibleChanged: console.log(visible + " : " +allDevices.count)
height: 180 * DefaultStyle.dp height: 180 * mainWindow.dp
width: 300 * DefaultStyle.dp width: 300 * mainWindow.dp
anchors.right: mainItem.right anchors.right: mainItem.right
anchors.bottom: mainItem.bottom anchors.bottom: mainItem.bottom
anchors.rightMargin: 20 * DefaultStyle.dp anchors.rightMargin: 20 * mainWindow.dp
anchors.bottomMargin: 10 * DefaultStyle.dp anchors.bottomMargin: 10 * mainWindow.dp
videoEnabled: preview.visible && mainItem.call && mainItem.call.core.localVideoEnabled videoEnabled: preview.visible && mainItem.call && mainItem.call.core.localVideoEnabled
onVideoEnabledChanged: console.log("P : " +videoEnabled + " / " +visible +" / " +mainItem.call) onVideoEnabledChanged: console.log("P : " +videoEnabled + " / " +visible +" / " +mainItem.call)
property AccountProxy accounts: AccountProxy {id: accountProxy property AccountProxy accounts: AccountProxy {id: accountProxy
@ -181,7 +181,7 @@ Item{
id: previewMouseArea id: previewMouseArea
anchors.fill: parent anchors.fill: parent
movableArea: mainItem movableArea: mainItem
margin: 10 * DefaultStyle.dp margin: 10 * mainWindow.dp
function resetPosition(){ function resetPosition(){
preview.anchors.right = mainItem.right preview.anchors.right = mainItem.right
preview.anchors.bottom = mainItem.bottom preview.anchors.bottom = mainItem.bottom

14
Linphone/view/Control/Container/Call/CallLayout.qml
View file

@ -39,7 +39,7 @@ Item {
id: callTerminatedText id: callTerminatedText
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 25 * DefaultStyle.dp anchors.topMargin: 25 * mainWindow.dp
z: 1 z: 1
visible: callState === LinphoneEnums.CallState.End || callState === LinphoneEnums.CallState.Error || callState === LinphoneEnums.CallState.Released visible: callState === LinphoneEnums.CallState.End || callState === LinphoneEnums.CallState.Error || callState === LinphoneEnums.CallState.Released
text: callState === LinphoneEnums.CallState.End text: callState === LinphoneEnums.CallState.End
@ -53,8 +53,8 @@ Item {
: call && call.core.lastErrorMessage || "" : call && call.core.lastErrorMessage || ""
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 22 * DefaultStyle.dp pixelSize: 22 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
@ -90,8 +90,8 @@ Item {
// text: qsTr("Waiting for other participants...") // text: qsTr("Waiting for other participants...")
// color: DefaultStyle.frey_0 // color: DefaultStyle.frey_0
// font { // font {
// pixelSize: 30 * DefaultStyle.dp // pixelSize: 30 * mainWindow.dp
// weight: 300 * DefaultStyle.dp // weight: 300 * mainWindow.dp
// } // }
// } // }
// Button { // Button {
@ -99,8 +99,8 @@ Item {
// text: qsTr("Share invitation") // text: qsTr("Share invitation")
// icon.source: AppIcons.shareNetwork // icon.source: AppIcons.shareNetwork
// color: DefaultStyle.main2_400 // color: DefaultStyle.main2_400
// Layout.preferredWidth: 206 * DefaultStyle.dp // Layout.preferredWidth: 206 * mainWindow.dp
// Layout.preferredHeight: 47 * DefaultStyle.dp // Layout.preferredHeight: 47 * mainWindow.dp
// } // }
// } // }

4
Linphone/view/Control/Container/Call/GridLayout.qml
View file

@ -33,8 +33,8 @@ Mosaic {
if(index < 0) cameraView.enabled = false // this is a delegate destruction. We need to stop camera before Qt change its currentDevice (and then, let CameraView to delete wrong renderer) if(index < 0) cameraView.enabled = false // this is a delegate destruction. We need to stop camera before Qt change its currentDevice (and then, let CameraView to delete wrong renderer)
} }
height: grid.cellHeight - 10 * DefaultStyle.dp height: grid.cellHeight - 10 * mainWindow.dp
width: grid.cellWidth - 10 * DefaultStyle.dp width: grid.cellWidth - 10 * mainWindow.dp
Sticker { Sticker {
id: cameraView id: cameraView
previewEnabled: index == 0 previewEnabled: index == 0

2
Linphone/view/Control/Container/Call/Mosaic.qml
View file

@ -57,7 +57,7 @@ ColumnLayout{
GridView{ GridView{
id: grid id: grid
property int margin: 10 * DefaultStyle.dp property int margin: 10 * mainWindow.dp
property int itemCount: model.count ? model.count :( model.length ? model.length : 0) property int itemCount: model.count ? model.count :( model.length ? model.length : 0)
property int columns: 1 property int columns: 1
property int rows: 1 property int rows: 1

18
Linphone/view/Control/Container/Carousel.qml
View file

@ -12,7 +12,7 @@ ColumnLayout {
required property int itemsCount required property int itemsCount
property int currentIndex: carouselStackLayout.currentIndex property int currentIndex: carouselStackLayout.currentIndex
property var currentItem: carouselButton.itemAt(currentIndex) property var currentItem: carouselButton.itemAt(currentIndex)
spacing: 61 * DefaultStyle.dp spacing: 61 * mainWindow.dp
function goToSlide(index) { function goToSlide(index) {
carouselStackLayout.goToSlideAtIndex(index) carouselStackLayout.goToSlideAtIndex(index)
@ -67,9 +67,9 @@ ColumnLayout {
Item { Item {
Rectangle { Rectangle {
id: currentIndicator id: currentIndicator
width: 13 * DefaultStyle.dp width: 13 * mainWindow.dp
height: 8 * DefaultStyle.dp height: 8 * mainWindow.dp
radius: 30 * DefaultStyle.dp radius: 30 * mainWindow.dp
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
z: 1 z: 1
x: mainItem.currentIndex >= 0 && mainItem.currentItem ? mainItem.currentItem.x - width/2 + mainItem.currentItem.width/2 : 0 x: mainItem.currentIndex >= 0 && mainItem.currentItem ? mainItem.currentItem.x - width/2 + mainItem.currentItem.width/2 : 0
@ -77,21 +77,21 @@ ColumnLayout {
} }
RowLayout { RowLayout {
id: carouselButtonsLayout id: carouselButtonsLayout
spacing: 7.5 * DefaultStyle.dp spacing: 7.5 * mainWindow.dp
anchors.leftMargin: 2.5 * DefaultStyle.dp anchors.leftMargin: 2.5 * mainWindow.dp
Repeater { Repeater {
id: carouselButton id: carouselButton
model: mainItem.itemsCount model: mainItem.itemsCount
delegate: Button { delegate: Button {
Layout.preferredWidth: 8 * DefaultStyle.dp Layout.preferredWidth: 8 * mainWindow.dp
Layout.preferredHeight: 8 * DefaultStyle.dp Layout.preferredHeight: 8 * mainWindow.dp
topPadding: 0 topPadding: 0
bottomPadding: 0 bottomPadding: 0
leftPadding: 0 leftPadding: 0
rightPadding: 0 rightPadding: 0
background: Rectangle { background: Rectangle {
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
radius: 30 * DefaultStyle.dp radius: 30 * mainWindow.dp
anchors.fill: parent anchors.fill: parent
} }
onClicked: { onClicked: {

80
Linphone/view/Control/Container/Contact/ContactLayout.qml
View file

@ -8,7 +8,7 @@ import SettingsCpp
ColumnLayout { ColumnLayout {
id: mainItem id: mainItem
spacing: 30 * DefaultStyle.dp spacing: 30 * mainWindow.dp
property FriendGui contact property FriendGui contact
property ConferenceInfoGui conferenceInfo property ConferenceInfoGui conferenceInfo
@ -34,20 +34,20 @@ ColumnLayout {
// property alias image: buttonImg // property alias image: buttonImg
property alias button: button property alias button: button
property string label property string label
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
Button { Button {
id: button id: button
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: 56 * DefaultStyle.dp Layout.preferredWidth: 56 * mainWindow.dp
Layout.preferredHeight: 56 * DefaultStyle.dp Layout.preferredHeight: 56 * mainWindow.dp
topPadding: 16 * DefaultStyle.dp topPadding: 16 * mainWindow.dp
bottomPadding: 16 * DefaultStyle.dp bottomPadding: 16 * mainWindow.dp
leftPadding: 16 * DefaultStyle.dp leftPadding: 16 * mainWindow.dp
rightPadding: 16 * DefaultStyle.dp rightPadding: 16 * mainWindow.dp
contentImageColor: DefaultStyle.main2_600 contentImageColor: DefaultStyle.main2_600
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
radius: 40 * DefaultStyle.dp radius: 40 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
} }
@ -55,23 +55,23 @@ ColumnLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: labelButton.label text: labelButton.label
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
ColumnLayout { ColumnLayout {
spacing: 13 * DefaultStyle.dp spacing: 13 * mainWindow.dp
Item { Item {
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
Layout.preferredHeight: detailAvatar.height Layout.preferredHeight: detailAvatar.height
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Avatar { Avatar {
id: detailAvatar id: detailAvatar
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: 100 * DefaultStyle.dp width: 100 * mainWindow.dp
height: 100 * DefaultStyle.dp height: 100 * mainWindow.dp
contact: mainItem.contact || null contact: mainItem.contact || null
_address: mainItem.conferenceInfo _address: mainItem.conferenceInfo
? mainItem.conferenceInfo.core.subject ? mainItem.conferenceInfo.core.subject
@ -81,15 +81,15 @@ ColumnLayout {
id: rightButton id: rightButton
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: detailAvatar.verticalCenter anchors.verticalCenter: detailAvatar.verticalCenter
anchors.rightMargin: 20 * DefaultStyle.dp anchors.rightMargin: 20 * mainWindow.dp
width: 30 * DefaultStyle.dp width: 30 * mainWindow.dp
height: 30 * DefaultStyle.dp height: 30 * mainWindow.dp
} }
} }
ColumnLayout { ColumnLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
spacing: 2 * DefaultStyle.dp spacing: 2 * mainWindow.dp
Text { Text {
Layout.preferredWidth: implicitWidth Layout.preferredWidth: implicitWidth
@ -99,8 +99,8 @@ ColumnLayout {
text: mainItem.contactName text: mainItem.contactName
maximumLineCount: 1 maximumLineCount: 1
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -113,8 +113,8 @@ ColumnLayout {
elide: Text.ElideMiddle elide: Text.ElideMiddle
maximumLineCount: 1 maximumLineCount: 1
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
Text { Text {
@ -138,15 +138,15 @@ ColumnLayout {
? DefaultStyle.danger_500main ? DefaultStyle.danger_500main
: DefaultStyle.main2_500main : DefaultStyle.main2_500main
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
} }
RowLayout { RowLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
spacing: 72 * DefaultStyle.dp spacing: 72 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: childrenRect.height Layout.preferredHeight: childrenRect.height
Button { Button {
@ -165,10 +165,10 @@ ColumnLayout {
} }
LabelButton { LabelButton {
visible: !mainItem.isConference visible: !mainItem.isConference
width: 56 * DefaultStyle.dp width: 56 * mainWindow.dp
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
button.icon.width: 24 * DefaultStyle.dp button.icon.width: 24 * mainWindow.dp
button.icon.height: 24 * DefaultStyle.dp button.icon.height: 24 * mainWindow.dp
button.icon.source: AppIcons.phone button.icon.source: AppIcons.phone
label: qsTr("Appel") label: qsTr("Appel")
button.onClicked: { button.onClicked: {
@ -178,20 +178,20 @@ ColumnLayout {
} }
LabelButton { LabelButton {
visible: !mainItem.isConference && !SettingsCpp.disableChatFeature visible: !mainItem.isConference && !SettingsCpp.disableChatFeature
width: 56 * DefaultStyle.dp width: 56 * mainWindow.dp
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
button.icon.width: 24 * DefaultStyle.dp button.icon.width: 24 * mainWindow.dp
button.icon.height: 24 * DefaultStyle.dp button.icon.height: 24 * mainWindow.dp
button.icon.source: AppIcons.chatTeardropText button.icon.source: AppIcons.chatTeardropText
label: qsTr("Message") label: qsTr("Message")
button.onClicked: console.debug("[ContactLayout.qml] TODO : open conversation") button.onClicked: console.debug("[ContactLayout.qml] TODO : open conversation")
} }
LabelButton { LabelButton {
visible: !mainItem.isConference visible: !mainItem.isConference
width: 56 * DefaultStyle.dp width: 56 * mainWindow.dp
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
button.icon.width: 24 * DefaultStyle.dp button.icon.width: 24 * mainWindow.dp
button.icon.height: 24 * DefaultStyle.dp button.icon.height: 24 * mainWindow.dp
button.icon.source: AppIcons.videoCamera button.icon.source: AppIcons.videoCamera
label: qsTr("Appel Video") label: qsTr("Appel Video")
button.onClicked: { button.onClicked: {
@ -206,6 +206,6 @@ ColumnLayout {
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.topMargin: 30 * DefaultStyle.dp Layout.topMargin: 30 * mainWindow.dp
} }
} }

6
Linphone/view/Control/Container/FormItemLayout.qml
View file

@ -22,7 +22,7 @@ FocusScope{
} }
ColumnLayout { ColumnLayout {
id: layout id: layout
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
visible: label.length > 0 visible: label.length > 0
@ -35,8 +35,8 @@ FocusScope{
textFormat: Text.RichText textFormat: Text.RichText
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }

2
Linphone/view/Control/Container/Main/MainRightPanel.qml
View file

@ -15,7 +15,7 @@ ColumnLayout {
Rectangle { Rectangle {
id: rightPanelHeader id: rightPanelHeader
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
Layout.preferredHeight: 57 * DefaultStyle.dp Layout.preferredHeight: 57 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
z: 1 z: 1
} }

4
Linphone/view/Control/Container/ScrollBar.qml
View file

@ -9,8 +9,8 @@ Control.ScrollBar {
padding: 0 padding: 0
background: Item{} background: Item{}
contentItem: Rectangle { contentItem: Rectangle {
implicitWidth: 6 * DefaultStyle.dp implicitWidth: 6 * mainWindow.dp
radius: 32 * DefaultStyle.dp radius: 32 * mainWindow.dp
// TODO : ask for color names // TODO : ask for color names
color: "#D9D9D9" color: "#D9D9D9"
} }

10
Linphone/view/Control/Container/Section.qml
View file

@ -7,23 +7,23 @@ Layout with line separator used in several views
*/ */
ColumnLayout { ColumnLayout {
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
property alias content: contentLayout.data property alias content: contentLayout.data
property alias contentLayout: contentLayout property alias contentLayout: contentLayout
implicitHeight: contentLayout.implicitHeight + 1 * DefaultStyle.dp + spacing implicitHeight: contentLayout.implicitHeight + 1 * mainWindow.dp + spacing
ColumnLayout { ColumnLayout {
id: contentLayout id: contentLayout
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
// width: parent.width // width: parent.width
// Layout.fillWidth: true // Layout.fillWidth: true
// Layout.preferredHeight: childrenRect.height // Layout.preferredHeight: childrenRect.height
// Layout.preferredWidth: parent.width // Layout.preferredWidth: parent.width
// Layout.leftMargin: 8 * DefaultStyle.dp // Layout.leftMargin: 8 * mainWindow.dp
} }
Rectangle { Rectangle {
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
width: parent.width width: parent.width
} }
} }

12
Linphone/view/Control/Container/TabBar.qml
View file

@ -10,9 +10,9 @@ Control.TabBar {
readonly property int originX: count > 0 readonly property int originX: count > 0
? itemAt(0).x ? itemAt(0).x
: 0 : 0
spacing: 40 * DefaultStyle.dp spacing: 40 * mainWindow.dp
property int pixelSize: 22 * DefaultStyle.dp property int pixelSize: 22 * mainWindow.dp
property int textWeight: 800 * DefaultStyle.dp property int textWeight: 800 * mainWindow.dp
wheelEnabled: true wheelEnabled: true
background: Item { background: Item {
id: tabBarBackground id: tabBarBackground
@ -20,7 +20,7 @@ Control.TabBar {
Rectangle { Rectangle {
id: barBG id: barBG
height: 4 * DefaultStyle.dp height: 4 * mainWindow.dp
color: DefaultStyle.grey_200 color: DefaultStyle.grey_200
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: parent.width width: parent.width
@ -64,7 +64,7 @@ Control.TabBar {
Rectangle { Rectangle {
id: tabBackground id: tabBackground
visible: mainItem.currentIndex === index visible: mainItem.currentIndex === index
height: 5 * DefaultStyle.dp height: 5 * mainWindow.dp
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
@ -93,7 +93,7 @@ Control.TabBar {
elide: Text.ElideRight elide: Text.ElideRight
maximumLineCount: 1 maximumLineCount: 1
text: modelData text: modelData
bottomPadding: 5 * DefaultStyle.dp bottomPadding: 5 * mainWindow.dp
} }
} }
} }

30
Linphone/view/Control/Container/VerticalTabBar.qml
View file

@ -7,8 +7,8 @@ import Linphone
Control.TabBar { Control.TabBar {
id: mainItem id: mainItem
//spacing: 32 * DefaultStyle.dp //spacing: 32 * mainWindow.dp
topPadding: 36 * DefaultStyle.dp topPadding: 36 * mainWindow.dp
property var model property var model
readonly property alias cornerRadius: bottomLeftCorner.radius readonly property alias cornerRadius: bottomLeftCorner.radius
@ -30,8 +30,8 @@ Control.TabBar {
id: unreadNotifications id: unreadNotifications
property int unread: 0 property int unread: 0
visible: unread > 0 visible: unread > 0
width: 15 * DefaultStyle.dp width: 15 * mainWindow.dp
height: 15 * DefaultStyle.dp height: 15 * mainWindow.dp
radius: width/2 radius: width/2
color: DefaultStyle.danger_500main color: DefaultStyle.danger_500main
Text{ Text{
@ -41,7 +41,7 @@ Control.TabBar {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
fontSizeMode: Text.Fit fontSizeMode: Text.Fit
font.pixelSize: 15 * DefaultStyle.dp font.pixelSize: 15 * mainWindow.dp
text: parent.unread > 100 ? '99+' : parent.unread text: parent.unread > 100 ? '99+' : parent.unread
} }
} }
@ -69,7 +69,7 @@ Control.TabBar {
id: bottomLeftCorner id: bottomLeftCorner
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
radius: 25 * DefaultStyle.dp radius: 25 * mainWindow.dp
} }
Rectangle { Rectangle {
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
@ -93,8 +93,8 @@ Control.TabBar {
id: tabButton id: tabButton
width: mainItem.width width: mainItem.width
height: visible ? undefined : 0 height: visible ? undefined : 0
bottomInset: 32 * DefaultStyle.dp bottomInset: 32 * mainWindow.dp
topInset: 32 * DefaultStyle.dp topInset: 32 * mainWindow.dp
visible: modelData?.visible != undefined ? modelData?.visible : true visible: modelData?.visible != undefined ? modelData?.visible : true
UnreadNotification { UnreadNotification {
@ -106,7 +106,7 @@ Control.TabBar {
? defaultAccount.core?.unreadMessageNotifications || -1 ? defaultAccount.core?.unreadMessageNotifications || -1
: 0 : 0
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 15 * DefaultStyle.dp anchors.rightMargin: 15 * mainWindow.dp
anchors.top: parent.top anchors.top: parent.top
} }
contentItem: ColumnLayout { contentItem: ColumnLayout {
@ -114,7 +114,7 @@ Control.TabBar {
// width: tabButton.width // width: tabButton.width
EffectImage { EffectImage {
id: buttonIcon id: buttonIcon
property int buttonSize: 24 * DefaultStyle.dp property int buttonSize: 24 * mainWindow.dp
imageSource: mainItem.currentIndex === index ? modelData.selectedIcon : modelData.icon imageSource: mainItem.currentIndex === index ? modelData.selectedIcon : modelData.icon
Layout.preferredWidth: buttonSize Layout.preferredWidth: buttonSize
Layout.preferredHeight: buttonSize Layout.preferredHeight: buttonSize
@ -126,8 +126,8 @@ Control.TabBar {
id: buttonText id: buttonText
text: modelData.label text: modelData.label
font { font {
weight: mainItem.currentIndex === index ? 800 * DefaultStyle.dp : 400 * DefaultStyle.dp weight: mainItem.currentIndex === index ? 800 * mainWindow.dp : 400 * mainWindow.dp
pixelSize: 9 * DefaultStyle.dp pixelSize: 9 * mainWindow.dp
underline: tabButton.activeFocus || tabButton.hovered underline: tabButton.activeFocus || tabButton.hovered
} }
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
@ -135,8 +135,8 @@ Control.TabBar {
Layout.preferredHeight: txtMeter.height Layout.preferredHeight: txtMeter.height
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
leftPadding: 3 * DefaultStyle.dp leftPadding: 3 * mainWindow.dp
rightPadding: 3 * DefaultStyle.dp rightPadding: 3 * mainWindow.dp
} }
} }
TextMetrics { TextMetrics {
@ -144,7 +144,7 @@ Control.TabBar {
text: modelData.label text: modelData.label
font: buttonText.font font: buttonText.font
Component.onCompleted: { Component.onCompleted: {
font.weight = 800 * DefaultStyle.dp font.weight = 800 * mainWindow.dp
mainItem.implicitWidth = Math.max(mainItem.implicitWidth, advanceWidth + buttonIcon.buttonSize) mainItem.implicitWidth = Math.max(mainItem.implicitWidth, advanceWidth + buttonIcon.buttonSize)
} }
} }

6
Linphone/view/Control/Display/Contact/Avatar.qml
View file

@ -83,7 +83,7 @@ Loader{
z: 1 z: 1
color: "transparent" color: "transparent"
border { border {
width: 3 * DefaultStyle.dp width: 3 * mainWindow.dp
color: mainItem.secured ? DefaultStyle.info_500_main : DefaultStyle.danger_500main color: mainItem.secured ? DefaultStyle.info_500_main : DefaultStyle.danger_500main
} }
Image { Image {
@ -126,7 +126,7 @@ Loader{
: DefaultStyle.main2_500main : DefaultStyle.main2_500main
: "transparent" : "transparent"
border { border {
width: 2 * DefaultStyle.dp width: 2 * mainWindow.dp
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
} }
} }
@ -152,7 +152,7 @@ Loader{
text: initialItem.initials text: initialItem.initials
font { font {
pixelSize: initialItem.height * 36 / 120 pixelSize: initialItem.height * 36 / 120
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
capitalization: Font.AllUppercase capitalization: Font.AllUppercase
} }
} }

64
Linphone/view/Control/Display/Contact/Contact.qml
View file

@ -17,7 +17,7 @@ Rectangle{
signal backgroundClicked() signal backgroundClicked()
signal edit() signal edit()
height: 45 * DefaultStyle.dp height: 45 * mainWindow.dp
MouseArea{ MouseArea{
anchors.fill: parent anchors.fill: parent
onClicked: mainItem.backgroundClicked() onClicked: mainItem.backgroundClicked()
@ -26,11 +26,11 @@ Rectangle{
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0
RowLayout { RowLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Avatar{ Avatar{
id: avatar id: avatar
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
account: mainItem.account account: mainItem.account
MouseArea{ MouseArea{
anchors.fill: parent anchors.fill: parent
@ -38,9 +38,9 @@ Rectangle{
} }
} }
Item { Item {
Layout.preferredWidth: 200 * DefaultStyle.dp Layout.preferredWidth: 200 * mainWindow.dp
Layout.fillHeight: true Layout.fillHeight: true
Layout.rightMargin: 10 * DefaultStyle.dp Layout.rightMargin: 10 * mainWindow.dp
ContactDescription{ ContactDescription{
id: description id: description
anchors.fill: parent anchors.fill: parent
@ -50,18 +50,18 @@ Rectangle{
} }
Control.Control { Control.Control {
id: registrationStatusItem id: registrationStatusItem
Layout.minimumWidth: 49 * DefaultStyle.dp Layout.minimumWidth: 49 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
topPadding: 4 * DefaultStyle.dp topPadding: 4 * mainWindow.dp
bottomPadding: 4 * DefaultStyle.dp bottomPadding: 4 * mainWindow.dp
leftPadding: 8 * DefaultStyle.dp leftPadding: 8 * mainWindow.dp
rightPadding: 8 * DefaultStyle.dp rightPadding: 8 * mainWindow.dp
Layout.preferredWidth: text.implicitWidth + (2 * 8 * DefaultStyle.dp) Layout.preferredWidth: text.implicitWidth + (2 * 8 * mainWindow.dp)
background: Rectangle{ background: Rectangle{
id: registrationStatus id: registrationStatus
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
radius: 90 * DefaultStyle.dp radius: 90 * mainWindow.dp
} }
contentItem: Text { contentItem: Text {
id: text id: text
@ -83,8 +83,8 @@ Rectangle{
// repeat: true // repeat: true
// onTriggered: text.mode = (++text.mode) % 4 // onTriggered: text.mode = (++text.mode) % 4
// } // }
font.weight: 300 * DefaultStyle.dp font.weight: 300 * mainWindow.dp
font.pixelSize: 12 * DefaultStyle.dp font.pixelSize: 12 * mainWindow.dp
color: mode == 0 color: mode == 0
? DefaultStyle.success_500main ? DefaultStyle.success_500main
: mode == 1 : mode == 1
@ -102,31 +102,31 @@ Rectangle{
} }
} }
Item{ Item{
Layout.preferredWidth: 26 * DefaultStyle.dp Layout.preferredWidth: 26 * mainWindow.dp
Layout.preferredHeight: 26 * DefaultStyle.dp Layout.preferredHeight: 26 * mainWindow.dp
Layout.fillHeight: true Layout.fillHeight: true
Layout.leftMargin: 40 * DefaultStyle.dp Layout.leftMargin: 40 * mainWindow.dp
visible: mainItem.account.core.unreadCallNotifications > 0 visible: mainItem.account.core.unreadCallNotifications > 0
Rectangle{ Rectangle{
id: unreadNotifications id: unreadNotifications
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 26 * DefaultStyle.dp width: 26 * mainWindow.dp
height: 26 * DefaultStyle.dp height: 26 * mainWindow.dp
radius: width/2 radius: width/2
color: DefaultStyle.danger_500main color: DefaultStyle.danger_500main
border.color: DefaultStyle.grey_0 border.color: DefaultStyle.grey_0
border.width: 2 * DefaultStyle.dp border.width: 2 * mainWindow.dp
Text{ Text{
id: unreadCount id: unreadCount
anchors.fill: parent anchors.fill: parent
anchors.margins: 2 * DefaultStyle.dp anchors.margins: 2 * mainWindow.dp
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
minimumPixelSize: 5 minimumPixelSize: 5
fontSizeMode: Text.Fit fontSizeMode: Text.Fit
font.pixelSize: 11 * DefaultStyle.dp font.pixelSize: 11 * mainWindow.dp
font.weight: 700 * DefaultStyle.dp font.weight: 700 * mainWindow.dp
text: mainItem.account.core.unreadCallNotifications >= 100 ? '99+' : mainItem.account.core.unreadCallNotifications text: mainItem.account.core.unreadCallNotifications >= 100 ? '99+' : mainItem.account.core.unreadCallNotifications
} }
} }
@ -139,10 +139,10 @@ Rectangle{
} }
} }
Voicemail { Voicemail {
Layout.leftMargin: 18 * DefaultStyle.dp Layout.leftMargin: 18 * mainWindow.dp
Layout.rightMargin: 20 * DefaultStyle.dp Layout.rightMargin: 20 * mainWindow.dp
Layout.preferredWidth: 27 * DefaultStyle.dp Layout.preferredWidth: 27 * mainWindow.dp
Layout.preferredHeight: 28 * DefaultStyle.dp Layout.preferredHeight: 28 * mainWindow.dp
voicemailCount: mainItem.account.core.voicemailCount >= 100 ? '99+' : mainItem.account.core.voicemailCount voicemailCount: mainItem.account.core.voicemailCount >= 100 ? '99+' : mainItem.account.core.voicemailCount
onClicked: { onClicked: {
if (mainItem.account.core.mwiServerAddress.length > 0) if (mainItem.account.core.mwiServerAddress.length > 0)
@ -155,11 +155,11 @@ Rectangle{
EffectImage { EffectImage {
id: manageAccount id: manageAccount
imageSource: AppIcons.manageProfile imageSource: AppIcons.manageProfile
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
visible: !SettingsCpp.hideAccountSettings visible: !SettingsCpp.hideAccountSettings
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.main2_500main colorizationColor: DefaultStyle.main2_500main
MouseArea{ MouseArea{

94
Linphone/view/Control/Display/Contact/ContactListView.qml
View file

@ -13,7 +13,7 @@ ListView {
visible: contentHeight > 0 visible: contentHeight > 0
clip: true clip: true
//keyNavigationWraps: true //keyNavigationWraps: true
// rightMargin: 5 * DefaultStyle.dp // rightMargin: 5 * mainWindow.dp
property bool selectionEnabled: true property bool selectionEnabled: true
@ -138,7 +138,7 @@ ListView {
} }
delegate: FocusScope { delegate: FocusScope {
id: itemDelegate id: itemDelegate
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
width: mainItem.width width: mainItem.width
property var previousItem : mainItem.model.count > 0 && index > 0 ? mainItem.model.getAt(index-1) : null property var previousItem : mainItem.model.count > 0 && index > 0 ? mainItem.model.getAt(index-1) : null
property var previousDisplayName: previousItem ? previousItem.core.displayName : "" property var previousDisplayName: previousItem ? previousItem.core.displayName : ""
@ -154,15 +154,15 @@ ListView {
anchors.left: parent.left anchors.left: parent.left
visible: mainItem.initialHeadersVisible && mainItem.model.sourceFlags != LinphoneEnums.MagicSearchSource.All visible: mainItem.initialHeadersVisible && mainItem.model.sourceFlags != LinphoneEnums.MagicSearchSource.All
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: 15 * DefaultStyle.dp anchors.rightMargin: 15 * mainWindow.dp
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
width: 20 * DefaultStyle.dp width: 20 * mainWindow.dp
opacity: (!previousItem || !previousDisplayName.toLocaleLowerCase(ConstantsCpp.DefaultLocale).startsWith(displayName[0].toLocaleLowerCase(ConstantsCpp.DefaultLocale))) ? 1 : 0 opacity: (!previousItem || !previousDisplayName.toLocaleLowerCase(ConstantsCpp.DefaultLocale).startsWith(displayName[0].toLocaleLowerCase(ConstantsCpp.DefaultLocale))) ? 1 : 0
text: displayName[0] text: displayName[0]
color: DefaultStyle.main2_400 color: DefaultStyle.main2_400
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 500 * DefaultStyle.dp weight: 500 * mainWindow.dp
capitalization: Font.AllUppercase capitalization: Font.AllUppercase
} }
} }
@ -170,13 +170,13 @@ ListView {
id: contactDelegate id: contactDelegate
anchors.left: initial.visible ? initial.right : parent.left anchors.left: initial.visible ? initial.right : parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 5 * DefaultStyle.dp anchors.rightMargin: 5 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
z: 1 z: 1
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
contact: modelData contact: modelData
} }
ColumnLayout { ColumnLayout {
@ -184,20 +184,20 @@ ListView {
Text { Text {
text: UtilsCpp.boldTextPart(itemDelegate.displayName, mainItem.searchBarText) text: UtilsCpp.boldTextPart(itemDelegate.displayName, mainItem.searchBarText)
font{ font{
pixelSize: mainItem.showDefaultAddress ? 16 * DefaultStyle.dp : 14 * DefaultStyle.dp pixelSize: mainItem.showDefaultAddress ? 16 * mainWindow.dp : 14 * mainWindow.dp
capitalization: mainItem.displayNameCapitalization ? Font.Capitalize : Font.MixedCase capitalization: mainItem.displayNameCapitalization ? Font.Capitalize : Font.MixedCase
weight: mainItem.showDefaultAddress ? 800 * DefaultStyle.dp : 400 * DefaultStyle.dp weight: mainItem.showDefaultAddress ? 800 * mainWindow.dp : 400 * mainWindow.dp
} }
maximumLineCount: 1 maximumLineCount: 1
Layout.fillWidth: true Layout.fillWidth: true
} }
Text { Text {
Layout.topMargin: 2 * DefaultStyle.dp Layout.topMargin: 2 * mainWindow.dp
visible: mainItem.showDefaultAddress visible: mainItem.showDefaultAddress
text: modelData.core.defaultAddress text: modelData.core.defaultAddress
font { font {
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
} }
} }
} }
@ -206,13 +206,13 @@ ListView {
id: actionsRow id: actionsRow
z: 1 z: 1
visible: actionButtons || friendPopup.visible || mainItem.multiSelectionEnabled visible: actionButtons || friendPopup.visible || mainItem.multiSelectionEnabled
spacing: visible ? 16 * DefaultStyle.dp : 0 spacing: visible ? 16 * mainWindow.dp : 0
EffectImage { EffectImage {
id: isSelectedCheck id: isSelectedCheck
// visible: mainItem.multiSelectionEnabled && (mainItem.confInfoGui.core.getParticipantIndex(modelData.core.defaultAddress) != -1) // visible: mainItem.multiSelectionEnabled && (mainItem.confInfoGui.core.getParticipantIndex(modelData.core.defaultAddress) != -1)
visible: mainItem.multiSelectionEnabled && (mainItem.selectedContacts.indexOf(modelData.core.defaultAddress) != -1) visible: mainItem.multiSelectionEnabled && (mainItem.selectedContacts.indexOf(modelData.core.defaultAddress) != -1)
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
imageSource: AppIcons.check imageSource: AppIcons.check
colorizationColor: DefaultStyle.main1_500_main colorizationColor: DefaultStyle.main1_500_main
Connections { Connections {
@ -224,19 +224,19 @@ ListView {
RowLayout{ RowLayout{
id: actionButtons id: actionButtons
visible: mainItem.actionLayoutVisible visible: mainItem.actionLayoutVisible
spacing: visible ? 10 * DefaultStyle.dp : 0 spacing: visible ? 10 * mainWindow.dp : 0
Button { Button {
id: callButton id: callButton
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
icon.source: AppIcons.phone icon.source: AppIcons.phone
focus: visible focus: visible
contentImageColor: DefaultStyle.main2_500main contentImageColor: DefaultStyle.main2_500main
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
radius: 40 * DefaultStyle.dp radius: 40 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
onClicked: UtilsCpp.createCall(modelData.core.defaultAddress) onClicked: UtilsCpp.createCall(modelData.core.defaultAddress)
@ -246,16 +246,16 @@ ListView {
Button { Button {
id: chatButton id: chatButton
visible: actionButtons.visible && !SettingsCpp.disableChatFeature visible: actionButtons.visible && !SettingsCpp.disableChatFeature
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
icon.source: AppIcons.chatTeardropText icon.source: AppIcons.chatTeardropText
focus: visible && !callButton.visible focus: visible && !callButton.visible
contentImageColor: DefaultStyle.main2_500main contentImageColor: DefaultStyle.main2_500main
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
radius: 40 * DefaultStyle.dp radius: 40 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
KeyNavigation.right: callButton KeyNavigation.right: callButton
@ -265,11 +265,11 @@ ListView {
PopupButton { PopupButton {
id: friendPopup id: friendPopup
z: 1 z: 1
// Layout.rightMargin: 13 * DefaultStyle.dp // Layout.rightMargin: 13 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.rightMargin: 8 * DefaultStyle.dp Layout.rightMargin: 8 * mainWindow.dp
popup.x: 0 popup.x: 0
popup.padding: 10 * DefaultStyle.dp popup.padding: 10 * mainWindow.dp
hoverEnabled: mainItem.hoverEnabled hoverEnabled: mainItem.hoverEnabled
visible: mainItem.contactMenuVisible && (contactArea.containsMouse || hovered || popup.opened) && (!mainItem.delegateButtons || mainItem.delegateButtons.length === 0) visible: mainItem.contactMenuVisible && (contactArea.containsMouse || hovered || popup.opened) && (!mainItem.delegateButtons || mainItem.delegateButtons.length === 0)
@ -278,11 +278,11 @@ ListView {
text: $modelData.core.starred ? qsTr("Enlever des favoris") : qsTr("Mettre en favori") text: $modelData.core.starred ? qsTr("Enlever des favoris") : qsTr("Mettre en favori")
background: Item{} background: Item{}
icon.source: modelData.core.starred ? AppIcons.heartFill : AppIcons.heart icon.source: modelData.core.starred ? AppIcons.heartFill : AppIcons.heart
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main textColor: DefaultStyle.main2_500main
contentImageColor: modelData.core.starred ? DefaultStyle.danger_500main : DefaultStyle.main2_600 contentImageColor: modelData.core.starred ? DefaultStyle.danger_500main : DefaultStyle.main2_600
onClicked: { onClicked: {
@ -294,11 +294,11 @@ ListView {
text: qsTr("Partager") text: qsTr("Partager")
background: Item{} background: Item{}
icon.source: AppIcons.shareNetwork icon.source: AppIcons.shareNetwork
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main textColor: DefaultStyle.main2_500main
onClicked: { onClicked: {
var vcard = modelData.core.getVCard() var vcard = modelData.core.getVCard()
@ -313,11 +313,11 @@ ListView {
text: qsTr("Supprimer") text: qsTr("Supprimer")
background: Item{} background: Item{}
icon.source: AppIcons.trashCan icon.source: AppIcons.trashCan
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.danger_500main textColor: DefaultStyle.danger_500main
contentImageColor: DefaultStyle.danger_500main contentImageColor: DefaultStyle.danger_500main
visible: !modelData.core.readOnly visible: !modelData.core.readOnly

12
Linphone/view/Control/Display/Contact/Voicemail.qml
View file

@ -10,15 +10,15 @@ Rectangle{
id: mainItem id: mainItem
property int voicemailCount: 0 property int voicemailCount: 0
visible: voicemailCount > 0 visible: voicemailCount > 0
width: 27 * DefaultStyle.dp width: 27 * mainWindow.dp
height: 28 * DefaultStyle.dp height: 28 * mainWindow.dp
signal clicked() signal clicked()
Button { Button {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
icon.source: AppIcons.voicemail icon.source: AppIcons.voicemail
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
} }
@ -29,8 +29,8 @@ Rectangle{
Text { Text {
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
font.weight: 700 * DefaultStyle.dp font.weight: 700 * mainWindow.dp
font.pixelSize: 10 * DefaultStyle.dp font.pixelSize: 10 * mainWindow.dp
color: DefaultStyle.danger_500main color: DefaultStyle.danger_500main
text: voicemailCount text: voicemailCount
maximumLineCount: 1 maximumLineCount: 1

74
Linphone/view/Control/Display/Meeting/MeetingListView.qml
View file

@ -18,7 +18,7 @@ ListView {
signal conferenceSelected(var contact) signal conferenceSelected(var contact)
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
currentIndex: confInfoProxy.currentDateIndex currentIndex: confInfoProxy.currentDateIndex
// using highlight doesn't center, take time before moving and don't work for not visible item (like not loaded) // using highlight doesn't center, take time before moving and don't work for not visible item (like not loaded)
highlightFollowsCurrentItem: false highlightFollowsCurrentItem: false
@ -43,21 +43,21 @@ ListView {
id: confInfoProxy id: confInfoProxy
filterText: searchBarText filterText: searchBarText
filterType: ConferenceInfoProxy.None filterType: ConferenceInfoProxy.None
initialDisplayItems: mainItem.height / (63 * DefaultStyle.dp) + 5 initialDisplayItems: mainItem.height / (63 * mainWindow.dp) + 5
displayItemsStep: initialDisplayItems/2 displayItemsStep: initialDisplayItems/2
} }
section { section {
criteria: ViewSection.FullString criteria: ViewSection.FullString
delegate: Text { delegate: Text {
topPadding: 24 * DefaultStyle.dp topPadding: 24 * mainWindow.dp
bottomPadding: 16 * DefaultStyle.dp bottomPadding: 16 * mainWindow.dp
text: section text: section
height: 29 * DefaultStyle.dp + topPadding + bottomPadding height: 29 * mainWindow.dp + topPadding + bottomPadding
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -66,7 +66,7 @@ ListView {
delegate: FocusScope { delegate: FocusScope {
id: itemDelegate id: itemDelegate
height: 63 * DefaultStyle.dp + topOffset height: 63 * mainWindow.dp + topOffset
width: mainItem.width width: mainItem.width
property var previousItem : mainItem.model.count > 0 && index > 0 ? mainItem.model.getAt(index-1) : null property var previousItem : mainItem.model.count > 0 && index > 0 ? mainItem.model.getAt(index-1) : null
property var dateTime: !!$modelData && $modelData.core.haveModel ? $modelData.core.dateTime : UtilsCpp.getCurrentDateTime() property var dateTime: !!$modelData && $modelData.core.haveModel ? $modelData.core.dateTime : UtilsCpp.getCurrentDateTime()
@ -74,7 +74,7 @@ ListView {
property string dateString: UtilsCpp.toDateString(dateTime) property string dateString: UtilsCpp.toDateString(dateTime)
property string previousDateString: previousItem ? UtilsCpp.toDateString(previousItem.core ? previousItem.core.dateTimeUtc : UtilsCpp.getCurrentDateTimeUtc()) : '' property string previousDateString: previousItem ? UtilsCpp.toDateString(previousItem.core ? previousItem.core.dateTimeUtc : UtilsCpp.getCurrentDateTimeUtc()) : ''
property bool isFirst : ListView.previousSection !== ListView.section property bool isFirst : ListView.previousSection !== ListView.section
property int topOffset: (dateDay.visible && !isFirst? 8 * DefaultStyle.dp : 0) property int topOffset: (dateDay.visible && !isFirst? 8 * mainWindow.dp : 0)
property var endDateTime: $modelData ? $modelData.core.endDateTime : UtilsCpp.getCurrentDateTime() property var endDateTime: $modelData ? $modelData.core.endDateTime : UtilsCpp.getCurrentDateTime()
property var haveModel: $modelData && $modelData.core.haveModel || false property var haveModel: $modelData && $modelData.core.haveModel || false
@ -85,34 +85,34 @@ ListView {
anchors.topMargin:parent.topOffset anchors.topMargin:parent.topOffset
spacing: 0 spacing: 0
Item{ Item{
Layout.preferredWidth: 32 * DefaultStyle.dp Layout.preferredWidth: 32 * mainWindow.dp
visible: !dateDay.visible visible: !dateDay.visible
} }
ColumnLayout { ColumnLayout {
id: dateDay id: dateDay
Layout.fillWidth: false Layout.fillWidth: false
Layout.preferredWidth: 32 * DefaultStyle.dp Layout.preferredWidth: 32 * mainWindow.dp
Layout.minimumWidth: 32 * DefaultStyle.dp Layout.minimumWidth: 32 * mainWindow.dp
Layout.preferredHeight: 51 * DefaultStyle.dp Layout.preferredHeight: 51 * mainWindow.dp
visible: previousDateString.length == 0 || previousDateString != dateString visible: previousDateString.length == 0 || previousDateString != dateString
spacing: 0 spacing: 0
Text { Text {
Layout.preferredHeight: 19 * DefaultStyle.dp Layout.preferredHeight: 19 * mainWindow.dp
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
text: day.substring(0,3) + '.' text: day.substring(0,3) + '.'
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
elide: Text.ElideNone elide: Text.ElideNone
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
Rectangle { Rectangle {
id: dayNum id: dayNum
Layout.preferredWidth: 32 * DefaultStyle.dp Layout.preferredWidth: 32 * mainWindow.dp
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
radius: height/2 radius: height/2
property var isCurrentDay: UtilsCpp.isCurrentDay(dateTime) property var isCurrentDay: UtilsCpp.isCurrentDay(dateTime)
@ -127,42 +127,42 @@ ListView {
color: dayNum.isCurrentDay ? DefaultStyle.grey_0 : DefaultStyle.main2_500main color: dayNum.isCurrentDay ? DefaultStyle.grey_0 : DefaultStyle.main2_500main
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
} }
Item{Layout.fillHeight:true;Layout.fillWidth: true} Item{Layout.fillHeight:true;Layout.fillWidth: true}
} }
Item { Item {
Layout.preferredWidth: 265 * DefaultStyle.dp Layout.preferredWidth: 265 * mainWindow.dp
Layout.preferredHeight: 63 * DefaultStyle.dp Layout.preferredHeight: 63 * mainWindow.dp
Layout.leftMargin: 23 * DefaultStyle.dp Layout.leftMargin: 23 * mainWindow.dp
Rectangle { Rectangle {
id: conferenceInfoDelegate id: conferenceInfoDelegate
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: 5 // margin to avoid clipping shadows at right anchors.rightMargin: 5 // margin to avoid clipping shadows at right
radius: 10 * DefaultStyle.dp radius: 10 * mainWindow.dp
visible: itemDelegate.haveModel || itemDelegate.activeFocus visible: itemDelegate.haveModel || itemDelegate.activeFocus
color: mainItem.currentIndex === index ? DefaultStyle.main2_200 : DefaultStyle.grey_0 color: mainItem.currentIndex === index ? DefaultStyle.main2_200 : DefaultStyle.grey_0
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 15 * DefaultStyle.dp anchors.leftMargin: 15 * mainWindow.dp
spacing: 2 * DefaultStyle.dp spacing: 2 * mainWindow.dp
visible: itemDelegate.haveModel visible: itemDelegate.haveModel
RowLayout { RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
Image { Image {
source: AppIcons.usersThree source: AppIcons.usersThree
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
Text { Text {
text: $modelData.core.subject text: $modelData.core.subject
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
} }
@ -170,8 +170,8 @@ ListView {
text: UtilsCpp.toDateHourString(dateTime) + " - " + UtilsCpp.toDateHourString(endDateTime) text: UtilsCpp.toDateHourString(dateTime) + " - " + UtilsCpp.toDateHourString(endDateTime)
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -186,15 +186,15 @@ ListView {
} }
Text { Text {
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: 5 * DefaultStyle.dp // margin to avoid clipping shadows at right anchors.rightMargin: 5 * mainWindow.dp // margin to avoid clipping shadows at right
anchors.leftMargin: 16 * DefaultStyle.dp anchors.leftMargin: 16 * mainWindow.dp
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
visible: !itemDelegate.haveModel visible: !itemDelegate.haveModel
text: qsTr("Aucune réunion aujourd'hui") text: qsTr("Aucune réunion aujourd'hui")
lineHeightMode: Text.FixedHeight lineHeightMode: Text.FixedHeight
lineHeight: 17.71 * DefaultStyle.dp lineHeight: 17.71 * mainWindow.dp
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 weight: 700
} }
} }

18
Linphone/view/Control/Display/Participant/ParticipantDeviceListView.qml
View file

@ -10,8 +10,8 @@ ListView {
height: contentHeight height: contentHeight
visible: contentHeight > 0 visible: contentHeight > 0
clip: true clip: true
rightMargin: 5 * DefaultStyle.dp rightMargin: 5 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
property string searchBarText property string searchBarText
@ -31,26 +31,26 @@ ListView {
} }
delegate: Item { delegate: Item {
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
width: mainItem.width width: mainItem.width
RowLayout { RowLayout {
id: participantDelegate id: participantDelegate
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 10 * DefaultStyle.dp anchors.leftMargin: 10 * mainWindow.dp
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 10 * DefaultStyle.dp anchors.rightMargin: 10 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
z: 1 z: 1
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData.core.address _address: modelData.core.address
} }
Text { Text {
text: modelData.core.displayName text: modelData.core.displayName
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
font.capitalization: mainItem.displayNameCapitalization ? Font.Capitalize : Font.MixedCase font.capitalization: mainItem.displayNameCapitalization ? Font.Capitalize : Font.MixedCase
maximumLineCount: 1 maximumLineCount: 1
Layout.fillWidth: true Layout.fillWidth: true

52
Linphone/view/Control/Display/Participant/ParticipantListView.qml
View file

@ -10,8 +10,8 @@ ListView {
height: contentHeight height: contentHeight
visible: contentHeight > 0 visible: contentHeight > 0
clip: true clip: true
rightMargin: 5 * DefaultStyle.dp rightMargin: 5 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
property string searchBarText property string searchBarText
@ -35,26 +35,26 @@ ListView {
} }
delegate: Item { delegate: Item {
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
width: mainItem.width width: mainItem.width
RowLayout { RowLayout {
id: participantDelegate id: participantDelegate
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 10 * DefaultStyle.dp anchors.leftMargin: 10 * mainWindow.dp
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 10 * DefaultStyle.dp anchors.rightMargin: 10 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
z: 1 z: 1
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData.core.sipAddress _address: modelData.core.sipAddress
} }
Text { Text {
text: modelData.core.displayName text: modelData.core.displayName
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
font.capitalization: mainItem.displayNameCapitalization ? Font.Capitalize : Font.MixedCase font.capitalization: mainItem.displayNameCapitalization ? Font.Capitalize : Font.MixedCase
maximumLineCount: 1 maximumLineCount: 1
Layout.fillWidth: true Layout.fillWidth: true
@ -65,8 +65,8 @@ ListView {
text: qsTr("Admin") text: qsTr("Admin")
color: DefaultStyle.main2_400 color: DefaultStyle.main2_400
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
RowLayout { RowLayout {
@ -75,19 +75,19 @@ ListView {
onIsMeChanged: if (isMe) mainItem.me = modelData onIsMeChanged: if (isMe) mainItem.me = modelData
enabled: mainItem.isMeAdmin && !modelData.core.isMe enabled: mainItem.isMeAdmin && !modelData.core.isMe
opacity: enabled ? 1.0 : 0 opacity: enabled ? 1.0 : 0
spacing: 26 * DefaultStyle.dp spacing: 26 * mainWindow.dp
Switch { Switch {
Component.onCompleted: if (modelData.core.isAdmin) toggle() Component.onCompleted: if (modelData.core.isAdmin) toggle()
//TODO : Utilser checked et onToggled (pas compris) //TODO : Utilser checked et onToggled (pas compris)
onToggled: participantModel.setParticipantAdminStatus(modelData.core, position === 1) onToggled: participantModel.setParticipantAdminStatus(modelData.core, position === 1)
} }
Button { Button {
Layout.preferredWidth: 20 * DefaultStyle.dp Layout.preferredWidth: 20 * mainWindow.dp
Layout.preferredHeight: 20 * DefaultStyle.dp Layout.preferredHeight: 20 * mainWindow.dp
color: DefaultStyle.main2_100 color: DefaultStyle.main2_100
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
icon.width: 14 * DefaultStyle.dp icon.width: 14 * mainWindow.dp
icon.height: 14 * DefaultStyle.dp icon.height: 14 * mainWindow.dp
onClicked: participantModel.removeParticipant(modelData.core) onClicked: participantModel.removeParticipant(modelData.core)
} }
} }
@ -97,24 +97,24 @@ ListView {
footer: Rectangle { footer: Rectangle {
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
visible: mainItem.isMeAdmin visible: mainItem.isMeAdmin
height: 74 * DefaultStyle.dp height: 74 * mainWindow.dp
width: mainItem.width width: mainItem.width
Button { Button {
anchors.centerIn: parent anchors.centerIn: parent
leftPadding: 16 * DefaultStyle.dp leftPadding: 16 * mainWindow.dp
rightPadding: 16 * DefaultStyle.dp rightPadding: 16 * mainWindow.dp
topPadding: 10 * DefaultStyle.dp topPadding: 10 * mainWindow.dp
bottomPadding: 10 * DefaultStyle.dp bottomPadding: 10 * mainWindow.dp
height: 40 * DefaultStyle.dp height: 40 * mainWindow.dp
icon.source: AppIcons.plusCircle icon.source: AppIcons.plusCircle
icon.width: 16 * DefaultStyle.dp icon.width: 16 * mainWindow.dp
icon.height: 16 * DefaultStyle.dp icon.height: 16 * mainWindow.dp
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
color: DefaultStyle.main1_100 color: DefaultStyle.main1_100
text: qsTr("Ajouter des participants") text: qsTr("Ajouter des participants")
textColor: DefaultStyle.main1_500_main textColor: DefaultStyle.main1_500_main
textSize: 15 * DefaultStyle.dp textSize: 15 * mainWindow.dp
textWeight: 600 * DefaultStyle.dp textWeight: 600 * mainWindow.dp
onClicked: mainItem.addParticipantRequested() onClicked: mainItem.addParticipantRequested()
} }
} }

10
Linphone/view/Control/Display/ProgressBar.qml
View file

@ -5,7 +5,7 @@ import Linphone
ProgressBar { ProgressBar {
id: mainItem id: mainItem
padding: 3 * DefaultStyle.dp padding: 3 * mainWindow.dp
property color backgroundColor: DefaultStyle.main2_100 property color backgroundColor: DefaultStyle.main2_100
property color innerColor: DefaultStyle.info_500_main property color innerColor: DefaultStyle.info_500_main
@ -15,7 +15,7 @@ ProgressBar {
background: Rectangle { background: Rectangle {
color: mainItem.backgroundColor color: mainItem.backgroundColor
radius: 50 * DefaultStyle.dp radius: 50 * mainWindow.dp
anchors.fill: mainItem anchors.fill: mainItem
width: mainItem.width width: mainItem.width
height: mainItem.height height: mainItem.height
@ -23,7 +23,7 @@ ProgressBar {
contentItem: Item { contentItem: Item {
Rectangle { Rectangle {
color: mainItem.innerColor color: mainItem.innerColor
radius: 50 * DefaultStyle.dp radius: 50 * mainWindow.dp
width: mainItem.visualPosition * mainItem.width width: mainItem.visualPosition * mainItem.width
height: parent.height height: parent.height
Text { Text {
@ -32,8 +32,8 @@ ProgressBar {
anchors.centerIn: parent anchors.centerIn: parent
color: mainItem.innerTextColor color: mainItem.innerTextColor
font { font {
pixelSize: 10 * DefaultStyle.dp pixelSize: 10 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
} }

6
Linphone/view/Control/Display/RoundedPane.qml
View file

@ -4,12 +4,12 @@ import Linphone
Control.Control { Control.Control {
id: mainItem id: mainItem
// width: 360 * DefaultStyle.dp // width: 360 * mainWindow.dp
property color backgroundColor: DefaultStyle.grey_0 property color backgroundColor: DefaultStyle.grey_0
padding: 10 * DefaultStyle.dp padding: 10 * mainWindow.dp
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
color: mainItem.backgroundColor color: mainItem.backgroundColor
} }
} }

8
Linphone/view/Control/Display/Settings/SettingsMenuItem.qml
View file

@ -7,7 +7,7 @@ import Linphone
Item { Item {
id: mainItem id: mainItem
height: visible ? 50 * DefaultStyle.dp : 0 height: visible ? 50 * mainWindow.dp : 0
anchors.right: parent.right anchors.right: parent.right
anchors.left: parent.left anchors.left: parent.left
@ -30,15 +30,15 @@ Item {
id: background id: background
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
radius: 35 * DefaultStyle.dp radius: 35 * mainWindow.dp
visible: parent.containsMouse || isSelected || mainItem.shadowEnabled visible: parent.containsMouse || isSelected || mainItem.shadowEnabled
} }
Rectangle { Rectangle {
id: backgroundRightFiller id: backgroundRightFiller
anchors.right: parent.right anchors.right: parent.right
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
width: 35 * DefaultStyle.dp width: 35 * mainWindow.dp
height: 50 * DefaultStyle.dp height: 50 * mainWindow.dp
visible: parent.containsMouse || isSelected visible: parent.containsMouse || isSelected
} }
// MultiEffect { // MultiEffect {

70
Linphone/view/Control/Display/Sticker.qml
View file

@ -24,7 +24,7 @@ Item {
property bool displayBorder : participantDevice && participantDevice.core.isSpeaking || false property bool displayBorder : participantDevice && participantDevice.core.isSpeaking || false
property alias displayPresence: avatar.displayPresence property alias displayPresence: avatar.displayPresence
property color color: DefaultStyle.grey_600 property color color: DefaultStyle.grey_600
property int radius: 15 * DefaultStyle.dp property int radius: 15 * mainWindow.dp
property bool remoteIsPaused: participantDevice property bool remoteIsPaused: participantDevice
? participantDevice.core.isPaused ? participantDevice.core.isPaused
: previewEnabled : previewEnabled
@ -69,7 +69,7 @@ Item {
radius: mainItem.radius radius: mainItem.radius
anchors.fill: parent anchors.fill: parent
border.color: DefaultStyle.main2_200 border.color: DefaultStyle.main2_200
border.width: mainItem.displayBorder ? 3 * DefaultStyle.dp : 0 border.width: mainItem.displayBorder ? 3 * mainWindow.dp : 0
property int minSize: Math.min(height, width) property int minSize: Math.min(height, width)
Item { Item {
id: noCameraLayout id: noCameraLayout
@ -77,7 +77,7 @@ Item {
visible: !cameraLoader.active || cameraLoader.status != Loader.Ready || !cameraLoader.item.isReady visible: !cameraLoader.active || cameraLoader.status != Loader.Ready || !cameraLoader.item.isReady
ColumnLayout { ColumnLayout {
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 81 * DefaultStyle.dp anchors.topMargin: 81 * mainWindow.dp
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
// Layout.alignment: Qt.AlignHCenter |Qt.AlignTop // Layout.alignment: Qt.AlignHCenter |Qt.AlignTop
spacing: 0 spacing: 0
@ -89,8 +89,8 @@ Item {
BusyIndicator { BusyIndicator {
indicatorColor: DefaultStyle.main2_100 indicatorColor: DefaultStyle.main2_100
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
indicatorHeight: 27 * DefaultStyle.dp indicatorHeight: 27 * mainWindow.dp
indicatorWidth: 27 * DefaultStyle.dp indicatorWidth: 27 * mainWindow.dp
} }
Timer { Timer {
id: waitingTimer id: waitingTimer
@ -107,10 +107,10 @@ Item {
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Layout.topMargin: 25 * DefaultStyle.dp Layout.topMargin: 25 * mainWindow.dp
font { font {
pixelSize: 30 * DefaultStyle.dp pixelSize: 30 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
Component.onCompleted: { Component.onCompleted: {
waitingTimer.restart() waitingTimer.restart()
@ -123,7 +123,7 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
height: mainItem.conference height: mainItem.conference
? background.minSize * 142 / 372 ? background.minSize * 142 / 372
: 120 * DefaultStyle.dp : 120 * mainWindow.dp
width: height width: height
Avatar{ Avatar{
id: avatar id: avatar
@ -139,29 +139,29 @@ Item {
spacing: 0 spacing: 0
visible: mainItem.participantDevice && (mainItem.participantDevice.core.state == LinphoneEnums.ParticipantDeviceState.Joining || mainItem.participantDevice.core.state == LinphoneEnums.ParticipantDeviceState.Alerting) || false visible: mainItem.participantDevice && (mainItem.participantDevice.core.state == LinphoneEnums.ParticipantDeviceState.Joining || mainItem.participantDevice.core.state == LinphoneEnums.ParticipantDeviceState.Alerting) || false
BusyIndicator { BusyIndicator {
Layout.preferredHeight: 42 * DefaultStyle.dp Layout.preferredHeight: 42 * mainWindow.dp
indicatorColor: DefaultStyle.main2_100 indicatorColor: DefaultStyle.main2_100
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
indicatorHeight: 42 * DefaultStyle.dp indicatorHeight: 42 * mainWindow.dp
indicatorWidth: 42 * DefaultStyle.dp indicatorWidth: 42 * mainWindow.dp
} }
Text { Text {
Layout.preferredHeight: 27 * DefaultStyle.dp Layout.preferredHeight: 27 * mainWindow.dp
Layout.topMargin: 15 * DefaultStyle.dp // (84-27)-42 Layout.topMargin: 15 * mainWindow.dp // (84-27)-42
text: qsTr('rejoint...') text: qsTr('rejoint...')
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 500 * DefaultStyle.dp weight: 500 * mainWindow.dp
} }
} }
} }
} }
ColumnLayout { ColumnLayout {
anchors.centerIn: parent anchors.centerIn: parent
spacing: 12 * DefaultStyle.dp spacing: 12 * mainWindow.dp
visible: mainItem.remoteIsPaused visible: mainItem.remoteIsPaused
EffectImage { EffectImage {
imageSource: AppIcons.pause imageSource: AppIcons.pause
@ -175,8 +175,8 @@ Item {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: qsTr("En pause") text: qsTr("En pause")
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 500 * DefaultStyle.dp weight: 500 * mainWindow.dp
} }
} }
} }
@ -185,15 +185,15 @@ Item {
visible: mainItem.displayAll && !mainItem.remoteIsPaused && !mainItem.conference visible: mainItem.displayAll && !mainItem.remoteIsPaused && !mainItem.conference
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.top: centerItem.bottom anchors.top: centerItem.bottom
anchors.topMargin: 21 * DefaultStyle.dp anchors.topMargin: 21 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: mainItem.displayName text: mainItem.displayName
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 22 * DefaultStyle.dp pixelSize: 22 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -204,8 +204,8 @@ Item {
text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
@ -268,8 +268,8 @@ Item {
Text { Text {
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.leftMargin: 10 * DefaultStyle.dp anchors.leftMargin: 10 * mainWindow.dp
anchors.bottomMargin: 10 * DefaultStyle.dp anchors.bottomMargin: 10 * mainWindow.dp
width: implicitWidth width: implicitWidth
property string _text: mainItem.displayName != '' property string _text: mainItem.displayName != ''
? mainItem.displayName ? mainItem.displayName
@ -279,8 +279,8 @@ Item {
text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 500 * DefaultStyle.dp weight: 500 * mainWindow.dp
} }
} }
} }
@ -297,19 +297,19 @@ Item {
RowLayout{ RowLayout{
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.rightMargin: 8 * DefaultStyle.dp anchors.rightMargin: 8 * mainWindow.dp
anchors.topMargin: 8 * DefaultStyle.dp anchors.topMargin: 8 * mainWindow.dp
height: 18 * DefaultStyle.dp height: 18 * mainWindow.dp
spacing: 0 spacing: 0
CheckableButton { CheckableButton {
id: muteIcon id: muteIcon
icon.source: AppIcons.microphoneSlash icon.source: AppIcons.microphoneSlash
Layout.preferredWidth: Math.min(mainItem.width / 16, 20 * DefaultStyle.dp) Layout.preferredWidth: Math.min(mainItem.width / 16, 20 * mainWindow.dp)
Layout.preferredHeight: Math.min(mainItem.width / 16, 20 * DefaultStyle.dp) Layout.preferredHeight: Math.min(mainItem.width / 16, 20 * mainWindow.dp)
visible: mainItem.mutedStatus visible: mainItem.mutedStatus
icon.width: Math.min(mainItem.width / 16, 20 * DefaultStyle.dp) icon.width: Math.min(mainItem.width / 16, 20 * mainWindow.dp)
icon.height: Math.min(mainItem.width / 16, 20 * DefaultStyle.dp) icon.height: Math.min(mainItem.width / 16, 20 * mainWindow.dp)
enabled: false enabled: false
contentImageColor: DefaultStyle.main2_500main contentImageColor: DefaultStyle.main2_500main
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0

4
Linphone/view/Control/Display/TemporaryText.qml
View file

@ -22,8 +22,8 @@ Text {
} }
} }
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
Timer { Timer {
id: autoHideErrorMessage id: autoHideErrorMessage

4
Linphone/view/Control/Display/Text.qml
View file

@ -8,8 +8,8 @@ Quick.Text {
width: txtMeter.advanceWidth width: txtMeter.advanceWidth
font { font {
family: DefaultStyle.defaultFont family: DefaultStyle.defaultFont
pixelSize: 10 * DefaultStyle.dp pixelSize: 10 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
wrapMode: Quick.Text.Wrap wrapMode: Quick.Text.Wrap

2
Linphone/view/Control/Display/ToolTip.qml
View file

@ -10,7 +10,7 @@ Control.ToolTip {
id: tooltipBackground id: tooltipBackground
opacity: 0.7 opacity: 0.7
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
} }
contentItem: Text { contentItem: Text {
text: mainItem.text text: mainItem.text

30
Linphone/view/Control/Form/Login/LoginForm.qml
View file

@ -6,7 +6,7 @@ import ConstantsCpp 1.0
ColumnLayout { ColumnLayout {
id: mainItem id: mainItem
spacing: 25 * DefaultStyle.dp spacing: 25 * mainWindow.dp
signal connectionSucceed() signal connectionSucceed()
FormItemLayout { FormItemLayout {
@ -17,8 +17,8 @@ ColumnLayout {
contentItem: TextField { contentItem: TextField {
id: usernameEdit id: usernameEdit
isError: username.errorTextVisible || errorText.visible isError: username.errorTextVisible || errorText.visible
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
} }
} }
Item { Item {
@ -31,8 +31,8 @@ ColumnLayout {
contentItem: TextField { contentItem: TextField {
id: passwordEdit id: passwordEdit
isError: password.errorTextVisible || errorText.visible isError: password.errorTextVisible || errorText.visible
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
hidden: true hidden: true
} }
} }
@ -55,14 +55,14 @@ ColumnLayout {
} }
RowLayout { RowLayout {
Layout.topMargin: 7 * DefaultStyle.dp Layout.topMargin: 7 * mainWindow.dp
spacing: 29 * DefaultStyle.dp spacing: 29 * mainWindow.dp
Button { Button {
id: connectionButton id: connectionButton
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
contentItem: StackLayout { contentItem: StackLayout {
id: connectionButtonContent id: connectionButtonContent
currentIndex: 0 currentIndex: 0
@ -72,8 +72,8 @@ ColumnLayout {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font { font {
pixelSize: 18 * DefaultStyle.dp pixelSize: 18 * mainWindow.dp
weight: 600 * DefaultStyle.dp weight: 600 * mainWindow.dp
} }
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
} }
@ -131,8 +131,8 @@ ColumnLayout {
text: qsTr("Mot de passe oublié ?") text: qsTr("Mot de passe oublié ?")
font{ font{
underline: true underline: true
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 600 * DefaultStyle.dp weight: 600 * mainWindow.dp
} }
} }
onClicked: Qt.openUrlExternally(ConstantsCpp.PasswordRecoveryUrl) onClicked: Qt.openUrlExternally(ConstantsCpp.PasswordRecoveryUrl)

76
Linphone/view/Control/Form/Settings/MultimediaSettings.qml
View file

@ -13,30 +13,30 @@ ColumnLayout {
property string microDevice: inputAudioDeviceCBox.currentText property string microDevice: inputAudioDeviceCBox.currentText
property bool ringerDevicesVisible: false property bool ringerDevicesVisible: false
property bool backgroundVisible: true property bool backgroundVisible: true
spacing: 40 * DefaultStyle.dp spacing: 40 * mainWindow.dp
RoundedPane { RoundedPane {
background.visible: mainItem.backgroundVisible background.visible: mainItem.backgroundVisible
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
height: contentItem.implicitHeight + topPadding + bottomPadding height: contentItem.implicitHeight + topPadding + bottomPadding
Layout.fillWidth: true Layout.fillWidth: true
topPadding: background.visible ? 25 * DefaultStyle.dp : 0 topPadding: background.visible ? 25 * mainWindow.dp : 0
bottomPadding: background.visible ? 25 * DefaultStyle.dp : 0 bottomPadding: background.visible ? 25 * mainWindow.dp : 0
leftPadding: background.visible ? 25 * DefaultStyle.dp : 0 leftPadding: background.visible ? 25 * mainWindow.dp : 0
rightPadding: background.visible ? 25 * DefaultStyle.dp : 0 rightPadding: background.visible ? 25 * mainWindow.dp : 0
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: mainItem.spacing spacing: mainItem.spacing
ColumnLayout { ColumnLayout {
spacing: 12 * DefaultStyle.dp spacing: 12 * mainWindow.dp
RowLayout { RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
imageSource: AppIcons.bellRinger imageSource: AppIcons.bellRinger
colorizationColor: DefaultStyle.main1_500_main colorizationColor: DefaultStyle.main1_500_main
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
imageWidth: 24 * DefaultStyle.dp imageWidth: 24 * mainWindow.dp
imageHeight: 24 * DefaultStyle.dp imageHeight: 24 * mainWindow.dp
} }
Text { Text {
text: qsTr("Sonnerie - Appels entrants") text: qsTr("Sonnerie - Appels entrants")
@ -47,7 +47,7 @@ ColumnLayout {
} }
ComboSetting { ComboSetting {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 12 * DefaultStyle.dp Layout.topMargin: 12 * mainWindow.dp
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
entries: SettingsCpp.ringerDevices entries: SettingsCpp.ringerDevices
propertyName: "ringerDevice" propertyName: "ringerDevice"
@ -58,16 +58,16 @@ ColumnLayout {
} }
} }
ColumnLayout { ColumnLayout {
spacing: 12 * DefaultStyle.dp spacing: 12 * mainWindow.dp
RowLayout { RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
imageSource: AppIcons.speaker imageSource: AppIcons.speaker
colorizationColor: DefaultStyle.main1_500_main colorizationColor: DefaultStyle.main1_500_main
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
imageWidth: 24 * DefaultStyle.dp imageWidth: 24 * mainWindow.dp
imageHeight: 24 * DefaultStyle.dp imageHeight: 24 * mainWindow.dp
} }
Text { Text {
text: qsTr("Haut-parleurs") text: qsTr("Haut-parleurs")
@ -79,7 +79,7 @@ ColumnLayout {
id: outputAudioDeviceCBox id: outputAudioDeviceCBox
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
entries: SettingsCpp.playbackDevices entries: SettingsCpp.playbackDevices
propertyName: "playbackDevice" propertyName: "playbackDevice"
propertyOwner: SettingsCpp propertyOwner: SettingsCpp
@ -97,16 +97,16 @@ ColumnLayout {
} }
} }
ColumnLayout { ColumnLayout {
spacing: 12 * DefaultStyle.dp spacing: 12 * mainWindow.dp
RowLayout { RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
imageSource: AppIcons.microphone imageSource: AppIcons.microphone
colorizationColor: DefaultStyle.main1_500_main colorizationColor: DefaultStyle.main1_500_main
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
imageWidth: 24 * DefaultStyle.dp imageWidth: 24 * mainWindow.dp
imageHeight: 24 * DefaultStyle.dp imageHeight: 24 * mainWindow.dp
} }
Text { Text {
text: qsTr("Microphone") text: qsTr("Microphone")
@ -118,7 +118,7 @@ ColumnLayout {
id: inputAudioDeviceCBox id: inputAudioDeviceCBox
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
entries: SettingsCpp.captureDevices entries: SettingsCpp.captureDevices
propertyName: "captureDevice" propertyName: "captureDevice"
propertyOwner: SettingsCpp propertyOwner: SettingsCpp
@ -148,16 +148,16 @@ ColumnLayout {
id: audioTestSlider id: audioTestSlider
Layout.fillWidth: true Layout.fillWidth: true
enabled: false enabled: false
Layout.preferredHeight: 10 * DefaultStyle.dp Layout.preferredHeight: 10 * mainWindow.dp
background: Rectangle { background: Rectangle {
x: audioTestSlider.leftPadding x: audioTestSlider.leftPadding
y: audioTestSlider.topPadding + audioTestSlider.availableHeight / 2 - height / 2 y: audioTestSlider.topPadding + audioTestSlider.availableHeight / 2 - height / 2
implicitWidth: 200 * DefaultStyle.dp implicitWidth: 200 * mainWindow.dp
implicitHeight: 10 * DefaultStyle.dp implicitHeight: 10 * mainWindow.dp
width: audioTestSlider.availableWidth width: audioTestSlider.availableWidth
height: implicitHeight height: implicitHeight
radius: 2 * DefaultStyle.dp radius: 2 * mainWindow.dp
color: DefaultStyle.grey_850 color: DefaultStyle.grey_850
Rectangle { Rectangle {
@ -168,23 +168,23 @@ ColumnLayout {
GradientStop { position: 0.0; color: DefaultStyle.vue_meter_light_green } GradientStop { position: 0.0; color: DefaultStyle.vue_meter_light_green }
GradientStop { position: 1.0; color: DefaultStyle.vue_meter_dark_green} GradientStop { position: 1.0; color: DefaultStyle.vue_meter_dark_green}
} }
radius: 2 * DefaultStyle.dp radius: 2 * mainWindow.dp
} }
} }
handle: Item {visible: false} handle: Item {visible: false}
} }
} }
ColumnLayout { ColumnLayout {
spacing: 12 * DefaultStyle.dp spacing: 12 * mainWindow.dp
RowLayout { RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
imageSource: AppIcons.videoCamera imageSource: AppIcons.videoCamera
colorizationColor: DefaultStyle.main1_500_main colorizationColor: DefaultStyle.main1_500_main
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
imageWidth: 24 * DefaultStyle.dp imageWidth: 24 * mainWindow.dp
imageHeight: 24 * DefaultStyle.dp imageHeight: 24 * mainWindow.dp
} }
Text { Text {
text: qsTr("Caméra") text: qsTr("Caméra")
@ -196,7 +196,7 @@ ColumnLayout {
id: videoDevicesCbox id: videoDevicesCbox
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
entries: SettingsCpp.videoDevices entries: SettingsCpp.videoDevices
propertyName: "videoDevice" propertyName: "videoDevice"
propertyOwner: SettingsCpp propertyOwner: SettingsCpp

40
Linphone/view/Control/Form/Settings/ScreencastSettings.qml
View file

@ -13,19 +13,19 @@ ColumnLayout {
property bool isLocalScreenSharing : conference?.core.isLocalScreenSharing || false property bool isLocalScreenSharing : conference?.core.isLocalScreenSharing || false
property bool screenSharingAvailable: !!conference && (!conference.core.isScreenSharingEnabled || isLocalScreenSharing) property bool screenSharingAvailable: !!conference && (!conference.core.isScreenSharingEnabled || isLocalScreenSharing)
spacing: 12 * DefaultStyle.dp spacing: 12 * mainWindow.dp
onIsLocalScreenSharingChanged: {if(isLocalScreenSharing) mainItem.call.core.videoSourceDescriptor = mainItem.desc } onIsLocalScreenSharingChanged: {if(isLocalScreenSharing) mainItem.call.core.videoSourceDescriptor = mainItem.desc }
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Veuillez choisir l’écran ou la fenêtre que vous souihaitez partager au autres participants") text: qsTr("Veuillez choisir l’écran ou la fenêtre que vous souihaitez partager au autres participants")
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
TabBar { TabBar {
Layout.fillWidth: true Layout.fillWidth: true
id: bar id: bar
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
model: [qsTr("Ecran entier"), qsTr("Fenêtre")] model: [qsTr("Ecran entier"), qsTr("Fenêtre")]
} }
component ScreenPreviewLayout: Control.Control { component ScreenPreviewLayout: Control.Control {
@ -36,18 +36,18 @@ ColumnLayout {
property bool selected: false property bool selected: false
property bool displayScreen: true property bool displayScreen: true
property int horizontalMargin: 0 property int horizontalMargin: 0
leftPadding: 18 * DefaultStyle.dp leftPadding: 18 * mainWindow.dp
rightPadding: 18 * DefaultStyle.dp rightPadding: 18 * mainWindow.dp
topPadding: 13 * DefaultStyle.dp topPadding: 13 * mainWindow.dp
bottomPadding: 13 * DefaultStyle.dp bottomPadding: 13 * mainWindow.dp
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: screenPreview.horizontalMargin anchors.leftMargin: screenPreview.horizontalMargin
anchors.rightMargin: screenPreview.horizontalMargin anchors.rightMargin: screenPreview.horizontalMargin
color: screenPreview.selected ? DefaultStyle.main2_100 : DefaultStyle.grey_0 color: screenPreview.selected ? DefaultStyle.main2_100 : DefaultStyle.grey_0
border.width: 2 * DefaultStyle.dp border.width: 2 * mainWindow.dp
border.color: screenPreview.selected ? DefaultStyle.main2_400 : DefaultStyle.main2_200 border.color: screenPreview.selected ? DefaultStyle.main2_400 : DefaultStyle.main2_200
radius: 10 * DefaultStyle.dp radius: 10 * mainWindow.dp
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
@ -62,7 +62,7 @@ ColumnLayout {
Layout.fillHeight: true Layout.fillHeight: true
Image { Image {
anchors.centerIn: parent anchors.centerIn: parent
//Layout.preferredHeight: 170 * DefaultStyle.dp //Layout.preferredHeight: 170 * mainWindow.dp
source: $modelData?.windowId ? "image://window/"+ $modelData.windowId : "image://screen/"+ $modelData.screenIndex source: $modelData?.windowId ? "image://window/"+ $modelData.windowId : "image://screen/"+ $modelData.screenIndex
sourceSize.width: parent.width sourceSize.width: parent.width
sourceSize.height: parent.height sourceSize.height: parent.height
@ -70,11 +70,11 @@ ColumnLayout {
} }
} }
RowLayout{ RowLayout{
Layout.topMargin: 6 * DefaultStyle.dp Layout.topMargin: 6 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Image{ Image{
Layout.preferredHeight: 15 * DefaultStyle.dp Layout.preferredHeight: 15 * mainWindow.dp
Layout.preferredWidth: 15 * DefaultStyle.dp Layout.preferredWidth: 15 * mainWindow.dp
visible: !!$modelData?.windowId visible: !!$modelData?.windowId
source: visible ? "image://window_icon/"+ $modelData.windowId : '' source: visible ? "image://window_icon/"+ $modelData.windowId : ''
sourceSize.width: width sourceSize.width: width
@ -85,7 +85,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
text: !!$modelData?.windowId ? $modelData.name : qsTr("Ecran %1").arg(screenIndex+1) text: !!$modelData?.windowId ? $modelData.name : qsTr("Ecran %1").arg(screenIndex+1)
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.pixelSize: (displayScreen ? 14 : 10)* DefaultStyle.dp font.pixelSize: (displayScreen ? 14 : 10)* mainWindow.dp
elide: Text.ElideRight elide: Text.ElideRight
maximumLineCount: 1 maximumLineCount: 1
} }
@ -96,7 +96,7 @@ ColumnLayout {
currentIndex: bar.currentIndex currentIndex: bar.currentIndex
ListView{ ListView{
id: screensLayout id: screensLayout
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
clip: true clip: true
//property int selectedIndex //property int selectedIndex
model: ScreenProxy{ model: ScreenProxy{
@ -105,9 +105,9 @@ ColumnLayout {
} }
onVisibleChanged: if(visible) screensList.update() onVisibleChanged: if(visible) screensList.update()
delegate: ScreenPreviewLayout { delegate: ScreenPreviewLayout {
horizontalMargin: (28 - 20 ) * DefaultStyle.dp // 20 coming from CallsWindow panel horizontalMargin: (28 - 20 ) * mainWindow.dp // 20 coming from CallsWindow panel
width: screensLayout.width width: screensLayout.width
height: 219 * DefaultStyle.dp height: 219 * mainWindow.dp
screenIndex: index screenIndex: index
onClicked: {//screensLayout.selectedIndex = index onClicked: {//screensLayout.selectedIndex = index
screensLayout.currentIndex = index screensLayout.currentIndex = index
@ -130,14 +130,14 @@ ColumnLayout {
currentIndex: -1 currentIndex: -1
onVisibleChanged: if(visible) windowsList.update() onVisibleChanged: if(visible) windowsList.update()
cellWidth: width / 2 cellWidth: width / 2
cellHeight: (112 + 15) * DefaultStyle.dp cellHeight: (112 + 15) * mainWindow.dp
clip: true clip: true
delegate: Item{ delegate: Item{
width: windowsLayout.cellWidth width: windowsLayout.cellWidth
height: windowsLayout.cellHeight height: windowsLayout.cellHeight
ScreenPreviewLayout { ScreenPreviewLayout {
anchors.fill: parent anchors.fill: parent
anchors.margins: 7 * DefaultStyle.dp anchors.margins: 7 * mainWindow.dp
displayScreen: false displayScreen: false
screenIndex: index screenIndex: index
onClicked: { onClicked: {

32
Linphone/view/Control/Input/Calendar.qml
View file

@ -39,15 +39,15 @@ ListView {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
property int currentMonth: model.month property int currentMonth: model.month
spacing: 18 * DefaultStyle.dp spacing: 18 * mainWindow.dp
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 38 * DefaultStyle.dp spacing: 38 * mainWindow.dp
Text { Text {
text: UtilsCpp.toDateMonthAndYearString(new Date(model.year, model.month, 15))// 15 because of timezones that can change the date for localeString text: UtilsCpp.toDateMonthAndYearString(new Date(model.year, model.month, 15))// 15 because of timezones that can change the date for localeString
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -56,8 +56,8 @@ ListView {
} }
Button { Button {
id: previousButton id: previousButton
Layout.preferredWidth: 20 * DefaultStyle.dp Layout.preferredWidth: 20 * mainWindow.dp
Layout.preferredHeight: 20 * DefaultStyle.dp Layout.preferredHeight: 20 * mainWindow.dp
icon.width: width icon.width: width
icon.height: height icon.height: height
background: Item{} background: Item{}
@ -66,8 +66,8 @@ ListView {
} }
Button { Button {
id: nextButton id: nextButton
Layout.preferredWidth: 20 * DefaultStyle.dp Layout.preferredWidth: 20 * mainWindow.dp
Layout.preferredHeight: 20 * DefaultStyle.dp Layout.preferredHeight: 20 * mainWindow.dp
icon.width: width icon.width: width
icon.height: height icon.height: height
background: Item{} background: Item{}
@ -77,7 +77,7 @@ ListView {
} }
ColumnLayout { ColumnLayout {
spacing: 12 * DefaultStyle.dp spacing: 12 * mainWindow.dp
Control.DayOfWeekRow { Control.DayOfWeekRow {
locale: monthGrid.locale locale: monthGrid.locale
Layout.column: 1 Layout.column: 1
@ -88,8 +88,8 @@ ListView {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
@ -145,9 +145,9 @@ ListView {
Rectangle { Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
width: 30 * DefaultStyle.dp width: 30 * mainWindow.dp
height: 30 * DefaultStyle.dp height: 30 * mainWindow.dp
radius: 50 * DefaultStyle.dp radius: 50 * mainWindow.dp
color: isSelectedDay ? DefaultStyle.main1_500_main : "transparent" color: isSelectedDay ? DefaultStyle.main1_500_main : "transparent"
border.width: focusDay.activeFocus || hoveringArea.containsMouse ? 1 : 0 border.width: focusDay.activeFocus || hoveringArea.containsMouse ? 1 : 0
@ -163,8 +163,8 @@ ListView {
? DefaultStyle.main2_700 ? DefaultStyle.main2_700
: DefaultStyle.main2_400 : DefaultStyle.main2_400
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }

10
Linphone/view/Control/Input/DigitInput.qml
View file

@ -4,7 +4,7 @@ import Linphone
Control.TextField { Control.TextField {
id: mainItem id: mainItem
property int inputSize: 100 * DefaultStyle.dp property int inputSize: 100 * mainWindow.dp
color: activeFocus ? DefaultStyle.main1_500_main : DefaultStyle.main2_500main color: activeFocus ? DefaultStyle.main1_500_main : DefaultStyle.main2_500main
validator: IntValidator{bottom: 0; top: 9} validator: IntValidator{bottom: 0; top: 9}
@ -24,7 +24,7 @@ Control.TextField {
// horizontalAlignment: Control.TextField.AlignHCenter // horizontalAlignment: Control.TextField.AlignHCenter
font.family: DefaultStyle.defaultFont font.family: DefaultStyle.defaultFont
font.pixelSize: inputSize / 2 font.pixelSize: inputSize / 2
font.weight: 300 * DefaultStyle.dp font.weight: 300 * mainWindow.dp
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
@ -32,7 +32,7 @@ Control.TextField {
// height: mainItem.inputSize // height: mainItem.inputSize
Rectangle { Rectangle {
id: background id: background
border.width: Math.max(DefaultStyle.dp, 1) border.width: Math.max(mainWindow.dp, 1)
border.color: mainItem.activeFocus ? DefaultStyle.main1_500_main : DefaultStyle.main2_500main border.color: mainItem.activeFocus ? DefaultStyle.main1_500_main : DefaultStyle.main2_500main
radius: mainItem.inputSize * 0.15 radius: mainItem.inputSize * 0.15
width: mainItem.inputSize * 0.9 width: mainItem.inputSize * 0.9
@ -42,11 +42,11 @@ Control.TextField {
id: indicator id: indicator
visible: mainItem.activeFocus visible: mainItem.activeFocus
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
height : Math.max(0.5, 1 * DefaultStyle.dp) height : Math.max(0.5, 1 * mainWindow.dp)
width: mainItem.inputSize * 0.67 width: mainItem.inputSize * 0.67
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: (mainItem.inputSize / 8) * DefaultStyle.dp anchors.bottomMargin: (mainItem.inputSize / 8) * mainWindow.dp
} }
} }
} }

46
Linphone/view/Control/Input/NumericPad.qml
View file

@ -89,8 +89,8 @@ FocusScope{
id: numPadGrid id: numPadGrid
anchors.fill: parent anchors.fill: parent
columns: 3 columns: 3
columnSpacing: 40 * DefaultStyle.dp columnSpacing: 40 * mainWindow.dp
rowSpacing: 10 * DefaultStyle.dp rowSpacing: 10 * mainWindow.dp
function getButtonAt(index){ function getButtonAt(index){
index = (index+15) % 15 index = (index+15) % 15
if(index >= 0){ if(index >= 0){
@ -112,8 +112,8 @@ FocusScope{
id: numPadButton id: numPadButton
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
required property int index required property int index
implicitWidth: 60 * DefaultStyle.dp implicitWidth: 60 * mainWindow.dp
implicitHeight: 60 * DefaultStyle.dp implicitHeight: 60 * mainWindow.dp
onClicked: { onClicked: {
mainItem.buttonPressed(innerText.text) mainItem.buttonPressed(innerText.text)
} }
@ -124,7 +124,7 @@ FocusScope{
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: numPadButton.down || numPadButton.shadowEnabled? DefaultStyle.numericPadPressedButtonColor : DefaultStyle.grey_0 color: numPadButton.down || numPadButton.shadowEnabled? DefaultStyle.numericPadPressedButtonColor : DefaultStyle.grey_0
radius: 71 * DefaultStyle.dp radius: 71 * mainWindow.dp
} }
contentItem: Text { contentItem: Text {
id: innerText id: innerText
@ -133,8 +133,8 @@ FocusScope{
anchors.centerIn: parent anchors.centerIn: parent
text: index + 1 text: index + 1
font { font {
pixelSize: 32 * DefaultStyle.dp pixelSize: 32 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -149,8 +149,8 @@ FocusScope{
Button { Button {
id: digitButton id: digitButton
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
implicitWidth: 60 * DefaultStyle.dp implicitWidth: 60 * mainWindow.dp
implicitHeight: 60 * DefaultStyle.dp implicitHeight: 60 * mainWindow.dp
onClicked: mainItem.buttonPressed(pressText.text) onClicked: mainItem.buttonPressed(pressText.text)
onPressAndHold: mainItem.buttonPressed(longPressText.text) onPressAndHold: mainItem.buttonPressed(longPressText.text)
@ -163,7 +163,7 @@ FocusScope{
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: digitButton.down || digitButton.shadowEnabled? DefaultStyle.numericPadPressedButtonColor : DefaultStyle.grey_0 color: digitButton.down || digitButton.shadowEnabled? DefaultStyle.numericPadPressedButtonColor : DefaultStyle.grey_0
radius: 71 * DefaultStyle.dp radius: 71 * mainWindow.dp
} }
contentItem: Item { contentItem: Item {
anchors.fill: parent anchors.fill: parent
@ -175,7 +175,7 @@ FocusScope{
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Component.onCompleted: {if (modelData.longPressText === undefined) anchors.centerIn= parent} Component.onCompleted: {if (modelData.longPressText === undefined) anchors.centerIn= parent}
text: modelData.pressText text: modelData.pressText
font.pixelSize: 32 * DefaultStyle.dp font.pixelSize: 32 * mainWindow.dp
} }
Text { Text {
id: longPressText id: longPressText
@ -186,7 +186,7 @@ FocusScope{
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
visible: modelData.longPressText ? modelData.longPressText.length > 0 : false visible: modelData.longPressText ? modelData.longPressText.length > 0 : false
text: modelData.longPressText ? modelData.longPressText : "" text: modelData.longPressText ? modelData.longPressText : ""
font.pixelSize: 22 * DefaultStyle.dp font.pixelSize: 22 * mainWindow.dp
} }
} }
} }
@ -198,12 +198,12 @@ FocusScope{
Button { Button {
id: launchCallButton id: launchCallButton
visible: !mainItem.lastRowVisible visible: !mainItem.lastRowVisible
implicitWidth: 75 * DefaultStyle.dp implicitWidth: 75 * mainWindow.dp
implicitHeight: 55 * DefaultStyle.dp implicitHeight: 55 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
icon.source: AppIcons.phone icon.source: AppIcons.phone
icon.width: 32 * DefaultStyle.dp icon.width: 32 * mainWindow.dp
icon.height: 32 * DefaultStyle.dp icon.height: 32 * mainWindow.dp
contentImageColor: DefaultStyle.grey_0 contentImageColor: DefaultStyle.grey_0
onClicked: mainItem.launchCall() onClicked: mainItem.launchCall()
@ -216,20 +216,20 @@ FocusScope{
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.success_500main color: DefaultStyle.success_500main
radius: 71 * DefaultStyle.dp radius: 71 * mainWindow.dp
} }
} }
Button { Button {
id: eraseButton id: eraseButton
visible: !mainItem.lastRowVisible visible: !mainItem.lastRowVisible
leftPadding: 5 * DefaultStyle.dp leftPadding: 5 * mainWindow.dp
rightPadding: 5 * DefaultStyle.dp rightPadding: 5 * mainWindow.dp
topPadding: 5 * DefaultStyle.dp topPadding: 5 * mainWindow.dp
bottomPadding: 5 * DefaultStyle.dp bottomPadding: 5 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
icon.source: AppIcons.backspaceFill icon.source: AppIcons.backspaceFill
icon.width: 38 * DefaultStyle.dp icon.width: 38 * mainWindow.dp
icon.height: 38 * DefaultStyle.dp icon.height: 38 * mainWindow.dp
onClicked: mainItem.wipe() onClicked: mainItem.wipe()

18
Linphone/view/Control/Input/PhoneNumberInput.qml
View file

@ -23,8 +23,8 @@ ColumnLayout {
text: mainItem.label + (mainItem.mandatory ? "*" : "") text: mainItem.label + (mainItem.mandatory ? "*" : "")
color: (combobox.hasActiveFocus || textField.hasActiveFocus) ? DefaultStyle.main1_500_main : DefaultStyle.main2_600 color: (combobox.hasActiveFocus || textField.hasActiveFocus) ? DefaultStyle.main1_500_main : DefaultStyle.main2_600
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
@ -34,8 +34,8 @@ ColumnLayout {
Rectangle { Rectangle {
id: contentBackground id: contentBackground
width: mainItem.textInputWidth width: mainItem.textInputWidth
height: 49 * DefaultStyle.dp height: 49 * mainWindow.dp
radius: 63 * DefaultStyle.dp radius: 63 * mainWindow.dp
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
border.color: mainItem.errorMessage.length > 0 border.color: mainItem.errorMessage.length > 0
? DefaultStyle.danger_500main ? DefaultStyle.danger_500main
@ -46,14 +46,14 @@ ColumnLayout {
anchors.fill: parent anchors.fill: parent
CountryIndicatorCombobox { CountryIndicatorCombobox {
id: combobox id: combobox
implicitWidth: 110 * DefaultStyle.dp implicitWidth: 110 * mainWindow.dp
defaultCallingCode: mainItem.defaultCallingCode defaultCallingCode: mainItem.defaultCallingCode
} }
Rectangle { Rectangle {
Layout.preferredWidth: 1 * DefaultStyle.dp Layout.preferredWidth: 1 * mainWindow.dp
Layout.fillHeight: true Layout.fillHeight: true
Layout.topMargin: 10 * DefaultStyle.dp Layout.topMargin: 10 * mainWindow.dp
Layout.bottomMargin: 10 * DefaultStyle.dp Layout.bottomMargin: 10 * mainWindow.dp
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
} }
TextField { TextField {
@ -76,7 +76,7 @@ ColumnLayout {
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.Wrap wrapMode: Text.Wrap
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
family: DefaultStyle.defaultFont family: DefaultStyle.defaultFont
bold: true bold: true
} }

40
Linphone/view/Control/Input/SearchBar.qml
View file

@ -8,7 +8,7 @@ FocusScope {
id: mainItem id: mainItem
property string placeholderText: "" property string placeholderText: ""
property color placeholderTextColor: DefaultStyle.main2_400 property color placeholderTextColor: DefaultStyle.main2_400
property int textInputWidth: 350 * DefaultStyle.dp property int textInputWidth: 350 * mainWindow.dp
property color borderColor: "transparent" property color borderColor: "transparent"
property color focusedBorderColor: DefaultStyle.main2_500main property color focusedBorderColor: DefaultStyle.main2_500main
property string text: textField.text property string text: textField.text
@ -39,12 +39,12 @@ FocusScope {
implicitWidth: mainItem.textInputWidth implicitWidth: mainItem.textInputWidth
implicitHeight: 50 * DefaultStyle.dp implicitHeight: 50 * mainWindow.dp
Rectangle{ Rectangle{
id: backgroundItem id: backgroundItem
anchors.fill: parent anchors.fill: parent
radius: 28 * DefaultStyle.dp radius: 28 * mainWindow.dp
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
border.color: textField.activeFocus ? mainItem.focusedBorderColor : mainItem.borderColor border.color: textField.activeFocus ? mainItem.focusedBorderColor : mainItem.borderColor
} }
@ -53,15 +53,15 @@ FocusScope {
visible: mainItem.magnifierVisible visible: mainItem.magnifierVisible
anchors.left: parent.left anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 10 * DefaultStyle.dp anchors.leftMargin: 10 * mainWindow.dp
source: AppIcons.magnifier source: AppIcons.magnifier
width: 20 * DefaultStyle.dp width: 20 * mainWindow.dp
height: 20 * DefaultStyle.dp height: 20 * mainWindow.dp
} }
Control.TextField { Control.TextField {
id: textField id: textField
anchors.left: magnifier.visible ? magnifier.right : parent.left anchors.left: magnifier.visible ? magnifier.right : parent.left
anchors.leftMargin: magnifier.visible ? 0 : 10 * DefaultStyle.dp anchors.leftMargin: magnifier.visible ? 0 : 10 * mainWindow.dp
anchors.right: clearTextButton.left anchors.right: clearTextButton.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
focus: true focus: true
@ -70,8 +70,8 @@ FocusScope {
width: mainItem.width - dialerButton.width width: mainItem.width - dialerButton.width
echoMode: (mainItem.hidden && !dialerButton.checked) ? TextInput.Password : TextInput.Normal echoMode: (mainItem.hidden && !dialerButton.checked) ? TextInput.Password : TextInput.Normal
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
family: DefaultStyle.defaultFont family: DefaultStyle.defaultFont
} }
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
@ -83,7 +83,7 @@ FocusScope {
cursorDelegate: Rectangle { cursorDelegate: Rectangle {
visible: textField.cursorVisible visible: textField.cursorVisible
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
width: 1 * DefaultStyle.dp width: 1 * mainWindow.dp
} }
} }
Button { Button {
@ -95,13 +95,13 @@ FocusScope {
color: "transparent" color: "transparent"
} }
icon.source: dialerButton.checked ? AppIcons.dialerSelected : AppIcons.dialer icon.source: dialerButton.checked ? AppIcons.dialerSelected : AppIcons.dialer
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 15 * DefaultStyle.dp anchors.rightMargin: 15 * mainWindow.dp
} }
Button { Button {
id: clearTextButton id: clearTextButton
@ -109,15 +109,15 @@ FocusScope {
background: Rectangle { background: Rectangle {
color: "transparent" color: "transparent"
} }
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 15 * DefaultStyle.dp anchors.rightMargin: 15 * mainWindow.dp
onClicked: { onClicked: {
textField.clear() textField.clear()
} }

8
Linphone/view/Control/Input/TextArea.qml
View file

@ -7,14 +7,14 @@ TextEdit {
id: mainItem id: mainItem
property string placeholderText property string placeholderText
property int placeholderPixelSize: 14 * DefaultStyle.dp property int placeholderPixelSize: 14 * mainWindow.dp
property int placeholderWeight: 400 * DefaultStyle.dp property int placeholderWeight: 400 * mainWindow.dp
property color placeholderTextColor: color property color placeholderTextColor: color
property alias background: background.data property alias background: background.data
property bool hoverEnabled: false property bool hoverEnabled: false
property bool hovered: mouseArea.hoverEnabled && mouseArea.containsMouse property bool hovered: mouseArea.hoverEnabled && mouseArea.containsMouse
topPadding: 5 * DefaultStyle.dp topPadding: 5 * mainWindow.dp
bottomPadding: 5 * DefaultStyle.dp bottomPadding: 5 * mainWindow.dp
activeFocusOnTab: true activeFocusOnTab: true
MouseArea { MouseArea {

26
Linphone/view/Control/Input/TextField.qml
View file

@ -6,18 +6,18 @@ import Linphone
Control.TextField { Control.TextField {
id: mainItem id: mainItem
property var customWidth property var customWidth
width: (customWidth ? customWidth - 1 : 360) * DefaultStyle.dp width: (customWidth ? customWidth - 1 : 360) * mainWindow.dp
height: 49 * DefaultStyle.dp height: 49 * mainWindow.dp
leftPadding: 15 * DefaultStyle.dp leftPadding: 15 * mainWindow.dp
rightPadding: eyeButton.visible ? 5 * DefaultStyle.dp + eyeButton.width + eyeButton.rightMargin : 15 * DefaultStyle.dp rightPadding: eyeButton.visible ? 5 * mainWindow.dp + eyeButton.width + eyeButton.rightMargin : 15 * mainWindow.dp
echoMode: (hidden && !eyeButton.checked) ? TextInput.Password : TextInput.Normal echoMode: (hidden && !eyeButton.checked) ? TextInput.Password : TextInput.Normal
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
color: isError ? DefaultStyle.danger_500main : DefaultStyle.main2_600 color: isError ? DefaultStyle.danger_500main : DefaultStyle.main2_600
placeholderTextColor: DefaultStyle.placeholders placeholderTextColor: DefaultStyle.placeholders
font { font {
family: DefaultStyle.defaultFont family: DefaultStyle.defaultFont
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
selectByMouse: true selectByMouse: true
activeFocusOnTab: true activeFocusOnTab: true
@ -31,8 +31,8 @@ Control.TextField {
property color disabledBackgroundColor: DefaultStyle.grey_200 property color disabledBackgroundColor: DefaultStyle.grey_200
property color backgroundBorderColor: DefaultStyle.grey_200 property color backgroundBorderColor: DefaultStyle.grey_200
property string initialText property string initialText
property int pixelSize: 14 * DefaultStyle.dp property int pixelSize: 14 * mainWindow.dp
property int weight: 400 * DefaultStyle.dp property int weight: 400 * mainWindow.dp
// fill propertyName and propertyOwner to check text validity // fill propertyName and propertyOwner to check text validity
property string propertyName property string propertyName
@ -62,7 +62,7 @@ Control.TextField {
id: inputBackground id: inputBackground
visible: mainItem.backgroundVisible visible: mainItem.backgroundVisible
anchors.fill: parent anchors.fill: parent
radius: 79 * DefaultStyle.dp radius: 79 * mainWindow.dp
color: mainItem.enabled ? mainItem.backgroundColor : mainItem.disabledBackgroundColor color: mainItem.enabled ? mainItem.backgroundColor : mainItem.disabledBackgroundColor
border.color: mainItem.isError border.color: mainItem.isError
? DefaultStyle.danger_500main ? DefaultStyle.danger_500main
@ -74,7 +74,7 @@ Control.TextField {
cursorDelegate: Rectangle { cursorDelegate: Rectangle {
id: cursor id: cursor
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
width: 1 * DefaultStyle.dp width: 1 * mainWindow.dp
anchors.verticalCenter: mainItem.verticalCenter anchors.verticalCenter: mainItem.verticalCenter
SequentialAnimation { SequentialAnimation {
@ -122,7 +122,7 @@ Control.TextField {
Button { Button {
id: eyeButton id: eyeButton
KeyNavigation.left: mainItem KeyNavigation.left: mainItem
property int rightMargin: 15 * DefaultStyle.dp property int rightMargin: 15 * mainWindow.dp
z: 1 z: 1
visible: mainItem.hidden visible: mainItem.hidden
checkable: true checkable: true
@ -130,8 +130,8 @@ Control.TextField {
color: "transparent" color: "transparent"
} }
icon.source: eyeButton.checked ? AppIcons.eyeShow : AppIcons.eyeHide icon.source: eyeButton.checked ? AppIcons.eyeShow : AppIcons.eyeHide
width: 20 * DefaultStyle.dp width: 20 * mainWindow.dp
height: 20 * DefaultStyle.dp height: 20 * mainWindow.dp
icon.width: width icon.width: width
icon.height: height icon.height: height
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

16
Linphone/view/Control/Input/TimeComboBox.qml
View file

@ -21,10 +21,10 @@ ComboBox {
property alias contentText: input property alias contentText: input
property var minTime property var minTime
property var maxTime property var maxTime
popup.width: 73 * DefaultStyle.dp popup.width: 73 * mainWindow.dp
listView.model: 48 listView.model: 48
listView.height: Math.min(204 * DefaultStyle.dp, listView.contentHeight) listView.height: Math.min(204 * mainWindow.dp, listView.contentHeight)
popup.height: Math.min(204 * DefaultStyle.dp, listView.contentHeight) popup.height: Math.min(204 * mainWindow.dp, listView.contentHeight)
editable: true editable: true
popup.closePolicy: Popup.PressOutsideParent | Popup.CloseOnPressOutside popup.closePolicy: Popup.PressOutsideParent | Popup.CloseOnPressOutside
onCurrentTextChanged: input.text = currentText onCurrentTextChanged: input.text = currentText
@ -52,8 +52,8 @@ ComboBox {
} }
} }
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
text: mainItem.selectedTimeString text: mainItem.selectedTimeString
Keys.onPressed: (event) => { Keys.onPressed: (event) => {
@ -74,12 +74,12 @@ ComboBox {
text: Qt.formatDateTime(currentDateTime, "hh:mm") text: Qt.formatDateTime(currentDateTime, "hh:mm")
width: mainItem.width width: mainItem.width
visible: mainItem.minTime == undefined || UtilsCpp.timeOffset(mainItem.minTime, currentDateTime) > 0 visible: mainItem.minTime == undefined || UtilsCpp.timeOffset(mainItem.minTime, currentDateTime) > 0
height: visible ? 25 * DefaultStyle.dp : 0 height: visible ? 25 * mainWindow.dp : 0
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
horizontalAlignment: TextInput.AlignHCenter horizontalAlignment: TextInput.AlignHCenter
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent

10
Linphone/view/Control/Popup/DesktopPopup.qml
View file

@ -5,10 +5,12 @@ import QtQuick.Controls.Basic
import QtQuick.Layouts import QtQuick.Layouts
import Qt.labs.platform import Qt.labs.platform
import UtilsCpp
// ============================================================================= // =============================================================================
Window { Window {
id: mainItem id: mainWindow
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -16,8 +18,8 @@ import Qt.labs.platform
property bool requestActivate: false property bool requestActivate: false
//property int flags: Qt.SplashScreen //property int flags: Qt.SplashScreen
property real dp: 1/UtilsCpp.getPixelDensity(x,y)
onDpChanged: console.log("[Window] new DP: "+dp)
default property alias _content: content.data default property alias _content: content.data
property bool _isOpen: false property bool _isOpen: false
@ -53,7 +55,7 @@ import Qt.labs.platform
id: content id: content
anchors.fill:parent anchors.fill:parent
property var $parent: mainItem property var $parent: mainWindow
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

20
Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml
View file

@ -16,24 +16,24 @@ Dialog {
onRejected: close() onRejected: close()
modal: true modal: true
closePolicy: Popup.NoAutoClose closePolicy: Popup.NoAutoClose
topPadding: 20 * DefaultStyle.dp topPadding: 20 * mainWindow.dp
bottomPadding: 20 * DefaultStyle.dp bottomPadding: 20 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
content: ColumnLayout { content: ColumnLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
id: contentLayout id: contentLayout
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 250 * DefaultStyle.dp Layout.preferredWidth: 250 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
wrapMode: Text.Wrap wrapMode: Text.Wrap
text: qsTr("Impossible de vous authentifier. Merci de vérifier votre mot de passe.") text: qsTr("Impossible de vous authentifier. Merci de vérifier votre mot de passe.")
font.pixelSize: 16 * DefaultStyle.dp font.pixelSize: 16 * mainWindow.dp
} }
ColumnLayout { ColumnLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
FormItemLayout { FormItemLayout {
Layout.fillWidth: true Layout.fillWidth: true
label: qsTr("Identité") label: qsTr("Identité")
@ -79,7 +79,7 @@ Dialog {
buttons: [ buttons: [
Button { Button {
id: cancelButton id: cancelButton
Layout.topMargin: 10 * DefaultStyle.dp Layout.topMargin: 10 * mainWindow.dp
text: qsTr("Annuler") text: qsTr("Annuler")
inversedColors: true inversedColors: true
onClicked: mainItem.rejected() onClicked: mainItem.rejected()
@ -88,7 +88,7 @@ Dialog {
}, },
Button { Button {
id: connectButton id: connectButton
Layout.topMargin: 10 * DefaultStyle.dp Layout.topMargin: 10 * mainWindow.dp
text: qsTr("Se connecter") text: qsTr("Se connecter")
KeyNavigation.up: passwordEdit KeyNavigation.up: passwordEdit
KeyNavigation.right: cancelButton KeyNavigation.right: cancelButton

44
Linphone/view/Control/Popup/Dialog/Dialog.qml
View file

@ -9,12 +9,12 @@ Popup {
modal: true modal: true
anchors.centerIn: parent anchors.centerIn: parent
closePolicy: Control.Popup.NoAutoClose closePolicy: Control.Popup.NoAutoClose
rightPadding: 10 * DefaultStyle.dp rightPadding: 10 * mainWindow.dp
leftPadding: 10 * DefaultStyle.dp leftPadding: 10 * mainWindow.dp
topPadding: 10 * DefaultStyle.dp topPadding: 10 * mainWindow.dp
bottomPadding: 10 * DefaultStyle.dp bottomPadding: 10 * mainWindow.dp
underlineColor: DefaultStyle.main1_500_main underlineColor: DefaultStyle.main1_500_main
property int radius: 16 * DefaultStyle.dp property int radius: 16 * mainWindow.dp
property string title property string title
property string text property string text
property string details property string details
@ -43,7 +43,7 @@ Popup {
ColumnLayout { ColumnLayout {
id: child id: child
anchors.fill: parent anchors.fill: parent
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
Text{ Text{
id: titleText id: titleText
@ -51,8 +51,8 @@ Popup {
visible: text.length != 0 visible: text.length != 0
text: mainItem.title text: mainItem.title
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
wrapMode: Text.Wrap wrapMode: Text.Wrap
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
@ -71,8 +71,8 @@ Popup {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
text: mainItem.text text: mainItem.text
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
wrapMode: Text.Wrap wrapMode: Text.Wrap
horizontalAlignment: titleText.visible ? Text.AlignLeft : Text.AlignHCenter horizontalAlignment: titleText.visible ? Text.AlignLeft : Text.AlignHCenter
@ -81,12 +81,12 @@ Popup {
id: detailsText id: detailsText
visible: text.length != 0 visible: text.length != 0
Layout.fillWidth: true Layout.fillWidth: true
//Layout.preferredWidth: 278 * DefaultStyle.dp //Layout.preferredWidth: 278 * mainWindow.dp
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
text: mainItem.details text: mainItem.details
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
italic: true italic: true
} }
wrapMode: Text.Wrap wrapMode: Text.Wrap
@ -102,7 +102,7 @@ Popup {
RowLayout { RowLayout {
id: buttonsLayout id: buttonsLayout
Layout.alignment: Qt.AlignBottom | ( titleText.visible ? Qt.AlignRight : Qt.AlignHCenter) Layout.alignment: Qt.AlignBottom | ( titleText.visible ? Qt.AlignRight : Qt.AlignHCenter)
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
// Default buttons only visible if no other children // Default buttons only visible if no other children
// have been set // have been set
@ -110,10 +110,10 @@ Popup {
id:firstButtonId id:firstButtonId
visible: mainItem.buttons.length === 2 visible: mainItem.buttons.length === 2
text: qsTr("Oui") text: qsTr("Oui")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
focus: !firstButtonAccept focus: !firstButtonAccept
onClicked: { onClicked: {
if(firstButtonAccept) if(firstButtonAccept)
@ -129,10 +129,10 @@ Popup {
id: secondButtonId id: secondButtonId
visible: mainItem.buttons.length === 2 visible: mainItem.buttons.length === 2
text: qsTr("Non") text: qsTr("Non")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
focus: !secondButtonAccept focus: !secondButtonAccept
onClicked: { onClicked: {
if(secondButtonAccept) if(secondButtonAccept)

120
Linphone/view/Control/Popup/Dialog/ZrtpAuthenticationDialog.qml
View file

@ -8,11 +8,11 @@ import UtilsCpp 1.0
// ============================================================================= // =============================================================================
Dialog { Dialog {
id: mainItem id: mainItem
width: 436 * DefaultStyle.dp width: 436 * mainWindow.dp
rightPadding: 0 * DefaultStyle.dp rightPadding: 0 * mainWindow.dp
leftPadding: 0 * DefaultStyle.dp leftPadding: 0 * mainWindow.dp
topPadding: 85 * DefaultStyle.dp + 24 * DefaultStyle.dp topPadding: 85 * mainWindow.dp + 24 * mainWindow.dp
bottomPadding: 24 * DefaultStyle.dp bottomPadding: 24 * mainWindow.dp
modal: true modal: true
closePolicy: Popup.NoAutoClose closePolicy: Popup.NoAutoClose
@ -38,10 +38,10 @@ Dialog {
radius: mainItem.radius radius: mainItem.radius
Layout.ColumnLayout { Layout.ColumnLayout {
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 18 * DefaultStyle.dp anchors.topMargin: 18 * mainWindow.dp
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
Item { Item {
// spacing: 14 * DefaultStyle.dp // spacing: 14 * mainWindow.dp
Layout.Layout.preferredWidth: childrenRect.width Layout.Layout.preferredWidth: childrenRect.width
Layout.Layout.preferredHeight: childrenRect.height Layout.Layout.preferredHeight: childrenRect.height
Layout.Layout.fillWidth: true Layout.Layout.fillWidth: true
@ -49,19 +49,19 @@ Dialog {
id: trustShield id: trustShield
anchors.centerIn: parent anchors.centerIn: parent
source: AppIcons.trustedWhite source: AppIcons.trustedWhite
sourceSize.width: 24 * DefaultStyle.dp sourceSize.width: 24 * mainWindow.dp
sourceSize.height: 24 * DefaultStyle.dp sourceSize.height: 24 * mainWindow.dp
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
} }
EffectImage { EffectImage {
anchors.left: trustShield.right anchors.left: trustShield.right
anchors.leftMargin: 14 * DefaultStyle.dp anchors.leftMargin: 14 * mainWindow.dp
visible: mainItem.securityError visible: mainItem.securityError
imageSource: AppIcons.shieldWarning imageSource: AppIcons.shieldWarning
colorizationColor: DefaultStyle.main2_700 colorizationColor: DefaultStyle.main2_700
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
} }
} }
Text { Text {
@ -69,8 +69,8 @@ Dialog {
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
Item{Layout.Layout.fillHeight: true} Item{Layout.Layout.fillHeight: true}
@ -79,15 +79,15 @@ Dialog {
visible: !mainItem.securityError visible: !mainItem.securityError
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 10 * DefaultStyle.dp anchors.topMargin: 10 * mainWindow.dp
anchors.rightMargin: 17 * DefaultStyle.dp anchors.rightMargin: 17 * mainWindow.dp
background: Item{} background: Item{}
contentItem: Text { contentItem: Text {
text: qsTr("Passer") text: qsTr("Passer")
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 600 * DefaultStyle.dp weight: 600 * mainWindow.dp
underline: true underline: true
} }
} }
@ -100,9 +100,9 @@ Dialog {
Rectangle { Rectangle {
z: 1 z: 1
width: mainItem.width width: mainItem.width
height: parent.height - 85 * DefaultStyle.dp height: parent.height - 85 * mainWindow.dp
x: parent.x x: parent.x
y: parent.y + 85 * DefaultStyle.dp y: parent.y + 85 * mainWindow.dp
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: mainItem.radius radius: mainItem.radius
} }
@ -119,21 +119,21 @@ Dialog {
content: [ content: [
Layout.ColumnLayout { Layout.ColumnLayout {
visible: !mainItem.securityError visible: !mainItem.securityError
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
Layout.Layout.fillWidth: true Layout.Layout.fillWidth: true
Layout.ColumnLayout { Layout.ColumnLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
Text { Text {
Layout.Layout.preferredWidth: 343 * DefaultStyle.dp Layout.Layout.preferredWidth: 343 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: !mainItem.isTokenVerified && mainItem.isCaseMismatch text: !mainItem.isTokenVerified && mainItem.isCaseMismatch
? qsTr("Pour garantir le chiffrement, nous avons besoin de réauthentifier l’appareil de votre correspondant. Echangez vos codes :") ? qsTr("Pour garantir le chiffrement, nous avons besoin de réauthentifier l’appareil de votre correspondant. Echangez vos codes :")
: qsTr("Pour garantir le chiffrement, nous avons besoin d’authentifier l’appareil de votre correspondant. Veuillez échanger vos codes : ") : qsTr("Pour garantir le chiffrement, nous avons besoin d’authentifier l’appareil de votre correspondant. Veuillez échanger vos codes : ")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
} }
Layout.ColumnLayout { Layout.ColumnLayout {
spacing: 0 spacing: 0
@ -142,15 +142,15 @@ Dialog {
text: qsTr("Votre code :") text: qsTr("Votre code :")
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
} }
Text { Text {
text: mainItem.call && mainItem.call.core.localToken || "" text: mainItem.call && mainItem.call.core.localToken || ""
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
font { font {
pixelSize: 18 * DefaultStyle.dp pixelSize: 18 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
} }
@ -158,17 +158,17 @@ Dialog {
Rectangle { Rectangle {
color: "transparent" color: "transparent"
border.color: DefaultStyle.main2_200 border.color: DefaultStyle.main2_200
border.width: Math.max(0.5, 1 * DefaultStyle.dp) border.width: Math.max(0.5, 1 * mainWindow.dp)
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
Layout.Layout.preferredWidth: 292 * DefaultStyle.dp Layout.Layout.preferredWidth: 292 * mainWindow.dp
Layout.Layout.preferredHeight: 233 * DefaultStyle.dp Layout.Layout.preferredHeight: 233 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
Layout.ColumnLayout { Layout.ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.topMargin: 10 * DefaultStyle.dp anchors.topMargin: 10 * mainWindow.dp
Text { Text {
text: qsTr("Code correspondant :") text: qsTr("Code correspondant :")
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
} }
Layout.GridLayout { Layout.GridLayout {
@ -176,28 +176,28 @@ Dialog {
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
rows: 2 rows: 2
columns: 2 columns: 2
rowSpacing: 32 * DefaultStyle.dp rowSpacing: 32 * mainWindow.dp
columnSpacing: 32 * DefaultStyle.dp columnSpacing: 32 * mainWindow.dp
property var correctIndex property var correctIndex
property var modelList property var modelList
Repeater { Repeater {
model: mainItem.call && mainItem.call.core.remoteTokens || "" model: mainItem.call && mainItem.call.core.remoteTokens || ""
Item { Item {
width: 70 * DefaultStyle.dp width: 70 * mainWindow.dp
height: 70 * DefaultStyle.dp height: 70 * mainWindow.dp
Rectangle { Rectangle {
id: code id: code
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: 71 * DefaultStyle.dp radius: 71 * mainWindow.dp
Text { Text {
anchors.fill: parent anchors.fill: parent
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: modelData text: modelData
font { font {
pixelSize: 32 * DefaultStyle.dp pixelSize: 32 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
MouseArea { MouseArea {
@ -228,24 +228,24 @@ Dialog {
spacing: 0 spacing: 0
Text { Text {
width: 303 * DefaultStyle.dp width: 303 * mainWindow.dp
// Layout.Layout.preferredWidth: 343 * DefaultStyle.dp // Layout.Layout.preferredWidth: 343 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
Layout.Layout.fillWidth: true Layout.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: qsTr("Le code fourni ne correspond pas.") text: qsTr("Le code fourni ne correspond pas.")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
} }
Text { Text {
width: 303 * DefaultStyle.dp width: 303 * mainWindow.dp
// Layout.Layout.preferredWidth: 343 * DefaultStyle.dp // Layout.Layout.preferredWidth: 343 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter Layout.Layout.alignment: Qt.AlignHCenter
Layout.Layout.fillWidth: true Layout.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: qsTr("La confidentialité de votre appel peut être compromise !") text: qsTr("La confidentialité de votre appel peut être compromise !")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
} }
} }
] ]
@ -257,27 +257,27 @@ Dialog {
text: qsTr("Aucune correspondance") text: qsTr("Aucune correspondance")
color: DefaultStyle.danger_500main color: DefaultStyle.danger_500main
inversedColors: true inversedColors: true
textSize: 15 * DefaultStyle.dp textSize: 15 * mainWindow.dp
visible: !mainItem.securityError visible: !mainItem.securityError
leftPadding: 16 * DefaultStyle.dp leftPadding: 16 * mainWindow.dp
rightPadding: 16 * DefaultStyle.dp rightPadding: 16 * mainWindow.dp
topPadding: 10 * DefaultStyle.dp topPadding: 10 * mainWindow.dp
bottomPadding: 10 * DefaultStyle.dp bottomPadding: 10 * mainWindow.dp
width: 247 * DefaultStyle.dp width: 247 * mainWindow.dp
onClicked: { onClicked: {
if(mainItem.call) mainItem.call.core.lCheckAuthenticationTokenSelected(" ") if(mainItem.call) mainItem.call.core.lCheckAuthenticationTokenSelected(" ")
} }
} }
Button { Button {
Layout.Layout.preferredWidth: 247 * DefaultStyle.dp Layout.Layout.preferredWidth: 247 * mainWindow.dp
visible: mainItem.securityError visible: mainItem.securityError
leftPadding: (247 * DefaultStyle.dp - contentItem.implicitWidth) /2 leftPadding: (247 * mainWindow.dp - contentItem.implicitWidth) /2
rightPadding: (247 * DefaultStyle.dp - contentItem.implicitWidth) /2 rightPadding: (247 * mainWindow.dp - contentItem.implicitWidth) /2
topPadding: 10 * DefaultStyle.dp topPadding: 10 * mainWindow.dp
bottomPadding: 10 * DefaultStyle.dp bottomPadding: 10 * mainWindow.dp
color: DefaultStyle.danger_500main color: DefaultStyle.danger_500main
onClicked: mainItem.call.core.lTerminate() onClicked: mainItem.call.core.lTerminate()
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
icon.source: AppIcons.endCall icon.source: AppIcons.endCall
contentImageColor: DefaultStyle.grey_0 contentImageColor: DefaultStyle.grey_0
text: qsTr("Raccrocher") text: qsTr("Raccrocher")

38
Linphone/view/Control/Popup/InformationPopup.qml
View file

@ -17,9 +17,9 @@ Popup {
closePolicy: Popup.NoAutoClose closePolicy: Popup.NoAutoClose
x : parent.x + parent.width - width x : parent.x + parent.width - width
// y : parent.y + parent.height - height // y : parent.y + parent.height - height
rightMargin: 20 * DefaultStyle.dp rightMargin: 20 * mainWindow.dp
bottomMargin: 20 * DefaultStyle.dp bottomMargin: 20 * mainWindow.dp
padding: 20 * DefaultStyle.dp padding: 20 * mainWindow.dp
underlineColor: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main underlineColor: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main
radius: 0 radius: 0
onHoveredChanged: { onHoveredChanged: {
@ -34,22 +34,22 @@ Popup {
} }
} }
contentItem: RowLayout { contentItem: RowLayout {
spacing: 24 * DefaultStyle.dp spacing: 24 * mainWindow.dp
EffectImage { EffectImage {
imageSource: mainItem.isSuccess ? AppIcons.smiley : AppIcons.smileySad imageSource: mainItem.isSuccess ? AppIcons.smiley : AppIcons.smileySad
colorizationColor: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main colorizationColor: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main
Layout.preferredWidth: 32 * DefaultStyle.dp Layout.preferredWidth: 32 * mainWindow.dp
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
width: 32 * DefaultStyle.dp width: 32 * mainWindow.dp
height: 32 * DefaultStyle.dp height: 32 * mainWindow.dp
} }
Rectangle { Rectangle {
Layout.preferredWidth: 1 * DefaultStyle.dp Layout.preferredWidth: 1 * mainWindow.dp
Layout.preferredHeight: parent.height Layout.preferredHeight: parent.height
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
ColumnLayout { ColumnLayout {
spacing: 2 * DefaultStyle.dp spacing: 2 * mainWindow.dp
RowLayout { RowLayout {
spacing: 0 spacing: 0
Text { Text {
@ -57,15 +57,15 @@ Popup {
text: mainItem.title text: mainItem.title
color: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main color: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
Button { Button {
Layout.preferredWidth: 20 * DefaultStyle.dp Layout.preferredWidth: 20 * mainWindow.dp
Layout.preferredHeight: 20 * DefaultStyle.dp Layout.preferredHeight: 20 * mainWindow.dp
icon.width: 20 * DefaultStyle.dp icon.width: 20 * mainWindow.dp
icon.height: 20 * DefaultStyle.dp icon.height: 20 * mainWindow.dp
Layout.alignment: Qt.AlignTop | Qt.AlignRight Layout.alignment: Qt.AlignTop | Qt.AlignRight
visible: mainItem.hovered || hovered visible: mainItem.hovered || hovered
background: Item{} background: Item{}
@ -76,13 +76,13 @@ Popup {
Text { Text {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true Layout.fillWidth: true
Layout.maximumWidth: 300 * DefaultStyle.dp Layout.maximumWidth: 300 * mainWindow.dp
text: mainItem.description text: mainItem.description
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }

12
Linphone/view/Control/Popup/Loading/LoadingPopup.qml
View file

@ -10,18 +10,18 @@ Popup {
modal: true modal: true
closePolicy: Control.Popup.NoAutoClose closePolicy: Control.Popup.NoAutoClose
anchors.centerIn: parent anchors.centerIn: parent
padding: 20 * DefaultStyle.dp padding: 20 * mainWindow.dp
underlineColor: DefaultStyle.main1_500_main underlineColor: DefaultStyle.main1_500_main
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
// onAboutToShow: width = contentText.implicitWidth // onAboutToShow: width = contentText.implicitWidth
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
// width: childrenRect.width // width: childrenRect.width
// height: childrenRect.height // height: childrenRect.height
BusyIndicator{ BusyIndicator{
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: 33 * DefaultStyle.dp Layout.preferredWidth: 33 * mainWindow.dp
Layout.preferredHeight: 33 * DefaultStyle.dp Layout.preferredHeight: 33 * mainWindow.dp
} }
Text { Text {
id: contentText id: contentText
@ -29,7 +29,7 @@ Popup {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
text: mainItem.text text: mainItem.text
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
} }
Button { Button {
visible: mainItem.cancelButtonVisible visible: mainItem.cancelButtonVisible

28
Linphone/view/Control/Popup/Notification/Notification.qml
View file

@ -5,24 +5,26 @@ import Linphone
// ============================================================================= // =============================================================================
DesktopPopup { DesktopPopup {
id: mainItem id: mainWindow
property var notificationData: ({ property var notificationData: ({
timelineModel : null timelineModel : null
}) })
property int overriddenHeight: 120 * DefaultStyle.dp //property int overriddenHeight: 120 * mainWindow.dp
property int overriddenWidth: 300 * DefaultStyle.dp //property int overriddenWidth: 300 * mainWindow.dp
property double radius: 0 property double radius: 0
default property alias _content: content.data default property alias _content: content.data
signal deleteNotification (var notification) signal deleteNotification (var notification)
width: mainItem.overriddenWidth //width: mainWindow.overriddenWidth
height: mainItem.overriddenHeight //height: mainWindow.overriddenHeight
height: 120 * mainWindow.dp
width: 300 * mainWindow.dp
// Use as an intermediate between signal/slot without propagate the notification var : last signal parameter will be the last notification instance // Use as an intermediate between signal/slot without propagate the notification var : last signal parameter will be the last notification instance
function deleteNotificationSlot(){ function deleteNotificationSlot(){
deleteNotification(mainItem) deleteNotification(mainWindow)
} }
function _close (cb) { function _close (cb) {
@ -35,10 +37,10 @@ DesktopPopup {
anchors.fill: parent anchors.fill: parent
visible: backgroundLoader.status != Loader.Ready visible: backgroundLoader.status != Loader.Ready
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: mainItem.radius radius: mainWindow.radius
border { border {
color: DefaultStyle.grey_400 color: DefaultStyle.grey_400
width: 1 * DefaultStyle.dp width: 1 * mainWindow.dp
} }
} }
@ -46,17 +48,19 @@ DesktopPopup {
id: backgroundLoader id: backgroundLoader
asynchronous: true asynchronous: true
sourceComponent: Item{ sourceComponent: Item{
width: mainItem.overriddenWidth //width: mainWindow.overriddenWidth
height: mainItem.overriddenHeight //height: mainWindow.overriddenHeight
width: mainWindow.width
height: mainWindow.height
Rectangle { Rectangle {
id: background id: background
anchors.fill: parent anchors.fill: parent
visible: backgroundLoader.status != Loader.Ready visible: backgroundLoader.status != Loader.Ready
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: mainItem.radius radius: mainWindow.radius
border { border {
color: DefaultStyle.grey_400 color: DefaultStyle.grey_400
width: 1 * DefaultStyle.dp width: 1 * mainWindow.dp
} }
} }
MultiEffect { MultiEffect {

74
Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
View file

@ -5,11 +5,12 @@ import UtilsCpp
// ============================================================================= // =============================================================================
Notification { Notification {
id: mainItem id: mainWindow
radius: 20 * DefaultStyle.dp radius: 20 * mainWindow.dp
overriddenWidth: content.implicitWidth//101 * DefaultStyle.dp //overriddenWidth: content.implicitWidth//101 * mainWindow.dp
overriddenHeight: content.implicitHeight//422 * DefaultStyle.dp //overriddenHeight: content.implicitHeight//422 * mainWindow.dp
width: content.implicitWidth
height: content.implicitHeight
readonly property var call: notificationData && notificationData.call readonly property var call: notificationData && notificationData.call
property var state: call.core.state property var state: call.core.state
property var status: call.core.status property var status: call.core.status
@ -24,28 +25,25 @@ Notification {
Popup { Popup {
id: content id: content
visible: mainItem.visible visible: mainWindow.visible
leftPadding: 19 * DefaultStyle.dp leftPadding: 19 * mainWindow.dp
rightPadding: 19 * DefaultStyle.dp rightPadding: 19 * mainWindow.dp
topPadding: 15 * DefaultStyle.dp topPadding: 15 * mainWindow.dp
bottomPadding: 15 * DefaultStyle.dp bottomPadding: 15 * mainWindow.dp
background: Item{} background: Item{}
contentItem: RowLayout { contentItem: RowLayout {
id: notifContent id: notifContent
spacing: 30 * mainWindow.dp
spacing: 30 * DefaultStyle.dp
height: childrenRect.height
width: childrenRect.width
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
spacing: 13 * DefaultStyle.dp spacing: 13 * mainWindow.dp
Layout.preferredHeight: childrenRect.height
Layout.preferredWidth: childrenRect.width
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
call: mainItem.call call: mainWindow.call
} }
ColumnLayout { ColumnLayout {
Text { Text {
@ -53,8 +51,8 @@ Notification {
text: remoteAddress ? remoteAddress.value : "" text: remoteAddress ? remoteAddress.value : ""
color: DefaultStyle.grey_600 color: DefaultStyle.grey_600
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -62,8 +60,8 @@ Notification {
EffectImage { EffectImage {
imageSource: AppIcons.arrowDownLeft imageSource: AppIcons.arrowDownLeft
colorizationColor: DefaultStyle.success_500main colorizationColor: DefaultStyle.success_500main
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
@ -71,8 +69,8 @@ Notification {
text: qsTr("Appel entrant")//.arg(localAddress ? qsTr(" pour %1").arg(localAddress.value) : "") //call.core.remoteAddress text: qsTr("Appel entrant")//.arg(localAddress ? qsTr(" pour %1").arg(localAddress.value) : "") //call.core.remoteAddress
color: DefaultStyle.grey_600 color: DefaultStyle.grey_600
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -82,38 +80,38 @@ Notification {
RowLayout { RowLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true Layout.fillWidth: true
spacing: 26 * DefaultStyle.dp spacing: 26 * mainWindow.dp
Button { Button {
color: DefaultStyle.success_500main color: DefaultStyle.success_500main
Layout.preferredWidth: 75 * DefaultStyle.dp Layout.preferredWidth: 75 * mainWindow.dp
Layout.preferredHeight: 55 * DefaultStyle.dp Layout.preferredHeight: 55 * mainWindow.dp
asynchronous: false asynchronous: false
contentItem: EffectImage { contentItem: EffectImage {
colorizationColor: DefaultStyle.grey_0 colorizationColor: DefaultStyle.grey_0
imageSource: AppIcons.phone imageSource: AppIcons.phone
imageWidth: 32 * DefaultStyle.dp imageWidth: 32 * mainWindow.dp
imageHeight: 32 * DefaultStyle.dp imageHeight: 32 * mainWindow.dp
} }
onClicked: { onClicked: {
console.debug("[NotificationReceivedCall] Accept click") console.debug("[NotificationReceivedCall] Accept click")
UtilsCpp.openCallsWindow(mainItem.call) UtilsCpp.openCallsWindow(mainWindow.call)
mainItem.call.core.lAccept(false) mainWindow.call.core.lAccept(false)
} }
} }
Button { Button {
color: DefaultStyle.danger_500main color: DefaultStyle.danger_500main
Layout.preferredWidth: 75 * DefaultStyle.dp Layout.preferredWidth: 75 * mainWindow.dp
Layout.preferredHeight: 55 * DefaultStyle.dp Layout.preferredHeight: 55 * mainWindow.dp
asynchronous: false asynchronous: false
contentItem: EffectImage { contentItem: EffectImage {
colorizationColor: DefaultStyle.grey_0 colorizationColor: DefaultStyle.grey_0
imageSource: AppIcons.endCall imageSource: AppIcons.endCall
imageWidth: 32 * DefaultStyle.dp imageWidth: 32 * mainWindow.dp
imageHeight: 32 * DefaultStyle.dp imageHeight: 32 * mainWindow.dp
} }
onClicked: { onClicked: {
console.debug("[NotificationReceivedCall] Decline click") console.debug("[NotificationReceivedCall] Decline click")
mainItem.call.core.lDecline() mainWindow.call.core.lDecline()
} }
} }
} }

20
Linphone/view/Control/Popup/Notification/TemporaryNotification.qml
View file

@ -4,13 +4,13 @@ import Linphone
Control.Control { Control.Control {
id: mainItem id: mainItem
// width: 269 * DefaultStyle.dp // width: 269 * mainWindow.dp
y: -height y: -height
z: 1 z: 1
topPadding: 8 * DefaultStyle.dp topPadding: 8 * mainWindow.dp
bottomPadding: 8 * DefaultStyle.dp bottomPadding: 8 * mainWindow.dp
leftPadding: 37 * DefaultStyle.dp leftPadding: 37 * mainWindow.dp
rightPadding: 37 * DefaultStyle.dp rightPadding: 37 * mainWindow.dp
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
clip: true clip: true
@ -41,15 +41,15 @@ Control.Control {
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
border.color: mainItem.contentColor border.color: mainItem.contentColor
border.width: 1 * DefaultStyle.dp border.width: 1 * mainWindow.dp
radius: 50 * DefaultStyle.dp radius: 50 * mainWindow.dp
} }
contentItem: RowLayout { contentItem: RowLayout {
Image { Image {
visible: mainItem.imageSource != undefined visible: mainItem.imageSource != undefined
source: mainItem.imageSource source: mainItem.imageSource
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -58,7 +58,7 @@ Control.Control {
text: mainItem.text text: mainItem.text
Layout.fillWidth: true Layout.fillWidth: true
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
} }
} }
} }

22
Linphone/view/Control/Popup/NumericPadPopup.qml
View file

@ -9,10 +9,10 @@ import LinphoneCallsCpp
Control.Popup { Control.Popup {
id: mainItem id: mainItem
closePolicy: Control.Popup.CloseOnEscape closePolicy: Control.Popup.CloseOnEscape
leftPadding: 72 * DefaultStyle.dp leftPadding: 72 * mainWindow.dp
rightPadding: 72 * DefaultStyle.dp rightPadding: 72 * mainWindow.dp
topPadding: 41 * DefaultStyle.dp topPadding: 41 * mainWindow.dp
bottomPadding: 18 * DefaultStyle.dp bottomPadding: 18 * mainWindow.dp
property bool closeButtonVisible: true property bool closeButtonVisible: true
property bool roundedBottom: false property bool roundedBottom: false
property bool lastRowVisible: true property bool lastRowVisible: true
@ -29,7 +29,7 @@ Control.Popup {
width: parent.width width: parent.width
height: parent.height height: parent.height
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
radius: 20 * DefaultStyle.dp radius: 20 * mainWindow.dp
} }
MultiEffect { MultiEffect {
id: effect id: effect
@ -57,17 +57,17 @@ Control.Popup {
visible: mainItem.closeButtonVisible visible: mainItem.closeButtonVisible
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 10 * DefaultStyle.dp anchors.topMargin: 10 * mainWindow.dp
anchors.rightMargin: 10 * DefaultStyle.dp anchors.rightMargin: 10 * mainWindow.dp
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
visible: false visible: false
} }
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
onClicked: mainItem.close() onClicked: mainItem.close()
} }
} }

4
Linphone/view/Control/Popup/Popup.qml
View file

@ -7,14 +7,14 @@ Control.Popup{
id: mainItem id: mainItem
padding: 0 padding: 0
property color underlineColor : DefaultStyle.main1_500_main property color underlineColor : DefaultStyle.main1_500_main
property int radius: 16 * DefaultStyle.dp property int radius: 16 * mainWindow.dp
property bool hovered: mouseArea.containsMouse property bool hovered: mouseArea.containsMouse
background: Item{ background: Item{
Rectangle { Rectangle {
visible: mainItem.underlineColor != undefined visible: mainItem.underlineColor != undefined
width: mainItem.width width: mainItem.width
height: mainItem.height + 2 * DefaultStyle.dp height: mainItem.height + 2 * mainWindow.dp
color: mainItem.underlineColor color: mainItem.underlineColor
radius: mainItem.radius radius: mainItem.radius
} }

2
Linphone/view/Control/Tool/Prototype/CallPrototype.qml
View file

@ -131,7 +131,7 @@ Window {
TextField { TextField {
id: usernameToCall id: usernameToCall
label: "Username to call" label: "Username to call"
Layout.preferredWidth: 250 * DefaultStyle.dp Layout.preferredWidth: 250 * mainWindow.dp
} }
Button{ Button{
text: 'Call' text: 'Call'

42
Linphone/view/Page/Form/Call/NewCallForm.qml
View file

@ -29,12 +29,12 @@ FocusScope {
} }
contentItem: ColumnLayout { contentItem: ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
SearchBar { SearchBar {
id: searchBar id: searchBar
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: 39 * DefaultStyle.dp Layout.rightMargin: 39 * mainWindow.dp
Layout.maximumWidth: mainItem.width Layout.maximumWidth: mainItem.width
focus: true focus: true
color: mainItem.searchBarColor color: mainItem.searchBarColor
@ -46,7 +46,7 @@ FocusScope {
Flickable { Flickable {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.topMargin: 25 * DefaultStyle.dp Layout.topMargin: 25 * mainWindow.dp
contentWidth: width contentWidth: width
contentHeight: content.height contentHeight: content.height
clip: true clip: true
@ -57,20 +57,20 @@ FocusScope {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 8 * DefaultStyle.dp anchors.rightMargin: 8 * mainWindow.dp
} }
ColumnLayout { ColumnLayout {
id: content id: content
spacing: 32 * DefaultStyle.dp spacing: 32 * mainWindow.dp
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 39 * DefaultStyle.dp anchors.rightMargin: 39 * mainWindow.dp
Button { Button {
id: grouCallButton id: grouCallButton
visible: mainItem.groupCallVisible && !SettingsCpp.disableMeetingsFeature visible: mainItem.groupCallVisible && !SettingsCpp.disableMeetingsFeature
Layout.preferredWidth: 320 * DefaultStyle.dp Layout.preferredWidth: 320 * mainWindow.dp
Layout.preferredHeight: 44 * DefaultStyle.dp Layout.preferredHeight: 44 * mainWindow.dp
padding: 0 padding: 0
KeyNavigation.up: searchBar KeyNavigation.up: searchBar
KeyNavigation.down: contactList.count >0 ? contactList : searchList KeyNavigation.down: contactList.count >0 ? contactList : searchList
@ -82,22 +82,22 @@ FocusScope {
GradientStop { position: 1.0; color: DefaultStyle.grey_0} GradientStop { position: 1.0; color: DefaultStyle.grey_0}
} }
anchors.fill: parent anchors.fill: parent
radius: 50 * DefaultStyle.dp radius: 50 * mainWindow.dp
} }
contentItem: RowLayout { contentItem: RowLayout {
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
Image { Image {
source: AppIcons.groupCall source: AppIcons.groupCall
Layout.preferredWidth: 44 * DefaultStyle.dp Layout.preferredWidth: 44 * mainWindow.dp
sourceSize.width: 44 * DefaultStyle.dp sourceSize.width: 44 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
} }
Text { Text {
text: "Appel de groupe" text: "Appel de groupe"
color: DefaultStyle.grey_1000 color: DefaultStyle.grey_1000
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
underline: grouCallButton.shadowEnabled underline: grouCallButton.shadowEnabled
} }
} }
@ -106,8 +106,8 @@ FocusScope {
} }
Image { Image {
source: AppIcons.rightArrow source: AppIcons.rightArrow
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
} }
} }
@ -116,8 +116,8 @@ FocusScope {
Text { Text {
text: qsTr("Contacts") text: qsTr("Contacts")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
ContactListView{ ContactListView{
@ -132,12 +132,12 @@ FocusScope {
} }
} }
ColumnLayout { ColumnLayout {
spacing: 18 * DefaultStyle.dp spacing: 18 * mainWindow.dp
Text { Text {
text: qsTr("Suggestions") text: qsTr("Suggestions")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
ContactListView{ ContactListView{

8
Linphone/view/Page/Form/Contact/ContactDescription.qml
View file

@ -18,8 +18,8 @@ ColumnLayout{
Layout.fillHeight: true Layout.fillHeight: true
verticalAlignment: (bottomTextItem.visible?Text.AlignBottom:Text.AlignVCenter) verticalAlignment: (bottomTextItem.visible?Text.AlignBottom:Text.AlignVCenter)
visible: text != '' visible: text != ''
font.weight: 400 * DefaultStyle.dp font.weight: 400 * mainWindow.dp
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
text: mainItem.topText text: mainItem.topText
width: mainItem.width width: mainItem.width
@ -32,8 +32,8 @@ ColumnLayout{
Layout.fillHeight: true Layout.fillHeight: true
verticalAlignment: (topTextItem.visible?Text.AlignTop:Text.AlignVCenter) verticalAlignment: (topTextItem.visible?Text.AlignTop:Text.AlignVCenter)
visible: text != '' visible: text != ''
font.weight: 300 * DefaultStyle.dp font.weight: 300 * mainWindow.dp
font.pixelSize: 12 * DefaultStyle.dp font.pixelSize: 12 * mainWindow.dp
color: DefaultStyle.main2_400 color: DefaultStyle.main2_400
text: mainItem.bottomText text: mainItem.bottomText
Layout.preferredWidth: mainItem.width Layout.preferredWidth: mainItem.width

106
Linphone/view/Page/Form/Contact/ContactEdition.qml
View file

@ -33,31 +33,31 @@ MainRightPanel {
mainItem.contact.core.undo() mainItem.contact.core.undo()
mainItem.closeEdition() mainItem.closeEdition()
} }
width: 278 * DefaultStyle.dp width: 278 * mainWindow.dp
text: qsTr("Les changements seront annulés. Souhaitez-vous continuer ?") text: qsTr("Les changements seront annulés. Souhaitez-vous continuer ?")
} }
headerContent: [ headerContent: [
Text { Text {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 31 * DefaultStyle.dp anchors.leftMargin: 31 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: mainItem.title text: mainItem.title
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
}, },
Button { Button {
background: Item{} background: Item{}
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 41 * DefaultStyle.dp anchors.rightMargin: 41 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
onClicked: { onClicked: {
confirmDialog.open() confirmDialog.open()
} }
@ -68,22 +68,22 @@ MainRightPanel {
anchors.fill: parent anchors.fill: parent
spacing : 0 spacing : 0
ColumnLayout { ColumnLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.topMargin: 69 * DefaultStyle.dp Layout.topMargin: 69 * mainWindow.dp
Avatar { Avatar {
contact: mainItem.contact contact: mainItem.contact
Layout.preferredWidth: 72 * DefaultStyle.dp Layout.preferredWidth: 72 * mainWindow.dp
Layout.preferredHeight: 72 * DefaultStyle.dp Layout.preferredHeight: 72 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
IconLabelButton { IconLabelButton {
id: addPictureButton id: addPictureButton
visible: !mainItem.contact || mainItem.contact.core.pictureUri.length === 0 visible: !mainItem.contact || mainItem.contact.core.pictureUri.length === 0
Layout.preferredWidth: width Layout.preferredWidth: width
Layout.preferredHeight: 17 * DefaultStyle.dp Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.camera iconSource: AppIcons.camera
iconSize: 17 * DefaultStyle.dp iconSize: 17 * mainWindow.dp
backgroundColor: "transparent" backgroundColor: "transparent"
text: qsTr("Ajouter une image") text: qsTr("Ajouter une image")
KeyNavigation.down: editButton.visible ? editButton : givenNameEdit KeyNavigation.down: editButton.visible ? editButton : givenNameEdit
@ -95,9 +95,9 @@ MainRightPanel {
IconLabelButton { IconLabelButton {
id: editButton id: editButton
Layout.preferredWidth: width Layout.preferredWidth: width
Layout.preferredHeight: 17 * DefaultStyle.dp Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.pencil iconSource: AppIcons.pencil
iconSize: 17 * DefaultStyle.dp iconSize: 17 * mainWindow.dp
backgroundColor: "transparent" backgroundColor: "transparent"
text: qsTr("Modifier") text: qsTr("Modifier")
KeyNavigation.down: givenNameEdit KeyNavigation.down: givenNameEdit
@ -116,9 +116,9 @@ MainRightPanel {
} }
IconLabelButton { IconLabelButton {
id: removeButton id: removeButton
Layout.preferredHeight: 17 * DefaultStyle.dp Layout.preferredHeight: 17 * mainWindow.dp
Layout.preferredWidth: width Layout.preferredWidth: width
iconSize: 17 * DefaultStyle.dp iconSize: 17 * mainWindow.dp
iconSource: AppIcons.trashCan iconSource: AppIcons.trashCan
backgroundColor: "transparent" backgroundColor: "transparent"
text: qsTr("Supprimer") text: qsTr("Supprimer")
@ -131,19 +131,19 @@ MainRightPanel {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.topMargin: 63 * DefaultStyle.dp Layout.topMargin: 63 * mainWindow.dp
Layout.bottomMargin: 78 * DefaultStyle.dp Layout.bottomMargin: 78 * mainWindow.dp
spacing: 100 * DefaultStyle.dp spacing: 100 * mainWindow.dp
Flickable { Flickable {
Layout.preferredWidth: contentWidth Layout.preferredWidth: contentWidth
Layout.fillHeight: true Layout.fillHeight: true
Layout.leftMargin: 100 * DefaultStyle.dp Layout.leftMargin: 100 * mainWindow.dp
contentWidth: content.implicitWidth contentWidth: content.implicitWidth
contentHeight: content.height contentHeight: content.height
clip: true clip: true
ColumnLayout { ColumnLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
anchors.fill: parent anchors.fill: parent
FormItemLayout { FormItemLayout {
id: givenName id: givenName
@ -207,7 +207,7 @@ MainRightPanel {
id: addressesFlickable id: addressesFlickable
Layout.preferredWidth: contentWidth Layout.preferredWidth: contentWidth
Layout.fillHeight: true Layout.fillHeight: true
Layout.rightMargin: 76 * DefaultStyle.dp Layout.rightMargin: 76 * mainWindow.dp
contentWidth: content.implicitWidth contentWidth: content.implicitWidth
contentHeight: content.implicitHeight contentHeight: content.implicitHeight
clip: true clip: true
@ -229,7 +229,7 @@ MainRightPanel {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 15 * DefaultStyle.dp anchors.leftMargin: 15 * mainWindow.dp
} }
Control.ScrollBar.horizontal: Control.ScrollBar{ Control.ScrollBar.horizontal: Control.ScrollBar{
visible: false visible: false
@ -237,7 +237,7 @@ MainRightPanel {
ColumnLayout { ColumnLayout {
id: content id: content
anchors.fill: parent anchors.fill: parent
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Repeater { Repeater {
id: addressesList id: addressesList
model: VariantList { model: VariantList {
@ -247,7 +247,7 @@ MainRightPanel {
label: modelData.label label: modelData.label
contentItem: RowLayout { contentItem: RowLayout {
id: addressLayout id: addressLayout
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
function updateFocus(event){ function updateFocus(event){
if(event.key == Qt.Key_Up){ if(event.key == Qt.Key_Up){
if(index - 1 >=0 ) if(index - 1 >=0 )
@ -279,15 +279,15 @@ MainRightPanel {
} }
Button { Button {
id: removeAddressButton id: removeAddressButton
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
background: Item{} background: Item{}
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
KeyNavigation.left: addressTextField KeyNavigation.left: addressTextField
Keys.onPressed: (event) => addressLayout.updateFocus(event) Keys.onPressed: (event) => addressLayout.updateFocus(event)
onClicked: mainItem.contact.core.removeAddress(index) onClicked: mainItem.contact.core.removeAddress(index)
@ -297,7 +297,7 @@ MainRightPanel {
} }
RowLayout { RowLayout {
onYChanged: addressesFlickable.ensureVisible(this) onYChanged: addressesFlickable.ensureVisible(this)
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
FormItemLayout { FormItemLayout {
label: qsTr("Adresse SIP") label: qsTr("Adresse SIP")
contentItem: TextField { contentItem: TextField {
@ -325,8 +325,8 @@ MainRightPanel {
} }
} }
Item { Item {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
} }
Repeater { Repeater {
@ -339,7 +339,7 @@ MainRightPanel {
label: modelData.label label: modelData.label
contentItem: RowLayout { contentItem: RowLayout {
id: phoneNumberLayout id: phoneNumberLayout
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
function updateFocus(event){ function updateFocus(event){
if(event.key == Qt.Key_Up){ if(event.key == Qt.Key_Up){
if(index - 1 >=0 ) if(index - 1 >=0 )
@ -370,15 +370,15 @@ MainRightPanel {
} }
Button { Button {
id: removePhoneButton id: removePhoneButton
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
background: Item{} background: Item{}
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
KeyNavigation.left: phoneTextField KeyNavigation.left: phoneTextField
Keys.onPressed: (event) => phoneNumberLayout.updateFocus(event) Keys.onPressed: (event) => phoneNumberLayout.updateFocus(event)
onClicked: mainItem.contact.core.removePhoneNumber(index) onClicked: mainItem.contact.core.removePhoneNumber(index)
@ -388,7 +388,7 @@ MainRightPanel {
} }
RowLayout { RowLayout {
onYChanged: addressesFlickable.ensureVisible(this) onYChanged: addressesFlickable.ensureVisible(this)
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
FormItemLayout { FormItemLayout {
id: phoneNumberInput id: phoneNumberInput
label: qsTr("Phone") label: qsTr("Phone")
@ -417,8 +417,8 @@ MainRightPanel {
} }
} }
Item { Item {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
} }
TemporaryText { TemporaryText {
@ -434,15 +434,15 @@ MainRightPanel {
Button { Button {
id: saveButton id: saveButton
Layout.bottomMargin: 100 * DefaultStyle.dp Layout.bottomMargin: 100 * mainWindow.dp
Layout.preferredWidth: 165 * DefaultStyle.dp Layout.preferredWidth: 165 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
enabled: mainItem.contact && mainItem.contact.core.allAddresses.length > 0 enabled: mainItem.contact && mainItem.contact.core.allAddresses.length > 0
text: mainItem.saveButtonText text: mainItem.saveButtonText
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
KeyNavigation.up: phoneNumberInputTextField KeyNavigation.up: phoneNumberInputTextField
KeyNavigation.down: givenNameEdit KeyNavigation.down: givenNameEdit
onClicked: { onClicked: {

70
Linphone/view/Page/Form/Login/LoginPage.qml
View file

@ -19,9 +19,9 @@ LoginLayout {
Button { Button {
enabled: mainItem.showBackButton enabled: mainItem.showBackButton
opacity: mainItem.showBackButton ? 1.0 : 0 opacity: mainItem.showBackButton ? 1.0 : 0
Layout.preferredHeight: 27 * DefaultStyle.dp Layout.preferredHeight: 27 * mainWindow.dp
Layout.preferredWidth: 27 * DefaultStyle.dp Layout.preferredWidth: 27 * mainWindow.dp
Layout.leftMargin: 79 * DefaultStyle.dp Layout.leftMargin: 79 * mainWindow.dp
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
icon.width: width icon.width: width
icon.height: height icon.height: height
@ -34,19 +34,19 @@ LoginLayout {
} }
}, },
RowLayout { RowLayout {
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
Layout.leftMargin: 21 * DefaultStyle.dp Layout.leftMargin: 21 * mainWindow.dp
Image { Image {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: AppIcons.profile source: AppIcons.profile
Layout.preferredHeight: 34 * DefaultStyle.dp Layout.preferredHeight: 34 * mainWindow.dp
Layout.preferredWidth: 34 * DefaultStyle.dp Layout.preferredWidth: 34 * mainWindow.dp
} }
Text { Text {
text: qsTr("Connexion") text: qsTr("Connexion")
font { font {
pixelSize: 36 * DefaultStyle.dp pixelSize: 36 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
}, },
@ -55,20 +55,20 @@ LoginLayout {
}, },
RowLayout { RowLayout {
visible: !SettingsCpp.assistantHideCreateAccount visible: !SettingsCpp.assistantHideCreateAccount
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 51 * DefaultStyle.dp Layout.rightMargin: 51 * mainWindow.dp
Text { Text {
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
text: qsTr("Pas encore de compte ?") text: qsTr("Pas encore de compte ?")
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
font.weight: 400 * DefaultStyle.dp font.weight: 400 * mainWindow.dp
} }
Button { Button {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
text: qsTr("S'inscrire") text: qsTr("S'inscrire")
onClicked: { onClicked: {
console.debug("[LoginPage] User: go to register") console.debug("[LoginPage] User: go to register")
@ -81,8 +81,8 @@ LoginLayout {
Flickable { Flickable {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.leftMargin: 127 * DefaultStyle.dp anchors.leftMargin: 127 * mainWindow.dp
anchors.topMargin: 70 * DefaultStyle.dp anchors.topMargin: 70 * mainWindow.dp
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: contentWidth width: contentWidth
contentWidth: content.implicitWidth contentWidth: content.implicitWidth
@ -99,8 +99,8 @@ LoginLayout {
Button { Button {
inversedColors: true inversedColors: true
Layout.preferredWidth: loginForm.width Layout.preferredWidth: loginForm.width
Layout.preferredHeight: 47 * DefaultStyle.dp Layout.preferredHeight: 47 * mainWindow.dp
Layout.topMargin: 39 * DefaultStyle.dp Layout.topMargin: 39 * mainWindow.dp
visible: !SettingsCpp.assistantHideThirdPartyAccount visible: !SettingsCpp.assistantHideThirdPartyAccount
text: qsTr("Compte SIP tiers") text: qsTr("Compte SIP tiers")
onClicked: {mainItem.useSIPButtonClicked()} onClicked: {mainItem.useSIPButtonClicked()}
@ -108,8 +108,8 @@ LoginLayout {
Button { Button {
inversedColors: true inversedColors: true
Layout.preferredWidth: loginForm.width Layout.preferredWidth: loginForm.width
Layout.preferredHeight: 47 * DefaultStyle.dp Layout.preferredHeight: 47 * mainWindow.dp
Layout.topMargin: 25 * DefaultStyle.dp Layout.topMargin: 25 * mainWindow.dp
text: qsTr("Configuration distante") text: qsTr("Configuration distante")
onClicked: {fetchConfigDialog.open()} onClicked: {fetchConfigDialog.open()}
} }
@ -119,22 +119,22 @@ LoginLayout {
z: -1 z: -1
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 129 * DefaultStyle.dp anchors.topMargin: 129 * mainWindow.dp
anchors.rightMargin: 127 * DefaultStyle.dp anchors.rightMargin: 127 * mainWindow.dp
width: 395 * DefaultStyle.dp width: 395 * mainWindow.dp
height: 350 * DefaultStyle.dp height: 350 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: AppIcons.loginImage source: AppIcons.loginImage
} }
] ]
Dialog{ Dialog{
id: fetchConfigDialog id: fetchConfigDialog
height: 315 * DefaultStyle.dp height: 315 * mainWindow.dp
width: 637 * DefaultStyle.dp width: 637 * mainWindow.dp
leftPadding: 33 * DefaultStyle.dp leftPadding: 33 * mainWindow.dp
rightPadding: 33 * DefaultStyle.dp rightPadding: 33 * mainWindow.dp
topPadding: 41 * DefaultStyle.dp topPadding: 41 * mainWindow.dp
bottomPadding: 29 * DefaultStyle.dp bottomPadding: 29 * mainWindow.dp
radius: 0 radius: 0
title: qsTr('Télécharger une configuration distante') title: qsTr('Télécharger une configuration distante')
text: qsTr('Veuillez entrer le lien de configuration qui vous a été fourni :') text: qsTr('Veuillez entrer le lien de configuration qui vous a été fourni :')
@ -152,7 +152,7 @@ LoginLayout {
TextField{ TextField{
id: configUrl id: configUrl
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
placeholderText: qsTr('Lien de configuration distante') placeholderText: qsTr('Lien de configuration distante')
} }
] ]

134
Linphone/view/Page/Form/Login/SIPLoginPage.qml
View file

@ -14,16 +14,16 @@ LoginLayout {
titleContent: [ titleContent: [
RowLayout { RowLayout {
Layout.leftMargin: 119 * DefaultStyle.dp Layout.leftMargin: 119 * mainWindow.dp
visible: !SettingsCpp.assistantHideThirdPartyAccount visible: !SettingsCpp.assistantHideThirdPartyAccount
spacing: 21 * DefaultStyle.dp spacing: 21 * mainWindow.dp
Button { Button {
id: backButton id: backButton
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
} }
@ -35,16 +35,16 @@ LoginLayout {
Image { Image {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: AppIcons.profile source: AppIcons.profile
Layout.preferredHeight: 34 * DefaultStyle.dp Layout.preferredHeight: 34 * mainWindow.dp
Layout.preferredWidth: 34 * DefaultStyle.dp Layout.preferredWidth: 34 * mainWindow.dp
sourceSize.width: 34 * DefaultStyle.dp sourceSize.width: 34 * mainWindow.dp
sourceSize.height: 34 * DefaultStyle.dp sourceSize.height: 34 * mainWindow.dp
} }
Text { Text {
text: qsTr("Compte SIP tiers") text: qsTr("Compte SIP tiers")
font { font {
pixelSize: 36 * DefaultStyle.dp pixelSize: 36 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
scaleLettersFactor: 1.1 scaleLettersFactor: 1.1
} }
@ -54,23 +54,23 @@ LoginLayout {
}, },
RowLayout { RowLayout {
visible: !SettingsCpp.assistantHideCreateAccount visible: !SettingsCpp.assistantHideCreateAccount
Layout.rightMargin: 51 * DefaultStyle.dp Layout.rightMargin: 51 * mainWindow.dp
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Text { Text {
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
text: qsTr("Pas encore de compte ?") text: qsTr("Pas encore de compte ?")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
Button { Button {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("S'inscrire") text: qsTr("S'inscrire")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
onClicked: { onClicked: {
console.debug("[SIPLoginPage] User: go to register page") console.debug("[SIPLoginPage] User: go to register page")
mainItem.goToRegister() mainItem.goToRegister()
@ -89,19 +89,19 @@ LoginLayout {
flickableDirection: Flickable.VerticalFlick flickableDirection: Flickable.VerticalFlick
ColumnLayout { ColumnLayout {
id: content id: content
spacing: 85 * DefaultStyle.dp spacing: 85 * mainWindow.dp
ColumnLayout { ColumnLayout {
spacing: 0 spacing: 0
ColumnLayout { ColumnLayout {
spacing: 28 * DefaultStyle.dp spacing: 28 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: rootStackView.width Layout.preferredWidth: rootStackView.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: DefaultStyle.main2_900 color: DefaultStyle.main2_900
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400* DefaultStyle.dp weight: 400* mainWindow.dp
} }
text: "Certaines fonctionnalités nécessitent un compte Linphone, comme la messagerie de groupe, les vidéoconférences..." text: "Certaines fonctionnalités nécessitent un compte Linphone, comme la messagerie de groupe, les vidéoconférences..."
} }
@ -111,8 +111,8 @@ LoginLayout {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: DefaultStyle.main2_900 color: DefaultStyle.main2_900
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400* DefaultStyle.dp weight: 400* mainWindow.dp
} }
text:"Ces fonctionnalités sont cachées lorsque vous vous enregistrez avec un compte SIP tiers." text:"Ces fonctionnalités sont cachées lorsque vous vous enregistrez avec un compte SIP tiers."
} }
@ -122,8 +122,8 @@ LoginLayout {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: DefaultStyle.main2_900 color: DefaultStyle.main2_900
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400* DefaultStyle.dp weight: 400* mainWindow.dp
} }
text: "Pour les activer dans un projet commercial, veuillez nous contacter. " text: "Pour les activer dans un projet commercial, veuillez nous contacter. "
} }
@ -131,14 +131,14 @@ LoginLayout {
Button { Button {
id: openLinkButton id: openLinkButton
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.topMargin: 18 * DefaultStyle.dp Layout.topMargin: 18 * mainWindow.dp
text: "linphone.org/contact" text: "linphone.org/contact"
textSize: 13 * DefaultStyle.dp textSize: 13 * mainWindow.dp
inversedColors: true inversedColors: true
leftPadding: 12 * DefaultStyle.dp leftPadding: 12 * mainWindow.dp
rightPadding: 12 * DefaultStyle.dp rightPadding: 12 * mainWindow.dp
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
onClicked: { onClicked: {
Qt.openUrlExternally(ConstantsCpp.ContactUrl) Qt.openUrlExternally(ConstantsCpp.ContactUrl)
} }
@ -147,17 +147,17 @@ LoginLayout {
} }
} }
ColumnLayout { ColumnLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Button { Button {
id: createAccountButton id: createAccountButton
// Layout.topMargin: 85 * DefaultStyle.dp // Layout.topMargin: 85 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
inversedColors: true inversedColors: true
text: qsTr("Créer un compte linphone") text: qsTr("Créer un compte linphone")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
onClicked: { onClicked: {
console.debug("[SIPLoginPage] User: click register") console.debug("[SIPLoginPage] User: click register")
mainItem.goToRegister() mainItem.goToRegister()
@ -169,10 +169,10 @@ LoginLayout {
id: continueButton id: continueButton
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Je comprends") text: qsTr("Je comprends")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
onClicked: { onClicked: {
rootStackView.replace(secondItem) rootStackView.replace(secondItem)
} }
@ -195,9 +195,9 @@ LoginLayout {
flickableDirection: Flickable.VerticalFlick flickableDirection: Flickable.VerticalFlick
ColumnLayout { ColumnLayout {
id: content id: content
spacing: 2 * DefaultStyle.dp spacing: 2 * mainWindow.dp
ColumnLayout { ColumnLayout {
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
FormItemLayout { FormItemLayout {
id: username id: username
label: qsTr("Nom d'utilisateur") label: qsTr("Nom d'utilisateur")
@ -206,7 +206,7 @@ LoginLayout {
contentItem: TextField { contentItem: TextField {
id: usernameEdit id: usernameEdit
isError: username.errorTextVisible isError: username.errorTextVisible
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
KeyNavigation.down: passwordEdit KeyNavigation.down: passwordEdit
} }
} }
@ -219,7 +219,7 @@ LoginLayout {
id: passwordEdit id: passwordEdit
isError: password.errorTextVisible isError: password.errorTextVisible
hidden: true hidden: true
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
KeyNavigation.up: usernameEdit KeyNavigation.up: usernameEdit
KeyNavigation.down: domainEdit KeyNavigation.down: domainEdit
} }
@ -233,7 +233,7 @@ LoginLayout {
id: domainEdit id: domainEdit
isError: domain.errorTextVisible isError: domain.errorTextVisible
initialText: SettingsCpp.assistantThirdPartySipAccountDomain initialText: SettingsCpp.assistantThirdPartySipAccountDomain
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
KeyNavigation.up: passwordEdit KeyNavigation.up: passwordEdit
KeyNavigation.down: displayName KeyNavigation.down: displayName
} }
@ -248,7 +248,7 @@ LoginLayout {
label: qsTr("Nom d'affichage") label: qsTr("Nom d'affichage")
contentItem: TextField { contentItem: TextField {
id: displayName id: displayName
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
KeyNavigation.up: domainEdit KeyNavigation.up: domainEdit
KeyNavigation.down: transportCbox KeyNavigation.down: transportCbox
} }
@ -258,8 +258,8 @@ LoginLayout {
label: qsTr("Transport") label: qsTr("Transport")
contentItem: ComboBox { contentItem: ComboBox {
id: transportCbox id: transportCbox
height: 49 * DefaultStyle.dp height: 49 * mainWindow.dp
width: 360 * DefaultStyle.dp width: 360 * mainWindow.dp
textRole: "text" textRole: "text"
valueRole: "value" valueRole: "value"
model: [ model: [
@ -291,11 +291,11 @@ LoginLayout {
Button { Button {
id: connectionButton id: connectionButton
Layout.topMargin: 32 * DefaultStyle.dp Layout.topMargin: 32 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
contentItem: StackLayout { contentItem: StackLayout {
id: connectionButtonContent id: connectionButtonContent
currentIndex: 0 currentIndex: 0
@ -305,8 +305,8 @@ LoginLayout {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font { font {
pixelSize: 18 * DefaultStyle.dp pixelSize: 18 * mainWindow.dp
weight: 600 * DefaultStyle.dp weight: 600 * mainWindow.dp
} }
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
} }
@ -370,18 +370,18 @@ LoginLayout {
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.topMargin: 70 * DefaultStyle.dp anchors.topMargin: 70 * mainWindow.dp
anchors.leftMargin: 127 * DefaultStyle.dp anchors.leftMargin: 127 * mainWindow.dp
width: 361 * DefaultStyle.dp width: 361 * mainWindow.dp
}, },
Image { Image {
z: -1 z: -1
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 129 * DefaultStyle.dp anchors.topMargin: 129 * mainWindow.dp
anchors.rightMargin: 127 * DefaultStyle.dp anchors.rightMargin: 127 * mainWindow.dp
width: 395 * DefaultStyle.dp width: 395 * mainWindow.dp
height: 350 * DefaultStyle.dp height: 350 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: AppIcons.loginImage source: AppIcons.loginImage
} }

48
Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml
View file

@ -23,7 +23,7 @@ FocusScope{
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
ListView { ListView {
id: participantList id: participantList
Layout.fillWidth: true Layout.fillWidth: true
@ -39,32 +39,32 @@ FocusScope{
} }
} }
delegate: FocusScope { delegate: FocusScope {
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
width: participantList.width - scrollbar.implicitWidth - 12 * DefaultStyle.dp width: participantList.width - scrollbar.implicitWidth - 12 * mainWindow.dp
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData _address: modelData
} }
Text { Text {
property var nameObj: UtilsCpp.getDisplayName(modelData) property var nameObj: UtilsCpp.getDisplayName(modelData)
text: nameObj ? nameObj.value : "" text: nameObj ? nameObj.value : ""
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
font.capitalization: Font.Capitalize font.capitalization: Font.Capitalize
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Button { Button {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
background: Item{} background: Item{}
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
focus: true focus: true
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
onClicked: suggestionList.removeSelectedContactByAddress(modelData) onClicked: suggestionList.removeSelectedContactByAddress(modelData)
@ -79,15 +79,15 @@ FocusScope{
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 8 * DefaultStyle.dp anchors.rightMargin: 8 * mainWindow.dp
} }
} }
SearchBar { SearchBar {
id: searchbar id: searchbar
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 6 * DefaultStyle.dp Layout.topMargin: 6 * mainWindow.dp
Layout.rightMargin: 28 * DefaultStyle.dp Layout.rightMargin: 28 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
placeholderText: mainItem.placeHolderText placeholderText: mainItem.placeHolderText
focus: participantList.count == 0 focus: participantList.count == 0
color: mainItem.searchBarColor color: mainItem.searchBarColor
@ -111,19 +111,19 @@ FocusScope{
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 8 * DefaultStyle.dp anchors.rightMargin: 8 * mainWindow.dp
} }
ColumnLayout { ColumnLayout {
id: content id: content
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: contactsScrollBar.implicitWidth + 12 * DefaultStyle.dp anchors.rightMargin: contactsScrollBar.implicitWidth + 12 * mainWindow.dp
Text { Text {
Layout.topMargin: 6 * DefaultStyle.dp Layout.topMargin: 6 * mainWindow.dp
text: qsTr("Contacts") text: qsTr("Contacts")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
ContactListView { ContactListView {
@ -131,7 +131,7 @@ FocusScope{
visible: contentHeight > 0 || searchbar.text.length > 0 visible: contentHeight > 0 || searchbar.text.length > 0
Layout.fillWidth: true Layout.fillWidth: true
// Layout.fillHeight: true // Layout.fillHeight: true
Layout.topMargin: 8 * DefaultStyle.dp Layout.topMargin: 8 * mainWindow.dp
Layout.preferredHeight: contentHeight Layout.preferredHeight: contentHeight
multiSelectionEnabled: true multiSelectionEnabled: true
contactMenuVisible: false contactMenuVisible: false
@ -144,11 +144,11 @@ FocusScope{
Control.ScrollBar.vertical.visible: false Control.ScrollBar.vertical.visible: false
} }
Text { Text {
Layout.topMargin: 6 * DefaultStyle.dp Layout.topMargin: 6 * mainWindow.dp
text: qsTr("Suggestions") text: qsTr("Suggestions")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
ContactListView { ContactListView {

142
Linphone/view/Page/Form/Meeting/MeetingForm.qml
View file

@ -16,7 +16,7 @@ FocusScope {
ColumnLayout { ColumnLayout {
id: formLayout id: formLayout
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
Connections { Connections {
target: mainItem.conferenceInfoGui.core target: mainItem.conferenceInfoGui.core
function onSchedulerStateChanged() { function onSchedulerStateChanged() {
@ -38,24 +38,24 @@ FocusScope {
autoExclusive: true autoExclusive: true
contentImageColor: checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main contentImageColor: checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main
inversedColors: !checked inversedColors: !checked
topPadding: 10 * DefaultStyle.dp topPadding: 10 * mainWindow.dp
bottomPadding: 10 * DefaultStyle.dp bottomPadding: 10 * mainWindow.dp
leftPadding: 16 * DefaultStyle.dp leftPadding: 16 * mainWindow.dp
rightPadding: 16 * DefaultStyle.dp rightPadding: 16 * mainWindow.dp
contentItem: RowLayout { contentItem: RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
imageSource: checkableButton.icon.source imageSource: checkableButton.icon.source
colorizationColor: checkableButton.checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main colorizationColor: checkableButton.checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
} }
Text { Text {
text: checkableButton.text text: checkableButton.text
color: checkableButton.checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main color: checkableButton.checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -63,24 +63,24 @@ FocusScope {
RowLayout { RowLayout {
visible: mainItem.isCreation && !SettingsCpp.disableBroadcastFeature visible: mainItem.isCreation && !SettingsCpp.disableBroadcastFeature
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.bottomMargin: 20 * DefaultStyle.dp Layout.bottomMargin: 20 * mainWindow.dp
spacing: 18 * DefaultStyle.dp spacing: 18 * mainWindow.dp
CheckableButton { CheckableButton {
Layout.preferredWidth: 151 * DefaultStyle.dp Layout.preferredWidth: 151 * mainWindow.dp
icon.source: AppIcons.usersThree icon.source: AppIcons.usersThree
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
enabled: false enabled: false
text: qsTr("Réunion") text: qsTr("Réunion")
checked: true checked: true
} }
CheckableButton { CheckableButton {
Layout.preferredWidth: 151 * DefaultStyle.dp Layout.preferredWidth: 151 * mainWindow.dp
enabled: false enabled: false
icon.source: AppIcons.slide icon.source: AppIcons.slide
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
text: qsTr("Broadcast") text: qsTr("Broadcast")
} }
} }
@ -88,20 +88,20 @@ FocusScope {
visible: mainItem.isCreation visible: mainItem.isCreation
spacing: formLayout.spacing spacing: formLayout.spacing
content: RowLayout { content: RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
imageSource: AppIcons.usersThree imageSource: AppIcons.usersThree
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
TextInput { TextInput {
id: confTitle id: confTitle
text: qsTr("Ajouter un titre") text: qsTr("Ajouter un titre")
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
focus: true focus: true
onActiveFocusChanged: if(activeFocus) selectAll() onActiveFocusChanged: if(activeFocus) selectAll()
@ -117,16 +117,16 @@ FocusScope {
EffectImage { EffectImage {
imageSource: AppIcons.clock imageSource: AppIcons.clock
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
CalendarComboBox { CalendarComboBox {
id: startDate id: startDate
background.visible: mainItem.isCreation background.visible: mainItem.isCreation
indicator.visible: mainItem.isCreation indicator.visible: mainItem.isCreation
contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp contentText.font.weight: (isCreation ? 700 : 400) * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * mainWindow.dp
KeyNavigation.up: confTitle KeyNavigation.up: confTitle
KeyNavigation.down: startHour KeyNavigation.down: startHour
onSelectedDateChanged: { onSelectedDateChanged: {
@ -140,18 +140,18 @@ FocusScope {
}, },
RowLayout { RowLayout {
Item { Item {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
RowLayout { RowLayout {
TimeComboBox { TimeComboBox {
id: startHour id: startHour
indicator.visible: mainItem.isCreation indicator.visible: mainItem.isCreation
// Layout.fillWidth: true // Layout.fillWidth: true
Layout.preferredWidth: 94 * DefaultStyle.dp Layout.preferredWidth: 94 * mainWindow.dp
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * mainWindow.dp
background.visible: mainItem.isCreation background.visible: mainItem.isCreation
contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp contentText.font.weight: (isCreation ? 700 : 400) * mainWindow.dp
KeyNavigation.up: startDate KeyNavigation.up: startDate
KeyNavigation.down: timeZoneCbox KeyNavigation.down: timeZoneCbox
KeyNavigation.left: startDate KeyNavigation.left: startDate
@ -166,10 +166,10 @@ FocusScope {
TimeComboBox { TimeComboBox {
id: endHour id: endHour
indicator.visible: mainItem.isCreation indicator.visible: mainItem.isCreation
Layout.preferredWidth: 94 * DefaultStyle.dp Layout.preferredWidth: 94 * mainWindow.dp
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * mainWindow.dp
background.visible: mainItem.isCreation background.visible: mainItem.isCreation
contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp contentText.font.weight: (isCreation ? 700 : 400) * mainWindow.dp
onSelectedDateTimeChanged: mainItem.conferenceInfoGui.core.endDateTime = selectedDateTime onSelectedDateTimeChanged: mainItem.conferenceInfoGui.core.endDateTime = selectedDateTime
} }
Item { Item {
@ -181,8 +181,8 @@ FocusScope {
property int min: (durationSec - hour*3600)/60 property int min: (durationSec - hour*3600)/60
text: (hour > 0 ? hour + "h" : "") + (min > 0 ? min + "mn" : "") text: (hour > 0 ? hour + "h" : "") + (min > 0 ? min + "mn" : "")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
} }
@ -190,12 +190,12 @@ FocusScope {
ComboBox { ComboBox {
id: timeZoneCbox id: timeZoneCbox
Layout.preferredWidth: 307 * DefaultStyle.dp Layout.preferredWidth: 307 * mainWindow.dp
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * mainWindow.dp
hoverEnabled: true hoverEnabled: true
listView.implicitHeight: 250 * DefaultStyle.dp listView.implicitHeight: 250 * mainWindow.dp
constantImageSource: AppIcons.globe constantImageSource: AppIcons.globe
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
leftMargin: 0 leftMargin: 0
currentIndex: mainItem.conferenceInfoGui ? model.getIndex(mainItem.conferenceInfoGui.core.timeZoneModel) : -1 currentIndex: mainItem.conferenceInfoGui ? model.getIndex(mainItem.conferenceInfoGui.core.timeZoneModel) : -1
background: Rectangle { background: Rectangle {
@ -216,27 +216,27 @@ FocusScope {
Section { Section {
spacing: formLayout.spacing spacing: formLayout.spacing
content: RowLayout { content: RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
imageSource: AppIcons.note imageSource: AppIcons.note
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
TextArea { TextArea {
id: descriptionEdit id: descriptionEdit
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 275 * DefaultStyle.dp Layout.preferredWidth: 275 * mainWindow.dp
leftPadding: 8 * DefaultStyle.dp leftPadding: 8 * mainWindow.dp
rightPadding: 8 * DefaultStyle.dp rightPadding: 8 * mainWindow.dp
hoverEnabled: true hoverEnabled: true
placeholderText: qsTr("Ajouter une description") placeholderText: qsTr("Ajouter une description")
placeholderTextColor: DefaultStyle.main2_600 placeholderTextColor: DefaultStyle.main2_600
placeholderWeight: 700 * DefaultStyle.dp placeholderWeight: 700 * mainWindow.dp
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
onEditingFinished: mainItem.conferenceInfoGui.core.description = text onEditingFinished: mainItem.conferenceInfoGui.core.description = text
Keys.onPressed: (event)=> { Keys.onPressed: (event)=> {
@ -249,7 +249,7 @@ FocusScope {
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: descriptionEdit.hovered || descriptionEdit.activeFocus ? DefaultStyle.grey_100 : "transparent" color: descriptionEdit.hovered || descriptionEdit.activeFocus ? DefaultStyle.grey_100 : "transparent"
radius: 4 * DefaultStyle.dp radius: 4 * mainWindow.dp
} }
} }
} }
@ -260,26 +260,26 @@ FocusScope {
Button { Button {
id: addParticipantsButton id: addParticipantsButton
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * mainWindow.dp
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: addParticipantsButton.hovered || addParticipantsButton.activeFocus ? DefaultStyle.grey_100 : "transparent" color: addParticipantsButton.hovered || addParticipantsButton.activeFocus ? DefaultStyle.grey_100 : "transparent"
radius: 4 * DefaultStyle.dp radius: 4 * mainWindow.dp
} }
contentItem: RowLayout { contentItem: RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
imageSource: AppIcons.usersThree imageSource: AppIcons.usersThree
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Ajouter des participants") text: qsTr("Ajouter des participants")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
} }
@ -289,34 +289,34 @@ FocusScope {
id: participantList id: participantList
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: contentHeight Layout.preferredHeight: contentHeight
Layout.maximumHeight: 250 * DefaultStyle.dp Layout.maximumHeight: 250 * mainWindow.dp
clip: true clip: true
model: mainItem.conferenceInfoGui.core.participants model: mainItem.conferenceInfoGui.core.participants
delegate: Item { delegate: Item {
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
width: participantList.width width: participantList.width
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData.address _address: modelData.address
} }
Text { Text {
text: modelData.displayName text: modelData.displayName
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
font.capitalization: Font.Capitalize font.capitalization: Font.Capitalize
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Button { Button {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
Layout.rightMargin: 10 * DefaultStyle.dp Layout.rightMargin: 10 * mainWindow.dp
background: Item{} background: Item{}
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
@ -334,7 +334,7 @@ FocusScope {
} }
Item { Item {
Layout.fillHeight: true Layout.fillHeight: true
Layout.minimumHeight: 1 * DefaultStyle.dp Layout.minimumHeight: 1 * mainWindow.dp
} }
} }
} }

50
Linphone/view/Page/Form/Register/RegisterCheckingPage.qml
View file

@ -16,14 +16,14 @@ LoginLayout {
onCtrlIsPressedChanged: console.log("ctrl is pressed", ctrlIsPressed) onCtrlIsPressedChanged: console.log("ctrl is pressed", ctrlIsPressed)
titleContent: [ titleContent: [
RowLayout { RowLayout {
spacing: 21 * DefaultStyle.dp spacing: 21 * mainWindow.dp
Layout.leftMargin: 119 * DefaultStyle.dp Layout.leftMargin: 119 * mainWindow.dp
Button { Button {
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
background: Rectangle { background: Rectangle {
color: "transparent" color: "transparent"
} }
@ -43,8 +43,8 @@ LoginLayout {
text = qsTr("Inscription | Confirmer votre ") + completeString text = qsTr("Inscription | Confirmer votre ") + completeString
} }
font { font {
pixelSize: 36 * DefaultStyle.dp pixelSize: 36 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
scaleLettersFactor: 1.1 scaleLettersFactor: 1.1
} }
@ -58,14 +58,14 @@ LoginLayout {
ColumnLayout { ColumnLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 51 * DefaultStyle.dp anchors.topMargin: 51 * mainWindow.dp
anchors.leftMargin: 127 * DefaultStyle.dp anchors.leftMargin: 127 * mainWindow.dp
spacing: 104 * DefaultStyle.dp spacing: 104 * mainWindow.dp
Text { Text {
font { font {
bold: true bold: true
pixelSize: 22 * DefaultStyle.dp pixelSize: 22 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
text: { text: {
@ -74,7 +74,7 @@ LoginLayout {
} }
} }
RowLayout { RowLayout {
spacing: 45 * DefaultStyle.dp spacing: 45 * mainWindow.dp
Repeater { Repeater {
model: 4 model: 4
id: repeater id: repeater
@ -139,18 +139,18 @@ LoginLayout {
} }
} }
RowLayout { RowLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Text { Text {
text: "Didn't receive the code ?" text: "Didn't receive the code ?"
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
font.weight: 400 * DefaultStyle.dp font.weight: 400 * mainWindow.dp
} }
Button { Button {
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
inversedColors: true inversedColors: true
text: "Resend a code" text: "Resend a code"
onClicked: { onClicked: {
@ -162,10 +162,10 @@ LoginLayout {
Image { Image {
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 140 * DefaultStyle.dp anchors.topMargin: 140 * mainWindow.dp
anchors.rightMargin: 97 * DefaultStyle.dp anchors.rightMargin: 97 * mainWindow.dp
width: 477 * DefaultStyle.dp width: 477 * mainWindow.dp
height: 345 * DefaultStyle.dp height: 345 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: AppIcons.verif_page_image source: AppIcons.verif_page_image
} }

110
Linphone/view/Page/Form/Register/RegisterPage.qml
View file

@ -29,8 +29,8 @@ LoginLayout {
titleContent: [ titleContent: [
RowLayout { RowLayout {
spacing: 21 * DefaultStyle.dp spacing: 21 * mainWindow.dp
Layout.leftMargin: 119 * DefaultStyle.dp Layout.leftMargin: 119 * mainWindow.dp
Image { Image {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: AppIcons.profile source: AppIcons.profile
@ -39,8 +39,8 @@ LoginLayout {
Layout.preferredWidth: width Layout.preferredWidth: width
text: qsTr("Inscription") text: qsTr("Inscription")
font { font {
pixelSize: 36 * DefaultStyle.dp pixelSize: 36 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
scaleLettersFactor: 1.1 scaleLettersFactor: 1.1
@ -50,22 +50,22 @@ LoginLayout {
Layout.fillWidth: true Layout.fillWidth: true
}, },
RowLayout { RowLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 51 * DefaultStyle.dp Layout.rightMargin: 51 * mainWindow.dp
Text { Text {
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
text: qsTr("Déjà un compte ?") text: qsTr("Déjà un compte ?")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
Button { Button {
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
text: qsTr("Connexion") text: qsTr("Connexion")
onClicked: { onClicked: {
console.debug("[RegisterPage] User: return") console.debug("[RegisterPage] User: return")
@ -80,45 +80,45 @@ LoginLayout {
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 51 * DefaultStyle.dp anchors.topMargin: 51 * mainWindow.dp
anchors.leftMargin: 127 * DefaultStyle.dp anchors.leftMargin: 127 * mainWindow.dp
anchors.rightMargin: 127 * DefaultStyle.dp anchors.rightMargin: 127 * mainWindow.dp
spacing: 50 * DefaultStyle.dp spacing: 50 * mainWindow.dp
TabBar { TabBar {
Layout.fillWidth: true Layout.fillWidth: true
id: bar id: bar
model: [qsTr("Register with phone number"), qsTr("Register with email")] model: [qsTr("Register with phone number"), qsTr("Register with email")]
} }
ColumnLayout { ColumnLayout {
spacing: 22 * DefaultStyle.dp spacing: 22 * mainWindow.dp
ColumnLayout { ColumnLayout {
spacing: 24 * DefaultStyle.dp spacing: 24 * mainWindow.dp
RowLayout { RowLayout {
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
FormItemLayout { FormItemLayout {
id: usernameItem id: usernameItem
label: qsTr("Username") label: qsTr("Username")
mandatory: true mandatory: true
contentItem: TextField { contentItem: TextField {
id: usernameInput id: usernameInput
Layout.preferredWidth: 346 * DefaultStyle.dp Layout.preferredWidth: 346 * mainWindow.dp
backgroundBorderColor: usernameItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200 backgroundBorderColor: usernameItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
} }
} }
RowLayout { RowLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
ComboBox { ComboBox {
enabled: false enabled: false
model: [{text:"@sip.linphone.org"}] model: [{text:"@sip.linphone.org"}]
Layout.preferredWidth: 210 * DefaultStyle.dp Layout.preferredWidth: 210 * mainWindow.dp
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
} }
EffectImage { EffectImage {
imageSource: AppIcons.lock imageSource: AppIcons.lock
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
Layout.preferredWidth: 16 * DefaultStyle.dp Layout.preferredWidth: 16 * mainWindow.dp
Layout.preferredHeight: 16 * DefaultStyle.dp Layout.preferredHeight: 16 * mainWindow.dp
} }
} }
} }
@ -132,7 +132,7 @@ LoginLayout {
mandatory: true mandatory: true
placeholderText: "Phone number" placeholderText: "Phone number"
defaultCallingCode: "33" defaultCallingCode: "33"
Layout.preferredWidth: 346 * DefaultStyle.dp Layout.preferredWidth: 346 * mainWindow.dp
} }
FormItemLayout { FormItemLayout {
id: emailItem id: emailItem
@ -141,7 +141,7 @@ LoginLayout {
enableErrorText: true enableErrorText: true
contentItem: TextField { contentItem: TextField {
id: emailInput id: emailInput
Layout.preferredWidth: 346 * DefaultStyle.dp Layout.preferredWidth: 346 * mainWindow.dp
backgroundBorderColor: emailItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200 backgroundBorderColor: emailItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
} }
} }
@ -152,9 +152,9 @@ LoginLayout {
clip: false clip: false
RowLayout { RowLayout {
id: rowlayout id: rowlayout
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
ColumnLayout { ColumnLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
FormItemLayout { FormItemLayout {
id: passwordItem id: passwordItem
label: qsTr("Mot de passe") label: qsTr("Mot de passe")
@ -163,13 +163,13 @@ LoginLayout {
contentItem: TextField { contentItem: TextField {
id: pwdInput id: pwdInput
hidden: true hidden: true
Layout.preferredWidth: 346 * DefaultStyle.dp Layout.preferredWidth: 346 * mainWindow.dp
backgroundBorderColor: passwordItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200 backgroundBorderColor: passwordItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
} }
} }
} }
ColumnLayout { ColumnLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
FormItemLayout { FormItemLayout {
label: qsTr("Confirmation mot de passe") label: qsTr("Confirmation mot de passe")
mandatory: true mandatory: true
@ -177,7 +177,7 @@ LoginLayout {
contentItem: TextField { contentItem: TextField {
id: confirmPwdInput id: confirmPwdInput
hidden: true hidden: true
Layout.preferredWidth: 346 * DefaultStyle.dp Layout.preferredWidth: 346 * mainWindow.dp
backgroundBorderColor: passwordItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200 backgroundBorderColor: passwordItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
} }
} }
@ -186,22 +186,22 @@ LoginLayout {
TemporaryText { TemporaryText {
id: otherErrorText id: otherErrorText
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 5 * DefaultStyle.dp Layout.topMargin: 5 * mainWindow.dp
} }
} }
} }
// ColumnLayout { // ColumnLayout {
// spacing: 18 * DefaultStyle.dp // spacing: 18 * mainWindow.dp
// RowLayout { // RowLayout {
// spacing: 10 * DefaultStyle.dp // spacing: 10 * mainWindow.dp
// CheckBox { // CheckBox {
// id: subscribeToNewsletterCheckBox // id: subscribeToNewsletterCheckBox
// } // }
// Text { // Text {
// text: qsTr("Je souhaite souscrire à la newletter Linphone.") // text: qsTr("Je souhaite souscrire à la newletter Linphone.")
// font { // font {
// pixelSize: 14 * DefaultStyle.dp // pixelSize: 14 * mainWindow.dp
// weight: 400 * DefaultStyle.dp // weight: 400 * mainWindow.dp
// } // }
// MouseArea { // MouseArea {
// anchors.fill: parent // anchors.fill: parent
@ -211,7 +211,7 @@ LoginLayout {
// } // }
RowLayout { RowLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
CheckBox { CheckBox {
id: termsCheckBox id: termsCheckBox
} }
@ -221,8 +221,8 @@ LoginLayout {
Text { Text {
text: qsTr("J'accepte les ") text: qsTr("J'accepte les ")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -233,8 +233,8 @@ LoginLayout {
activeFocusOnTab: true activeFocusOnTab: true
font { font {
underline: true underline: true
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
bold: activeFocus bold: activeFocus
} }
text: qsTr("conditions d’utilisation") text: qsTr("conditions d’utilisation")
@ -255,16 +255,16 @@ LoginLayout {
Text { Text {
text: qsTr(" et la ") text: qsTr(" et la ")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
Text { Text {
activeFocusOnTab: true activeFocusOnTab: true
font { font {
underline: true underline: true
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
bold: activeFocus bold: activeFocus
} }
text: qsTr("politique de confidentialité.") text: qsTr("politique de confidentialité.")
@ -287,10 +287,10 @@ LoginLayout {
// } // }
Button { Button {
enabled: termsCheckBox.checked enabled: termsCheckBox.checked
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
text: qsTr("Créer") text: qsTr("Créer")
onClicked:{ onClicked:{
if (usernameInput.text.length === 0) { if (usernameInput.text.length === 0) {
@ -324,10 +324,10 @@ LoginLayout {
z: -1 z: -1
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 129 * DefaultStyle.dp anchors.topMargin: 129 * mainWindow.dp
anchors.rightMargin: 127 * DefaultStyle.dp anchors.rightMargin: 127 * mainWindow.dp
width: 395 * DefaultStyle.dp width: 395 * mainWindow.dp
height: 350 * DefaultStyle.dp height: 350 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: AppIcons.loginImage source: AppIcons.loginImage
} }

20
Linphone/view/Page/Form/Security/SecurityModePage.qml
View file

@ -16,28 +16,28 @@ LoginLayout {
Text { Text {
text: qsTr("Choisir votre mode") text: qsTr("Choisir votre mode")
font { font {
pixelSize: 36 * DefaultStyle.dp pixelSize: 36 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
Text { Text {
text: qsTr("Vous pourrez changer de mode plus tard.") text: qsTr("Vous pourrez changer de mode plus tard.")
font.bold: true font.bold: true
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
} }
centerContent: ColumnLayout { centerContent: ColumnLayout {
spacing: 80 * DefaultStyle.dp spacing: 80 * mainWindow.dp
RowLayout { RowLayout {
id: radioButtonsLayout id: radioButtonsLayout
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
spacing: 70 * DefaultStyle.dp spacing: 70 * mainWindow.dp
Repeater { Repeater {
model: [ model: [
{checked: true, title: qsTr("Chiffrement de bout en bout"), text: qsTr("Ce mode vous garanti la confidentialité de tous vos échanges. Notre technologie de chiffrement de bout en bout assure un niveau de sécurité maximal pour tous vos échanges."), imgUrl: AppIcons.chiffrement, color: DefaultStyle.info_500_main}, {checked: true, title: qsTr("Chiffrement de bout en bout"), text: qsTr("Ce mode vous garanti la confidentialité de tous vos échanges. Notre technologie de chiffrement de bout en bout assure un niveau de sécurité maximal pour tous vos échanges."), imgUrl: AppIcons.chiffrement, color: DefaultStyle.info_500_main},
@ -59,10 +59,10 @@ LoginLayout {
id: continueButton id: continueButton
property int selectedIndex: 0 property int selectedIndex: 0
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
leftPadding: 100 * DefaultStyle.dp leftPadding: 100 * mainWindow.dp
rightPadding: 100 * DefaultStyle.dp rightPadding: 100 * mainWindow.dp
text: qsTr("Continuer") text: qsTr("Continuer")
onClicked: mainItem.modeSelected(selectedIndex) onClicked: mainItem.modeSelected(selectedIndex)
} }

16
Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml
View file

@ -25,20 +25,20 @@ AbstractMainPage {
id: leftPanel id: leftPanel
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
property int sideMargin: 45 * DefaultStyle.dp property int sideMargin: 45 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: leftPanel.sideMargin Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin Layout.rightMargin: leftPanel.sideMargin
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Button { Button {
id: backButton id: backButton
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
focus: true focus: true
onClicked: { onClicked: {
mainItem.goBack() mainItem.goBack()
@ -62,7 +62,7 @@ AbstractMainPage {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
model: mainItem.families model: mainItem.families
Layout.topMargin: 41 * DefaultStyle.dp Layout.topMargin: 41 * mainWindow.dp
Layout.leftMargin: leftPanel.sideMargin Layout.leftMargin: leftPanel.sideMargin
property int selectedIndex: 0 property int selectedIndex: 0
activeFocusOnTab: true activeFocusOnTab: true

18
Linphone/view/Page/Layout/Login/LoginLayout.qml
View file

@ -14,7 +14,7 @@ Rectangle {
property alias centerContent : centerLayout.children property alias centerContent : centerLayout.children
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
ColumnLayout { ColumnLayout {
// anchors.leftMargin: 119 * DefaultStyle.dp // anchors.leftMargin: 119 * mainWindow.dp
id: contentLayout id: contentLayout
// anchors.top: parent.top // anchors.top: parent.top
// anchors.left: parent.left // anchors.left: parent.left
@ -24,8 +24,8 @@ Rectangle {
spacing: 0 spacing: 0
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 102 * DefaultStyle.dp Layout.preferredHeight: 102 * mainWindow.dp
Layout.rightMargin: 42 * DefaultStyle.dp Layout.rightMargin: 42 * mainWindow.dp
spacing: 0 spacing: 0
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
@ -33,12 +33,12 @@ Rectangle {
Button { Button {
id: aboutButton id: aboutButton
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
icon.source: AppIcons.info icon.source: AppIcons.info
text: qsTr("À propos") text: qsTr("À propos")
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main textColor: DefaultStyle.main2_500main
onClicked: console.debug("[LoginLayout]User: open about popup") onClicked: console.debug("[LoginLayout]User: open about popup")
@ -48,7 +48,7 @@ Rectangle {
RowLayout { RowLayout {
id: titleLayout id: titleLayout
Layout.preferredHeight: 131 * DefaultStyle.dp Layout.preferredHeight: 131 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
spacing: 0 spacing: 0
} }
@ -63,7 +63,7 @@ Rectangle {
source: AppIcons.belledonne source: AppIcons.belledonne
fillMode: Image.Stretch fillMode: Image.Stretch
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 108 * DefaultStyle.dp Layout.preferredHeight: 108 * mainWindow.dp
} }
} }

148
Linphone/view/Page/Layout/Main/MainLayout.qml
View file

@ -108,12 +108,12 @@ Item {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0
anchors.topMargin: 25 * DefaultStyle.dp anchors.topMargin: 25 * mainWindow.dp
VerticalTabBar { VerticalTabBar {
id: tabbar id: tabbar
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: 82 * DefaultStyle.dp Layout.preferredWidth: 82 * mainWindow.dp
defaultAccount: accountProxy.defaultAccount defaultAccount: accountProxy.defaultAccount
currentIndex: SettingsCpp.getLastActiveTabIndex() currentIndex: SettingsCpp.getLastActiveTabIndex()
Binding on currentIndex { Binding on currentIndex {
@ -145,10 +145,10 @@ Item {
RowLayout { RowLayout {
id: topRow id: topRow
Layout.preferredHeight: 50 * DefaultStyle.dp Layout.preferredHeight: 50 * mainWindow.dp
Layout.leftMargin: 45 * DefaultStyle.dp Layout.leftMargin: 45 * mainWindow.dp
Layout.rightMargin: 41 * DefaultStyle.dp Layout.rightMargin: 41 * mainWindow.dp
spacing: 25 * DefaultStyle.dp spacing: 25 * mainWindow.dp
SearchBar { SearchBar {
id: magicSearchBar id: magicSearchBar
Layout.fillWidth: true Layout.fillWidth: true
@ -172,18 +172,18 @@ Item {
component MagicSearchButton: Button { component MagicSearchButton: Button {
id: button id: button
width: 45 * DefaultStyle.dp width: 45 * mainWindow.dp
height: 45 * DefaultStyle.dp height: 45 * mainWindow.dp
topPadding: 16 * DefaultStyle.dp topPadding: 16 * mainWindow.dp
bottomPadding: 16 * DefaultStyle.dp bottomPadding: 16 * mainWindow.dp
leftPadding: 16 * DefaultStyle.dp leftPadding: 16 * mainWindow.dp
rightPadding: 16 * DefaultStyle.dp rightPadding: 16 * mainWindow.dp
contentImageColor: DefaultStyle.main2_500main contentImageColor: DefaultStyle.main2_500main
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
radius: 40 * DefaultStyle.dp radius: 40 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
} }
@ -191,21 +191,21 @@ Item {
Popup { Popup {
id: listPopup id: listPopup
width: magicSearchBar.width width: magicSearchBar.width
property int maxHeight: 400 * DefaultStyle.dp property int maxHeight: 400 * mainWindow.dp
property bool displayScrollbar: contactList.contentHeight + topPadding + bottomPadding> maxHeight property bool displayScrollbar: contactList.contentHeight + topPadding + bottomPadding> maxHeight
height: Math.min(contactList.contentHeight + topPadding + bottomPadding, maxHeight) height: Math.min(contactList.contentHeight + topPadding + bottomPadding, maxHeight)
y: magicSearchBar.height y: magicSearchBar.height
// closePolicy: Popup.NoAutoClose // closePolicy: Popup.NoAutoClose
topPadding: 20 * DefaultStyle.dp topPadding: 20 * mainWindow.dp
bottomPadding: 20 * DefaultStyle.dp bottomPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
Rectangle { Rectangle {
id: popupBg id: popupBg
radius: 16 * DefaultStyle.dp radius: 16 * mainWindow.dp
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
anchors.fill: parent anchors.fill: parent
border.color: DefaultStyle.main1_500_main border.color: DefaultStyle.main1_500_main
@ -222,14 +222,14 @@ Item {
} }
ScrollBar { ScrollBar {
id: scrollbar id: scrollbar
Component.onCompleted: x = -10 * DefaultStyle.dp Component.onCompleted: x = -10 * mainWindow.dp
policy: Control.ScrollBar.AsNeeded// Don't work as expected policy: Control.ScrollBar.AsNeeded// Don't work as expected
visible: listPopup.displayScrollbar visible: listPopup.displayScrollbar
interactive: true interactive: true
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.margins: 10 * DefaultStyle.dp anchors.margins: 10 * mainWindow.dp
} }
} }
@ -238,7 +238,7 @@ Item {
visible: magicSearchBar.text.length != 0 visible: magicSearchBar.text.length != 0
Layout.preferredHeight: contentHeight Layout.preferredHeight: contentHeight
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: 5 * DefaultStyle.dp Layout.rightMargin: 5 * mainWindow.dp
initialHeadersVisible: false initialHeadersVisible: false
contactMenuVisible: false contactMenuVisible: false
actionLayoutVisible: true actionLayoutVisible: true
@ -267,8 +267,8 @@ Item {
text: qsTr("Contact") text: qsTr("Contact")
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
footer: FocusScope{ footer: FocusScope{
@ -286,15 +286,15 @@ Item {
ColumnLayout { ColumnLayout {
id: content id: content
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: 5 * DefaultStyle.dp anchors.rightMargin: 5 * mainWindow.dp
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Text { Text {
text: qsTr("Suggestion") text: qsTr("Suggestion")
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
@ -310,18 +310,18 @@ Item {
} }
RowLayout { RowLayout {
id: suggestionRow id: suggestionRow
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
_address: magicSearchBar.text _address: magicSearchBar.text
} }
Text { Text {
property var urlObj: UtilsCpp.interpretUrl(magicSearchBar.text) property var urlObj: UtilsCpp.interpretUrl(magicSearchBar.text)
text: urlObj?.value text: urlObj?.value
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
Item { Item {
@ -329,8 +329,8 @@ Item {
} }
MagicSearchButton { MagicSearchButton {
id: callButton id: callButton
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
icon.source: AppIcons.phone icon.source: AppIcons.phone
focus: true focus: true
onClicked: { onClicked: {
@ -343,8 +343,8 @@ Item {
MagicSearchButton { MagicSearchButton {
id: chatButton id: chatButton
visible: !SettingsCpp.disableChatFeature visible: !SettingsCpp.disableChatFeature
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
icon.source: AppIcons.chatTeardropText icon.source: AppIcons.chatTeardropText
KeyNavigation.right: callButton KeyNavigation.right: callButton
KeyNavigation.left: callButton KeyNavigation.left: callButton
@ -356,28 +356,28 @@ Item {
} }
} }
RowLayout { RowLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
PopupButton { PopupButton {
id: deactivateDndButton id: deactivateDndButton
Layout.preferredWidth: 32 * DefaultStyle.dp Layout.preferredWidth: 32 * mainWindow.dp
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
popup.padding: 14 * DefaultStyle.dp popup.padding: 14 * mainWindow.dp
visible: SettingsCpp.dnd visible: SettingsCpp.dnd
contentItem: EffectImage { contentItem: EffectImage {
imageSource: AppIcons.bellDnd imageSource: AppIcons.bellDnd
width: 32 * DefaultStyle.dp width: 32 * mainWindow.dp
height: 32 * DefaultStyle.dp height: 32 * mainWindow.dp
Layout.preferredWidth: 32 * DefaultStyle.dp Layout.preferredWidth: 32 * mainWindow.dp
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.main1_500_main colorizationColor: DefaultStyle.main1_500_main
} }
popup.contentItem: ColumnLayout { popup.contentItem: ColumnLayout {
IconLabelButton { IconLabelButton {
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
focus: visible focus: visible
iconSize: 32 * DefaultStyle.dp iconSize: 32 * mainWindow.dp
text: qsTr("Désactiver ne pas déranger") text: qsTr("Désactiver ne pas déranger")
iconSource: AppIcons.bellDnd iconSource: AppIcons.bellDnd
onClicked: { onClicked: {
@ -389,8 +389,8 @@ Item {
} }
Voicemail { Voicemail {
id: voicemail id: voicemail
Layout.preferredWidth: 27 * DefaultStyle.dp Layout.preferredWidth: 27 * mainWindow.dp
Layout.preferredHeight: 28 * DefaultStyle.dp Layout.preferredHeight: 28 * mainWindow.dp
function cumulatedVoicemailCount() { function cumulatedVoicemailCount() {
var count = 0 var count = 0
@ -413,9 +413,9 @@ Item {
} }
PopupButton { PopupButton {
id: avatarButton id: avatarButton
Layout.preferredWidth: 54 * DefaultStyle.dp Layout.preferredWidth: 54 * mainWindow.dp
Layout.preferredHeight: width Layout.preferredHeight: width
popup.padding: 14 * DefaultStyle.dp popup.padding: 14 * mainWindow.dp
contentItem: Avatar { contentItem: Avatar {
id: avatar id: avatar
height: avatarButton.height height: avatarButton.height
@ -435,10 +435,10 @@ Item {
} }
PopupButton { PopupButton {
id: settingsMenuButton id: settingsMenuButton
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
popup.width: 271 * DefaultStyle.dp popup.width: 271 * mainWindow.dp
popup.padding: 14 * DefaultStyle.dp popup.padding: 14 * mainWindow.dp
popup.contentItem: FocusScope { popup.contentItem: FocusScope {
id: popupFocus id: popupFocus
implicitHeight: settingsButtons.implicitHeight implicitHeight: settingsButtons.implicitHeight
@ -451,7 +451,7 @@ Item {
ColumnLayout { ColumnLayout {
id: settingsButtons id: settingsButtons
anchors.fill: parent anchors.fill: parent
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
function getPreviousItem(index){ function getPreviousItem(index){
if(visibleChildren.length == 0) return null if(visibleChildren.length == 0) return null
@ -473,11 +473,11 @@ Item {
IconLabelButton { IconLabelButton {
id: accountButton id: accountButton
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
visible: !SettingsCpp.hideAccountSettings visible: !SettingsCpp.hideAccountSettings
focus: visible focus: visible
iconSize: 32 * DefaultStyle.dp iconSize: 32 * mainWindow.dp
text: qsTr("Mon compte") text: qsTr("Mon compte")
iconSource: AppIcons.manageProfile iconSource: AppIcons.manageProfile
onClicked: openAccountSettings(accountProxy.defaultAccount ? accountProxy.defaultAccount : accountProxy.firstAccount()) onClicked: openAccountSettings(accountProxy.defaultAccount ? accountProxy.defaultAccount : accountProxy.firstAccount())
@ -486,9 +486,9 @@ Item {
} }
IconLabelButton { IconLabelButton {
id: dndButton id: dndButton
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
iconSize: 32 * DefaultStyle.dp iconSize: 32 * mainWindow.dp
text: SettingsCpp.dnd ? qsTr("Désactiver ne pas déranger") : qsTr("Activer ne pas déranger") text: SettingsCpp.dnd ? qsTr("Désactiver ne pas déranger") : qsTr("Activer ne pas déranger")
iconSource: AppIcons.bellDnd iconSource: AppIcons.bellDnd
onClicked: { onClicked: {
@ -500,11 +500,11 @@ Item {
} }
IconLabelButton { IconLabelButton {
id: settingsButton id: settingsButton
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
visible: !SettingsCpp.hideSettings visible: !SettingsCpp.hideSettings
focus: !accountButton.visible && visible focus: !accountButton.visible && visible
iconSize: 32 * DefaultStyle.dp iconSize: 32 * mainWindow.dp
text: qsTr("Paramètres") text: qsTr("Paramètres")
iconSource: AppIcons.settings iconSource: AppIcons.settings
onClicked: openContextualMenuComponent(settingsPageComponent) onClicked: openContextualMenuComponent(settingsPageComponent)
@ -513,11 +513,11 @@ Item {
} }
IconLabelButton { IconLabelButton {
id: recordsButton id: recordsButton
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
visible: !SettingsCpp.disableCallRecordings visible: !SettingsCpp.disableCallRecordings
focus: !accountButton.visible && !settingsButton.visible && visible focus: !accountButton.visible && !settingsButton.visible && visible
iconSize: 32 * DefaultStyle.dp iconSize: 32 * mainWindow.dp
text: qsTr("Enregistrements") text: qsTr("Enregistrements")
iconSource: AppIcons.micro iconSource: AppIcons.micro
KeyNavigation.up: visibleChildren.length != 0 ? settingsButtons.getPreviousItem(2) : null KeyNavigation.up: visibleChildren.length != 0 ? settingsButtons.getPreviousItem(2) : null
@ -525,9 +525,9 @@ Item {
} }
IconLabelButton { IconLabelButton {
id: helpButton id: helpButton
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
iconSize: 32 * DefaultStyle.dp iconSize: 32 * mainWindow.dp
focus: !accountButton.visible && !settingsButton.visible && !recordsButton.visible focus: !accountButton.visible && !settingsButton.visible && !recordsButton.visible
text: qsTr("Aide") text: qsTr("Aide")
iconSource: AppIcons.question iconSource: AppIcons.question
@ -537,10 +537,10 @@ Item {
} }
IconLabelButton { IconLabelButton {
id: quitButton id: quitButton
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
focus: !accountButton.visible && !settingsButton.visible && visible focus: !accountButton.visible && !settingsButton.visible && visible
iconSize: 32 * DefaultStyle.dp iconSize: 32 * mainWindow.dp
text: qsTr("Quitter Linphone") text: qsTr("Quitter Linphone")
iconSource: AppIcons.power iconSource: AppIcons.power
onClicked: { onClicked: {
@ -561,16 +561,16 @@ Item {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
visible: addAccountButton.visible visible: addAccountButton.visible
color: DefaultStyle.main2_400 color: DefaultStyle.main2_400
} }
IconLabelButton { IconLabelButton {
id: addAccountButton id: addAccountButton
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
visible: SettingsCpp.maxAccount == 0 || SettingsCpp.maxAccount > accountProxy.count visible: SettingsCpp.maxAccount == 0 || SettingsCpp.maxAccount > accountProxy.count
iconSize: 32 * DefaultStyle.dp iconSize: 32 * mainWindow.dp
text: qsTr("Ajouter un compte") text: qsTr("Ajouter un compte")
iconSource: AppIcons.plusCircle iconSource: AppIcons.plusCircle
onClicked: mainItem.addAccountRequest() onClicked: mainItem.addAccountRequest()
@ -646,7 +646,7 @@ Item {
pushExit: noTransition pushExit: noTransition
popEnter: noTransition popEnter: noTransition
popExit: noTransition popExit: noTransition
Layout.topMargin: 24 * DefaultStyle.dp Layout.topMargin: 24 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
initialItem: mainStackLayoutComponent initialItem: mainStackLayoutComponent

30
Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml
View file

@ -19,10 +19,10 @@ Rectangle {
Control.ScrollView { Control.ScrollView {
id: scrollView id: scrollView
height: parent.height height: parent.height
width: parent.width - 2 * 45 * DefaultStyle.dp width: parent.width - 2 * 45 * mainWindow.dp
anchors.centerIn: parent anchors.centerIn: parent
contentHeight: content.height + 20 * DefaultStyle.dp contentHeight: content.height + 20 * mainWindow.dp
contentWidth: parent.width - 2 * 45 * DefaultStyle.dp contentWidth: parent.width - 2 * 45 * mainWindow.dp
Control.ScrollBar.vertical: ScrollBar { Control.ScrollBar.vertical: ScrollBar {
active: scrollView.contentHeight > container.height active: scrollView.contentHeight > container.height
interactive: true interactive: true
@ -30,7 +30,7 @@ Rectangle {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: -15 * DefaultStyle.dp anchors.rightMargin: -15 * mainWindow.dp
} }
Control.ScrollBar.horizontal: ScrollBar { Control.ScrollBar.horizontal: ScrollBar {
active: false active: false
@ -38,21 +38,21 @@ Rectangle {
ColumnLayout { ColumnLayout {
id: content id: content
width: parent.width width: parent.width
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Button { Button {
id: backButton id: backButton
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
focus: true focus: true
visible: mainItem.container.depth > 1 visible: mainItem.container.depth > 1
Layout.rightMargin: 41 * DefaultStyle.dp Layout.rightMargin: 41 * mainWindow.dp
onClicked: { onClicked: {
mainItem.container.pop() mainItem.container.pop()
} }
@ -71,13 +71,13 @@ Rectangle {
Loader { Loader {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
sourceComponent: mainItem.topbarOptionalComponent sourceComponent: mainItem.topbarOptionalComponent
Layout.rightMargin: 34 * DefaultStyle.dp Layout.rightMargin: 34 * mainWindow.dp
} }
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
height: 1 * DefaultStyle.dp height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
Loader { Loader {

148
Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml
View file

@ -15,18 +15,18 @@ AbstractSettingsLayout {
id: content id: content
ColumnLayout { ColumnLayout {
width: parent.width width: parent.width
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Détails") text: qsTr("Détails")
@ -48,23 +48,23 @@ AbstractSettingsLayout {
} }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
Avatar { Avatar {
account: model account: model
displayPresence: false displayPresence: false
Layout.preferredWidth: 100 * DefaultStyle.dp Layout.preferredWidth: 100 * mainWindow.dp
Layout.preferredHeight: 100 * DefaultStyle.dp Layout.preferredHeight: 100 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
IconLabelButton { IconLabelButton {
visible: model.core.pictureUri.length === 0 visible: model.core.pictureUri.length === 0
Layout.preferredWidth: width Layout.preferredWidth: width
Layout.preferredHeight: 17 * DefaultStyle.dp Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.camera iconSource: AppIcons.camera
iconSize: 17 * DefaultStyle.dp iconSize: 17 * mainWindow.dp
text: qsTr("Ajouter une image") text: qsTr("Ajouter une image")
onClicked: fileDialog.open() onClicked: fileDialog.open()
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
@ -73,21 +73,21 @@ AbstractSettingsLayout {
RowLayout { RowLayout {
visible: model.core.pictureUri.length > 0 visible: model.core.pictureUri.length > 0
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
IconLabelButton { IconLabelButton {
Layout.preferredWidth: width Layout.preferredWidth: width
Layout.preferredHeight: 17 * DefaultStyle.dp Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.pencil iconSource: AppIcons.pencil
iconSize: 17 * DefaultStyle.dp iconSize: 17 * mainWindow.dp
text: qsTr("Modifier l'image") text: qsTr("Modifier l'image")
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
onClicked: fileDialog.open() onClicked: fileDialog.open()
} }
IconLabelButton { IconLabelButton {
Layout.preferredWidth: width Layout.preferredWidth: width
Layout.preferredHeight: 17 * DefaultStyle.dp Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.trashCan iconSource: AppIcons.trashCan
iconSize: 17 * DefaultStyle.dp iconSize: 17 * mainWindow.dp
text: qsTr("Supprimer l'image") text: qsTr("Supprimer l'image")
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
onClicked: model.core.pictureUri = "" onClicked: model.core.pictureUri = ""
@ -105,7 +105,7 @@ AbstractSettingsLayout {
} }
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: qsTr("Adresse SIP :") text: qsTr("Adresse SIP :")
@ -123,16 +123,16 @@ AbstractSettingsLayout {
} }
IconLabelButton { IconLabelButton {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
Layout.preferredWidth: 20 * DefaultStyle.dp Layout.preferredWidth: 20 * mainWindow.dp
Layout.preferredHeight: 20 * DefaultStyle.dp Layout.preferredHeight: 20 * mainWindow.dp
iconSize: 24 * DefaultStyle.dp iconSize: 24 * mainWindow.dp
iconSource: AppIcons.copy iconSource: AppIcons.copy
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
onClicked: UtilsCpp.copyToClipboard(model.core.identityAddress) onClicked: UtilsCpp.copyToClipboard(model.core.identityAddress)
} }
} }
ColumnLayout { ColumnLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
Text { Text {
text: qsTr("Nom d’affichage") text: qsTr("Nom d’affichage")
@ -148,7 +148,7 @@ AbstractSettingsLayout {
TextField { TextField {
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
initialText: model.core.displayName initialText: model.core.displayName
backgroundColor: DefaultStyle.grey_100 backgroundColor: DefaultStyle.grey_100
onEditingFinished: { onEditingFinished: {
@ -163,7 +163,7 @@ AbstractSettingsLayout {
} }
ComboSetting { ComboSetting {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -15 * DefaultStyle.dp Layout.topMargin: -15 * mainWindow.dp
entries: account.core.dialPlans entries: account.core.dialPlans
propertyName: "dialPlan" propertyName: "dialPlan"
propertyOwner: account.core propertyOwner: account.core
@ -176,9 +176,9 @@ AbstractSettingsLayout {
} }
RowLayout { RowLayout {
id:mainItem id:mainItem
spacing : 20 * DefaultStyle.dp spacing : 20 * mainWindow.dp
ColumnLayout { ColumnLayout {
spacing : 5 * DefaultStyle.dp spacing : 5 * mainWindow.dp
Text { Text {
text: qsTr("Supprimer mon compte") text: qsTr("Supprimer mon compte")
font: Typography.p2l font: Typography.p2l
@ -200,17 +200,17 @@ AbstractSettingsLayout {
Button { Button {
background: Item{} background: Item{}
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
Layout.rightMargin: 5 * DefaultStyle.dp Layout.rightMargin: 5 * mainWindow.dp
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
contentItem: RowLayout { contentItem: RowLayout {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
EffectImage { EffectImage {
imageSource: AppIcons.trashCan imageSource: AppIcons.trashCan
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.danger_500main colorizationColor: DefaultStyle.danger_500main
} }
@ -233,22 +233,22 @@ AbstractSettingsLayout {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
height: 1 * DefaultStyle.dp height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Vos appareils") text: qsTr("Vos appareils")
@ -271,22 +271,22 @@ AbstractSettingsLayout {
RoundedPane { RoundedPane {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
// Layout.minimumHeight: account.core.devices.length * 133 * DefaultStyle.dp + (account.core.devices.length - 1) * 15 * DefaultStyle.dp + 2 * 21 * DefaultStyle.dp // Layout.minimumHeight: account.core.devices.length * 133 * mainWindow.dp + (account.core.devices.length - 1) * 15 * mainWindow.dp + 2 * 21 * mainWindow.dp
Layout.rightMargin: 30 * DefaultStyle.dp Layout.rightMargin: 30 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.bottomMargin: 4 * DefaultStyle.dp Layout.bottomMargin: 4 * mainWindow.dp
Layout.leftMargin: 44 * DefaultStyle.dp Layout.leftMargin: 44 * mainWindow.dp
topPadding: 21 * DefaultStyle.dp topPadding: 21 * mainWindow.dp
bottomPadding: 21 * DefaultStyle.dp bottomPadding: 21 * mainWindow.dp
leftPadding: 17 * DefaultStyle.dp leftPadding: 17 * mainWindow.dp
rightPadding: 17 * DefaultStyle.dp rightPadding: 17 * mainWindow.dp
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
} }
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
Repeater { Repeater {
id: devices id: devices
model: AccountDeviceProxy { model: AccountDeviceProxy {
@ -295,25 +295,25 @@ AbstractSettingsLayout {
} }
Control.Control{ Control.Control{
Layout.fillWidth: true Layout.fillWidth: true
height: 133 * DefaultStyle.dp height: 133 * mainWindow.dp
topPadding: 26 * DefaultStyle.dp topPadding: 26 * mainWindow.dp
bottomPadding: 26 * DefaultStyle.dp bottomPadding: 26 * mainWindow.dp
rightPadding: 36 * DefaultStyle.dp rightPadding: 36 * mainWindow.dp
leftPadding: 33 * DefaultStyle.dp leftPadding: 33 * mainWindow.dp
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: 10 * DefaultStyle.dp radius: 10 * mainWindow.dp
} }
contentItem: ColumnLayout { contentItem: ColumnLayout {
width: parent.width width: parent.width
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
RowLayout { RowLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
EffectImage { EffectImage {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
imageSource: modelData.core.userAgent.toLowerCase().includes('ios') | modelData.core.userAgent.toLowerCase().includes('android') ? AppIcons.mobile : AppIcons.desktop imageSource: modelData.core.userAgent.toLowerCase().includes('ios') | modelData.core.userAgent.toLowerCase().includes('android') ? AppIcons.mobile : AppIcons.desktop
@ -330,8 +330,8 @@ AbstractSettingsLayout {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Supprimer") text: qsTr("Supprimer")
icon.source: AppIcons.trashCan icon.source: AppIcons.trashCan
icon.width: 16 * DefaultStyle.dp icon.width: 16 * mainWindow.dp
icon.height: 16 * DefaultStyle.dp icon.height: 16 * mainWindow.dp
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
onClicked: { onClicked: {
var mainWin = UtilsCpp.getMainWindow() var mainWin = UtilsCpp.getMainWindow()
@ -347,15 +347,15 @@ AbstractSettingsLayout {
} }
} }
RowLayout { RowLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
text: qsTr("Dernière connexion:") text: qsTr("Dernière connexion:")
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
font: Typography.p2 font: Typography.p2
} }
EffectImage { EffectImage {
Layout.preferredWidth: 20 * DefaultStyle.dp Layout.preferredWidth: 20 * mainWindow.dp
Layout.preferredHeight: 20 * DefaultStyle.dp Layout.preferredHeight: 20 * mainWindow.dp
imageSource: AppIcons.calendar imageSource: AppIcons.calendar
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
@ -366,8 +366,8 @@ AbstractSettingsLayout {
font: Typography.p1 font: Typography.p1
} }
EffectImage { EffectImage {
Layout.preferredWidth: 20 * DefaultStyle.dp Layout.preferredWidth: 20 * mainWindow.dp
Layout.preferredHeight: 20 * DefaultStyle.dp Layout.preferredHeight: 20 * mainWindow.dp
imageSource: AppIcons.clock imageSource: AppIcons.clock
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit

52
Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
View file

@ -15,18 +15,18 @@ AbstractSettingsLayout {
id: content id: content
ColumnLayout { ColumnLayout {
width: parent.width width: parent.width
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Paramètres") text: qsTr("Paramètres")
@ -42,10 +42,10 @@ AbstractSettingsLayout {
ColumnLayout { ColumnLayout {
id: column id: column
Layout.fillWidth: true Layout.fillWidth: true
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
DecoratedTextField { DecoratedTextField {
propertyName: "mwiServerAddress" propertyName: "mwiServerAddress"
propertyOwner: account.core propertyOwner: account.core
@ -61,21 +61,21 @@ AbstractSettingsLayout {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
height: 1 * DefaultStyle.dp height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Paramètres avancés") text: qsTr("Paramètres avancés")
@ -90,10 +90,10 @@ AbstractSettingsLayout {
} }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
Text { Text {
text: qsTr("Transport") text: qsTr("Transport")
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
@ -101,7 +101,7 @@ AbstractSettingsLayout {
} }
ComboSetting { ComboSetting {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -15 * DefaultStyle.dp Layout.topMargin: -15 * mainWindow.dp
entries: account.core.transports entries: account.core.transports
propertyName: "transport" propertyName: "transport"
propertyOwner: account.core propertyOwner: account.core

94
Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
View file

@ -13,18 +13,18 @@ AbstractSettingsLayout {
id: content id: content
ColumnLayout { ColumnLayout {
width: parent.width width: parent.width
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Configuration distante") text: qsTr("Configuration distante")
@ -39,10 +39,10 @@ AbstractSettingsLayout {
} }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
DecoratedTextField { DecoratedTextField {
Layout.fillWidth: true Layout.fillWidth: true
id: configUri id: configUri
@ -64,22 +64,22 @@ AbstractSettingsLayout {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 35 * DefaultStyle.dp Layout.topMargin: 35 * mainWindow.dp
Layout.bottomMargin: 9 * DefaultStyle.dp Layout.bottomMargin: 9 * mainWindow.dp
height: 1 * DefaultStyle.dp height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Codecs Audio") text: qsTr("Codecs Audio")
@ -94,10 +94,10 @@ AbstractSettingsLayout {
} }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
Repeater { Repeater {
model: PayloadTypeProxy { model: PayloadTypeProxy {
family: PayloadTypeCore.Audio family: PayloadTypeCore.Audio
@ -114,22 +114,22 @@ AbstractSettingsLayout {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 35 * DefaultStyle.dp Layout.topMargin: 35 * mainWindow.dp
Layout.bottomMargin: 9 * DefaultStyle.dp Layout.bottomMargin: 9 * mainWindow.dp
height: 1 * DefaultStyle.dp height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Codecs Vidéo") text: qsTr("Codecs Vidéo")
@ -144,10 +144,10 @@ AbstractSettingsLayout {
} }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
Repeater { Repeater {
model: PayloadTypeProxy { model: PayloadTypeProxy {
family: PayloadTypeCore.Video family: PayloadTypeCore.Video
@ -164,19 +164,19 @@ AbstractSettingsLayout {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 35 * DefaultStyle.dp Layout.topMargin: 35 * mainWindow.dp
Layout.bottomMargin: 9 * DefaultStyle.dp Layout.bottomMargin: 9 * mainWindow.dp
height: 1 * DefaultStyle.dp height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Item { Item {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
} }
SwitchSetting { SwitchSetting {
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
titleText:qsTr("Cacher les FPS") titleText:qsTr("Cacher les FPS")
propertyName: "hideFps" propertyName: "hideFps"
propertyOwner: SettingsCpp propertyOwner: SettingsCpp

26
Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml
View file

@ -12,16 +12,16 @@ AbstractSettingsLayout {
id: content id: content
ColumnLayout { ColumnLayout {
RowLayout { RowLayout {
spacing: 47 * DefaultStyle.dp spacing: 47 * mainWindow.dp
ColumnLayout { ColumnLayout {
Item { Item {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
} }
} }
ColumnLayout { ColumnLayout {
Layout.rightMargin: 25 * DefaultStyle.dp Layout.rightMargin: 25 * mainWindow.dp
Layout.topMargin: 36 * DefaultStyle.dp Layout.topMargin: 36 * mainWindow.dp
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
SwitchSetting { SwitchSetting {
titleText: qsTr("Annulateur d'écho") titleText: qsTr("Annulateur d'écho")
subTitleText: qsTr("Évite que de l'écho soit entendu par votre correspondant") subTitleText: qsTr("Évite que de l'écho soit entendu par votre correspondant")
@ -40,16 +40,16 @@ AbstractSettingsLayout {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
Layout.topMargin: 38 * DefaultStyle.dp Layout.topMargin: 38 * mainWindow.dp
Layout.bottomMargin: 16 * DefaultStyle.dp Layout.bottomMargin: 16 * mainWindow.dp
} }
RowLayout { RowLayout {
spacing: 47 * DefaultStyle.dp spacing: 47 * mainWindow.dp
ColumnLayout { ColumnLayout {
Item { Item {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Text { Text {
id: periphTitle id: periphTitle
text: qsTr("Périphériques") text: qsTr("Périphériques")
@ -59,7 +59,7 @@ AbstractSettingsLayout {
} }
Text { Text {
anchors.top: periphTitle.bottom anchors.top: periphTitle.bottom
anchors.topMargin: 3 * DefaultStyle.dp anchors.topMargin: 3 * mainWindow.dp
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Vous pouvez modifier les périphériques de sortie audio, le microphone et la caméra de capture.") text: qsTr("Vous pouvez modifier les périphériques de sortie audio, le microphone et la caméra de capture.")
@ -75,8 +75,8 @@ AbstractSettingsLayout {
MultimediaSettings { MultimediaSettings {
ringerDevicesVisible: true ringerDevicesVisible: true
backgroundVisible: false backgroundVisible: false
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
} }
} }
} }

30
Linphone/view/Page/Layout/Settings/CarddavSettingsLayout.qml
View file

@ -16,12 +16,12 @@ AbstractSettingsLayout {
Component { Component {
id: topBar id: topBar
RowLayout { RowLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Button { Button {
background: Item{} background: Item{}
icon.source: AppIcons.trashCan icon.source: AppIcons.trashCan
icon.width: 32 * DefaultStyle.dp icon.width: 32 * mainWindow.dp
icon.height: 32 * DefaultStyle.dp icon.height: 32 * mainWindow.dp
contentImageColor: DefaultStyle.main2_600 contentImageColor: DefaultStyle.main2_600
visible: !isNew visible: !isNew
onClicked: { onClicked: {
@ -64,18 +64,18 @@ AbstractSettingsLayout {
id: content id: content
ColumnLayout { ColumnLayout {
width: parent.width width: parent.width
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Carnet d'adresse CardDAV") text: qsTr("Carnet d'adresse CardDAV")
@ -97,10 +97,10 @@ AbstractSettingsLayout {
} }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
DecoratedTextField { DecoratedTextField {
propertyName: "displayName" propertyName: "displayName"
propertyOwner: carddavGui.core propertyOwner: carddavGui.core

8
Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml
View file

@ -17,7 +17,7 @@ AbstractSettingsLayout {
Component { Component {
id: content id: content
ColumnLayout { ColumnLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ContactsSettingsProviderLayout { ContactsSettingsProviderLayout {
title: qsTr("Annuaires LDAP") title: qsTr("Annuaires LDAP")
addText: qsTr("Ajouter un annuaire LDAP") addText: qsTr("Ajouter un annuaire LDAP")
@ -33,9 +33,9 @@ AbstractSettingsLayout {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 35 * DefaultStyle.dp Layout.topMargin: 35 * mainWindow.dp
Layout.bottomMargin: 9 * DefaultStyle.dp Layout.bottomMargin: 9 * mainWindow.dp
height: 1 * DefaultStyle.dp height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
} }
ContactsSettingsProviderLayout { ContactsSettingsProviderLayout {

32
Linphone/view/Page/Layout/Settings/ContactsSettingsProviderLayout.qml
View file

@ -20,14 +20,14 @@ RowLayout {
property bool supportsEnableDisable property bool supportsEnableDisable
property bool showAddButton property bool showAddButton
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
text: mainItem.title text: mainItem.title
font: Typography.h4 font: Typography.h4
@ -48,25 +48,25 @@ RowLayout {
} }
} }
ColumnLayout { ColumnLayout {
Layout.rightMargin: 25 * DefaultStyle.dp Layout.rightMargin: 25 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
spacing: 27 * DefaultStyle.dp spacing: 27 * mainWindow.dp
Layout.leftMargin: 76 * DefaultStyle.dp Layout.leftMargin: 76 * mainWindow.dp
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
Repeater { Repeater {
model: mainItem.proxyModel model: mainItem.proxyModel
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft|Qt.AlignHCenter Layout.alignment: Qt.AlignLeft|Qt.AlignHCenter
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
text: modelData.core[titleProperty] text: modelData.core[titleProperty]
font: Typography.p2l font: Typography.p2l
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 17 * DefaultStyle.dp Layout.leftMargin: 17 * mainWindow.dp
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
@ -74,8 +74,8 @@ RowLayout {
Button { Button {
background: Item{} background: Item{}
icon.source: AppIcons.pencil icon.source: AppIcons.pencil
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
contentImageColor: DefaultStyle.main2_600 contentImageColor: DefaultStyle.main2_600
onClicked: { onClicked: {
mainItem.owner.container.push(mainItem.settingsLayout, { mainItem.owner.container.push(mainItem.settingsLayout, {
@ -88,7 +88,7 @@ RowLayout {
Switch { Switch {
id: switchButton id: switchButton
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.rightMargin: 17 * DefaultStyle.dp Layout.rightMargin: 17 * mainWindow.dp
checked: supportsEnableDisable && modelData.core["enabled"] checked: supportsEnableDisable && modelData.core["enabled"]
visible: supportsEnableDisable visible: supportsEnableDisable
onToggled: { onToggled: {
@ -113,12 +113,12 @@ RowLayout {
} }
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Button { Button {
Layout.preferredHeight: 47 * DefaultStyle.dp Layout.preferredHeight: 47 * mainWindow.dp
Layout.alignment: Qt.AlignRight | Qt.AlignHCenter Layout.alignment: Qt.AlignRight | Qt.AlignHCenter
text: qsTr("Ajouter") text: qsTr("Ajouter")
visible: mainItem.showAddButton visible: mainItem.showAddButton

2
Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml
View file

@ -49,7 +49,7 @@ AbstractSettingsLayout {
Component { Component {
id: content id: content
ColumnLayout { ColumnLayout {
spacing: 40 * DefaultStyle.dp spacing: 40 * mainWindow.dp
SwitchSetting { SwitchSetting {
titleText: qsTr("Activer les traces de débogage") titleText: qsTr("Activer les traces de débogage")
propertyName: "logsEnabled" propertyName: "logsEnabled"

30
Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml
View file

@ -16,12 +16,12 @@ AbstractSettingsLayout {
Component { Component {
id: topBar id: topBar
RowLayout { RowLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Button { Button {
background: Item{} background: Item{}
icon.source: AppIcons.trashCan icon.source: AppIcons.trashCan
icon.width: 32 * DefaultStyle.dp icon.width: 32 * mainWindow.dp
icon.height: 32 * DefaultStyle.dp icon.height: 32 * mainWindow.dp
contentImageColor: DefaultStyle.main2_600 contentImageColor: DefaultStyle.main2_600
visible: !isNew visible: !isNew
onClicked: { onClicked: {
@ -56,18 +56,18 @@ AbstractSettingsLayout {
id: content id: content
ColumnLayout { ColumnLayout {
width: parent.width width: parent.width
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
RowLayout { RowLayout {
Layout.topMargin: 16 * DefaultStyle.dp Layout.topMargin: 16 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
Layout.minimumWidth: 341 * DefaultStyle.dp Layout.minimumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Annuaires LDAP") text: qsTr("Annuaires LDAP")
@ -89,10 +89,10 @@ AbstractSettingsLayout {
} }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
Layout.rightMargin: 44 * DefaultStyle.dp Layout.rightMargin: 44 * mainWindow.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
DecoratedTextField { DecoratedTextField {
id: server id: server
propertyName: "server" propertyName: "server"

20
Linphone/view/Page/Layout/Settings/NetworkSettingsLayout.qml
View file

@ -10,16 +10,16 @@ AbstractSettingsLayout {
Component { Component {
id: content id: content
ColumnLayout { ColumnLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
RowLayout { RowLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.preferredWidth: 341 * DefaultStyle.dp Layout.preferredWidth: 341 * mainWindow.dp
Layout.maximumWidth: 341 * DefaultStyle.dp Layout.maximumWidth: 341 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
text: qsTr("Réseau") text: qsTr("Réseau")
font: Typography.h4 font: Typography.h4
@ -33,10 +33,10 @@ AbstractSettingsLayout {
} }
} }
ColumnLayout { ColumnLayout {
Layout.rightMargin: 25 * DefaultStyle.dp Layout.rightMargin: 25 * mainWindow.dp
Layout.topMargin: 36 * DefaultStyle.dp Layout.topMargin: 36 * mainWindow.dp
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * mainWindow.dp
spacing: 40 * DefaultStyle.dp spacing: 40 * mainWindow.dp
SwitchSetting { SwitchSetting {
Layout.fillWidth: true Layout.fillWidth: true
titleText: qsTr("Autoriser l'IPv6") titleText: qsTr("Autoriser l'IPv6")

2
Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml
View file

@ -10,7 +10,7 @@ AbstractSettingsLayout {
Component { Component {
id: content id: content
Column { Column {
spacing: 40 * DefaultStyle.dp spacing: 40 * mainWindow.dp
SwitchSetting { SwitchSetting {
titleText: qsTr("Chiffrer tous les fichiers") titleText: qsTr("Chiffrer tous les fichiers")
subTitleText: qsTr("Attention, vous ne pourrez pas revenir en arrière !") subTitleText: qsTr("Attention, vous ne pourrez pas revenir en arrière !")

56
Linphone/view/Page/Main/AbstractMainPage.qml
View file

@ -24,16 +24,16 @@ FocusScope {
// Control.SplitView { // Control.SplitView {
// id: splitView // id: splitView
// anchors.fill: parent // anchors.fill: parent
// anchors.topMargin: 10 * DefaultStyle.dp // anchors.topMargin: 10 * mainWindow.dp
// handle: Rectangle { // handle: Rectangle {
// implicitWidth: 8 * DefaultStyle.dp // implicitWidth: 8 * mainWindow.dp
// color: Control.SplitHandle.hovered ? DefaultStyle.grey_200 : DefaultStyle.grey_100 // color: Control.SplitHandle.hovered ? DefaultStyle.grey_200 : DefaultStyle.grey_100
// } // }
// ColumnLayout { // ColumnLayout {
// id: leftPanel // id: leftPanel
// Control.SplitView.preferredWidth: 350 * DefaultStyle.dp // Control.SplitView.preferredWidth: 350 * mainWindow.dp
// Control.SplitView.minimumWidth: 350 * DefaultStyle.dp // Control.SplitView.minimumWidth: 350 * mainWindow.dp
// } // }
// Rectangle { // Rectangle {
// id: rightPanel // id: rightPanel
@ -55,23 +55,23 @@ FocusScope {
// Layout.fillWidth: true // Layout.fillWidth: true
// } // }
// ColumnLayout { // ColumnLayout {
// spacing: 30 * DefaultStyle.dp // spacing: 30 * mainWindow.dp
// Item { // Item {
// Layout.fillHeight: true // Layout.fillHeight: true
// } // }
// Image { // Image {
// Layout.alignment: Qt.AlignHCenter // Layout.alignment: Qt.AlignHCenter
// source: AppIcons.noItemImage // source: AppIcons.noItemImage
// Layout.preferredWidth: 359 * DefaultStyle.dp // Layout.preferredWidth: 359 * mainWindow.dp
// Layout.preferredHeight: 314 * DefaultStyle.dp // Layout.preferredHeight: 314 * mainWindow.dp
// fillMode: Image.PreserveAspectFit // fillMode: Image.PreserveAspectFit
// } // }
// Text { // Text {
// text: mainItem.emptyListText // text: mainItem.emptyListText
// Layout.alignment: Qt.AlignHCenter // Layout.alignment: Qt.AlignHCenter
// font { // font {
// pixelSize: 22 * DefaultStyle.dp // pixelSize: 22 * mainWindow.dp
// weight: 800 * DefaultStyle.dp // weight: 800 * mainWindow.dp
// } // }
// } // }
// Button { // Button {
@ -81,8 +81,8 @@ FocusScope {
// EffectImage { // EffectImage {
// colorizationColor: DefaultStyle.grey_0 // colorizationColor: DefaultStyle.grey_0
// source: mainItem.newItemIconSource // source: mainItem.newItemIconSource
// width: 24 * DefaultStyle.dp // width: 24 * mainWindow.dp
// height: 24 * DefaultStyle.dp // height: 24 * mainWindow.dp
// fillMode: Image.PreserveAspectFit // fillMode: Image.PreserveAspectFit
// } // }
// Text { // Text {
@ -90,8 +90,8 @@ FocusScope {
// wrapMode: Text.WordWrap // wrapMode: Text.WordWrap
// color: DefaultStyle.grey_0 // color: DefaultStyle.grey_0
// font { // font {
// weight: 600 * DefaultStyle.dp // weight: 600 * mainWindow.dp
// pixelSize: 18 * DefaultStyle.dp // pixelSize: 18 * mainWindow.dp
// family: DefaultStyle.defaultFont // family: DefaultStyle.defaultFont
// } // }
// } // }
@ -122,13 +122,13 @@ FocusScope {
spacing: 0 spacing: 0
ColumnLayout { ColumnLayout {
id: leftPanel id: leftPanel
Layout.preferredWidth: 404 * DefaultStyle.dp Layout.preferredWidth: 404 * mainWindow.dp
Layout.fillWidth:false Layout.fillWidth:false
spacing:0 spacing:0
} }
Rectangle { Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: 1 * DefaultStyle.dp Layout.preferredWidth: 1 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
Rectangle { Rectangle {
@ -150,38 +150,38 @@ FocusScope {
Layout.fillWidth: true Layout.fillWidth: true
} }
ColumnLayout { ColumnLayout {
spacing: 30 * DefaultStyle.dp spacing: 30 * mainWindow.dp
Item { Item {
Layout.fillHeight: true Layout.fillHeight: true
} }
Image { Image {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
source: AppIcons.noItemImage source: AppIcons.noItemImage
Layout.preferredWidth: 359 * DefaultStyle.dp Layout.preferredWidth: 359 * mainWindow.dp
Layout.preferredHeight: 314 * DefaultStyle.dp Layout.preferredHeight: 314 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
} }
Text { Text {
text: mainItem.emptyListText text: mainItem.emptyListText
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font { font {
pixelSize: 22 * DefaultStyle.dp pixelSize: 22 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
Button { Button {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
contentItem: RowLayout { contentItem: RowLayout {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
EffectImage { EffectImage {
colorizationColor: DefaultStyle.grey_0 colorizationColor: DefaultStyle.grey_0
imageSource: mainItem.newItemIconSource imageSource: mainItem.newItemIconSource
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
} }
Text { Text {
@ -189,8 +189,8 @@ FocusScope {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
weight: 600 * DefaultStyle.dp weight: 600 * mainWindow.dp
pixelSize: 18 * DefaultStyle.dp pixelSize: 18 * mainWindow.dp
family: DefaultStyle.defaultFont family: DefaultStyle.defaultFont
} }
} }

32
Linphone/view/Page/Main/Account/AccountListView.qml
View file

@ -11,18 +11,18 @@ import LinphoneAccountsCpp
Item { Item {
id: mainItem id: mainItem
width: 517 * DefaultStyle.dp width: 517 * mainWindow.dp
readonly property int topPadding: 23 * DefaultStyle.dp readonly property int topPadding: 23 * mainWindow.dp
readonly property int bottomPadding: 23 * DefaultStyle.dp readonly property int bottomPadding: 23 * mainWindow.dp
readonly property int leftPadding: 32 * DefaultStyle.dp readonly property int leftPadding: 32 * mainWindow.dp
readonly property int rightPadding: 32 * DefaultStyle.dp readonly property int rightPadding: 32 * mainWindow.dp
readonly property int spacing: 16 * DefaultStyle.dp readonly property int spacing: 16 * mainWindow.dp
property AccountProxy accountProxy property AccountProxy accountProxy
signal addAccountRequest() signal addAccountRequest()
signal editAccount(AccountGui account) signal editAccount(AccountGui account)
implicitHeight: list.contentHeight + topPadding + bottomPadding + 32 * DefaultStyle.dp + 1 + newAccountArea.height implicitHeight: list.contentHeight + topPadding + bottomPadding + 32 * mainWindow.dp + 1 + newAccountArea.height
ColumnLayout{ ColumnLayout{
id: childLayout id: childLayout
anchors.top: parent.top anchors.top: parent.top
@ -64,26 +64,26 @@ Item {
Layout.topMargin: mainItem.spacing Layout.topMargin: mainItem.spacing
Layout.bottomMargin: mainItem.spacing Layout.bottomMargin: mainItem.spacing
visible: addAccountButton.visible visible: addAccountButton.visible
height: 1 * DefaultStyle.dp height: 1 * mainWindow.dp
color: DefaultStyle.main2_300 color: DefaultStyle.main2_300
} }
MouseArea{ MouseArea{
id: addAccountButton id: addAccountButton
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
visible: SettingsCpp.maxAccount == 0 || SettingsCpp.maxAccount > accountProxy.count visible: SettingsCpp.maxAccount == 0 || SettingsCpp.maxAccount > accountProxy.count
onClicked: mainItem.addAccountRequest() onClicked: mainItem.addAccountRequest()
RowLayout{ RowLayout{
id: newAccountArea id: newAccountArea
anchors.fill: parent anchors.fill: parent
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
EffectImage { EffectImage {
id: newAccount id: newAccount
imageSource: AppIcons.plusCircle imageSource: AppIcons.plusCircle
width: 32 * DefaultStyle.dp width: 32 * mainWindow.dp
height: 32 * DefaultStyle.dp height: 32 * mainWindow.dp
Layout.preferredWidth: 32 * DefaultStyle.dp Layout.preferredWidth: 32 * mainWindow.dp
Layout.preferredHeight: 32 * DefaultStyle.dp Layout.preferredHeight: 32 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.main2_500main colorizationColor: DefaultStyle.main2_500main
@ -92,8 +92,8 @@ Item {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.weight: 400 * DefaultStyle.dp font.weight: 400 * mainWindow.dp
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
text: 'Ajouter un compte' text: 'Ajouter un compte'
} }

236
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -47,7 +47,7 @@ AbstractMainPage {
else rightPanelStackView.replace(emptySelection, Control.StackView.Immediate) else rightPanelStackView.replace(emptySelection, Control.StackView.Immediate)
} }
rightPanelStackView.initialItem: emptySelection rightPanelStackView.initialItem: emptySelection
rightPanelStackView.width: 360 * DefaultStyle.dp rightPanelStackView.width: 360 * mainWindow.dp
onNoItemButtonPressed: goToNewCall() onNoItemButtonPressed: goToNewCall()
@ -62,12 +62,12 @@ AbstractMainPage {
Dialog { Dialog {
id: deleteHistoryPopup id: deleteHistoryPopup
width: 278 * DefaultStyle.dp width: 278 * mainWindow.dp
text: qsTr("L'historique d'appel sera supprimé. Souhaitez-vous continuer ?") text: qsTr("L'historique d'appel sera supprimé. Souhaitez-vous continuer ?")
} }
Dialog { Dialog {
id: deleteForUserPopup id: deleteForUserPopup
width: 278 * DefaultStyle.dp width: 278 * mainWindow.dp
text: qsTr("L'historique d'appel de l'utilisateur sera supprimé. Souhaitez-vous continuer ?") text: qsTr("L'historique d'appel de l'utilisateur sera supprimé. Souhaitez-vous continuer ?")
} }
@ -90,9 +90,9 @@ AbstractMainPage {
Control.StackView { Control.StackView {
id: listStackView id: listStackView
anchors.top: titleLoader.bottom anchors.top: titleLoader.bottom
anchors.topMargin: 18 * DefaultStyle.dp anchors.topMargin: 18 * mainWindow.dp
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 45 * DefaultStyle.dp anchors.leftMargin: 45 * mainWindow.dp
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
clip: true clip: true
@ -107,7 +107,7 @@ AbstractMainPage {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: 402 * DefaultStyle.dp height: 402 * mainWindow.dp
NumericPadPopup { NumericPadPopup {
id: numericPadPopup id: numericPadPopup
width: parent.width width: parent.width
@ -129,32 +129,32 @@ AbstractMainPage {
RowLayout { RowLayout {
id: titleCallLayout id: titleCallLayout
anchors.fill: parent anchors.fill: parent
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
Text { Text {
text: qsTr("Appels") text: qsTr("Appels")
Layout.leftMargin: 45 * DefaultStyle.dp Layout.leftMargin: 45 * mainWindow.dp
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
font.pixelSize: 29 * DefaultStyle.dp font.pixelSize: 29 * mainWindow.dp
font.weight: 800 * DefaultStyle.dp font.weight: 800 * mainWindow.dp
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
PopupButton { PopupButton {
id: removeHistory id: removeHistory
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
focus: true focus: true
popup.x: 0 popup.x: 0
popup.padding: 20 * DefaultStyle.dp popup.padding: 20 * mainWindow.dp
KeyNavigation.right: newCallButton KeyNavigation.right: newCallButton
KeyNavigation.down: listStackView KeyNavigation.down: listStackView
popup.contentItem: ColumnLayout { popup.contentItem: ColumnLayout {
IconLabelButton { IconLabelButton {
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
focus: visible focus: visible
iconSize: 24 * DefaultStyle.dp iconSize: 24 * mainWindow.dp
text: qsTr("Supprimer l'historique") text: qsTr("Supprimer l'historique")
iconSource: AppIcons.trashCan iconSource: AppIcons.trashCan
color: DefaultStyle.danger_500main color: DefaultStyle.danger_500main
@ -175,11 +175,11 @@ AbstractMainPage {
id: newCallButton id: newCallButton
background: Item {} background: Item {}
icon.source: AppIcons.newCall icon.source: AppIcons.newCall
Layout.preferredWidth: 28 * DefaultStyle.dp Layout.preferredWidth: 28 * mainWindow.dp
Layout.preferredHeight: 28 * DefaultStyle.dp Layout.preferredHeight: 28 * mainWindow.dp
Layout.rightMargin: 39 * DefaultStyle.dp Layout.rightMargin: 39 * mainWindow.dp
icon.width: 28 * DefaultStyle.dp icon.width: 28 * mainWindow.dp
icon.height: 28 * DefaultStyle.dp icon.height: 28 * mainWindow.dp
KeyNavigation.left: removeHistory KeyNavigation.left: removeHistory
KeyNavigation.down: listStackView KeyNavigation.down: listStackView
onClicked: { onClicked: {
@ -200,20 +200,20 @@ AbstractMainPage {
SearchBar { SearchBar {
id: searchBar id: searchBar
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: 39 * DefaultStyle.dp Layout.rightMargin: 39 * mainWindow.dp
placeholderText: qsTr("Rechercher un appel") placeholderText: qsTr("Rechercher un appel")
focus: true focus: true
KeyNavigation.up: titleLoader KeyNavigation.up: titleLoader
KeyNavigation.down: historyListView KeyNavigation.down: historyListView
} }
Item { Item {
Layout.topMargin: 38 * DefaultStyle.dp Layout.topMargin: 38 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Control.Control { Control.Control {
id: listLayout id: listLayout
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: 39 * DefaultStyle.dp anchors.rightMargin: 39 * mainWindow.dp
background: Item{} background: Item{}
ColumnLayout { ColumnLayout {
@ -224,8 +224,8 @@ AbstractMainPage {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: qsTr("Aucun appel") text: qsTr("Aucun appel")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
Binding on text { Binding on text {
when: searchBar.text.length !== 0 when: searchBar.text.length !== 0
@ -241,14 +241,14 @@ AbstractMainPage {
id: callHistoryProxy id: callHistoryProxy
filterText: searchBar.text filterText: searchBar.text
onFilterTextChanged: maxDisplayItems = initialDisplayItems onFilterTextChanged: maxDisplayItems = initialDisplayItems
initialDisplayItems: historyListView.height / (56 * DefaultStyle.dp) + 5 initialDisplayItems: historyListView.height / (56 * mainWindow.dp) + 5
displayItemsStep: initialDisplayItems / 2 displayItemsStep: initialDisplayItems / 2
onCountChanged: console.log("callHistoryProxy : " +count) onCountChanged: console.log("callHistoryProxy : " +count)
} }
Component.onCompleted: console.log("historyListView completed") Component.onCompleted: console.log("historyListView completed")
cacheBuffer: contentHeight>0 ? contentHeight : 0// cache all items cacheBuffer: contentHeight>0 ? contentHeight : 0// cache all items
flickDeceleration: 10000 flickDeceleration: 10000
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
highlightFollowsCurrentItem: true highlightFollowsCurrentItem: true
preferredHighlightBegin: height/2 - 10 preferredHighlightBegin: height/2 - 10
preferredHighlightEnd: height/2 + 10 preferredHighlightEnd: height/2 + 10
@ -271,40 +271,40 @@ AbstractMainPage {
onAtYEndChanged: if(atYEnd) callHistoryProxy.displayMore() onAtYEndChanged: if(atYEnd) callHistoryProxy.displayMore()
delegate: FocusScope { delegate: FocusScope {
width:historyListView.width width:historyListView.width
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
anchors.topMargin: 5 * DefaultStyle.dp anchors.topMargin: 5 * mainWindow.dp
anchors.bottomMargin: 5 * DefaultStyle.dp anchors.bottomMargin: 5 * mainWindow.dp
visible: !!modelData visible: !!modelData
Component.onCompleted: console.log(index + " => Completed "+visible) Component.onCompleted: console.log(index + " => Completed "+visible)
RowLayout { RowLayout {
z: 1 z: 1
anchors.fill: parent anchors.fill: parent
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Avatar { Avatar {
id: historyAvatar id: historyAvatar
property var contactObj: UtilsCpp.findFriendByAddress(modelData.core.remoteAddress) property var contactObj: UtilsCpp.findFriendByAddress(modelData.core.remoteAddress)
contact: contactObj && contactObj.value || null contact: contactObj && contactObj.value || null
_address: modelData.core.remoteAddress _address: modelData.core.remoteAddress
width: 45 * DefaultStyle.dp width: 45 * mainWindow.dp
height: 45 * DefaultStyle.dp height: 45 * mainWindow.dp
} }
ColumnLayout { ColumnLayout {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Text { Text {
id: friendAddress id: friendAddress
Layout.fillWidth: true Layout.fillWidth: true
maximumLineCount: 1 maximumLineCount: 1
text: modelData.core.displayName text: modelData.core.displayName
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
RowLayout { RowLayout {
spacing: 6 * DefaultStyle.dp spacing: 6 * mainWindow.dp
EffectImage { EffectImage {
id: statusIcon id: statusIcon
imageSource: modelData.core.status === LinphoneEnums.CallStatus.Declined imageSource: modelData.core.status === LinphoneEnums.CallStatus.Declined
@ -324,8 +324,8 @@ AbstractMainPage {
: modelData.core.isOutgoing : modelData.core.isOutgoing
? DefaultStyle.info_500_main ? DefaultStyle.info_500_main
: DefaultStyle.success_500main : DefaultStyle.success_500main
Layout.preferredWidth: 12 * DefaultStyle.dp Layout.preferredWidth: 12 * mainWindow.dp
Layout.preferredHeight: 12 * DefaultStyle.dp Layout.preferredHeight: 12 * mainWindow.dp
transform: Rotation { transform: Rotation {
angle: modelData.core.isOutgoing && (modelData.core.status === LinphoneEnums.CallStatus.Declined angle: modelData.core.isOutgoing && (modelData.core.status === LinphoneEnums.CallStatus.Declined
|| modelData.core.status === LinphoneEnums.CallStatus.DeclinedElsewhere || modelData.core.status === LinphoneEnums.CallStatus.DeclinedElsewhere
@ -341,23 +341,23 @@ AbstractMainPage {
// text: modelData.core.date // text: modelData.core.date
text: UtilsCpp.formatDate(modelData.core.date) text: UtilsCpp.formatDate(modelData.core.date)
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
} }
Button { Button {
Layout.rightMargin: 5 * DefaultStyle.dp Layout.rightMargin: 5 * mainWindow.dp
padding: 0 padding: 0
background: Item { background: Item {
visible: false visible: false
} }
icon.source: AppIcons.phone icon.source: AppIcons.phone
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
focus: true focus: true
activeFocusOnTab: false activeFocusOnTab: false
onClicked: { onClicked: {
@ -415,7 +415,7 @@ AbstractMainPage {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 8 * DefaultStyle.dp anchors.rightMargin: 8 * mainWindow.dp
active: true active: true
policy: Control.ScrollBar.AsNeeded policy: Control.ScrollBar.AsNeeded
} }
@ -432,14 +432,14 @@ AbstractMainPage {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
Button { Button {
Layout.leftMargin: 45 * DefaultStyle.dp Layout.leftMargin: 45 * mainWindow.dp
background: Item { background: Item {
} }
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
focus: true focus: true
KeyNavigation.down: listStackView KeyNavigation.down: listStackView
onClicked: { onClicked: {
@ -451,8 +451,8 @@ AbstractMainPage {
Text { Text {
text: qsTr("Nouvel appel") text: qsTr("Nouvel appel")
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
font.pixelSize: 29 * DefaultStyle.dp font.pixelSize: 29 * mainWindow.dp
font.weight: 800 * DefaultStyle.dp font.weight: 800 * mainWindow.dp
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
@ -510,18 +510,18 @@ AbstractMainPage {
height: parent.height height: parent.height
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
visible: !SettingsCpp.disableMeetingsFeature visible: !SettingsCpp.disableMeetingsFeature
Button { Button {
id: backGroupCallButton id: backGroupCallButton
background: Item{} background: Item{}
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
Layout.leftMargin: 21 * DefaultStyle.dp Layout.leftMargin: 21 * mainWindow.dp
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
KeyNavigation.down: listStackView KeyNavigation.down: listStackView
KeyNavigation.right: groupCallButton KeyNavigation.right: groupCallButton
KeyNavigation.left: groupCallButton KeyNavigation.left: groupCallButton
@ -531,14 +531,14 @@ AbstractMainPage {
} }
} }
ColumnLayout { ColumnLayout {
spacing: 3 * DefaultStyle.dp spacing: 3 * mainWindow.dp
Text { Text {
text: qsTr("Appel de groupe") text: qsTr("Appel de groupe")
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
maximumLineCount: 1 maximumLineCount: 1
font { font {
pixelSize: 18 * DefaultStyle.dp pixelSize: 18 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -547,8 +547,8 @@ AbstractMainPage {
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
maximumLineCount: 1 maximumLineCount: 1
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -556,13 +556,13 @@ AbstractMainPage {
Button { Button {
id: groupCallButton id: groupCallButton
enabled: mainItem.selectedParticipantsCount.length != 0 enabled: mainItem.selectedParticipantsCount.length != 0
Layout.rightMargin: 21 * DefaultStyle.dp Layout.rightMargin: 21 * mainWindow.dp
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
leftPadding: 12 * DefaultStyle.dp leftPadding: 12 * mainWindow.dp
rightPadding: 12 * DefaultStyle.dp rightPadding: 12 * mainWindow.dp
text: qsTr("Lancer") text: qsTr("Lancer")
textSize: 13 * DefaultStyle.dp textSize: 13 * mainWindow.dp
KeyNavigation.down: listStackView KeyNavigation.down: listStackView
KeyNavigation.left: backGroupCallButton KeyNavigation.left: backGroupCallButton
KeyNavigation.right: backGroupCallButton KeyNavigation.right: backGroupCallButton
@ -582,28 +582,28 @@ AbstractMainPage {
addParticipantsLayout.forceActiveFocus() addParticipantsLayout.forceActiveFocus()
} }
ColumnLayout { ColumnLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
anchors.fill: parent anchors.fill: parent
RowLayout { RowLayout {
spacing: 0 spacing: 0
Layout.rightMargin: 38 * DefaultStyle.dp Layout.rightMargin: 38 * mainWindow.dp
Text { Text {
font.pixelSize: 13 * DefaultStyle.dp font.pixelSize: 13 * mainWindow.dp
font.weight: 700 * DefaultStyle.dp font.weight: 700 * mainWindow.dp
text: qsTr("Nom du groupe") text: qsTr("Nom du groupe")
} }
Item{Layout.fillWidth: true} Item{Layout.fillWidth: true}
Text { Text {
font.pixelSize: 12 * DefaultStyle.dp font.pixelSize: 12 * mainWindow.dp
font.weight: 300 * DefaultStyle.dp font.weight: 300 * mainWindow.dp
text: qsTr("Requis") text: qsTr("Requis")
} }
} }
TextField { TextField {
id: groupCallName id: groupCallName
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: 38 * DefaultStyle.dp Layout.rightMargin: 38 * mainWindow.dp
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * mainWindow.dp
focus: true focus: true
KeyNavigation.down: addParticipantsLayout//participantList.count > 0 ? participantList : searchbar KeyNavigation.down: addParticipantsLayout//participantList.count > 0 ? participantList : searchbar
} }
@ -648,8 +648,8 @@ AbstractMainPage {
ContactLayout { ContactLayout {
id: contactDetail id: contactDetail
anchors.fill: parent anchors.fill: parent
anchors.topMargin: 45 * DefaultStyle.dp anchors.topMargin: 45 * mainWindow.dp
anchors.bottomMargin: 45 * DefaultStyle.dp anchors.bottomMargin: 45 * mainWindow.dp
visible: mainItem.selectedRowHistoryGui != undefined visible: mainItem.selectedRowHistoryGui != undefined
property var contactObj: UtilsCpp.findFriendByAddress(contactAddress) property var contactObj: UtilsCpp.findFriendByAddress(contactAddress)
contact: contactObj && contactObj.value || null contact: contactObj && contactObj.value || null
@ -659,7 +659,7 @@ AbstractMainPage {
buttonContent: PopupButton { buttonContent: PopupButton {
id: detailOptions id: detailOptions
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 30 * DefaultStyle.dp anchors.rightMargin: 30 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
popup.x: width popup.x: width
property var friendGuiObj: UtilsCpp.findFriendByAddress(contactDetail.contactAddress) property var friendGuiObj: UtilsCpp.findFriendByAddress(contactDetail.contactAddress)
@ -679,11 +679,11 @@ AbstractMainPage {
Button { Button {
text: detailOptions.friendGui ? qsTr("Voir le contact") : qsTr("Ajouter aux contacts") text: detailOptions.friendGui ? qsTr("Voir le contact") : qsTr("Ajouter aux contacts")
icon.source: AppIcons.plusCircle icon.source: AppIcons.plusCircle
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main textColor: DefaultStyle.main2_500main
contentImageColor: DefaultStyle.main2_600 contentImageColor: DefaultStyle.main2_600
background: Item {} background: Item {}
@ -696,11 +696,11 @@ AbstractMainPage {
Button { Button {
text: qsTr("Copier l'adresse SIP") text: qsTr("Copier l'adresse SIP")
icon.source: AppIcons.copy icon.source: AppIcons.copy
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main textColor: DefaultStyle.main2_500main
contentImageColor: DefaultStyle.main2_600 contentImageColor: DefaultStyle.main2_600
background: Item {} background: Item {}
@ -723,18 +723,18 @@ AbstractMainPage {
// } // }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 2 * DefaultStyle.dp Layout.preferredHeight: 2 * mainWindow.dp
color: DefaultStyle.main2_400 color: DefaultStyle.main2_400
} }
Button { Button {
text: qsTr("Supprimer l'historique") text: qsTr("Supprimer l'historique")
icon.source: AppIcons.trashCan icon.source: AppIcons.trashCan
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.danger_500main textColor: DefaultStyle.danger_500main
contentImageColor: DefaultStyle.danger_500main contentImageColor: DefaultStyle.danger_500main
background: Item {} background: Item {}
@ -756,15 +756,15 @@ AbstractMainPage {
} }
detailContent: RoundedPane { detailContent: RoundedPane {
id: detailControl id: detailControl
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
implicitHeight: 430 * DefaultStyle.dp + topPadding + bottomPadding implicitHeight: 430 * mainWindow.dp + topPadding + bottomPadding
background: Rectangle { background: Rectangle {
id: detailListBackground id: detailListBackground
width: parent.width width: parent.width
height: detailListView.height height: detailListView.height
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
} }
ListView { ListView {
@ -772,24 +772,24 @@ AbstractMainPage {
width: parent.width width: parent.width
height: Math.min(detailControl.implicitHeight, contentHeight) height: Math.min(detailControl.implicitHeight, contentHeight)
spacing: 20 * DefaultStyle.dp spacing: 20 * mainWindow.dp
clip: true clip: true
model: CallHistoryProxy { model: CallHistoryProxy {
id: detailsHistoryProxy id: detailsHistoryProxy
filterText: mainItem.selectedRowHistoryGui ? mainItem.selectedRowHistoryGui.core.remoteAddress : "" filterText: mainItem.selectedRowHistoryGui ? mainItem.selectedRowHistoryGui.core.remoteAddress : ""
onFilterTextChanged: maxDisplayItems = initialDisplayItems onFilterTextChanged: maxDisplayItems = initialDisplayItems
initialDisplayItems: detailListView.height / (56 * DefaultStyle.dp) + 5 initialDisplayItems: detailListView.height / (56 * mainWindow.dp) + 5
displayItemsStep: initialDisplayItems / 2 displayItemsStep: initialDisplayItems / 2
} }
onAtYEndChanged: if(atYEnd) detailsHistoryProxy.displayMore() onAtYEndChanged: if(atYEnd) detailsHistoryProxy.displayMore()
delegate: Item { delegate: Item {
width:detailListView.width width:detailListView.width
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 20 * DefaultStyle.dp anchors.leftMargin: 20 * mainWindow.dp
anchors.rightMargin: 20 * DefaultStyle.dp anchors.rightMargin: 20 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
ColumnLayout { ColumnLayout {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
@ -813,8 +813,8 @@ AbstractMainPage {
: modelData.core.isOutgoing : modelData.core.isOutgoing
? DefaultStyle.info_500_main ? DefaultStyle.info_500_main
: DefaultStyle.success_500main : DefaultStyle.success_500main
Layout.preferredWidth: 16 * DefaultStyle.dp Layout.preferredWidth: 16 * mainWindow.dp
Layout.preferredHeight: 16 * DefaultStyle.dp Layout.preferredHeight: 16 * mainWindow.dp
transform: Rotation { transform: Rotation {
angle: modelData.core.isOutgoing && (modelData.core.status === LinphoneEnums.CallStatus.Declined angle: modelData.core.isOutgoing && (modelData.core.status === LinphoneEnums.CallStatus.Declined
|| modelData.core.status === LinphoneEnums.CallStatus.DeclinedElsewhere || modelData.core.status === LinphoneEnums.CallStatus.DeclinedElsewhere
@ -833,8 +833,8 @@ AbstractMainPage {
? qsTr("Appel sortant") ? qsTr("Appel sortant")
: qsTr("Appel entrant") : qsTr("Appel entrant")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -842,8 +842,8 @@ AbstractMainPage {
text: UtilsCpp.formatDate(modelData.core.date) text: UtilsCpp.formatDate(modelData.core.date)
color: modelData.core.status === LinphoneEnums.CallStatus.Missed? DefaultStyle.danger_500main : DefaultStyle.main2_500main color: modelData.core.status === LinphoneEnums.CallStatus.Missed? DefaultStyle.danger_500main : DefaultStyle.main2_500main
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
@ -854,8 +854,8 @@ AbstractMainPage {
Text { Text {
text: UtilsCpp.formatElapsedTime(modelData.core.duration, false) text: UtilsCpp.formatElapsedTime(modelData.core.duration, false)
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
@ -876,8 +876,8 @@ AbstractMainPage {
property color colorizationColor: DefaultStyle.main2_500main property color colorizationColor: DefaultStyle.main2_500main
EffectImage { EffectImage {
imageSource: iconLabel.iconSource imageSource: iconLabel.iconSource
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
colorizationColor: iconLabel.colorizationColor colorizationColor: iconLabel.colorizationColor
} }
@ -885,8 +885,8 @@ AbstractMainPage {
text: iconLabel.text text: iconLabel.text
color: iconLabel.colorizationColor color: iconLabel.colorizationColor
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }

54
Linphone/view/Page/Main/Call/CallSettingsPanel.qml
View file

@ -17,28 +17,28 @@ Control.Page {
signal returnRequested() signal returnRequested()
signal validateRequested() signal validateRequested()
topPadding: 16 * DefaultStyle.dp topPadding: 16 * mainWindow.dp
// bottomPadding: 16 * DefaultStyle.dp // bottomPadding: 16 * mainWindow.dp
background: Rectangle { background: Rectangle {
width: mainItem.width width: mainItem.width
height: mainItem.height height: mainItem.height
color: DefaultStyle.grey_100 color: DefaultStyle.grey_100
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
} }
header: Control.Control { header: Control.Control {
id: pageHeader id: pageHeader
width: mainItem.width width: mainItem.width
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
leftPadding: 10 * DefaultStyle.dp leftPadding: 10 * mainWindow.dp
rightPadding: 10 * DefaultStyle.dp rightPadding: 10 * mainWindow.dp
background: Rectangle { background: Rectangle {
id: headerBackground id: headerBackground
width: pageHeader.width width: pageHeader.width
height: pageHeader.height height: pageHeader.height
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
Rectangle { Rectangle {
y: pageHeader.height/2 y: pageHeader.height/2
height: pageHeader.height/2 height: pageHeader.height/2
@ -49,7 +49,7 @@ Control.Page {
id: headerStack id: headerStack
RowLayout { RowLayout {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Text { Text {
text: mainItem.headerTitleText text: mainItem.headerTitleText
Layout.fillWidth: true Layout.fillWidth: true
@ -58,8 +58,8 @@ Control.Page {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
RowLayout { RowLayout {
@ -72,21 +72,21 @@ Control.Page {
visible: false visible: false
} }
icon.source: AppIcons.closeX icon.source: AppIcons.closeX
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
onClicked: mainItem.visible = false onClicked: mainItem.visible = false
} }
} }
RowLayout { RowLayout {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Button { Button {
background: Item{} background: Item{}
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
onClicked: mainItem.returnRequested() onClicked: mainItem.returnRequested()
} }
@ -98,8 +98,8 @@ Control.Page {
text: mainItem.headerTitleText text: mainItem.headerTitleText
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
Text { Text {
@ -109,8 +109,8 @@ Control.Page {
text: mainItem.headerSubtitleText text: mainItem.headerSubtitleText
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
@ -120,13 +120,13 @@ Control.Page {
} }
Button { Button {
text: mainItem.headerValidateButtonText text: mainItem.headerValidateButtonText
textSize: 13 * DefaultStyle.dp textSize: 13 * mainWindow.dp
textWeight: 600 * DefaultStyle.dp textWeight: 600 * mainWindow.dp
onClicked: mainItem.validateRequested() onClicked: mainItem.validateRequested()
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
leftPadding: 12 * DefaultStyle.dp leftPadding: 12 * mainWindow.dp
rightPadding: 12 * DefaultStyle.dp rightPadding: 12 * mainWindow.dp
} }
} }
} }

90
Linphone/view/Page/Main/Call/WaitingRoom.qml
View file

@ -17,15 +17,15 @@ RowLayout {
RowLayout { RowLayout {
Layout.fillWidth: false Layout.fillWidth: false
Layout.fillHeight: false Layout.fillHeight: false
spacing: 100 * DefaultStyle.dp spacing: 100 * mainWindow.dp
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
ColumnLayout { ColumnLayout {
spacing: 31 * DefaultStyle.dp spacing: 31 * mainWindow.dp
Sticker { Sticker {
id: preview id: preview
previewEnabled: true previewEnabled: true
Layout.preferredHeight: 330 * DefaultStyle.dp Layout.preferredHeight: 330 * mainWindow.dp
Layout.preferredWidth: 558 * DefaultStyle.dp Layout.preferredWidth: 558 * mainWindow.dp
qmlName: "WP" qmlName: "WP"
displayAll: false displayAll: false
displayPresence: false displayPresence: false
@ -37,7 +37,7 @@ RowLayout {
} }
RowLayout { RowLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
CheckableButton { CheckableButton {
id: videoButton id: videoButton
iconUrl: AppIcons.videoCamera iconUrl: AppIcons.videoCamera
@ -45,10 +45,10 @@ RowLayout {
checked: !mainItem.localVideoEnabled checked: !mainItem.localVideoEnabled
color: DefaultStyle.grey_500 color: DefaultStyle.grey_500
contentImageColor: DefaultStyle.main2_0 contentImageColor: DefaultStyle.main2_0
Layout.preferredWidth: 55 * DefaultStyle.dp Layout.preferredWidth: 55 * mainWindow.dp
Layout.preferredHeight: 55 * DefaultStyle.dp Layout.preferredHeight: 55 * mainWindow.dp
icon.width: 32 * DefaultStyle.dp icon.width: 32 * mainWindow.dp
icon.height: 32 * DefaultStyle.dp icon.height: 32 * mainWindow.dp
onClicked: mainItem.localVideoEnabled = !mainItem.localVideoEnabled onClicked: mainItem.localVideoEnabled = !mainItem.localVideoEnabled
} }
CheckableButton { CheckableButton {
@ -57,10 +57,10 @@ RowLayout {
checkedIconUrl: AppIcons.microphoneSlash checkedIconUrl: AppIcons.microphoneSlash
color: DefaultStyle.grey_500 color: DefaultStyle.grey_500
contentImageColor: DefaultStyle.main2_0 contentImageColor: DefaultStyle.main2_0
Layout.preferredWidth: 55 * DefaultStyle.dp Layout.preferredWidth: 55 * mainWindow.dp
Layout.preferredHeight: 55 * DefaultStyle.dp Layout.preferredHeight: 55 * mainWindow.dp
icon.width: 32 * DefaultStyle.dp icon.width: 32 * mainWindow.dp
icon.height: 32 * DefaultStyle.dp icon.height: 32 * mainWindow.dp
onCheckedChanged: mainItem.microEnabled = !mainItem.microEnabled onCheckedChanged: mainItem.microEnabled = !mainItem.microEnabled
} }
CheckableButton { CheckableButton {
@ -70,10 +70,10 @@ RowLayout {
color: DefaultStyle.grey_500 color: DefaultStyle.grey_500
checkedColor: DefaultStyle.main2_100 checkedColor: DefaultStyle.main2_100
contentImageColor: checked ? DefaultStyle.grey_500 : DefaultStyle.grey_0 contentImageColor: checked ? DefaultStyle.grey_500 : DefaultStyle.grey_0
Layout.preferredWidth: 55 * DefaultStyle.dp Layout.preferredWidth: 55 * mainWindow.dp
Layout.preferredHeight: 55 * DefaultStyle.dp Layout.preferredHeight: 55 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
} }
CheckableButton { CheckableButton {
id: speakerButton id: speakerButton
@ -82,10 +82,10 @@ RowLayout {
checkedIconUrl: AppIcons.speakerSlash checkedIconUrl: AppIcons.speakerSlash
color: DefaultStyle.grey_500 color: DefaultStyle.grey_500
contentImageColor: DefaultStyle.main2_0 contentImageColor: DefaultStyle.main2_0
Layout.preferredWidth: 55 * DefaultStyle.dp Layout.preferredWidth: 55 * mainWindow.dp
Layout.preferredHeight: 55 * DefaultStyle.dp Layout.preferredHeight: 55 * mainWindow.dp
icon.width: 32 * DefaultStyle.dp icon.width: 32 * mainWindow.dp
icon.height: 32 * DefaultStyle.dp icon.height: 32 * mainWindow.dp
} }
} }
} }
@ -93,17 +93,17 @@ RowLayout {
id: stackLayout id: stackLayout
currentIndex: 0 currentIndex: 0
ColumnLayout { ColumnLayout {
spacing: 93 * DefaultStyle.dp spacing: 93 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.topMargin: 54 * DefaultStyle.dp Layout.topMargin: 54 * mainWindow.dp
spacing: 0 spacing: 0
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Participer à :") text: qsTr("Participer à :")
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 30 * DefaultStyle.dp pixelSize: 30 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
Text { Text {
@ -111,19 +111,19 @@ RowLayout {
text: mainItem.conferenceInfo && mainItem.conferenceInfo.core.subject text: mainItem.conferenceInfo && mainItem.conferenceInfo.core.subject
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 30 * DefaultStyle.dp pixelSize: 30 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
ColumnLayout { ColumnLayout {
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Button { Button {
Layout.preferredWidth: 292 * DefaultStyle.dp Layout.preferredWidth: 292 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
text: qsTr("Join") text: qsTr("Join")
onClicked: { onClicked: {
settingsButton.checked = false settingsButton.checked = false
@ -132,10 +132,10 @@ RowLayout {
} }
} }
Button { Button {
Layout.preferredWidth: 292 * DefaultStyle.dp Layout.preferredWidth: 292 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
inversedColors: true inversedColors: true
text: qsTr("Cancel") text: qsTr("Cancel")
onClicked: { onClicked: {
@ -145,16 +145,16 @@ RowLayout {
} }
} }
ColumnLayout { ColumnLayout {
spacing: 37 * DefaultStyle.dp spacing: 37 * mainWindow.dp
ColumnLayout { ColumnLayout {
spacing: 13 * DefaultStyle.dp spacing: 13 * mainWindow.dp
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Connexion à la réunion") text: qsTr("Connexion à la réunion")
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 30 * DefaultStyle.dp pixelSize: 30 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
Text { Text {
@ -162,16 +162,16 @@ RowLayout {
text: qsTr("Vous allez rejoindre la réunion dans quelques instants...") text: qsTr("Vous allez rejoindre la réunion dans quelques instants...")
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
BusyIndicator { BusyIndicator {
indicatorColor: DefaultStyle.main1_500_main indicatorColor: DefaultStyle.main1_500_main
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: 48 * DefaultStyle.dp Layout.preferredWidth: 48 * mainWindow.dp
Layout.preferredHeight: 48 * DefaultStyle.dp Layout.preferredHeight: 48 * mainWindow.dp
} }
} }
} }

354
Linphone/view/Page/Main/Contact/ContactPage.qml
View file

@ -82,45 +82,45 @@ AbstractMainPage {
id: verifyDevicePopup id: verifyDevicePopup
property string deviceName property string deviceName
property string deviceAddress property string deviceAddress
padding: 30 * DefaultStyle.dp padding: 30 * mainWindow.dp
anchors.centerIn: parent anchors.centerIn: parent
closePolicy: Control.Popup.CloseOnEscape closePolicy: Control.Popup.CloseOnEscape
modal: true modal: true
onAboutToHide: neverDisplayAgainCheckbox.checked = false onAboutToHide: neverDisplayAgainCheckbox.checked = false
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: 45 * DefaultStyle.dp spacing: 45 * mainWindow.dp
ColumnLayout { ColumnLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Text { Text {
text: qsTr("Augmenter la confiance") text: qsTr("Augmenter la confiance")
font { font {
pixelSize: 22 * DefaultStyle.dp pixelSize: 22 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
ColumnLayout { ColumnLayout {
spacing: 24 * DefaultStyle.dp spacing: 24 * mainWindow.dp
Text { Text {
Layout.preferredWidth: 529 * DefaultStyle.dp Layout.preferredWidth: 529 * mainWindow.dp
text: qsTr("Pour augmenter le niveau de confiance vous devez appeler les différents appareils de votre contact et valider un code.") text: qsTr("Pour augmenter le niveau de confiance vous devez appeler les différents appareils de votre contact et valider un code.")
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
} }
Text { Text {
Layout.preferredWidth: 529 * DefaultStyle.dp Layout.preferredWidth: 529 * mainWindow.dp
text: qsTr("Vous êtes sur le point d’appeler “%1” voulez vous continuer ?").arg(verifyDevicePopup.deviceName) text: qsTr("Vous êtes sur le point d’appeler “%1” voulez vous continuer ?").arg(verifyDevicePopup.deviceName)
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
} }
} }
} }
RowLayout { RowLayout {
RowLayout { RowLayout {
spacing: 7 * DefaultStyle.dp spacing: 7 * mainWindow.dp
CheckBox{ CheckBox{
id: neverDisplayAgainCheckbox id: neverDisplayAgainCheckbox
} }
Text { Text {
text: qsTr("Ne plus afficher") text: qsTr("Ne plus afficher")
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: neverDisplayAgainCheckbox.toggle() onClicked: neverDisplayAgainCheckbox.toggle()
@ -129,22 +129,22 @@ AbstractMainPage {
} }
Item{Layout.fillWidth: true} Item{Layout.fillWidth: true}
RowLayout { RowLayout {
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
Button { Button {
inversedColors: true inversedColors: true
text: qsTr("Annuler") text: qsTr("Annuler")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
onClicked: verifyDevicePopup.close() onClicked: verifyDevicePopup.close()
} }
Button { Button {
text: qsTr("Appeler") text: qsTr("Appeler")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
onClicked: { onClicked: {
SettingsCpp.setDisplayDeviceCheckConfirmation(!neverDisplayAgainCheckbox.checked) SettingsCpp.setDisplayDeviceCheckConfirmation(!neverDisplayAgainCheckbox.checked)
UtilsCpp.createCall(verifyDevicePopup.deviceAddress, {}, LinphoneEnums.MediaEncryption.Zrtp) UtilsCpp.createCall(verifyDevicePopup.deviceAddress, {}, LinphoneEnums.MediaEncryption.Zrtp)
@ -158,8 +158,8 @@ AbstractMainPage {
leftPanelContent: FocusScope { leftPanelContent: FocusScope {
id: leftPanel id: leftPanel
property int leftMargin: 45 * DefaultStyle.dp property int leftMargin: 45 * mainWindow.dp
property int rightMargin: 39 * DefaultStyle.dp property int rightMargin: 39 * mainWindow.dp
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -175,8 +175,8 @@ AbstractMainPage {
Text { Text {
text: qsTr("Contacts") text: qsTr("Contacts")
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
font.pixelSize: 29 * DefaultStyle.dp font.pixelSize: 29 * mainWindow.dp
font.weight: 800 * DefaultStyle.dp font.weight: 800 * mainWindow.dp
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
@ -186,10 +186,10 @@ AbstractMainPage {
background: Item { background: Item {
} }
icon.source: AppIcons.plusCircle icon.source: AppIcons.plusCircle
Layout.preferredWidth: 30 * DefaultStyle.dp Layout.preferredWidth: 30 * mainWindow.dp
Layout.preferredHeight: 30 * DefaultStyle.dp Layout.preferredHeight: 30 * mainWindow.dp
icon.width: 30 * DefaultStyle.dp icon.width: 30 * mainWindow.dp
icon.height: 30 * DefaultStyle.dp icon.height: 30 * mainWindow.dp
onClicked: { onClicked: {
mainItem.createContact("", "") mainItem.createContact("", "")
} }
@ -203,13 +203,13 @@ AbstractMainPage {
anchors.left: leftPanel.left anchors.left: leftPanel.left
anchors.bottom: leftPanel.bottom anchors.bottom: leftPanel.bottom
enabled: mainItem.leftPanelEnabled enabled: mainItem.leftPanelEnabled
spacing: 38 * DefaultStyle.dp spacing: 38 * mainWindow.dp
SearchBar { SearchBar {
id: searchBar id: searchBar
visible: contactList.model.sourceModel.count != 0 visible: contactList.model.sourceModel.count != 0
Layout.leftMargin: leftPanel.leftMargin Layout.leftMargin: leftPanel.leftMargin
Layout.rightMargin: leftPanel.rightMargin Layout.rightMargin: leftPanel.rightMargin
Layout.topMargin: 18 * DefaultStyle.dp Layout.topMargin: 18 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
placeholderText: qsTr("Rechercher un contact") placeholderText: qsTr("Rechercher un contact")
KeyNavigation.up: createContactButton KeyNavigation.up: createContactButton
@ -229,15 +229,15 @@ AbstractMainPage {
ColumnLayout { ColumnLayout {
id: content id: content
width: parent.width width: parent.width
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
Text { Text {
visible: contactList.count === 0 && favoriteList.count === 0 visible: contactList.count === 0 && favoriteList.count === 0
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.topMargin: 137 * DefaultStyle.dp Layout.topMargin: 137 * mainWindow.dp
text: qsTr("Aucun contact") text: qsTr("Aucun contact")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
ColumnLayout { ColumnLayout {
@ -245,14 +245,14 @@ AbstractMainPage {
onVisibleChanged: if (visible && !favoriteList.visible) favoriteList.visible = true onVisibleChanged: if (visible && !favoriteList.visible) favoriteList.visible = true
Layout.leftMargin: leftPanel.leftMargin Layout.leftMargin: leftPanel.leftMargin
Layout.rightMargin: leftPanel.rightMargin Layout.rightMargin: leftPanel.rightMargin
spacing: 18 * DefaultStyle.dp spacing: 18 * mainWindow.dp
RowLayout { RowLayout {
spacing: 0 spacing: 0
Text { Text {
text: qsTr("Favoris") text: qsTr("Favoris")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
Item { Item {
@ -262,10 +262,10 @@ AbstractMainPage {
id: favoriteExpandButton id: favoriteExpandButton
background: Item{} background: Item{}
icon.source: favoriteList.visible ? AppIcons.upArrow : AppIcons.downArrow icon.source: favoriteList.visible ? AppIcons.upArrow : AppIcons.downArrow
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
onClicked: favoriteList.visible = !favoriteList.visible onClicked: favoriteList.visible = !favoriteList.visible
KeyNavigation.up: searchBar KeyNavigation.up: searchBar
KeyNavigation.down: favoriteList KeyNavigation.down: favoriteList
@ -298,14 +298,14 @@ AbstractMainPage {
onVisibleChanged: if (visible && !contactList.visible) contactList.visible = true onVisibleChanged: if (visible && !contactList.visible) contactList.visible = true
Layout.leftMargin: leftPanel.leftMargin Layout.leftMargin: leftPanel.leftMargin
Layout.rightMargin: leftPanel.rightMargin Layout.rightMargin: leftPanel.rightMargin
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
RowLayout { RowLayout {
spacing: 0 spacing: 0
Text { Text {
text: qsTr("Contacts") text: qsTr("Contacts")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
Item { Item {
@ -315,10 +315,10 @@ AbstractMainPage {
id: contactExpandButton id: contactExpandButton
background: Item{} background: Item{}
icon.source: contactList.visible ? AppIcons.upArrow : AppIcons.downArrow icon.source: contactList.visible ? AppIcons.upArrow : AppIcons.downArrow
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
onClicked: contactList.visible = !contactList.visible onClicked: contactList.visible = !contactList.visible
KeyNavigation.up: favoriteList.visible ? favoriteList : searchBar KeyNavigation.up: favoriteList.visible ? favoriteList : searchBar
KeyNavigation.down: contactList KeyNavigation.down: contactList
@ -361,7 +361,7 @@ AbstractMainPage {
ScrollBar { ScrollBar {
id: contactsScrollbar id: contactsScrollbar
Layout.fillHeight: true Layout.fillHeight: true
Layout.rightMargin: 8 * DefaultStyle.dp Layout.rightMargin: 8 * mainWindow.dp
height: listLayout.height height: listLayout.height
active: true active: true
interactive: true interactive: true
@ -382,19 +382,19 @@ AbstractMainPage {
RowLayout { RowLayout {
visible: mainItem.selectedContact != undefined visible: mainItem.selectedContact != undefined
anchors.fill: parent anchors.fill: parent
anchors.topMargin: 45 * DefaultStyle.dp anchors.topMargin: 45 * mainWindow.dp
anchors.bottomMargin: 23 * DefaultStyle.dp anchors.bottomMargin: 23 * mainWindow.dp
ContactLayout { ContactLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.alignment: Qt.AlignLeft | Qt.AlignTop
contact: mainItem.selectedContact contact: mainItem.selectedContact
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
buttonContent: Button { buttonContent: Button {
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
background: Item{} background: Item{}
onClicked: mainItem.editContact(mainItem.selectedContact) onClicked: mainItem.editContact(mainItem.selectedContact)
icon.source: AppIcons.pencil icon.source: AppIcons.pencil
@ -402,57 +402,57 @@ AbstractMainPage {
} }
detailContent: ColumnLayout { detailContent: ColumnLayout {
Layout.fillWidth: false Layout.fillWidth: false
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
spacing: 32 * DefaultStyle.dp spacing: 32 * mainWindow.dp
ColumnLayout { ColumnLayout {
spacing: 9 * DefaultStyle.dp spacing: 9 * mainWindow.dp
Text { Text {
Layout.leftMargin: 10 * DefaultStyle.dp Layout.leftMargin: 10 * mainWindow.dp
text: qsTr("Informations") text: qsTr("Informations")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
RoundedPane { RoundedPane {
Layout.preferredHeight: Math.min(226 * DefaultStyle.dp, addrList.contentHeight + topPadding + bottomPadding) Layout.preferredHeight: Math.min(226 * mainWindow.dp, addrList.contentHeight + topPadding + bottomPadding)
height: Math.min(226 * DefaultStyle.dp, addrList.contentHeight) height: Math.min(226 * mainWindow.dp, addrList.contentHeight)
Layout.fillWidth: true Layout.fillWidth: true
topPadding: 12 * DefaultStyle.dp topPadding: 12 * mainWindow.dp
bottomPadding: 12 * DefaultStyle.dp bottomPadding: 12 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
contentItem: ListView { contentItem: ListView {
id: addrList id: addrList
width: 360 * DefaultStyle.dp width: 360 * mainWindow.dp
height: contentHeight height: contentHeight
clip: true clip: true
spacing: 9 * DefaultStyle.dp spacing: 9 * mainWindow.dp
model: VariantList { model: VariantList {
model: mainItem.selectedContact ? mainItem.selectedContact.core.allAddresses : [] model: mainItem.selectedContact ? mainItem.selectedContact.core.allAddresses : []
} }
delegate: Item { delegate: Item {
width: addrList.width width: addrList.width
height: 46 * DefaultStyle.dp height: 46 * mainWindow.dp
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
// anchors.topMargin: 5 * DefaultStyle.dp // anchors.topMargin: 5 * mainWindow.dp
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
// Layout.fillHeight: true // Layout.fillHeight: true
// Layout.alignment: Qt.AlignVCenter // Layout.alignment: Qt.AlignVCenter
// Layout.topMargin: 10 * DefaultStyle.dp // Layout.topMargin: 10 * mainWindow.dp
// Layout.bottomMargin: 10 * DefaultStyle.dp // Layout.bottomMargin: 10 * mainWindow.dp
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: modelData.label text: modelData.label
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
Text { Text {
@ -460,8 +460,8 @@ AbstractMainPage {
property string _text: modelData.address property string _text: modelData.address
text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -470,13 +470,13 @@ AbstractMainPage {
} }
Button { Button {
background: Item{} background: Item{}
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.source: AppIcons.phone icon.source: AppIcons.phone
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
onClicked: { onClicked: {
UtilsCpp.createCall(modelData.address) UtilsCpp.createCall(modelData.address)
} }
@ -486,9 +486,9 @@ AbstractMainPage {
Rectangle { Rectangle {
visible: index != addrList.model.count - 1 visible: index != addrList.model.count - 1
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
Layout.rightMargin: 3 * DefaultStyle.dp Layout.rightMargin: 3 * mainWindow.dp
Layout.leftMargin: 3 * DefaultStyle.dp Layout.leftMargin: 3 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
clip: true clip: true
} }
@ -500,47 +500,47 @@ AbstractMainPage {
RoundedPane { RoundedPane {
visible: companyText.text.length != 0 || jobText.text.length != 0 visible: companyText.text.length != 0 || jobText.text.length != 0
Layout.fillWidth: true Layout.fillWidth: true
topPadding: 17 * DefaultStyle.dp topPadding: 17 * mainWindow.dp
bottomPadding: 17 * DefaultStyle.dp bottomPadding: 17 * mainWindow.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
// Layout.fillHeight: true // Layout.fillHeight: true
contentItem: ColumnLayout { contentItem: ColumnLayout {
// height: 100 * DefaultStyle.dp // height: 100 * mainWindow.dp
RowLayout { RowLayout {
height: 50 * DefaultStyle.dp height: 50 * mainWindow.dp
Text { Text {
text: qsTr("Company :") text: qsTr("Company :")
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
Text { Text {
id: companyText id: companyText
text: mainItem.selectedContact && mainItem.selectedContact.core.organization text: mainItem.selectedContact && mainItem.selectedContact.core.organization
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
RowLayout { RowLayout {
height: 50 * DefaultStyle.dp height: 50 * mainWindow.dp
Text { Text {
text: qsTr("Job :") text: qsTr("Job :")
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
Text { Text {
id: jobText id: jobText
text: mainItem.selectedContact && mainItem.selectedContact.core.job text: mainItem.selectedContact && mainItem.selectedContact.core.job
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -550,27 +550,27 @@ AbstractMainPage {
Text { Text {
text: qsTr("Medias") text: qsTr("Medias")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
Button { Button {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
radius: 15 * DefaultStyle.dp radius: 15 * mainWindow.dp
} }
contentItem: RowLayout { contentItem: RowLayout {
Image { Image {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
source: AppIcons.shareNetwork source: AppIcons.shareNetwork
} }
Text { Text {
text: qsTr("Show media shared") text: qsTr("Show media shared")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
weight: 400 * DefaultStyle.dp weight: 400 * mainWindow.dp
} }
} }
} }
@ -581,28 +581,28 @@ AbstractMainPage {
} }
} }
ColumnLayout { ColumnLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Layout.rightMargin: 90 * DefaultStyle.dp Layout.rightMargin: 90 * mainWindow.dp
ColumnLayout { ColumnLayout {
RowLayout { RowLayout {
Text { Text {
text: qsTr("Confiance") text: qsTr("Confiance")
Layout.leftMargin: 10 * DefaultStyle.dp Layout.leftMargin: 10 * mainWindow.dp
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
} }
RoundedPane { RoundedPane {
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: 13 * DefaultStyle.dp spacing: 13 * mainWindow.dp
Text { Text {
text: qsTr("Niveau de confiance - Appareils vérifiés") text: qsTr("Niveau de confiance - Appareils vérifiés")
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 700 * DefaultStyle.dp weight: 700 * mainWindow.dp
} }
} }
Text { Text {
@ -611,34 +611,34 @@ AbstractMainPage {
} }
ProgressBar { ProgressBar {
visible: deviceList.count > 0 visible: deviceList.count > 0
Layout.preferredWidth: 320 * DefaultStyle.dp Layout.preferredWidth: 320 * mainWindow.dp
Layout.preferredHeight: 28 * DefaultStyle.dp Layout.preferredHeight: 28 * mainWindow.dp
value: mainItem.selectedContact ? mainItem.selectedContact.core.verifiedDeviceCount / deviceList.count : 0 value: mainItem.selectedContact ? mainItem.selectedContact.core.verifiedDeviceCount / deviceList.count : 0
} }
ListView { ListView {
id: deviceList id: deviceList
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: Math.min(200 * DefaultStyle.dp, contentHeight) Layout.preferredHeight: Math.min(200 * mainWindow.dp, contentHeight)
clip: true clip: true
model: mainItem.selectedContact ? mainItem.selectedContact.core.devices : [] model: mainItem.selectedContact ? mainItem.selectedContact.core.devices : []
spacing: 16 * DefaultStyle.dp spacing: 16 * mainWindow.dp
delegate: RowLayout { delegate: RowLayout {
id: deviceDelegate id: deviceDelegate
width: deviceList.width width: deviceList.width
height: 30 * DefaultStyle.dp height: 30 * mainWindow.dp
property var callObj property var callObj
property CallGui deviceCall: callObj ? callObj.value : null property CallGui deviceCall: callObj ? callObj.value : null
property string deviceName: modelData.name.length != 0 ? modelData.name : qsTr("Appareil sans nom") property string deviceName: modelData.name.length != 0 ? modelData.name : qsTr("Appareil sans nom")
Text { Text {
text: deviceDelegate.deviceName text: deviceDelegate.deviceName
font.pixelSize: 14 * DefaultStyle.dp font.pixelSize: 14 * mainWindow.dp
} }
Item{Layout.fillWidth: true} Item{Layout.fillWidth: true}
Image{ Image{
visible: modelData.securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified visible: modelData.securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
source: AppIcons.trusted source: AppIcons.trusted
width: 22 * DefaultStyle.dp width: 22 * mainWindow.dp
height: 22 * DefaultStyle.dp height: 22 * mainWindow.dp
} }
Button { Button {
@ -647,12 +647,12 @@ AbstractMainPage {
icon.source: AppIcons.warningCircle icon.source: AppIcons.warningCircle
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
textColor: DefaultStyle.main1_500_main textColor: DefaultStyle.main1_500_main
textSize: 13 * DefaultStyle.dp textSize: 13 * mainWindow.dp
text: qsTr("Vérifier") text: qsTr("Vérifier")
leftPadding: 12 * DefaultStyle.dp leftPadding: 12 * mainWindow.dp
rightPadding: 12 * DefaultStyle.dp rightPadding: 12 * mainWindow.dp
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
onClicked: { onClicked: {
if (SettingsCpp.getDisplayDeviceCheckConfirmation()) { if (SettingsCpp.getDisplayDeviceCheckConfirmation()) {
verifyDevicePopup.deviceName = deviceDelegate.deviceName verifyDevicePopup.deviceName = deviceDelegate.deviceName
@ -671,27 +671,27 @@ AbstractMainPage {
} }
} }
ColumnLayout { ColumnLayout {
spacing: 9 * DefaultStyle.dp spacing: 9 * mainWindow.dp
Text { Text {
Layout.preferredHeight: 22 * DefaultStyle.dp Layout.preferredHeight: 22 * mainWindow.dp
Layout.leftMargin: 10 * DefaultStyle.dp Layout.leftMargin: 10 * mainWindow.dp
text: qsTr("Other actions") text: qsTr("Other actions")
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
RoundedPane { RoundedPane {
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * mainWindow.dp
contentItem: ColumnLayout { contentItem: ColumnLayout {
width: parent.width width: parent.width
IconLabelButton { IconLabelButton {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 50 * DefaultStyle.dp Layout.preferredHeight: 50 * mainWindow.dp
iconSize: 24 * DefaultStyle.dp iconSize: 24 * mainWindow.dp
iconSource: AppIcons.pencil iconSource: AppIcons.pencil
text: qsTr("Edit") text: qsTr("Edit")
onClicked: mainItem.editContact(mainItem.selectedContact) onClicked: mainItem.editContact(mainItem.selectedContact)
@ -699,34 +699,34 @@ AbstractMainPage {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
IconLabelButton { IconLabelButton {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 50 * DefaultStyle.dp Layout.preferredHeight: 50 * mainWindow.dp
iconSize: 24 * DefaultStyle.dp iconSize: 24 * mainWindow.dp
iconSource: mainItem.selectedContact && mainItem.selectedContact.core.starred ? AppIcons.heartFill : AppIcons.heart iconSource: mainItem.selectedContact && mainItem.selectedContact.core.starred ? AppIcons.heartFill : AppIcons.heart
text: mainItem.selectedContact && mainItem.selectedContact.core.starred ? qsTr("Remove from favorites") : qsTr("Add to favorites") text: mainItem.selectedContact && mainItem.selectedContact.core.starred ? qsTr("Remove from favorites") : qsTr("Add to favorites")
onClicked: if (mainItem.selectedContact) mainItem.selectedContact.core.lSetStarred(!mainItem.selectedContact.core.starred) onClicked: if (mainItem.selectedContact) mainItem.selectedContact.core.lSetStarred(!mainItem.selectedContact.core.starred)
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
IconLabelButton { IconLabelButton {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 50 * DefaultStyle.dp Layout.preferredHeight: 50 * mainWindow.dp
iconSize: 24 * DefaultStyle.dp iconSize: 24 * mainWindow.dp
iconSource: AppIcons.shareNetwork iconSource: AppIcons.shareNetwork
text: qsTr("Partager") text: qsTr("Partager")
onClicked: { onClicked: {
@ -742,51 +742,51 @@ AbstractMainPage {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
IconLabelButton { IconLabelButton {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 50 * DefaultStyle.dp Layout.preferredHeight: 50 * mainWindow.dp
iconSize: 24 * DefaultStyle.dp iconSize: 24 * mainWindow.dp
iconSource: AppIcons.bellSlash iconSource: AppIcons.bellSlash
text: qsTr("Mute") text: qsTr("Mute")
onClicked: console.log("TODO : mute contact") onClicked: console.log("TODO : mute contact")
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
IconLabelButton { IconLabelButton {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 50 * DefaultStyle.dp Layout.preferredHeight: 50 * mainWindow.dp
iconSize: 24 * DefaultStyle.dp iconSize: 24 * mainWindow.dp
iconSource: AppIcons.empty iconSource: AppIcons.empty
text: qsTr("Block") text: qsTr("Block")
onClicked: console.log("TODO : block contact") onClicked: console.log("TODO : block contact")
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 1 * DefaultStyle.dp Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
} }
IconLabelButton { IconLabelButton {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 15 * DefaultStyle.dp Layout.leftMargin: 15 * mainWindow.dp
Layout.rightMargin: 15 * DefaultStyle.dp Layout.rightMargin: 15 * mainWindow.dp
Layout.preferredHeight: 50 * DefaultStyle.dp Layout.preferredHeight: 50 * mainWindow.dp
iconSize: 24 * DefaultStyle.dp iconSize: 24 * mainWindow.dp
iconSource: AppIcons.trashCan iconSource: AppIcons.trashCan
color: DefaultStyle.danger_500main color: DefaultStyle.danger_500main
text: qsTr("Delete this contact") text: qsTr("Delete this contact")

24
Linphone/view/Page/Main/Help/HelpPage.qml
View file

@ -17,19 +17,19 @@ AbstractMainPage {
id: leftPanel id: leftPanel
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
property int sideMargin: 45 * DefaultStyle.dp property int sideMargin: 45 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: leftPanel.sideMargin Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin Layout.rightMargin: leftPanel.sideMargin
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Button { Button {
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
width: 24 * DefaultStyle.dp width: 24 * mainWindow.dp
height: 24 * DefaultStyle.dp height: 24 * mainWindow.dp
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
} }
@ -49,7 +49,7 @@ AbstractMainPage {
Text { Text {
Layout.leftMargin: leftPanel.sideMargin Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin Layout.rightMargin: leftPanel.sideMargin
Layout.topMargin: 41 * DefaultStyle.dp Layout.topMargin: 41 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("À propos de Linphone") text: qsTr("À propos de Linphone")
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
@ -59,8 +59,8 @@ AbstractMainPage {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: leftPanel.sideMargin Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin Layout.rightMargin: leftPanel.sideMargin
Layout.topMargin: 24 * DefaultStyle.dp Layout.topMargin: 24 * mainWindow.dp
spacing: 32 * DefaultStyle.dp spacing: 32 * mainWindow.dp
HelpIconLabelButton { HelpIconLabelButton {
Layout.fillWidth: true Layout.fillWidth: true
iconSource: AppIcons.detective iconSource: AppIcons.detective
@ -101,7 +101,7 @@ AbstractMainPage {
Text { Text {
Layout.leftMargin: leftPanel.sideMargin Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin Layout.rightMargin: leftPanel.sideMargin
Layout.topMargin: 32 * DefaultStyle.dp Layout.topMargin: 32 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("À propos de Linphone") text: qsTr("À propos de Linphone")
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
@ -112,7 +112,7 @@ AbstractMainPage {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: leftPanel.sideMargin Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin Layout.rightMargin: leftPanel.sideMargin
Layout.topMargin: 24 * DefaultStyle.dp Layout.topMargin: 24 * mainWindow.dp
iconSource: AppIcons.debug iconSource: AppIcons.debug
title: qsTr("Dépannage") title: qsTr("Dépannage")
onClicked: { onClicked: {

270
Linphone/view/Page/Main/Meeting/MeetingPage.qml
View file

@ -56,16 +56,16 @@ AbstractMainPage {
id: cancelAndDeleteConfDialog id: cancelAndDeleteConfDialog
property bool cancel: false property bool cancel: false
signal cancelRequested() signal cancelRequested()
// width: 278 * DefaultStyle.dp // width: 278 * mainWindow.dp
text: cancel ? qsTr("Souhaitez-vous annuler et supprimer cette réunion ?") : qsTr("Souhaitez-vous supprimer cette réunion ?") text: cancel ? qsTr("Souhaitez-vous annuler et supprimer cette réunion ?") : qsTr("Souhaitez-vous supprimer cette réunion ?")
buttons: [ buttons: [
Button { Button {
visible: cancelAndDeleteConfDialog.cancel visible: cancelAndDeleteConfDialog.cancel
text: qsTr("Annuler et supprimer") text: qsTr("Annuler et supprimer")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
onClicked: { onClicked: {
cancelAndDeleteConfDialog.cancelRequested() cancelAndDeleteConfDialog.cancelRequested()
cancelAndDeleteConfDialog.accepted() cancelAndDeleteConfDialog.accepted()
@ -74,10 +74,10 @@ AbstractMainPage {
}, },
Button { Button {
text: cancelAndDeleteConfDialog.cancel ? qsTr("Supprimer seulement") : qsTr("Supprimer") text: cancelAndDeleteConfDialog.cancel ? qsTr("Supprimer seulement") : qsTr("Supprimer")
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
onClicked: { onClicked: {
cancelAndDeleteConfDialog.accepted() cancelAndDeleteConfDialog.accepted()
cancelAndDeleteConfDialog.close() cancelAndDeleteConfDialog.close()
@ -86,10 +86,10 @@ AbstractMainPage {
Button { Button {
text: qsTr("Retour") text: qsTr("Retour")
inversedColors: true inversedColors: true
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * mainWindow.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * mainWindow.dp
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
onClicked: { onClicked: {
cancelAndDeleteConfDialog.rejected() cancelAndDeleteConfDialog.rejected()
cancelAndDeleteConfDialog.close() cancelAndDeleteConfDialog.close()
@ -102,7 +102,7 @@ AbstractMainPage {
id: leftPanelStackView id: leftPanelStackView
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 45 * DefaultStyle.dp Layout.leftMargin: 45 * mainWindow.dp
initialItem: listLayout initialItem: listLayout
} }
@ -110,7 +110,7 @@ AbstractMainPage {
id: overridenRightPanel id: overridenRightPanel
Control.StackView { Control.StackView {
id: overridenRightPanelStackView id: overridenRightPanelStackView
width: 393 * DefaultStyle.dp width: 393 * mainWindow.dp
height: parent.height height: parent.height
anchors.top: parent.top anchors.top: parent.top
anchors.centerIn: parent anchors.centerIn: parent
@ -134,24 +134,24 @@ AbstractMainPage {
spacing: 0 spacing: 0
RowLayout { RowLayout {
enabled: mainItem.leftPanelEnabled enabled: mainItem.leftPanelEnabled
Layout.rightMargin: 38 * DefaultStyle.dp Layout.rightMargin: 38 * mainWindow.dp
spacing: 0 spacing: 0
Text { Text {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Réunions") text: qsTr("Réunions")
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
font.pixelSize: 29 * DefaultStyle.dp font.pixelSize: 29 * mainWindow.dp
font.weight: 800 * DefaultStyle.dp font.weight: 800 * mainWindow.dp
} }
Item{Layout.fillWidth: true} Item{Layout.fillWidth: true}
Button { Button {
background: Item { background: Item {
} }
icon.source: AppIcons.plusCircle icon.source: AppIcons.plusCircle
Layout.preferredWidth: 28 * DefaultStyle.dp Layout.preferredWidth: 28 * mainWindow.dp
Layout.preferredHeight: 28 * DefaultStyle.dp Layout.preferredHeight: 28 * mainWindow.dp
icon.width: 28 * DefaultStyle.dp icon.width: 28 * mainWindow.dp
icon.height: 28 * DefaultStyle.dp icon.height: 28 * mainWindow.dp
onClicked: { onClicked: {
mainItem.editConference() mainItem.editConference()
} }
@ -160,20 +160,20 @@ AbstractMainPage {
SearchBar { SearchBar {
id: searchBar id: searchBar
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 18 * DefaultStyle.dp Layout.topMargin: 18 * mainWindow.dp
Layout.rightMargin: 38 * DefaultStyle.dp Layout.rightMargin: 38 * mainWindow.dp
placeholderText: qsTr("Rechercher une réunion") placeholderText: qsTr("Rechercher une réunion")
KeyNavigation.up: conferenceList KeyNavigation.up: conferenceList
KeyNavigation.down: conferenceList KeyNavigation.down: conferenceList
} }
Text { Text {
Layout.topMargin: 38 * DefaultStyle.dp Layout.topMargin: 38 * mainWindow.dp
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: mainItem.emptyListText text: mainItem.emptyListText
font { font {
pixelSize: 16 * DefaultStyle.dp pixelSize: 16 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
visible: mainItem.showDefaultItem visible: mainItem.showDefaultItem
Binding on text { Binding on text {
@ -185,7 +185,7 @@ AbstractMainPage {
MeetingListView { MeetingListView {
id: conferenceList id: conferenceList
// Remove 24 from first section padding because we cannot know that it is the first section. 24 is the margins between sections. // Remove 24 from first section padding because we cannot know that it is the first section. 24 is the margins between sections.
Layout.topMargin: 38 * DefaultStyle.dp - 24 * DefaultStyle.dp Layout.topMargin: 38 * mainWindow.dp - 24 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
hoverEnabled: mainItem.leftPanelEnabled hoverEnabled: mainItem.leftPanelEnabled
@ -210,7 +210,7 @@ AbstractMainPage {
Control.ScrollBar.vertical: ScrollBar { Control.ScrollBar.vertical: ScrollBar {
id: meetingsScrollbar id: meetingsScrollbar
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 8 * DefaultStyle.dp anchors.rightMargin: 8 * mainWindow.dp
active: true active: true
interactive: true interactive: true
policy: Control.ScrollBar.AsNeeded policy: Control.ScrollBar.AsNeeded
@ -228,21 +228,21 @@ AbstractMainPage {
property ConferenceInfoGui conferenceInfoGui property ConferenceInfoGui conferenceInfoGui
property bool isCreation property bool isCreation
ColumnLayout { ColumnLayout {
spacing: 33 * DefaultStyle.dp spacing: 33 * mainWindow.dp
anchors.fill: parent anchors.fill: parent
RowLayout { RowLayout {
Layout.rightMargin: 35 * DefaultStyle.dp Layout.rightMargin: 35 * mainWindow.dp
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Button { Button {
id: backButton id: backButton
background: Item{} background: Item{}
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
focus: true focus: true
KeyNavigation.right: createButton KeyNavigation.right: createButton
KeyNavigation.down: meetingSetup KeyNavigation.down: meetingSetup
@ -255,17 +255,17 @@ AbstractMainPage {
text: qsTr("Nouvelle réunion") text: qsTr("Nouvelle réunion")
color: DefaultStyle.main2_700 color: DefaultStyle.main2_700
font { font {
pixelSize: 22 * DefaultStyle.dp pixelSize: 22 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
Layout.fillWidth: true Layout.fillWidth: true
} }
Item {Layout.fillWidth: true} Item {Layout.fillWidth: true}
Button { Button {
id: createButton id: createButton
Layout.preferredWidth: 57 * DefaultStyle.dp Layout.preferredWidth: 57 * mainWindow.dp
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
KeyNavigation.left: backButton KeyNavigation.left: backButton
KeyNavigation.down: meetingSetup KeyNavigation.down: meetingSetup
contentItem: Text { contentItem: Text {
@ -274,8 +274,8 @@ AbstractMainPage {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font { font {
pixelSize: 13 * DefaultStyle.dp pixelSize: 13 * mainWindow.dp
weight: 600 * DefaultStyle.dp weight: 600 * mainWindow.dp
} }
color: DefaultStyle.grey_0 color: DefaultStyle.grey_0
} }
@ -299,7 +299,7 @@ AbstractMainPage {
isCreation: createConfLayout.isCreation isCreation: createConfLayout.isCreation
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: 35 * DefaultStyle.dp Layout.rightMargin: 35 * mainWindow.dp
Connections { Connections {
target: meetingSetup.conferenceInfoGui ? meetingSetup.conferenceInfoGui.core : null target: meetingSetup.conferenceInfoGui ? meetingSetup.conferenceInfoGui.core : null
function onConferenceSchedulerStateChanged() { function onConferenceSchedulerStateChanged() {
@ -353,15 +353,15 @@ AbstractMainPage {
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0
Section { Section {
Layout.topMargin: 58 * DefaultStyle.dp Layout.topMargin: 58 * mainWindow.dp
content: RowLayout { content: RowLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
Button { Button {
id: backButton id: backButton
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
KeyNavigation.left: saveButton KeyNavigation.left: saveButton
KeyNavigation.right: titleText KeyNavigation.right: titleText
@ -379,8 +379,8 @@ AbstractMainPage {
Layout.fillWidth: true Layout.fillWidth: true
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
KeyNavigation.left: backButton KeyNavigation.left: backButton
KeyNavigation.right: saveButton KeyNavigation.right: saveButton
@ -393,13 +393,13 @@ AbstractMainPage {
} }
Button { Button {
id: saveButton id: saveButton
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
leftPadding: 12 * DefaultStyle.dp leftPadding: 12 * mainWindow.dp
rightPadding: 12 * DefaultStyle.dp rightPadding: 12 * mainWindow.dp
focus: true focus: true
text: qsTr("Save") text: qsTr("Save")
textSize: 13 * DefaultStyle.dp textSize: 13 * mainWindow.dp
KeyNavigation.left: titleText KeyNavigation.left: titleText
KeyNavigation.right: backButton KeyNavigation.right: backButton
KeyNavigation.down: conferenceEdit KeyNavigation.down: conferenceEdit
@ -461,29 +461,29 @@ AbstractMainPage {
Layout.preferredHeight: addParticipantsButtons.implicitHeight Layout.preferredHeight: addParticipantsButtons.implicitHeight
RowLayout { RowLayout {
id: addParticipantsButtons id: addParticipantsButtons
spacing: 5 * DefaultStyle.dp spacing: 5 * mainWindow.dp
Button { Button {
id: removeButton id: removeButton
background: Item{} background: Item{}
icon.source: AppIcons.leftArrow icon.source: AppIcons.leftArrow
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
KeyNavigation.right: addButton KeyNavigation.right: addButton
KeyNavigation.down: addParticipantLayout KeyNavigation.down: addParticipantLayout
onClicked: container.pop() onClicked: container.pop()
} }
ColumnLayout { ColumnLayout {
spacing: 3 * DefaultStyle.dp spacing: 3 * mainWindow.dp
Text { Text {
text: qsTr("Ajouter des participants") text: qsTr("Ajouter des participants")
color: DefaultStyle.main1_500_main color: DefaultStyle.main1_500_main
maximumLineCount: 1 maximumLineCount: 1
font { font {
pixelSize: 18 * DefaultStyle.dp pixelSize: 18 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -492,8 +492,8 @@ AbstractMainPage {
color: DefaultStyle.main2_500main color: DefaultStyle.main2_500main
maximumLineCount: 1 maximumLineCount: 1
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -501,14 +501,14 @@ AbstractMainPage {
Button { Button {
id: addButton id: addButton
enabled: addParticipantLayout.selectedParticipantsCount.length != 0 enabled: addParticipantLayout.selectedParticipantsCount.length != 0
Layout.rightMargin: 21 * DefaultStyle.dp Layout.rightMargin: 21 * mainWindow.dp
topPadding: 6 * DefaultStyle.dp topPadding: 6 * mainWindow.dp
bottomPadding: 6 * DefaultStyle.dp bottomPadding: 6 * mainWindow.dp
leftPadding: 12 * DefaultStyle.dp leftPadding: 12 * mainWindow.dp
rightPadding: 12 * DefaultStyle.dp rightPadding: 12 * mainWindow.dp
focus: enabled focus: enabled
text: qsTr("Ajouter") text: qsTr("Ajouter")
textSize: 13 * DefaultStyle.dp textSize: 13 * mainWindow.dp
KeyNavigation.left: removeButton KeyNavigation.left: removeButton
KeyNavigation.down: addParticipantLayout KeyNavigation.down: addParticipantLayout
onClicked: { onClicked: {
@ -535,22 +535,22 @@ AbstractMainPage {
id: meetingDetailsLayout id: meetingDetailsLayout
anchors.fill: parent anchors.fill: parent
visible: mainItem.selectedConference visible: mainItem.selectedConference
spacing: 25 * DefaultStyle.dp spacing: 25 * mainWindow.dp
Section { Section {
Layout.topMargin: 58 * DefaultStyle.dp Layout.topMargin: 58 * mainWindow.dp
visible: mainItem.selectedConference visible: mainItem.selectedConference
content: RowLayout { content: RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
Image { Image {
source: AppIcons.usersThree source: AppIcons.usersThree
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
} }
Text { Text {
text: mainItem.selectedConference ? mainItem.selectedConference.core.subject : "" text: mainItem.selectedConference ? mainItem.selectedConference.core.subject : ""
font { font {
pixelSize: 20 * DefaultStyle.dp pixelSize: 20 * mainWindow.dp
weight: 800 * DefaultStyle.dp weight: 800 * mainWindow.dp
} }
} }
Item { Item {
@ -560,10 +560,10 @@ AbstractMainPage {
id: editButton id: editButton
property var isMeObj: UtilsCpp.isMe(mainItem.selectedConference?.core.organizerAddress) property var isMeObj: UtilsCpp.isMe(mainItem.selectedConference?.core.organizerAddress)
visible: mainItem.selectedConference && isMeObj && isMeObj.value || false visible: mainItem.selectedConference && isMeObj && isMeObj.value || false
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
icon.source: AppIcons.pencil icon.source: AppIcons.pencil
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
KeyNavigation.left: leftPanelStackView.currentItem KeyNavigation.left: leftPanelStackView.currentItem
@ -575,8 +575,8 @@ AbstractMainPage {
} }
PopupButton { PopupButton {
id: deletePopup id: deletePopup
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
contentImageColor: DefaultStyle.main1_500_main contentImageColor: DefaultStyle.main1_500_main
KeyNavigation.left: editButton.visible ? editButton : leftPanelStackView.currentItem KeyNavigation.left: editButton.visible ? editButton : leftPanelStackView.currentItem
KeyNavigation.right: leftPanelStackView.currentItem KeyNavigation.right: leftPanelStackView.currentItem
@ -591,11 +591,11 @@ AbstractMainPage {
inversedColors: true inversedColors: true
property var isMeObj: UtilsCpp.isMe(mainItem.selectedConference?.core.organizerAddress) property var isMeObj: UtilsCpp.isMe(mainItem.selectedConference?.core.organizerAddress)
icon.source: AppIcons.trashCan icon.source: AppIcons.trashCan
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
spacing: 10 * DefaultStyle.dp spacing: 10 * mainWindow.dp
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
text: qsTr("Delete this meeting") text: qsTr("Delete this meeting")
onClicked: { onClicked: {
@ -622,14 +622,14 @@ AbstractMainPage {
} }
Section { Section {
content: ColumnLayout { content: ColumnLayout {
spacing: 15 * DefaultStyle.dp spacing: 15 * mainWindow.dp
width: parent.width width: parent.width
RowLayout { RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
Layout.fillWidth: true Layout.fillWidth: true
Image { Image {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
source: AppIcons.videoCamera source: AppIcons.videoCamera
} }
Button { Button {
@ -637,8 +637,8 @@ AbstractMainPage {
Layout.fillWidth: true Layout.fillWidth: true
font.bold: shadowEnabled font.bold: shadowEnabled
text: mainItem.selectedConference ? mainItem.selectedConference.core.uri : "" text: mainItem.selectedConference ? mainItem.selectedConference.core.uri : ""
textSize: 14 * DefaultStyle.dp textSize: 14 * mainWindow.dp
textWeight: 400 * DefaultStyle.dp textWeight: 400 * mainWindow.dp
underline: true underline: true
inversedColors: true inversedColors: true
color: DefaultStyle.main2_600 color: DefaultStyle.main2_600
@ -660,10 +660,10 @@ AbstractMainPage {
} }
Button { Button {
id: shareNetworkButton id: shareNetworkButton
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
icon.width: 24 * DefaultStyle.dp icon.width: 24 * mainWindow.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * mainWindow.dp
background: Item{} background: Item{}
icon.source: AppIcons.shareNetwork icon.source: AppIcons.shareNetwork
KeyNavigation.left: linkButton KeyNavigation.left: linkButton
@ -677,10 +677,10 @@ AbstractMainPage {
} }
} }
RowLayout { RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
Image { Image {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
source: AppIcons.clock source: AppIcons.clock
} }
Text { Text {
@ -691,22 +691,22 @@ AbstractMainPage {
+ UtilsCpp.toDateHourString(mainItem.selectedConference.core.endDateTime) + UtilsCpp.toDateHourString(mainItem.selectedConference.core.endDateTime)
: '' : ''
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
} }
RowLayout { RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
Image { Image {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
source: AppIcons.globe source: AppIcons.globe
} }
Text { Text {
text: qsTr("Time zone: ") + (mainItem.selectedConference ? (mainItem.selectedConference.core.timeZoneModel.displayName + ", " + mainItem.selectedConference.core.timeZoneModel.countryName) : "") text: qsTr("Time zone: ") + (mainItem.selectedConference ? (mainItem.selectedConference.core.timeZoneModel.displayName + ", " + mainItem.selectedConference.core.timeZoneModel.countryName) : "")
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -716,10 +716,10 @@ AbstractMainPage {
Section { Section {
visible: mainItem.selectedConference && mainItem.selectedConference.core.description.length != 0 visible: mainItem.selectedConference && mainItem.selectedConference.core.description.length != 0
content: RowLayout { content: RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
imageSource: AppIcons.note imageSource: AppIcons.note
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
} }
@ -727,7 +727,7 @@ AbstractMainPage {
text: mainItem.selectedConference ? mainItem.selectedConference.core.description : "" text: mainItem.selectedConference ? mainItem.selectedConference.core.description : ""
Layout.fillWidth: true Layout.fillWidth: true
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -735,22 +735,22 @@ AbstractMainPage {
} }
Section { Section {
content: RowLayout { content: RowLayout {
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
EffectImage { EffectImage {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
imageSource: AppIcons.userRectangle imageSource: AppIcons.userRectangle
colorizationColor: DefaultStyle.main2_600 colorizationColor: DefaultStyle.main2_600
} }
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
_address: mainItem.selectedConference ? mainItem.selectedConference.core.organizerAddress : "" _address: mainItem.selectedConference ? mainItem.selectedConference.core.organizerAddress : ""
} }
Text { Text {
text: mainItem.selectedConference ? mainItem.selectedConference.core.organizerName : "" text: mainItem.selectedConference ? mainItem.selectedConference.core.organizerName : ""
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -759,34 +759,34 @@ AbstractMainPage {
Section { Section {
content: RowLayout { content: RowLayout {
Layout.preferredHeight: participantList.height Layout.preferredHeight: participantList.height
width: 393 * DefaultStyle.dp width: 393 * mainWindow.dp
spacing: 8 * DefaultStyle.dp spacing: 8 * mainWindow.dp
Image { Image {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * mainWindow.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.alignment: Qt.AlignLeft | Qt.AlignTop
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * mainWindow.dp
source: AppIcons.usersTwo source: AppIcons.usersTwo
} }
ListView { ListView {
id: participantList id: participantList
Layout.preferredHeight: Math.min(184 * DefaultStyle.dp, contentHeight) Layout.preferredHeight: Math.min(184 * mainWindow.dp, contentHeight)
Layout.fillWidth: true Layout.fillWidth: true
model: mainItem.selectedConference ? mainItem.selectedConference.core.participants : [] model: mainItem.selectedConference ? mainItem.selectedConference.core.participants : []
clip: true clip: true
delegate: RowLayout { delegate: RowLayout {
height: 56 * DefaultStyle.dp height: 56 * mainWindow.dp
width: participantList.width width: participantList.width
Avatar { Avatar {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * mainWindow.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData.address _address: modelData.address
} }
Text { Text {
text: modelData.displayName text: modelData.displayName
Layout.fillWidth: true Layout.fillWidth: true
font { font {
pixelSize: 14 * DefaultStyle.dp pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize capitalization: Font.Capitalize
} }
} }
@ -795,8 +795,8 @@ AbstractMainPage {
visible: mainItem.selectedConference && mainItem.selectedConference.core.organizerAddress === modelData.address visible: mainItem.selectedConference && mainItem.selectedConference.core.organizerAddress === modelData.address
color: DefaultStyle.main2_400 color: DefaultStyle.main2_400
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * mainWindow.dp
weight: 300 * DefaultStyle.dp weight: 300 * mainWindow.dp
} }
} }
} }
@ -807,8 +807,8 @@ AbstractMainPage {
id: joinButton id: joinButton
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Rejoindre la réunion") text: qsTr("Rejoindre la réunion")
topPadding: 11 * DefaultStyle.dp topPadding: 11 * mainWindow.dp
bottomPadding: 11 * DefaultStyle.dp bottomPadding: 11 * mainWindow.dp
focus: true focus: true
KeyNavigation.up: shareNetworkButton KeyNavigation.up: shareNetworkButton
KeyNavigation.down: deletePopup KeyNavigation.down: deletePopup

Some files were not shown because too many files have changed in this diff Show more