diff --git a/Linphone/tool/Utils.cpp b/Linphone/tool/Utils.cpp
index 273f62101..dec11510c 100644
--- a/Linphone/tool/Utils.cpp
+++ b/Linphone/tool/Utils.cpp
@@ -55,6 +55,11 @@ char *Utils::rstrstr(const char *a, const char *b) {
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) {
QStringList splitted = address.split(":");
if (splitted.size() > 0 && splitted[0] == "sip") splitted.removeFirst();
diff --git a/Linphone/tool/Utils.hpp b/Linphone/tool/Utils.hpp
index e4b93b603..d2276f02d 100644
--- a/Linphone/tool/Utils.hpp
+++ b/Linphone/tool/Utils.hpp
@@ -53,7 +53,7 @@ class Utils : public QObject {
public:
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 QString getUsername(const QString &address);
Q_INVOKABLE static QString getGivenNameFromFullName(const QString &fullName);
diff --git a/Linphone/view/Control/Button/Button.qml b/Linphone/view/Control/Button/Button.qml
index 82c10f0ba..013acc4ad 100644
--- a/Linphone/view/Control/Button/Button.qml
+++ b/Linphone/view/Control/Button/Button.qml
@@ -12,10 +12,10 @@ Control.Button {
property color borderColor: DefaultStyle.grey_0
readonly property color pressedColor: Qt.darker(color, 1.1)
property bool inversedColors: false
- property int textSize: 18 * DefaultStyle.dp
- property int textWeight: 600 * DefaultStyle.dp
+ property int textSize: 18 * mainWindow.dp
+ property int textWeight: 600 * mainWindow.dp
property var textHAlignment: Text.AlignHCenter
- property int radius: 48 * DefaultStyle.dp
+ property int radius: 48 * mainWindow.dp
property color textColor: DefaultStyle.grey_0
property bool underline: activeFocus || containsMouse
property bool shadowEnabled: enabled && (activeFocus || containsMouse)
@@ -24,10 +24,10 @@ Control.Button {
property bool asynchronous: true
hoverEnabled: true
activeFocusOnTab: true
- // leftPadding: 20 * DefaultStyle.dp
- // rightPadding: 20 * DefaultStyle.dp
- // topPadding: 11 * DefaultStyle.dp
- // bottomPadding: 11 * DefaultStyle.dp
+ // leftPadding: 20 * mainWindow.dp
+ // rightPadding: 20 * mainWindow.dp
+ // topPadding: 11 * mainWindow.dp
+ // bottomPadding: 11 * mainWindow.dp
implicitHeight: contentItem.implicitHeight + bottomPadding + topPadding
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
MouseArea {
diff --git a/Linphone/view/Control/Button/CalendarComboBox.qml b/Linphone/view/Control/Button/CalendarComboBox.qml
index e7f063b19..15418c06b 100644
--- a/Linphone/view/Control/Button/CalendarComboBox.qml
+++ b/Linphone/view/Control/Button/CalendarComboBox.qml
@@ -14,24 +14,24 @@ ComboBox {
id: contentText
text: Qt.formatDate(calendar.selectedDate, "ddd d, MMMM")
anchors.fill: parent
- anchors.leftMargin: 15 * DefaultStyle.dp
+ anchors.leftMargin: 15 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
popup: Control.Popup {
id: popupItem
y: mainItem.height
- width: 321 * DefaultStyle.dp
- height: 270 * DefaultStyle.dp
+ width: 321 * mainWindow.dp
+ height: 270 * mainWindow.dp
closePolicy: Popup.NoAutoClose
- topPadding: 25 * DefaultStyle.dp
- bottomPadding: 24 * DefaultStyle.dp
- leftPadding: 21 * DefaultStyle.dp
- rightPadding: 19 * DefaultStyle.dp
+ topPadding: 25 * mainWindow.dp
+ bottomPadding: 24 * mainWindow.dp
+ leftPadding: 21 * mainWindow.dp
+ rightPadding: 19 * mainWindow.dp
onOpened: calendar.forceActiveFocus()
background: Item {
anchors.fill: parent
@@ -39,7 +39,7 @@ ComboBox {
id: calendarBg
anchors.fill: parent
color: DefaultStyle.grey_0
- radius: 16 * DefaultStyle.dp
+ radius: 16 * mainWindow.dp
border.color: DefaultStyle.main1_500_main
border.width: calendar.activeFocus? 1 : 0
}
diff --git a/Linphone/view/Control/Button/CheckBox.qml b/Linphone/view/Control/Button/CheckBox.qml
index bc13e5663..ba675909a 100644
--- a/Linphone/view/Control/Button/CheckBox.qml
+++ b/Linphone/view/Control/Button/CheckBox.qml
@@ -7,16 +7,16 @@ Control.CheckBox {
id: mainItem
property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered
indicator: Item{
- implicitWidth: 20 * DefaultStyle.dp
- implicitHeight: 20 * DefaultStyle.dp
+ implicitWidth: 20 * mainWindow.dp
+ implicitHeight: 20 * mainWindow.dp
x: (parent.width - width) / 2
y: (parent.height - height) / 2
Rectangle {
id: backgroundArea
anchors.fill: parent
- radius: 3 * DefaultStyle.dp
+ radius: 3 * mainWindow.dp
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"
EffectImage {
visible: mainItem.checked
diff --git a/Linphone/view/Control/Button/ComboBox.qml b/Linphone/view/Control/Button/ComboBox.qml
index 51a589c04..190b097f5 100644
--- a/Linphone/view/Control/Button/ComboBox.qml
+++ b/Linphone/view/Control/Button/ComboBox.qml
@@ -13,9 +13,9 @@ Control.ComboBox {
// Layout.preferredHeight: mainItem.height
property alias listView: listView
property string constantImageSource
- property int pixelSize: 14 * DefaultStyle.dp
- property int weight: 400 * DefaultStyle.dp
- property int leftMargin: 10 * DefaultStyle.dp
+ property int pixelSize: 14 * mainWindow.dp
+ property int weight: 400 * mainWindow.dp
+ property int leftMargin: 10 * mainWindow.dp
property bool oneLine: false
property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered
@@ -46,7 +46,7 @@ Control.ComboBox {
Rectangle {
id: buttonBackground
anchors.fill: parent
- radius: 63 * DefaultStyle.dp
+ radius: 63 * mainWindow.dp
color: mainItem.enabled ? DefaultStyle.grey_100 : DefaultStyle.grey_200
border.color: mainItem.enabled
? mainItem.activeFocus
@@ -68,14 +68,14 @@ Control.ComboBox {
}
contentItem: Item {
anchors.fill: parent
- anchors.leftMargin: 10 * DefaultStyle.dp
- anchors.rightMargin: indicImage.width + 10 * DefaultStyle.dp
+ anchors.leftMargin: 10 * mainWindow.dp
+ anchors.rightMargin: indicImage.width + 10 * mainWindow.dp
Image {
id: selectedItemImg
source: mainItem.constantImageSource ? mainItem.constantImageSource : ""
visible: source != ""
- sourceSize.width: 24 * DefaultStyle.dp
- width: visible ? 24 * DefaultStyle.dp : 0
+ sourceSize.width: 24 * mainWindow.dp
+ width: visible ? 24 * mainWindow.dp : 0
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
@@ -93,9 +93,9 @@ Control.ComboBox {
weight: mainItem.weight
}
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.rightMargin: 20 * DefaultStyle.dp
+ anchors.rightMargin: 20 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
}
@@ -118,10 +118,10 @@ Control.ComboBox {
id: indicImage
z: 1
anchors.right: parent.right
- anchors.rightMargin: 10 * DefaultStyle.dp
+ anchors.rightMargin: 10 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
source: AppIcons.downArrow
- width: 14 * DefaultStyle.dp
+ width: 14 * mainWindow.dp
fillMode: Image.PreserveAspectFit
}
@@ -130,7 +130,7 @@ Control.ComboBox {
y: mainItem.height - 1
width: mainItem.width
implicitHeight: contentItem.implicitHeight
- padding: 1 * DefaultStyle.dp
+ padding: 1 * mainWindow.dp
//height: Math.min(implicitHeight, 300)
onOpened: {
@@ -150,7 +150,7 @@ Control.ComboBox {
highlight: Rectangle {
width: listView.width
color: DefaultStyle.main2_200
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
y: listView.currentItem? listView.currentItem.y : 0
}
@@ -171,12 +171,12 @@ Control.ComboBox {
Image {
id: delegateImg
visible: source != ""
- width: visible ? 20 * DefaultStyle.dp : 0
- sourceSize.width: 20 * DefaultStyle.dp
+ width: visible ? 20 * mainWindow.dp : 0
+ sourceSize.width: 20 * mainWindow.dp
source: typeof(modelData) != "undefined" && modelData.img ? modelData.img : ""
fillMode: Image.PreserveAspectFit
anchors.left: parent.left
- anchors.leftMargin: visible ? 10 * DefaultStyle.dp : 0
+ anchors.leftMargin: visible ? 10 * mainWindow.dp : 0
anchors.verticalCenter: parent.verticalCenter
}
@@ -192,14 +192,14 @@ Control.ComboBox {
maximumLineCount: 1
wrapMode: Text.WrapAnywhere
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
anchors.verticalCenter: parent.verticalCenter
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.rightMargin: 20 * DefaultStyle.dp
+ anchors.rightMargin: 20 * mainWindow.dp
}
MouseArea {
@@ -209,7 +209,7 @@ Control.ComboBox {
Rectangle {
anchors.fill: parent
opacity: 0.1
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
color: DefaultStyle.main2_500main
visible: parent.containsMouse
}
@@ -227,11 +227,11 @@ Control.ComboBox {
background: Item {
implicitWidth: mainItem.width
- implicitHeight: 30 * DefaultStyle.dp
+ implicitHeight: 30 * mainWindow.dp
Rectangle {
id: cboxBg
anchors.fill: parent
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
}
MultiEffect {
anchors.fill: cboxBg
diff --git a/Linphone/view/Control/Button/CountryIndicatorCombobox.qml b/Linphone/view/Control/Button/CountryIndicatorCombobox.qml
index f8af24ca8..8db75e06a 100644
--- a/Linphone/view/Control/Button/CountryIndicatorCombobox.qml
+++ b/Linphone/view/Control/Button/CountryIndicatorCombobox.qml
@@ -17,8 +17,8 @@ ColumnLayout {
text: mainItem.label
color: combobox.activeFocus ? DefaultStyle.main1_500_main : DefaultStyle.main2_600
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
bold: true
}
}
@@ -34,7 +34,7 @@ ColumnLayout {
background: Rectangle {
implicitWidth: mainItem.implicitWidth
implicitHeight: mainItem.implicitHeight
- radius: 63 * DefaultStyle.dp
+ radius: 63 * mainWindow.dp
color: mainItem.enableBackgroundColor ? DefaultStyle.grey_100 : "transparent"
border.color: mainItem.enableBackgroundColors
? (mainItem.errorMessage.length > 0
@@ -47,14 +47,14 @@ ColumnLayout {
contentItem: Item {
anchors.fill: parent
readonly property var currentItem: combobox.model.getAt(combobox.currentIndex)
- anchors.leftMargin: 15 * DefaultStyle.dp
+ anchors.leftMargin: 15 * mainWindow.dp
Text {
id: selectedItemFlag
visible: text.length > 0
- font.pixelSize: 21 * DefaultStyle.dp
+ font.pixelSize: 21 * mainWindow.dp
text: parent.currentItem ? parent.currentItem.flag : ""
font.family: DefaultStyle.emojiFont
- anchors.rightMargin: 5 * DefaultStyle.dp
+ anchors.rightMargin: 5 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
}
// Rectangle{
@@ -62,7 +62,7 @@ ColumnLayout {
// visible: false
// layer.enabled: true
// anchors.centerIn: selectedItemFlag
- // radius: 600 * DefaultStyle.dp
+ // radius: 600 * mainWindow.dp
// width: selectedItemFlag.width/2
// height: selectedItemFlag.height/2
// }
@@ -77,7 +77,7 @@ ColumnLayout {
// maskSource: mask
// }
Text {
- leftPadding: 5 * DefaultStyle.dp
+ leftPadding: 5 * mainWindow.dp
text: parent.currentItem ? "+" + parent.currentItem.countryCallingCode : ""
color: DefaultStyle.main2_600
anchors.right: parent.right
@@ -85,8 +85,8 @@ ColumnLayout {
anchors.verticalCenter: parent.verticalCenter
elide: Text.ElideRight
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -100,8 +100,8 @@ ColumnLayout {
popup: Control.Popup {
id: listPopup
y: combobox.height - 1
- width: 311 * DefaultStyle.dp
- height: 250 * DefaultStyle.dp
+ width: 311 * mainWindow.dp
+ height: 250 * mainWindow.dp
contentItem: ListView {
id: listView
@@ -112,14 +112,14 @@ ColumnLayout {
keyNavigationEnabled: true
keyNavigationWraps: true
maximumFlickVelocity: 1500
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
highlight: Rectangle {
anchors.left: parent.left
anchors.right: parent.right
width: listView.width
height: listView.height
color: DefaultStyle.main2_300
- // radius: 15 * DefaultStyle.dp
+ // radius: 15 * mainWindow.dp
y: listView.currentItem? listView.currentItem.y : 0
}
@@ -128,13 +128,13 @@ ColumnLayout {
height: combobox.height
RowLayout {
anchors.fill: parent
- anchors.leftMargin: 20 * DefaultStyle.dp
+ anchors.leftMargin: 20 * mainWindow.dp
Text {
id: delegateImg
visible: text.length > 0
text: $modelData.flag
font {
- pixelSize: 28 * DefaultStyle.dp
+ pixelSize: 28 * mainWindow.dp
family: DefaultStyle.emojiFont
}
}
@@ -145,14 +145,14 @@ ColumnLayout {
elide: Text.ElideRight
color: DefaultStyle.main2_500main
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
Rectangle {
id: separator
- width: 1 * DefaultStyle.dp
+ width: 1 * mainWindow.dp
height: combobox.height / 2
color: DefaultStyle.main2_500main
}
@@ -162,8 +162,8 @@ ColumnLayout {
elide: Text.ElideRight
color: DefaultStyle.main2_500main
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
Item {
@@ -176,7 +176,7 @@ ColumnLayout {
Rectangle {
anchors.fill: parent
opacity: 0.1
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
color: DefaultStyle.main2_500main
visible: parent.containsMouse
}
@@ -198,7 +198,7 @@ ColumnLayout {
Rectangle {
id: popupBg
anchors.fill: parent
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
color: DefaultStyle.grey_100
}
MultiEffect {
diff --git a/Linphone/view/Control/Button/HelpIconLabelButton.qml b/Linphone/view/Control/Button/HelpIconLabelButton.qml
index 7e8b50f6b..9666c6d42 100644
--- a/Linphone/view/Control/Button/HelpIconLabelButton.qml
+++ b/Linphone/view/Control/Button/HelpIconLabelButton.qml
@@ -8,7 +8,7 @@ MouseArea {
property string iconSource
property string title
property string subTitle
- property int iconSize: 32 * DefaultStyle.dp
+ property int iconSize: 32 * mainWindow.dp
property bool shadowEnabled: containsMouse || activeFocus
hoverEnabled: true
width: content.implicitWidth
@@ -36,7 +36,7 @@ MouseArea {
ColumnLayout {
width: implicitWidth
height: implicitHeight
- Layout.leftMargin: 16 * DefaultStyle.dp
+ Layout.leftMargin: 16 * mainWindow.dp
Text {
Layout.fillWidth: true
text: mainItem.title
diff --git a/Linphone/view/Control/Button/IconLabelButton.qml b/Linphone/view/Control/Button/IconLabelButton.qml
index 0afe28e08..72d98f7cb 100644
--- a/Linphone/view/Control/Button/IconLabelButton.qml
+++ b/Linphone/view/Control/Button/IconLabelButton.qml
@@ -8,12 +8,12 @@ Item{
property string iconSource
property string text
property color color: DefaultStyle.main2_600
- property int iconSize: 17 * DefaultStyle.dp
- property int textSize: 14 * DefaultStyle.dp
- property int textWeight: 400 * DefaultStyle.dp
+ property int iconSize: 17 * mainWindow.dp
+ property int textSize: 14 * mainWindow.dp
+ property int textWeight: 400 * mainWindow.dp
property color backgroundColor: DefaultStyle.grey_0
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 alias containsMouse: mouseArea.containsMouse
diff --git a/Linphone/view/Control/Button/MediumButton.qml b/Linphone/view/Control/Button/MediumButton.qml
index 4be5a13d4..d1d87ab7a 100644
--- a/Linphone/view/Control/Button/MediumButton.qml
+++ b/Linphone/view/Control/Button/MediumButton.qml
@@ -10,8 +10,8 @@ Button {
textWeight: Typography.b3.weight
color: DefaultStyle.main1_100
textColor: DefaultStyle.main1_500_main
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
- topPadding: 10 * DefaultStyle.dp
- bottomPadding: 10 * DefaultStyle.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
+ topPadding: 10 * mainWindow.dp
+ bottomPadding: 10 * mainWindow.dp
}
diff --git a/Linphone/view/Control/Button/PopupButton.qml b/Linphone/view/Control/Button/PopupButton.qml
index 989c5668c..ae55fc82f 100644
--- a/Linphone/view/Control/Button/PopupButton.qml
+++ b/Linphone/view/Control/Button/PopupButton.qml
@@ -10,17 +10,17 @@ Button {
property bool shadowEnabled: mainItem.activeFocus || hovered
property alias popupBackgroundColor: popupBackground.color
checked: popup.visible
- implicitWidth: 24 * DefaultStyle.dp
- implicitHeight: 24 * DefaultStyle.dp
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ implicitWidth: 24 * mainWindow.dp
+ implicitHeight: 24 * mainWindow.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
icon.source: AppIcons.more
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
function close() {
popup.close()
}
@@ -41,7 +41,7 @@ Button {
anchors.fill: parent
visible: mainItem.checked || mainItem.shadowEnabled
color: mainItem.checked ? DefaultStyle.main2_300 : DefaultStyle.grey_100
- radius: 40 * DefaultStyle.dp
+ radius: 40 * mainWindow.dp
}
MultiEffect {
enabled: mainItem.shadowEnabled
@@ -70,7 +70,7 @@ Button {
x: 0
y: mainItem.height
closePolicy: Popup.CloseOnPressOutsideParent | Popup.CloseOnPressOutside | Popup.CloseOnEscape
- padding: 10 * DefaultStyle.dp
+ padding: 10 * mainWindow.dp
parent: mainItem // Explicit define for coordinates references.
onVisibleChanged: {
@@ -96,7 +96,7 @@ Button {
id: popupBackground
anchors.fill: parent
color: DefaultStyle.grey_0
- radius: 16 * DefaultStyle.dp
+ radius: 16 * mainWindow.dp
}
MultiEffect {
source: popupBackground
diff --git a/Linphone/view/Control/Button/RadioButton.qml b/Linphone/view/Control/Button/RadioButton.qml
index 884a22f53..b5f51c842 100644
--- a/Linphone/view/Control/Button/RadioButton.qml
+++ b/Linphone/view/Control/Button/RadioButton.qml
@@ -11,7 +11,7 @@ Control.RadioButton {
property string imgUrl
property bool checkOnClick: true
property color color
- property int indicatorSize: 16 * DefaultStyle.dp
+ property int indicatorSize: 16 * mainWindow.dp
property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered
//onClicked: if (checkOnClick && !mainItem.checked) mainItem.toggle()
@@ -33,7 +33,7 @@ Control.RadioButton {
radius: mainItem.indicatorSize/2
color: "transparent"
border.color: mainItem.color
- border.width: 2 * DefaultStyle.dp
+ border.width: 2 * mainWindow.dp
Rectangle {
width: parent.width/2
height: parent.height/2
diff --git a/Linphone/view/Control/Button/SecurityRadioButton.qml b/Linphone/view/Control/Button/SecurityRadioButton.qml
index 57021f557..54e77b24e 100644
--- a/Linphone/view/Control/Button/SecurityRadioButton.qml
+++ b/Linphone/view/Control/Button/SecurityRadioButton.qml
@@ -21,18 +21,18 @@ Control.RadioButton {
background: Rectangle {
color: DefaultStyle.grey_100
border.color: mainItem.checked ? mainItem.color : "transparent"
- radius: 20 * DefaultStyle.dp
+ radius: 20 * mainWindow.dp
}
indicator: RowLayout {
anchors.left: parent.left
- anchors.leftMargin: 13 * DefaultStyle.dp
+ anchors.leftMargin: 13 * mainWindow.dp
anchors.top: parent.top
- anchors.topMargin: 8 * DefaultStyle.dp
- spacing: 4 * DefaultStyle.dp
+ anchors.topMargin: 8 * mainWindow.dp
+ spacing: 4 * mainWindow.dp
Rectangle {
- implicitWidth: 16 * DefaultStyle.dp
- implicitHeight: 16 * DefaultStyle.dp
+ implicitWidth: 16 * mainWindow.dp
+ implicitHeight: 16 * mainWindow.dp
radius: implicitWidth/2
border.color: mainItem.color
@@ -51,7 +51,7 @@ Control.RadioButton {
text: mainItem.title
font.bold: true
color: DefaultStyle.grey_900
- font.pixelSize: 16 * DefaultStyle.dp
+ font.pixelSize: 16 * mainWindow.dp
}
Button {
padding: 0
@@ -59,12 +59,12 @@ Control.RadioButton {
visible: false
}
icon.source: AppIcons.info
- Layout.preferredWidth: 2 * DefaultStyle.dp
- Layout.preferredHeight: 2 * DefaultStyle.dp
- width: 2 * DefaultStyle.dp
- height: 2 * DefaultStyle.dp
- icon.width: 2 * DefaultStyle.dp
- icon.height: 2 * DefaultStyle.dp
+ Layout.preferredWidth: 2 * mainWindow.dp
+ Layout.preferredHeight: 2 * mainWindow.dp
+ width: 2 * mainWindow.dp
+ height: 2 * mainWindow.dp
+ icon.width: 2 * mainWindow.dp
+ icon.height: 2 * mainWindow.dp
}
}
@@ -73,27 +73,27 @@ Control.RadioButton {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
- anchors.leftMargin: 13 * DefaultStyle.dp
+ anchors.leftMargin: 13 * mainWindow.dp
RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
- Layout.bottomMargin: 10 * DefaultStyle.dp
- Layout.rightMargin: 10 * DefaultStyle.dp
+ Layout.bottomMargin: 10 * mainWindow.dp
+ Layout.rightMargin: 10 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter
Text {
id: innerText
verticalAlignment: Text.AlignVCenter
- Layout.preferredWidth: 220 * DefaultStyle.dp
- Layout.preferredHeight: 100 * DefaultStyle.dp
- font.pixelSize: 14 * DefaultStyle.dp
+ Layout.preferredWidth: 220 * mainWindow.dp
+ Layout.preferredHeight: 100 * mainWindow.dp
+ font.pixelSize: 14 * mainWindow.dp
text: mainItem.contentText
Layout.fillHeight: true
}
Image {
id: image
Layout.fillHeight: true
- Layout.preferredWidth: 100 * DefaultStyle.dp
- Layout.preferredHeight: 100 * DefaultStyle.dp
+ Layout.preferredWidth: 100 * mainWindow.dp
+ Layout.preferredHeight: 100 * mainWindow.dp
fillMode: Image.PreserveAspectFit
source: mainItem.imgUrl
}
diff --git a/Linphone/view/Control/Button/Settings/ComboSetting.qml b/Linphone/view/Control/Button/Settings/ComboSetting.qml
index 1fe09219c..19dd82acd 100644
--- a/Linphone/view/Control/Button/Settings/ComboSetting.qml
+++ b/Linphone/view/Control/Button/Settings/ComboSetting.qml
@@ -6,7 +6,7 @@ import 'qrc:/Linphone/view/Control/Tool/Helper/utils.js' as Utils
ComboBox {
id: comboBox
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
property string propertyName
property var propertyOwner
property alias entries: comboBox.model
diff --git a/Linphone/view/Control/Button/Settings/SwitchSetting.qml b/Linphone/view/Control/Button/Settings/SwitchSetting.qml
index 014f679c0..48851eee9 100644
--- a/Linphone/view/Control/Button/Settings/SwitchSetting.qml
+++ b/Linphone/view/Control/Button/Settings/SwitchSetting.qml
@@ -10,8 +10,8 @@ RowLayout {
property string propertyName
property var propertyOwner
property bool enabled: true
- spacing : 20 * DefaultStyle.dp
- Layout.minimumHeight: 32 * DefaultStyle.dp
+ spacing : 20 * mainWindow.dp
+ Layout.minimumHeight: 32 * mainWindow.dp
ColumnLayout {
Text {
text: titleText
diff --git a/Linphone/view/Control/Button/Slider.qml b/Linphone/view/Control/Button/Slider.qml
index 19e011499..86492aae8 100644
--- a/Linphone/view/Control/Button/Slider.qml
+++ b/Linphone/view/Control/Button/Slider.qml
@@ -11,14 +11,14 @@ Control.Slider {
background: Item{
x: mainItem.leftPadding
y: mainItem.topPadding + mainItem.availableHeight / 2 - height / 2
- implicitWidth: 200 * DefaultStyle.dp
- implicitHeight: 4 * DefaultStyle.dp
+ implicitWidth: 200 * mainWindow.dp
+ implicitHeight: 4 * mainWindow.dp
width: mainItem.availableWidth
height: implicitHeight
Rectangle {
id: sliderBackground
anchors.fill: parent
- radius: 30 * DefaultStyle.dp
+ radius: 30 * mainWindow.dp
// TODO : change the colors when mockup indicates their names
color: DefaultStyle.grey_850
@@ -30,7 +30,7 @@ Control.Slider {
GradientStop { position: 0.0; color: "#FF9E79" }
GradientStop { position: 1.0; color: "#FE5E00" }
}
- radius: 40 * DefaultStyle.dp
+ radius: 40 * mainWindow.dp
}
}
MultiEffect {
@@ -49,12 +49,12 @@ Control.Slider {
handle: Item {
x: mainItem.leftPadding + mainItem.visualPosition * (mainItem.availableWidth - width)
y: mainItem.topPadding + mainItem.availableHeight / 2 - height / 2
- implicitWidth: 16 * DefaultStyle.dp
- implicitHeight: 16 * DefaultStyle.dp
+ implicitWidth: 16 * mainWindow.dp
+ implicitHeight: 16 * mainWindow.dp
Rectangle {
id: handleRect
anchors.fill: parent
- radius: 30 * DefaultStyle.dp
+ radius: 30 * mainWindow.dp
color: DefaultStyle.grey_0
}
MultiEffect {
diff --git a/Linphone/view/Control/Button/SmallButton.qml b/Linphone/view/Control/Button/SmallButton.qml
index eb3eec220..83096dc49 100644
--- a/Linphone/view/Control/Button/SmallButton.qml
+++ b/Linphone/view/Control/Button/SmallButton.qml
@@ -10,8 +10,8 @@ Button {
textWeight: Typography.b2.weight
color: DefaultStyle.main1_100
textColor: DefaultStyle.main1_500_main
- leftPadding: 12 * DefaultStyle.dp
- rightPadding: 12 * DefaultStyle.dp
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
+ leftPadding: 12 * mainWindow.dp
+ rightPadding: 12 * mainWindow.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
}
diff --git a/Linphone/view/Control/Button/Switch.qml b/Linphone/view/Control/Button/Switch.qml
index afcf00f85..a8186435b 100644
--- a/Linphone/view/Control/Button/Switch.qml
+++ b/Linphone/view/Control/Button/Switch.qml
@@ -9,27 +9,27 @@ Control.Switch {
property bool shadowEnabled: mainItem.hovered || mainItem.activeFocus
hoverEnabled: true
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
indicator: Item{
- implicitWidth: 32 * DefaultStyle.dp
- implicitHeight: 20 * DefaultStyle.dp
+ implicitWidth: 32 * mainWindow.dp
+ implicitHeight: 20 * mainWindow.dp
x: mainItem.leftPadding
y: parent.height / 2 - height / 2
Rectangle {
id: indicatorBackground
anchors.fill: parent
- radius: 10 * DefaultStyle.dp
+ radius: 10 * mainWindow.dp
color: mainItem.checked? DefaultStyle.success_500main : DefaultStyle.main2_400
Rectangle {
anchors.verticalCenter: parent.verticalCenter
- property int margin: 4 * DefaultStyle.dp
+ property int margin: 4 * mainWindow.dp
x: mainItem.checked ? parent.width - width - margin : margin
- width: 12 * DefaultStyle.dp
- height: 12 * DefaultStyle.dp
- radius: 10 * DefaultStyle.dp
+ width: 12 * mainWindow.dp
+ height: 12 * mainWindow.dp
+ radius: 10 * mainWindow.dp
color: DefaultStyle.grey_0
Behavior on x {
NumberAnimation{duration: 100}
diff --git a/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml b/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml
index 87afc37a2..5b344dce4 100644
--- a/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml
+++ b/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml
@@ -49,8 +49,8 @@ Item{
RowLayout{
anchors.fill: parent
- anchors.rightMargin: 10 * DefaultStyle.dp
- spacing: 16 * DefaultStyle.dp
+ anchors.rightMargin: 10 * mainWindow.dp
+ spacing: 16 * mainWindow.dp
Control.StackView {
id: mainStackView
@@ -62,21 +62,21 @@ Item{
id: waitingForOthersComponent
Rectangle {
color: DefaultStyle.grey_600
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
ColumnLayout {
anchors.centerIn: parent
- spacing: 22 * DefaultStyle.dp
+ spacing: 22 * mainWindow.dp
width: waitText.implicitWidth
Text {
id: waitText
text: qsTr("Waiting for other participants...")
- Layout.preferredHeight: 67 * DefaultStyle.dp
+ Layout.preferredHeight: 67 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter
color: DefaultStyle.grey_0
font {
- pixelSize: 30 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 30 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
Item {
@@ -87,10 +87,10 @@ Item{
icon.source: AppIcons.shareNetwork
contentImageColor: DefaultStyle.main2_400
text: qsTr("Share invitation")
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
anchors.centerIn: parent
textColor: DefaultStyle.main2_400
onClicked: {
@@ -129,23 +129,23 @@ Item{
ListView{
id: sideStickers
Layout.fillHeight: true
- Layout.preferredWidth: 300 * DefaultStyle.dp
- Layout.rightMargin: 10 * DefaultStyle.dp
- Layout.bottomMargin: 10 * DefaultStyle.dp
+ Layout.preferredWidth: 300 * mainWindow.dp
+ Layout.rightMargin: 10 * mainWindow.dp
+ Layout.bottomMargin: 10 * mainWindow.dp
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
snapMode: ListView.SnapOneItem
clip: true
delegate: Item{ // Spacing workaround
visible: $modelData && mainItem.callState != LinphoneEnums.CallState.End && mainItem.callState != LinphoneEnums.CallState.Released
&& ($modelData.core.address != activeSpeakerAddress || mainItem.conference?.core.isScreenSharingEnabled) || false
- height: visible ? (180 + 15) * DefaultStyle.dp : 0
- width: 300 * DefaultStyle.dp
+ height: visible ? (180 + 15) * mainWindow.dp : 0
+ width: 300 * mainWindow.dp
Sticker {
previewEnabled: index == 0 // before anchors for priority initialization
anchors.fill: parent
- anchors.bottomMargin: 15 * DefaultStyle.dp// Spacing
+ anchors.bottomMargin: 15 * mainWindow.dp// Spacing
qmlName: 'S_'+index
visible: parent.visible
participantDevice: $modelData
@@ -162,12 +162,12 @@ Item{
previewEnabled: true
visible: !sideStickers.visible
onVisibleChanged: console.log(visible + " : " +allDevices.count)
- height: 180 * DefaultStyle.dp
- width: 300 * DefaultStyle.dp
+ height: 180 * mainWindow.dp
+ width: 300 * mainWindow.dp
anchors.right: mainItem.right
anchors.bottom: mainItem.bottom
- anchors.rightMargin: 20 * DefaultStyle.dp
- anchors.bottomMargin: 10 * DefaultStyle.dp
+ anchors.rightMargin: 20 * mainWindow.dp
+ anchors.bottomMargin: 10 * mainWindow.dp
videoEnabled: preview.visible && mainItem.call && mainItem.call.core.localVideoEnabled
onVideoEnabledChanged: console.log("P : " +videoEnabled + " / " +visible +" / " +mainItem.call)
property AccountProxy accounts: AccountProxy {id: accountProxy
@@ -181,7 +181,7 @@ Item{
id: previewMouseArea
anchors.fill: parent
movableArea: mainItem
- margin: 10 * DefaultStyle.dp
+ margin: 10 * mainWindow.dp
function resetPosition(){
preview.anchors.right = mainItem.right
preview.anchors.bottom = mainItem.bottom
diff --git a/Linphone/view/Control/Container/Call/CallLayout.qml b/Linphone/view/Control/Container/Call/CallLayout.qml
index c3825ac58..b7573a77b 100644
--- a/Linphone/view/Control/Container/Call/CallLayout.qml
+++ b/Linphone/view/Control/Container/Call/CallLayout.qml
@@ -39,7 +39,7 @@ Item {
id: callTerminatedText
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
- anchors.topMargin: 25 * DefaultStyle.dp
+ anchors.topMargin: 25 * mainWindow.dp
z: 1
visible: callState === LinphoneEnums.CallState.End || callState === LinphoneEnums.CallState.Error || callState === LinphoneEnums.CallState.Released
text: callState === LinphoneEnums.CallState.End
@@ -53,8 +53,8 @@ Item {
: call && call.core.lastErrorMessage || ""
color: DefaultStyle.grey_0
font {
- pixelSize: 22 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
@@ -90,8 +90,8 @@ Item {
// text: qsTr("Waiting for other participants...")
// color: DefaultStyle.frey_0
// font {
- // pixelSize: 30 * DefaultStyle.dp
- // weight: 300 * DefaultStyle.dp
+ // pixelSize: 30 * mainWindow.dp
+ // weight: 300 * mainWindow.dp
// }
// }
// Button {
@@ -99,8 +99,8 @@ Item {
// text: qsTr("Share invitation")
// icon.source: AppIcons.shareNetwork
// color: DefaultStyle.main2_400
- // Layout.preferredWidth: 206 * DefaultStyle.dp
- // Layout.preferredHeight: 47 * DefaultStyle.dp
+ // Layout.preferredWidth: 206 * mainWindow.dp
+ // Layout.preferredHeight: 47 * mainWindow.dp
// }
// }
diff --git a/Linphone/view/Control/Container/Call/GridLayout.qml b/Linphone/view/Control/Container/Call/GridLayout.qml
index 30eace79e..a84cec006 100644
--- a/Linphone/view/Control/Container/Call/GridLayout.qml
+++ b/Linphone/view/Control/Container/Call/GridLayout.qml
@@ -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)
}
- height: grid.cellHeight - 10 * DefaultStyle.dp
- width: grid.cellWidth - 10 * DefaultStyle.dp
+ height: grid.cellHeight - 10 * mainWindow.dp
+ width: grid.cellWidth - 10 * mainWindow.dp
Sticker {
id: cameraView
previewEnabled: index == 0
diff --git a/Linphone/view/Control/Container/Call/Mosaic.qml b/Linphone/view/Control/Container/Call/Mosaic.qml
index 7b706edf4..da304d93b 100644
--- a/Linphone/view/Control/Container/Call/Mosaic.qml
+++ b/Linphone/view/Control/Container/Call/Mosaic.qml
@@ -57,7 +57,7 @@ ColumnLayout{
GridView{
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 columns: 1
property int rows: 1
diff --git a/Linphone/view/Control/Container/Carousel.qml b/Linphone/view/Control/Container/Carousel.qml
index 871ee7615..0b536aca0 100644
--- a/Linphone/view/Control/Container/Carousel.qml
+++ b/Linphone/view/Control/Container/Carousel.qml
@@ -12,7 +12,7 @@ ColumnLayout {
required property int itemsCount
property int currentIndex: carouselStackLayout.currentIndex
property var currentItem: carouselButton.itemAt(currentIndex)
- spacing: 61 * DefaultStyle.dp
+ spacing: 61 * mainWindow.dp
function goToSlide(index) {
carouselStackLayout.goToSlideAtIndex(index)
@@ -67,9 +67,9 @@ ColumnLayout {
Item {
Rectangle {
id: currentIndicator
- width: 13 * DefaultStyle.dp
- height: 8 * DefaultStyle.dp
- radius: 30 * DefaultStyle.dp
+ width: 13 * mainWindow.dp
+ height: 8 * mainWindow.dp
+ radius: 30 * mainWindow.dp
color: DefaultStyle.main1_500_main
z: 1
x: mainItem.currentIndex >= 0 && mainItem.currentItem ? mainItem.currentItem.x - width/2 + mainItem.currentItem.width/2 : 0
@@ -77,21 +77,21 @@ ColumnLayout {
}
RowLayout {
id: carouselButtonsLayout
- spacing: 7.5 * DefaultStyle.dp
- anchors.leftMargin: 2.5 * DefaultStyle.dp
+ spacing: 7.5 * mainWindow.dp
+ anchors.leftMargin: 2.5 * mainWindow.dp
Repeater {
id: carouselButton
model: mainItem.itemsCount
delegate: Button {
- Layout.preferredWidth: 8 * DefaultStyle.dp
- Layout.preferredHeight: 8 * DefaultStyle.dp
+ Layout.preferredWidth: 8 * mainWindow.dp
+ Layout.preferredHeight: 8 * mainWindow.dp
topPadding: 0
bottomPadding: 0
leftPadding: 0
rightPadding: 0
background: Rectangle {
color: DefaultStyle.main2_200
- radius: 30 * DefaultStyle.dp
+ radius: 30 * mainWindow.dp
anchors.fill: parent
}
onClicked: {
diff --git a/Linphone/view/Control/Container/Contact/ContactLayout.qml b/Linphone/view/Control/Container/Contact/ContactLayout.qml
index c2c8eaec8..a3b19c7e4 100644
--- a/Linphone/view/Control/Container/Contact/ContactLayout.qml
+++ b/Linphone/view/Control/Container/Contact/ContactLayout.qml
@@ -8,7 +8,7 @@ import SettingsCpp
ColumnLayout {
id: mainItem
- spacing: 30 * DefaultStyle.dp
+ spacing: 30 * mainWindow.dp
property FriendGui contact
property ConferenceInfoGui conferenceInfo
@@ -34,20 +34,20 @@ ColumnLayout {
// property alias image: buttonImg
property alias button: button
property string label
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Button {
id: button
Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: 56 * DefaultStyle.dp
- Layout.preferredHeight: 56 * DefaultStyle.dp
- topPadding: 16 * DefaultStyle.dp
- bottomPadding: 16 * DefaultStyle.dp
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
+ Layout.preferredWidth: 56 * mainWindow.dp
+ Layout.preferredHeight: 56 * mainWindow.dp
+ topPadding: 16 * mainWindow.dp
+ bottomPadding: 16 * mainWindow.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
contentImageColor: DefaultStyle.main2_600
background: Rectangle {
anchors.fill: parent
- radius: 40 * DefaultStyle.dp
+ radius: 40 * mainWindow.dp
color: DefaultStyle.main2_200
}
}
@@ -55,23 +55,23 @@ ColumnLayout {
Layout.alignment: Qt.AlignHCenter
text: labelButton.label
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
ColumnLayout {
- spacing: 13 * DefaultStyle.dp
+ spacing: 13 * mainWindow.dp
Item {
- Layout.preferredWidth: 360 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
Layout.preferredHeight: detailAvatar.height
Layout.alignment: Qt.AlignHCenter
Avatar {
id: detailAvatar
anchors.horizontalCenter: parent.horizontalCenter
- width: 100 * DefaultStyle.dp
- height: 100 * DefaultStyle.dp
+ width: 100 * mainWindow.dp
+ height: 100 * mainWindow.dp
contact: mainItem.contact || null
_address: mainItem.conferenceInfo
? mainItem.conferenceInfo.core.subject
@@ -81,15 +81,15 @@ ColumnLayout {
id: rightButton
anchors.right: parent.right
anchors.verticalCenter: detailAvatar.verticalCenter
- anchors.rightMargin: 20 * DefaultStyle.dp
- width: 30 * DefaultStyle.dp
- height: 30 * DefaultStyle.dp
+ anchors.rightMargin: 20 * mainWindow.dp
+ width: 30 * mainWindow.dp
+ height: 30 * mainWindow.dp
}
}
ColumnLayout {
Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: 360 * DefaultStyle.dp
- spacing: 2 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
+ spacing: 2 * mainWindow.dp
Text {
Layout.preferredWidth: implicitWidth
@@ -99,8 +99,8 @@ ColumnLayout {
text: mainItem.contactName
maximumLineCount: 1
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -113,8 +113,8 @@ ColumnLayout {
elide: Text.ElideMiddle
maximumLineCount: 1
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
Text {
@@ -138,15 +138,15 @@ ColumnLayout {
? DefaultStyle.danger_500main
: DefaultStyle.main2_500main
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
}
RowLayout {
Layout.alignment: Qt.AlignHCenter
- spacing: 72 * DefaultStyle.dp
+ spacing: 72 * mainWindow.dp
Layout.fillWidth: true
Layout.preferredHeight: childrenRect.height
Button {
@@ -165,10 +165,10 @@ ColumnLayout {
}
LabelButton {
visible: !mainItem.isConference
- width: 56 * DefaultStyle.dp
- height: 56 * DefaultStyle.dp
- button.icon.width: 24 * DefaultStyle.dp
- button.icon.height: 24 * DefaultStyle.dp
+ width: 56 * mainWindow.dp
+ height: 56 * mainWindow.dp
+ button.icon.width: 24 * mainWindow.dp
+ button.icon.height: 24 * mainWindow.dp
button.icon.source: AppIcons.phone
label: qsTr("Appel")
button.onClicked: {
@@ -178,20 +178,20 @@ ColumnLayout {
}
LabelButton {
visible: !mainItem.isConference && !SettingsCpp.disableChatFeature
- width: 56 * DefaultStyle.dp
- height: 56 * DefaultStyle.dp
- button.icon.width: 24 * DefaultStyle.dp
- button.icon.height: 24 * DefaultStyle.dp
+ width: 56 * mainWindow.dp
+ height: 56 * mainWindow.dp
+ button.icon.width: 24 * mainWindow.dp
+ button.icon.height: 24 * mainWindow.dp
button.icon.source: AppIcons.chatTeardropText
label: qsTr("Message")
button.onClicked: console.debug("[ContactLayout.qml] TODO : open conversation")
}
LabelButton {
visible: !mainItem.isConference
- width: 56 * DefaultStyle.dp
- height: 56 * DefaultStyle.dp
- button.icon.width: 24 * DefaultStyle.dp
- button.icon.height: 24 * DefaultStyle.dp
+ width: 56 * mainWindow.dp
+ height: 56 * mainWindow.dp
+ button.icon.width: 24 * mainWindow.dp
+ button.icon.height: 24 * mainWindow.dp
button.icon.source: AppIcons.videoCamera
label: qsTr("Appel Video")
button.onClicked: {
@@ -206,6 +206,6 @@ ColumnLayout {
Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter
- Layout.topMargin: 30 * DefaultStyle.dp
+ Layout.topMargin: 30 * mainWindow.dp
}
}
diff --git a/Linphone/view/Control/Container/FormItemLayout.qml b/Linphone/view/Control/Container/FormItemLayout.qml
index 76f95e515..a9daa1211 100644
--- a/Linphone/view/Control/Container/FormItemLayout.qml
+++ b/Linphone/view/Control/Container/FormItemLayout.qml
@@ -22,7 +22,7 @@ FocusScope{
}
ColumnLayout {
id: layout
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Text {
visible: label.length > 0
@@ -35,8 +35,8 @@ FocusScope{
textFormat: Text.RichText
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
diff --git a/Linphone/view/Control/Container/Main/MainRightPanel.qml b/Linphone/view/Control/Container/Main/MainRightPanel.qml
index 3c80cc552..aabd928ff 100644
--- a/Linphone/view/Control/Container/Main/MainRightPanel.qml
+++ b/Linphone/view/Control/Container/Main/MainRightPanel.qml
@@ -15,7 +15,7 @@ ColumnLayout {
Rectangle {
id: rightPanelHeader
color: DefaultStyle.grey_0
- Layout.preferredHeight: 57 * DefaultStyle.dp
+ Layout.preferredHeight: 57 * mainWindow.dp
Layout.fillWidth: true
z: 1
}
diff --git a/Linphone/view/Control/Container/ScrollBar.qml b/Linphone/view/Control/Container/ScrollBar.qml
index a233b1b92..5309b618c 100644
--- a/Linphone/view/Control/Container/ScrollBar.qml
+++ b/Linphone/view/Control/Container/ScrollBar.qml
@@ -9,8 +9,8 @@ Control.ScrollBar {
padding: 0
background: Item{}
contentItem: Rectangle {
- implicitWidth: 6 * DefaultStyle.dp
- radius: 32 * DefaultStyle.dp
+ implicitWidth: 6 * mainWindow.dp
+ radius: 32 * mainWindow.dp
// TODO : ask for color names
color: "#D9D9D9"
}
diff --git a/Linphone/view/Control/Container/Section.qml b/Linphone/view/Control/Container/Section.qml
index d6de8c7a8..f17d7c0fc 100644
--- a/Linphone/view/Control/Container/Section.qml
+++ b/Linphone/view/Control/Container/Section.qml
@@ -7,23 +7,23 @@ Layout with line separator used in several views
*/
ColumnLayout {
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
property alias content: contentLayout.data
property alias contentLayout: contentLayout
- implicitHeight: contentLayout.implicitHeight + 1 * DefaultStyle.dp + spacing
+ implicitHeight: contentLayout.implicitHeight + 1 * mainWindow.dp + spacing
ColumnLayout {
id: contentLayout
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
// width: parent.width
// Layout.fillWidth: true
// Layout.preferredHeight: childrenRect.height
// Layout.preferredWidth: parent.width
- // Layout.leftMargin: 8 * DefaultStyle.dp
+ // Layout.leftMargin: 8 * mainWindow.dp
}
Rectangle {
color: DefaultStyle.main2_200
Layout.fillWidth: true
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
width: parent.width
}
}
\ No newline at end of file
diff --git a/Linphone/view/Control/Container/TabBar.qml b/Linphone/view/Control/Container/TabBar.qml
index 10e389062..e4e111862 100644
--- a/Linphone/view/Control/Container/TabBar.qml
+++ b/Linphone/view/Control/Container/TabBar.qml
@@ -10,9 +10,9 @@ Control.TabBar {
readonly property int originX: count > 0
? itemAt(0).x
: 0
- spacing: 40 * DefaultStyle.dp
- property int pixelSize: 22 * DefaultStyle.dp
- property int textWeight: 800 * DefaultStyle.dp
+ spacing: 40 * mainWindow.dp
+ property int pixelSize: 22 * mainWindow.dp
+ property int textWeight: 800 * mainWindow.dp
wheelEnabled: true
background: Item {
id: tabBarBackground
@@ -20,7 +20,7 @@ Control.TabBar {
Rectangle {
id: barBG
- height: 4 * DefaultStyle.dp
+ height: 4 * mainWindow.dp
color: DefaultStyle.grey_200
anchors.bottom: parent.bottom
width: parent.width
@@ -64,7 +64,7 @@ Control.TabBar {
Rectangle {
id: tabBackground
visible: mainItem.currentIndex === index
- height: 5 * DefaultStyle.dp
+ height: 5 * mainWindow.dp
color: DefaultStyle.main1_500_main
anchors.bottom: parent.bottom
anchors.left: parent.left
@@ -93,7 +93,7 @@ Control.TabBar {
elide: Text.ElideRight
maximumLineCount: 1
text: modelData
- bottomPadding: 5 * DefaultStyle.dp
+ bottomPadding: 5 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Control/Container/VerticalTabBar.qml b/Linphone/view/Control/Container/VerticalTabBar.qml
index ae2ea54af..96e408369 100644
--- a/Linphone/view/Control/Container/VerticalTabBar.qml
+++ b/Linphone/view/Control/Container/VerticalTabBar.qml
@@ -7,8 +7,8 @@ import Linphone
Control.TabBar {
id: mainItem
- //spacing: 32 * DefaultStyle.dp
- topPadding: 36 * DefaultStyle.dp
+ //spacing: 32 * mainWindow.dp
+ topPadding: 36 * mainWindow.dp
property var model
readonly property alias cornerRadius: bottomLeftCorner.radius
@@ -30,8 +30,8 @@ Control.TabBar {
id: unreadNotifications
property int unread: 0
visible: unread > 0
- width: 15 * DefaultStyle.dp
- height: 15 * DefaultStyle.dp
+ width: 15 * mainWindow.dp
+ height: 15 * mainWindow.dp
radius: width/2
color: DefaultStyle.danger_500main
Text{
@@ -41,7 +41,7 @@ Control.TabBar {
horizontalAlignment: Text.AlignHCenter
color: DefaultStyle.grey_0
fontSizeMode: Text.Fit
- font.pixelSize: 15 * DefaultStyle.dp
+ font.pixelSize: 15 * mainWindow.dp
text: parent.unread > 100 ? '99+' : parent.unread
}
}
@@ -69,7 +69,7 @@ Control.TabBar {
id: bottomLeftCorner
anchors.fill: parent
color: DefaultStyle.main1_500_main
- radius: 25 * DefaultStyle.dp
+ radius: 25 * mainWindow.dp
}
Rectangle {
color: DefaultStyle.main1_500_main
@@ -93,8 +93,8 @@ Control.TabBar {
id: tabButton
width: mainItem.width
height: visible ? undefined : 0
- bottomInset: 32 * DefaultStyle.dp
- topInset: 32 * DefaultStyle.dp
+ bottomInset: 32 * mainWindow.dp
+ topInset: 32 * mainWindow.dp
visible: modelData?.visible != undefined ? modelData?.visible : true
UnreadNotification {
@@ -106,7 +106,7 @@ Control.TabBar {
? defaultAccount.core?.unreadMessageNotifications || -1
: 0
anchors.right: parent.right
- anchors.rightMargin: 15 * DefaultStyle.dp
+ anchors.rightMargin: 15 * mainWindow.dp
anchors.top: parent.top
}
contentItem: ColumnLayout {
@@ -114,7 +114,7 @@ Control.TabBar {
// width: tabButton.width
EffectImage {
id: buttonIcon
- property int buttonSize: 24 * DefaultStyle.dp
+ property int buttonSize: 24 * mainWindow.dp
imageSource: mainItem.currentIndex === index ? modelData.selectedIcon : modelData.icon
Layout.preferredWidth: buttonSize
Layout.preferredHeight: buttonSize
@@ -126,8 +126,8 @@ Control.TabBar {
id: buttonText
text: modelData.label
font {
- weight: mainItem.currentIndex === index ? 800 * DefaultStyle.dp : 400 * DefaultStyle.dp
- pixelSize: 9 * DefaultStyle.dp
+ weight: mainItem.currentIndex === index ? 800 * mainWindow.dp : 400 * mainWindow.dp
+ pixelSize: 9 * mainWindow.dp
underline: tabButton.activeFocus || tabButton.hovered
}
color: DefaultStyle.grey_0
@@ -135,8 +135,8 @@ Control.TabBar {
Layout.preferredHeight: txtMeter.height
Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter
- leftPadding: 3 * DefaultStyle.dp
- rightPadding: 3 * DefaultStyle.dp
+ leftPadding: 3 * mainWindow.dp
+ rightPadding: 3 * mainWindow.dp
}
}
TextMetrics {
@@ -144,7 +144,7 @@ Control.TabBar {
text: modelData.label
font: buttonText.font
Component.onCompleted: {
- font.weight = 800 * DefaultStyle.dp
+ font.weight = 800 * mainWindow.dp
mainItem.implicitWidth = Math.max(mainItem.implicitWidth, advanceWidth + buttonIcon.buttonSize)
}
}
diff --git a/Linphone/view/Control/Display/Contact/Avatar.qml b/Linphone/view/Control/Display/Contact/Avatar.qml
index 341e0fef0..fb0c60a5b 100644
--- a/Linphone/view/Control/Display/Contact/Avatar.qml
+++ b/Linphone/view/Control/Display/Contact/Avatar.qml
@@ -83,7 +83,7 @@ Loader{
z: 1
color: "transparent"
border {
- width: 3 * DefaultStyle.dp
+ width: 3 * mainWindow.dp
color: mainItem.secured ? DefaultStyle.info_500_main : DefaultStyle.danger_500main
}
Image {
@@ -126,7 +126,7 @@ Loader{
: DefaultStyle.main2_500main
: "transparent"
border {
- width: 2 * DefaultStyle.dp
+ width: 2 * mainWindow.dp
color: DefaultStyle.grey_0
}
}
@@ -152,7 +152,7 @@ Loader{
text: initialItem.initials
font {
pixelSize: initialItem.height * 36 / 120
- weight: 800 * DefaultStyle.dp
+ weight: 800 * mainWindow.dp
capitalization: Font.AllUppercase
}
}
diff --git a/Linphone/view/Control/Display/Contact/Contact.qml b/Linphone/view/Control/Display/Contact/Contact.qml
index 344007f70..b366566ea 100644
--- a/Linphone/view/Control/Display/Contact/Contact.qml
+++ b/Linphone/view/Control/Display/Contact/Contact.qml
@@ -17,7 +17,7 @@ Rectangle{
signal backgroundClicked()
signal edit()
- height: 45 * DefaultStyle.dp
+ height: 45 * mainWindow.dp
MouseArea{
anchors.fill: parent
onClicked: mainItem.backgroundClicked()
@@ -26,11 +26,11 @@ Rectangle{
anchors.fill: parent
spacing: 0
RowLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Avatar{
id: avatar
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
account: mainItem.account
MouseArea{
anchors.fill: parent
@@ -38,9 +38,9 @@ Rectangle{
}
}
Item {
- Layout.preferredWidth: 200 * DefaultStyle.dp
+ Layout.preferredWidth: 200 * mainWindow.dp
Layout.fillHeight: true
- Layout.rightMargin: 10 * DefaultStyle.dp
+ Layout.rightMargin: 10 * mainWindow.dp
ContactDescription{
id: description
anchors.fill: parent
@@ -50,18 +50,18 @@ Rectangle{
}
Control.Control {
id: registrationStatusItem
- Layout.minimumWidth: 49 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- topPadding: 4 * DefaultStyle.dp
- bottomPadding: 4 * DefaultStyle.dp
- leftPadding: 8 * DefaultStyle.dp
- rightPadding: 8 * DefaultStyle.dp
- Layout.preferredWidth: text.implicitWidth + (2 * 8 * DefaultStyle.dp)
+ Layout.minimumWidth: 49 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ topPadding: 4 * mainWindow.dp
+ bottomPadding: 4 * mainWindow.dp
+ leftPadding: 8 * mainWindow.dp
+ rightPadding: 8 * mainWindow.dp
+ Layout.preferredWidth: text.implicitWidth + (2 * 8 * mainWindow.dp)
background: Rectangle{
id: registrationStatus
anchors.fill: parent
color: DefaultStyle.main2_200
- radius: 90 * DefaultStyle.dp
+ radius: 90 * mainWindow.dp
}
contentItem: Text {
id: text
@@ -83,8 +83,8 @@ Rectangle{
// repeat: true
// onTriggered: text.mode = (++text.mode) % 4
// }
- font.weight: 300 * DefaultStyle.dp
- font.pixelSize: 12 * DefaultStyle.dp
+ font.weight: 300 * mainWindow.dp
+ font.pixelSize: 12 * mainWindow.dp
color: mode == 0
? DefaultStyle.success_500main
: mode == 1
@@ -102,31 +102,31 @@ Rectangle{
}
}
Item{
- Layout.preferredWidth: 26 * DefaultStyle.dp
- Layout.preferredHeight: 26 * DefaultStyle.dp
+ Layout.preferredWidth: 26 * mainWindow.dp
+ Layout.preferredHeight: 26 * mainWindow.dp
Layout.fillHeight: true
- Layout.leftMargin: 40 * DefaultStyle.dp
+ Layout.leftMargin: 40 * mainWindow.dp
visible: mainItem.account.core.unreadCallNotifications > 0
Rectangle{
id: unreadNotifications
anchors.verticalCenter: parent.verticalCenter
- width: 26 * DefaultStyle.dp
- height: 26 * DefaultStyle.dp
+ width: 26 * mainWindow.dp
+ height: 26 * mainWindow.dp
radius: width/2
color: DefaultStyle.danger_500main
border.color: DefaultStyle.grey_0
- border.width: 2 * DefaultStyle.dp
+ border.width: 2 * mainWindow.dp
Text{
id: unreadCount
anchors.fill: parent
- anchors.margins: 2 * DefaultStyle.dp
+ anchors.margins: 2 * mainWindow.dp
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
color: DefaultStyle.grey_0
minimumPixelSize: 5
fontSizeMode: Text.Fit
- font.pixelSize: 11 * DefaultStyle.dp
- font.weight: 700 * DefaultStyle.dp
+ font.pixelSize: 11 * mainWindow.dp
+ font.weight: 700 * mainWindow.dp
text: mainItem.account.core.unreadCallNotifications >= 100 ? '99+' : mainItem.account.core.unreadCallNotifications
}
}
@@ -139,10 +139,10 @@ Rectangle{
}
}
Voicemail {
- Layout.leftMargin: 18 * DefaultStyle.dp
- Layout.rightMargin: 20 * DefaultStyle.dp
- Layout.preferredWidth: 27 * DefaultStyle.dp
- Layout.preferredHeight: 28 * DefaultStyle.dp
+ Layout.leftMargin: 18 * mainWindow.dp
+ Layout.rightMargin: 20 * mainWindow.dp
+ Layout.preferredWidth: 27 * mainWindow.dp
+ Layout.preferredHeight: 28 * mainWindow.dp
voicemailCount: mainItem.account.core.voicemailCount >= 100 ? '99+' : mainItem.account.core.voicemailCount
onClicked: {
if (mainItem.account.core.mwiServerAddress.length > 0)
@@ -155,11 +155,11 @@ Rectangle{
EffectImage {
id: manageAccount
imageSource: AppIcons.manageProfile
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
visible: !SettingsCpp.hideAccountSettings
- width: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.main2_500main
MouseArea{
diff --git a/Linphone/view/Control/Display/Contact/ContactListView.qml b/Linphone/view/Control/Display/Contact/ContactListView.qml
index e95866b31..6463b658b 100644
--- a/Linphone/view/Control/Display/Contact/ContactListView.qml
+++ b/Linphone/view/Control/Display/Contact/ContactListView.qml
@@ -13,7 +13,7 @@ ListView {
visible: contentHeight > 0
clip: true
//keyNavigationWraps: true
- // rightMargin: 5 * DefaultStyle.dp
+ // rightMargin: 5 * mainWindow.dp
property bool selectionEnabled: true
@@ -138,7 +138,7 @@ ListView {
}
delegate: FocusScope {
id: itemDelegate
- height: 56 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
width: mainItem.width
property var previousItem : mainItem.model.count > 0 && index > 0 ? mainItem.model.getAt(index-1) : null
property var previousDisplayName: previousItem ? previousItem.core.displayName : ""
@@ -154,15 +154,15 @@ ListView {
anchors.left: parent.left
visible: mainItem.initialHeadersVisible && mainItem.model.sourceFlags != LinphoneEnums.MagicSearchSource.All
anchors.verticalCenter: parent.verticalCenter
- anchors.rightMargin: 15 * DefaultStyle.dp
+ anchors.rightMargin: 15 * mainWindow.dp
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
text: displayName[0]
color: DefaultStyle.main2_400
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 500 * mainWindow.dp
capitalization: Font.AllUppercase
}
}
@@ -170,13 +170,13 @@ ListView {
id: contactDelegate
anchors.left: initial.visible ? initial.right : parent.left
anchors.right: parent.right
- anchors.rightMargin: 5 * DefaultStyle.dp
+ anchors.rightMargin: 5 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
z: 1
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
contact: modelData
}
ColumnLayout {
@@ -184,20 +184,20 @@ ListView {
Text {
text: UtilsCpp.boldTextPart(itemDelegate.displayName, mainItem.searchBarText)
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
- weight: mainItem.showDefaultAddress ? 800 * DefaultStyle.dp : 400 * DefaultStyle.dp
+ weight: mainItem.showDefaultAddress ? 800 * mainWindow.dp : 400 * mainWindow.dp
}
maximumLineCount: 1
Layout.fillWidth: true
}
Text {
- Layout.topMargin: 2 * DefaultStyle.dp
+ Layout.topMargin: 2 * mainWindow.dp
visible: mainItem.showDefaultAddress
text: modelData.core.defaultAddress
font {
- weight: 300 * DefaultStyle.dp
- pixelSize: 12 * DefaultStyle.dp
+ weight: 300 * mainWindow.dp
+ pixelSize: 12 * mainWindow.dp
}
}
}
@@ -206,13 +206,13 @@ ListView {
id: actionsRow
z: 1
visible: actionButtons || friendPopup.visible || mainItem.multiSelectionEnabled
- spacing: visible ? 16 * DefaultStyle.dp : 0
+ spacing: visible ? 16 * mainWindow.dp : 0
EffectImage {
id: isSelectedCheck
// visible: mainItem.multiSelectionEnabled && (mainItem.confInfoGui.core.getParticipantIndex(modelData.core.defaultAddress) != -1)
visible: mainItem.multiSelectionEnabled && (mainItem.selectedContacts.indexOf(modelData.core.defaultAddress) != -1)
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
imageSource: AppIcons.check
colorizationColor: DefaultStyle.main1_500_main
Connections {
@@ -224,19 +224,19 @@ ListView {
RowLayout{
id: actionButtons
visible: mainItem.actionLayoutVisible
- spacing: visible ? 10 * DefaultStyle.dp : 0
+ spacing: visible ? 10 * mainWindow.dp : 0
Button {
id: callButton
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
icon.source: AppIcons.phone
focus: visible
contentImageColor: DefaultStyle.main2_500main
background: Rectangle {
anchors.fill: parent
- radius: 40 * DefaultStyle.dp
+ radius: 40 * mainWindow.dp
color: DefaultStyle.main2_200
}
onClicked: UtilsCpp.createCall(modelData.core.defaultAddress)
@@ -246,16 +246,16 @@ ListView {
Button {
id: chatButton
visible: actionButtons.visible && !SettingsCpp.disableChatFeature
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
icon.source: AppIcons.chatTeardropText
focus: visible && !callButton.visible
contentImageColor: DefaultStyle.main2_500main
background: Rectangle {
anchors.fill: parent
- radius: 40 * DefaultStyle.dp
+ radius: 40 * mainWindow.dp
color: DefaultStyle.main2_200
}
KeyNavigation.right: callButton
@@ -265,11 +265,11 @@ ListView {
PopupButton {
id: friendPopup
z: 1
- // Layout.rightMargin: 13 * DefaultStyle.dp
+ // Layout.rightMargin: 13 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter
- Layout.rightMargin: 8 * DefaultStyle.dp
+ Layout.rightMargin: 8 * mainWindow.dp
popup.x: 0
- popup.padding: 10 * DefaultStyle.dp
+ popup.padding: 10 * mainWindow.dp
hoverEnabled: mainItem.hoverEnabled
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")
background: Item{}
icon.source: modelData.core.starred ? AppIcons.heartFill : AppIcons.heart
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- spacing: 10 * DefaultStyle.dp
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ spacing: 10 * mainWindow.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main
contentImageColor: modelData.core.starred ? DefaultStyle.danger_500main : DefaultStyle.main2_600
onClicked: {
@@ -294,11 +294,11 @@ ListView {
text: qsTr("Partager")
background: Item{}
icon.source: AppIcons.shareNetwork
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- spacing: 10 * DefaultStyle.dp
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ spacing: 10 * mainWindow.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main
onClicked: {
var vcard = modelData.core.getVCard()
@@ -313,11 +313,11 @@ ListView {
text: qsTr("Supprimer")
background: Item{}
icon.source: AppIcons.trashCan
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- spacing: 10 * DefaultStyle.dp
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ spacing: 10 * mainWindow.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.danger_500main
contentImageColor: DefaultStyle.danger_500main
visible: !modelData.core.readOnly
diff --git a/Linphone/view/Control/Display/Contact/Voicemail.qml b/Linphone/view/Control/Display/Contact/Voicemail.qml
index 1ff72f94f..02767a8a8 100644
--- a/Linphone/view/Control/Display/Contact/Voicemail.qml
+++ b/Linphone/view/Control/Display/Contact/Voicemail.qml
@@ -10,15 +10,15 @@ Rectangle{
id: mainItem
property int voicemailCount: 0
visible: voicemailCount > 0
- width: 27 * DefaultStyle.dp
- height: 28 * DefaultStyle.dp
+ width: 27 * mainWindow.dp
+ height: 28 * mainWindow.dp
signal clicked()
Button {
anchors.bottom: parent.bottom
anchors.left: parent.left
icon.source: AppIcons.voicemail
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
background: Item {
anchors.fill: parent
}
@@ -29,8 +29,8 @@ Rectangle{
Text {
anchors.top: parent.top
anchors.right: parent.right
- font.weight: 700 * DefaultStyle.dp
- font.pixelSize: 10 * DefaultStyle.dp
+ font.weight: 700 * mainWindow.dp
+ font.pixelSize: 10 * mainWindow.dp
color: DefaultStyle.danger_500main
text: voicemailCount
maximumLineCount: 1
diff --git a/Linphone/view/Control/Display/Meeting/MeetingListView.qml b/Linphone/view/Control/Display/Meeting/MeetingListView.qml
index caf5e887f..d7e953cab 100644
--- a/Linphone/view/Control/Display/Meeting/MeetingListView.qml
+++ b/Linphone/view/Control/Display/Meeting/MeetingListView.qml
@@ -18,7 +18,7 @@ ListView {
signal conferenceSelected(var contact)
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
currentIndex: confInfoProxy.currentDateIndex
// using highlight doesn't center, take time before moving and don't work for not visible item (like not loaded)
highlightFollowsCurrentItem: false
@@ -43,21 +43,21 @@ ListView {
id: confInfoProxy
filterText: searchBarText
filterType: ConferenceInfoProxy.None
- initialDisplayItems: mainItem.height / (63 * DefaultStyle.dp) + 5
+ initialDisplayItems: mainItem.height / (63 * mainWindow.dp) + 5
displayItemsStep: initialDisplayItems/2
}
section {
criteria: ViewSection.FullString
delegate: Text {
- topPadding: 24 * DefaultStyle.dp
- bottomPadding: 16 * DefaultStyle.dp
+ topPadding: 24 * mainWindow.dp
+ bottomPadding: 16 * mainWindow.dp
text: section
- height: 29 * DefaultStyle.dp + topPadding + bottomPadding
+ height: 29 * mainWindow.dp + topPadding + bottomPadding
wrapMode: Text.NoWrap
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 800 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -66,7 +66,7 @@ ListView {
delegate: FocusScope {
id: itemDelegate
- height: 63 * DefaultStyle.dp + topOffset
+ height: 63 * mainWindow.dp + topOffset
width: mainItem.width
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()
@@ -74,7 +74,7 @@ ListView {
property string dateString: UtilsCpp.toDateString(dateTime)
property string previousDateString: previousItem ? UtilsCpp.toDateString(previousItem.core ? previousItem.core.dateTimeUtc : UtilsCpp.getCurrentDateTimeUtc()) : ''
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 haveModel: $modelData && $modelData.core.haveModel || false
@@ -85,34 +85,34 @@ ListView {
anchors.topMargin:parent.topOffset
spacing: 0
Item{
- Layout.preferredWidth: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
visible: !dateDay.visible
}
ColumnLayout {
id: dateDay
Layout.fillWidth: false
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.minimumWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 51 * DefaultStyle.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.minimumWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 51 * mainWindow.dp
visible: previousDateString.length == 0 || previousDateString != dateString
spacing: 0
Text {
- Layout.preferredHeight: 19 * DefaultStyle.dp
+ Layout.preferredHeight: 19 * mainWindow.dp
Layout.alignment: Qt.AlignCenter
text: day.substring(0,3) + '.'
color: DefaultStyle.main2_500main
wrapMode: Text.NoWrap
elide: Text.ElideNone
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
capitalization: Font.Capitalize
}
}
Rectangle {
id: dayNum
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.alignment: Qt.AlignCenter
radius: height/2
property var isCurrentDay: UtilsCpp.isCurrentDay(dateTime)
@@ -127,42 +127,42 @@ ListView {
color: dayNum.isCurrentDay ? DefaultStyle.grey_0 : DefaultStyle.main2_500main
wrapMode: Text.NoWrap
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
}
Item{Layout.fillHeight:true;Layout.fillWidth: true}
}
Item {
- Layout.preferredWidth: 265 * DefaultStyle.dp
- Layout.preferredHeight: 63 * DefaultStyle.dp
- Layout.leftMargin: 23 * DefaultStyle.dp
+ Layout.preferredWidth: 265 * mainWindow.dp
+ Layout.preferredHeight: 63 * mainWindow.dp
+ Layout.leftMargin: 23 * mainWindow.dp
Rectangle {
id: conferenceInfoDelegate
anchors.fill: parent
anchors.rightMargin: 5 // margin to avoid clipping shadows at right
- radius: 10 * DefaultStyle.dp
+ radius: 10 * mainWindow.dp
visible: itemDelegate.haveModel || itemDelegate.activeFocus
color: mainItem.currentIndex === index ? DefaultStyle.main2_200 : DefaultStyle.grey_0
ColumnLayout {
anchors.fill: parent
anchors.left: parent.left
- anchors.leftMargin: 15 * DefaultStyle.dp
- spacing: 2 * DefaultStyle.dp
+ anchors.leftMargin: 15 * mainWindow.dp
+ spacing: 2 * mainWindow.dp
visible: itemDelegate.haveModel
RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Image {
source: AppIcons.usersThree
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
Text {
text: $modelData.core.subject
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
}
@@ -170,8 +170,8 @@ ListView {
text: UtilsCpp.toDateHourString(dateTime) + " - " + UtilsCpp.toDateHourString(endDateTime)
color: DefaultStyle.main2_500main
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -186,15 +186,15 @@ ListView {
}
Text {
anchors.fill: parent
- anchors.rightMargin: 5 * DefaultStyle.dp // margin to avoid clipping shadows at right
- anchors.leftMargin: 16 * DefaultStyle.dp
+ anchors.rightMargin: 5 * mainWindow.dp // margin to avoid clipping shadows at right
+ anchors.leftMargin: 16 * mainWindow.dp
verticalAlignment: Text.AlignVCenter
visible: !itemDelegate.haveModel
text: qsTr("Aucune réunion aujourd'hui")
lineHeightMode: Text.FixedHeight
- lineHeight: 17.71 * DefaultStyle.dp
+ lineHeight: 17.71 * mainWindow.dp
font {
- pixelSize: 13 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
weight: 700
}
}
diff --git a/Linphone/view/Control/Display/Participant/ParticipantDeviceListView.qml b/Linphone/view/Control/Display/Participant/ParticipantDeviceListView.qml
index cadffc912..766e3b9f9 100644
--- a/Linphone/view/Control/Display/Participant/ParticipantDeviceListView.qml
+++ b/Linphone/view/Control/Display/Participant/ParticipantDeviceListView.qml
@@ -10,8 +10,8 @@ ListView {
height: contentHeight
visible: contentHeight > 0
clip: true
- rightMargin: 5 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ rightMargin: 5 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
property string searchBarText
@@ -31,26 +31,26 @@ ListView {
}
delegate: Item {
- height: 56 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
width: mainItem.width
RowLayout {
id: participantDelegate
anchors.left: parent.left
- anchors.leftMargin: 10 * DefaultStyle.dp
+ anchors.leftMargin: 10 * mainWindow.dp
anchors.right: parent.right
- anchors.rightMargin: 10 * DefaultStyle.dp
+ anchors.rightMargin: 10 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
z: 1
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData.core.address
}
Text {
text: modelData.core.displayName
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
font.capitalization: mainItem.displayNameCapitalization ? Font.Capitalize : Font.MixedCase
maximumLineCount: 1
Layout.fillWidth: true
diff --git a/Linphone/view/Control/Display/Participant/ParticipantListView.qml b/Linphone/view/Control/Display/Participant/ParticipantListView.qml
index 5653411e0..310a15336 100644
--- a/Linphone/view/Control/Display/Participant/ParticipantListView.qml
+++ b/Linphone/view/Control/Display/Participant/ParticipantListView.qml
@@ -10,8 +10,8 @@ ListView {
height: contentHeight
visible: contentHeight > 0
clip: true
- rightMargin: 5 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ rightMargin: 5 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
property string searchBarText
@@ -35,26 +35,26 @@ ListView {
}
delegate: Item {
- height: 56 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
width: mainItem.width
RowLayout {
id: participantDelegate
anchors.left: parent.left
- anchors.leftMargin: 10 * DefaultStyle.dp
+ anchors.leftMargin: 10 * mainWindow.dp
anchors.right: parent.right
- anchors.rightMargin: 10 * DefaultStyle.dp
+ anchors.rightMargin: 10 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
z: 1
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData.core.sipAddress
}
Text {
text: modelData.core.displayName
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
font.capitalization: mainItem.displayNameCapitalization ? Font.Capitalize : Font.MixedCase
maximumLineCount: 1
Layout.fillWidth: true
@@ -65,8 +65,8 @@ ListView {
text: qsTr("Admin")
color: DefaultStyle.main2_400
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
RowLayout {
@@ -75,19 +75,19 @@ ListView {
onIsMeChanged: if (isMe) mainItem.me = modelData
enabled: mainItem.isMeAdmin && !modelData.core.isMe
opacity: enabled ? 1.0 : 0
- spacing: 26 * DefaultStyle.dp
+ spacing: 26 * mainWindow.dp
Switch {
Component.onCompleted: if (modelData.core.isAdmin) toggle()
//TODO : Utilser checked et onToggled (pas compris)
onToggled: participantModel.setParticipantAdminStatus(modelData.core, position === 1)
}
Button {
- Layout.preferredWidth: 20 * DefaultStyle.dp
- Layout.preferredHeight: 20 * DefaultStyle.dp
+ Layout.preferredWidth: 20 * mainWindow.dp
+ Layout.preferredHeight: 20 * mainWindow.dp
color: DefaultStyle.main2_100
icon.source: AppIcons.closeX
- icon.width: 14 * DefaultStyle.dp
- icon.height: 14 * DefaultStyle.dp
+ icon.width: 14 * mainWindow.dp
+ icon.height: 14 * mainWindow.dp
onClicked: participantModel.removeParticipant(modelData.core)
}
}
@@ -97,24 +97,24 @@ ListView {
footer: Rectangle {
color: DefaultStyle.grey_100
visible: mainItem.isMeAdmin
- height: 74 * DefaultStyle.dp
+ height: 74 * mainWindow.dp
width: mainItem.width
Button {
anchors.centerIn: parent
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
- topPadding: 10 * DefaultStyle.dp
- bottomPadding: 10 * DefaultStyle.dp
- height: 40 * DefaultStyle.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
+ topPadding: 10 * mainWindow.dp
+ bottomPadding: 10 * mainWindow.dp
+ height: 40 * mainWindow.dp
icon.source: AppIcons.plusCircle
- icon.width: 16 * DefaultStyle.dp
- icon.height: 16 * DefaultStyle.dp
+ icon.width: 16 * mainWindow.dp
+ icon.height: 16 * mainWindow.dp
contentImageColor: DefaultStyle.main1_500_main
color: DefaultStyle.main1_100
text: qsTr("Ajouter des participants")
textColor: DefaultStyle.main1_500_main
- textSize: 15 * DefaultStyle.dp
- textWeight: 600 * DefaultStyle.dp
+ textSize: 15 * mainWindow.dp
+ textWeight: 600 * mainWindow.dp
onClicked: mainItem.addParticipantRequested()
}
}
diff --git a/Linphone/view/Control/Display/ProgressBar.qml b/Linphone/view/Control/Display/ProgressBar.qml
index 9b2f216a1..7118f55ee 100644
--- a/Linphone/view/Control/Display/ProgressBar.qml
+++ b/Linphone/view/Control/Display/ProgressBar.qml
@@ -5,7 +5,7 @@ import Linphone
ProgressBar {
id: mainItem
- padding: 3 * DefaultStyle.dp
+ padding: 3 * mainWindow.dp
property color backgroundColor: DefaultStyle.main2_100
property color innerColor: DefaultStyle.info_500_main
@@ -15,7 +15,7 @@ ProgressBar {
background: Rectangle {
color: mainItem.backgroundColor
- radius: 50 * DefaultStyle.dp
+ radius: 50 * mainWindow.dp
anchors.fill: mainItem
width: mainItem.width
height: mainItem.height
@@ -23,7 +23,7 @@ ProgressBar {
contentItem: Item {
Rectangle {
color: mainItem.innerColor
- radius: 50 * DefaultStyle.dp
+ radius: 50 * mainWindow.dp
width: mainItem.visualPosition * mainItem.width
height: parent.height
Text {
@@ -32,8 +32,8 @@ ProgressBar {
anchors.centerIn: parent
color: mainItem.innerTextColor
font {
- pixelSize: 10 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 10 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Control/Display/RoundedPane.qml b/Linphone/view/Control/Display/RoundedPane.qml
index ab67ede99..559471a6b 100644
--- a/Linphone/view/Control/Display/RoundedPane.qml
+++ b/Linphone/view/Control/Display/RoundedPane.qml
@@ -4,12 +4,12 @@ import Linphone
Control.Control {
id: mainItem
- // width: 360 * DefaultStyle.dp
+ // width: 360 * mainWindow.dp
property color backgroundColor: DefaultStyle.grey_0
- padding: 10 * DefaultStyle.dp
+ padding: 10 * mainWindow.dp
background: Rectangle {
anchors.fill: parent
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
color: mainItem.backgroundColor
}
}
diff --git a/Linphone/view/Control/Display/Settings/SettingsMenuItem.qml b/Linphone/view/Control/Display/Settings/SettingsMenuItem.qml
index 7c18d759b..c29a689ba 100644
--- a/Linphone/view/Control/Display/Settings/SettingsMenuItem.qml
+++ b/Linphone/view/Control/Display/Settings/SettingsMenuItem.qml
@@ -7,7 +7,7 @@ import Linphone
Item {
id: mainItem
- height: visible ? 50 * DefaultStyle.dp : 0
+ height: visible ? 50 * mainWindow.dp : 0
anchors.right: parent.right
anchors.left: parent.left
@@ -30,15 +30,15 @@ Item {
id: background
anchors.fill: parent
color: DefaultStyle.main2_200
- radius: 35 * DefaultStyle.dp
+ radius: 35 * mainWindow.dp
visible: parent.containsMouse || isSelected || mainItem.shadowEnabled
}
Rectangle {
id: backgroundRightFiller
anchors.right: parent.right
color: DefaultStyle.main2_200
- width: 35 * DefaultStyle.dp
- height: 50 * DefaultStyle.dp
+ width: 35 * mainWindow.dp
+ height: 50 * mainWindow.dp
visible: parent.containsMouse || isSelected
}
// MultiEffect {
diff --git a/Linphone/view/Control/Display/Sticker.qml b/Linphone/view/Control/Display/Sticker.qml
index 5f2c07cb1..a49e04607 100644
--- a/Linphone/view/Control/Display/Sticker.qml
+++ b/Linphone/view/Control/Display/Sticker.qml
@@ -24,7 +24,7 @@ Item {
property bool displayBorder : participantDevice && participantDevice.core.isSpeaking || false
property alias displayPresence: avatar.displayPresence
property color color: DefaultStyle.grey_600
- property int radius: 15 * DefaultStyle.dp
+ property int radius: 15 * mainWindow.dp
property bool remoteIsPaused: participantDevice
? participantDevice.core.isPaused
: previewEnabled
@@ -69,7 +69,7 @@ Item {
radius: mainItem.radius
anchors.fill: parent
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)
Item {
id: noCameraLayout
@@ -77,7 +77,7 @@ Item {
visible: !cameraLoader.active || cameraLoader.status != Loader.Ready || !cameraLoader.item.isReady
ColumnLayout {
anchors.top: parent.top
- anchors.topMargin: 81 * DefaultStyle.dp
+ anchors.topMargin: 81 * mainWindow.dp
anchors.horizontalCenter: parent.horizontalCenter
// Layout.alignment: Qt.AlignHCenter |Qt.AlignTop
spacing: 0
@@ -89,8 +89,8 @@ Item {
BusyIndicator {
indicatorColor: DefaultStyle.main2_100
Layout.alignment: Qt.AlignHCenter
- indicatorHeight: 27 * DefaultStyle.dp
- indicatorWidth: 27 * DefaultStyle.dp
+ indicatorHeight: 27 * mainWindow.dp
+ indicatorWidth: 27 * mainWindow.dp
}
Timer {
id: waitingTimer
@@ -107,10 +107,10 @@ Item {
color: DefaultStyle.grey_0
Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter
- Layout.topMargin: 25 * DefaultStyle.dp
+ Layout.topMargin: 25 * mainWindow.dp
font {
- pixelSize: 30 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 30 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
Component.onCompleted: {
waitingTimer.restart()
@@ -123,7 +123,7 @@ Item {
anchors.centerIn: parent
height: mainItem.conference
? background.minSize * 142 / 372
- : 120 * DefaultStyle.dp
+ : 120 * mainWindow.dp
width: height
Avatar{
id: avatar
@@ -139,29 +139,29 @@ Item {
spacing: 0
visible: mainItem.participantDevice && (mainItem.participantDevice.core.state == LinphoneEnums.ParticipantDeviceState.Joining || mainItem.participantDevice.core.state == LinphoneEnums.ParticipantDeviceState.Alerting) || false
BusyIndicator {
- Layout.preferredHeight: 42 * DefaultStyle.dp
+ Layout.preferredHeight: 42 * mainWindow.dp
indicatorColor: DefaultStyle.main2_100
Layout.alignment: Qt.AlignHCenter
- indicatorHeight: 42 * DefaultStyle.dp
- indicatorWidth: 42 * DefaultStyle.dp
+ indicatorHeight: 42 * mainWindow.dp
+ indicatorWidth: 42 * mainWindow.dp
}
Text {
- Layout.preferredHeight: 27 * DefaultStyle.dp
- Layout.topMargin: 15 * DefaultStyle.dp // (84-27)-42
+ Layout.preferredHeight: 27 * mainWindow.dp
+ Layout.topMargin: 15 * mainWindow.dp // (84-27)-42
text: qsTr('rejoint...')
color: DefaultStyle.grey_0
Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
}
}
ColumnLayout {
anchors.centerIn: parent
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
visible: mainItem.remoteIsPaused
EffectImage {
imageSource: AppIcons.pause
@@ -175,8 +175,8 @@ Item {
Layout.alignment: Qt.AlignHCenter
text: qsTr("En pause")
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
}
@@ -185,15 +185,15 @@ Item {
visible: mainItem.displayAll && !mainItem.remoteIsPaused && !mainItem.conference
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: centerItem.bottom
- anchors.topMargin: 21 * DefaultStyle.dp
+ anchors.topMargin: 21 * mainWindow.dp
Text {
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
text: mainItem.displayName
color: DefaultStyle.grey_0
font {
- pixelSize: 22 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp
+ weight: 300 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -204,8 +204,8 @@ Item {
text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text
color: DefaultStyle.grey_0
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
@@ -268,8 +268,8 @@ Item {
Text {
anchors.left: parent.left
anchors.bottom: parent.bottom
- anchors.leftMargin: 10 * DefaultStyle.dp
- anchors.bottomMargin: 10 * DefaultStyle.dp
+ anchors.leftMargin: 10 * mainWindow.dp
+ anchors.bottomMargin: 10 * mainWindow.dp
width: implicitWidth
property string _text: mainItem.displayName != ''
? mainItem.displayName
@@ -279,8 +279,8 @@ Item {
text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text
color: DefaultStyle.grey_0
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
}
@@ -297,19 +297,19 @@ Item {
RowLayout{
anchors.right: parent.right
anchors.top: parent.top
- anchors.rightMargin: 8 * DefaultStyle.dp
- anchors.topMargin: 8 * DefaultStyle.dp
+ anchors.rightMargin: 8 * mainWindow.dp
+ anchors.topMargin: 8 * mainWindow.dp
- height: 18 * DefaultStyle.dp
+ height: 18 * mainWindow.dp
spacing: 0
CheckableButton {
id: muteIcon
icon.source: AppIcons.microphoneSlash
- Layout.preferredWidth: Math.min(mainItem.width / 16, 20 * DefaultStyle.dp)
- Layout.preferredHeight: 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 * mainWindow.dp)
visible: mainItem.mutedStatus
- icon.width: Math.min(mainItem.width / 16, 20 * DefaultStyle.dp)
- icon.height: 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 * mainWindow.dp)
enabled: false
contentImageColor: DefaultStyle.main2_500main
backgroundColor: DefaultStyle.grey_0
diff --git a/Linphone/view/Control/Display/TemporaryText.qml b/Linphone/view/Control/Display/TemporaryText.qml
index d6f88778d..ee1b211b2 100644
--- a/Linphone/view/Control/Display/TemporaryText.qml
+++ b/Linphone/view/Control/Display/TemporaryText.qml
@@ -22,8 +22,8 @@ Text {
}
}
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
Timer {
id: autoHideErrorMessage
diff --git a/Linphone/view/Control/Display/Text.qml b/Linphone/view/Control/Display/Text.qml
index 82bbdae0e..2af5a4231 100644
--- a/Linphone/view/Control/Display/Text.qml
+++ b/Linphone/view/Control/Display/Text.qml
@@ -8,8 +8,8 @@ Quick.Text {
width: txtMeter.advanceWidth
font {
family: DefaultStyle.defaultFont
- pixelSize: 10 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 10 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
color: DefaultStyle.main2_600
wrapMode: Quick.Text.Wrap
diff --git a/Linphone/view/Control/Display/ToolTip.qml b/Linphone/view/Control/Display/ToolTip.qml
index 437c5e5e7..27d7581d0 100644
--- a/Linphone/view/Control/Display/ToolTip.qml
+++ b/Linphone/view/Control/Display/ToolTip.qml
@@ -10,7 +10,7 @@ Control.ToolTip {
id: tooltipBackground
opacity: 0.7
color: DefaultStyle.main2_200
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
}
contentItem: Text {
text: mainItem.text
diff --git a/Linphone/view/Control/Form/Login/LoginForm.qml b/Linphone/view/Control/Form/Login/LoginForm.qml
index d285659c6..15d2432d3 100644
--- a/Linphone/view/Control/Form/Login/LoginForm.qml
+++ b/Linphone/view/Control/Form/Login/LoginForm.qml
@@ -6,7 +6,7 @@ import ConstantsCpp 1.0
ColumnLayout {
id: mainItem
- spacing: 25 * DefaultStyle.dp
+ spacing: 25 * mainWindow.dp
signal connectionSucceed()
FormItemLayout {
@@ -17,8 +17,8 @@ ColumnLayout {
contentItem: TextField {
id: usernameEdit
isError: username.errorTextVisible || errorText.visible
- Layout.preferredWidth: 360 * DefaultStyle.dp
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
}
}
Item {
@@ -31,8 +31,8 @@ ColumnLayout {
contentItem: TextField {
id: passwordEdit
isError: password.errorTextVisible || errorText.visible
- Layout.preferredWidth: 360 * DefaultStyle.dp
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
hidden: true
}
}
@@ -55,14 +55,14 @@ ColumnLayout {
}
RowLayout {
- Layout.topMargin: 7 * DefaultStyle.dp
- spacing: 29 * DefaultStyle.dp
+ Layout.topMargin: 7 * mainWindow.dp
+ spacing: 29 * mainWindow.dp
Button {
id: connectionButton
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
contentItem: StackLayout {
id: connectionButtonContent
currentIndex: 0
@@ -72,8 +72,8 @@ ColumnLayout {
verticalAlignment: Text.AlignVCenter
font {
- pixelSize: 18 * DefaultStyle.dp
- weight: 600 * DefaultStyle.dp
+ pixelSize: 18 * mainWindow.dp
+ weight: 600 * mainWindow.dp
}
color: DefaultStyle.grey_0
}
@@ -131,8 +131,8 @@ ColumnLayout {
text: qsTr("Mot de passe oublié ?")
font{
underline: true
- pixelSize: 13 * DefaultStyle.dp
- weight: 600 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 600 * mainWindow.dp
}
}
onClicked: Qt.openUrlExternally(ConstantsCpp.PasswordRecoveryUrl)
diff --git a/Linphone/view/Control/Form/Settings/MultimediaSettings.qml b/Linphone/view/Control/Form/Settings/MultimediaSettings.qml
index b4155ff38..da78c93ff 100644
--- a/Linphone/view/Control/Form/Settings/MultimediaSettings.qml
+++ b/Linphone/view/Control/Form/Settings/MultimediaSettings.qml
@@ -13,30 +13,30 @@ ColumnLayout {
property string microDevice: inputAudioDeviceCBox.currentText
property bool ringerDevicesVisible: false
property bool backgroundVisible: true
- spacing: 40 * DefaultStyle.dp
+ spacing: 40 * mainWindow.dp
RoundedPane {
background.visible: mainItem.backgroundVisible
Layout.alignment: Qt.AlignHCenter
height: contentItem.implicitHeight + topPadding + bottomPadding
Layout.fillWidth: true
- topPadding: background.visible ? 25 * DefaultStyle.dp : 0
- bottomPadding: background.visible ? 25 * DefaultStyle.dp : 0
- leftPadding: background.visible ? 25 * DefaultStyle.dp : 0
- rightPadding: background.visible ? 25 * DefaultStyle.dp : 0
+ topPadding: background.visible ? 25 * mainWindow.dp : 0
+ bottomPadding: background.visible ? 25 * mainWindow.dp : 0
+ leftPadding: background.visible ? 25 * mainWindow.dp : 0
+ rightPadding: background.visible ? 25 * mainWindow.dp : 0
contentItem: ColumnLayout {
spacing: mainItem.spacing
ColumnLayout {
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
imageSource: AppIcons.bellRinger
colorizationColor: DefaultStyle.main1_500_main
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- imageWidth: 24 * DefaultStyle.dp
- imageHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ imageWidth: 24 * mainWindow.dp
+ imageHeight: 24 * mainWindow.dp
}
Text {
text: qsTr("Sonnerie - Appels entrants")
@@ -47,7 +47,7 @@ ColumnLayout {
}
ComboSetting {
Layout.fillWidth: true
- Layout.topMargin: 12 * DefaultStyle.dp
+ Layout.topMargin: 12 * mainWindow.dp
Layout.preferredWidth: parent.width
entries: SettingsCpp.ringerDevices
propertyName: "ringerDevice"
@@ -58,16 +58,16 @@ ColumnLayout {
}
}
ColumnLayout {
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
imageSource: AppIcons.speaker
colorizationColor: DefaultStyle.main1_500_main
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- imageWidth: 24 * DefaultStyle.dp
- imageHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ imageWidth: 24 * mainWindow.dp
+ imageHeight: 24 * mainWindow.dp
}
Text {
text: qsTr("Haut-parleurs")
@@ -79,7 +79,7 @@ ColumnLayout {
id: outputAudioDeviceCBox
Layout.fillWidth: true
Layout.preferredWidth: parent.width
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
entries: SettingsCpp.playbackDevices
propertyName: "playbackDevice"
propertyOwner: SettingsCpp
@@ -97,16 +97,16 @@ ColumnLayout {
}
}
ColumnLayout {
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
imageSource: AppIcons.microphone
colorizationColor: DefaultStyle.main1_500_main
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- imageWidth: 24 * DefaultStyle.dp
- imageHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ imageWidth: 24 * mainWindow.dp
+ imageHeight: 24 * mainWindow.dp
}
Text {
text: qsTr("Microphone")
@@ -118,7 +118,7 @@ ColumnLayout {
id: inputAudioDeviceCBox
Layout.fillWidth: true
Layout.preferredWidth: parent.width
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
entries: SettingsCpp.captureDevices
propertyName: "captureDevice"
propertyOwner: SettingsCpp
@@ -148,16 +148,16 @@ ColumnLayout {
id: audioTestSlider
Layout.fillWidth: true
enabled: false
- Layout.preferredHeight: 10 * DefaultStyle.dp
+ Layout.preferredHeight: 10 * mainWindow.dp
background: Rectangle {
x: audioTestSlider.leftPadding
y: audioTestSlider.topPadding + audioTestSlider.availableHeight / 2 - height / 2
- implicitWidth: 200 * DefaultStyle.dp
- implicitHeight: 10 * DefaultStyle.dp
+ implicitWidth: 200 * mainWindow.dp
+ implicitHeight: 10 * mainWindow.dp
width: audioTestSlider.availableWidth
height: implicitHeight
- radius: 2 * DefaultStyle.dp
+ radius: 2 * mainWindow.dp
color: DefaultStyle.grey_850
Rectangle {
@@ -168,23 +168,23 @@ ColumnLayout {
GradientStop { position: 0.0; color: DefaultStyle.vue_meter_light_green }
GradientStop { position: 1.0; color: DefaultStyle.vue_meter_dark_green}
}
- radius: 2 * DefaultStyle.dp
+ radius: 2 * mainWindow.dp
}
}
handle: Item {visible: false}
}
}
ColumnLayout {
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
imageSource: AppIcons.videoCamera
colorizationColor: DefaultStyle.main1_500_main
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- imageWidth: 24 * DefaultStyle.dp
- imageHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ imageWidth: 24 * mainWindow.dp
+ imageHeight: 24 * mainWindow.dp
}
Text {
text: qsTr("Caméra")
@@ -196,7 +196,7 @@ ColumnLayout {
id: videoDevicesCbox
Layout.fillWidth: true
Layout.preferredWidth: parent.width
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
entries: SettingsCpp.videoDevices
propertyName: "videoDevice"
propertyOwner: SettingsCpp
diff --git a/Linphone/view/Control/Form/Settings/ScreencastSettings.qml b/Linphone/view/Control/Form/Settings/ScreencastSettings.qml
index 39266f188..06d795b91 100644
--- a/Linphone/view/Control/Form/Settings/ScreencastSettings.qml
+++ b/Linphone/view/Control/Form/Settings/ScreencastSettings.qml
@@ -13,19 +13,19 @@ ColumnLayout {
property bool isLocalScreenSharing : conference?.core.isLocalScreenSharing || false
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 }
Text {
Layout.fillWidth: true
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
}
TabBar {
Layout.fillWidth: true
id: bar
- pixelSize: 16 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
model: [qsTr("Ecran entier"), qsTr("Fenêtre")]
}
component ScreenPreviewLayout: Control.Control {
@@ -36,18 +36,18 @@ ColumnLayout {
property bool selected: false
property bool displayScreen: true
property int horizontalMargin: 0
- leftPadding: 18 * DefaultStyle.dp
- rightPadding: 18 * DefaultStyle.dp
- topPadding: 13 * DefaultStyle.dp
- bottomPadding: 13 * DefaultStyle.dp
+ leftPadding: 18 * mainWindow.dp
+ rightPadding: 18 * mainWindow.dp
+ topPadding: 13 * mainWindow.dp
+ bottomPadding: 13 * mainWindow.dp
background: Rectangle {
anchors.fill: parent
anchors.leftMargin: screenPreview.horizontalMargin
anchors.rightMargin: screenPreview.horizontalMargin
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
- radius: 10 * DefaultStyle.dp
+ radius: 10 * mainWindow.dp
MouseArea {
anchors.fill: parent
onClicked: {
@@ -62,7 +62,7 @@ ColumnLayout {
Layout.fillHeight: true
Image {
anchors.centerIn: parent
- //Layout.preferredHeight: 170 * DefaultStyle.dp
+ //Layout.preferredHeight: 170 * mainWindow.dp
source: $modelData?.windowId ? "image://window/"+ $modelData.windowId : "image://screen/"+ $modelData.screenIndex
sourceSize.width: parent.width
sourceSize.height: parent.height
@@ -70,11 +70,11 @@ ColumnLayout {
}
}
RowLayout{
- Layout.topMargin: 6 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 6 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Image{
- Layout.preferredHeight: 15 * DefaultStyle.dp
- Layout.preferredWidth: 15 * DefaultStyle.dp
+ Layout.preferredHeight: 15 * mainWindow.dp
+ Layout.preferredWidth: 15 * mainWindow.dp
visible: !!$modelData?.windowId
source: visible ? "image://window_icon/"+ $modelData.windowId : ''
sourceSize.width: width
@@ -85,7 +85,7 @@ ColumnLayout {
Layout.fillWidth: true
text: !!$modelData?.windowId ? $modelData.name : qsTr("Ecran %1").arg(screenIndex+1)
horizontalAlignment: Text.AlignHCenter
- font.pixelSize: (displayScreen ? 14 : 10)* DefaultStyle.dp
+ font.pixelSize: (displayScreen ? 14 : 10)* mainWindow.dp
elide: Text.ElideRight
maximumLineCount: 1
}
@@ -96,7 +96,7 @@ ColumnLayout {
currentIndex: bar.currentIndex
ListView{
id: screensLayout
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
clip: true
//property int selectedIndex
model: ScreenProxy{
@@ -105,9 +105,9 @@ ColumnLayout {
}
onVisibleChanged: if(visible) screensList.update()
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
- height: 219 * DefaultStyle.dp
+ height: 219 * mainWindow.dp
screenIndex: index
onClicked: {//screensLayout.selectedIndex = index
screensLayout.currentIndex = index
@@ -130,14 +130,14 @@ ColumnLayout {
currentIndex: -1
onVisibleChanged: if(visible) windowsList.update()
cellWidth: width / 2
- cellHeight: (112 + 15) * DefaultStyle.dp
+ cellHeight: (112 + 15) * mainWindow.dp
clip: true
delegate: Item{
width: windowsLayout.cellWidth
height: windowsLayout.cellHeight
ScreenPreviewLayout {
anchors.fill: parent
- anchors.margins: 7 * DefaultStyle.dp
+ anchors.margins: 7 * mainWindow.dp
displayScreen: false
screenIndex: index
onClicked: {
diff --git a/Linphone/view/Control/Input/Calendar.qml b/Linphone/view/Control/Input/Calendar.qml
index 830c1157c..056c50413 100644
--- a/Linphone/view/Control/Input/Calendar.qml
+++ b/Linphone/view/Control/Input/Calendar.qml
@@ -39,15 +39,15 @@ ListView {
ColumnLayout {
anchors.fill: parent
property int currentMonth: model.month
- spacing: 18 * DefaultStyle.dp
+ spacing: 18 * mainWindow.dp
RowLayout {
Layout.fillWidth: true
- spacing: 38 * DefaultStyle.dp
+ spacing: 38 * mainWindow.dp
Text {
text: UtilsCpp.toDateMonthAndYearString(new Date(model.year, model.month, 15))// 15 because of timezones that can change the date for localeString
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 700 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -56,8 +56,8 @@ ListView {
}
Button {
id: previousButton
- Layout.preferredWidth: 20 * DefaultStyle.dp
- Layout.preferredHeight: 20 * DefaultStyle.dp
+ Layout.preferredWidth: 20 * mainWindow.dp
+ Layout.preferredHeight: 20 * mainWindow.dp
icon.width: width
icon.height: height
background: Item{}
@@ -66,8 +66,8 @@ ListView {
}
Button {
id: nextButton
- Layout.preferredWidth: 20 * DefaultStyle.dp
- Layout.preferredHeight: 20 * DefaultStyle.dp
+ Layout.preferredWidth: 20 * mainWindow.dp
+ Layout.preferredHeight: 20 * mainWindow.dp
icon.width: width
icon.height: height
background: Item{}
@@ -77,7 +77,7 @@ ListView {
}
ColumnLayout {
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
Control.DayOfWeekRow {
locale: monthGrid.locale
Layout.column: 1
@@ -88,8 +88,8 @@ ListView {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
@@ -145,9 +145,9 @@ ListView {
Rectangle {
anchors.centerIn: parent
- width: 30 * DefaultStyle.dp
- height: 30 * DefaultStyle.dp
- radius: 50 * DefaultStyle.dp
+ width: 30 * mainWindow.dp
+ height: 30 * mainWindow.dp
+ radius: 50 * mainWindow.dp
color: isSelectedDay ? DefaultStyle.main1_500_main : "transparent"
border.width: focusDay.activeFocus || hoveringArea.containsMouse ? 1 : 0
@@ -163,8 +163,8 @@ ListView {
? DefaultStyle.main2_700
: DefaultStyle.main2_400
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Control/Input/DigitInput.qml b/Linphone/view/Control/Input/DigitInput.qml
index e474b2e0a..e110a713f 100644
--- a/Linphone/view/Control/Input/DigitInput.qml
+++ b/Linphone/view/Control/Input/DigitInput.qml
@@ -4,7 +4,7 @@ import Linphone
Control.TextField {
id: mainItem
- property int inputSize: 100 * DefaultStyle.dp
+ property int inputSize: 100 * mainWindow.dp
color: activeFocus ? DefaultStyle.main1_500_main : DefaultStyle.main2_500main
validator: IntValidator{bottom: 0; top: 9}
@@ -24,7 +24,7 @@ Control.TextField {
// horizontalAlignment: Control.TextField.AlignHCenter
font.family: DefaultStyle.defaultFont
font.pixelSize: inputSize / 2
- font.weight: 300 * DefaultStyle.dp
+ font.weight: 300 * mainWindow.dp
background: Item {
anchors.fill: parent
@@ -32,7 +32,7 @@ Control.TextField {
// height: mainItem.inputSize
Rectangle {
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
radius: mainItem.inputSize * 0.15
width: mainItem.inputSize * 0.9
@@ -42,11 +42,11 @@ Control.TextField {
id: indicator
visible: mainItem.activeFocus
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
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
- anchors.bottomMargin: (mainItem.inputSize / 8) * DefaultStyle.dp
+ anchors.bottomMargin: (mainItem.inputSize / 8) * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Control/Input/NumericPad.qml b/Linphone/view/Control/Input/NumericPad.qml
index 0c5293e87..868857106 100644
--- a/Linphone/view/Control/Input/NumericPad.qml
+++ b/Linphone/view/Control/Input/NumericPad.qml
@@ -89,8 +89,8 @@ FocusScope{
id: numPadGrid
anchors.fill: parent
columns: 3
- columnSpacing: 40 * DefaultStyle.dp
- rowSpacing: 10 * DefaultStyle.dp
+ columnSpacing: 40 * mainWindow.dp
+ rowSpacing: 10 * mainWindow.dp
function getButtonAt(index){
index = (index+15) % 15
if(index >= 0){
@@ -112,8 +112,8 @@ FocusScope{
id: numPadButton
Layout.Layout.alignment: Qt.AlignHCenter
required property int index
- implicitWidth: 60 * DefaultStyle.dp
- implicitHeight: 60 * DefaultStyle.dp
+ implicitWidth: 60 * mainWindow.dp
+ implicitHeight: 60 * mainWindow.dp
onClicked: {
mainItem.buttonPressed(innerText.text)
}
@@ -124,7 +124,7 @@ FocusScope{
background: Rectangle {
anchors.fill: parent
color: numPadButton.down || numPadButton.shadowEnabled? DefaultStyle.numericPadPressedButtonColor : DefaultStyle.grey_0
- radius: 71 * DefaultStyle.dp
+ radius: 71 * mainWindow.dp
}
contentItem: Text {
id: innerText
@@ -133,8 +133,8 @@ FocusScope{
anchors.centerIn: parent
text: index + 1
font {
- pixelSize: 32 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 32 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -149,8 +149,8 @@ FocusScope{
Button {
id: digitButton
Layout.Layout.alignment: Qt.AlignHCenter
- implicitWidth: 60 * DefaultStyle.dp
- implicitHeight: 60 * DefaultStyle.dp
+ implicitWidth: 60 * mainWindow.dp
+ implicitHeight: 60 * mainWindow.dp
onClicked: mainItem.buttonPressed(pressText.text)
onPressAndHold: mainItem.buttonPressed(longPressText.text)
@@ -163,7 +163,7 @@ FocusScope{
background: Rectangle {
anchors.fill: parent
color: digitButton.down || digitButton.shadowEnabled? DefaultStyle.numericPadPressedButtonColor : DefaultStyle.grey_0
- radius: 71 * DefaultStyle.dp
+ radius: 71 * mainWindow.dp
}
contentItem: Item {
anchors.fill: parent
@@ -175,7 +175,7 @@ FocusScope{
horizontalAlignment: Text.AlignHCenter
Component.onCompleted: {if (modelData.longPressText === undefined) anchors.centerIn= parent}
text: modelData.pressText
- font.pixelSize: 32 * DefaultStyle.dp
+ font.pixelSize: 32 * mainWindow.dp
}
Text {
id: longPressText
@@ -186,7 +186,7 @@ FocusScope{
horizontalAlignment: Text.AlignHCenter
visible: modelData.longPressText ? modelData.longPressText.length > 0 : false
text: modelData.longPressText ? modelData.longPressText : ""
- font.pixelSize: 22 * DefaultStyle.dp
+ font.pixelSize: 22 * mainWindow.dp
}
}
}
@@ -198,12 +198,12 @@ FocusScope{
Button {
id: launchCallButton
visible: !mainItem.lastRowVisible
- implicitWidth: 75 * DefaultStyle.dp
- implicitHeight: 55 * DefaultStyle.dp
+ implicitWidth: 75 * mainWindow.dp
+ implicitHeight: 55 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
icon.source: AppIcons.phone
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
contentImageColor: DefaultStyle.grey_0
onClicked: mainItem.launchCall()
@@ -216,20 +216,20 @@ FocusScope{
background: Rectangle {
anchors.fill: parent
color: DefaultStyle.success_500main
- radius: 71 * DefaultStyle.dp
+ radius: 71 * mainWindow.dp
}
}
Button {
id: eraseButton
visible: !mainItem.lastRowVisible
- leftPadding: 5 * DefaultStyle.dp
- rightPadding: 5 * DefaultStyle.dp
- topPadding: 5 * DefaultStyle.dp
- bottomPadding: 5 * DefaultStyle.dp
+ leftPadding: 5 * mainWindow.dp
+ rightPadding: 5 * mainWindow.dp
+ topPadding: 5 * mainWindow.dp
+ bottomPadding: 5 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
icon.source: AppIcons.backspaceFill
- icon.width: 38 * DefaultStyle.dp
- icon.height: 38 * DefaultStyle.dp
+ icon.width: 38 * mainWindow.dp
+ icon.height: 38 * mainWindow.dp
onClicked: mainItem.wipe()
diff --git a/Linphone/view/Control/Input/PhoneNumberInput.qml b/Linphone/view/Control/Input/PhoneNumberInput.qml
index 1e33508cd..28635c87c 100644
--- a/Linphone/view/Control/Input/PhoneNumberInput.qml
+++ b/Linphone/view/Control/Input/PhoneNumberInput.qml
@@ -23,8 +23,8 @@ ColumnLayout {
text: mainItem.label + (mainItem.mandatory ? "*" : "")
color: (combobox.hasActiveFocus || textField.hasActiveFocus) ? DefaultStyle.main1_500_main : DefaultStyle.main2_600
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
@@ -34,8 +34,8 @@ ColumnLayout {
Rectangle {
id: contentBackground
width: mainItem.textInputWidth
- height: 49 * DefaultStyle.dp
- radius: 63 * DefaultStyle.dp
+ height: 49 * mainWindow.dp
+ radius: 63 * mainWindow.dp
color: DefaultStyle.grey_100
border.color: mainItem.errorMessage.length > 0
? DefaultStyle.danger_500main
@@ -46,14 +46,14 @@ ColumnLayout {
anchors.fill: parent
CountryIndicatorCombobox {
id: combobox
- implicitWidth: 110 * DefaultStyle.dp
+ implicitWidth: 110 * mainWindow.dp
defaultCallingCode: mainItem.defaultCallingCode
}
Rectangle {
- Layout.preferredWidth: 1 * DefaultStyle.dp
+ Layout.preferredWidth: 1 * mainWindow.dp
Layout.fillHeight: true
- Layout.topMargin: 10 * DefaultStyle.dp
- Layout.bottomMargin: 10 * DefaultStyle.dp
+ Layout.topMargin: 10 * mainWindow.dp
+ Layout.bottomMargin: 10 * mainWindow.dp
color: DefaultStyle.main2_600
}
TextField {
@@ -76,7 +76,7 @@ ColumnLayout {
elide: Text.ElideRight
wrapMode: Text.Wrap
font {
- pixelSize: 13 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
family: DefaultStyle.defaultFont
bold: true
}
diff --git a/Linphone/view/Control/Input/SearchBar.qml b/Linphone/view/Control/Input/SearchBar.qml
index 7a873355c..4e437f4a4 100644
--- a/Linphone/view/Control/Input/SearchBar.qml
+++ b/Linphone/view/Control/Input/SearchBar.qml
@@ -8,7 +8,7 @@ FocusScope {
id: mainItem
property string placeholderText: ""
property color placeholderTextColor: DefaultStyle.main2_400
- property int textInputWidth: 350 * DefaultStyle.dp
+ property int textInputWidth: 350 * mainWindow.dp
property color borderColor: "transparent"
property color focusedBorderColor: DefaultStyle.main2_500main
property string text: textField.text
@@ -39,12 +39,12 @@ FocusScope {
implicitWidth: mainItem.textInputWidth
- implicitHeight: 50 * DefaultStyle.dp
+ implicitHeight: 50 * mainWindow.dp
Rectangle{
id: backgroundItem
anchors.fill: parent
- radius: 28 * DefaultStyle.dp
+ radius: 28 * mainWindow.dp
color: DefaultStyle.grey_100
border.color: textField.activeFocus ? mainItem.focusedBorderColor : mainItem.borderColor
}
@@ -53,15 +53,15 @@ FocusScope {
visible: mainItem.magnifierVisible
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 10 * DefaultStyle.dp
+ anchors.leftMargin: 10 * mainWindow.dp
source: AppIcons.magnifier
- width: 20 * DefaultStyle.dp
- height: 20 * DefaultStyle.dp
+ width: 20 * mainWindow.dp
+ height: 20 * mainWindow.dp
}
Control.TextField {
id: textField
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.verticalCenter: parent.verticalCenter
focus: true
@@ -70,8 +70,8 @@ FocusScope {
width: mainItem.width - dialerButton.width
echoMode: (mainItem.hidden && !dialerButton.checked) ? TextInput.Password : TextInput.Normal
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
family: DefaultStyle.defaultFont
}
color: DefaultStyle.main2_600
@@ -83,7 +83,7 @@ FocusScope {
cursorDelegate: Rectangle {
visible: textField.cursorVisible
color: DefaultStyle.main2_500main
- width: 1 * DefaultStyle.dp
+ width: 1 * mainWindow.dp
}
}
Button {
@@ -95,13 +95,13 @@ FocusScope {
color: "transparent"
}
icon.source: dialerButton.checked ? AppIcons.dialerSelected : AppIcons.dialer
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
- anchors.rightMargin: 15 * DefaultStyle.dp
+ anchors.rightMargin: 15 * mainWindow.dp
}
Button {
id: clearTextButton
@@ -109,15 +109,15 @@ FocusScope {
background: Rectangle {
color: "transparent"
}
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
icon.source: AppIcons.closeX
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- anchors.rightMargin: 15 * DefaultStyle.dp
+ anchors.rightMargin: 15 * mainWindow.dp
onClicked: {
textField.clear()
}
diff --git a/Linphone/view/Control/Input/TextArea.qml b/Linphone/view/Control/Input/TextArea.qml
index 13162e5dd..ac9343548 100644
--- a/Linphone/view/Control/Input/TextArea.qml
+++ b/Linphone/view/Control/Input/TextArea.qml
@@ -7,14 +7,14 @@ TextEdit {
id: mainItem
property string placeholderText
- property int placeholderPixelSize: 14 * DefaultStyle.dp
- property int placeholderWeight: 400 * DefaultStyle.dp
+ property int placeholderPixelSize: 14 * mainWindow.dp
+ property int placeholderWeight: 400 * mainWindow.dp
property color placeholderTextColor: color
property alias background: background.data
property bool hoverEnabled: false
property bool hovered: mouseArea.hoverEnabled && mouseArea.containsMouse
- topPadding: 5 * DefaultStyle.dp
- bottomPadding: 5 * DefaultStyle.dp
+ topPadding: 5 * mainWindow.dp
+ bottomPadding: 5 * mainWindow.dp
activeFocusOnTab: true
MouseArea {
diff --git a/Linphone/view/Control/Input/TextField.qml b/Linphone/view/Control/Input/TextField.qml
index 05725ca9b..9ceddc0c4 100644
--- a/Linphone/view/Control/Input/TextField.qml
+++ b/Linphone/view/Control/Input/TextField.qml
@@ -6,18 +6,18 @@ import Linphone
Control.TextField {
id: mainItem
property var customWidth
- width: (customWidth ? customWidth - 1 : 360) * DefaultStyle.dp
- height: 49 * DefaultStyle.dp
- leftPadding: 15 * DefaultStyle.dp
- rightPadding: eyeButton.visible ? 5 * DefaultStyle.dp + eyeButton.width + eyeButton.rightMargin : 15 * DefaultStyle.dp
+ width: (customWidth ? customWidth - 1 : 360) * mainWindow.dp
+ height: 49 * mainWindow.dp
+ leftPadding: 15 * mainWindow.dp
+ rightPadding: eyeButton.visible ? 5 * mainWindow.dp + eyeButton.width + eyeButton.rightMargin : 15 * mainWindow.dp
echoMode: (hidden && !eyeButton.checked) ? TextInput.Password : TextInput.Normal
verticalAlignment: TextInput.AlignVCenter
color: isError ? DefaultStyle.danger_500main : DefaultStyle.main2_600
placeholderTextColor: DefaultStyle.placeholders
font {
family: DefaultStyle.defaultFont
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
selectByMouse: true
activeFocusOnTab: true
@@ -31,8 +31,8 @@ Control.TextField {
property color disabledBackgroundColor: DefaultStyle.grey_200
property color backgroundBorderColor: DefaultStyle.grey_200
property string initialText
- property int pixelSize: 14 * DefaultStyle.dp
- property int weight: 400 * DefaultStyle.dp
+ property int pixelSize: 14 * mainWindow.dp
+ property int weight: 400 * mainWindow.dp
// fill propertyName and propertyOwner to check text validity
property string propertyName
@@ -62,7 +62,7 @@ Control.TextField {
id: inputBackground
visible: mainItem.backgroundVisible
anchors.fill: parent
- radius: 79 * DefaultStyle.dp
+ radius: 79 * mainWindow.dp
color: mainItem.enabled ? mainItem.backgroundColor : mainItem.disabledBackgroundColor
border.color: mainItem.isError
? DefaultStyle.danger_500main
@@ -74,7 +74,7 @@ Control.TextField {
cursorDelegate: Rectangle {
id: cursor
color: DefaultStyle.main1_500_main
- width: 1 * DefaultStyle.dp
+ width: 1 * mainWindow.dp
anchors.verticalCenter: mainItem.verticalCenter
SequentialAnimation {
@@ -122,7 +122,7 @@ Control.TextField {
Button {
id: eyeButton
KeyNavigation.left: mainItem
- property int rightMargin: 15 * DefaultStyle.dp
+ property int rightMargin: 15 * mainWindow.dp
z: 1
visible: mainItem.hidden
checkable: true
@@ -130,8 +130,8 @@ Control.TextField {
color: "transparent"
}
icon.source: eyeButton.checked ? AppIcons.eyeShow : AppIcons.eyeHide
- width: 20 * DefaultStyle.dp
- height: 20 * DefaultStyle.dp
+ width: 20 * mainWindow.dp
+ height: 20 * mainWindow.dp
icon.width: width
icon.height: height
anchors.verticalCenter: parent.verticalCenter
diff --git a/Linphone/view/Control/Input/TimeComboBox.qml b/Linphone/view/Control/Input/TimeComboBox.qml
index 82a73e6df..591a7788a 100644
--- a/Linphone/view/Control/Input/TimeComboBox.qml
+++ b/Linphone/view/Control/Input/TimeComboBox.qml
@@ -21,10 +21,10 @@ ComboBox {
property alias contentText: input
property var minTime
property var maxTime
- popup.width: 73 * DefaultStyle.dp
+ popup.width: 73 * mainWindow.dp
listView.model: 48
- listView.height: Math.min(204 * DefaultStyle.dp, listView.contentHeight)
- popup.height: Math.min(204 * DefaultStyle.dp, listView.contentHeight)
+ listView.height: Math.min(204 * mainWindow.dp, listView.contentHeight)
+ popup.height: Math.min(204 * mainWindow.dp, listView.contentHeight)
editable: true
popup.closePolicy: Popup.PressOutsideParent | Popup.CloseOnPressOutside
onCurrentTextChanged: input.text = currentText
@@ -52,8 +52,8 @@ ComboBox {
}
}
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
text: mainItem.selectedTimeString
Keys.onPressed: (event) => {
@@ -74,12 +74,12 @@ ComboBox {
text: Qt.formatDateTime(currentDateTime, "hh:mm")
width: mainItem.width
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
horizontalAlignment: TextInput.AlignHCenter
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
MouseArea {
anchors.fill: parent
diff --git a/Linphone/view/Control/Popup/DesktopPopup.qml b/Linphone/view/Control/Popup/DesktopPopup.qml
index 2ad569c8b..f47c71311 100644
--- a/Linphone/view/Control/Popup/DesktopPopup.qml
+++ b/Linphone/view/Control/Popup/DesktopPopup.qml
@@ -5,10 +5,12 @@ import QtQuick.Controls.Basic
import QtQuick.Layouts
import Qt.labs.platform
+import UtilsCpp
+
// =============================================================================
Window {
- id: mainItem
+ id: mainWindow
// ---------------------------------------------------------------------------
@@ -16,8 +18,8 @@ import Qt.labs.platform
property bool requestActivate: false
//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
property bool _isOpen: false
@@ -53,7 +55,7 @@ import Qt.labs.platform
id: content
anchors.fill:parent
- property var $parent: mainItem
+ property var $parent: mainWindow
}
// ---------------------------------------------------------------------------
diff --git a/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml b/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml
index cb0d54a3b..13ff35fa3 100644
--- a/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml
+++ b/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml
@@ -16,24 +16,24 @@ Dialog {
onRejected: close()
modal: true
closePolicy: Popup.NoAutoClose
- topPadding: 20 * DefaultStyle.dp
- bottomPadding: 20 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
+ topPadding: 20 * mainWindow.dp
+ bottomPadding: 20 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
content: ColumnLayout {
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
id: contentLayout
Text {
Layout.fillWidth: true
- Layout.preferredWidth: 250 * DefaultStyle.dp
+ Layout.preferredWidth: 250 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.Wrap
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 {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
FormItemLayout {
Layout.fillWidth: true
label: qsTr("Identité")
@@ -79,7 +79,7 @@ Dialog {
buttons: [
Button {
id: cancelButton
- Layout.topMargin: 10 * DefaultStyle.dp
+ Layout.topMargin: 10 * mainWindow.dp
text: qsTr("Annuler")
inversedColors: true
onClicked: mainItem.rejected()
@@ -88,7 +88,7 @@ Dialog {
},
Button {
id: connectButton
- Layout.topMargin: 10 * DefaultStyle.dp
+ Layout.topMargin: 10 * mainWindow.dp
text: qsTr("Se connecter")
KeyNavigation.up: passwordEdit
KeyNavigation.right: cancelButton
diff --git a/Linphone/view/Control/Popup/Dialog/Dialog.qml b/Linphone/view/Control/Popup/Dialog/Dialog.qml
index f4b77cd27..4ef63a172 100644
--- a/Linphone/view/Control/Popup/Dialog/Dialog.qml
+++ b/Linphone/view/Control/Popup/Dialog/Dialog.qml
@@ -9,12 +9,12 @@ Popup {
modal: true
anchors.centerIn: parent
closePolicy: Control.Popup.NoAutoClose
- rightPadding: 10 * DefaultStyle.dp
- leftPadding: 10 * DefaultStyle.dp
- topPadding: 10 * DefaultStyle.dp
- bottomPadding: 10 * DefaultStyle.dp
+ rightPadding: 10 * mainWindow.dp
+ leftPadding: 10 * mainWindow.dp
+ topPadding: 10 * mainWindow.dp
+ bottomPadding: 10 * mainWindow.dp
underlineColor: DefaultStyle.main1_500_main
- property int radius: 16 * DefaultStyle.dp
+ property int radius: 16 * mainWindow.dp
property string title
property string text
property string details
@@ -43,7 +43,7 @@ Popup {
ColumnLayout {
id: child
anchors.fill: parent
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
Text{
id: titleText
@@ -51,8 +51,8 @@ Popup {
visible: text.length != 0
text: mainItem.title
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignLeft
@@ -71,8 +71,8 @@ Popup {
Layout.alignment: Qt.AlignCenter
text: mainItem.text
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
wrapMode: Text.Wrap
horizontalAlignment: titleText.visible ? Text.AlignLeft : Text.AlignHCenter
@@ -81,12 +81,12 @@ Popup {
id: detailsText
visible: text.length != 0
Layout.fillWidth: true
- //Layout.preferredWidth: 278 * DefaultStyle.dp
+ //Layout.preferredWidth: 278 * mainWindow.dp
Layout.alignment: Qt.AlignCenter
text: mainItem.details
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 400 * mainWindow.dp
italic: true
}
wrapMode: Text.Wrap
@@ -102,7 +102,7 @@ Popup {
RowLayout {
id: buttonsLayout
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
// have been set
@@ -110,10 +110,10 @@ Popup {
id:firstButtonId
visible: mainItem.buttons.length === 2
text: qsTr("Oui")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
focus: !firstButtonAccept
onClicked: {
if(firstButtonAccept)
@@ -129,10 +129,10 @@ Popup {
id: secondButtonId
visible: mainItem.buttons.length === 2
text: qsTr("Non")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
focus: !secondButtonAccept
onClicked: {
if(secondButtonAccept)
diff --git a/Linphone/view/Control/Popup/Dialog/ZrtpAuthenticationDialog.qml b/Linphone/view/Control/Popup/Dialog/ZrtpAuthenticationDialog.qml
index e7eeb2cfe..4bb286cc1 100644
--- a/Linphone/view/Control/Popup/Dialog/ZrtpAuthenticationDialog.qml
+++ b/Linphone/view/Control/Popup/Dialog/ZrtpAuthenticationDialog.qml
@@ -8,11 +8,11 @@ import UtilsCpp 1.0
// =============================================================================
Dialog {
id: mainItem
- width: 436 * DefaultStyle.dp
- rightPadding: 0 * DefaultStyle.dp
- leftPadding: 0 * DefaultStyle.dp
- topPadding: 85 * DefaultStyle.dp + 24 * DefaultStyle.dp
- bottomPadding: 24 * DefaultStyle.dp
+ width: 436 * mainWindow.dp
+ rightPadding: 0 * mainWindow.dp
+ leftPadding: 0 * mainWindow.dp
+ topPadding: 85 * mainWindow.dp + 24 * mainWindow.dp
+ bottomPadding: 24 * mainWindow.dp
modal: true
closePolicy: Popup.NoAutoClose
@@ -38,10 +38,10 @@ Dialog {
radius: mainItem.radius
Layout.ColumnLayout {
anchors.top: parent.top
- anchors.topMargin: 18 * DefaultStyle.dp
+ anchors.topMargin: 18 * mainWindow.dp
anchors.horizontalCenter: parent.horizontalCenter
Item {
- // spacing: 14 * DefaultStyle.dp
+ // spacing: 14 * mainWindow.dp
Layout.Layout.preferredWidth: childrenRect.width
Layout.Layout.preferredHeight: childrenRect.height
Layout.Layout.fillWidth: true
@@ -49,19 +49,19 @@ Dialog {
id: trustShield
anchors.centerIn: parent
source: AppIcons.trustedWhite
- sourceSize.width: 24 * DefaultStyle.dp
- sourceSize.height: 24 * DefaultStyle.dp
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ sourceSize.width: 24 * mainWindow.dp
+ sourceSize.height: 24 * mainWindow.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
}
EffectImage {
anchors.left: trustShield.right
- anchors.leftMargin: 14 * DefaultStyle.dp
+ anchors.leftMargin: 14 * mainWindow.dp
visible: mainItem.securityError
imageSource: AppIcons.shieldWarning
colorizationColor: DefaultStyle.main2_700
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
}
}
Text {
@@ -69,8 +69,8 @@ Dialog {
color: DefaultStyle.grey_0
Layout.Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
Item{Layout.Layout.fillHeight: true}
@@ -79,15 +79,15 @@ Dialog {
visible: !mainItem.securityError
anchors.top: parent.top
anchors.right: parent.right
- anchors.topMargin: 10 * DefaultStyle.dp
- anchors.rightMargin: 17 * DefaultStyle.dp
+ anchors.topMargin: 10 * mainWindow.dp
+ anchors.rightMargin: 17 * mainWindow.dp
background: Item{}
contentItem: Text {
text: qsTr("Passer")
color: DefaultStyle.grey_0
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 600 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 600 * mainWindow.dp
underline: true
}
}
@@ -100,9 +100,9 @@ Dialog {
Rectangle {
z: 1
width: mainItem.width
- height: parent.height - 85 * DefaultStyle.dp
+ height: parent.height - 85 * mainWindow.dp
x: parent.x
- y: parent.y + 85 * DefaultStyle.dp
+ y: parent.y + 85 * mainWindow.dp
color: DefaultStyle.grey_0
radius: mainItem.radius
}
@@ -119,21 +119,21 @@ Dialog {
content: [
Layout.ColumnLayout {
visible: !mainItem.securityError
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
Layout.Layout.fillWidth: true
Layout.ColumnLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
Text {
- Layout.Layout.preferredWidth: 343 * DefaultStyle.dp
+ Layout.Layout.preferredWidth: 343 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter
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 d’authentifier l’appareil de votre correspondant. Veuillez échanger vos codes : ")
wrapMode: Text.WordWrap
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
Layout.ColumnLayout {
spacing: 0
@@ -142,15 +142,15 @@ Dialog {
text: qsTr("Votre code :")
horizontalAlignment: Text.AlignHCenter
Layout.Layout.alignment: Qt.AlignHCenter
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
Text {
text: mainItem.call && mainItem.call.core.localToken || ""
horizontalAlignment: Text.AlignHCenter
Layout.Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 18 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 18 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
}
@@ -158,17 +158,17 @@ Dialog {
Rectangle {
color: "transparent"
border.color: DefaultStyle.main2_200
- border.width: Math.max(0.5, 1 * DefaultStyle.dp)
- radius: 15 * DefaultStyle.dp
- Layout.Layout.preferredWidth: 292 * DefaultStyle.dp
- Layout.Layout.preferredHeight: 233 * DefaultStyle.dp
+ border.width: Math.max(0.5, 1 * mainWindow.dp)
+ radius: 15 * mainWindow.dp
+ Layout.Layout.preferredWidth: 292 * mainWindow.dp
+ Layout.Layout.preferredHeight: 233 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
Layout.ColumnLayout {
anchors.fill: parent
- anchors.topMargin: 10 * DefaultStyle.dp
+ anchors.topMargin: 10 * mainWindow.dp
Text {
text: qsTr("Code correspondant :")
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
}
Layout.GridLayout {
@@ -176,28 +176,28 @@ Dialog {
Layout.Layout.alignment: Qt.AlignHCenter
rows: 2
columns: 2
- rowSpacing: 32 * DefaultStyle.dp
- columnSpacing: 32 * DefaultStyle.dp
+ rowSpacing: 32 * mainWindow.dp
+ columnSpacing: 32 * mainWindow.dp
property var correctIndex
property var modelList
Repeater {
model: mainItem.call && mainItem.call.core.remoteTokens || ""
Item {
- width: 70 * DefaultStyle.dp
- height: 70 * DefaultStyle.dp
+ width: 70 * mainWindow.dp
+ height: 70 * mainWindow.dp
Rectangle {
id: code
anchors.fill: parent
color: DefaultStyle.grey_0
- radius: 71 * DefaultStyle.dp
+ radius: 71 * mainWindow.dp
Text {
anchors.fill: parent
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
text: modelData
font {
- pixelSize: 32 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 32 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
MouseArea {
@@ -228,24 +228,24 @@ Dialog {
spacing: 0
Text {
- width: 303 * DefaultStyle.dp
- // Layout.Layout.preferredWidth: 343 * DefaultStyle.dp
+ width: 303 * mainWindow.dp
+ // Layout.Layout.preferredWidth: 343 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
Layout.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
text: qsTr("Le code fourni ne correspond pas.")
wrapMode: Text.WordWrap
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
Text {
- width: 303 * DefaultStyle.dp
- // Layout.Layout.preferredWidth: 343 * DefaultStyle.dp
+ width: 303 * mainWindow.dp
+ // Layout.Layout.preferredWidth: 343 * mainWindow.dp
Layout.Layout.alignment: Qt.AlignHCenter
Layout.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
text: qsTr("La confidentialité de votre appel peut être compromise !")
wrapMode: Text.WordWrap
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
}
]
@@ -257,27 +257,27 @@ Dialog {
text: qsTr("Aucune correspondance")
color: DefaultStyle.danger_500main
inversedColors: true
- textSize: 15 * DefaultStyle.dp
+ textSize: 15 * mainWindow.dp
visible: !mainItem.securityError
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
- topPadding: 10 * DefaultStyle.dp
- bottomPadding: 10 * DefaultStyle.dp
- width: 247 * DefaultStyle.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
+ topPadding: 10 * mainWindow.dp
+ bottomPadding: 10 * mainWindow.dp
+ width: 247 * mainWindow.dp
onClicked: {
if(mainItem.call) mainItem.call.core.lCheckAuthenticationTokenSelected(" ")
}
}
Button {
- Layout.Layout.preferredWidth: 247 * DefaultStyle.dp
+ Layout.Layout.preferredWidth: 247 * mainWindow.dp
visible: mainItem.securityError
- leftPadding: (247 * DefaultStyle.dp - contentItem.implicitWidth) /2
- rightPadding: (247 * DefaultStyle.dp - contentItem.implicitWidth) /2
- topPadding: 10 * DefaultStyle.dp
- bottomPadding: 10 * DefaultStyle.dp
+ leftPadding: (247 * mainWindow.dp - contentItem.implicitWidth) /2
+ rightPadding: (247 * mainWindow.dp - contentItem.implicitWidth) /2
+ topPadding: 10 * mainWindow.dp
+ bottomPadding: 10 * mainWindow.dp
color: DefaultStyle.danger_500main
onClicked: mainItem.call.core.lTerminate()
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
icon.source: AppIcons.endCall
contentImageColor: DefaultStyle.grey_0
text: qsTr("Raccrocher")
diff --git a/Linphone/view/Control/Popup/InformationPopup.qml b/Linphone/view/Control/Popup/InformationPopup.qml
index d4a11231a..472240df8 100644
--- a/Linphone/view/Control/Popup/InformationPopup.qml
+++ b/Linphone/view/Control/Popup/InformationPopup.qml
@@ -17,9 +17,9 @@ Popup {
closePolicy: Popup.NoAutoClose
x : parent.x + parent.width - width
// y : parent.y + parent.height - height
- rightMargin: 20 * DefaultStyle.dp
- bottomMargin: 20 * DefaultStyle.dp
- padding: 20 * DefaultStyle.dp
+ rightMargin: 20 * mainWindow.dp
+ bottomMargin: 20 * mainWindow.dp
+ padding: 20 * mainWindow.dp
underlineColor: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main
radius: 0
onHoveredChanged: {
@@ -34,22 +34,22 @@ Popup {
}
}
contentItem: RowLayout {
- spacing: 24 * DefaultStyle.dp
+ spacing: 24 * mainWindow.dp
EffectImage {
imageSource: mainItem.isSuccess ? AppIcons.smiley : AppIcons.smileySad
colorizationColor: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
- width: 32 * DefaultStyle.dp
- height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
+ width: 32 * mainWindow.dp
+ height: 32 * mainWindow.dp
}
Rectangle {
- Layout.preferredWidth: 1 * DefaultStyle.dp
+ Layout.preferredWidth: 1 * mainWindow.dp
Layout.preferredHeight: parent.height
color: DefaultStyle.main2_200
}
ColumnLayout {
- spacing: 2 * DefaultStyle.dp
+ spacing: 2 * mainWindow.dp
RowLayout {
spacing: 0
Text {
@@ -57,15 +57,15 @@ Popup {
text: mainItem.title
color: mainItem.isSuccess ? DefaultStyle.success_500main : DefaultStyle.danger_500main
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Button {
- Layout.preferredWidth: 20 * DefaultStyle.dp
- Layout.preferredHeight: 20 * DefaultStyle.dp
- icon.width: 20 * DefaultStyle.dp
- icon.height: 20 * DefaultStyle.dp
+ Layout.preferredWidth: 20 * mainWindow.dp
+ Layout.preferredHeight: 20 * mainWindow.dp
+ icon.width: 20 * mainWindow.dp
+ icon.height: 20 * mainWindow.dp
Layout.alignment: Qt.AlignTop | Qt.AlignRight
visible: mainItem.hovered || hovered
background: Item{}
@@ -76,13 +76,13 @@ Popup {
Text {
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
- Layout.maximumWidth: 300 * DefaultStyle.dp
+ Layout.maximumWidth: 300 * mainWindow.dp
text: mainItem.description
wrapMode: Text.WordWrap
color: DefaultStyle.main2_500main
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Control/Popup/Loading/LoadingPopup.qml b/Linphone/view/Control/Popup/Loading/LoadingPopup.qml
index 28df35b9c..0d38575f7 100644
--- a/Linphone/view/Control/Popup/Loading/LoadingPopup.qml
+++ b/Linphone/view/Control/Popup/Loading/LoadingPopup.qml
@@ -10,18 +10,18 @@ Popup {
modal: true
closePolicy: Control.Popup.NoAutoClose
anchors.centerIn: parent
- padding: 20 * DefaultStyle.dp
+ padding: 20 * mainWindow.dp
underlineColor: DefaultStyle.main1_500_main
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
// onAboutToShow: width = contentText.implicitWidth
contentItem: ColumnLayout {
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
// width: childrenRect.width
// height: childrenRect.height
BusyIndicator{
Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: 33 * DefaultStyle.dp
- Layout.preferredHeight: 33 * DefaultStyle.dp
+ Layout.preferredWidth: 33 * mainWindow.dp
+ Layout.preferredHeight: 33 * mainWindow.dp
}
Text {
id: contentText
@@ -29,7 +29,7 @@ Popup {
Layout.fillWidth: true
Layout.fillHeight: true
text: mainItem.text
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
Button {
visible: mainItem.cancelButtonVisible
diff --git a/Linphone/view/Control/Popup/Notification/Notification.qml b/Linphone/view/Control/Popup/Notification/Notification.qml
index 624b0950a..bf53dc23c 100644
--- a/Linphone/view/Control/Popup/Notification/Notification.qml
+++ b/Linphone/view/Control/Popup/Notification/Notification.qml
@@ -5,24 +5,26 @@ import Linphone
// =============================================================================
DesktopPopup {
- id: mainItem
+ id: mainWindow
property var notificationData: ({
timelineModel : null
})
- property int overriddenHeight: 120 * DefaultStyle.dp
- property int overriddenWidth: 300 * DefaultStyle.dp
+ //property int overriddenHeight: 120 * mainWindow.dp
+ //property int overriddenWidth: 300 * mainWindow.dp
property double radius: 0
default property alias _content: content.data
signal deleteNotification (var notification)
- width: mainItem.overriddenWidth
- height: mainItem.overriddenHeight
+ //width: mainWindow.overriddenWidth
+ //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
function deleteNotificationSlot(){
- deleteNotification(mainItem)
+ deleteNotification(mainWindow)
}
function _close (cb) {
@@ -35,10 +37,10 @@ DesktopPopup {
anchors.fill: parent
visible: backgroundLoader.status != Loader.Ready
color: DefaultStyle.grey_0
- radius: mainItem.radius
+ radius: mainWindow.radius
border {
color: DefaultStyle.grey_400
- width: 1 * DefaultStyle.dp
+ width: 1 * mainWindow.dp
}
}
@@ -46,17 +48,19 @@ DesktopPopup {
id: backgroundLoader
asynchronous: true
sourceComponent: Item{
- width: mainItem.overriddenWidth
- height: mainItem.overriddenHeight
+ //width: mainWindow.overriddenWidth
+ //height: mainWindow.overriddenHeight
+ width: mainWindow.width
+ height: mainWindow.height
Rectangle {
id: background
anchors.fill: parent
visible: backgroundLoader.status != Loader.Ready
color: DefaultStyle.grey_0
- radius: mainItem.radius
+ radius: mainWindow.radius
border {
color: DefaultStyle.grey_400
- width: 1 * DefaultStyle.dp
+ width: 1 * mainWindow.dp
}
}
MultiEffect {
diff --git a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
index 60896c334..4105357d6 100644
--- a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
+++ b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
@@ -5,11 +5,12 @@ import UtilsCpp
// =============================================================================
Notification {
- id: mainItem
- radius: 20 * DefaultStyle.dp
- overriddenWidth: content.implicitWidth//101 * DefaultStyle.dp
- overriddenHeight: content.implicitHeight//422 * DefaultStyle.dp
-
+ id: mainWindow
+ radius: 20 * mainWindow.dp
+ //overriddenWidth: content.implicitWidth//101 * mainWindow.dp
+ //overriddenHeight: content.implicitHeight//422 * mainWindow.dp
+ width: content.implicitWidth
+ height: content.implicitHeight
readonly property var call: notificationData && notificationData.call
property var state: call.core.state
property var status: call.core.status
@@ -24,28 +25,25 @@ Notification {
Popup {
id: content
- visible: mainItem.visible
- leftPadding: 19 * DefaultStyle.dp
- rightPadding: 19 * DefaultStyle.dp
- topPadding: 15 * DefaultStyle.dp
- bottomPadding: 15 * DefaultStyle.dp
+ visible: mainWindow.visible
+ leftPadding: 19 * mainWindow.dp
+ rightPadding: 19 * mainWindow.dp
+ topPadding: 15 * mainWindow.dp
+ bottomPadding: 15 * mainWindow.dp
+
background: Item{}
contentItem: RowLayout {
id: notifContent
-
- spacing: 30 * DefaultStyle.dp
- height: childrenRect.height
- width: childrenRect.width
+ spacing: 30 * mainWindow.dp
RowLayout {
Layout.fillWidth: true
+ Layout.fillHeight: true
Layout.alignment: Qt.AlignLeft
- spacing: 13 * DefaultStyle.dp
- Layout.preferredHeight: childrenRect.height
- Layout.preferredWidth: childrenRect.width
+ spacing: 13 * mainWindow.dp
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
- call: mainItem.call
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
+ call: mainWindow.call
}
ColumnLayout {
Text {
@@ -53,8 +51,8 @@ Notification {
text: remoteAddress ? remoteAddress.value : ""
color: DefaultStyle.grey_600
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 800 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -62,8 +60,8 @@ Notification {
EffectImage {
imageSource: AppIcons.arrowDownLeft
colorizationColor: DefaultStyle.success_500main
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
Text {
Layout.fillWidth: true
@@ -71,8 +69,8 @@ Notification {
text: qsTr("Appel entrant")//.arg(localAddress ? qsTr(" pour %1").arg(localAddress.value) : "") //call.core.remoteAddress
color: DefaultStyle.grey_600
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -82,38 +80,38 @@ Notification {
RowLayout {
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
- spacing: 26 * DefaultStyle.dp
+ spacing: 26 * mainWindow.dp
Button {
color: DefaultStyle.success_500main
- Layout.preferredWidth: 75 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
+ Layout.preferredWidth: 75 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
asynchronous: false
contentItem: EffectImage {
colorizationColor: DefaultStyle.grey_0
imageSource: AppIcons.phone
- imageWidth: 32 * DefaultStyle.dp
- imageHeight: 32 * DefaultStyle.dp
+ imageWidth: 32 * mainWindow.dp
+ imageHeight: 32 * mainWindow.dp
}
onClicked: {
console.debug("[NotificationReceivedCall] Accept click")
- UtilsCpp.openCallsWindow(mainItem.call)
- mainItem.call.core.lAccept(false)
+ UtilsCpp.openCallsWindow(mainWindow.call)
+ mainWindow.call.core.lAccept(false)
}
}
Button {
color: DefaultStyle.danger_500main
- Layout.preferredWidth: 75 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
+ Layout.preferredWidth: 75 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
asynchronous: false
contentItem: EffectImage {
colorizationColor: DefaultStyle.grey_0
imageSource: AppIcons.endCall
- imageWidth: 32 * DefaultStyle.dp
- imageHeight: 32 * DefaultStyle.dp
+ imageWidth: 32 * mainWindow.dp
+ imageHeight: 32 * mainWindow.dp
}
onClicked: {
console.debug("[NotificationReceivedCall] Decline click")
- mainItem.call.core.lDecline()
+ mainWindow.call.core.lDecline()
}
}
}
diff --git a/Linphone/view/Control/Popup/Notification/TemporaryNotification.qml b/Linphone/view/Control/Popup/Notification/TemporaryNotification.qml
index a4c9451f0..ebdbf1de5 100644
--- a/Linphone/view/Control/Popup/Notification/TemporaryNotification.qml
+++ b/Linphone/view/Control/Popup/Notification/TemporaryNotification.qml
@@ -4,13 +4,13 @@ import Linphone
Control.Control {
id: mainItem
- // width: 269 * DefaultStyle.dp
+ // width: 269 * mainWindow.dp
y: -height
z: 1
- topPadding: 8 * DefaultStyle.dp
- bottomPadding: 8 * DefaultStyle.dp
- leftPadding: 37 * DefaultStyle.dp
- rightPadding: 37 * DefaultStyle.dp
+ topPadding: 8 * mainWindow.dp
+ bottomPadding: 8 * mainWindow.dp
+ leftPadding: 37 * mainWindow.dp
+ rightPadding: 37 * mainWindow.dp
anchors.horizontalCenter: parent.horizontalCenter
clip: true
@@ -41,15 +41,15 @@ Control.Control {
anchors.fill: parent
color: DefaultStyle.grey_0
border.color: mainItem.contentColor
- border.width: 1 * DefaultStyle.dp
- radius: 50 * DefaultStyle.dp
+ border.width: 1 * mainWindow.dp
+ radius: 50 * mainWindow.dp
}
contentItem: RowLayout {
Image {
visible: mainItem.imageSource != undefined
source: mainItem.imageSource
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit
Layout.fillWidth: true
}
@@ -58,7 +58,7 @@ Control.Control {
text: mainItem.text
Layout.fillWidth: true
font {
- pixelSize: 14 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Control/Popup/NumericPadPopup.qml b/Linphone/view/Control/Popup/NumericPadPopup.qml
index 216f7fe9b..ab5b38013 100644
--- a/Linphone/view/Control/Popup/NumericPadPopup.qml
+++ b/Linphone/view/Control/Popup/NumericPadPopup.qml
@@ -9,10 +9,10 @@ import LinphoneCallsCpp
Control.Popup {
id: mainItem
closePolicy: Control.Popup.CloseOnEscape
- leftPadding: 72 * DefaultStyle.dp
- rightPadding: 72 * DefaultStyle.dp
- topPadding: 41 * DefaultStyle.dp
- bottomPadding: 18 * DefaultStyle.dp
+ leftPadding: 72 * mainWindow.dp
+ rightPadding: 72 * mainWindow.dp
+ topPadding: 41 * mainWindow.dp
+ bottomPadding: 18 * mainWindow.dp
property bool closeButtonVisible: true
property bool roundedBottom: false
property bool lastRowVisible: true
@@ -29,7 +29,7 @@ Control.Popup {
width: parent.width
height: parent.height
color: DefaultStyle.grey_100
- radius: 20 * DefaultStyle.dp
+ radius: 20 * mainWindow.dp
}
MultiEffect {
id: effect
@@ -57,17 +57,17 @@ Control.Popup {
visible: mainItem.closeButtonVisible
anchors.top: parent.top
anchors.right: parent.right
- anchors.topMargin: 10 * DefaultStyle.dp
- anchors.rightMargin: 10 * DefaultStyle.dp
+ anchors.topMargin: 10 * mainWindow.dp
+ anchors.rightMargin: 10 * mainWindow.dp
background: Item {
anchors.fill: parent
visible: false
}
icon.source: AppIcons.closeX
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
onClicked: mainItem.close()
}
}
diff --git a/Linphone/view/Control/Popup/Popup.qml b/Linphone/view/Control/Popup/Popup.qml
index 6059471f9..0c4071c16 100644
--- a/Linphone/view/Control/Popup/Popup.qml
+++ b/Linphone/view/Control/Popup/Popup.qml
@@ -7,14 +7,14 @@ Control.Popup{
id: mainItem
padding: 0
property color underlineColor : DefaultStyle.main1_500_main
- property int radius: 16 * DefaultStyle.dp
+ property int radius: 16 * mainWindow.dp
property bool hovered: mouseArea.containsMouse
background: Item{
Rectangle {
visible: mainItem.underlineColor != undefined
width: mainItem.width
- height: mainItem.height + 2 * DefaultStyle.dp
+ height: mainItem.height + 2 * mainWindow.dp
color: mainItem.underlineColor
radius: mainItem.radius
}
diff --git a/Linphone/view/Control/Tool/Prototype/CallPrototype.qml b/Linphone/view/Control/Tool/Prototype/CallPrototype.qml
index 39a11b77f..527a5df9b 100644
--- a/Linphone/view/Control/Tool/Prototype/CallPrototype.qml
+++ b/Linphone/view/Control/Tool/Prototype/CallPrototype.qml
@@ -131,7 +131,7 @@ Window {
TextField {
id: usernameToCall
label: "Username to call"
- Layout.preferredWidth: 250 * DefaultStyle.dp
+ Layout.preferredWidth: 250 * mainWindow.dp
}
Button{
text: 'Call'
diff --git a/Linphone/view/Page/Form/Call/NewCallForm.qml b/Linphone/view/Page/Form/Call/NewCallForm.qml
index b1b946e40..782ee6cc0 100644
--- a/Linphone/view/Page/Form/Call/NewCallForm.qml
+++ b/Linphone/view/Page/Form/Call/NewCallForm.qml
@@ -29,12 +29,12 @@ FocusScope {
}
contentItem: ColumnLayout {
anchors.fill: parent
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
SearchBar {
id: searchBar
Layout.alignment: Qt.AlignTop
Layout.fillWidth: true
- Layout.rightMargin: 39 * DefaultStyle.dp
+ Layout.rightMargin: 39 * mainWindow.dp
Layout.maximumWidth: mainItem.width
focus: true
color: mainItem.searchBarColor
@@ -46,7 +46,7 @@ FocusScope {
Flickable {
Layout.fillWidth: true
Layout.fillHeight: true
- Layout.topMargin: 25 * DefaultStyle.dp
+ Layout.topMargin: 25 * mainWindow.dp
contentWidth: width
contentHeight: content.height
clip: true
@@ -57,20 +57,20 @@ FocusScope {
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- anchors.rightMargin: 8 * DefaultStyle.dp
+ anchors.rightMargin: 8 * mainWindow.dp
}
ColumnLayout {
id: content
- spacing: 32 * DefaultStyle.dp
+ spacing: 32 * mainWindow.dp
anchors.left: parent.left
anchors.right: parent.right
- anchors.rightMargin: 39 * DefaultStyle.dp
+ anchors.rightMargin: 39 * mainWindow.dp
Button {
id: grouCallButton
visible: mainItem.groupCallVisible && !SettingsCpp.disableMeetingsFeature
- Layout.preferredWidth: 320 * DefaultStyle.dp
- Layout.preferredHeight: 44 * DefaultStyle.dp
+ Layout.preferredWidth: 320 * mainWindow.dp
+ Layout.preferredHeight: 44 * mainWindow.dp
padding: 0
KeyNavigation.up: searchBar
KeyNavigation.down: contactList.count >0 ? contactList : searchList
@@ -82,22 +82,22 @@ FocusScope {
GradientStop { position: 1.0; color: DefaultStyle.grey_0}
}
anchors.fill: parent
- radius: 50 * DefaultStyle.dp
+ radius: 50 * mainWindow.dp
}
contentItem: RowLayout {
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
Image {
source: AppIcons.groupCall
- Layout.preferredWidth: 44 * DefaultStyle.dp
- sourceSize.width: 44 * DefaultStyle.dp
+ Layout.preferredWidth: 44 * mainWindow.dp
+ sourceSize.width: 44 * mainWindow.dp
fillMode: Image.PreserveAspectFit
}
Text {
text: "Appel de groupe"
color: DefaultStyle.grey_1000
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
underline: grouCallButton.shadowEnabled
}
}
@@ -106,8 +106,8 @@ FocusScope {
}
Image {
source: AppIcons.rightArrow
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
}
}
@@ -116,8 +116,8 @@ FocusScope {
Text {
text: qsTr("Contacts")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
ContactListView{
@@ -132,12 +132,12 @@ FocusScope {
}
}
ColumnLayout {
- spacing: 18 * DefaultStyle.dp
+ spacing: 18 * mainWindow.dp
Text {
text: qsTr("Suggestions")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
ContactListView{
diff --git a/Linphone/view/Page/Form/Contact/ContactDescription.qml b/Linphone/view/Page/Form/Contact/ContactDescription.qml
index 83261a26a..33617ac9a 100644
--- a/Linphone/view/Page/Form/Contact/ContactDescription.qml
+++ b/Linphone/view/Page/Form/Contact/ContactDescription.qml
@@ -18,8 +18,8 @@ ColumnLayout{
Layout.fillHeight: true
verticalAlignment: (bottomTextItem.visible?Text.AlignBottom:Text.AlignVCenter)
visible: text != ''
- font.weight: 400 * DefaultStyle.dp
- font.pixelSize: 14 * DefaultStyle.dp
+ font.weight: 400 * mainWindow.dp
+ font.pixelSize: 14 * mainWindow.dp
color: DefaultStyle.main2_700
text: mainItem.topText
width: mainItem.width
@@ -32,8 +32,8 @@ ColumnLayout{
Layout.fillHeight: true
verticalAlignment: (topTextItem.visible?Text.AlignTop:Text.AlignVCenter)
visible: text != ''
- font.weight: 300 * DefaultStyle.dp
- font.pixelSize: 12 * DefaultStyle.dp
+ font.weight: 300 * mainWindow.dp
+ font.pixelSize: 12 * mainWindow.dp
color: DefaultStyle.main2_400
text: mainItem.bottomText
Layout.preferredWidth: mainItem.width
diff --git a/Linphone/view/Page/Form/Contact/ContactEdition.qml b/Linphone/view/Page/Form/Contact/ContactEdition.qml
index 79513670f..b9e43ccbd 100644
--- a/Linphone/view/Page/Form/Contact/ContactEdition.qml
+++ b/Linphone/view/Page/Form/Contact/ContactEdition.qml
@@ -33,31 +33,31 @@ MainRightPanel {
mainItem.contact.core.undo()
mainItem.closeEdition()
}
- width: 278 * DefaultStyle.dp
+ width: 278 * mainWindow.dp
text: qsTr("Les changements seront annulés. Souhaitez-vous continuer ?")
}
headerContent: [
Text {
anchors.left: parent.left
- anchors.leftMargin: 31 * DefaultStyle.dp
+ anchors.leftMargin: 31 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
text: mainItem.title
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
},
Button {
background: Item{}
anchors.right: parent.right
- anchors.rightMargin: 41 * DefaultStyle.dp
+ anchors.rightMargin: 41 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
icon.source: AppIcons.closeX
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
onClicked: {
confirmDialog.open()
}
@@ -68,22 +68,22 @@ MainRightPanel {
anchors.fill: parent
spacing : 0
ColumnLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
- Layout.topMargin: 69 * DefaultStyle.dp
+ Layout.topMargin: 69 * mainWindow.dp
Avatar {
contact: mainItem.contact
- Layout.preferredWidth: 72 * DefaultStyle.dp
- Layout.preferredHeight: 72 * DefaultStyle.dp
+ Layout.preferredWidth: 72 * mainWindow.dp
+ Layout.preferredHeight: 72 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
}
IconLabelButton {
id: addPictureButton
visible: !mainItem.contact || mainItem.contact.core.pictureUri.length === 0
Layout.preferredWidth: width
- Layout.preferredHeight: 17 * DefaultStyle.dp
+ Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.camera
- iconSize: 17 * DefaultStyle.dp
+ iconSize: 17 * mainWindow.dp
backgroundColor: "transparent"
text: qsTr("Ajouter une image")
KeyNavigation.down: editButton.visible ? editButton : givenNameEdit
@@ -95,9 +95,9 @@ MainRightPanel {
IconLabelButton {
id: editButton
Layout.preferredWidth: width
- Layout.preferredHeight: 17 * DefaultStyle.dp
+ Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.pencil
- iconSize: 17 * DefaultStyle.dp
+ iconSize: 17 * mainWindow.dp
backgroundColor: "transparent"
text: qsTr("Modifier")
KeyNavigation.down: givenNameEdit
@@ -116,9 +116,9 @@ MainRightPanel {
}
IconLabelButton {
id: removeButton
- Layout.preferredHeight: 17 * DefaultStyle.dp
+ Layout.preferredHeight: 17 * mainWindow.dp
Layout.preferredWidth: width
- iconSize: 17 * DefaultStyle.dp
+ iconSize: 17 * mainWindow.dp
iconSource: AppIcons.trashCan
backgroundColor: "transparent"
text: qsTr("Supprimer")
@@ -131,19 +131,19 @@ MainRightPanel {
Layout.fillHeight: true
Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
- Layout.topMargin: 63 * DefaultStyle.dp
- Layout.bottomMargin: 78 * DefaultStyle.dp
- spacing: 100 * DefaultStyle.dp
+ Layout.topMargin: 63 * mainWindow.dp
+ Layout.bottomMargin: 78 * mainWindow.dp
+ spacing: 100 * mainWindow.dp
Flickable {
Layout.preferredWidth: contentWidth
Layout.fillHeight: true
- Layout.leftMargin: 100 * DefaultStyle.dp
+ Layout.leftMargin: 100 * mainWindow.dp
contentWidth: content.implicitWidth
contentHeight: content.height
clip: true
ColumnLayout {
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
anchors.fill: parent
FormItemLayout {
id: givenName
@@ -207,7 +207,7 @@ MainRightPanel {
id: addressesFlickable
Layout.preferredWidth: contentWidth
Layout.fillHeight: true
- Layout.rightMargin: 76 * DefaultStyle.dp
+ Layout.rightMargin: 76 * mainWindow.dp
contentWidth: content.implicitWidth
contentHeight: content.implicitHeight
clip: true
@@ -229,7 +229,7 @@ MainRightPanel {
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- anchors.leftMargin: 15 * DefaultStyle.dp
+ anchors.leftMargin: 15 * mainWindow.dp
}
Control.ScrollBar.horizontal: Control.ScrollBar{
visible: false
@@ -237,7 +237,7 @@ MainRightPanel {
ColumnLayout {
id: content
anchors.fill: parent
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
Repeater {
id: addressesList
model: VariantList {
@@ -247,7 +247,7 @@ MainRightPanel {
label: modelData.label
contentItem: RowLayout {
id: addressLayout
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
function updateFocus(event){
if(event.key == Qt.Key_Up){
if(index - 1 >=0 )
@@ -279,15 +279,15 @@ MainRightPanel {
}
Button {
id: removeAddressButton
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter
background: Item{}
icon.source: AppIcons.closeX
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
KeyNavigation.left: addressTextField
Keys.onPressed: (event) => addressLayout.updateFocus(event)
onClicked: mainItem.contact.core.removeAddress(index)
@@ -297,7 +297,7 @@ MainRightPanel {
}
RowLayout {
onYChanged: addressesFlickable.ensureVisible(this)
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
FormItemLayout {
label: qsTr("Adresse SIP")
contentItem: TextField {
@@ -325,8 +325,8 @@ MainRightPanel {
}
}
Item {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
}
Repeater {
@@ -339,7 +339,7 @@ MainRightPanel {
label: modelData.label
contentItem: RowLayout {
id: phoneNumberLayout
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
function updateFocus(event){
if(event.key == Qt.Key_Up){
if(index - 1 >=0 )
@@ -370,15 +370,15 @@ MainRightPanel {
}
Button {
id: removePhoneButton
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter
background: Item{}
icon.source: AppIcons.closeX
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
KeyNavigation.left: phoneTextField
Keys.onPressed: (event) => phoneNumberLayout.updateFocus(event)
onClicked: mainItem.contact.core.removePhoneNumber(index)
@@ -388,7 +388,7 @@ MainRightPanel {
}
RowLayout {
onYChanged: addressesFlickable.ensureVisible(this)
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
FormItemLayout {
id: phoneNumberInput
label: qsTr("Phone")
@@ -417,8 +417,8 @@ MainRightPanel {
}
}
Item {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
}
TemporaryText {
@@ -434,15 +434,15 @@ MainRightPanel {
Button {
id: saveButton
- Layout.bottomMargin: 100 * DefaultStyle.dp
- Layout.preferredWidth: 165 * DefaultStyle.dp
+ Layout.bottomMargin: 100 * mainWindow.dp
+ Layout.preferredWidth: 165 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
enabled: mainItem.contact && mainItem.contact.core.allAddresses.length > 0
text: mainItem.saveButtonText
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
KeyNavigation.up: phoneNumberInputTextField
KeyNavigation.down: givenNameEdit
onClicked: {
diff --git a/Linphone/view/Page/Form/Login/LoginPage.qml b/Linphone/view/Page/Form/Login/LoginPage.qml
index 079afa882..7c404d6cb 100644
--- a/Linphone/view/Page/Form/Login/LoginPage.qml
+++ b/Linphone/view/Page/Form/Login/LoginPage.qml
@@ -19,9 +19,9 @@ LoginLayout {
Button {
enabled: mainItem.showBackButton
opacity: mainItem.showBackButton ? 1.0 : 0
- Layout.preferredHeight: 27 * DefaultStyle.dp
- Layout.preferredWidth: 27 * DefaultStyle.dp
- Layout.leftMargin: 79 * DefaultStyle.dp
+ Layout.preferredHeight: 27 * mainWindow.dp
+ Layout.preferredWidth: 27 * mainWindow.dp
+ Layout.leftMargin: 79 * mainWindow.dp
icon.source: AppIcons.leftArrow
icon.width: width
icon.height: height
@@ -34,19 +34,19 @@ LoginLayout {
}
},
RowLayout {
- spacing: 15 * DefaultStyle.dp
- Layout.leftMargin: 21 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
+ Layout.leftMargin: 21 * mainWindow.dp
Image {
fillMode: Image.PreserveAspectFit
source: AppIcons.profile
- Layout.preferredHeight: 34 * DefaultStyle.dp
- Layout.preferredWidth: 34 * DefaultStyle.dp
+ Layout.preferredHeight: 34 * mainWindow.dp
+ Layout.preferredWidth: 34 * mainWindow.dp
}
Text {
text: qsTr("Connexion")
font {
- pixelSize: 36 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 36 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
},
@@ -55,20 +55,20 @@ LoginLayout {
},
RowLayout {
visible: !SettingsCpp.assistantHideCreateAccount
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 51 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 51 * mainWindow.dp
Text {
- Layout.rightMargin: 15 * DefaultStyle.dp
+ Layout.rightMargin: 15 * mainWindow.dp
text: qsTr("Pas encore de compte ?")
- font.pixelSize: 14 * DefaultStyle.dp
- font.weight: 400 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
+ font.weight: 400 * mainWindow.dp
}
Button {
Layout.alignment: Qt.AlignRight
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
text: qsTr("S'inscrire")
onClicked: {
console.debug("[LoginPage] User: go to register")
@@ -81,8 +81,8 @@ LoginLayout {
Flickable {
anchors.left: parent.left
anchors.top: parent.top
- anchors.leftMargin: 127 * DefaultStyle.dp
- anchors.topMargin: 70 * DefaultStyle.dp
+ anchors.leftMargin: 127 * mainWindow.dp
+ anchors.topMargin: 70 * mainWindow.dp
anchors.bottom: parent.bottom
width: contentWidth
contentWidth: content.implicitWidth
@@ -99,8 +99,8 @@ LoginLayout {
Button {
inversedColors: true
Layout.preferredWidth: loginForm.width
- Layout.preferredHeight: 47 * DefaultStyle.dp
- Layout.topMargin: 39 * DefaultStyle.dp
+ Layout.preferredHeight: 47 * mainWindow.dp
+ Layout.topMargin: 39 * mainWindow.dp
visible: !SettingsCpp.assistantHideThirdPartyAccount
text: qsTr("Compte SIP tiers")
onClicked: {mainItem.useSIPButtonClicked()}
@@ -108,8 +108,8 @@ LoginLayout {
Button {
inversedColors: true
Layout.preferredWidth: loginForm.width
- Layout.preferredHeight: 47 * DefaultStyle.dp
- Layout.topMargin: 25 * DefaultStyle.dp
+ Layout.preferredHeight: 47 * mainWindow.dp
+ Layout.topMargin: 25 * mainWindow.dp
text: qsTr("Configuration distante")
onClicked: {fetchConfigDialog.open()}
}
@@ -119,22 +119,22 @@ LoginLayout {
z: -1
anchors.top: parent.top
anchors.right: parent.right
- anchors.topMargin: 129 * DefaultStyle.dp
- anchors.rightMargin: 127 * DefaultStyle.dp
- width: 395 * DefaultStyle.dp
- height: 350 * DefaultStyle.dp
+ anchors.topMargin: 129 * mainWindow.dp
+ anchors.rightMargin: 127 * mainWindow.dp
+ width: 395 * mainWindow.dp
+ height: 350 * mainWindow.dp
fillMode: Image.PreserveAspectFit
source: AppIcons.loginImage
}
]
Dialog{
id: fetchConfigDialog
- height: 315 * DefaultStyle.dp
- width: 637 * DefaultStyle.dp
- leftPadding: 33 * DefaultStyle.dp
- rightPadding: 33 * DefaultStyle.dp
- topPadding: 41 * DefaultStyle.dp
- bottomPadding: 29 * DefaultStyle.dp
+ height: 315 * mainWindow.dp
+ width: 637 * mainWindow.dp
+ leftPadding: 33 * mainWindow.dp
+ rightPadding: 33 * mainWindow.dp
+ topPadding: 41 * mainWindow.dp
+ bottomPadding: 29 * mainWindow.dp
radius: 0
title: qsTr('Télécharger une configuration distante')
text: qsTr('Veuillez entrer le lien de configuration qui vous a été fourni :')
@@ -152,7 +152,7 @@ LoginLayout {
TextField{
id: configUrl
Layout.fillWidth: true
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
placeholderText: qsTr('Lien de configuration distante')
}
]
diff --git a/Linphone/view/Page/Form/Login/SIPLoginPage.qml b/Linphone/view/Page/Form/Login/SIPLoginPage.qml
index fd7deec24..8c170369e 100644
--- a/Linphone/view/Page/Form/Login/SIPLoginPage.qml
+++ b/Linphone/view/Page/Form/Login/SIPLoginPage.qml
@@ -14,16 +14,16 @@ LoginLayout {
titleContent: [
RowLayout {
- Layout.leftMargin: 119 * DefaultStyle.dp
+ Layout.leftMargin: 119 * mainWindow.dp
visible: !SettingsCpp.assistantHideThirdPartyAccount
- spacing: 21 * DefaultStyle.dp
+ spacing: 21 * mainWindow.dp
Button {
id: backButton
- Layout.preferredHeight: 24 * DefaultStyle.dp
- Layout.preferredWidth: 24 * DefaultStyle.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
background: Item {
anchors.fill: parent
}
@@ -35,16 +35,16 @@ LoginLayout {
Image {
fillMode: Image.PreserveAspectFit
source: AppIcons.profile
- Layout.preferredHeight: 34 * DefaultStyle.dp
- Layout.preferredWidth: 34 * DefaultStyle.dp
- sourceSize.width: 34 * DefaultStyle.dp
- sourceSize.height: 34 * DefaultStyle.dp
+ Layout.preferredHeight: 34 * mainWindow.dp
+ Layout.preferredWidth: 34 * mainWindow.dp
+ sourceSize.width: 34 * mainWindow.dp
+ sourceSize.height: 34 * mainWindow.dp
}
Text {
text: qsTr("Compte SIP tiers")
font {
- pixelSize: 36 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 36 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
scaleLettersFactor: 1.1
}
@@ -54,23 +54,23 @@ LoginLayout {
},
RowLayout {
visible: !SettingsCpp.assistantHideCreateAccount
- Layout.rightMargin: 51 * DefaultStyle.dp
- spacing: 20 * DefaultStyle.dp
+ Layout.rightMargin: 51 * mainWindow.dp
+ spacing: 20 * mainWindow.dp
Text {
- Layout.rightMargin: 15 * DefaultStyle.dp
+ Layout.rightMargin: 15 * mainWindow.dp
text: qsTr("Pas encore de compte ?")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
Button {
Layout.alignment: Qt.AlignRight
text: qsTr("S'inscrire")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
onClicked: {
console.debug("[SIPLoginPage] User: go to register page")
mainItem.goToRegister()
@@ -89,19 +89,19 @@ LoginLayout {
flickableDirection: Flickable.VerticalFlick
ColumnLayout {
id: content
- spacing: 85 * DefaultStyle.dp
+ spacing: 85 * mainWindow.dp
ColumnLayout {
spacing: 0
ColumnLayout {
- spacing: 28 * DefaultStyle.dp
+ spacing: 28 * mainWindow.dp
Text {
Layout.fillWidth: true
Layout.preferredWidth: rootStackView.width
wrapMode: Text.WordWrap
color: DefaultStyle.main2_900
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400* DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400* mainWindow.dp
}
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
color: DefaultStyle.main2_900
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400* DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400* mainWindow.dp
}
text:"Ces fonctionnalités sont cachées lorsque vous vous enregistrez avec un compte SIP tiers."
}
@@ -122,8 +122,8 @@ LoginLayout {
wrapMode: Text.WordWrap
color: DefaultStyle.main2_900
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400* DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400* mainWindow.dp
}
text: "Pour les activer dans un projet commercial, veuillez nous contacter. "
}
@@ -131,14 +131,14 @@ LoginLayout {
Button {
id: openLinkButton
Layout.alignment: Qt.AlignCenter
- Layout.topMargin: 18 * DefaultStyle.dp
+ Layout.topMargin: 18 * mainWindow.dp
text: "linphone.org/contact"
- textSize: 13 * DefaultStyle.dp
+ textSize: 13 * mainWindow.dp
inversedColors: true
- leftPadding: 12 * DefaultStyle.dp
- rightPadding: 12 * DefaultStyle.dp
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
+ leftPadding: 12 * mainWindow.dp
+ rightPadding: 12 * mainWindow.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
onClicked: {
Qt.openUrlExternally(ConstantsCpp.ContactUrl)
}
@@ -147,17 +147,17 @@ LoginLayout {
}
}
ColumnLayout {
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
Button {
id: createAccountButton
- // Layout.topMargin: 85 * DefaultStyle.dp
+ // Layout.topMargin: 85 * mainWindow.dp
Layout.fillWidth: true
inversedColors: true
text: qsTr("Créer un compte linphone")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
onClicked: {
console.debug("[SIPLoginPage] User: click register")
mainItem.goToRegister()
@@ -169,10 +169,10 @@ LoginLayout {
id: continueButton
Layout.fillWidth: true
text: qsTr("Je comprends")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
onClicked: {
rootStackView.replace(secondItem)
}
@@ -195,9 +195,9 @@ LoginLayout {
flickableDirection: Flickable.VerticalFlick
ColumnLayout {
id: content
- spacing: 2 * DefaultStyle.dp
+ spacing: 2 * mainWindow.dp
ColumnLayout {
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
FormItemLayout {
id: username
label: qsTr("Nom d'utilisateur")
@@ -206,7 +206,7 @@ LoginLayout {
contentItem: TextField {
id: usernameEdit
isError: username.errorTextVisible
- Layout.preferredWidth: 360 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
KeyNavigation.down: passwordEdit
}
}
@@ -219,7 +219,7 @@ LoginLayout {
id: passwordEdit
isError: password.errorTextVisible
hidden: true
- Layout.preferredWidth: 360 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
KeyNavigation.up: usernameEdit
KeyNavigation.down: domainEdit
}
@@ -233,7 +233,7 @@ LoginLayout {
id: domainEdit
isError: domain.errorTextVisible
initialText: SettingsCpp.assistantThirdPartySipAccountDomain
- Layout.preferredWidth: 360 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
KeyNavigation.up: passwordEdit
KeyNavigation.down: displayName
}
@@ -248,7 +248,7 @@ LoginLayout {
label: qsTr("Nom d'affichage")
contentItem: TextField {
id: displayName
- Layout.preferredWidth: 360 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
KeyNavigation.up: domainEdit
KeyNavigation.down: transportCbox
}
@@ -258,8 +258,8 @@ LoginLayout {
label: qsTr("Transport")
contentItem: ComboBox {
id: transportCbox
- height: 49 * DefaultStyle.dp
- width: 360 * DefaultStyle.dp
+ height: 49 * mainWindow.dp
+ width: 360 * mainWindow.dp
textRole: "text"
valueRole: "value"
model: [
@@ -291,11 +291,11 @@ LoginLayout {
Button {
id: connectionButton
- Layout.topMargin: 32 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ Layout.topMargin: 32 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
contentItem: StackLayout {
id: connectionButtonContent
currentIndex: 0
@@ -305,8 +305,8 @@ LoginLayout {
verticalAlignment: Text.AlignVCenter
font {
- pixelSize: 18 * DefaultStyle.dp
- weight: 600 * DefaultStyle.dp
+ pixelSize: 18 * mainWindow.dp
+ weight: 600 * mainWindow.dp
}
color: DefaultStyle.grey_0
}
@@ -370,18 +370,18 @@ LoginLayout {
anchors.top: parent.top
anchors.left: parent.left
anchors.bottom: parent.bottom
- anchors.topMargin: 70 * DefaultStyle.dp
- anchors.leftMargin: 127 * DefaultStyle.dp
- width: 361 * DefaultStyle.dp
+ anchors.topMargin: 70 * mainWindow.dp
+ anchors.leftMargin: 127 * mainWindow.dp
+ width: 361 * mainWindow.dp
},
Image {
z: -1
anchors.top: parent.top
anchors.right: parent.right
- anchors.topMargin: 129 * DefaultStyle.dp
- anchors.rightMargin: 127 * DefaultStyle.dp
- width: 395 * DefaultStyle.dp
- height: 350 * DefaultStyle.dp
+ anchors.topMargin: 129 * mainWindow.dp
+ anchors.rightMargin: 127 * mainWindow.dp
+ width: 395 * mainWindow.dp
+ height: 350 * mainWindow.dp
fillMode: Image.PreserveAspectFit
source: AppIcons.loginImage
}
diff --git a/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml b/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml
index f42821f97..5f8402945 100644
--- a/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml
+++ b/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml
@@ -23,7 +23,7 @@ FocusScope{
ColumnLayout {
anchors.fill: parent
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
ListView {
id: participantList
Layout.fillWidth: true
@@ -39,32 +39,32 @@ FocusScope{
}
}
delegate: FocusScope {
- height: 56 * DefaultStyle.dp
- width: participantList.width - scrollbar.implicitWidth - 12 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
+ width: participantList.width - scrollbar.implicitWidth - 12 * mainWindow.dp
RowLayout {
anchors.fill: parent
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData
}
Text {
property var nameObj: UtilsCpp.getDisplayName(modelData)
text: nameObj ? nameObj.value : ""
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
font.capitalization: Font.Capitalize
}
Item {
Layout.fillWidth: true
}
Button {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
background: Item{}
icon.source: AppIcons.closeX
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
focus: true
contentImageColor: DefaultStyle.main1_500_main
onClicked: suggestionList.removeSelectedContactByAddress(modelData)
@@ -79,15 +79,15 @@ FocusScope{
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- anchors.rightMargin: 8 * DefaultStyle.dp
+ anchors.rightMargin: 8 * mainWindow.dp
}
}
SearchBar {
id: searchbar
Layout.fillWidth: true
- Layout.topMargin: 6 * DefaultStyle.dp
- Layout.rightMargin: 28 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.topMargin: 6 * mainWindow.dp
+ Layout.rightMargin: 28 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
placeholderText: mainItem.placeHolderText
focus: participantList.count == 0
color: mainItem.searchBarColor
@@ -111,19 +111,19 @@ FocusScope{
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- anchors.rightMargin: 8 * DefaultStyle.dp
+ anchors.rightMargin: 8 * mainWindow.dp
}
ColumnLayout {
id: content
anchors.left: parent.left
anchors.right: parent.right
- anchors.rightMargin: contactsScrollBar.implicitWidth + 12 * DefaultStyle.dp
+ anchors.rightMargin: contactsScrollBar.implicitWidth + 12 * mainWindow.dp
Text {
- Layout.topMargin: 6 * DefaultStyle.dp
+ Layout.topMargin: 6 * mainWindow.dp
text: qsTr("Contacts")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
ContactListView {
@@ -131,7 +131,7 @@ FocusScope{
visible: contentHeight > 0 || searchbar.text.length > 0
Layout.fillWidth: true
// Layout.fillHeight: true
- Layout.topMargin: 8 * DefaultStyle.dp
+ Layout.topMargin: 8 * mainWindow.dp
Layout.preferredHeight: contentHeight
multiSelectionEnabled: true
contactMenuVisible: false
@@ -144,11 +144,11 @@ FocusScope{
Control.ScrollBar.vertical.visible: false
}
Text {
- Layout.topMargin: 6 * DefaultStyle.dp
+ Layout.topMargin: 6 * mainWindow.dp
text: qsTr("Suggestions")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
ContactListView {
diff --git a/Linphone/view/Page/Form/Meeting/MeetingForm.qml b/Linphone/view/Page/Form/Meeting/MeetingForm.qml
index fa7a23343..d26c2cd7b 100644
--- a/Linphone/view/Page/Form/Meeting/MeetingForm.qml
+++ b/Linphone/view/Page/Form/Meeting/MeetingForm.qml
@@ -16,7 +16,7 @@ FocusScope {
ColumnLayout {
id: formLayout
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
Connections {
target: mainItem.conferenceInfoGui.core
function onSchedulerStateChanged() {
@@ -38,24 +38,24 @@ FocusScope {
autoExclusive: true
contentImageColor: checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main
inversedColors: !checked
- topPadding: 10 * DefaultStyle.dp
- bottomPadding: 10 * DefaultStyle.dp
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
+ topPadding: 10 * mainWindow.dp
+ bottomPadding: 10 * mainWindow.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
contentItem: RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
imageSource: checkableButton.icon.source
colorizationColor: checkableButton.checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
}
Text {
text: checkableButton.text
color: checkableButton.checked ? DefaultStyle.grey_0 : DefaultStyle.main1_500_main
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -63,24 +63,24 @@ FocusScope {
RowLayout {
visible: mainItem.isCreation && !SettingsCpp.disableBroadcastFeature
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.bottomMargin: 20 * DefaultStyle.dp
- spacing: 18 * DefaultStyle.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.bottomMargin: 20 * mainWindow.dp
+ spacing: 18 * mainWindow.dp
CheckableButton {
- Layout.preferredWidth: 151 * DefaultStyle.dp
+ Layout.preferredWidth: 151 * mainWindow.dp
icon.source: AppIcons.usersThree
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
enabled: false
text: qsTr("Réunion")
checked: true
}
CheckableButton {
- Layout.preferredWidth: 151 * DefaultStyle.dp
+ Layout.preferredWidth: 151 * mainWindow.dp
enabled: false
icon.source: AppIcons.slide
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
text: qsTr("Broadcast")
}
}
@@ -88,20 +88,20 @@ FocusScope {
visible: mainItem.isCreation
spacing: formLayout.spacing
content: RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
imageSource: AppIcons.usersThree
colorizationColor: DefaultStyle.main2_600
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
TextInput {
id: confTitle
text: qsTr("Ajouter un titre")
color: DefaultStyle.main2_600
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
focus: true
onActiveFocusChanged: if(activeFocus) selectAll()
@@ -117,16 +117,16 @@ FocusScope {
EffectImage {
imageSource: AppIcons.clock
colorizationColor: DefaultStyle.main2_600
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
CalendarComboBox {
id: startDate
background.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.preferredHeight: 30 * DefaultStyle.dp
+ Layout.preferredHeight: 30 * mainWindow.dp
KeyNavigation.up: confTitle
KeyNavigation.down: startHour
onSelectedDateChanged: {
@@ -140,18 +140,18 @@ FocusScope {
},
RowLayout {
Item {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
RowLayout {
TimeComboBox {
id: startHour
indicator.visible: mainItem.isCreation
// Layout.fillWidth: true
- Layout.preferredWidth: 94 * DefaultStyle.dp
- Layout.preferredHeight: 30 * DefaultStyle.dp
+ Layout.preferredWidth: 94 * mainWindow.dp
+ Layout.preferredHeight: 30 * mainWindow.dp
background.visible: mainItem.isCreation
- contentText.font.weight: (isCreation ? 700 : 400) * DefaultStyle.dp
+ contentText.font.weight: (isCreation ? 700 : 400) * mainWindow.dp
KeyNavigation.up: startDate
KeyNavigation.down: timeZoneCbox
KeyNavigation.left: startDate
@@ -166,10 +166,10 @@ FocusScope {
TimeComboBox {
id: endHour
indicator.visible: mainItem.isCreation
- Layout.preferredWidth: 94 * DefaultStyle.dp
- Layout.preferredHeight: 30 * DefaultStyle.dp
+ Layout.preferredWidth: 94 * mainWindow.dp
+ Layout.preferredHeight: 30 * mainWindow.dp
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
}
Item {
@@ -181,8 +181,8 @@ FocusScope {
property int min: (durationSec - hour*3600)/60
text: (hour > 0 ? hour + "h" : "") + (min > 0 ? min + "mn" : "")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
}
@@ -190,12 +190,12 @@ FocusScope {
ComboBox {
id: timeZoneCbox
- Layout.preferredWidth: 307 * DefaultStyle.dp
- Layout.preferredHeight: 30 * DefaultStyle.dp
+ Layout.preferredWidth: 307 * mainWindow.dp
+ Layout.preferredHeight: 30 * mainWindow.dp
hoverEnabled: true
- listView.implicitHeight: 250 * DefaultStyle.dp
+ listView.implicitHeight: 250 * mainWindow.dp
constantImageSource: AppIcons.globe
- weight: 700 * DefaultStyle.dp
+ weight: 700 * mainWindow.dp
leftMargin: 0
currentIndex: mainItem.conferenceInfoGui ? model.getIndex(mainItem.conferenceInfoGui.core.timeZoneModel) : -1
background: Rectangle {
@@ -216,27 +216,27 @@ FocusScope {
Section {
spacing: formLayout.spacing
content: RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
imageSource: AppIcons.note
colorizationColor: DefaultStyle.main2_600
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
TextArea {
id: descriptionEdit
Layout.fillWidth: true
- Layout.preferredWidth: 275 * DefaultStyle.dp
- leftPadding: 8 * DefaultStyle.dp
- rightPadding: 8 * DefaultStyle.dp
+ Layout.preferredWidth: 275 * mainWindow.dp
+ leftPadding: 8 * mainWindow.dp
+ rightPadding: 8 * mainWindow.dp
hoverEnabled: true
placeholderText: qsTr("Ajouter une description")
placeholderTextColor: DefaultStyle.main2_600
- placeholderWeight: 700 * DefaultStyle.dp
+ placeholderWeight: 700 * mainWindow.dp
color: DefaultStyle.main2_600
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
onEditingFinished: mainItem.conferenceInfoGui.core.description = text
Keys.onPressed: (event)=> {
@@ -249,7 +249,7 @@ FocusScope {
background: Rectangle {
anchors.fill: parent
color: descriptionEdit.hovered || descriptionEdit.activeFocus ? DefaultStyle.grey_100 : "transparent"
- radius: 4 * DefaultStyle.dp
+ radius: 4 * mainWindow.dp
}
}
}
@@ -260,26 +260,26 @@ FocusScope {
Button {
id: addParticipantsButton
Layout.fillWidth: true
- Layout.preferredHeight: 30 * DefaultStyle.dp
+ Layout.preferredHeight: 30 * mainWindow.dp
background: Rectangle {
anchors.fill: parent
color: addParticipantsButton.hovered || addParticipantsButton.activeFocus ? DefaultStyle.grey_100 : "transparent"
- radius: 4 * DefaultStyle.dp
+ radius: 4 * mainWindow.dp
}
contentItem: RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
imageSource: AppIcons.usersThree
colorizationColor: DefaultStyle.main2_600
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
Text {
Layout.fillWidth: true
text: qsTr("Ajouter des participants")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
}
@@ -289,34 +289,34 @@ FocusScope {
id: participantList
Layout.fillWidth: true
Layout.preferredHeight: contentHeight
- Layout.maximumHeight: 250 * DefaultStyle.dp
+ Layout.maximumHeight: 250 * mainWindow.dp
clip: true
model: mainItem.conferenceInfoGui.core.participants
delegate: Item {
- height: 56 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
width: participantList.width
RowLayout {
anchors.fill: parent
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData.address
}
Text {
text: modelData.displayName
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
font.capitalization: Font.Capitalize
}
Item {
Layout.fillWidth: true
}
Button {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- Layout.rightMargin: 10 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ Layout.rightMargin: 10 * mainWindow.dp
background: Item{}
icon.source: AppIcons.closeX
contentImageColor: DefaultStyle.main1_500_main
@@ -334,7 +334,7 @@ FocusScope {
}
Item {
Layout.fillHeight: true
- Layout.minimumHeight: 1 * DefaultStyle.dp
+ Layout.minimumHeight: 1 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml b/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml
index 662d34586..1069a9f81 100644
--- a/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml
+++ b/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml
@@ -16,14 +16,14 @@ LoginLayout {
onCtrlIsPressedChanged: console.log("ctrl is pressed", ctrlIsPressed)
titleContent: [
RowLayout {
- spacing: 21 * DefaultStyle.dp
- Layout.leftMargin: 119 * DefaultStyle.dp
+ spacing: 21 * mainWindow.dp
+ Layout.leftMargin: 119 * mainWindow.dp
Button {
- Layout.preferredHeight: 24 * DefaultStyle.dp
- Layout.preferredWidth: 24 * DefaultStyle.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
background: Rectangle {
color: "transparent"
}
@@ -43,8 +43,8 @@ LoginLayout {
text = qsTr("Inscription | Confirmer votre ") + completeString
}
font {
- pixelSize: 36 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 36 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
scaleLettersFactor: 1.1
}
@@ -58,14 +58,14 @@ LoginLayout {
ColumnLayout {
anchors.left: parent.left
anchors.top: parent.top
- anchors.topMargin: 51 * DefaultStyle.dp
- anchors.leftMargin: 127 * DefaultStyle.dp
- spacing: 104 * DefaultStyle.dp
+ anchors.topMargin: 51 * mainWindow.dp
+ anchors.leftMargin: 127 * mainWindow.dp
+ spacing: 104 * mainWindow.dp
Text {
font {
bold: true
- pixelSize: 22 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
color: DefaultStyle.main2_700
text: {
@@ -74,7 +74,7 @@ LoginLayout {
}
}
RowLayout {
- spacing: 45 * DefaultStyle.dp
+ spacing: 45 * mainWindow.dp
Repeater {
model: 4
id: repeater
@@ -139,18 +139,18 @@ LoginLayout {
}
}
RowLayout {
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
Text {
text: "Didn't receive the code ?"
color: DefaultStyle.main2_700
- font.pixelSize: 14 * DefaultStyle.dp
- font.weight: 400 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
+ font.weight: 400 * mainWindow.dp
}
Button {
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
inversedColors: true
text: "Resend a code"
onClicked: {
@@ -162,10 +162,10 @@ LoginLayout {
Image {
anchors.top: parent.top
anchors.right: parent.right
- anchors.topMargin: 140 * DefaultStyle.dp
- anchors.rightMargin: 97 * DefaultStyle.dp
- width: 477 * DefaultStyle.dp
- height: 345 * DefaultStyle.dp
+ anchors.topMargin: 140 * mainWindow.dp
+ anchors.rightMargin: 97 * mainWindow.dp
+ width: 477 * mainWindow.dp
+ height: 345 * mainWindow.dp
fillMode: Image.PreserveAspectFit
source: AppIcons.verif_page_image
}
diff --git a/Linphone/view/Page/Form/Register/RegisterPage.qml b/Linphone/view/Page/Form/Register/RegisterPage.qml
index d4f1f3930..23b1674dc 100644
--- a/Linphone/view/Page/Form/Register/RegisterPage.qml
+++ b/Linphone/view/Page/Form/Register/RegisterPage.qml
@@ -29,8 +29,8 @@ LoginLayout {
titleContent: [
RowLayout {
- spacing: 21 * DefaultStyle.dp
- Layout.leftMargin: 119 * DefaultStyle.dp
+ spacing: 21 * mainWindow.dp
+ Layout.leftMargin: 119 * mainWindow.dp
Image {
fillMode: Image.PreserveAspectFit
source: AppIcons.profile
@@ -39,8 +39,8 @@ LoginLayout {
Layout.preferredWidth: width
text: qsTr("Inscription")
font {
- pixelSize: 36 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 36 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
wrapMode: Text.NoWrap
scaleLettersFactor: 1.1
@@ -50,22 +50,22 @@ LoginLayout {
Layout.fillWidth: true
},
RowLayout {
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 51 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 51 * mainWindow.dp
Text {
- Layout.rightMargin: 15 * DefaultStyle.dp
+ Layout.rightMargin: 15 * mainWindow.dp
color: DefaultStyle.main2_700
text: qsTr("Déjà un compte ?")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
Button {
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
text: qsTr("Connexion")
onClicked: {
console.debug("[RegisterPage] User: return")
@@ -80,45 +80,45 @@ LoginLayout {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
- anchors.topMargin: 51 * DefaultStyle.dp
- anchors.leftMargin: 127 * DefaultStyle.dp
- anchors.rightMargin: 127 * DefaultStyle.dp
- spacing: 50 * DefaultStyle.dp
+ anchors.topMargin: 51 * mainWindow.dp
+ anchors.leftMargin: 127 * mainWindow.dp
+ anchors.rightMargin: 127 * mainWindow.dp
+ spacing: 50 * mainWindow.dp
TabBar {
Layout.fillWidth: true
id: bar
model: [qsTr("Register with phone number"), qsTr("Register with email")]
}
ColumnLayout {
- spacing: 22 * DefaultStyle.dp
+ spacing: 22 * mainWindow.dp
ColumnLayout {
- spacing: 24 * DefaultStyle.dp
+ spacing: 24 * mainWindow.dp
RowLayout {
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
FormItemLayout {
id: usernameItem
label: qsTr("Username")
mandatory: true
contentItem: TextField {
id: usernameInput
- Layout.preferredWidth: 346 * DefaultStyle.dp
+ Layout.preferredWidth: 346 * mainWindow.dp
backgroundBorderColor: usernameItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
}
}
RowLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Layout.alignment: Qt.AlignBottom
ComboBox {
enabled: false
model: [{text:"@sip.linphone.org"}]
- Layout.preferredWidth: 210 * DefaultStyle.dp
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredWidth: 210 * mainWindow.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
}
EffectImage {
imageSource: AppIcons.lock
colorizationColor: DefaultStyle.main2_600
- Layout.preferredWidth: 16 * DefaultStyle.dp
- Layout.preferredHeight: 16 * DefaultStyle.dp
+ Layout.preferredWidth: 16 * mainWindow.dp
+ Layout.preferredHeight: 16 * mainWindow.dp
}
}
}
@@ -132,7 +132,7 @@ LoginLayout {
mandatory: true
placeholderText: "Phone number"
defaultCallingCode: "33"
- Layout.preferredWidth: 346 * DefaultStyle.dp
+ Layout.preferredWidth: 346 * mainWindow.dp
}
FormItemLayout {
id: emailItem
@@ -141,7 +141,7 @@ LoginLayout {
enableErrorText: true
contentItem: TextField {
id: emailInput
- Layout.preferredWidth: 346 * DefaultStyle.dp
+ Layout.preferredWidth: 346 * mainWindow.dp
backgroundBorderColor: emailItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
}
}
@@ -152,9 +152,9 @@ LoginLayout {
clip: false
RowLayout {
id: rowlayout
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
ColumnLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
FormItemLayout {
id: passwordItem
label: qsTr("Mot de passe")
@@ -163,13 +163,13 @@ LoginLayout {
contentItem: TextField {
id: pwdInput
hidden: true
- Layout.preferredWidth: 346 * DefaultStyle.dp
+ Layout.preferredWidth: 346 * mainWindow.dp
backgroundBorderColor: passwordItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
}
}
}
ColumnLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
FormItemLayout {
label: qsTr("Confirmation mot de passe")
mandatory: true
@@ -177,7 +177,7 @@ LoginLayout {
contentItem: TextField {
id: confirmPwdInput
hidden: true
- Layout.preferredWidth: 346 * DefaultStyle.dp
+ Layout.preferredWidth: 346 * mainWindow.dp
backgroundBorderColor: passwordItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
}
}
@@ -186,22 +186,22 @@ LoginLayout {
TemporaryText {
id: otherErrorText
Layout.fillWidth: true
- Layout.topMargin: 5 * DefaultStyle.dp
+ Layout.topMargin: 5 * mainWindow.dp
}
}
}
// ColumnLayout {
- // spacing: 18 * DefaultStyle.dp
+ // spacing: 18 * mainWindow.dp
// RowLayout {
- // spacing: 10 * DefaultStyle.dp
+ // spacing: 10 * mainWindow.dp
// CheckBox {
// id: subscribeToNewsletterCheckBox
// }
// Text {
// text: qsTr("Je souhaite souscrire à la newletter Linphone.")
// font {
- // pixelSize: 14 * DefaultStyle.dp
- // weight: 400 * DefaultStyle.dp
+ // pixelSize: 14 * mainWindow.dp
+ // weight: 400 * mainWindow.dp
// }
// MouseArea {
// anchors.fill: parent
@@ -211,7 +211,7 @@ LoginLayout {
// }
RowLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
CheckBox {
id: termsCheckBox
}
@@ -221,8 +221,8 @@ LoginLayout {
Text {
text: qsTr("J'accepte les ")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
MouseArea {
anchors.fill: parent
@@ -233,8 +233,8 @@ LoginLayout {
activeFocusOnTab: true
font {
underline: true
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
bold: activeFocus
}
text: qsTr("conditions d’utilisation")
@@ -255,16 +255,16 @@ LoginLayout {
Text {
text: qsTr(" et la ")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
Text {
activeFocusOnTab: true
font {
underline: true
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
bold: activeFocus
}
text: qsTr("politique de confidentialité.")
@@ -287,10 +287,10 @@ LoginLayout {
// }
Button {
enabled: termsCheckBox.checked
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
text: qsTr("Créer")
onClicked:{
if (usernameInput.text.length === 0) {
@@ -324,10 +324,10 @@ LoginLayout {
z: -1
anchors.top: parent.top
anchors.right: parent.right
- anchors.topMargin: 129 * DefaultStyle.dp
- anchors.rightMargin: 127 * DefaultStyle.dp
- width: 395 * DefaultStyle.dp
- height: 350 * DefaultStyle.dp
+ anchors.topMargin: 129 * mainWindow.dp
+ anchors.rightMargin: 127 * mainWindow.dp
+ width: 395 * mainWindow.dp
+ height: 350 * mainWindow.dp
fillMode: Image.PreserveAspectFit
source: AppIcons.loginImage
}
diff --git a/Linphone/view/Page/Form/Security/SecurityModePage.qml b/Linphone/view/Page/Form/Security/SecurityModePage.qml
index 1eefc77aa..9f3c80f05 100644
--- a/Linphone/view/Page/Form/Security/SecurityModePage.qml
+++ b/Linphone/view/Page/Form/Security/SecurityModePage.qml
@@ -16,28 +16,28 @@ LoginLayout {
Text {
text: qsTr("Choisir votre mode")
font {
- pixelSize: 36 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 36 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Text {
text: qsTr("Vous pourrez changer de mode plus tard.")
font.bold: true
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
}
centerContent: ColumnLayout {
- spacing: 80 * DefaultStyle.dp
+ spacing: 80 * mainWindow.dp
RowLayout {
id: radioButtonsLayout
Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
- spacing: 70 * DefaultStyle.dp
+ spacing: 70 * mainWindow.dp
Repeater {
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},
@@ -59,10 +59,10 @@ LoginLayout {
id: continueButton
property int selectedIndex: 0
Layout.alignment: Qt.AlignHCenter
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
- leftPadding: 100 * DefaultStyle.dp
- rightPadding: 100 * DefaultStyle.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
+ leftPadding: 100 * mainWindow.dp
+ rightPadding: 100 * mainWindow.dp
text: qsTr("Continuer")
onClicked: mainItem.modeSelected(selectedIndex)
}
diff --git a/Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml b/Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml
index 85501f7e0..e64093b3c 100644
--- a/Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml
+++ b/Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml
@@ -25,20 +25,20 @@ AbstractMainPage {
id: leftPanel
Layout.fillWidth: true
Layout.fillHeight: true
- property int sideMargin: 45 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ property int sideMargin: 45 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
RowLayout {
Layout.fillWidth: true
Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Button {
id: backButton
- Layout.preferredHeight: 24 * DefaultStyle.dp
- Layout.preferredWidth: 24 * DefaultStyle.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
focus: true
onClicked: {
mainItem.goBack()
@@ -62,7 +62,7 @@ AbstractMainPage {
Layout.fillWidth: true
Layout.fillHeight: true
model: mainItem.families
- Layout.topMargin: 41 * DefaultStyle.dp
+ Layout.topMargin: 41 * mainWindow.dp
Layout.leftMargin: leftPanel.sideMargin
property int selectedIndex: 0
activeFocusOnTab: true
diff --git a/Linphone/view/Page/Layout/Login/LoginLayout.qml b/Linphone/view/Page/Layout/Login/LoginLayout.qml
index 84424f0fa..291c08a2c 100644
--- a/Linphone/view/Page/Layout/Login/LoginLayout.qml
+++ b/Linphone/view/Page/Layout/Login/LoginLayout.qml
@@ -14,7 +14,7 @@ Rectangle {
property alias centerContent : centerLayout.children
color: DefaultStyle.grey_0
ColumnLayout {
- // anchors.leftMargin: 119 * DefaultStyle.dp
+ // anchors.leftMargin: 119 * mainWindow.dp
id: contentLayout
// anchors.top: parent.top
// anchors.left: parent.left
@@ -24,8 +24,8 @@ Rectangle {
spacing: 0
RowLayout {
Layout.fillWidth: true
- Layout.preferredHeight: 102 * DefaultStyle.dp
- Layout.rightMargin: 42 * DefaultStyle.dp
+ Layout.preferredHeight: 102 * mainWindow.dp
+ Layout.rightMargin: 42 * mainWindow.dp
spacing: 0
Item {
Layout.fillWidth: true
@@ -33,12 +33,12 @@ Rectangle {
Button {
id: aboutButton
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
icon.source: AppIcons.info
text: qsTr("À propos")
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main
onClicked: console.debug("[LoginLayout]User: open about popup")
@@ -48,7 +48,7 @@ Rectangle {
RowLayout {
id: titleLayout
- Layout.preferredHeight: 131 * DefaultStyle.dp
+ Layout.preferredHeight: 131 * mainWindow.dp
Layout.fillWidth: true
spacing: 0
}
@@ -63,7 +63,7 @@ Rectangle {
source: AppIcons.belledonne
fillMode: Image.Stretch
Layout.fillWidth: true
- Layout.preferredHeight: 108 * DefaultStyle.dp
+ Layout.preferredHeight: 108 * mainWindow.dp
}
}
diff --git a/Linphone/view/Page/Layout/Main/MainLayout.qml b/Linphone/view/Page/Layout/Main/MainLayout.qml
index e6c66ad8e..c8f026424 100644
--- a/Linphone/view/Page/Layout/Main/MainLayout.qml
+++ b/Linphone/view/Page/Layout/Main/MainLayout.qml
@@ -108,12 +108,12 @@ Item {
RowLayout {
anchors.fill: parent
spacing: 0
- anchors.topMargin: 25 * DefaultStyle.dp
+ anchors.topMargin: 25 * mainWindow.dp
VerticalTabBar {
id: tabbar
Layout.fillHeight: true
- Layout.preferredWidth: 82 * DefaultStyle.dp
+ Layout.preferredWidth: 82 * mainWindow.dp
defaultAccount: accountProxy.defaultAccount
currentIndex: SettingsCpp.getLastActiveTabIndex()
Binding on currentIndex {
@@ -145,10 +145,10 @@ Item {
RowLayout {
id: topRow
- Layout.preferredHeight: 50 * DefaultStyle.dp
- Layout.leftMargin: 45 * DefaultStyle.dp
- Layout.rightMargin: 41 * DefaultStyle.dp
- spacing: 25 * DefaultStyle.dp
+ Layout.preferredHeight: 50 * mainWindow.dp
+ Layout.leftMargin: 45 * mainWindow.dp
+ Layout.rightMargin: 41 * mainWindow.dp
+ spacing: 25 * mainWindow.dp
SearchBar {
id: magicSearchBar
Layout.fillWidth: true
@@ -172,18 +172,18 @@ Item {
component MagicSearchButton: Button {
id: button
- width: 45 * DefaultStyle.dp
- height: 45 * DefaultStyle.dp
- topPadding: 16 * DefaultStyle.dp
- bottomPadding: 16 * DefaultStyle.dp
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
+ width: 45 * mainWindow.dp
+ height: 45 * mainWindow.dp
+ topPadding: 16 * mainWindow.dp
+ bottomPadding: 16 * mainWindow.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
contentImageColor: DefaultStyle.main2_500main
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
background: Rectangle {
anchors.fill: parent
- radius: 40 * DefaultStyle.dp
+ radius: 40 * mainWindow.dp
color: DefaultStyle.main2_200
}
}
@@ -191,21 +191,21 @@ Item {
Popup {
id: listPopup
width: magicSearchBar.width
- property int maxHeight: 400 * DefaultStyle.dp
+ property int maxHeight: 400 * mainWindow.dp
property bool displayScrollbar: contactList.contentHeight + topPadding + bottomPadding> maxHeight
height: Math.min(contactList.contentHeight + topPadding + bottomPadding, maxHeight)
y: magicSearchBar.height
// closePolicy: Popup.NoAutoClose
- topPadding: 20 * DefaultStyle.dp
- bottomPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
+ topPadding: 20 * mainWindow.dp
+ bottomPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
background: Item {
anchors.fill: parent
Rectangle {
id: popupBg
- radius: 16 * DefaultStyle.dp
+ radius: 16 * mainWindow.dp
color: DefaultStyle.grey_0
anchors.fill: parent
border.color: DefaultStyle.main1_500_main
@@ -222,14 +222,14 @@ Item {
}
ScrollBar {
id: scrollbar
- Component.onCompleted: x = -10 * DefaultStyle.dp
+ Component.onCompleted: x = -10 * mainWindow.dp
policy: Control.ScrollBar.AsNeeded// Don't work as expected
visible: listPopup.displayScrollbar
interactive: true
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- anchors.margins: 10 * DefaultStyle.dp
+ anchors.margins: 10 * mainWindow.dp
}
}
@@ -238,7 +238,7 @@ Item {
visible: magicSearchBar.text.length != 0
Layout.preferredHeight: contentHeight
Layout.fillWidth: true
- Layout.rightMargin: 5 * DefaultStyle.dp
+ Layout.rightMargin: 5 * mainWindow.dp
initialHeadersVisible: false
contactMenuVisible: false
actionLayoutVisible: true
@@ -267,8 +267,8 @@ Item {
text: qsTr("Contact")
color: DefaultStyle.main2_500main
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
footer: FocusScope{
@@ -286,15 +286,15 @@ Item {
ColumnLayout {
id: content
anchors.fill: parent
- anchors.rightMargin: 5 * DefaultStyle.dp
+ anchors.rightMargin: 5 * mainWindow.dp
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Text {
text: qsTr("Suggestion")
color: DefaultStyle.main2_500main
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
@@ -310,18 +310,18 @@ Item {
}
RowLayout {
id: suggestionRow
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
_address: magicSearchBar.text
}
Text {
property var urlObj: UtilsCpp.interpretUrl(magicSearchBar.text)
text: urlObj?.value
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
Item {
@@ -329,8 +329,8 @@ Item {
}
MagicSearchButton {
id: callButton
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
icon.source: AppIcons.phone
focus: true
onClicked: {
@@ -343,8 +343,8 @@ Item {
MagicSearchButton {
id: chatButton
visible: !SettingsCpp.disableChatFeature
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
icon.source: AppIcons.chatTeardropText
KeyNavigation.right: callButton
KeyNavigation.left: callButton
@@ -356,28 +356,28 @@ Item {
}
}
RowLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
PopupButton {
id: deactivateDndButton
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
- popup.padding: 14 * DefaultStyle.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
+ popup.padding: 14 * mainWindow.dp
visible: SettingsCpp.dnd
contentItem: EffectImage {
imageSource: AppIcons.bellDnd
- width: 32 * DefaultStyle.dp
- height: 32 * DefaultStyle.dp
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ width: 32 * mainWindow.dp
+ height: 32 * mainWindow.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.main1_500_main
}
popup.contentItem: ColumnLayout {
IconLabelButton {
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true
focus: visible
- iconSize: 32 * DefaultStyle.dp
+ iconSize: 32 * mainWindow.dp
text: qsTr("Désactiver ne pas déranger")
iconSource: AppIcons.bellDnd
onClicked: {
@@ -389,8 +389,8 @@ Item {
}
Voicemail {
id: voicemail
- Layout.preferredWidth: 27 * DefaultStyle.dp
- Layout.preferredHeight: 28 * DefaultStyle.dp
+ Layout.preferredWidth: 27 * mainWindow.dp
+ Layout.preferredHeight: 28 * mainWindow.dp
function cumulatedVoicemailCount() {
var count = 0
@@ -413,9 +413,9 @@ Item {
}
PopupButton {
id: avatarButton
- Layout.preferredWidth: 54 * DefaultStyle.dp
+ Layout.preferredWidth: 54 * mainWindow.dp
Layout.preferredHeight: width
- popup.padding: 14 * DefaultStyle.dp
+ popup.padding: 14 * mainWindow.dp
contentItem: Avatar {
id: avatar
height: avatarButton.height
@@ -435,10 +435,10 @@ Item {
}
PopupButton {
id: settingsMenuButton
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- popup.width: 271 * DefaultStyle.dp
- popup.padding: 14 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ popup.width: 271 * mainWindow.dp
+ popup.padding: 14 * mainWindow.dp
popup.contentItem: FocusScope {
id: popupFocus
implicitHeight: settingsButtons.implicitHeight
@@ -451,7 +451,7 @@ Item {
ColumnLayout {
id: settingsButtons
anchors.fill: parent
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
function getPreviousItem(index){
if(visibleChildren.length == 0) return null
@@ -473,11 +473,11 @@ Item {
IconLabelButton {
id: accountButton
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true
visible: !SettingsCpp.hideAccountSettings
focus: visible
- iconSize: 32 * DefaultStyle.dp
+ iconSize: 32 * mainWindow.dp
text: qsTr("Mon compte")
iconSource: AppIcons.manageProfile
onClicked: openAccountSettings(accountProxy.defaultAccount ? accountProxy.defaultAccount : accountProxy.firstAccount())
@@ -486,9 +486,9 @@ Item {
}
IconLabelButton {
id: dndButton
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
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")
iconSource: AppIcons.bellDnd
onClicked: {
@@ -500,11 +500,11 @@ Item {
}
IconLabelButton {
id: settingsButton
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true
visible: !SettingsCpp.hideSettings
focus: !accountButton.visible && visible
- iconSize: 32 * DefaultStyle.dp
+ iconSize: 32 * mainWindow.dp
text: qsTr("Paramètres")
iconSource: AppIcons.settings
onClicked: openContextualMenuComponent(settingsPageComponent)
@@ -513,11 +513,11 @@ Item {
}
IconLabelButton {
id: recordsButton
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true
visible: !SettingsCpp.disableCallRecordings
focus: !accountButton.visible && !settingsButton.visible && visible
- iconSize: 32 * DefaultStyle.dp
+ iconSize: 32 * mainWindow.dp
text: qsTr("Enregistrements")
iconSource: AppIcons.micro
KeyNavigation.up: visibleChildren.length != 0 ? settingsButtons.getPreviousItem(2) : null
@@ -525,9 +525,9 @@ Item {
}
IconLabelButton {
id: helpButton
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true
- iconSize: 32 * DefaultStyle.dp
+ iconSize: 32 * mainWindow.dp
focus: !accountButton.visible && !settingsButton.visible && !recordsButton.visible
text: qsTr("Aide")
iconSource: AppIcons.question
@@ -537,10 +537,10 @@ Item {
}
IconLabelButton {
id: quitButton
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true
focus: !accountButton.visible && !settingsButton.visible && visible
- iconSize: 32 * DefaultStyle.dp
+ iconSize: 32 * mainWindow.dp
text: qsTr("Quitter Linphone")
iconSource: AppIcons.power
onClicked: {
@@ -561,16 +561,16 @@ Item {
}
Rectangle {
Layout.fillWidth: true
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
visible: addAccountButton.visible
color: DefaultStyle.main2_400
}
IconLabelButton {
id: addAccountButton
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.fillWidth: true
visible: SettingsCpp.maxAccount == 0 || SettingsCpp.maxAccount > accountProxy.count
- iconSize: 32 * DefaultStyle.dp
+ iconSize: 32 * mainWindow.dp
text: qsTr("Ajouter un compte")
iconSource: AppIcons.plusCircle
onClicked: mainItem.addAccountRequest()
@@ -646,7 +646,7 @@ Item {
pushExit: noTransition
popEnter: noTransition
popExit: noTransition
- Layout.topMargin: 24 * DefaultStyle.dp
+ Layout.topMargin: 24 * mainWindow.dp
Layout.fillWidth: true
Layout.fillHeight: true
initialItem: mainStackLayoutComponent
diff --git a/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml
index 1396b7949..d2e612451 100644
--- a/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml
@@ -19,10 +19,10 @@ Rectangle {
Control.ScrollView {
id: scrollView
height: parent.height
- width: parent.width - 2 * 45 * DefaultStyle.dp
+ width: parent.width - 2 * 45 * mainWindow.dp
anchors.centerIn: parent
- contentHeight: content.height + 20 * DefaultStyle.dp
- contentWidth: parent.width - 2 * 45 * DefaultStyle.dp
+ contentHeight: content.height + 20 * mainWindow.dp
+ contentWidth: parent.width - 2 * 45 * mainWindow.dp
Control.ScrollBar.vertical: ScrollBar {
active: scrollView.contentHeight > container.height
interactive: true
@@ -30,7 +30,7 @@ Rectangle {
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- anchors.rightMargin: -15 * DefaultStyle.dp
+ anchors.rightMargin: -15 * mainWindow.dp
}
Control.ScrollBar.horizontal: ScrollBar {
active: false
@@ -38,21 +38,21 @@ Rectangle {
ColumnLayout {
id: content
width: parent.width
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
RowLayout {
Layout.fillWidth: true
- Layout.topMargin: 20 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Button {
id: backButton
- Layout.preferredHeight: 24 * DefaultStyle.dp
- Layout.preferredWidth: 24 * DefaultStyle.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
focus: true
visible: mainItem.container.depth > 1
- Layout.rightMargin: 41 * DefaultStyle.dp
+ Layout.rightMargin: 41 * mainWindow.dp
onClicked: {
mainItem.container.pop()
}
@@ -71,13 +71,13 @@ Rectangle {
Loader {
Layout.alignment: Qt.AlignRight
sourceComponent: mainItem.topbarOptionalComponent
- Layout.rightMargin: 34 * DefaultStyle.dp
+ Layout.rightMargin: 34 * mainWindow.dp
}
}
Rectangle {
Layout.fillWidth: true
- Layout.topMargin: 16 * DefaultStyle.dp
- height: 1 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main
}
Loader {
diff --git a/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml
index ac7053a8f..c455cac12 100644
--- a/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml
@@ -15,18 +15,18 @@ AbstractSettingsLayout {
id: content
ColumnLayout {
width: parent.width
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Détails")
@@ -48,23 +48,23 @@ AbstractSettingsLayout {
}
ColumnLayout {
Layout.fillWidth: true
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
Avatar {
account: model
displayPresence: false
- Layout.preferredWidth: 100 * DefaultStyle.dp
- Layout.preferredHeight: 100 * DefaultStyle.dp
+ Layout.preferredWidth: 100 * mainWindow.dp
+ Layout.preferredHeight: 100 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
}
IconLabelButton {
visible: model.core.pictureUri.length === 0
Layout.preferredWidth: width
- Layout.preferredHeight: 17 * DefaultStyle.dp
+ Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.camera
- iconSize: 17 * DefaultStyle.dp
+ iconSize: 17 * mainWindow.dp
text: qsTr("Ajouter une image")
onClicked: fileDialog.open()
Layout.alignment: Qt.AlignHCenter
@@ -73,21 +73,21 @@ AbstractSettingsLayout {
RowLayout {
visible: model.core.pictureUri.length > 0
Layout.alignment: Qt.AlignHCenter
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
IconLabelButton {
Layout.preferredWidth: width
- Layout.preferredHeight: 17 * DefaultStyle.dp
+ Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.pencil
- iconSize: 17 * DefaultStyle.dp
+ iconSize: 17 * mainWindow.dp
text: qsTr("Modifier l'image")
color: DefaultStyle.main2_600
onClicked: fileDialog.open()
}
IconLabelButton {
Layout.preferredWidth: width
- Layout.preferredHeight: 17 * DefaultStyle.dp
+ Layout.preferredHeight: 17 * mainWindow.dp
iconSource: AppIcons.trashCan
- iconSize: 17 * DefaultStyle.dp
+ iconSize: 17 * mainWindow.dp
text: qsTr("Supprimer l'image")
color: DefaultStyle.main2_600
onClicked: model.core.pictureUri = ""
@@ -105,7 +105,7 @@ AbstractSettingsLayout {
}
RowLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.alignment: Qt.AlignLeft
text: qsTr("Adresse SIP :")
@@ -123,16 +123,16 @@ AbstractSettingsLayout {
}
IconLabelButton {
Layout.alignment: Qt.AlignRight
- Layout.preferredWidth: 20 * DefaultStyle.dp
- Layout.preferredHeight: 20 * DefaultStyle.dp
- iconSize: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 20 * mainWindow.dp
+ Layout.preferredHeight: 20 * mainWindow.dp
+ iconSize: 24 * mainWindow.dp
iconSource: AppIcons.copy
color: DefaultStyle.main2_600
onClicked: UtilsCpp.copyToClipboard(model.core.identityAddress)
}
}
ColumnLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Layout.alignment: Qt.AlignLeft
Text {
text: qsTr("Nom d’affichage")
@@ -148,7 +148,7 @@ AbstractSettingsLayout {
TextField {
Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
initialText: model.core.displayName
backgroundColor: DefaultStyle.grey_100
onEditingFinished: {
@@ -163,7 +163,7 @@ AbstractSettingsLayout {
}
ComboSetting {
Layout.fillWidth: true
- Layout.topMargin: -15 * DefaultStyle.dp
+ Layout.topMargin: -15 * mainWindow.dp
entries: account.core.dialPlans
propertyName: "dialPlan"
propertyOwner: account.core
@@ -176,9 +176,9 @@ AbstractSettingsLayout {
}
RowLayout {
id:mainItem
- spacing : 20 * DefaultStyle.dp
+ spacing : 20 * mainWindow.dp
ColumnLayout {
- spacing : 5 * DefaultStyle.dp
+ spacing : 5 * mainWindow.dp
Text {
text: qsTr("Supprimer mon compte")
font: Typography.p2l
@@ -200,17 +200,17 @@ AbstractSettingsLayout {
Button {
background: Item{}
Layout.alignment: Qt.AlignRight
- Layout.rightMargin: 5 * DefaultStyle.dp
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.rightMargin: 5 * mainWindow.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
contentItem: RowLayout {
Layout.alignment: Qt.AlignRight
EffectImage {
imageSource: AppIcons.trashCan
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.danger_500main
}
@@ -233,22 +233,22 @@ AbstractSettingsLayout {
}
Rectangle {
Layout.fillWidth: true
- Layout.topMargin: 16 * DefaultStyle.dp
- height: 1 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main
}
RowLayout {
Layout.fillWidth: true
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Vos appareils")
@@ -271,22 +271,22 @@ AbstractSettingsLayout {
RoundedPane {
Layout.fillWidth: 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.rightMargin: 30 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.bottomMargin: 4 * DefaultStyle.dp
- Layout.leftMargin: 44 * DefaultStyle.dp
- topPadding: 21 * DefaultStyle.dp
- bottomPadding: 21 * DefaultStyle.dp
- leftPadding: 17 * DefaultStyle.dp
- rightPadding: 17 * 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 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.bottomMargin: 4 * mainWindow.dp
+ Layout.leftMargin: 44 * mainWindow.dp
+ topPadding: 21 * mainWindow.dp
+ bottomPadding: 21 * mainWindow.dp
+ leftPadding: 17 * mainWindow.dp
+ rightPadding: 17 * mainWindow.dp
background: Rectangle {
anchors.fill: parent
color: DefaultStyle.grey_100
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
}
contentItem: ColumnLayout {
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
Repeater {
id: devices
model: AccountDeviceProxy {
@@ -295,25 +295,25 @@ AbstractSettingsLayout {
}
Control.Control{
Layout.fillWidth: true
- height: 133 * DefaultStyle.dp
- topPadding: 26 * DefaultStyle.dp
- bottomPadding: 26 * DefaultStyle.dp
- rightPadding: 36 * DefaultStyle.dp
- leftPadding: 33 * DefaultStyle.dp
+ height: 133 * mainWindow.dp
+ topPadding: 26 * mainWindow.dp
+ bottomPadding: 26 * mainWindow.dp
+ rightPadding: 36 * mainWindow.dp
+ leftPadding: 33 * mainWindow.dp
background: Rectangle {
anchors.fill: parent
color: DefaultStyle.grey_0
- radius: 10 * DefaultStyle.dp
+ radius: 10 * mainWindow.dp
}
contentItem: ColumnLayout {
width: parent.width
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
RowLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
EffectImage {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.main2_600
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
text: qsTr("Supprimer")
icon.source: AppIcons.trashCan
- icon.width: 16 * DefaultStyle.dp
- icon.height: 16 * DefaultStyle.dp
+ icon.width: 16 * mainWindow.dp
+ icon.height: 16 * mainWindow.dp
contentImageColor: DefaultStyle.main1_500_main
onClicked: {
var mainWin = UtilsCpp.getMainWindow()
@@ -347,15 +347,15 @@ AbstractSettingsLayout {
}
}
RowLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Text {
text: qsTr("Dernière connexion:")
color: DefaultStyle.main2_600
font: Typography.p2
}
EffectImage {
- Layout.preferredWidth: 20 * DefaultStyle.dp
- Layout.preferredHeight: 20 * DefaultStyle.dp
+ Layout.preferredWidth: 20 * mainWindow.dp
+ Layout.preferredHeight: 20 * mainWindow.dp
imageSource: AppIcons.calendar
colorizationColor: DefaultStyle.main2_600
fillMode: Image.PreserveAspectFit
@@ -366,8 +366,8 @@ AbstractSettingsLayout {
font: Typography.p1
}
EffectImage {
- Layout.preferredWidth: 20 * DefaultStyle.dp
- Layout.preferredHeight: 20 * DefaultStyle.dp
+ Layout.preferredWidth: 20 * mainWindow.dp
+ Layout.preferredHeight: 20 * mainWindow.dp
imageSource: AppIcons.clock
colorizationColor: DefaultStyle.main2_600
fillMode: Image.PreserveAspectFit
diff --git a/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml b/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
index 65dfb9a19..c654ed75e 100644
--- a/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
@@ -15,18 +15,18 @@ AbstractSettingsLayout {
id: content
ColumnLayout {
width: parent.width
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Paramètres")
@@ -42,10 +42,10 @@ AbstractSettingsLayout {
ColumnLayout {
id: column
Layout.fillWidth: true
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
DecoratedTextField {
propertyName: "mwiServerAddress"
propertyOwner: account.core
@@ -61,21 +61,21 @@ AbstractSettingsLayout {
}
Rectangle {
Layout.fillWidth: true
- Layout.topMargin: 16 * DefaultStyle.dp
- height: 1 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main
}
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Paramètres avancés")
@@ -90,10 +90,10 @@ AbstractSettingsLayout {
}
ColumnLayout {
Layout.fillWidth: true
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
Text {
text: qsTr("Transport")
color: DefaultStyle.main2_600
@@ -101,7 +101,7 @@ AbstractSettingsLayout {
}
ComboSetting {
Layout.fillWidth: true
- Layout.topMargin: -15 * DefaultStyle.dp
+ Layout.topMargin: -15 * mainWindow.dp
entries: account.core.transports
propertyName: "transport"
propertyOwner: account.core
diff --git a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
index ac94057d1..b192174a5 100644
--- a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
@@ -13,18 +13,18 @@ AbstractSettingsLayout {
id: content
ColumnLayout {
width: parent.width
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Configuration distante")
@@ -39,10 +39,10 @@ AbstractSettingsLayout {
}
ColumnLayout {
Layout.fillWidth: true
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
DecoratedTextField {
Layout.fillWidth: true
id: configUri
@@ -64,22 +64,22 @@ AbstractSettingsLayout {
}
Rectangle {
Layout.fillWidth: true
- Layout.topMargin: 35 * DefaultStyle.dp
- Layout.bottomMargin: 9 * DefaultStyle.dp
- height: 1 * DefaultStyle.dp
+ Layout.topMargin: 35 * mainWindow.dp
+ Layout.bottomMargin: 9 * mainWindow.dp
+ height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main
}
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Codecs Audio")
@@ -94,10 +94,10 @@ AbstractSettingsLayout {
}
ColumnLayout {
Layout.fillWidth: true
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
Repeater {
model: PayloadTypeProxy {
family: PayloadTypeCore.Audio
@@ -114,22 +114,22 @@ AbstractSettingsLayout {
}
Rectangle {
Layout.fillWidth: true
- Layout.topMargin: 35 * DefaultStyle.dp
- Layout.bottomMargin: 9 * DefaultStyle.dp
- height: 1 * DefaultStyle.dp
+ Layout.topMargin: 35 * mainWindow.dp
+ Layout.bottomMargin: 9 * mainWindow.dp
+ height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main
}
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Codecs Vidéo")
@@ -144,10 +144,10 @@ AbstractSettingsLayout {
}
ColumnLayout {
Layout.fillWidth: true
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
Repeater {
model: PayloadTypeProxy {
family: PayloadTypeCore.Video
@@ -164,19 +164,19 @@ AbstractSettingsLayout {
}
Rectangle {
Layout.fillWidth: true
- Layout.topMargin: 35 * DefaultStyle.dp
- Layout.bottomMargin: 9 * DefaultStyle.dp
- height: 1 * DefaultStyle.dp
+ Layout.topMargin: 35 * mainWindow.dp
+ Layout.bottomMargin: 9 * mainWindow.dp
+ height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main
}
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Item {
- Layout.preferredWidth: 341 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
}
SwitchSetting {
- Layout.rightMargin: 44 * DefaultStyle.dp
+ Layout.rightMargin: 44 * mainWindow.dp
titleText:qsTr("Cacher les FPS")
propertyName: "hideFps"
propertyOwner: SettingsCpp
diff --git a/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml
index 1d5a1461a..2e90b0f57 100644
--- a/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml
@@ -12,16 +12,16 @@ AbstractSettingsLayout {
id: content
ColumnLayout {
RowLayout {
- spacing: 47 * DefaultStyle.dp
+ spacing: 47 * mainWindow.dp
ColumnLayout {
Item {
- Layout.preferredWidth: 341 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
}
}
ColumnLayout {
- Layout.rightMargin: 25 * DefaultStyle.dp
- Layout.topMargin: 36 * DefaultStyle.dp
- spacing: 20 * DefaultStyle.dp
+ Layout.rightMargin: 25 * mainWindow.dp
+ Layout.topMargin: 36 * mainWindow.dp
+ spacing: 20 * mainWindow.dp
SwitchSetting {
titleText: qsTr("Annulateur d'écho")
subTitleText: qsTr("Évite que de l'écho soit entendu par votre correspondant")
@@ -40,16 +40,16 @@ AbstractSettingsLayout {
}
Rectangle {
Layout.fillWidth: true
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_500main
- Layout.topMargin: 38 * DefaultStyle.dp
- Layout.bottomMargin: 16 * DefaultStyle.dp
+ Layout.topMargin: 38 * mainWindow.dp
+ Layout.bottomMargin: 16 * mainWindow.dp
}
RowLayout {
- spacing: 47 * DefaultStyle.dp
+ spacing: 47 * mainWindow.dp
ColumnLayout {
Item {
- Layout.preferredWidth: 341 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
Text {
id: periphTitle
text: qsTr("Périphériques")
@@ -59,7 +59,7 @@ AbstractSettingsLayout {
}
Text {
anchors.top: periphTitle.bottom
- anchors.topMargin: 3 * DefaultStyle.dp
+ anchors.topMargin: 3 * mainWindow.dp
anchors.left: parent.left
anchors.right: parent.right
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 {
ringerDevicesVisible: true
backgroundVisible: false
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Page/Layout/Settings/CarddavSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/CarddavSettingsLayout.qml
index a1ae1e0ea..5be635a02 100644
--- a/Linphone/view/Page/Layout/Settings/CarddavSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/CarddavSettingsLayout.qml
@@ -16,12 +16,12 @@ AbstractSettingsLayout {
Component {
id: topBar
RowLayout {
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
Button {
background: Item{}
icon.source: AppIcons.trashCan
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
contentImageColor: DefaultStyle.main2_600
visible: !isNew
onClicked: {
@@ -64,18 +64,18 @@ AbstractSettingsLayout {
id: content
ColumnLayout {
width: parent.width
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Carnet d'adresse CardDAV")
@@ -97,10 +97,10 @@ AbstractSettingsLayout {
}
ColumnLayout {
Layout.fillWidth: true
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
DecoratedTextField {
propertyName: "displayName"
propertyOwner: carddavGui.core
diff --git a/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml
index 269e0b5d5..c245b81ae 100644
--- a/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml
@@ -17,7 +17,7 @@ AbstractSettingsLayout {
Component {
id: content
ColumnLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ContactsSettingsProviderLayout {
title: qsTr("Annuaires LDAP")
addText: qsTr("Ajouter un annuaire LDAP")
@@ -33,9 +33,9 @@ AbstractSettingsLayout {
}
Rectangle {
Layout.fillWidth: true
- Layout.topMargin: 35 * DefaultStyle.dp
- Layout.bottomMargin: 9 * DefaultStyle.dp
- height: 1 * DefaultStyle.dp
+ Layout.topMargin: 35 * mainWindow.dp
+ Layout.bottomMargin: 9 * mainWindow.dp
+ height: 1 * mainWindow.dp
color: DefaultStyle.main2_500main
}
ContactsSettingsProviderLayout {
diff --git a/Linphone/view/Page/Layout/Settings/ContactsSettingsProviderLayout.qml b/Linphone/view/Page/Layout/Settings/ContactsSettingsProviderLayout.qml
index 700bfd051..2f2594bf2 100644
--- a/Linphone/view/Page/Layout/Settings/ContactsSettingsProviderLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/ContactsSettingsProviderLayout.qml
@@ -20,14 +20,14 @@ RowLayout {
property bool supportsEnableDisable
property bool showAddButton
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
text: mainItem.title
font: Typography.h4
@@ -48,25 +48,25 @@ RowLayout {
}
}
ColumnLayout {
- Layout.rightMargin: 25 * DefaultStyle.dp
+ Layout.rightMargin: 25 * mainWindow.dp
Layout.fillWidth: true
Layout.fillHeight: true
- spacing: 27 * DefaultStyle.dp
- Layout.leftMargin: 76 * DefaultStyle.dp
- Layout.topMargin: 16 * DefaultStyle.dp
+ spacing: 27 * mainWindow.dp
+ Layout.leftMargin: 76 * mainWindow.dp
+ Layout.topMargin: 16 * mainWindow.dp
Repeater {
model: mainItem.proxyModel
RowLayout {
Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft|Qt.AlignHCenter
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Text {
text: modelData.core[titleProperty]
font: Typography.p2l
wrapMode: Text.WordWrap
color: DefaultStyle.main2_600
Layout.fillWidth: true
- Layout.leftMargin: 17 * DefaultStyle.dp
+ Layout.leftMargin: 17 * mainWindow.dp
}
Item {
Layout.fillWidth: true
@@ -74,8 +74,8 @@ RowLayout {
Button {
background: Item{}
icon.source: AppIcons.pencil
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
contentImageColor: DefaultStyle.main2_600
onClicked: {
mainItem.owner.container.push(mainItem.settingsLayout, {
@@ -88,7 +88,7 @@ RowLayout {
Switch {
id: switchButton
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
- Layout.rightMargin: 17 * DefaultStyle.dp
+ Layout.rightMargin: 17 * mainWindow.dp
checked: supportsEnableDisable && modelData.core["enabled"]
visible: supportsEnableDisable
onToggled: {
@@ -113,12 +113,12 @@ RowLayout {
}
RowLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Item {
Layout.fillWidth: true
}
Button {
- Layout.preferredHeight: 47 * DefaultStyle.dp
+ Layout.preferredHeight: 47 * mainWindow.dp
Layout.alignment: Qt.AlignRight | Qt.AlignHCenter
text: qsTr("Ajouter")
visible: mainItem.showAddButton
diff --git a/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml
index 1491ad632..d881f3432 100644
--- a/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml
@@ -49,7 +49,7 @@ AbstractSettingsLayout {
Component {
id: content
ColumnLayout {
- spacing: 40 * DefaultStyle.dp
+ spacing: 40 * mainWindow.dp
SwitchSetting {
titleText: qsTr("Activer les traces de débogage")
propertyName: "logsEnabled"
diff --git a/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml
index 88a6c1b30..d3b5d0653 100644
--- a/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml
@@ -16,12 +16,12 @@ AbstractSettingsLayout {
Component {
id: topBar
RowLayout {
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
Button {
background: Item{}
icon.source: AppIcons.trashCan
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
contentImageColor: DefaultStyle.main2_600
visible: !isNew
onClicked: {
@@ -56,18 +56,18 @@ AbstractSettingsLayout {
id: content
ColumnLayout {
width: parent.width
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
RowLayout {
- Layout.topMargin: 16 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.topMargin: 16 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- Layout.minimumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ Layout.minimumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Annuaires LDAP")
@@ -89,10 +89,10 @@ AbstractSettingsLayout {
}
ColumnLayout {
Layout.fillWidth: true
- spacing: 20 * DefaultStyle.dp
- Layout.rightMargin: 44 * DefaultStyle.dp
- Layout.topMargin: 20 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
+ Layout.rightMargin: 44 * mainWindow.dp
+ Layout.topMargin: 20 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
DecoratedTextField {
id: server
propertyName: "server"
diff --git a/Linphone/view/Page/Layout/Settings/NetworkSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/NetworkSettingsLayout.qml
index 00a19f652..dfe0de49b 100644
--- a/Linphone/view/Page/Layout/Settings/NetworkSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/NetworkSettingsLayout.qml
@@ -10,16 +10,16 @@ AbstractSettingsLayout {
Component {
id: content
ColumnLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
RowLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
ColumnLayout {
- Layout.preferredWidth: 341 * DefaultStyle.dp
- Layout.maximumWidth: 341 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.preferredWidth: 341 * mainWindow.dp
+ Layout.maximumWidth: 341 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Text {
text: qsTr("Réseau")
font: Typography.h4
@@ -33,10 +33,10 @@ AbstractSettingsLayout {
}
}
ColumnLayout {
- Layout.rightMargin: 25 * DefaultStyle.dp
- Layout.topMargin: 36 * DefaultStyle.dp
- Layout.leftMargin: 64 * DefaultStyle.dp
- spacing: 40 * DefaultStyle.dp
+ Layout.rightMargin: 25 * mainWindow.dp
+ Layout.topMargin: 36 * mainWindow.dp
+ Layout.leftMargin: 64 * mainWindow.dp
+ spacing: 40 * mainWindow.dp
SwitchSetting {
Layout.fillWidth: true
titleText: qsTr("Autoriser l'IPv6")
diff --git a/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml b/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml
index f14eefcb6..0e76eefe0 100644
--- a/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml
@@ -10,7 +10,7 @@ AbstractSettingsLayout {
Component {
id: content
Column {
- spacing: 40 * DefaultStyle.dp
+ spacing: 40 * mainWindow.dp
SwitchSetting {
titleText: qsTr("Chiffrer tous les fichiers")
subTitleText: qsTr("Attention, vous ne pourrez pas revenir en arrière !")
diff --git a/Linphone/view/Page/Main/AbstractMainPage.qml b/Linphone/view/Page/Main/AbstractMainPage.qml
index fed432407..c742bded9 100644
--- a/Linphone/view/Page/Main/AbstractMainPage.qml
+++ b/Linphone/view/Page/Main/AbstractMainPage.qml
@@ -24,16 +24,16 @@ FocusScope {
// Control.SplitView {
// id: splitView
// anchors.fill: parent
- // anchors.topMargin: 10 * DefaultStyle.dp
+ // anchors.topMargin: 10 * mainWindow.dp
// handle: Rectangle {
- // implicitWidth: 8 * DefaultStyle.dp
+ // implicitWidth: 8 * mainWindow.dp
// color: Control.SplitHandle.hovered ? DefaultStyle.grey_200 : DefaultStyle.grey_100
// }
// ColumnLayout {
// id: leftPanel
- // Control.SplitView.preferredWidth: 350 * DefaultStyle.dp
- // Control.SplitView.minimumWidth: 350 * DefaultStyle.dp
+ // Control.SplitView.preferredWidth: 350 * mainWindow.dp
+ // Control.SplitView.minimumWidth: 350 * mainWindow.dp
// }
// Rectangle {
// id: rightPanel
@@ -55,23 +55,23 @@ FocusScope {
// Layout.fillWidth: true
// }
// ColumnLayout {
- // spacing: 30 * DefaultStyle.dp
+ // spacing: 30 * mainWindow.dp
// Item {
// Layout.fillHeight: true
// }
// Image {
// Layout.alignment: Qt.AlignHCenter
// source: AppIcons.noItemImage
- // Layout.preferredWidth: 359 * DefaultStyle.dp
- // Layout.preferredHeight: 314 * DefaultStyle.dp
+ // Layout.preferredWidth: 359 * mainWindow.dp
+ // Layout.preferredHeight: 314 * mainWindow.dp
// fillMode: Image.PreserveAspectFit
// }
// Text {
// text: mainItem.emptyListText
// Layout.alignment: Qt.AlignHCenter
// font {
- // pixelSize: 22 * DefaultStyle.dp
- // weight: 800 * DefaultStyle.dp
+ // pixelSize: 22 * mainWindow.dp
+ // weight: 800 * mainWindow.dp
// }
// }
// Button {
@@ -81,8 +81,8 @@ FocusScope {
// EffectImage {
// colorizationColor: DefaultStyle.grey_0
// source: mainItem.newItemIconSource
- // width: 24 * DefaultStyle.dp
- // height: 24 * DefaultStyle.dp
+ // width: 24 * mainWindow.dp
+ // height: 24 * mainWindow.dp
// fillMode: Image.PreserveAspectFit
// }
// Text {
@@ -90,8 +90,8 @@ FocusScope {
// wrapMode: Text.WordWrap
// color: DefaultStyle.grey_0
// font {
- // weight: 600 * DefaultStyle.dp
- // pixelSize: 18 * DefaultStyle.dp
+ // weight: 600 * mainWindow.dp
+ // pixelSize: 18 * mainWindow.dp
// family: DefaultStyle.defaultFont
// }
// }
@@ -122,13 +122,13 @@ FocusScope {
spacing: 0
ColumnLayout {
id: leftPanel
- Layout.preferredWidth: 404 * DefaultStyle.dp
+ Layout.preferredWidth: 404 * mainWindow.dp
Layout.fillWidth:false
spacing:0
}
Rectangle {
Layout.fillHeight: true
- Layout.preferredWidth: 1 * DefaultStyle.dp
+ Layout.preferredWidth: 1 * mainWindow.dp
color: DefaultStyle.main2_200
}
Rectangle {
@@ -150,38 +150,38 @@ FocusScope {
Layout.fillWidth: true
}
ColumnLayout {
- spacing: 30 * DefaultStyle.dp
+ spacing: 30 * mainWindow.dp
Item {
Layout.fillHeight: true
}
Image {
Layout.alignment: Qt.AlignHCenter
source: AppIcons.noItemImage
- Layout.preferredWidth: 359 * DefaultStyle.dp
- Layout.preferredHeight: 314 * DefaultStyle.dp
+ Layout.preferredWidth: 359 * mainWindow.dp
+ Layout.preferredHeight: 314 * mainWindow.dp
fillMode: Image.PreserveAspectFit
}
Text {
text: mainItem.emptyListText
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 22 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Button {
Layout.alignment: Qt.AlignHCenter
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
contentItem: RowLayout {
Layout.alignment: Qt.AlignVCenter
EffectImage {
colorizationColor: DefaultStyle.grey_0
imageSource: mainItem.newItemIconSource
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit
}
Text {
@@ -189,8 +189,8 @@ FocusScope {
wrapMode: Text.WordWrap
color: DefaultStyle.grey_0
font {
- weight: 600 * DefaultStyle.dp
- pixelSize: 18 * DefaultStyle.dp
+ weight: 600 * mainWindow.dp
+ pixelSize: 18 * mainWindow.dp
family: DefaultStyle.defaultFont
}
}
diff --git a/Linphone/view/Page/Main/Account/AccountListView.qml b/Linphone/view/Page/Main/Account/AccountListView.qml
index b12af30ea..f6489ea39 100644
--- a/Linphone/view/Page/Main/Account/AccountListView.qml
+++ b/Linphone/view/Page/Main/Account/AccountListView.qml
@@ -11,18 +11,18 @@ import LinphoneAccountsCpp
Item {
id: mainItem
- width: 517 * DefaultStyle.dp
- readonly property int topPadding: 23 * DefaultStyle.dp
- readonly property int bottomPadding: 23 * DefaultStyle.dp
- readonly property int leftPadding: 32 * DefaultStyle.dp
- readonly property int rightPadding: 32 * DefaultStyle.dp
- readonly property int spacing: 16 * DefaultStyle.dp
+ width: 517 * mainWindow.dp
+ readonly property int topPadding: 23 * mainWindow.dp
+ readonly property int bottomPadding: 23 * mainWindow.dp
+ readonly property int leftPadding: 32 * mainWindow.dp
+ readonly property int rightPadding: 32 * mainWindow.dp
+ readonly property int spacing: 16 * mainWindow.dp
property AccountProxy accountProxy
signal addAccountRequest()
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{
id: childLayout
anchors.top: parent.top
@@ -64,26 +64,26 @@ Item {
Layout.topMargin: mainItem.spacing
Layout.bottomMargin: mainItem.spacing
visible: addAccountButton.visible
- height: 1 * DefaultStyle.dp
+ height: 1 * mainWindow.dp
color: DefaultStyle.main2_300
}
MouseArea{
id: addAccountButton
Layout.fillWidth: true
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
visible: SettingsCpp.maxAccount == 0 || SettingsCpp.maxAccount > accountProxy.count
onClicked: mainItem.addAccountRequest()
RowLayout{
id: newAccountArea
anchors.fill: parent
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
EffectImage {
id: newAccount
imageSource: AppIcons.plusCircle
- width: 32 * DefaultStyle.dp
- height: 32 * DefaultStyle.dp
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ width: 32 * mainWindow.dp
+ height: 32 * mainWindow.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
fillMode: Image.PreserveAspectFit
colorizationColor: DefaultStyle.main2_500main
@@ -92,8 +92,8 @@ Item {
Layout.fillHeight: true
Layout.fillWidth: true
verticalAlignment: Text.AlignVCenter
- font.weight: 400 * DefaultStyle.dp
- font.pixelSize: 14 * DefaultStyle.dp
+ font.weight: 400 * mainWindow.dp
+ font.pixelSize: 14 * mainWindow.dp
color: DefaultStyle.main2_500main
text: 'Ajouter un compte'
}
diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml
index 39651b2d4..9ba192994 100644
--- a/Linphone/view/Page/Main/Call/CallPage.qml
+++ b/Linphone/view/Page/Main/Call/CallPage.qml
@@ -47,7 +47,7 @@ AbstractMainPage {
else rightPanelStackView.replace(emptySelection, Control.StackView.Immediate)
}
rightPanelStackView.initialItem: emptySelection
- rightPanelStackView.width: 360 * DefaultStyle.dp
+ rightPanelStackView.width: 360 * mainWindow.dp
onNoItemButtonPressed: goToNewCall()
@@ -62,12 +62,12 @@ AbstractMainPage {
Dialog {
id: deleteHistoryPopup
- width: 278 * DefaultStyle.dp
+ width: 278 * mainWindow.dp
text: qsTr("L'historique d'appel sera supprimé. Souhaitez-vous continuer ?")
}
Dialog {
id: deleteForUserPopup
- width: 278 * DefaultStyle.dp
+ width: 278 * mainWindow.dp
text: qsTr("L'historique d'appel de l'utilisateur sera supprimé. Souhaitez-vous continuer ?")
}
@@ -90,9 +90,9 @@ AbstractMainPage {
Control.StackView {
id: listStackView
anchors.top: titleLoader.bottom
- anchors.topMargin: 18 * DefaultStyle.dp
+ anchors.topMargin: 18 * mainWindow.dp
anchors.left: parent.left
- anchors.leftMargin: 45 * DefaultStyle.dp
+ anchors.leftMargin: 45 * mainWindow.dp
anchors.right: parent.right
anchors.bottom: parent.bottom
clip: true
@@ -107,7 +107,7 @@ AbstractMainPage {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
- height: 402 * DefaultStyle.dp
+ height: 402 * mainWindow.dp
NumericPadPopup {
id: numericPadPopup
width: parent.width
@@ -129,32 +129,32 @@ AbstractMainPage {
RowLayout {
id: titleCallLayout
anchors.fill: parent
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
Text {
text: qsTr("Appels")
- Layout.leftMargin: 45 * DefaultStyle.dp
+ Layout.leftMargin: 45 * mainWindow.dp
color: DefaultStyle.main2_700
- font.pixelSize: 29 * DefaultStyle.dp
- font.weight: 800 * DefaultStyle.dp
+ font.pixelSize: 29 * mainWindow.dp
+ font.weight: 800 * mainWindow.dp
}
Item {
Layout.fillWidth: true
}
PopupButton {
id: removeHistory
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
focus: true
popup.x: 0
- popup.padding: 20 * DefaultStyle.dp
+ popup.padding: 20 * mainWindow.dp
KeyNavigation.right: newCallButton
KeyNavigation.down: listStackView
popup.contentItem: ColumnLayout {
IconLabelButton {
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
Layout.fillWidth: true
focus: visible
- iconSize: 24 * DefaultStyle.dp
+ iconSize: 24 * mainWindow.dp
text: qsTr("Supprimer l'historique")
iconSource: AppIcons.trashCan
color: DefaultStyle.danger_500main
@@ -175,11 +175,11 @@ AbstractMainPage {
id: newCallButton
background: Item {}
icon.source: AppIcons.newCall
- Layout.preferredWidth: 28 * DefaultStyle.dp
- Layout.preferredHeight: 28 * DefaultStyle.dp
- Layout.rightMargin: 39 * DefaultStyle.dp
- icon.width: 28 * DefaultStyle.dp
- icon.height: 28 * DefaultStyle.dp
+ Layout.preferredWidth: 28 * mainWindow.dp
+ Layout.preferredHeight: 28 * mainWindow.dp
+ Layout.rightMargin: 39 * mainWindow.dp
+ icon.width: 28 * mainWindow.dp
+ icon.height: 28 * mainWindow.dp
KeyNavigation.left: removeHistory
KeyNavigation.down: listStackView
onClicked: {
@@ -200,20 +200,20 @@ AbstractMainPage {
SearchBar {
id: searchBar
Layout.fillWidth: true
- Layout.rightMargin: 39 * DefaultStyle.dp
+ Layout.rightMargin: 39 * mainWindow.dp
placeholderText: qsTr("Rechercher un appel")
focus: true
KeyNavigation.up: titleLoader
KeyNavigation.down: historyListView
}
Item {
- Layout.topMargin: 38 * DefaultStyle.dp
+ Layout.topMargin: 38 * mainWindow.dp
Layout.fillWidth: true
Layout.fillHeight: true
Control.Control {
id: listLayout
anchors.fill: parent
- anchors.rightMargin: 39 * DefaultStyle.dp
+ anchors.rightMargin: 39 * mainWindow.dp
background: Item{}
ColumnLayout {
@@ -224,8 +224,8 @@ AbstractMainPage {
Layout.alignment: Qt.AlignHCenter
text: qsTr("Aucun appel")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
Binding on text {
when: searchBar.text.length !== 0
@@ -241,14 +241,14 @@ AbstractMainPage {
id: callHistoryProxy
filterText: searchBar.text
onFilterTextChanged: maxDisplayItems = initialDisplayItems
- initialDisplayItems: historyListView.height / (56 * DefaultStyle.dp) + 5
+ initialDisplayItems: historyListView.height / (56 * mainWindow.dp) + 5
displayItemsStep: initialDisplayItems / 2
onCountChanged: console.log("callHistoryProxy : " +count)
}
Component.onCompleted: console.log("historyListView completed")
cacheBuffer: contentHeight>0 ? contentHeight : 0// cache all items
flickDeceleration: 10000
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
highlightFollowsCurrentItem: true
preferredHighlightBegin: height/2 - 10
preferredHighlightEnd: height/2 + 10
@@ -271,40 +271,40 @@ AbstractMainPage {
onAtYEndChanged: if(atYEnd) callHistoryProxy.displayMore()
delegate: FocusScope {
width:historyListView.width
- height: 56 * DefaultStyle.dp
- anchors.topMargin: 5 * DefaultStyle.dp
- anchors.bottomMargin: 5 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
+ anchors.topMargin: 5 * mainWindow.dp
+ anchors.bottomMargin: 5 * mainWindow.dp
visible: !!modelData
Component.onCompleted: console.log(index + " => Completed "+visible)
RowLayout {
z: 1
anchors.fill: parent
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Avatar {
id: historyAvatar
property var contactObj: UtilsCpp.findFriendByAddress(modelData.core.remoteAddress)
contact: contactObj && contactObj.value || null
_address: modelData.core.remoteAddress
- width: 45 * DefaultStyle.dp
- height: 45 * DefaultStyle.dp
+ width: 45 * mainWindow.dp
+ height: 45 * mainWindow.dp
}
ColumnLayout {
Layout.fillHeight: true
Layout.fillWidth: true
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Text {
id: friendAddress
Layout.fillWidth: true
maximumLineCount: 1
text: modelData.core.displayName
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
capitalization: Font.Capitalize
}
}
RowLayout {
- spacing: 6 * DefaultStyle.dp
+ spacing: 6 * mainWindow.dp
EffectImage {
id: statusIcon
imageSource: modelData.core.status === LinphoneEnums.CallStatus.Declined
@@ -324,8 +324,8 @@ AbstractMainPage {
: modelData.core.isOutgoing
? DefaultStyle.info_500_main
: DefaultStyle.success_500main
- Layout.preferredWidth: 12 * DefaultStyle.dp
- Layout.preferredHeight: 12 * DefaultStyle.dp
+ Layout.preferredWidth: 12 * mainWindow.dp
+ Layout.preferredHeight: 12 * mainWindow.dp
transform: Rotation {
angle: modelData.core.isOutgoing && (modelData.core.status === LinphoneEnums.CallStatus.Declined
|| modelData.core.status === LinphoneEnums.CallStatus.DeclinedElsewhere
@@ -341,23 +341,23 @@ AbstractMainPage {
// text: modelData.core.date
text: UtilsCpp.formatDate(modelData.core.date)
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
}
Button {
- Layout.rightMargin: 5 * DefaultStyle.dp
+ Layout.rightMargin: 5 * mainWindow.dp
padding: 0
background: Item {
visible: false
}
icon.source: AppIcons.phone
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
focus: true
activeFocusOnTab: false
onClicked: {
@@ -415,7 +415,7 @@ AbstractMainPage {
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
- anchors.rightMargin: 8 * DefaultStyle.dp
+ anchors.rightMargin: 8 * mainWindow.dp
active: true
policy: Control.ScrollBar.AsNeeded
}
@@ -432,14 +432,14 @@ AbstractMainPage {
RowLayout {
anchors.fill: parent
Button {
- Layout.leftMargin: 45 * DefaultStyle.dp
+ Layout.leftMargin: 45 * mainWindow.dp
background: Item {
}
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
focus: true
KeyNavigation.down: listStackView
onClicked: {
@@ -451,8 +451,8 @@ AbstractMainPage {
Text {
text: qsTr("Nouvel appel")
color: DefaultStyle.main2_700
- font.pixelSize: 29 * DefaultStyle.dp
- font.weight: 800 * DefaultStyle.dp
+ font.pixelSize: 29 * mainWindow.dp
+ font.weight: 800 * mainWindow.dp
}
Item {
Layout.fillWidth: true
@@ -510,18 +510,18 @@ AbstractMainPage {
height: parent.height
RowLayout {
anchors.fill: parent
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
visible: !SettingsCpp.disableMeetingsFeature
Button {
id: backGroupCallButton
background: Item{}
icon.source: AppIcons.leftArrow
contentImageColor: DefaultStyle.main1_500_main
- Layout.leftMargin: 21 * DefaultStyle.dp
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.leftMargin: 21 * mainWindow.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
KeyNavigation.down: listStackView
KeyNavigation.right: groupCallButton
KeyNavigation.left: groupCallButton
@@ -531,14 +531,14 @@ AbstractMainPage {
}
}
ColumnLayout {
- spacing: 3 * DefaultStyle.dp
+ spacing: 3 * mainWindow.dp
Text {
text: qsTr("Appel de groupe")
color: DefaultStyle.main1_500_main
maximumLineCount: 1
font {
- pixelSize: 18 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 18 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
Layout.fillWidth: true
}
@@ -547,8 +547,8 @@ AbstractMainPage {
color: DefaultStyle.main2_500main
maximumLineCount: 1
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
Layout.fillWidth: true
}
@@ -556,13 +556,13 @@ AbstractMainPage {
Button {
id: groupCallButton
enabled: mainItem.selectedParticipantsCount.length != 0
- Layout.rightMargin: 21 * DefaultStyle.dp
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
- leftPadding: 12 * DefaultStyle.dp
- rightPadding: 12 * DefaultStyle.dp
+ Layout.rightMargin: 21 * mainWindow.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
+ leftPadding: 12 * mainWindow.dp
+ rightPadding: 12 * mainWindow.dp
text: qsTr("Lancer")
- textSize: 13 * DefaultStyle.dp
+ textSize: 13 * mainWindow.dp
KeyNavigation.down: listStackView
KeyNavigation.left: backGroupCallButton
KeyNavigation.right: backGroupCallButton
@@ -582,28 +582,28 @@ AbstractMainPage {
addParticipantsLayout.forceActiveFocus()
}
ColumnLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
anchors.fill: parent
RowLayout {
spacing: 0
- Layout.rightMargin: 38 * DefaultStyle.dp
+ Layout.rightMargin: 38 * mainWindow.dp
Text {
- font.pixelSize: 13 * DefaultStyle.dp
- font.weight: 700 * DefaultStyle.dp
+ font.pixelSize: 13 * mainWindow.dp
+ font.weight: 700 * mainWindow.dp
text: qsTr("Nom du groupe")
}
Item{Layout.fillWidth: true}
Text {
- font.pixelSize: 12 * DefaultStyle.dp
- font.weight: 300 * DefaultStyle.dp
+ font.pixelSize: 12 * mainWindow.dp
+ font.weight: 300 * mainWindow.dp
text: qsTr("Requis")
}
}
TextField {
id: groupCallName
Layout.fillWidth: true
- Layout.rightMargin: 38 * DefaultStyle.dp
- Layout.preferredHeight: 49 * DefaultStyle.dp
+ Layout.rightMargin: 38 * mainWindow.dp
+ Layout.preferredHeight: 49 * mainWindow.dp
focus: true
KeyNavigation.down: addParticipantsLayout//participantList.count > 0 ? participantList : searchbar
}
@@ -648,8 +648,8 @@ AbstractMainPage {
ContactLayout {
id: contactDetail
anchors.fill: parent
- anchors.topMargin: 45 * DefaultStyle.dp
- anchors.bottomMargin: 45 * DefaultStyle.dp
+ anchors.topMargin: 45 * mainWindow.dp
+ anchors.bottomMargin: 45 * mainWindow.dp
visible: mainItem.selectedRowHistoryGui != undefined
property var contactObj: UtilsCpp.findFriendByAddress(contactAddress)
contact: contactObj && contactObj.value || null
@@ -659,7 +659,7 @@ AbstractMainPage {
buttonContent: PopupButton {
id: detailOptions
anchors.right: parent.right
- anchors.rightMargin: 30 * DefaultStyle.dp
+ anchors.rightMargin: 30 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
popup.x: width
property var friendGuiObj: UtilsCpp.findFriendByAddress(contactDetail.contactAddress)
@@ -679,11 +679,11 @@ AbstractMainPage {
Button {
text: detailOptions.friendGui ? qsTr("Voir le contact") : qsTr("Ajouter aux contacts")
icon.source: AppIcons.plusCircle
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- spacing: 10 * DefaultStyle.dp
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ spacing: 10 * mainWindow.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main
contentImageColor: DefaultStyle.main2_600
background: Item {}
@@ -696,11 +696,11 @@ AbstractMainPage {
Button {
text: qsTr("Copier l'adresse SIP")
icon.source: AppIcons.copy
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- spacing: 10 * DefaultStyle.dp
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ spacing: 10 * mainWindow.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.main2_500main
contentImageColor: DefaultStyle.main2_600
background: Item {}
@@ -723,18 +723,18 @@ AbstractMainPage {
// }
Rectangle {
Layout.fillWidth: true
- Layout.preferredHeight: 2 * DefaultStyle.dp
+ Layout.preferredHeight: 2 * mainWindow.dp
color: DefaultStyle.main2_400
}
Button {
text: qsTr("Supprimer l'historique")
icon.source: AppIcons.trashCan
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- spacing: 10 * DefaultStyle.dp
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ spacing: 10 * mainWindow.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
textColor: DefaultStyle.danger_500main
contentImageColor: DefaultStyle.danger_500main
background: Item {}
@@ -756,15 +756,15 @@ AbstractMainPage {
}
detailContent: RoundedPane {
id: detailControl
- Layout.preferredWidth: 360 * DefaultStyle.dp
- implicitHeight: 430 * DefaultStyle.dp + topPadding + bottomPadding
+ Layout.preferredWidth: 360 * mainWindow.dp
+ implicitHeight: 430 * mainWindow.dp + topPadding + bottomPadding
background: Rectangle {
id: detailListBackground
width: parent.width
height: detailListView.height
color: DefaultStyle.grey_0
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
}
ListView {
@@ -772,24 +772,24 @@ AbstractMainPage {
width: parent.width
height: Math.min(detailControl.implicitHeight, contentHeight)
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
clip: true
model: CallHistoryProxy {
id: detailsHistoryProxy
filterText: mainItem.selectedRowHistoryGui ? mainItem.selectedRowHistoryGui.core.remoteAddress : ""
onFilterTextChanged: maxDisplayItems = initialDisplayItems
- initialDisplayItems: detailListView.height / (56 * DefaultStyle.dp) + 5
+ initialDisplayItems: detailListView.height / (56 * mainWindow.dp) + 5
displayItemsStep: initialDisplayItems / 2
}
onAtYEndChanged: if(atYEnd) detailsHistoryProxy.displayMore()
delegate: Item {
width:detailListView.width
- height: 56 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
RowLayout {
anchors.fill: parent
- anchors.leftMargin: 20 * DefaultStyle.dp
- anchors.rightMargin: 20 * DefaultStyle.dp
+ anchors.leftMargin: 20 * mainWindow.dp
+ anchors.rightMargin: 20 * mainWindow.dp
anchors.verticalCenter: parent.verticalCenter
ColumnLayout {
Layout.alignment: Qt.AlignVCenter
@@ -813,8 +813,8 @@ AbstractMainPage {
: modelData.core.isOutgoing
? DefaultStyle.info_500_main
: DefaultStyle.success_500main
- Layout.preferredWidth: 16 * DefaultStyle.dp
- Layout.preferredHeight: 16 * DefaultStyle.dp
+ Layout.preferredWidth: 16 * mainWindow.dp
+ Layout.preferredHeight: 16 * mainWindow.dp
transform: Rotation {
angle: modelData.core.isOutgoing && (modelData.core.status === LinphoneEnums.CallStatus.Declined
|| modelData.core.status === LinphoneEnums.CallStatus.DeclinedElsewhere
@@ -833,8 +833,8 @@ AbstractMainPage {
? qsTr("Appel sortant")
: qsTr("Appel entrant")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -842,8 +842,8 @@ AbstractMainPage {
text: UtilsCpp.formatDate(modelData.core.date)
color: modelData.core.status === LinphoneEnums.CallStatus.Missed? DefaultStyle.danger_500main : DefaultStyle.main2_500main
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
@@ -854,8 +854,8 @@ AbstractMainPage {
Text {
text: UtilsCpp.formatElapsedTime(modelData.core.duration, false)
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
@@ -876,8 +876,8 @@ AbstractMainPage {
property color colorizationColor: DefaultStyle.main2_500main
EffectImage {
imageSource: iconLabel.iconSource
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit
colorizationColor: iconLabel.colorizationColor
}
@@ -885,8 +885,8 @@ AbstractMainPage {
text: iconLabel.text
color: iconLabel.colorizationColor
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Page/Main/Call/CallSettingsPanel.qml b/Linphone/view/Page/Main/Call/CallSettingsPanel.qml
index 856259268..f50bac14c 100644
--- a/Linphone/view/Page/Main/Call/CallSettingsPanel.qml
+++ b/Linphone/view/Page/Main/Call/CallSettingsPanel.qml
@@ -17,28 +17,28 @@ Control.Page {
signal returnRequested()
signal validateRequested()
- topPadding: 16 * DefaultStyle.dp
- // bottomPadding: 16 * DefaultStyle.dp
+ topPadding: 16 * mainWindow.dp
+ // bottomPadding: 16 * mainWindow.dp
background: Rectangle {
width: mainItem.width
height: mainItem.height
color: DefaultStyle.grey_100
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
}
header: Control.Control {
id: pageHeader
width: mainItem.width
- height: 56 * DefaultStyle.dp
- leftPadding: 10 * DefaultStyle.dp
- rightPadding: 10 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
+ leftPadding: 10 * mainWindow.dp
+ rightPadding: 10 * mainWindow.dp
background: Rectangle {
id: headerBackground
width: pageHeader.width
height: pageHeader.height
color: DefaultStyle.grey_0
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
Rectangle {
y: pageHeader.height/2
height: pageHeader.height/2
@@ -49,7 +49,7 @@ Control.Page {
id: headerStack
RowLayout {
Layout.alignment: Qt.AlignVCenter
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Text {
text: mainItem.headerTitleText
Layout.fillWidth: true
@@ -58,8 +58,8 @@ Control.Page {
verticalAlignment: Text.AlignVCenter
color: DefaultStyle.main1_500_main
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
RowLayout {
@@ -72,21 +72,21 @@ Control.Page {
visible: false
}
icon.source: AppIcons.closeX
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
onClicked: mainItem.visible = false
}
}
RowLayout {
Layout.alignment: Qt.AlignVCenter
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Button {
background: Item{}
icon.source: AppIcons.leftArrow
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
contentImageColor: DefaultStyle.main1_500_main
onClicked: mainItem.returnRequested()
}
@@ -98,8 +98,8 @@ Control.Page {
text: mainItem.headerTitleText
color: DefaultStyle.main1_500_main
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Text {
@@ -109,8 +109,8 @@ Control.Page {
text: mainItem.headerSubtitleText
color: DefaultStyle.main2_500main
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
@@ -120,13 +120,13 @@ Control.Page {
}
Button {
text: mainItem.headerValidateButtonText
- textSize: 13 * DefaultStyle.dp
- textWeight: 600 * DefaultStyle.dp
+ textSize: 13 * mainWindow.dp
+ textWeight: 600 * mainWindow.dp
onClicked: mainItem.validateRequested()
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
- leftPadding: 12 * DefaultStyle.dp
- rightPadding: 12 * DefaultStyle.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
+ leftPadding: 12 * mainWindow.dp
+ rightPadding: 12 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Page/Main/Call/WaitingRoom.qml b/Linphone/view/Page/Main/Call/WaitingRoom.qml
index 2156ee36b..70e11ce8f 100644
--- a/Linphone/view/Page/Main/Call/WaitingRoom.qml
+++ b/Linphone/view/Page/Main/Call/WaitingRoom.qml
@@ -17,15 +17,15 @@ RowLayout {
RowLayout {
Layout.fillWidth: false
Layout.fillHeight: false
- spacing: 100 * DefaultStyle.dp
+ spacing: 100 * mainWindow.dp
Layout.alignment: Qt.AlignCenter
ColumnLayout {
- spacing: 31 * DefaultStyle.dp
+ spacing: 31 * mainWindow.dp
Sticker {
id: preview
previewEnabled: true
- Layout.preferredHeight: 330 * DefaultStyle.dp
- Layout.preferredWidth: 558 * DefaultStyle.dp
+ Layout.preferredHeight: 330 * mainWindow.dp
+ Layout.preferredWidth: 558 * mainWindow.dp
qmlName: "WP"
displayAll: false
displayPresence: false
@@ -37,7 +37,7 @@ RowLayout {
}
RowLayout {
Layout.alignment: Qt.AlignHCenter
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
CheckableButton {
id: videoButton
iconUrl: AppIcons.videoCamera
@@ -45,10 +45,10 @@ RowLayout {
checked: !mainItem.localVideoEnabled
color: DefaultStyle.grey_500
contentImageColor: DefaultStyle.main2_0
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
onClicked: mainItem.localVideoEnabled = !mainItem.localVideoEnabled
}
CheckableButton {
@@ -57,10 +57,10 @@ RowLayout {
checkedIconUrl: AppIcons.microphoneSlash
color: DefaultStyle.grey_500
contentImageColor: DefaultStyle.main2_0
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
onCheckedChanged: mainItem.microEnabled = !mainItem.microEnabled
}
CheckableButton {
@@ -70,10 +70,10 @@ RowLayout {
color: DefaultStyle.grey_500
checkedColor: DefaultStyle.main2_100
contentImageColor: checked ? DefaultStyle.grey_500 : DefaultStyle.grey_0
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
}
CheckableButton {
id: speakerButton
@@ -82,10 +82,10 @@ RowLayout {
checkedIconUrl: AppIcons.speakerSlash
color: DefaultStyle.grey_500
contentImageColor: DefaultStyle.main2_0
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
}
}
}
@@ -93,17 +93,17 @@ RowLayout {
id: stackLayout
currentIndex: 0
ColumnLayout {
- spacing: 93 * DefaultStyle.dp
+ spacing: 93 * mainWindow.dp
ColumnLayout {
- Layout.topMargin: 54 * DefaultStyle.dp
+ Layout.topMargin: 54 * mainWindow.dp
spacing: 0
Text {
Layout.fillWidth: true
text: qsTr("Participer à :")
color: DefaultStyle.grey_0
font {
- pixelSize: 30 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 30 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
Text {
@@ -111,19 +111,19 @@ RowLayout {
text: mainItem.conferenceInfo && mainItem.conferenceInfo.core.subject
color: DefaultStyle.grey_0
font {
- pixelSize: 30 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 30 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
ColumnLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Button {
- Layout.preferredWidth: 292 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ Layout.preferredWidth: 292 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
text: qsTr("Join")
onClicked: {
settingsButton.checked = false
@@ -132,10 +132,10 @@ RowLayout {
}
}
Button {
- Layout.preferredWidth: 292 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ Layout.preferredWidth: 292 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
inversedColors: true
text: qsTr("Cancel")
onClicked: {
@@ -145,16 +145,16 @@ RowLayout {
}
}
ColumnLayout {
- spacing: 37 * DefaultStyle.dp
+ spacing: 37 * mainWindow.dp
ColumnLayout {
- spacing: 13 * DefaultStyle.dp
+ spacing: 13 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("Connexion à la réunion")
color: DefaultStyle.grey_0
font {
- pixelSize: 30 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 30 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
Text {
@@ -162,16 +162,16 @@ RowLayout {
text: qsTr("Vous allez rejoindre la réunion dans quelques instants...")
color: DefaultStyle.grey_0
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
BusyIndicator {
indicatorColor: DefaultStyle.main1_500_main
Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: 48 * DefaultStyle.dp
- Layout.preferredHeight: 48 * DefaultStyle.dp
+ Layout.preferredWidth: 48 * mainWindow.dp
+ Layout.preferredHeight: 48 * mainWindow.dp
}
}
}
diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml
index 4e49a4434..9a3e89ed0 100644
--- a/Linphone/view/Page/Main/Contact/ContactPage.qml
+++ b/Linphone/view/Page/Main/Contact/ContactPage.qml
@@ -82,45 +82,45 @@ AbstractMainPage {
id: verifyDevicePopup
property string deviceName
property string deviceAddress
- padding: 30 * DefaultStyle.dp
+ padding: 30 * mainWindow.dp
anchors.centerIn: parent
closePolicy: Control.Popup.CloseOnEscape
modal: true
onAboutToHide: neverDisplayAgainCheckbox.checked = false
contentItem: ColumnLayout {
- spacing: 45 * DefaultStyle.dp
+ spacing: 45 * mainWindow.dp
ColumnLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Text {
text: qsTr("Augmenter la confiance")
font {
- pixelSize: 22 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
ColumnLayout {
- spacing: 24 * DefaultStyle.dp
+ spacing: 24 * mainWindow.dp
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.")
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
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)
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
}
}
RowLayout {
RowLayout {
- spacing: 7 * DefaultStyle.dp
+ spacing: 7 * mainWindow.dp
CheckBox{
id: neverDisplayAgainCheckbox
}
Text {
text: qsTr("Ne plus afficher")
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
MouseArea {
anchors.fill: parent
onClicked: neverDisplayAgainCheckbox.toggle()
@@ -129,22 +129,22 @@ AbstractMainPage {
}
Item{Layout.fillWidth: true}
RowLayout {
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
Button {
inversedColors: true
text: qsTr("Annuler")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
onClicked: verifyDevicePopup.close()
}
Button {
text: qsTr("Appeler")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
onClicked: {
SettingsCpp.setDisplayDeviceCheckConfirmation(!neverDisplayAgainCheckbox.checked)
UtilsCpp.createCall(verifyDevicePopup.deviceAddress, {}, LinphoneEnums.MediaEncryption.Zrtp)
@@ -158,8 +158,8 @@ AbstractMainPage {
leftPanelContent: FocusScope {
id: leftPanel
- property int leftMargin: 45 * DefaultStyle.dp
- property int rightMargin: 39 * DefaultStyle.dp
+ property int leftMargin: 45 * mainWindow.dp
+ property int rightMargin: 39 * mainWindow.dp
Layout.fillHeight: true
Layout.fillWidth: true
@@ -175,8 +175,8 @@ AbstractMainPage {
Text {
text: qsTr("Contacts")
color: DefaultStyle.main2_700
- font.pixelSize: 29 * DefaultStyle.dp
- font.weight: 800 * DefaultStyle.dp
+ font.pixelSize: 29 * mainWindow.dp
+ font.weight: 800 * mainWindow.dp
}
Item {
Layout.fillWidth: true
@@ -186,10 +186,10 @@ AbstractMainPage {
background: Item {
}
icon.source: AppIcons.plusCircle
- Layout.preferredWidth: 30 * DefaultStyle.dp
- Layout.preferredHeight: 30 * DefaultStyle.dp
- icon.width: 30 * DefaultStyle.dp
- icon.height: 30 * DefaultStyle.dp
+ Layout.preferredWidth: 30 * mainWindow.dp
+ Layout.preferredHeight: 30 * mainWindow.dp
+ icon.width: 30 * mainWindow.dp
+ icon.height: 30 * mainWindow.dp
onClicked: {
mainItem.createContact("", "")
}
@@ -203,13 +203,13 @@ AbstractMainPage {
anchors.left: leftPanel.left
anchors.bottom: leftPanel.bottom
enabled: mainItem.leftPanelEnabled
- spacing: 38 * DefaultStyle.dp
+ spacing: 38 * mainWindow.dp
SearchBar {
id: searchBar
visible: contactList.model.sourceModel.count != 0
Layout.leftMargin: leftPanel.leftMargin
Layout.rightMargin: leftPanel.rightMargin
- Layout.topMargin: 18 * DefaultStyle.dp
+ Layout.topMargin: 18 * mainWindow.dp
Layout.fillWidth: true
placeholderText: qsTr("Rechercher un contact")
KeyNavigation.up: createContactButton
@@ -229,15 +229,15 @@ AbstractMainPage {
ColumnLayout {
id: content
width: parent.width
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
Text {
visible: contactList.count === 0 && favoriteList.count === 0
Layout.alignment: Qt.AlignHCenter
- Layout.topMargin: 137 * DefaultStyle.dp
+ Layout.topMargin: 137 * mainWindow.dp
text: qsTr("Aucun contact")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
ColumnLayout {
@@ -245,14 +245,14 @@ AbstractMainPage {
onVisibleChanged: if (visible && !favoriteList.visible) favoriteList.visible = true
Layout.leftMargin: leftPanel.leftMargin
Layout.rightMargin: leftPanel.rightMargin
- spacing: 18 * DefaultStyle.dp
+ spacing: 18 * mainWindow.dp
RowLayout {
spacing: 0
Text {
text: qsTr("Favoris")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Item {
@@ -262,10 +262,10 @@ AbstractMainPage {
id: favoriteExpandButton
background: Item{}
icon.source: favoriteList.visible ? AppIcons.upArrow : AppIcons.downArrow
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
onClicked: favoriteList.visible = !favoriteList.visible
KeyNavigation.up: searchBar
KeyNavigation.down: favoriteList
@@ -298,14 +298,14 @@ AbstractMainPage {
onVisibleChanged: if (visible && !contactList.visible) contactList.visible = true
Layout.leftMargin: leftPanel.leftMargin
Layout.rightMargin: leftPanel.rightMargin
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
RowLayout {
spacing: 0
Text {
text: qsTr("Contacts")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Item {
@@ -315,10 +315,10 @@ AbstractMainPage {
id: contactExpandButton
background: Item{}
icon.source: contactList.visible ? AppIcons.upArrow : AppIcons.downArrow
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
onClicked: contactList.visible = !contactList.visible
KeyNavigation.up: favoriteList.visible ? favoriteList : searchBar
KeyNavigation.down: contactList
@@ -361,7 +361,7 @@ AbstractMainPage {
ScrollBar {
id: contactsScrollbar
Layout.fillHeight: true
- Layout.rightMargin: 8 * DefaultStyle.dp
+ Layout.rightMargin: 8 * mainWindow.dp
height: listLayout.height
active: true
interactive: true
@@ -382,19 +382,19 @@ AbstractMainPage {
RowLayout {
visible: mainItem.selectedContact != undefined
anchors.fill: parent
- anchors.topMargin: 45 * DefaultStyle.dp
- anchors.bottomMargin: 23 * DefaultStyle.dp
+ anchors.topMargin: 45 * mainWindow.dp
+ anchors.bottomMargin: 23 * mainWindow.dp
ContactLayout {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
contact: mainItem.selectedContact
- Layout.preferredWidth: 360 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
buttonContent: Button {
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
background: Item{}
onClicked: mainItem.editContact(mainItem.selectedContact)
icon.source: AppIcons.pencil
@@ -402,57 +402,57 @@ AbstractMainPage {
}
detailContent: ColumnLayout {
Layout.fillWidth: false
- Layout.preferredWidth: 360 * DefaultStyle.dp
- spacing: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
+ spacing: 32 * mainWindow.dp
ColumnLayout {
- spacing: 9 * DefaultStyle.dp
+ spacing: 9 * mainWindow.dp
Text {
- Layout.leftMargin: 10 * DefaultStyle.dp
+ Layout.leftMargin: 10 * mainWindow.dp
text: qsTr("Informations")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
RoundedPane {
- Layout.preferredHeight: Math.min(226 * DefaultStyle.dp, addrList.contentHeight + topPadding + bottomPadding)
- height: Math.min(226 * DefaultStyle.dp, addrList.contentHeight)
+ Layout.preferredHeight: Math.min(226 * mainWindow.dp, addrList.contentHeight + topPadding + bottomPadding)
+ height: Math.min(226 * mainWindow.dp, addrList.contentHeight)
Layout.fillWidth: true
- topPadding: 12 * DefaultStyle.dp
- bottomPadding: 12 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
+ topPadding: 12 * mainWindow.dp
+ bottomPadding: 12 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
contentItem: ListView {
id: addrList
- width: 360 * DefaultStyle.dp
+ width: 360 * mainWindow.dp
height: contentHeight
clip: true
- spacing: 9 * DefaultStyle.dp
+ spacing: 9 * mainWindow.dp
model: VariantList {
model: mainItem.selectedContact ? mainItem.selectedContact.core.allAddresses : []
}
delegate: Item {
width: addrList.width
- height: 46 * DefaultStyle.dp
+ height: 46 * mainWindow.dp
ColumnLayout {
anchors.fill: parent
- // anchors.topMargin: 5 * DefaultStyle.dp
+ // anchors.topMargin: 5 * mainWindow.dp
RowLayout {
Layout.fillWidth: true
// Layout.fillHeight: true
// Layout.alignment: Qt.AlignVCenter
- // Layout.topMargin: 10 * DefaultStyle.dp
- // Layout.bottomMargin: 10 * DefaultStyle.dp
+ // Layout.topMargin: 10 * mainWindow.dp
+ // Layout.bottomMargin: 10 * mainWindow.dp
ColumnLayout {
Layout.fillWidth: true
Text {
Layout.fillWidth: true
text: modelData.label
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
Text {
@@ -460,8 +460,8 @@ AbstractMainPage {
property string _text: modelData.address
text: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_text) : _text
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -470,13 +470,13 @@ AbstractMainPage {
}
Button {
background: Item{}
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
icon.source: AppIcons.phone
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
onClicked: {
UtilsCpp.createCall(modelData.address)
}
@@ -486,9 +486,9 @@ AbstractMainPage {
Rectangle {
visible: index != addrList.model.count - 1
Layout.fillWidth: true
- Layout.preferredHeight: 1 * DefaultStyle.dp
- Layout.rightMargin: 3 * DefaultStyle.dp
- Layout.leftMargin: 3 * DefaultStyle.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
+ Layout.rightMargin: 3 * mainWindow.dp
+ Layout.leftMargin: 3 * mainWindow.dp
color: DefaultStyle.main2_200
clip: true
}
@@ -500,47 +500,47 @@ AbstractMainPage {
RoundedPane {
visible: companyText.text.length != 0 || jobText.text.length != 0
Layout.fillWidth: true
- topPadding: 17 * DefaultStyle.dp
- bottomPadding: 17 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
+ topPadding: 17 * mainWindow.dp
+ bottomPadding: 17 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
// Layout.fillHeight: true
contentItem: ColumnLayout {
- // height: 100 * DefaultStyle.dp
+ // height: 100 * mainWindow.dp
RowLayout {
- height: 50 * DefaultStyle.dp
+ height: 50 * mainWindow.dp
Text {
text: qsTr("Company :")
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
Text {
id: companyText
text: mainItem.selectedContact && mainItem.selectedContact.core.organization
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
RowLayout {
- height: 50 * DefaultStyle.dp
+ height: 50 * mainWindow.dp
Text {
text: qsTr("Job :")
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
Text {
id: jobText
text: mainItem.selectedContact && mainItem.selectedContact.core.job
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -550,27 +550,27 @@ AbstractMainPage {
Text {
text: qsTr("Medias")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Button {
Rectangle {
anchors.fill: parent
color: DefaultStyle.grey_0
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
}
contentItem: RowLayout {
Image {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
source: AppIcons.shareNetwork
}
Text {
text: qsTr("Show media shared")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -581,28 +581,28 @@ AbstractMainPage {
}
}
ColumnLayout {
- spacing: 10 * DefaultStyle.dp
- Layout.rightMargin: 90 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
+ Layout.rightMargin: 90 * mainWindow.dp
ColumnLayout {
RowLayout {
Text {
text: qsTr("Confiance")
- Layout.leftMargin: 10 * DefaultStyle.dp
+ Layout.leftMargin: 10 * mainWindow.dp
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
}
RoundedPane {
- Layout.preferredWidth: 360 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
contentItem: ColumnLayout {
- spacing: 13 * DefaultStyle.dp
+ spacing: 13 * mainWindow.dp
Text {
text: qsTr("Niveau de confiance - Appareils vérifiés")
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
Text {
@@ -611,34 +611,34 @@ AbstractMainPage {
}
ProgressBar {
visible: deviceList.count > 0
- Layout.preferredWidth: 320 * DefaultStyle.dp
- Layout.preferredHeight: 28 * DefaultStyle.dp
+ Layout.preferredWidth: 320 * mainWindow.dp
+ Layout.preferredHeight: 28 * mainWindow.dp
value: mainItem.selectedContact ? mainItem.selectedContact.core.verifiedDeviceCount / deviceList.count : 0
}
ListView {
id: deviceList
Layout.fillWidth: true
- Layout.preferredHeight: Math.min(200 * DefaultStyle.dp, contentHeight)
+ Layout.preferredHeight: Math.min(200 * mainWindow.dp, contentHeight)
clip: true
model: mainItem.selectedContact ? mainItem.selectedContact.core.devices : []
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
delegate: RowLayout {
id: deviceDelegate
width: deviceList.width
- height: 30 * DefaultStyle.dp
+ height: 30 * mainWindow.dp
property var callObj
property CallGui deviceCall: callObj ? callObj.value : null
property string deviceName: modelData.name.length != 0 ? modelData.name : qsTr("Appareil sans nom")
Text {
text: deviceDelegate.deviceName
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
Item{Layout.fillWidth: true}
Image{
visible: modelData.securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
source: AppIcons.trusted
- width: 22 * DefaultStyle.dp
- height: 22 * DefaultStyle.dp
+ width: 22 * mainWindow.dp
+ height: 22 * mainWindow.dp
}
Button {
@@ -647,12 +647,12 @@ AbstractMainPage {
icon.source: AppIcons.warningCircle
contentImageColor: DefaultStyle.main1_500_main
textColor: DefaultStyle.main1_500_main
- textSize: 13 * DefaultStyle.dp
+ textSize: 13 * mainWindow.dp
text: qsTr("Vérifier")
- leftPadding: 12 * DefaultStyle.dp
- rightPadding: 12 * DefaultStyle.dp
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
+ leftPadding: 12 * mainWindow.dp
+ rightPadding: 12 * mainWindow.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
onClicked: {
if (SettingsCpp.getDisplayDeviceCheckConfirmation()) {
verifyDevicePopup.deviceName = deviceDelegate.deviceName
@@ -671,27 +671,27 @@ AbstractMainPage {
}
}
ColumnLayout {
- spacing: 9 * DefaultStyle.dp
+ spacing: 9 * mainWindow.dp
Text {
- Layout.preferredHeight: 22 * DefaultStyle.dp
- Layout.leftMargin: 10 * DefaultStyle.dp
+ Layout.preferredHeight: 22 * mainWindow.dp
+ Layout.leftMargin: 10 * mainWindow.dp
text: qsTr("Other actions")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
RoundedPane {
- Layout.preferredWidth: 360 * DefaultStyle.dp
+ Layout.preferredWidth: 360 * mainWindow.dp
contentItem: ColumnLayout {
width: parent.width
IconLabelButton {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 50 * DefaultStyle.dp
- iconSize: 24 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 50 * mainWindow.dp
+ iconSize: 24 * mainWindow.dp
iconSource: AppIcons.pencil
text: qsTr("Edit")
onClicked: mainItem.editContact(mainItem.selectedContact)
@@ -699,34 +699,34 @@ AbstractMainPage {
}
Rectangle {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200
}
IconLabelButton {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 50 * DefaultStyle.dp
- iconSize: 24 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 50 * mainWindow.dp
+ iconSize: 24 * mainWindow.dp
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")
onClicked: if (mainItem.selectedContact) mainItem.selectedContact.core.lSetStarred(!mainItem.selectedContact.core.starred)
}
Rectangle {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200
}
IconLabelButton {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 50 * DefaultStyle.dp
- iconSize: 24 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 50 * mainWindow.dp
+ iconSize: 24 * mainWindow.dp
iconSource: AppIcons.shareNetwork
text: qsTr("Partager")
onClicked: {
@@ -742,51 +742,51 @@ AbstractMainPage {
}
Rectangle {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200
}
IconLabelButton {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 50 * DefaultStyle.dp
- iconSize: 24 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 50 * mainWindow.dp
+ iconSize: 24 * mainWindow.dp
iconSource: AppIcons.bellSlash
text: qsTr("Mute")
onClicked: console.log("TODO : mute contact")
}
Rectangle {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200
}
IconLabelButton {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 50 * DefaultStyle.dp
- iconSize: 24 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 50 * mainWindow.dp
+ iconSize: 24 * mainWindow.dp
iconSource: AppIcons.empty
text: qsTr("Block")
onClicked: console.log("TODO : block contact")
}
Rectangle {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200
}
IconLabelButton {
Layout.fillWidth: true
- Layout.leftMargin: 15 * DefaultStyle.dp
- Layout.rightMargin: 15 * DefaultStyle.dp
- Layout.preferredHeight: 50 * DefaultStyle.dp
- iconSize: 24 * DefaultStyle.dp
+ Layout.leftMargin: 15 * mainWindow.dp
+ Layout.rightMargin: 15 * mainWindow.dp
+ Layout.preferredHeight: 50 * mainWindow.dp
+ iconSize: 24 * mainWindow.dp
iconSource: AppIcons.trashCan
color: DefaultStyle.danger_500main
text: qsTr("Delete this contact")
diff --git a/Linphone/view/Page/Main/Help/HelpPage.qml b/Linphone/view/Page/Main/Help/HelpPage.qml
index ac12ca446..4f3ffdfe7 100644
--- a/Linphone/view/Page/Main/Help/HelpPage.qml
+++ b/Linphone/view/Page/Main/Help/HelpPage.qml
@@ -17,19 +17,19 @@ AbstractMainPage {
id: leftPanel
Layout.fillWidth: true
Layout.fillHeight: true
- property int sideMargin: 45 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ property int sideMargin: 45 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
RowLayout {
Layout.fillWidth: true
Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Button {
- Layout.preferredHeight: 24 * DefaultStyle.dp
- Layout.preferredWidth: 24 * DefaultStyle.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
background: Item {
anchors.fill: parent
}
@@ -49,7 +49,7 @@ AbstractMainPage {
Text {
Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin
- Layout.topMargin: 41 * DefaultStyle.dp
+ Layout.topMargin: 41 * mainWindow.dp
Layout.fillWidth: true
text: qsTr("À propos de Linphone")
color: DefaultStyle.main2_600
@@ -59,8 +59,8 @@ AbstractMainPage {
Layout.fillWidth: true
Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin
- Layout.topMargin: 24 * DefaultStyle.dp
- spacing: 32 * DefaultStyle.dp
+ Layout.topMargin: 24 * mainWindow.dp
+ spacing: 32 * mainWindow.dp
HelpIconLabelButton {
Layout.fillWidth: true
iconSource: AppIcons.detective
@@ -101,7 +101,7 @@ AbstractMainPage {
Text {
Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin
- Layout.topMargin: 32 * DefaultStyle.dp
+ Layout.topMargin: 32 * mainWindow.dp
Layout.fillWidth: true
text: qsTr("À propos de Linphone")
color: DefaultStyle.main2_600
@@ -112,7 +112,7 @@ AbstractMainPage {
Layout.fillWidth: true
Layout.leftMargin: leftPanel.sideMargin
Layout.rightMargin: leftPanel.sideMargin
- Layout.topMargin: 24 * DefaultStyle.dp
+ Layout.topMargin: 24 * mainWindow.dp
iconSource: AppIcons.debug
title: qsTr("Dépannage")
onClicked: {
diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml
index 204e3525c..7dbb308c7 100644
--- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml
+++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml
@@ -56,16 +56,16 @@ AbstractMainPage {
id: cancelAndDeleteConfDialog
property bool cancel: false
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 ?")
buttons: [
Button {
visible: cancelAndDeleteConfDialog.cancel
text: qsTr("Annuler et supprimer")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
onClicked: {
cancelAndDeleteConfDialog.cancelRequested()
cancelAndDeleteConfDialog.accepted()
@@ -74,10 +74,10 @@ AbstractMainPage {
},
Button {
text: cancelAndDeleteConfDialog.cancel ? qsTr("Supprimer seulement") : qsTr("Supprimer")
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
onClicked: {
cancelAndDeleteConfDialog.accepted()
cancelAndDeleteConfDialog.close()
@@ -86,10 +86,10 @@ AbstractMainPage {
Button {
text: qsTr("Retour")
inversedColors: true
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
onClicked: {
cancelAndDeleteConfDialog.rejected()
cancelAndDeleteConfDialog.close()
@@ -102,7 +102,7 @@ AbstractMainPage {
id: leftPanelStackView
Layout.fillHeight: true
Layout.fillWidth: true
- Layout.leftMargin: 45 * DefaultStyle.dp
+ Layout.leftMargin: 45 * mainWindow.dp
initialItem: listLayout
}
@@ -110,7 +110,7 @@ AbstractMainPage {
id: overridenRightPanel
Control.StackView {
id: overridenRightPanelStackView
- width: 393 * DefaultStyle.dp
+ width: 393 * mainWindow.dp
height: parent.height
anchors.top: parent.top
anchors.centerIn: parent
@@ -134,24 +134,24 @@ AbstractMainPage {
spacing: 0
RowLayout {
enabled: mainItem.leftPanelEnabled
- Layout.rightMargin: 38 * DefaultStyle.dp
+ Layout.rightMargin: 38 * mainWindow.dp
spacing: 0
Text {
Layout.fillWidth: true
text: qsTr("Réunions")
color: DefaultStyle.main2_700
- font.pixelSize: 29 * DefaultStyle.dp
- font.weight: 800 * DefaultStyle.dp
+ font.pixelSize: 29 * mainWindow.dp
+ font.weight: 800 * mainWindow.dp
}
Item{Layout.fillWidth: true}
Button {
background: Item {
}
icon.source: AppIcons.plusCircle
- Layout.preferredWidth: 28 * DefaultStyle.dp
- Layout.preferredHeight: 28 * DefaultStyle.dp
- icon.width: 28 * DefaultStyle.dp
- icon.height: 28 * DefaultStyle.dp
+ Layout.preferredWidth: 28 * mainWindow.dp
+ Layout.preferredHeight: 28 * mainWindow.dp
+ icon.width: 28 * mainWindow.dp
+ icon.height: 28 * mainWindow.dp
onClicked: {
mainItem.editConference()
}
@@ -160,20 +160,20 @@ AbstractMainPage {
SearchBar {
id: searchBar
Layout.fillWidth: true
- Layout.topMargin: 18 * DefaultStyle.dp
- Layout.rightMargin: 38 * DefaultStyle.dp
+ Layout.topMargin: 18 * mainWindow.dp
+ Layout.rightMargin: 38 * mainWindow.dp
placeholderText: qsTr("Rechercher une réunion")
KeyNavigation.up: conferenceList
KeyNavigation.down: conferenceList
}
Text {
- Layout.topMargin: 38 * DefaultStyle.dp
+ Layout.topMargin: 38 * mainWindow.dp
Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter
text: mainItem.emptyListText
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
visible: mainItem.showDefaultItem
Binding on text {
@@ -185,7 +185,7 @@ AbstractMainPage {
MeetingListView {
id: conferenceList
// 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.fillHeight: true
hoverEnabled: mainItem.leftPanelEnabled
@@ -210,7 +210,7 @@ AbstractMainPage {
Control.ScrollBar.vertical: ScrollBar {
id: meetingsScrollbar
anchors.right: parent.right
- anchors.rightMargin: 8 * DefaultStyle.dp
+ anchors.rightMargin: 8 * mainWindow.dp
active: true
interactive: true
policy: Control.ScrollBar.AsNeeded
@@ -228,21 +228,21 @@ AbstractMainPage {
property ConferenceInfoGui conferenceInfoGui
property bool isCreation
ColumnLayout {
- spacing: 33 * DefaultStyle.dp
+ spacing: 33 * mainWindow.dp
anchors.fill: parent
RowLayout {
- Layout.rightMargin: 35 * DefaultStyle.dp
- spacing: 5 * DefaultStyle.dp
+ Layout.rightMargin: 35 * mainWindow.dp
+ spacing: 5 * mainWindow.dp
Button {
id: backButton
background: Item{}
icon.source: AppIcons.leftArrow
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
focus: true
KeyNavigation.right: createButton
KeyNavigation.down: meetingSetup
@@ -255,17 +255,17 @@ AbstractMainPage {
text: qsTr("Nouvelle réunion")
color: DefaultStyle.main2_700
font {
- pixelSize: 22 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
Layout.fillWidth: true
}
Item {Layout.fillWidth: true}
Button {
id: createButton
- Layout.preferredWidth: 57 * DefaultStyle.dp
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
+ Layout.preferredWidth: 57 * mainWindow.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
KeyNavigation.left: backButton
KeyNavigation.down: meetingSetup
contentItem: Text {
@@ -274,8 +274,8 @@ AbstractMainPage {
verticalAlignment: Text.AlignVCenter
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 600 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 600 * mainWindow.dp
}
color: DefaultStyle.grey_0
}
@@ -299,7 +299,7 @@ AbstractMainPage {
isCreation: createConfLayout.isCreation
Layout.fillHeight: true
Layout.fillWidth: true
- Layout.rightMargin: 35 * DefaultStyle.dp
+ Layout.rightMargin: 35 * mainWindow.dp
Connections {
target: meetingSetup.conferenceInfoGui ? meetingSetup.conferenceInfoGui.core : null
function onConferenceSchedulerStateChanged() {
@@ -353,15 +353,15 @@ AbstractMainPage {
anchors.fill: parent
spacing: 0
Section {
- Layout.topMargin: 58 * DefaultStyle.dp
+ Layout.topMargin: 58 * mainWindow.dp
content: RowLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Button {
id: backButton
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
icon.source: AppIcons.leftArrow
KeyNavigation.left: saveButton
KeyNavigation.right: titleText
@@ -379,8 +379,8 @@ AbstractMainPage {
Layout.fillWidth: true
color: DefaultStyle.main2_600
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
KeyNavigation.left: backButton
KeyNavigation.right: saveButton
@@ -393,13 +393,13 @@ AbstractMainPage {
}
Button {
id: saveButton
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
- leftPadding: 12 * DefaultStyle.dp
- rightPadding: 12 * DefaultStyle.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
+ leftPadding: 12 * mainWindow.dp
+ rightPadding: 12 * mainWindow.dp
focus: true
text: qsTr("Save")
- textSize: 13 * DefaultStyle.dp
+ textSize: 13 * mainWindow.dp
KeyNavigation.left: titleText
KeyNavigation.right: backButton
KeyNavigation.down: conferenceEdit
@@ -461,29 +461,29 @@ AbstractMainPage {
Layout.preferredHeight: addParticipantsButtons.implicitHeight
RowLayout {
id: addParticipantsButtons
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Button {
id: removeButton
background: Item{}
icon.source: AppIcons.leftArrow
contentImageColor: DefaultStyle.main1_500_main
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
KeyNavigation.right: addButton
KeyNavigation.down: addParticipantLayout
onClicked: container.pop()
}
ColumnLayout {
- spacing: 3 * DefaultStyle.dp
+ spacing: 3 * mainWindow.dp
Text {
text: qsTr("Ajouter des participants")
color: DefaultStyle.main1_500_main
maximumLineCount: 1
font {
- pixelSize: 18 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 18 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
Layout.fillWidth: true
}
@@ -492,8 +492,8 @@ AbstractMainPage {
color: DefaultStyle.main2_500main
maximumLineCount: 1
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
Layout.fillWidth: true
}
@@ -501,14 +501,14 @@ AbstractMainPage {
Button {
id: addButton
enabled: addParticipantLayout.selectedParticipantsCount.length != 0
- Layout.rightMargin: 21 * DefaultStyle.dp
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
- leftPadding: 12 * DefaultStyle.dp
- rightPadding: 12 * DefaultStyle.dp
+ Layout.rightMargin: 21 * mainWindow.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
+ leftPadding: 12 * mainWindow.dp
+ rightPadding: 12 * mainWindow.dp
focus: enabled
text: qsTr("Ajouter")
- textSize: 13 * DefaultStyle.dp
+ textSize: 13 * mainWindow.dp
KeyNavigation.left: removeButton
KeyNavigation.down: addParticipantLayout
onClicked: {
@@ -535,22 +535,22 @@ AbstractMainPage {
id: meetingDetailsLayout
anchors.fill: parent
visible: mainItem.selectedConference
- spacing: 25 * DefaultStyle.dp
+ spacing: 25 * mainWindow.dp
Section {
- Layout.topMargin: 58 * DefaultStyle.dp
+ Layout.topMargin: 58 * mainWindow.dp
visible: mainItem.selectedConference
content: RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Image {
source: AppIcons.usersThree
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
Text {
text: mainItem.selectedConference ? mainItem.selectedConference.core.subject : ""
font {
- pixelSize: 20 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 20 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Item {
@@ -560,10 +560,10 @@ AbstractMainPage {
id: editButton
property var isMeObj: UtilsCpp.isMe(mainItem.selectedConference?.core.organizerAddress)
visible: mainItem.selectedConference && isMeObj && isMeObj.value || false
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
icon.source: AppIcons.pencil
contentImageColor: DefaultStyle.main1_500_main
KeyNavigation.left: leftPanelStackView.currentItem
@@ -575,8 +575,8 @@ AbstractMainPage {
}
PopupButton {
id: deletePopup
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
contentImageColor: DefaultStyle.main1_500_main
KeyNavigation.left: editButton.visible ? editButton : leftPanelStackView.currentItem
KeyNavigation.right: leftPanelStackView.currentItem
@@ -591,11 +591,11 @@ AbstractMainPage {
inversedColors: true
property var isMeObj: UtilsCpp.isMe(mainItem.selectedConference?.core.organizerAddress)
icon.source: AppIcons.trashCan
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
- spacing: 10 * DefaultStyle.dp
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
+ spacing: 10 * mainWindow.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
text: qsTr("Delete this meeting")
onClicked: {
@@ -622,14 +622,14 @@ AbstractMainPage {
}
Section {
content: ColumnLayout {
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
width: parent.width
RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Layout.fillWidth: true
Image {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
source: AppIcons.videoCamera
}
Button {
@@ -637,8 +637,8 @@ AbstractMainPage {
Layout.fillWidth: true
font.bold: shadowEnabled
text: mainItem.selectedConference ? mainItem.selectedConference.core.uri : ""
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
underline: true
inversedColors: true
color: DefaultStyle.main2_600
@@ -660,10 +660,10 @@ AbstractMainPage {
}
Button {
id: shareNetworkButton
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
background: Item{}
icon.source: AppIcons.shareNetwork
KeyNavigation.left: linkButton
@@ -677,10 +677,10 @@ AbstractMainPage {
}
}
RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Image {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
source: AppIcons.clock
}
Text {
@@ -691,22 +691,22 @@ AbstractMainPage {
+ UtilsCpp.toDateHourString(mainItem.selectedConference.core.endDateTime)
: ''
font {
- pixelSize: 14 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize
}
}
}
RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Image {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
source: AppIcons.globe
}
Text {
text: qsTr("Time zone: ") + (mainItem.selectedConference ? (mainItem.selectedConference.core.timeZoneModel.displayName + ", " + mainItem.selectedConference.core.timeZoneModel.countryName) : "")
font {
- pixelSize: 14 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -716,10 +716,10 @@ AbstractMainPage {
Section {
visible: mainItem.selectedConference && mainItem.selectedConference.core.description.length != 0
content: RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
imageSource: AppIcons.note
colorizationColor: DefaultStyle.main2_600
}
@@ -727,7 +727,7 @@ AbstractMainPage {
text: mainItem.selectedConference ? mainItem.selectedConference.core.description : ""
Layout.fillWidth: true
font {
- pixelSize: 14 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -735,22 +735,22 @@ AbstractMainPage {
}
Section {
content: RowLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
EffectImage {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
imageSource: AppIcons.userRectangle
colorizationColor: DefaultStyle.main2_600
}
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
_address: mainItem.selectedConference ? mainItem.selectedConference.core.organizerAddress : ""
}
Text {
text: mainItem.selectedConference ? mainItem.selectedConference.core.organizerName : ""
font {
- pixelSize: 14 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -759,34 +759,34 @@ AbstractMainPage {
Section {
content: RowLayout {
Layout.preferredHeight: participantList.height
- width: 393 * DefaultStyle.dp
- spacing: 8 * DefaultStyle.dp
+ width: 393 * mainWindow.dp
+ spacing: 8 * mainWindow.dp
Image {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
- Layout.topMargin: 20 * DefaultStyle.dp
+ Layout.topMargin: 20 * mainWindow.dp
source: AppIcons.usersTwo
}
ListView {
id: participantList
- Layout.preferredHeight: Math.min(184 * DefaultStyle.dp, contentHeight)
+ Layout.preferredHeight: Math.min(184 * mainWindow.dp, contentHeight)
Layout.fillWidth: true
model: mainItem.selectedConference ? mainItem.selectedConference.core.participants : []
clip: true
delegate: RowLayout {
- height: 56 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
width: participantList.width
Avatar {
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
_address: modelData.address
}
Text {
text: modelData.displayName
Layout.fillWidth: true
font {
- pixelSize: 14 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
capitalization: Font.Capitalize
}
}
@@ -795,8 +795,8 @@ AbstractMainPage {
visible: mainItem.selectedConference && mainItem.selectedConference.core.organizerAddress === modelData.address
color: DefaultStyle.main2_400
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 300 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 300 * mainWindow.dp
}
}
}
@@ -807,8 +807,8 @@ AbstractMainPage {
id: joinButton
Layout.fillWidth: true
text: qsTr("Rejoindre la réunion")
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
focus: true
KeyNavigation.up: shareNetworkButton
KeyNavigation.down: deletePopup
diff --git a/Linphone/view/Page/Main/Start/WelcomePage.qml b/Linphone/view/Page/Main/Start/WelcomePage.qml
index f537a877f..cdfb976d1 100644
--- a/Linphone/view/Page/Main/Start/WelcomePage.qml
+++ b/Linphone/view/Page/Main/Start/WelcomePage.qml
@@ -13,23 +13,23 @@ LoginLayout {
id: welcome
text: qsTr("Bienvenue")
Layout.alignment: Qt.AlignVCenter
- Layout.leftMargin: 132 * DefaultStyle.dp
+ Layout.leftMargin: 132 * mainWindow.dp
color: DefaultStyle.main2_800
font {
- pixelSize: 96 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 96 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
scaleLettersFactor: 1.1
},
Text {
Layout.alignment: Qt.AlignBottom
- Layout.leftMargin: 29 * DefaultStyle.dp
- Layout.bottomMargin: 19 * DefaultStyle.dp
+ Layout.leftMargin: 29 * mainWindow.dp
+ Layout.bottomMargin: 19 * mainWindow.dp
color: DefaultStyle.main2_800
text: qsTr("sur Linphone")
font {
- pixelSize: 36 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 36 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
scaleLettersFactor: 1.1
},
@@ -39,7 +39,7 @@ LoginLayout {
Button {
visible: carousel.currentIndex < (carousel.itemsCount - 1)
flat: true
- Layout.rightMargin: 50 * DefaultStyle.dp
+ Layout.rightMargin: 50 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter | Layout.AlignRight
background: Item {
visible: false
@@ -48,8 +48,8 @@ LoginLayout {
text: qsTr("Passer")
font {
underline: true
- pixelSize: 13 * DefaultStyle.dp
- weight: 600 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 600 * mainWindow.dp
}
}
onClicked: {
@@ -59,26 +59,26 @@ LoginLayout {
}
]
centerContent: ColumnLayout {
- spacing: 76 * DefaultStyle.dp
+ spacing: 76 * mainWindow.dp
anchors.left: parent.left
anchors.top: parent.top
- anchors.leftMargin: 308 * DefaultStyle.dp
- anchors.topMargin: 166 * DefaultStyle.dp
+ anchors.leftMargin: 308 * mainWindow.dp
+ anchors.topMargin: 166 * mainWindow.dp
RowLayout {
id: carouselLayout
- spacing: 76 * DefaultStyle.dp
+ spacing: 76 * mainWindow.dp
Image {
id: carouselImg
- // Layout.rightMargin: 40 * DefaultStyle.dp
- Layout.preferredWidth: 153.22 * DefaultStyle.dp
- Layout.preferredHeight: 155.9 * DefaultStyle.dp
+ // Layout.rightMargin: 40 * mainWindow.dp
+ Layout.preferredWidth: 153.22 * mainWindow.dp
+ Layout.preferredHeight: 155.9 * mainWindow.dp
fillMode: Image.PreserveAspectFit
source: carousel.currentIndex == 0 ? AppIcons.welcomeLinphoneLogo : carousel.currentIndex == 1 ? AppIcons.welcomeLock : AppIcons.welcomeOpenSource
}
Carousel {
id: carousel
- Layout.leftMargin: 75.78 * DefaultStyle.dp
+ Layout.leftMargin: 75.78 * mainWindow.dp
itemsCount: slideRepeater.count
itemsList: Repeater {
id: slideRepeater
@@ -88,21 +88,21 @@ LoginLayout {
{title: qsTr("Open Source"), text: qsTr("Une application open source et un service gratuit
depuis 2001")}
]
ColumnLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
Text {
id: title
text: modelData.title
font {
- pixelSize: 29 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 29 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Text {
id: txt
- Layout.maximumWidth: 361 * DefaultStyle.dp
+ Layout.maximumWidth: 361 * mainWindow.dp
wrapMode: Text.WordWrap
- font.pixelSize: 14 * DefaultStyle.dp
- font.weight: 400 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
+ font.weight: 400 * mainWindow.dp
text: modelData.text
}
}
@@ -111,11 +111,11 @@ LoginLayout {
}
Button {
- Layout.leftMargin: 509 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ Layout.leftMargin: 509 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
text: carousel.currentIndex < (carousel.itemsCount - 1) ? qsTr("Suivant") : qsTr("Commencer")
onClicked: {
if (carousel.currentIndex < carousel.itemsCount - 1) carousel.goToSlide(carousel.currentIndex + 1);
diff --git a/Linphone/view/Page/Window/AbstractWindow.qml b/Linphone/view/Page/Window/AbstractWindow.qml
index f5e0587f4..357d88451 100644
--- a/Linphone/view/Page/Window/AbstractWindow.qml
+++ b/Linphone/view/Page/Window/AbstractWindow.qml
@@ -9,9 +9,12 @@ ApplicationWindow {
id: mainWindow
x: 0
y: 0
- width: Math.min(1512 * DefaultStyle.dp, Screen.desktopAvailableWidth)
- height: Math.min(982 * DefaultStyle.dp, Screen.desktopAvailableHeight)
+ width: Math.min(1512, Screen.desktopAvailableWidth)* mainWindow.dp
+ height: Math.min(982, Screen.desktopAvailableHeight)* mainWindow.dp
+ property real dp: 1/UtilsCpp.getPixelDensity(x,y)
+ onDpChanged: console.log("[ApplicationWindow] new DP: "+dp)
+
MouseArea {
anchors.fill: parent
onClicked: forceActiveFocus()
@@ -35,7 +38,7 @@ ApplicationWindow {
// For C++, requestDialog need to be call directly
onAccepted: requestDialog ? requestDialog.result(1) : callback(1)
onRejected: requestDialog ? requestDialog.result(0) : callback(0)
- width: 278 * DefaultStyle.dp
+ width: 278 * mainWindow.dp
}
}
@@ -50,34 +53,34 @@ ApplicationWindow {
}
underlineColor: DefaultStyle.main1_500_main
anchors.centerIn: parent
- width: 370 * DefaultStyle.dp
+ width: 370 * mainWindow.dp
modal: true
- leftPadding: 15 * DefaultStyle.dp
- rightPadding: 15 * DefaultStyle.dp
- topPadding: 20 * DefaultStyle.dp
- bottomPadding: 25 * DefaultStyle.dp
+ leftPadding: 15 * mainWindow.dp
+ rightPadding: 15 * mainWindow.dp
+ topPadding: 20 * mainWindow.dp
+ bottomPadding: 25 * mainWindow.dp
contentItem: ColumnLayout {
- spacing: 16 * DefaultStyle.dp
+ spacing: 16 * mainWindow.dp
RowLayout {
spacing: 0
Text {
text: qsTr("Which channel do you choose?")
font {
- pixelSize: 16 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Item{Layout.fillWidth: true}
Button {
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
Layout.alignment: Qt.AlignVCenter
background: Item{}
icon.source:AppIcons.closeX
- width: 24 * DefaultStyle.dp
- height: 24 * DefaultStyle.dp
- icon.width: 24 * DefaultStyle.dp
- icon.height: 24 * DefaultStyle.dp
+ width: 24 * mainWindow.dp
+ height: 24 * mainWindow.dp
+ icon.width: 24 * mainWindow.dp
+ icon.height: 24 * mainWindow.dp
contentItem: Image {
anchors.fill: parent
source: AppIcons.closeX
@@ -92,37 +95,37 @@ ApplicationWindow {
}
Layout.fillWidth: true
Layout.preferredHeight: contentHeight
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
delegate: Item {
width: popuplist.width
- height: 56 * DefaultStyle.dp
+ height: 56 * mainWindow.dp
ColumnLayout {
width: popuplist.width
anchors.verticalCenter: parent.verticalCenter
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
ColumnLayout {
- spacing: 7 * DefaultStyle.dp
+ spacing: 7 * mainWindow.dp
Text {
- Layout.leftMargin: 5 * DefaultStyle.dp
+ Layout.leftMargin: 5 * mainWindow.dp
text: modelData.label + " :"
font {
- pixelSize: 13 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
Text {
- Layout.leftMargin: 5 * DefaultStyle.dp
+ Layout.leftMargin: 5 * mainWindow.dp
text: modelData.address
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
Rectangle {
visible: index != popuplist.model.count - 1
Layout.fillWidth: true
- Layout.preferredHeight: 1 * DefaultStyle.dp
+ Layout.preferredHeight: 1 * mainWindow.dp
color: DefaultStyle.main2_200
}
}
@@ -229,7 +232,7 @@ ApplicationWindow {
property int nextY: mainWindow.height
property list popupList
property int popupCount: popupList.length
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
onPopupCountChanged: {
nextY = mainWindow.height
for(var i = 0; i < popupCount; ++i) {
@@ -245,9 +248,9 @@ ApplicationWindow {
modal: true
closePolicy: Popup.NoAutoClose
anchors.centerIn: parent
- padding: 20 * DefaultStyle.dp
+ padding: 20 * mainWindow.dp
underlineColor: DefaultStyle.main1_500_main
- radius: 15 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
}
FPSCounter{
anchors.top: parent.top
@@ -260,7 +263,7 @@ ApplicationWindow {
id: fpsText
font.bold: true
font.italic: true
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
text: parent.fps + " FPS"
color: parent.fps < 30 ? DefaultStyle.danger_500main : DefaultStyle.main2_900
}
diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml
index 51bd561c7..290d41469 100644
--- a/Linphone/view/Page/Window/Call/CallsWindow.qml
+++ b/Linphone/view/Page/Window/Call/CallsWindow.qml
@@ -149,7 +149,7 @@ AbstractWindow {
Dialog {
id: terminateAllCallsDialog
onAccepted: call.core.lTerminateAllCalls()
- width: 278 * DefaultStyle.dp
+ width: 278 * mainWindow.dp
text: qsTr("La fenêtre est sur le point d'être fermée. Cela terminera tous les appels en cours. Souhaitez vous continuer ?")
}
@@ -186,11 +186,11 @@ AbstractWindow {
? DefaultStyle.main2_400
: DefaultStyle.grey_500
: DefaultStyle.grey_600
- radius: 71 * DefaultStyle.dp
+ radius: 71 * mainWindow.dp
}
icon.source: disabledIcon && bottomButton.checked ? disabledIcon : enabledIcon
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
contentImageColor: DefaultStyle.grey_0
}
ZrtpAuthenticationDialog {
@@ -203,11 +203,11 @@ AbstractWindow {
modal: true
closePolicy: Control.Popup.NoAutoClose
anchors.centerIn: parent
- padding: 20 * DefaultStyle.dp
+ padding: 20 * mainWindow.dp
underlineColor: DefaultStyle.main1_500_main
- radius: 15 * DefaultStyle.dp
- width: 278 * DefaultStyle.dp
- height: 115 * DefaultStyle.dp
+ radius: 15 * mainWindow.dp
+ width: 278 * mainWindow.dp
+ height: 115 * mainWindow.dp
Connections {
target: mainWindow
function onTransferStateChanged() {
@@ -222,16 +222,16 @@ AbstractWindow {
contentItem: ColumnLayout {
spacing: 0
BusyIndicator{
- Layout.preferredWidth: 33 * DefaultStyle.dp
- Layout.preferredHeight: 33 * DefaultStyle.dp
+ Layout.preferredWidth: 33 * mainWindow.dp
+ Layout.preferredHeight: 33 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
}
Text {
Layout.alignment: Qt.AlignHCenter
text: qsTr("Transfert en cours, veuillez patienter")
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
}
}
@@ -245,13 +245,13 @@ AbstractWindow {
}
Control.Control {
id: zrtpValidationToast
- // width: 269 * DefaultStyle.dp
+ // width: 269 * mainWindow.dp
y: -height*2
z: 1
- topPadding: 8 * DefaultStyle.dp
- bottomPadding: 8 * DefaultStyle.dp
- leftPadding: 50 * DefaultStyle.dp
- rightPadding: 50 * DefaultStyle.dp
+ topPadding: 8 * mainWindow.dp
+ bottomPadding: 8 * mainWindow.dp
+ leftPadding: 50 * mainWindow.dp
+ rightPadding: 50 * mainWindow.dp
anchors.horizontalCenter: parent.horizontalCenter
clip: true
function open() {
@@ -263,15 +263,15 @@ AbstractWindow {
anchors.fill: parent
color: DefaultStyle.grey_0
border.color: DefaultStyle.info_500_main
- border.width: 1 * DefaultStyle.dp
- radius: 50 * DefaultStyle.dp
+ border.width: 1 * mainWindow.dp
+ radius: 50 * mainWindow.dp
}
contentItem: RowLayout {
// anchors.centerIn: parent
Image {
source: AppIcons.trusted
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
fillMode: Image.PreserveAspectFit
Layout.fillWidth: true
}
@@ -280,7 +280,7 @@ AbstractWindow {
text: qsTr("Appareil vérifié")
Layout.fillWidth: true
font {
- pixelSize: 14 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
}
}
}
@@ -293,27 +293,27 @@ AbstractWindow {
color: DefaultStyle.grey_900
ColumnLayout {
anchors.fill: parent
- spacing: 10 * DefaultStyle.dp
- anchors.bottomMargin: 10 * DefaultStyle.dp
- anchors.topMargin: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
+ anchors.bottomMargin: 10 * mainWindow.dp
+ anchors.topMargin: 10 * mainWindow.dp
Item {
id: headerItem
- Layout.margins: 10 * DefaultStyle.dp
- Layout.leftMargin: 20 * DefaultStyle.dp
+ Layout.margins: 10 * mainWindow.dp
+ Layout.leftMargin: 20 * mainWindow.dp
Layout.fillWidth: true
- Layout.minimumHeight: 25 * DefaultStyle.dp
+ Layout.minimumHeight: 25 * mainWindow.dp
RowLayout {
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
ColumnLayout {
RowLayout {
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
EffectImage {
id: callStatusIcon
- Layout.preferredWidth: 30 * DefaultStyle.dp
- Layout.preferredHeight: 30 * DefaultStyle.dp
+ Layout.preferredWidth: 30 * mainWindow.dp
+ Layout.preferredHeight: 30 * mainWindow.dp
// TODO : change with broadcast or meeting icon when available
imageSource: !mainWindow.call
? AppIcons.meeting
@@ -356,51 +356,51 @@ AbstractWindow {
: remoteName
color: DefaultStyle.grey_0
font {
- pixelSize: 22 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
}
Rectangle {
visible: mainWindow.call && (mainWindow.callState === LinphoneEnums.CallState.Connected
|| mainWindow.callState === LinphoneEnums.CallState.StreamsRunning)
Layout.preferredHeight: parent.height
- Layout.preferredWidth: 2 * DefaultStyle.dp
+ Layout.preferredWidth: 2 * mainWindow.dp
color: DefaultStyle.grey_0
}
Text {
text: mainWindow.call ? UtilsCpp.formatElapsedTime(mainWindow.call.core.duration) : ""
color: DefaultStyle.grey_0
font {
- pixelSize: 22 * DefaultStyle.dp
- weight: 800 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp
+ weight: 800 * mainWindow.dp
}
visible: mainWindow.callState === LinphoneEnums.CallState.Connected
|| mainWindow.callState === LinphoneEnums.CallState.StreamsRunning
}
Text {
- Layout.leftMargin: 14 * DefaultStyle.dp
+ Layout.leftMargin: 14 * mainWindow.dp
id: conferenceDate
text: mainWindow.conferenceInfo ? mainWindow.conferenceInfo.core.getStartEndDateString() : ""
color: DefaultStyle.grey_0
font {
- pixelSize: 14 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp
+ weight: 400 * mainWindow.dp
capitalization: Font.Capitalize
}
}
}
RowLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
visible: mainWindow.callState === LinphoneEnums.CallState.Connected || mainWindow.callState === LinphoneEnums.CallState.StreamsRunning
BusyIndicator {
visible: mainWindow.call && mainWindow.callState != LinphoneEnums.CallState.Connected && mainWindow.callState != LinphoneEnums.CallState.StreamsRunning
- Layout.preferredWidth: 15 * DefaultStyle.dp
- Layout.preferredHeight: 15 * DefaultStyle.dp
+ Layout.preferredWidth: 15 * mainWindow.dp
+ Layout.preferredHeight: 15 * mainWindow.dp
indicatorColor: DefaultStyle.grey_0
}
EffectImage {
- Layout.preferredWidth: 15 * DefaultStyle.dp
- Layout.preferredHeight: 15 * DefaultStyle.dp
+ Layout.preferredWidth: 15 * mainWindow.dp
+ Layout.preferredHeight: 15 * mainWindow.dp
colorizationColor: mainWindow.call
? mainWindow.call.core.encryption === LinphoneEnums.MediaEncryption.Srtp
? DefaultStyle.info_500_main
@@ -442,8 +442,8 @@ AbstractWindow {
: DefaultStyle.grey_0
: DefaultStyle.grey_0
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 400 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 400 * mainWindow.dp
}
MouseArea {
anchors.fill: parent
@@ -464,9 +464,9 @@ AbstractWindow {
Layout.fillWidth: true
}
EffectImage {
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
- Layout.rightMargin: 30 * DefaultStyle.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
+ Layout.rightMargin: 30 * mainWindow.dp
property int quality: mainWindow.call ? mainWindow.call.core.quality : 0
imageSource: quality >= 4
? AppIcons.cellSignalFull
@@ -498,28 +498,28 @@ AbstractWindow {
: (mainWindow.call.core.recording || mainWindow.call.core.remoteRecording)
: false
anchors.centerIn: parent
- leftPadding: 14 * DefaultStyle.dp
- rightPadding: 14 * DefaultStyle.dp
- topPadding: 6 * DefaultStyle.dp
- bottomPadding: 6 * DefaultStyle.dp
+ leftPadding: 14 * mainWindow.dp
+ rightPadding: 14 * mainWindow.dp
+ topPadding: 6 * mainWindow.dp
+ bottomPadding: 6 * mainWindow.dp
background: Rectangle {
anchors.fill: parent
color: DefaultStyle.grey_500
- radius: 10 * DefaultStyle.dp
+ radius: 10 * mainWindow.dp
}
contentItem: RowLayout {
- spacing: 85 * DefaultStyle.dp
+ spacing: 85 * mainWindow.dp
RowLayout {
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
EffectImage {
imageSource: AppIcons.recordFill
colorizationColor: DefaultStyle.danger_500main
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
Text {
color: DefaultStyle.danger_500main
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
text: mainWindow.call
? mainWindow.call.core.recording
? mainWindow.conference ? qsTr("Vous enregistrez la réunion") : qsTr("Vous enregistrez l'appel")
@@ -540,7 +540,7 @@ AbstractWindow {
RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
- spacing: 23 * DefaultStyle.dp
+ spacing: 23 * mainWindow.dp
Control.StackView {
id: middleItemStackView
initialItem: inCallItem
@@ -550,9 +550,9 @@ AbstractWindow {
CallSettingsPanel {
id: rightPanel
Layout.fillHeight: true
- Layout.rightMargin: 20 * DefaultStyle.dp
- Layout.preferredWidth: 393 * DefaultStyle.dp
- Layout.topMargin: 10 * DefaultStyle.dp
+ Layout.rightMargin: 20 * mainWindow.dp
+ Layout.preferredWidth: 393 * mainWindow.dp
+ Layout.topMargin: 10 * mainWindow.dp
property int currentIndex: 0
visible: false
function replace(id) {
@@ -579,9 +579,9 @@ AbstractWindow {
NewCallForm {
id: newCallForm
anchors.fill: parent
- anchors.topMargin: 21 * DefaultStyle.dp
- anchors.leftMargin: 16 * DefaultStyle.dp
- anchors.rightMargin: 16 * DefaultStyle.dp
+ anchors.topMargin: 21 * mainWindow.dp
+ anchors.leftMargin: 16 * mainWindow.dp
+ anchors.rightMargin: 16 * mainWindow.dp
groupCallVisible: false
searchBarColor: DefaultStyle.grey_0
searchBarBorderColor: DefaultStyle.grey_200
@@ -601,16 +601,16 @@ AbstractWindow {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
- height: 402 * DefaultStyle.dp
+ height: 402 * mainWindow.dp
NumericPadPopup {
id: numPadPopup
width: parent.width
roundedBottom: true
visible: false
- leftPadding: 40 * DefaultStyle.dp
- rightPadding: 40 * DefaultStyle.dp
- topPadding: 41 * DefaultStyle.dp
- bottomPadding: 18 * DefaultStyle.dp
+ leftPadding: 40 * mainWindow.dp
+ rightPadding: 40 * mainWindow.dp
+ topPadding: 41 * mainWindow.dp
+ bottomPadding: 18 * mainWindow.dp
onLaunchCall: {
UtilsCpp.createCall(dialerTextInput.text)
}
@@ -637,8 +637,8 @@ AbstractWindow {
SearchBar {
id: dialerTextInput
Layout.fillWidth: true
- Layout.leftMargin: 10 * DefaultStyle.dp
- Layout.rightMargin: 10 * DefaultStyle.dp
+ Layout.leftMargin: 10 * mainWindow.dp
+ Layout.rightMargin: 10 * mainWindow.dp
magnifierVisible: false
color: DefaultStyle.grey_0
borderColor: DefaultStyle.grey_200
@@ -650,7 +650,7 @@ AbstractWindow {
Item {
Layout.preferredWidth: parent.width
Layout.preferredHeight: numPadPopup.height
- Layout.topMargin: 10 * DefaultStyle.dp
+ Layout.topMargin: 10 * mainWindow.dp
NumericPadPopup {
id: numPadPopup
width: parent.width
@@ -659,10 +659,10 @@ AbstractWindow {
visible: parent.visible
currentCall: callsModel.currentCall
lastRowVisible: false
- leftPadding: 40 * DefaultStyle.dp
- rightPadding: 40 * DefaultStyle.dp
- topPadding: 41 * DefaultStyle.dp
- bottomPadding: 18 * DefaultStyle.dp
+ leftPadding: 40 * mainWindow.dp
+ rightPadding: 40 * mainWindow.dp
+ topPadding: 41 * mainWindow.dp
+ bottomPadding: 18 * mainWindow.dp
onLaunchCall: {
UtilsCpp.createCall(dialerTextInput.text)
}
@@ -682,15 +682,15 @@ AbstractWindow {
}
ColumnLayout {
anchors.fill: parent
- anchors.topMargin: 16 * DefaultStyle.dp
- anchors.bottomMargin: 16 * DefaultStyle.dp
- anchors.leftMargin: 17 * DefaultStyle.dp
- anchors.rightMargin: 17 * DefaultStyle.dp
- spacing: 12 * DefaultStyle.dp
+ anchors.topMargin: 16 * mainWindow.dp
+ anchors.bottomMargin: 16 * mainWindow.dp
+ anchors.leftMargin: 17 * mainWindow.dp
+ anchors.rightMargin: 17 * mainWindow.dp
+ spacing: 12 * mainWindow.dp
Text {
Layout.fillWidth: true
text: qsTr("La disposition choisie sera enregistrée pour vos prochaines réunions")
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
color: DefaultStyle.main2_500main
}
RoundedPane {
@@ -707,9 +707,9 @@ AbstractWindow {
id: radiobutton
checkOnClick: false
color: DefaultStyle.main1_500_main
- indicatorSize: 20 * DefaultStyle.dp
+ indicatorSize: 20 * mainWindow.dp
leftPadding: indicator.width + spacing
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
checkable: false // Qt Documentation is wrong: It is true by default. We don't want to change the checked state if the layout change is not effective.
checked: index == 0
? mainWindow.conferenceLayout === LinphoneEnums.ConferenceLayout.Grid
@@ -719,11 +719,11 @@ AbstractWindow {
onClicked: mainWindow.changeLayout(index)
contentItem: RowLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
EffectImage {
id: radioButtonImg
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
imageSource: modelData.imgUrl
colorizationColor: DefaultStyle.main2_500main
}
@@ -731,7 +731,7 @@ AbstractWindow {
text: modelData.text
color: DefaultStyle.main2_500main
verticalAlignment: Text.AlignVCenter
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
Layout.fillWidth: true
}
}
@@ -765,16 +765,16 @@ AbstractWindow {
popup.contentItem: Button {
background: Item{}
contentItem: RowLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
EffectImage {
colorizationColor: DefaultStyle.main2_600
imageSource: AppIcons.arrowsMerge
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
}
Text {
text: qsTr("Merger tous les appels")
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
}
onClicked: {
@@ -788,15 +788,15 @@ AbstractWindow {
Layout.fillWidth: true
Layout.maximumHeight: rightPanel.height
visible: callList.contentHeight > 0
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 6 * DefaultStyle.dp
- topPadding: 15 * DefaultStyle.dp
- bottomPadding: 16 * DefaultStyle.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 6 * mainWindow.dp
+ topPadding: 15 * mainWindow.dp
+ bottomPadding: 16 * mainWindow.dp
- Layout.topMargin: 15 * DefaultStyle.dp
- Layout.bottomMargin: 16 * DefaultStyle.dp
- Layout.leftMargin: 16 * DefaultStyle.dp
- Layout.rightMargin: 16 * DefaultStyle.dp
+ Layout.topMargin: 15 * mainWindow.dp
+ Layout.bottomMargin: 16 * mainWindow.dp
+ Layout.leftMargin: 16 * mainWindow.dp
+ Layout.rightMargin: 16 * mainWindow.dp
contentItem: ListView {
id: callList
@@ -804,14 +804,14 @@ AbstractWindow {
id: callProxy
}
implicitHeight: contentHeight// Math.min(contentHeight, rightPanel.height)
- spacing: 15 * DefaultStyle.dp
+ spacing: 15 * mainWindow.dp
clip: true
onCountChanged: forceLayout()
delegate: Item {
id: callDelegate
width: callList.width
- height: 45 * DefaultStyle.dp
+ height: 45 * mainWindow.dp
RowLayout {
id: delegateContent
@@ -820,8 +820,8 @@ AbstractWindow {
Avatar {
id: delegateAvatar
_address: modelData.core.remoteAddress
- Layout.preferredWidth: 45 * DefaultStyle.dp
- Layout.preferredHeight: 45 * DefaultStyle.dp
+ Layout.preferredWidth: 45 * mainWindow.dp
+ Layout.preferredHeight: 45 * mainWindow.dp
}
Text {
id: delegateName
@@ -829,7 +829,7 @@ AbstractWindow {
text: modelData.core.isConference
? modelData.core.conference.core.subject
: remoteAddress ? remoteAddress.value : ""
- Layout.leftMargin: 8 * DefaultStyle.dp
+ Layout.leftMargin: 8 * mainWindow.dp
}
Item {
Layout.fillHeight: true
@@ -837,7 +837,7 @@ AbstractWindow {
}
Text {
id: callStateText
- Layout.rightMargin: 2 * DefaultStyle.dp
+ Layout.rightMargin: 2 * mainWindow.dp
property string type: modelData.core.isConference ? qsTr('Réunion') : qsTr('Appel')
text: modelData.core.state === LinphoneEnums.CallState.Paused
|| modelData.core.state === LinphoneEnums.CallState.PausedByRemote
@@ -846,9 +846,9 @@ AbstractWindow {
}
PopupButton {
id: listCallOptionsButton
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
- Layout.rightMargin: 10 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
+ Layout.rightMargin: 10 * mainWindow.dp
popup.contentItem: ColumnLayout {
spacing: 0
@@ -859,15 +859,15 @@ AbstractWindow {
KeyNavigation.down: endCallButton
background: Item {}
contentItem: RowLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
Image {
source: modelData.core.state === LinphoneEnums.CallState.Paused
|| modelData.core.state === LinphoneEnums.CallState.PausedByRemote
? AppIcons.phone : AppIcons.pause
- sourceSize.width: 32 * DefaultStyle.dp
- sourceSize.height: 32 * DefaultStyle.dp
- Layout.preferredWidth: 32 * DefaultStyle.dp
- Layout.preferredHeight: 32 * DefaultStyle.dp
+ sourceSize.width: 32 * mainWindow.dp
+ sourceSize.height: 32 * mainWindow.dp
+ Layout.preferredWidth: 32 * mainWindow.dp
+ Layout.preferredHeight: 32 * mainWindow.dp
fillMode: Image.PreserveAspectFit
}
Text {
@@ -889,12 +889,12 @@ AbstractWindow {
KeyNavigation.down: pausingButton
background: Item {}
contentItem: RowLayout {
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
EffectImage {
imageSource: AppIcons.endCall
colorizationColor: DefaultStyle.danger_500main
- width: 32 * DefaultStyle.dp
- height: 32 * DefaultStyle.dp
+ width: 32 * mainWindow.dp
+ height: 32 * mainWindow.dp
}
Text {
color: DefaultStyle.danger_500main
@@ -933,10 +933,10 @@ AbstractWindow {
id: inSettingsPanel
call: mainWindow.call
anchors.fill: parent
- anchors.topMargin: 16 * DefaultStyle.dp
- anchors.bottomMargin: 16 * DefaultStyle.dp
- anchors.leftMargin: 17 * DefaultStyle.dp
- anchors.rightMargin: 17 * DefaultStyle.dp
+ anchors.topMargin: 16 * mainWindow.dp
+ anchors.bottomMargin: 16 * mainWindow.dp
+ anchors.leftMargin: 17 * mainWindow.dp
+ anchors.rightMargin: 17 * mainWindow.dp
}
}
}
@@ -952,10 +952,10 @@ AbstractWindow {
}
ScreencastSettings {
anchors.fill: parent
- anchors.topMargin: 16 * DefaultStyle.dp
- anchors.bottomMargin: 16 * DefaultStyle.dp
- anchors.leftMargin: 17 * DefaultStyle.dp
- anchors.rightMargin: 17 * DefaultStyle.dp
+ anchors.topMargin: 16 * mainWindow.dp
+ anchors.bottomMargin: 16 * mainWindow.dp
+ anchors.leftMargin: 17 * mainWindow.dp
+ anchors.rightMargin: 17 * mainWindow.dp
call: mainWindow.call
}
}
@@ -973,9 +973,9 @@ AbstractWindow {
Control.StackView {
id: participantsStack
anchors.fill: parent
- anchors.bottomMargin: 16 * DefaultStyle.dp
- anchors.leftMargin: 17 * DefaultStyle.dp
- anchors.rightMargin: 17 * DefaultStyle.dp
+ anchors.bottomMargin: 16 * mainWindow.dp
+ anchors.leftMargin: 17 * mainWindow.dp
+ anchors.rightMargin: 17 * mainWindow.dp
initialItem: participantListComp
onCurrentItemChanged: rightPanel.headerStack.currentIndex = currentItem.Control.StackView.index
property list selectedParticipants
@@ -1000,12 +1000,12 @@ AbstractWindow {
EffectImage {
colorizationColor: DefaultStyle.main2_600
imageSource: AppIcons.shareNetwork
- Layout.preferredWidth: 24 * DefaultStyle.dp
- Layout.preferredHeight: 24 * DefaultStyle.dp
+ Layout.preferredWidth: 24 * mainWindow.dp
+ Layout.preferredHeight: 24 * mainWindow.dp
}
Text {
text: qsTr("Partager le lien de la réunion")
- font.pixelSize: 14 * DefaultStyle.dp
+ font.pixelSize: 14 * mainWindow.dp
}
}
onClicked: {
@@ -1072,35 +1072,35 @@ AbstractWindow {
}
RoundedPane {
Layout.fillWidth: true
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
- topPadding: 13 * DefaultStyle.dp
- bottomPadding: 13 * DefaultStyle.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
+ topPadding: 13 * mainWindow.dp
+ bottomPadding: 13 * mainWindow.dp
- Layout.topMargin: 13 * DefaultStyle.dp
- Layout.leftMargin: 16 * DefaultStyle.dp
- Layout.rightMargin: 16 * DefaultStyle.dp
+ Layout.topMargin: 13 * mainWindow.dp
+ Layout.leftMargin: 16 * mainWindow.dp
+ Layout.rightMargin: 16 * mainWindow.dp
contentItem: ColumnLayout {
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
Text {
text: qsTr("Chiffrement :")
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
ColumnLayout {
Layout.alignment: Qt.AlignHCenter
- spacing: 7 * DefaultStyle.dp
+ spacing: 7 * mainWindow.dp
Text {
property bool isPostQuantum: mainWindow.call.core.encryption === LinphoneEnums.MediaEncryption.Zrtp && mainWindow.call.core.zrtpStats.isPostQuantum
text: qsTr("Chiffrement du média : %1%2").arg(isPostQuantum ? "post Quantum " : "").arg(mainWindow.call.core.encryptionString)
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
ColumnLayout {
@@ -1109,40 +1109,40 @@ AbstractWindow {
text: qsTr("Cipher algorithm : %1").arg(mainWindow.call && mainWindow.call.core.zrtpStats.cipherAlgo)
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: qsTr("Key agreement algorithm : %1").arg(mainWindow.call && mainWindow.call.core.zrtpStats.keyAgreementAlgo)
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: qsTr("Hash algorithm : %1").arg(mainWindow.call && mainWindow.call.core.zrtpStats.hashAlgo)
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: qsTr("Authentication algorithm : %1").arg(mainWindow.call && mainWindow.call.core.zrtpStats.authenticationAlgo)
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: qsTr("SAS algorithm : %1").arg(mainWindow.call && mainWindow.call.core.zrtpStats.sasAlgo)
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
}
@@ -1155,13 +1155,13 @@ AbstractWindow {
Layout.fillWidth: true
text: qsTr("Validation chiffrement")
onClicked: zrtpValidation.open()
- Layout.bottomMargin: 13 * DefaultStyle.dp
- Layout.leftMargin: 16 * DefaultStyle.dp
- Layout.rightMargin: 16 * DefaultStyle.dp
- leftPadding: 20 * DefaultStyle.dp
- rightPadding: 20 * DefaultStyle.dp
- topPadding: 11 * DefaultStyle.dp
- bottomPadding: 11 * DefaultStyle.dp
+ Layout.bottomMargin: 13 * mainWindow.dp
+ Layout.leftMargin: 16 * mainWindow.dp
+ Layout.rightMargin: 16 * mainWindow.dp
+ leftPadding: 20 * mainWindow.dp
+ rightPadding: 20 * mainWindow.dp
+ topPadding: 11 * mainWindow.dp
+ bottomPadding: 11 * mainWindow.dp
}
}
}
@@ -1169,65 +1169,65 @@ AbstractWindow {
id: statsPanel
ColumnLayout {
property string objectName: "statsPanel"
- spacing: 20 * DefaultStyle.dp
+ spacing: 20 * mainWindow.dp
Control.StackView.onActivated: {
rightPanel.headerTitleText = qsTr("Statistiques")
}
RoundedPane {
Layout.fillWidth: true
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
- topPadding: 13 * DefaultStyle.dp
- bottomPadding: 13 * DefaultStyle.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
+ topPadding: 13 * mainWindow.dp
+ bottomPadding: 13 * mainWindow.dp
- Layout.topMargin: 13 * DefaultStyle.dp
- Layout.leftMargin: 16 * DefaultStyle.dp
- Layout.rightMargin: 16 * DefaultStyle.dp
+ Layout.topMargin: 13 * mainWindow.dp
+ Layout.leftMargin: 16 * mainWindow.dp
+ Layout.rightMargin: 16 * mainWindow.dp
contentItem: ColumnLayout {
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
Text {
text: qsTr("Audio")
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
ColumnLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
Text {
text: mainWindow.call ? mainWindow.call.core.audioStats.codec : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: mainWindow.call ? mainWindow.call.core.audioStats.bandwidth : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: mainWindow.call ? mainWindow.call.core.audioStats.lossRate : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: mainWindow.call ? mainWindow.call.core.audioStats.jitterBufferSize : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
}
@@ -1235,68 +1235,68 @@ AbstractWindow {
}
RoundedPane {
Layout.fillWidth: true
- leftPadding: 16 * DefaultStyle.dp
- rightPadding: 16 * DefaultStyle.dp
- topPadding: 13 * DefaultStyle.dp
- bottomPadding: 13 * DefaultStyle.dp
+ leftPadding: 16 * mainWindow.dp
+ rightPadding: 16 * mainWindow.dp
+ topPadding: 13 * mainWindow.dp
+ bottomPadding: 13 * mainWindow.dp
- Layout.leftMargin: 16 * DefaultStyle.dp
- Layout.rightMargin: 16 * DefaultStyle.dp
+ Layout.leftMargin: 16 * mainWindow.dp
+ Layout.rightMargin: 16 * mainWindow.dp
visible: mainWindow.localVideoEnabled || mainWindow.remoteVideoEnabled
contentItem: ColumnLayout {
- spacing: 12 * DefaultStyle.dp
+ spacing: 12 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
Text {
text: qsTr("Vidéo")
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 700 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 700 * mainWindow.dp
}
}
ColumnLayout {
- spacing: 8 * DefaultStyle.dp
+ spacing: 8 * mainWindow.dp
Layout.alignment: Qt.AlignHCenter
Text {
text: mainWindow.call ? mainWindow.call.core.videoStats.codec : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: mainWindow.call ? mainWindow.call.core.videoStats.bandwidth : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: mainWindow.call ? mainWindow.call.core.videoStats.lossRate : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: mainWindow.call ? mainWindow.call.core.videoStats.resolution : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
Text {
text: mainWindow.call ? mainWindow.call.core.videoStats.fps : ""
Layout.alignment: Qt.AlignHCenter
font {
- pixelSize: 12 * DefaultStyle.dp
- weight: 500 * DefaultStyle.dp
+ pixelSize: 12 * mainWindow.dp
+ weight: 500 * mainWindow.dp
}
}
}
@@ -1363,9 +1363,9 @@ AbstractWindow {
property string objectName: "inCallItem"
CallLayout{
anchors.fill: parent
- anchors.leftMargin: 20 * DefaultStyle.dp
- anchors.rightMargin: (rightPanel.visible ? 0 : 10) * DefaultStyle.dp // Grid and AS have 10 in right margin (so apply -10 here)
- anchors.topMargin: 10 * DefaultStyle.dp
+ anchors.leftMargin: 20 * mainWindow.dp
+ anchors.rightMargin: (rightPanel.visible ? 0 : 10) * mainWindow.dp // Grid and AS have 10 in right margin (so apply -10 here)
+ anchors.topMargin: 10 * mainWindow.dp
call: mainWindow.call
callTerminatedByUser: mainWindow.callTerminatedByUser
}
@@ -1378,7 +1378,7 @@ AbstractWindow {
RowLayout {
id: bottomButtonsLayout
Layout.alignment: Qt.AlignHCenter
- spacing: 58 * DefaultStyle.dp
+ spacing: 58 * mainWindow.dp
visible: middleItemStackView.currentItem.objectName == "inCallItem"
function refreshLayout() {
@@ -1407,10 +1407,10 @@ AbstractWindow {
Button {
Layout.row: 0
icon.source: AppIcons.endCall
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
- Layout.preferredWidth: 75 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
+ Layout.preferredWidth: 75 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
contentImageColor: DefaultStyle.grey_0
checkable: false
Layout.column: mainWindow.callState == LinphoneEnums.CallState.OutgoingInit
@@ -1422,7 +1422,7 @@ AbstractWindow {
background: Rectangle {
anchors.fill: parent
color: DefaultStyle.danger_500main
- radius: 71 * DefaultStyle.dp
+ radius: 71 * mainWindow.dp
}
onClicked: {
mainWindow.endCall(mainWindow.call)
@@ -1434,16 +1434,16 @@ AbstractWindow {
visible: false
Layout.row: 0
Layout.column: 1
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
CheckableButton {
id: pauseButton
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
background: Rectangle {
anchors.fill: parent
- radius: 71 * DefaultStyle.dp
+ radius: 71 * mainWindow.dp
color: parent.enabled
? parent.checked
? DefaultStyle.success_500main
@@ -1463,10 +1463,10 @@ AbstractWindow {
id: transferCallButton
visible: !mainWindow.conference
icon.source: AppIcons.transferCall
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
contentImageColor: enabled ? DefaultStyle.grey_0 : DefaultStyle.grey_500
onCheckedChanged: {
if (checked) {
@@ -1485,10 +1485,10 @@ AbstractWindow {
id: newCallButton
checkable: false
icon.source: AppIcons.newCall
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
onClicked: {
var mainWin = UtilsCpp.getMainWindow()
UtilsCpp.smartShowWindow(mainWin)
@@ -1504,37 +1504,37 @@ AbstractWindow {
|| mainWindow.callState == LinphoneEnums.CallState.OutgoingEarlyMedia
|| mainWindow.callState == LinphoneEnums.CallState.IncomingReceived
? bottomButtonsLayout.columns - 1 : 0
- spacing: 10 * DefaultStyle.dp
+ spacing: 10 * mainWindow.dp
CheckableButton {
id: videoCameraButton
enabled: mainWindow.conferenceInfo || (mainWindow.callState === LinphoneEnums.CallState.Connected || mainWindow.callState === LinphoneEnums.CallState.StreamsRunning)
iconUrl: AppIcons.videoCamera
checkedIconUrl: AppIcons.videoCameraSlash
checked: !mainWindow.localVideoEnabled
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
onClicked: mainWindow.call.core.lSetLocalVideoEnabled(!mainWindow.call.core.localVideoEnabled)
}
CheckableButton {
iconUrl: AppIcons.microphone
checkedIconUrl: AppIcons.microphoneSlash
checked: mainWindow.call && mainWindow.call.core.microphoneMuted
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
onClicked: mainWindow.call.core.lSetMicrophoneMuted(!mainWindow.call.core.microphoneMuted)
}
CheckableButton {
iconUrl: AppIcons.screencast
visible: !!mainWindow.conference
checkedColor: DefaultStyle.main2_400
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
onCheckedChanged: {
if (checked) {
rightPanel.visible = true
@@ -1549,29 +1549,29 @@ AbstractWindow {
checkable: false
checkedColor: DefaultStyle.main2_400
iconUrl: AppIcons.handWaving
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
}
CheckableButton {
visible: false
iconUrl: AppIcons.smiley
checkedColor: DefaultStyle.main2_400
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
}
CheckableButton {
id: participantListButton
visible: mainWindow.conference
iconUrl: AppIcons.usersTwo
checkedColor: DefaultStyle.main2_400
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
onCheckedChanged: {
if (checked) {
rightPanel.visible = true
@@ -1587,8 +1587,8 @@ AbstractWindow {
}
PopupButton {
id: moreOptionsButton
- Layout.preferredWidth: 55 * DefaultStyle.dp
- Layout.preferredHeight: 55 * DefaultStyle.dp
+ Layout.preferredWidth: 55 * mainWindow.dp
+ Layout.preferredHeight: 55 * mainWindow.dp
contentImageColor: enabled && !checked ? DefaultStyle.grey_0 : DefaultStyle.grey_500
icon.source: AppIcons.more
background: Rectangle {
@@ -1598,7 +1598,7 @@ AbstractWindow {
? DefaultStyle.main2_400
: DefaultStyle.grey_500
: DefaultStyle.grey_600
- radius: 40 * DefaultStyle.dp
+ radius: 40 * mainWindow.dp
}
popup.x: width/2
Connections {
@@ -1609,25 +1609,25 @@ AbstractWindow {
}
component MenuButton: Button {
background: Item{}
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
textColor: down || checked ? DefaultStyle.main1_500_main : DefaultStyle.main2_500main
contentImageColor: down || checked ? DefaultStyle.main1_500_main : DefaultStyle.main2_500main
- textSize: 14 * DefaultStyle.dp
- textWeight: 400 * DefaultStyle.dp
+ textSize: 14 * mainWindow.dp
+ textWeight: 400 * mainWindow.dp
textHAlignment: Text.AlignLeft
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
}
popup.contentItem: ColumnLayout {
id: optionsList
- spacing: 5 * DefaultStyle.dp
+ spacing: 5 * mainWindow.dp
MenuButton {
visible: mainWindow.conference
Layout.fillWidth: true
icon.source: AppIcons.squaresFour
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
text: qsTr("Modifier la disposition")
onClicked: {
rightPanel.visible = true
@@ -1639,8 +1639,8 @@ AbstractWindow {
visible: mainWindow.conference
Layout.fillWidth: true
icon.source: AppIcons.fullscreen
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
text: qsTr("Mode Plein écran")
checkable: true
onToggled: {
@@ -1678,8 +1678,8 @@ AbstractWindow {
visible: mainWindow.call && !mainWindow.conference && !SettingsCpp.disableCallRecordings
enabled: mainWindow.call && mainWindow.call.core.recordable
icon.source: AppIcons.recordFill
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
checked: mainWindow.call && mainWindow.call.core.recording
contentImageColor: down
? DefaultStyle.main1_500_main
@@ -1702,8 +1702,8 @@ AbstractWindow {
MenuButton {
checkable: true
icon.source: !mainWindow.call || mainWindow.call.core.speakerMuted ? AppIcons.speakerSlash : AppIcons.speaker
- icon.width: 32 * DefaultStyle.dp
- icon.height: 32 * DefaultStyle.dp
+ icon.width: 32 * mainWindow.dp
+ icon.height: 32 * mainWindow.dp
contentImageColor: down
? DefaultStyle.main1_500_main
: mainWindow.call && mainWindow.call.core.speakerMuted
diff --git a/Linphone/view/Page/Window/Main/MainWindow.qml b/Linphone/view/Page/Window/Main/MainWindow.qml
index ebdf1aa1d..a5eaf3570 100644
--- a/Linphone/view/Page/Window/Main/MainWindow.qml
+++ b/Linphone/view/Page/Window/Main/MainWindow.qml
@@ -9,7 +9,7 @@ import LinphoneAccountsCpp
AbstractWindow {
id: mainWindow
- // height: 982 * DefaultStyle.dp
+ // height: 982 * mainWindow.dp
title: qsTr("Linphone")
// TODO : handle this bool when security mode is implemented
property bool firstConnection: true
@@ -22,7 +22,7 @@ AbstractWindow {
// flags: Qt.Window | Qt.FramelessWindowHint | Qt.WindowTitleHint
// menuBar: Rectangle {
// width: parent.width
- // height: 40 * DefaultStyle.dp
+ // height: 40 * mainWindow.dp
// color: DefaultStyle.grey_100
// }
diff --git a/Linphone/view/Style/Typography.qml b/Linphone/view/Style/Typography.qml
index 31c2cfd33..ea9d9a935 100644
--- a/Linphone/view/Style/Typography.qml
+++ b/Linphone/view/Style/Typography.qml
@@ -6,71 +6,71 @@ QtObject {
// Title/H4 - Bloc title
property font h4: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 16 * DefaultStyle.dp,
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp,
+ weight: 800 * mainWindow.dp
})
// Title/H3M - Bloc title medium
property font h3m: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 16 * DefaultStyle.dp,
- weight: 800 * DefaultStyle.dp
+ pixelSize: 16 * mainWindow.dp,
+ weight: 800 * mainWindow.dp
})
// Title/H3 - Bloc title
property font h3: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 22 * DefaultStyle.dp,
- weight: 800 * DefaultStyle.dp
+ pixelSize: 22 * mainWindow.dp,
+ weight: 800 * mainWindow.dp
})
// Title/H2 - Large bloc title
property font h2: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 29 * DefaultStyle.dp,
- weight: 800 * DefaultStyle.dp
+ pixelSize: 29 * mainWindow.dp,
+ weight: 800 * mainWindow.dp
})
// Text/P2 - Bold, reduced paratraph text
property font p2: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 13 * DefaultStyle.dp,
- weight: 700 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp,
+ weight: 700 * mainWindow.dp
})
// Text/P2 - Large Bold, reduced paratraph text
property font p2l: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 14 * DefaultStyle.dp,
- weight: 700 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp,
+ weight: 700 * mainWindow.dp
})
// Text/P1 - Paratraph text
property font p1: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 14 * DefaultStyle.dp,
- weight: 400 * DefaultStyle.dp
+ pixelSize: 14 * mainWindow.dp,
+ weight: 400 * mainWindow.dp
})
// Text/P1 - Paratraph text
property font p1s: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 13 * DefaultStyle.dp,
- weight: 400 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp,
+ weight: 400 * mainWindow.dp
})
// Button/B2 - Medium Button
property font b2: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 15 * DefaultStyle.dp,
- weight: 600 * DefaultStyle.dp
+ pixelSize: 15 * mainWindow.dp,
+ weight: 600 * mainWindow.dp
})
// Button/B3 - Small Button
property font b3: Qt.font( {
family: DefaultStyle.defaultFont,
- pixelSize: 13 * DefaultStyle.dp,
- weight: 600 * DefaultStyle.dp
+ pixelSize: 13 * mainWindow.dp,
+ weight: 600 * mainWindow.dp
})
}