summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-10-23 12:39:27 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-10-23 12:39:27 +0200
commit3eee9784f01a1d5b56ca735eb7ab8ab605d91f8c (patch)
tree7a618c3fd3c37f63d104268a377e72d56fe2a4ce
parent4ea3d40ea0c4e3437925bc79869f5a8c7b7bc159 (diff)
downloadkube-3eee9784f01a1d5b56ca735eb7ab8ab605d91f8c.tar.gz
kube-3eee9784f01a1d5b56ca735eb7ab8ab605d91f8c.zip
Support links on all labels
-rw-r--r--accounts/gmail/package/contents/ui/GmailSettings.qml6
-rw-r--r--framework/qml/Label.qml7
2 files changed, 7 insertions, 6 deletions
diff --git a/accounts/gmail/package/contents/ui/GmailSettings.qml b/accounts/gmail/package/contents/ui/GmailSettings.qml
index 4fe6bc89..16f7dbf3 100644
--- a/accounts/gmail/package/contents/ui/GmailSettings.qml
+++ b/accounts/gmail/package/contents/ui/GmailSettings.qml
@@ -59,13 +59,7 @@ Item {
59<li> Visit <a href='https://myaccount.google.com/lesssecureapps'>https://myaccount.google.com/lesssecureapps</a> and enable the setting to allow Kube to connect to your account." 59<li> Visit <a href='https://myaccount.google.com/lesssecureapps'>https://myaccount.google.com/lesssecureapps</a> and enable the setting to allow Kube to connect to your account."
60 Layout.alignment: Qt.AlignCenter 60 Layout.alignment: Qt.AlignCenter
61 Layout.columnSpan: 2 61 Layout.columnSpan: 2
62 onLinkActivated: Qt.openUrlExternally(link)
63 textFormat: Text.StyledText 62 textFormat: Text.StyledText
64 MouseArea {
65 anchors.fill: parent
66 acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text
67 cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
68 }
69 } 63 }
70 64
71 Kube.Label { 65 Kube.Label {
diff --git a/framework/qml/Label.qml b/framework/qml/Label.qml
index cc8235a3..850ed8ba 100644
--- a/framework/qml/Label.qml
+++ b/framework/qml/Label.qml
@@ -23,4 +23,11 @@ import org.kube.framework 1.0 as Kube
23T.Label { 23T.Label {
24 color: Kube.Colors.textColor 24 color: Kube.Colors.textColor
25 font.family: Kube.Font.fontFamily 25 font.family: Kube.Font.fontFamily
26 linkColor: Kube.Colors.highlightColor
27 onLinkActivated: Qt.openUrlExternally(link)
28 MouseArea {
29 anchors.fill: parent
30 acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text
31 cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
32 }
26} 33}