From 7c7a755f2d87d672ee8afc7d5656971297539fe3 Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Thu, 10 Mar 2016 12:12:31 +0100 Subject: Theme plugin with colorpalette --- components/package/contents/ui/FocusComposer.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'components/package/contents/ui/FocusComposer.qml') diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml index 8ec01cc9..5c4d88d7 100644 --- a/components/package/contents/ui/FocusComposer.qml +++ b/components/package/contents/ui/FocusComposer.qml @@ -19,13 +19,15 @@ import QtQuick 2.4 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.1 +import org.kube.framework.theme 1.0 + Rectangle { id: root property variant originalMessage visible: false - color: colorPalette.border + color: ColorPalette.border opacity: 0.9 -- cgit v1.2.3 From 73b2621624c87528ce776b74555ec98c56115661 Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Thu, 10 Mar 2016 12:41:52 +0100 Subject: remove Colorpalette.qml and change its use to the theme plugin --- components/package/contents/ui/FocusComposer.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/package/contents/ui/FocusComposer.qml') diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml index 5c4d88d7..bc8b3f2d 100644 --- a/components/package/contents/ui/FocusComposer.qml +++ b/components/package/contents/ui/FocusComposer.qml @@ -45,7 +45,7 @@ Rectangle { height: root.height * 0.8 width: root.width * 0.8 - color: colorPalette.background + color: ColorPalette.background MouseArea { anchors.fill: parent @@ -80,4 +80,4 @@ Rectangle { } } } -} \ No newline at end of file +} -- cgit v1.2.3 From 181b39ddd0b3c027341b228ab51482ce4413d3bb Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Thu, 10 Mar 2016 13:54:07 +0100 Subject: add scaling unit to the theme plugin and use it instaed of the main.qml unit item --- components/package/contents/ui/FocusComposer.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/package/contents/ui/FocusComposer.qml') diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml index bc8b3f2d..ab04dbed 100644 --- a/components/package/contents/ui/FocusComposer.qml +++ b/components/package/contents/ui/FocusComposer.qml @@ -55,7 +55,7 @@ Rectangle { anchors { fill: parent - margins: unit.size * 3 + margins: Unit.size * 3 } Composer { -- cgit v1.2.3