From 3dfcc1ae7973d1dbbd2dfa6c10d14548815ad7de Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Wed, 17 May 2017 13:43:57 +0200 Subject: initial Kube.TextArea --- components/kube/contents/ui/ComposerView.qml | 5 +++- framework/qml/TextArea.qml | 39 ++++++++++++++++++++++++++++ framework/qmldir | 1 + 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 framework/qml/TextArea.qml diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml index beeeff53..0cb5eefc 100644 --- a/components/kube/contents/ui/ComposerView.qml +++ b/components/kube/contents/ui/ComposerView.qml @@ -237,6 +237,9 @@ Kube.View { leftMargin: Kube.Units.largeSpacing + Kube.Units.gridUnit * 2 rightMargin: Kube.Units.largeSpacing + Kube.Units.gridUnit * 2 } + + spacing: Kube.Units.smallSpacing * 2 + Kube.TextField { id: subject Layout.fillWidth: true @@ -247,7 +250,7 @@ Kube.View { onActiveFocusChanged: closeFirstSplitIfNecessary() } - Controls2.TextArea { + Kube.TextArea { id: content Layout.fillWidth: true Layout.fillHeight: true diff --git a/framework/qml/TextArea.qml b/framework/qml/TextArea.qml new file mode 100644 index 00000000..40d23651 --- /dev/null +++ b/framework/qml/TextArea.qml @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2017 Michael Bohlender, + * + * 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. + */ + + +import QtQuick 2.7 +import QtQuick.Templates 2.1 as T + +import org.kube.framework 1.0 as Kube + +T.TextArea { + id: root + + padding: Kube.Units.smallSpacing + 1 //(boder width) + + color: Kube.Colors.textColor + selectionColor: Kube.Colors.highlightColor + selectedTextColor: Kube.Colors.highlightedTextColor + + background: Rectangle { + color: Kube.Colors.viewBackgroundColor + border.width: 1 + border.color: Kube.Colors.buttonColor + } +} diff --git a/framework/qmldir b/framework/qmldir index a5184771..1265b68c 100644 --- a/framework/qmldir +++ b/framework/qmldir @@ -22,6 +22,7 @@ StatusBar 1.0 StatusBar.qml ComboBox 1.0 ComboBox.qml PositiveButton 1.0 PositiveButton.qml TextField 1.0 TextField.qml +TextArea 1.0 TextArea.qml Label 1.0 Label.qml View 1.0 View.qml AutocompleteLineEdit 1.0 AutocompleteLineEdit.qml -- cgit v1.2.3