wrap some qml textPOI-1.0.0NAV-3.0.0MAP-3.1.0jupiter_release

7 files changed, 51 insertions, 38 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7fe7d05..2a43885 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,7 @@ set (create_file cmake -E touch)
 # Check if navigation-service stuff with the right version has been cloned and do it if necessary
 set(navigation-service_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/navigation)
 set(navigation-service_URL http://git.projects.genivi.org/lbs/navigation.git)
-set(navigation-service_VERSION 2f68c489569e13eed75ba4213c0f7fefdca918f3)
+set(navigation-service_VERSION 90a066a53f841a336079a50a03f42a36b4a9ccbd)
 
 if (EXISTS ${navigation-service_SRC_DIR})
 	execute_process(	
diff --git a/src/hmi/qml/Core/EntryField.qml b/src/hmi/qml/Core/EntryField.qml
index dd0b6f2..227a708 100644
--- a/src/hmi/qml/Core/EntryField.qml
+++ b/src/hmi/qml/Core/EntryField.qml
@@ -74,7 +74,9 @@ Column {
                 id:input; width: parent.width*3/4; height: parent.height; color: 'white'; font.pixelSize: parent.height*0.75
 				onMclicked: { callEntry(); }
                 text: Genivi.data[globaldata]?Genivi.data[globaldata]:""
-				MouseArea {
+                wrapMode: Text.WordWrap
+                clip: true
+                MouseArea {
 					anchors.fill: parent
 					onClicked: {
 						if (!entryfield.disabled) {
diff --git a/src/hmi/qml/Core/SmartText.qml b/src/hmi/qml/Core/SmartText.qml
new file mode 100644
index 0000000..0944211
--- /dev/null
+++ b/src/hmi/qml/Core/SmartText.qml
@@ -0,0 +1,35 @@
+/**
+* @licence app begin@
+* SPDX-License-Identifier: MPL-2.0
+*
+*
+* \file SmartText.qml
+*
+* \brief This file is part of the navigation hmi.
+*
+* \author Philippe Colliot <philippe.colliot@mpsa.com>
+*
+* \version
+*
+* This Source Code Form is subject to the terms of the
+* Mozilla Public License (MPL), v. 2.0.
+* If a copy of the MPL was not distributed with this file,
+* You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+* For further information see http://www.genivi.org/.
+*
+* List of changes:
+* <date>, <name>, <description of change>
+*
+* @licence end@
+*/
+import QtQuick 2.0
+
+Text {
+    style: Text.Sunken;
+    wrapMode: Text.WordWrap
+    elide: Text.ElideRight
+    smooth: true
+    clip: true
+//    scale: paintedWidth > width ? (width / paintedWidth) : 1
+}
diff --git a/src/hmi/qml/NavigationBrowseMap.qml b/src/hmi/qml/NavigationBrowseMap.qml
index 7954cc0..60f1555 100644
--- a/src/hmi/qml/NavigationBrowseMap.qml
+++ b/src/hmi/qml/NavigationBrowseMap.qml
@@ -539,12 +539,10 @@ HMIMenu {
                 image:StyleSheetTop.navigation_browse_map_top_background[Constants.SOURCE];
                 anchors { fill: parent; topMargin: parent.headlineHeight}
 
-                Text {
+                SmartText {
                     x:StyleSheetTop.fsamessageText[Constants.X]; y:StyleSheetTop.fsamessageText[Constants.Y]; width:StyleSheetTop.fsamessageText[Constants.WIDTH]; height:StyleSheetTop.fsamessageText[Constants.HEIGHT];color:StyleSheetTop.fsamessageText[Constants.TEXTCOLOR];styleColor:StyleSheetTop.fsamessageText[Constants.STYLECOLOR]; font.pixelSize:StyleSheetTop.fsamessageText[Constants.PIXELSIZE];
                     id:fsamessageText
                     visible: true
-                    style: Text.Sunken
-                    smooth: true
                     text:""
                 }
 
@@ -628,14 +626,11 @@ HMIMenu {
                     }
                 }
 
-                Text {
+                SmartText {
                     x:StyleSheetBottom.currentroad[Constants.X]; y:StyleSheetBottom.currentroad[Constants.Y]; width:StyleSheetBottom.currentroad[Constants.WIDTH]; height:StyleSheetBottom.currentroad[Constants.HEIGHT];color:StyleSheetBottom.currentroad[Constants.TEXTCOLOR];styleColor:StyleSheetBottom.currentroad[Constants.STYLECOLOR]; font.pixelSize:StyleSheetBottom.currentroad[Constants.PIXELSIZE];
                     visible: true
-                    style: Text.Sunken;
-                    smooth: true
                     id:currentroad
                     text: "-------"
-                    scale: paintedWidth > width ? (width / paintedWidth) : 1
                 }
 
                 StdButton {
@@ -793,14 +788,11 @@ HMIMenu {
                     text: " "
                 }
 
-                Text {
+                SmartText {
                     x:StyleSheetGuidance.roadaftermaneuverValue[Constants.X]; y:StyleSheetGuidance.roadaftermaneuverValue[Constants.Y]; width:StyleSheetGuidance.roadaftermaneuverValue[Constants.WIDTH]; height:StyleSheetGuidance.roadaftermaneuverValue[Constants.HEIGHT];color:StyleSheetGuidance.roadaftermaneuverValue[Constants.TEXTCOLOR];styleColor:StyleSheetGuidance.roadaftermaneuverValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetGuidance.roadaftermaneuverValue[Constants.PIXELSIZE];
                     visible: true
-                    style: Text.Sunken;
-                    smooth: true
                     id:roadaftermaneuverValue
                     text: " "
-                    scale: paintedWidth > width ? (width / paintedWidth) : 1
                 }
 
                 Text {
diff --git a/src/hmi/qml/NavigationCalculatedRoute.qml b/src/hmi/qml/NavigationCalculatedRoute.qml
index 5febac1..45f9fca 100644
--- a/src/hmi/qml/NavigationCalculatedRoute.qml
+++ b/src/hmi/qml/NavigationCalculatedRoute.qml
@@ -165,12 +165,10 @@ HMIMenu {
             text: Genivi.gettext("RouteDistance")
         }
 
-        Text {
+        SmartText {
             x:StyleSheet.distanceValue[Constants.X]; y:StyleSheet.distanceValue[Constants.Y]; width:StyleSheet.distanceValue[Constants.WIDTH]; height:StyleSheet.distanceValue[Constants.HEIGHT];color:StyleSheet.distanceValue[Constants.TEXTCOLOR];styleColor:StyleSheet.distanceValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.distanceValue[Constants.PIXELSIZE];
             id:distanceValue
-            wrapMode: Text.WordWrap
-            style: Text.Sunken;
-            smooth: true
+            text: ""
         }
 
         Text {
@@ -181,12 +179,10 @@ HMIMenu {
             text: Genivi.gettext("RouteTime")
         }
 
-        Text {
+        SmartText {
             x:StyleSheet.timeValue[Constants.X]; y:StyleSheet.timeValue[Constants.Y]; width:StyleSheet.timeValue[Constants.WIDTH]; height:StyleSheet.timeValue[Constants.HEIGHT];color:StyleSheet.timeValue[Constants.TEXTCOLOR];styleColor:StyleSheet.timeValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.timeValue[Constants.PIXELSIZE];
             id:timeValue
-            wrapMode: Text.WordWrap
-            style: Text.Sunken;
-            smooth: true
+            text: ""
         }
 
         Text {
@@ -197,13 +193,10 @@ HMIMenu {
             text: Genivi.gettext("StatusTitle")
         }
 
-        Text {
+        SmartText {
             x:StyleSheet.statusValue[Constants.X]; y:StyleSheet.statusValue[Constants.Y]; width:StyleSheet.statusValue[Constants.WIDTH]; height:StyleSheet.statusValue[Constants.HEIGHT];color:StyleSheet.statusValue[Constants.TEXTCOLOR];styleColor:StyleSheet.statusValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.statusValue[Constants.PIXELSIZE];
             id:statusValue
-            style: Text.Sunken;
-            smooth: true
             text: ""
-            scale: paintedWidth > width ? (width / paintedWidth) : 1
         }
 
         StdButton {
diff --git a/src/hmi/qml/NavigationRoute.qml b/src/hmi/qml/NavigationRoute.qml
index d44b295..fb337ee 100644
--- a/src/hmi/qml/NavigationRoute.qml
+++ b/src/hmi/qml/NavigationRoute.qml
@@ -112,11 +112,8 @@ HMIMenu {
             text: Genivi.gettext("EnteredLocation")
         }
 
-        Text {
+        SmartText {
             x:StyleSheet.locationValue[Constants.X]; y:StyleSheet.locationValue[Constants.Y]; width:StyleSheet.locationValue[Constants.WIDTH]; height:StyleSheet.locationValue[Constants.HEIGHT];color:StyleSheet.locationValue[Constants.TEXTCOLOR];styleColor:StyleSheet.locationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.locationValue[Constants.PIXELSIZE];
-            style: Text.Sunken;
-            smooth: true
-            scale: paintedWidth > width ? (width / paintedWidth) : 1
             id:locationValue
         }
 
@@ -128,11 +125,8 @@ HMIMenu {
             text: Genivi.gettext("Position")
         }
 
-        Text {
+        SmartText {
             x:StyleSheet.positionValue[Constants.X]; y:StyleSheet.positionValue[Constants.Y]; width:StyleSheet.positionValue[Constants.WIDTH]; height:StyleSheet.positionValue[Constants.HEIGHT];color:StyleSheet.positionValue[Constants.TEXTCOLOR];styleColor:StyleSheet.positionValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.positionValue[Constants.PIXELSIZE];
-            style: Text.Sunken;
-            smooth: true
-            scale: paintedWidth > width ? (width / paintedWidth) : 1
             id:positionValue
         }
 
@@ -144,11 +138,8 @@ HMIMenu {
             text: Genivi.gettext("Destination")
         }
 
-        Text {
+        SmartText {
             x:StyleSheet.destinationValue[Constants.X]; y:StyleSheet.destinationValue[Constants.Y]; width:StyleSheet.destinationValue[Constants.WIDTH]; height:StyleSheet.destinationValue[Constants.HEIGHT];color:StyleSheet.destinationValue[Constants.TEXTCOLOR];styleColor:StyleSheet.destinationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.destinationValue[Constants.PIXELSIZE];
-            style: Text.Sunken;
-            smooth: true
-            scale: paintedWidth > width ? (width / paintedWidth) : 1
             id:destinationValue
         }
 
diff --git a/src/hmi/qml/NavigationSearchFreeText.qml b/src/hmi/qml/NavigationSearchFreeText.qml
index aa28bd2..010ee6e 100644
--- a/src/hmi/qml/NavigationSearchFreeText.qml
+++ b/src/hmi/qml/NavigationSearchFreeText.qml
@@ -150,7 +150,7 @@ HMIMenu {
 			criterion: Genivi.NAVIGATIONCORE_FULL_ADDRESS
 			globaldata: 'location_input'
 			textfocus: true
-			next: ok
+            next: ok
 			prev: back
 			onLeave:{menu.leave(0)}
 		}