From bc7a2ceabb8836a668d14f3dbf3731997921c7e7 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 3 Apr 2017 12:59:21 +0200 Subject: A Button --- components/mail/contents/ui/Mail.qml | 24 +++--------------- components/package/contents/ui/Button.qml | 41 +++++++++++++++++++++++++++++++ components/qmldir | 1 + 3 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 components/package/contents/ui/Button.qml (limited to 'components') diff --git a/components/mail/contents/ui/Mail.qml b/components/mail/contents/ui/Mail.qml index 3978098f..a1ff1cb8 100644 --- a/components/mail/contents/ui/Mail.qml +++ b/components/mail/contents/ui/Mail.qml @@ -210,35 +210,19 @@ Controls2.ApplicationWindow { } } - Rectangle { + KubeComponents.Button { id: newMailButton - anchors { top: toolBar.bottom left: parent.left right: parent.right margins: Kirigami.Units.largeSpacing } - color: KubeTheme.Colors.positveColor - clip: true - height: Kirigami.Units.gridUnit * 1.5 - - Text { - anchors.centerIn: parent - - text: qsTr("New Email") - color: KubeTheme.Colors.highlightedTextColor - } - //iconName: "mail-message-new" - //Controls2.Tooltip.text: "compose new email" - - MouseArea { - anchors.fill: parent - onClicked: { - composer.open() - } + text: qsTr("New Email") + onClicked: { + composer.open() } } diff --git a/components/package/contents/ui/Button.qml b/components/package/contents/ui/Button.qml new file mode 100644 index 00000000..ceb8d0c3 --- /dev/null +++ b/components/package/contents/ui/Button.qml @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 Christian Mollekopf, + * + * 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 org.kube.components.theme 1.0 as KubeTheme + +Rectangle { + id: root + + signal clicked() + property alias text: text.text + property color textColor: KubeTheme.Colors.highlightedTextColor + + clip: true + + Text { + id: text + anchors.centerIn: parent + color: root.textColor + } + + MouseArea { + anchors.fill: parent + onClicked: root.clicked() + } +} diff --git a/components/qmldir b/components/qmldir index 24c93d94..90379baf 100644 --- a/components/qmldir +++ b/components/qmldir @@ -13,3 +13,4 @@ Outbox 1.0 Outbox.qml People 1.0 People.qml Notification 1.0 Notification.qml Icon 1.0 Icon.qml +Button 1.0 Button.qml -- cgit v1.2.3