From f2b054c04d5e9bbc82f3a85ff9f5f5afa57a7c8e Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Sat, 18 Apr 2020 23:13:27 +0200
Subject: [PATCH] Merge 2 texts on about popup to be able to copy data

---
 .../ui/views/App/Main/Dialogs/About.qml       | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/linphone-app/ui/views/App/Main/Dialogs/About.qml b/linphone-app/ui/views/App/Main/Dialogs/About.qml
index 1f4a5e54e..7635e50eb 100644
--- a/linphone-app/ui/views/App/Main/Dialogs/About.qml
+++ b/linphone-app/ui/views/App/Main/Dialogs/About.qml
@@ -28,6 +28,7 @@ DialogPlus {
     spacing: AboutStyle.spacing
 
     RowLayout {
+    id:versionsLayout
       spacing: AboutStyle.versionsBlock.spacing
 
       height: AboutStyle.versionsBlock.iconSize
@@ -37,43 +38,31 @@ DialogPlus {
         icon: 'linphone_logo'
         iconSize: parent.height
       }
-
+      
       Column {
+        id:versionsArea
         Layout.fillWidth: true
         Layout.preferredHeight: parent.height
 
         spacing: 0
 
         TextEdit {
+          id: appVersion
           color: AboutStyle.versionsBlock.appVersion.color
           selectByMouse: true
           font.pointSize: AboutStyle.versionsBlock.appVersion.pointSize
-          text: 'Desktop ' + Qt.application.version + ' - Qt' + App.qtVersion
+          text: 'Desktop ' + Qt.application.version + ' - Qt' + App.qtVersion +'\nCore ' + CoreManager.version
 
-          height: parent.height / 2
-          width: parent.width
+          height: parent.height
+          width: parent.width   
 
           verticalAlignment: Text.AlignVCenter
 
-          onActiveFocusChanged: deselect()
-        }
-
-        TextEdit {
-          color: AboutStyle.versionsBlock.coreVersion.color
-          selectByMouse: true
-          font.pointSize: AboutStyle.versionsBlock.coreVersion.pointSize
-          text: 'Core ' + CoreManager.version
-
-          height: parent.heigth / 2
-          width: parent.width
-
-          verticalAlignment: Text.AlignVCenter
-
-          onActiveFocusChanged: deselect()
+          onActiveFocusChanged: deselect();
         }
       }
     }
-
+   
     Column {
       spacing: AboutStyle.copyrightBlock.spacing
       width: parent.width
@@ -114,4 +103,5 @@ DialogPlus {
       }
     }
   }
+  
 }