Style sidebar

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

@@ -18,6 +18,7 @@ Item
 	property int fontSize
 	property int borderWidth
 	property int borderRadius
+	property int innerMargin: 10
 
 	scale: state === "Pressed" ? 0.96 : 1.0
 	onEnabledChanged: state = ""
@@ -42,16 +43,18 @@ Item
 				height: (iconUrl)? iconHeight: 0
 				width: (iconUrl)? iconHeight: 0
 
+				fillMode: Image.PreserveAspectFit
+
 				visible: (iconUrl)? true: false
 				anchors.left: innerElements.left
 
-				anchors.margins:(iconUrl)? 10 : 0
+				anchors.margins:(iconUrl)? innerMargin : 0
 				anchors.verticalCenter: parent.verticalCenter
 			}
 
 			Text
 			{
-				anchors.margins: 10
+				anchors.margins: innerMargin
 				id: innerText
 				font.pointSize: fontSize
 				anchors.left: icon.right

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

@@ -74,6 +74,7 @@ Drawer
 				innerAnchors.left: rectangleButton.left
 				innerAnchors.verticalCenter: rectangleButton.verticalCenter
 				iconUrl: (model.icon)? model.icon : undefined
+				innerMargin: 20
 			}
 
 
@@ -134,11 +135,6 @@ Drawer
 				{
 					stackView.push("qrc:/TrustedNodesView.qml");
 				},
-				"Search Contacts": function(){
-					stackView.push("qrc:/Contacts.qml",
-								            {'searching': true} )
-
-				},
 				"Paste Link": function()
 				{
 					UriJs.URI.withinString(
@@ -155,22 +151,19 @@ Drawer
 			{
 				title: "Trusted Nodes"
 				showOnCoreReady: true
-				icon: "/icons/attach.svg"
+				icon: "/icons/netgraph.svg"
-			}
-			ListElement
-			{
-				title: "Search Contacts"
-				showOnCoreReady: true
 			}
 			ListElement
 			{
 				title: "Paste Link"
 				showOnCoreReady: true
+				icon: "/icons/add.svg"
 			}
 			ListElement
 			{
 				title: "Terminate Core"
 				showOnOsAndroid: false
+				icon: "/icons/exit.svg"
 			}
 
 		}

retroshare-qml-app/src/styles/SideBarStyle.qml

@@ -7,7 +7,7 @@ QtObject {
 
 	property QtObject item: QtObject
 	{
-		property var height: 50
+		property var height: 40
 
 		property string hoverColor: "lightgrey"
 		property string defaultColor: "white"