Merge branch 'mbohlender/fonts' into develop

5 files changed, 45 insertions, 13 deletions

diff --git a/framework/qml/Font.qml b/framework/qml/Font.qml
new file mode 100644
index 00000000..b4abbe0d
--- /dev/null
+++ b/framework/qml/Font.qml
@@ -0,0 +1,28 @@
+/*
+  Copyright (C) 2017 Michael Bohlender, <bohlender@kolabsys.com>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+pragma Singleton
+
+import QtQuick 2.7
+
+Item {
+    id: root
+
+    property string fontFamily: "Noto Sans"
+}
+
diff --git a/framework/qml/Label.qml b/framework/qml/Label.qml
index c7a71faa..cc8235a3 100644
--- a/framework/qml/Label.qml
+++ b/framework/qml/Label.qml
@@ -18,9 +18,9 @@
 
 import QtQuick 2.7
 import QtQuick.Templates 2.0 as T
-import org.kube.framework 1.0
+import org.kube.framework 1.0 as Kube
 
 T.Label {
-    color: Colors.textColor
-    font.family: "Noto Sans"
+    color: Kube.Colors.textColor
+    font.family: Kube.Font.fontFamily
 }
diff --git a/framework/qml/TextField.qml b/framework/qml/TextField.qml
index dbf5dae7..a33ccc3a 100644
--- a/framework/qml/TextField.qml
+++ b/framework/qml/TextField.qml
@@ -18,18 +18,18 @@
 
 import QtQuick 2.7
 import QtQuick.Templates 2.0 as T
-import org.kube.framework 1.0
+import org.kube.framework 1.0 as Kube
 
 T.TextField {
     id: root
 
-    implicitHeight: Units.gridUnit + Units.smallSpacing * 2
-    implicitWidth: Units.gridUnit * 5 + Units.smallSpacing * 2
+    implicitHeight: Kube.Units.gridUnit + Kube.Units.smallSpacing * 2
+    implicitWidth: Kube.Units.gridUnit * 5 + Kube.Units.smallSpacing * 2
 
-    padding: Units.smallSpacing
+    padding: Kube.Units.smallSpacing
 
-    color: Colors.textColor
-    font.family: "Noto Sans"
+    color: Kube.Colors.textColor
+    font.family: Kube.Font.fontFamily
 
     Label {
         id: placeholder
@@ -41,13 +41,13 @@ T.TextField {
 
         visible: root.text == ""
         text: root.placeholderText
-        color: Colors.disabledTextColor
+        color: Kube.Colors.disabledTextColor
         elide: Text.ElideRight
     }
 
     background: Rectangle {
-        color: Colors.viewBackgroundColor
+        color: Kube.Colors.viewBackgroundColor
         border.width: 1
-        border.color: Colors.buttonColor
+        border.color: Kube.Colors.buttonColor
     }
 }
diff --git a/framework/qml/Units.qml b/framework/qml/Units.qml
index a8eddd8d..8e8b5e83 100644
--- a/framework/qml/Units.qml
+++ b/framework/qml/Units.qml
@@ -20,14 +20,16 @@
 pragma Singleton
 
 import QtQuick 2.7
+import org.kube.framework 1.0 as Kube
 
 Item {
     property int gridUnit: fontMetrics.height
     property int smallSpacing: gridUnit/4
     property int largeSpacing: gridUnit
+
     property variant fontMetrics: TextMetrics {
         text: "M"
-        font.family: "Noto Sans"
+        font.family: Kube.Font.fontFamily
     }
 }
 
diff --git a/framework/qmldir b/framework/qmldir
index 9f49a65f..1cc25b18 100644
--- a/framework/qmldir
+++ b/framework/qmldir
@@ -22,5 +22,7 @@ Label 1.0 Label.qml
 singleton Colors 1.0 Colors.qml
 singleton Icons 1.0 Icons.qml
 singleton Units 1.0 Units.qml
+singleton Font 1.0 Font.qml
+
 
 plugin frameworkplugin