fix(Dialogs): fix left and right margin in one unique file

resources.qrc

@@ -448,10 +448,10 @@
     <file>ui/views/App/Styles/Main/InviteFriendsStyle.qml</file>
     <file>ui/views/App/Styles/Main/MainWindowStyle.qml</file>
     <file>ui/views/App/Styles/qmldir</file>
+    <file>ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml</file>
+    <file>ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml</file>
     <file>ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml</file>
     <file>ui/views/App/Styles/Settings/SettingsAudioStyle.qml</file>
-    <file>ui/views/App/Styles/Settings/SettingsSipAccountsEditStyle.qml</file>
-    <file>ui/views/App/Styles/Settings/SettingsVideoPreviewStyle.qml</file>
     <file>ui/views/App/Styles/Settings/SettingsWindowStyle.qml</file>
     <file>ui/views/App/Styles/SplashScreen/SplashScreenStyle.qml</file>
   </qresource>

ui/modules/Common/Dialog/DialogDescription.qml

@@ -19,8 +19,8 @@ Item {
 
     anchors {
       fill: parent
-      leftMargin: DialogStyle.leftMargin
-      rightMargin: DialogStyle.rightMargin
+      leftMargin: DialogStyle.description.leftMargin
+      rightMargin: DialogStyle.description.rightMargin
     }
 
     color: DialogStyle.description.color

ui/modules/Common/Dialog/DialogPlus.qml

@@ -69,6 +69,8 @@ Rectangle {
 
       Layout.fillHeight: !dialog.contentIsEmpty
       Layout.fillWidth: true
+      Layout.leftMargin: DialogStyle.content.leftMargin
+      Layout.rightMargin: DialogStyle.content.rightMargin
     }
 
     Row {
@@ -79,7 +81,7 @@ Rectangle {
         : Qt.AlignLeft
       Layout.bottomMargin: DialogStyle.buttons.bottomMargin
       Layout.leftMargin: !centeredButtons
-        ? DialogStyle.leftMargin
+        ? DialogStyle.buttons.leftMargin
         : undefined
       Layout.topMargin: DialogStyle.buttons.topMargin
       spacing: DialogStyle.buttons.spacing

ui/modules/Common/Styles/Dialog/DialogStyle.qml

@@ -9,11 +9,9 @@ import Units 1.0
 QtObject {
   property color color: Colors.k
 
-  property int leftMargin: 50
-  property int rightMargin: 50
-
   property QtObject buttons: QtObject {
     property int bottomMargin: 15
+    property int leftMargin: 50
     property int spacing: 20
     property int topMargin: 15
   }
@@ -23,9 +21,16 @@ QtObject {
     property int width: 400
   }
 
+  property QtObject content: QtObject {
+    property int leftMargin: 25
+    property int rightMargin: 25
+  }
+
   property QtObject description: QtObject {
     property color color: Colors.j
+    property int leftMargin: 50
     property int pointSize: Units.dp * 11
+    property int rightMargin: 50
     property int verticalMargin: 25
   }
 }

ui/scripts/LinphoneUtils/linphone-utils.js

@@ -11,14 +11,13 @@
 // Returns the username of a contact/sipAddressObserver object or URI string.
 function getContactUsername (contact) {
   var object = contact.contact || // Contact object from `SipAddressObserver`.
-    (contact.vcard && contact) || // Contact object.
-    (contact.sipAddress) || // String from `SipAddressObserver`.
-    contact // String.
+    (contact.vcard && contact) // Contact object.
 
-  if (Utils.isString(object)) {
-    var index = object.indexOf('@')
-    return object.substring(4, index !== -1 ? index : undefined) // 4 = length('sip:')
+  if (object) {
+    return object.vcard.username
   }
 
-  return object.vcard.username
+  object = contact.sipAddress || contact // String from `SipAddressObserver` or just a String.
+  var index = object.indexOf('@')
+  return object.substring(4, index !== -1 ? index : undefined) // 4 = length('sip:')
 }

ui/views/App/Calls/Dialogs/CallSipAddress.qml

@@ -26,12 +26,7 @@ DialogPlus {
   // ---------------------------------------------------------------------------
 
   ColumnLayout {
-    anchors {
-      fill: parent
-      leftMargin: CallSipAddressStyle.leftMargin
-      rightMargin: CallSipAddressStyle.rightMargin
-    }
-
+    anchors.fill: parent
     spacing: 0
 
     // -------------------------------------------------------------------------

ui/views/App/Calls/Dialogs/CallTransfer.qml

@@ -36,12 +36,7 @@ DialogPlus {
   // ---------------------------------------------------------------------------
 
   ColumnLayout {
-    anchors {
-      fill: parent
-      leftMargin: CallTransferStyle.leftMargin
-      rightMargin: CallTransferStyle.rightMargin
-    }
-
+    anchors.fill: parent
     spacing: 0
 
     // -------------------------------------------------------------------------

ui/views/App/Calls/Dialogs/ConferenceManager.qml

@@ -40,12 +40,7 @@ DialogPlus {
   // ---------------------------------------------------------------------------
 
   RowLayout {
-    anchors {
-      fill: parent
-      leftMargin: ConferenceManagerStyle.leftMargin
-      rightMargin: ConferenceManagerStyle.rightMargin
-    }
-
+    anchors.fill: parent
     spacing: 0
 
     // -------------------------------------------------------------------------
@@ -104,9 +99,9 @@ DialogPlus {
 
     Rectangle {
       Layout.fillHeight: true
-      Layout.leftMargin: ConferenceManagerStyle.leftMargin
+      Layout.leftMargin: ConferenceManagerStyle.columns.separator.leftMargin
       Layout.preferredWidth: ConferenceManagerStyle.columns.separator.width
-      Layout.rightMargin: ConferenceManagerStyle.rightMargin
+      Layout.rightMargin: ConferenceManagerStyle.columns.separator.rightMargin
 
       color: ConferenceManagerStyle.columns.separator.color
     }

ui/views/App/Main/Dialogs/About.qml

@@ -24,12 +24,7 @@ DialogPlus {
   width: AboutStyle.width
 
   Column {
-    anchors {
-      fill: parent
-      leftMargin: AboutStyle.leftMargin
-      rightMargin: AboutStyle.rightMargin
-    }
-
+    anchors.fill: parent
     spacing: AboutStyle.spacing
 
     RowLayout {

ui/views/App/Main/Dialogs/AuthenticationRequest.qml

@@ -43,15 +43,9 @@ DialogPlus {
   // ---------------------------------------------------------------------------
 
   Form {
+    anchors.fill: parent
     orientation: Qt.Vertical
 
-    anchors {
-      left: parent.left
-      leftMargin: AuthenticationRequestStyle.leftMargin
-      right: parent.right
-      rightMargin: AuthenticationRequestStyle.rightMargin
-    }
-
     FormLine {
       FormGroup {
         label: qsTr('identityLabel')

ui/views/App/Main/Dialogs/ManageAccounts.qml

@@ -25,15 +25,9 @@ DialogPlus {
   // ---------------------------------------------------------------------------
 
   Form {
+    anchors.fill: parent
     orientation: Qt.Vertical
 
-    anchors {
-      left: parent.left
-      leftMargin: ManageAccountsStyle.leftMargin
-      right: parent.right
-      rightMargin: ManageAccountsStyle.rightMargin
-    }
-
     FormLine {
       FormGroup {
         label: qsTr('selectPresenceLabel')

ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml

@@ -43,12 +43,7 @@ DialogPlus {
   // ---------------------------------------------------------------------------
 
   Form {
-    anchors {
-      left: parent.left
-      leftMargin: SettingsSipAccountsEditStyle.leftMargin
-      right: parent.right
-      rightMargin: SettingsSipAccountsEditStyle.rightMargin
-    }
+    anchors.fill: parent
 
     FormLine {
       FormGroup {

ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml

@@ -25,10 +25,6 @@ DialogPlus {
   // ---------------------------------------------------------------------------
 
   CameraPreview {
-    anchors {
-      fill: parent
-      leftMargin: SettingsVideoPreviewStyle.preview.leftMargin
-      rightMargin: SettingsVideoPreviewStyle.preview.rightMargin
-    }
+    anchors.fill: parent
   }
 }

ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml

@@ -5,8 +5,6 @@ import QtQuick 2.7
 
 QtObject {
   property int height: 420
-  property int leftMargin: 35
-  property int rightMargin: 35
   property int spacing: 10
   property int width: 450
 }

ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml

@@ -5,8 +5,6 @@ import QtQuick 2.7
 
 QtObject {
   property int height: 420
-  property int leftMargin: 35
-  property int rightMargin: 35
   property int spacing: 10
   property int width: 450
 }

ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml

@@ -7,8 +7,6 @@ import Colors 1.0
 
 QtObject {
   property int height: 420
-  property int leftMargin: 35
-  property int rightMargin: 35
   property int width: 740
 
   property QtObject columns: QtObject {
@@ -18,6 +16,8 @@ QtObject {
 
     property QtObject separator: QtObject {
       property color color: Colors.c
+      property int leftMargin: 25
+      property int rightMargin: 25
       property int width: 1
     }
   }

ui/views/App/Styles/Main/Dialogs/AboutStyle.qml

@@ -8,8 +8,6 @@ import Units 1.0
 
 QtObject {
   property int height: 225
-  property int leftMargin: 25
-  property int rightMargin: 25
   property int spacing: 20
   property int width: 400
 

ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml

@@ -5,7 +5,5 @@ import QtQuick 2.7
 
 QtObject {
   property int height: 416
-  property int leftMargin: 35
-  property int rightMargin: 35
-  property int width: 480
+  property int width: 450
 }

ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml

@@ -5,7 +5,5 @@ import QtQuick 2.7
 
 QtObject {
   property int height: 234
-  property int leftMargin: 35
-  property int rightMargin: 35
-  property int width: 480
+  property int width: 450
 }

ui/views/App/Styles/Settings/SettingsSipAccountsEditStyle.qml → ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml

@@ -5,7 +5,5 @@ import QtQuick 2.7
 
 QtObject {
   property int height: 550
-  property int leftMargin: 35
-  property int rightMargin: 35
   property int width: 600
 }

ui/views/App/Styles/Settings/SettingsVideoPreviewStyle.qml → ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml

@@ -6,9 +6,4 @@ import QtQuick 2.7
 QtObject {
   property int height: 480
   property int width: 640
-
-  property QtObject preview: QtObject {
-    property int leftMargin: 25
-    property int rightMargin: 25
-  }
 }

ui/views/App/Styles/qmldir

@@ -2,7 +2,9 @@
 
 module App.Styles
 
-# Views styles -----------------------------------------------------------------
+# Views styles =================================================================
+
+# Calls Window -----------------------------------------------------------------
 
 singleton CallStyle                                      1.0 Calls/CallStyle.qml
 singleton CallsWindowStyle                               1.0 Calls/CallsWindowStyle.qml
@@ -12,6 +14,8 @@ singleton CallSipAddressStyle                            1.0 Calls/Dialogs/CallS
 singleton CallTransferStyle                              1.0 Calls/Dialogs/CallTransferStyle.qml
 singleton ConferenceManagerStyle                         1.0 Calls/Dialogs/ConferenceManagerStyle.qml
 
+# Main Window ------------------------------------------------------------------
+
 singleton ActivateLinphoneSipAccountWithEmailStyle       1.0 Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml
 singleton ActivateLinphoneSipAccountWithPhoneNumberStyle 1.0 Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumberStyle.qml
 singleton AssistantAbstractViewStyle                     1.0 Main/Assistant/AssistantAbstractViewStyle.qml
@@ -31,10 +35,15 @@ singleton AboutStyle                                     1.0 Main/Dialogs/AboutS
 singleton AuthenticationRequestStyle                     1.0 Main/Dialogs/AuthenticationRequestStyle.qml
 singleton ManageAccountsStyle                            1.0 Main/Dialogs/ManageAccountsStyle.qml
 
+# Settings Window --------------------------------------------------------------
+
 singleton SettingsAdvancedStyle                          1.0 Settings/SettingsAdvancedStyle.qml
 singleton SettingsAudioStyle                             1.0 Settings/SettingsAudioStyle.qml
-singleton SettingsSipAccountsEditStyle                   1.0 Settings/SettingsSipAccountsEditStyle.qml
-singleton SettingsVideoPreviewStyle                      1.0 Settings/SettingsVideoPreviewStyle.qml
 singleton SettingsWindowStyle                            1.0 Settings/SettingsWindowStyle.qml
 
+singleton SettingsSipAccountsEditStyle                   1.0 Settings/Dialogs/SettingsSipAccountsEditStyle.qml
+singleton SettingsVideoPreviewStyle                      1.0 Settings/Dialogs/SettingsVideoPreviewStyle.qml
+
+# SplashScreen Window ----------------------------------------------------------
+
 singleton SplashScreenStyle                              1.0 SplashScreen/SplashScreenStyle.qml