diff options
author | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-05-17 13:43:57 +0200 |
---|---|---|
committer | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-05-17 13:43:57 +0200 |
commit | 3dfcc1ae7973d1dbbd2dfa6c10d14548815ad7de (patch) | |
tree | 2d96ab2f0842f095fdb08b0faef128ec247f6ef1 | |
parent | 8dce5968d395ef362fd554ed5131d14900470a67 (diff) | |
download | kube-3dfcc1ae7973d1dbbd2dfa6c10d14548815ad7de.tar.gz kube-3dfcc1ae7973d1dbbd2dfa6c10d14548815ad7de.zip |
initial Kube.TextArea
-rw-r--r-- | components/kube/contents/ui/ComposerView.qml | 5 | ||||
-rw-r--r-- | framework/qml/TextArea.qml | 39 | ||||
-rw-r--r-- | framework/qmldir | 1 |
3 files changed, 44 insertions, 1 deletions
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 { | |||
237 | leftMargin: Kube.Units.largeSpacing + Kube.Units.gridUnit * 2 | 237 | leftMargin: Kube.Units.largeSpacing + Kube.Units.gridUnit * 2 |
238 | rightMargin: Kube.Units.largeSpacing + Kube.Units.gridUnit * 2 | 238 | rightMargin: Kube.Units.largeSpacing + Kube.Units.gridUnit * 2 |
239 | } | 239 | } |
240 | |||
241 | spacing: Kube.Units.smallSpacing * 2 | ||
242 | |||
240 | Kube.TextField { | 243 | Kube.TextField { |
241 | id: subject | 244 | id: subject |
242 | Layout.fillWidth: true | 245 | Layout.fillWidth: true |
@@ -247,7 +250,7 @@ Kube.View { | |||
247 | onActiveFocusChanged: closeFirstSplitIfNecessary() | 250 | onActiveFocusChanged: closeFirstSplitIfNecessary() |
248 | } | 251 | } |
249 | 252 | ||
250 | Controls2.TextArea { | 253 | Kube.TextArea { |
251 | id: content | 254 | id: content |
252 | Layout.fillWidth: true | 255 | Layout.fillWidth: true |
253 | Layout.fillHeight: true | 256 | 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 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2017 Michael Bohlender, <michael.bohlender@kdemail.net> | ||
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 | |||
19 | |||
20 | import QtQuick 2.7 | ||
21 | import QtQuick.Templates 2.1 as T | ||
22 | |||
23 | import org.kube.framework 1.0 as Kube | ||
24 | |||
25 | T.TextArea { | ||
26 | id: root | ||
27 | |||
28 | padding: Kube.Units.smallSpacing + 1 //(boder width) | ||
29 | |||
30 | color: Kube.Colors.textColor | ||
31 | selectionColor: Kube.Colors.highlightColor | ||
32 | selectedTextColor: Kube.Colors.highlightedTextColor | ||
33 | |||
34 | background: Rectangle { | ||
35 | color: Kube.Colors.viewBackgroundColor | ||
36 | border.width: 1 | ||
37 | border.color: Kube.Colors.buttonColor | ||
38 | } | ||
39 | } | ||
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 | |||
22 | ComboBox 1.0 ComboBox.qml | 22 | ComboBox 1.0 ComboBox.qml |
23 | PositiveButton 1.0 PositiveButton.qml | 23 | PositiveButton 1.0 PositiveButton.qml |
24 | TextField 1.0 TextField.qml | 24 | TextField 1.0 TextField.qml |
25 | TextArea 1.0 TextArea.qml | ||
25 | Label 1.0 Label.qml | 26 | Label 1.0 Label.qml |
26 | View 1.0 View.qml | 27 | View 1.0 View.qml |
27 | AutocompleteLineEdit 1.0 AutocompleteLineEdit.qml | 28 | AutocompleteLineEdit 1.0 AutocompleteLineEdit.qml |