summaryrefslogtreecommitdiffstats
path: root/framework/qml
diff options
context:
space:
mode:
Diffstat (limited to 'framework/qml')
-rw-r--r--framework/qml/EditAccount.qml3
-rw-r--r--framework/qml/Heading.qml27
-rw-r--r--framework/qml/People.qml3
-rw-r--r--framework/qml/Units.qml2
4 files changed, 31 insertions, 4 deletions
diff --git a/framework/qml/EditAccount.qml b/framework/qml/EditAccount.qml
index dfda020e..290cd5dc 100644
--- a/framework/qml/EditAccount.qml
+++ b/framework/qml/EditAccount.qml
@@ -38,8 +38,7 @@ Item {
38 margins: Kube.Units.largeSpacing * 2 38 margins: Kube.Units.largeSpacing * 2
39 } 39 }
40 40
41 //TODO Kube.Heading 41 Kube.Heading {
42 Kube.Label {
43 id: heading 42 id: heading
44 text: loader.item.heading 43 text: loader.item.heading
45 color: Kube.Colors.highlightColor 44 color: Kube.Colors.highlightColor
diff --git a/framework/qml/Heading.qml b/framework/qml/Heading.qml
new file mode 100644
index 00000000..803c1488
--- /dev/null
+++ b/framework/qml/Heading.qml
@@ -0,0 +1,27 @@
1/*
2 * Copyright (C) 2017 Michael Bohlender, <bohlender@kolabsys.com>
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License along
15 * with this program; if not, write to the Free Software Foundation, Inc.,
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 */
18
19import QtQuick 2.7
20import QtQuick.Templates 2.0 as T
21import org.kube.framework 1.0 as Kube
22
23T.Label {
24 color: Kube.Colors.textColor
25 font.family: Kube.Font.fontFamily
26 font.pointSize: Kube.Units.defaultFontSize * 2
27}
diff --git a/framework/qml/People.qml b/framework/qml/People.qml
index f67d55f1..7f36193e 100644
--- a/framework/qml/People.qml
+++ b/framework/qml/People.qml
@@ -269,8 +269,7 @@ Item {
269 color: "lightgrey" 269 color: "lightgrey"
270 } 270 }
271 271
272 //TODO replace with Kube.Heading once it is there 272 Kube.Heading {
273 Kube.Label {
274 id: nameLabel 273 id: nameLabel
275 274
276 anchors { 275 anchors {
diff --git a/framework/qml/Units.qml b/framework/qml/Units.qml
index 8e8b5e83..6d66bf5c 100644
--- a/framework/qml/Units.qml
+++ b/framework/qml/Units.qml
@@ -27,6 +27,8 @@ Item {
27 property int smallSpacing: gridUnit/4 27 property int smallSpacing: gridUnit/4
28 property int largeSpacing: gridUnit 28 property int largeSpacing: gridUnit
29 29
30 property int defaultFontSize: fontMetrics.font.pointSize
31
30 property variant fontMetrics: TextMetrics { 32 property variant fontMetrics: TextMetrics {
31 text: "M" 33 text: "M"
32 font.family: Kube.Font.fontFamily 34 font.family: Kube.Font.fontFamily