Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-II

retroshare-qml-app/src/ChatCache.qml

@@ -133,6 +133,14 @@ QtObject
 			}
 			return ""
 		}
+		function delIdentityAvatar (gxsId)
+		{
+			if (identityDetails[gxsId] && identityDetails[gxsId].avatar !== undefined)
+			{
+				identityDetails[gxsId].avatar = ""
+			}
+
+		}
 
 	}
 

retroshare-qml-app/src/ContactDetails.qml

@@ -75,7 +75,7 @@ Item
 									if (jP.returncode === "ok")
 									{
 										console.log("Avatar changed! ")
-										topFace.getDetails()
+										topFace.refresh()
 									}
 								})
 			}

retroshare-qml-app/src/TrustedNodeDetails.qml

@@ -96,6 +96,8 @@ Item
 		clip: true
 		snapMode: ListView.SnapToItem
 
+		spacing:7
+
 		header:Rectangle
 		{
 			color: "aliceblue"
@@ -132,10 +134,10 @@ Item
 			Column
 			{
 				id: innerCol
-				height: 60
+				height: idRow.height + gxsInfo.height
 				width: parent.width
 				leftPadding: 4
-				spacing: 4
+				spacing: 6
 
 				Row
 				{
@@ -165,6 +167,7 @@ Item
 
 				TextAndIcon
 				{
+					id: gxsInfo
 					width: parent.width
 					innerText:  model.peer_id
 					anchors.horizontalCenter: parent.horizontalCenter
@@ -173,8 +176,6 @@ Item
 				}
 			}
 		}
-
-
 	}
 
 	Row

retroshare-qml-app/src/components/AvatarOrColorHash.qml

@@ -105,6 +105,13 @@ Item
 
 		}
 	}
+	function refresh()
+	{
+		ChatCache.contactsCache.delIdentityAvatar(gxs_id)
+		compRoot.avatarAttemptCnt = 0
+		getDetails()
+
+	}
 
 	Component.onCompleted: startComponent ()
 

retroshare-qml-app/src/components/TextAndIcon.qml

@@ -4,18 +4,19 @@ import QtQuick.Controls 2.0
 
 Item
 {
-	height: icon.height + 5
+	height: innerText.implicitHeight
+
+	property int iconHeight: 25
 
 	property alias iconUrl: icon.source
 	property alias innerText: innerText.text
 
-
 	Image
 	{
 		id: icon
 
-		height: innerText.contentHeight
+		height: iconHeight
-		width: innerText.contentHeight
+		width: height
 
 		fillMode: Image.PreserveAspectFit
 		anchors.left: parent.left