From 24cd706a39ac50c77dd9b88f50b8197bb2013173 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 10 May 2017 12:13:21 +0200 Subject: Added ProgressBar component --- components/kube/contents/ui/MailView.qml | 17 +------------- framework/qml/ProgressBar.qml | 38 ++++++++++++++++++++++++++++++++ framework/qmldir | 1 + 3 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 framework/qml/ProgressBar.qml diff --git a/components/kube/contents/ui/MailView.qml b/components/kube/contents/ui/MailView.qml index c40722d0..51bfa3d3 100644 --- a/components/kube/contents/ui/MailView.qml +++ b/components/kube/contents/ui/MailView.qml @@ -127,7 +127,7 @@ SplitView { } ] } - Controls2.ProgressBar { + Kube.ProgressBar { id: progressBar anchors.horizontalCenter: parent.horizontalCenter height: 3 @@ -136,21 +136,6 @@ SplitView { indeterminate: true visible: false - background: Rectangle { - color: Kube.Colors.backgroundColor - radius: 3 - } - - contentItem: Item { - Rectangle { - width: progressBar.visualPosition * parent.width - height: parent.height - radius: 2 - color: Kube.Colors.highlightColor - } - } - - Kube.Listener { filter: Kube.Messages.progressNotification onMessageReceived: { diff --git a/framework/qml/ProgressBar.qml b/framework/qml/ProgressBar.qml new file mode 100644 index 00000000..12d4f0e9 --- /dev/null +++ b/framework/qml/ProgressBar.qml @@ -0,0 +1,38 @@ +/* + * 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 QtQuick.Templates 2.0 as T +import org.kube.framework 1.0 as Kube + +T.ProgressBar { + id: root + background: Rectangle { + color: Kube.Colors.backgroundColor + radius: 3 + } + + contentItem: Item { + Rectangle { + width: root.visualPosition * root.width + height: root.height + radius: 2 + color: Kube.Colors.highlightColor + } + } +} diff --git a/framework/qmldir b/framework/qmldir index 4de45a1c..8b0c52ac 100644 --- a/framework/qmldir +++ b/framework/qmldir @@ -17,6 +17,7 @@ Icon 1.0 Icon.qml IconButton 1.0 IconButton.qml Button 1.0 Button.qml Popup 1.0 Popup.qml +ProgressBar 1.0 ProgressBar.qml ComboBox 1.0 ComboBox.qml PositiveButton 1.0 PositiveButton.qml TextField 1.0 TextField.qml -- cgit v1.2.3