From 03cd80f5addb3af8c374732fdc18d38bcb74a79b Mon Sep 17 00:00:00 2001 From: Angela Mazzurco Date: Sat, 22 Jul 2017 19:11:56 +0200 Subject: [PATCH] Style buttons --- retroshare-qml-app/src/ContactDetails.qml | 15 ++++++++++++--- retroshare-qml-app/src/Locations.qml | 1 + retroshare-qml-app/src/TrustedNodeDetails.qml | 14 ++++++++++++-- retroshare-qml-app/src/TrustedNodesView.qml | 10 ++++++++-- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/retroshare-qml-app/src/ContactDetails.qml b/retroshare-qml-app/src/ContactDetails.qml index bd90708ff..fc8516d27 100644 --- a/retroshare-qml-app/src/ContactDetails.qml +++ b/retroshare-qml-app/src/ContactDetails.qml @@ -30,7 +30,7 @@ Item property bool isOwn: cntDt.md.own property string objectName: "contactDetails" - Button + ButtonText { id: avatarPicker @@ -40,6 +40,11 @@ Item anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter + buttonTextPixelSize: 14 + iconUrl: "/icons/attach-image.svg" + borderRadius: 0 + + onClicked: { fileChooser.open() @@ -154,9 +159,11 @@ Item spacing: 6 - Button + ButtonText { text: qsTr("Contact full link") + borderRadius: 0 + buttonTextPixelSize: 14 onClicked: { rsApi.request( @@ -182,10 +189,12 @@ Item } } - Button + ButtonText { text: qsTr("Contact short link") enabled: false + borderRadius: 0 + buttonTextPixelSize: 14 } } } diff --git a/retroshare-qml-app/src/Locations.qml b/retroshare-qml-app/src/Locations.qml index 0e81c2ed2..ed24de4fe 100644 --- a/retroshare-qml-app/src/Locations.qml +++ b/retroshare-qml-app/src/Locations.qml @@ -199,6 +199,7 @@ Item onClicked: locationView.state = "createLocation" buttonTextPixelSize: 15 iconUrl: "/icons/add.svg" + borderRadius: 0 } RsLoginPassView diff --git a/retroshare-qml-app/src/TrustedNodeDetails.qml b/retroshare-qml-app/src/TrustedNodeDetails.qml index 5aac8315e..8155e8503 100644 --- a/retroshare-qml-app/src/TrustedNodeDetails.qml +++ b/retroshare-qml-app/src/TrustedNodeDetails.qml @@ -162,9 +162,14 @@ Item anchors.horizontalCenter: parent.horizontalCenter spacing: 6 - Button + ButtonText { text: qsTr("Revoke") + + borderRadius: 0 + buttonTextPixelSize: 14 + iconUrl: "/icons/leave.svg" + onClicked: rsApi.request( "/peers/"+nodeDetailsRoot.pgpId+"/delete", "", @@ -172,11 +177,16 @@ Item { stackView.push("qrc:/TrustedNodesView.qml") }) } - Button + ButtonText { text: qsTr("Entrust") visible: nodeDetailsRoot.nodeCert.length > 0 + + borderRadius: 0 + buttonTextPixelSize: 14 + iconUrl: "/icons/invite.svg" + onClicked: { var jsonData = diff --git a/retroshare-qml-app/src/TrustedNodesView.qml b/retroshare-qml-app/src/TrustedNodesView.qml index 4cc7a3401..2eb9cc2ef 100644 --- a/retroshare-qml-app/src/TrustedNodesView.qml +++ b/retroshare-qml-app/src/TrustedNodesView.qml @@ -20,6 +20,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import "jsonpath.js" as JSONPath import "." //Needed for TokensManager singleton +import "components/." Item { @@ -113,12 +114,17 @@ Item } } - Button + ButtonText { id: bottomButton text: qsTr("Add Trusted Node") anchors.bottom: parent.bottom onClicked: stackView.push("qrc:/AddTrustedNode.qml") - width: parent.width + anchors.horizontalCenter: parent.horizontalCenter +// width: parent.width + + borderRadius: 0 + buttonTextPixelSize: 14 + iconUrl: "/icons/add.svg" } }