Merge branch 'qml_app_style_buttons' into qml_app_ui_improvements

retroshare-qml-app/src/ChatView.qml

@@ -144,7 +144,7 @@ Item
 			border.color: inferiorPanel.styles.borderColor
 		}
 
-		BtnIcon
+		ButtonIcon
 		{
 
 			id: attachButton
@@ -263,7 +263,7 @@ Item
 			}
 		}
 
-		BtnIcon
+		ButtonIcon
 		{
 
 			id: emojiButton
@@ -290,7 +290,7 @@ Item
 
 		}
 
-		BtnIcon
+		ButtonIcon
 		{
 
 			id: sendButton

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

@@ -4,7 +4,7 @@ import QtQuick.Controls 2.0
 Item
 {
 	id: button
-	property alias buttonText: innerText.text;
+	property alias text: innerText.text;
 	property alias buttonTextPixelSize: innerText.font.pixelSize
 	property alias innerAnchors: innerElements.anchors;
 	property alias rectangleButton: rectangleButton;
@@ -12,14 +12,17 @@ Item
 	property var iconUrl
 	property int iconHeight: 20
 
-	property color color
+	property color color: "lightsteelblue"
-	property color hoverColor
+	property color hoverColor: color
-	property color pressColor
+	property color pressColor: color
 	property int fontSize
 	property int borderWidth
-	property int borderRadius
+	property int borderRadius: 3
 	property int innerMargin: 10
 
+	height: innerText.height + innerMargin + innerMargin
+	width: innerText.width + innerMargin + innerMargin + icon.width + icon.width
+
 	scale: state === "Pressed" ? 0.96 : 1.0
 	onEnabledChanged: state = ""
 	signal clicked
@@ -29,7 +32,7 @@ Item
 		id: rectangleButton
 		anchors.fill: parent
 		radius: borderRadius
-		color: button.enabled ? button.color : "grey"
+		color: button.enabled ? button.color : "lavender"
 		border.width: borderWidth
 		border.color: "black"
 
@@ -59,6 +62,7 @@ Item
 				font.pointSize: fontSize
 				anchors.left: icon.right
 				anchors.verticalCenter: parent.verticalCenter
+				color: button.enabled ? "black" : "grey"
 			}
 		}
 	}

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

@@ -111,9 +111,9 @@ Drawer
 					}
 				}
 
-				Btn
+				ButtonText
 				{
-					buttonText: model.title
+					text: model.title
 					width: parent.width
 					height: parent.height
 					color:  menuItem.styles.defaultColor
@@ -123,6 +123,7 @@ Drawer
 					iconUrl: (model.icon)? model.icon : undefined
 					innerMargin: 20
 					buttonTextPixelSize: menuItem.styles.pixelSize
+					borderRadius: 0
 				}
 
 

retroshare-qml-app/src/main-app.qml

@@ -153,7 +153,7 @@ ApplicationWindow
 
 		}
 
-		BtnIcon
+		ButtonIcon
 		{
 			property bool searchIconVisibility: false
 			property var onClickCB: function (){}
@@ -190,7 +190,7 @@ ApplicationWindow
 		Component
 		{
 			id: rsIcon
-			BtnIcon
+			ButtonIcon
 			{
 				height: imageLoader.height
 				width: imageLoader.height

retroshare-qml-app/src/qml.qrc

@@ -31,7 +31,7 @@
         <file>ChatBubbleDelegate.qml</file>
         <file>icons/send-message.svg</file>
         <file>icons/attach.svg</file>
-        <file>components/BtnIcon.qml</file>
+        <file>components/ButtonIcon.qml</file>
         <file>icons/smiley.svg</file>
         <file>icons/microphone_mute.svg</file>
         <file>icons/microphone.svg</file>
@@ -40,7 +40,7 @@
         <file>components/AvatarOrColorHash.qml</file>
         <file>components/SideBar.qml</file>
         <file>styles/SideBarStyle.qml</file>
-        <file>components/Btn.qml</file>
+        <file>components/ButtonText.qml</file>
         <file>icons/netgraph.svg</file>
         <file>icons/search.svg</file>
         <file>icons/exit.svg</file>