diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-05-10 12:13:21 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-05-10 12:39:33 +0200 |
commit | 24cd706a39ac50c77dd9b88f50b8197bb2013173 (patch) | |
tree | 21f02a8ac3852c015386f765144056530cb5817c | |
parent | 4564985f3d53c0a3487e53570e6d4a244be4cb6c (diff) | |
download | kube-24cd706a39ac50c77dd9b88f50b8197bb2013173.tar.gz kube-24cd706a39ac50c77dd9b88f50b8197bb2013173.zip |
Added ProgressBar component
-rw-r--r-- | components/kube/contents/ui/MailView.qml | 17 | ||||
-rw-r--r-- | framework/qml/ProgressBar.qml | 38 | ||||
-rw-r--r-- | framework/qmldir | 1 |
3 files changed, 40 insertions, 16 deletions
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 { | |||
127 | } | 127 | } |
128 | ] | 128 | ] |
129 | } | 129 | } |
130 | Controls2.ProgressBar { | 130 | Kube.ProgressBar { |
131 | id: progressBar | 131 | id: progressBar |
132 | anchors.horizontalCenter: parent.horizontalCenter | 132 | anchors.horizontalCenter: parent.horizontalCenter |
133 | height: 3 | 133 | height: 3 |
@@ -136,21 +136,6 @@ SplitView { | |||
136 | indeterminate: true | 136 | indeterminate: true |
137 | visible: false | 137 | visible: false |
138 | 138 | ||
139 | background: Rectangle { | ||
140 | color: Kube.Colors.backgroundColor | ||
141 | radius: 3 | ||
142 | } | ||
143 | |||
144 | contentItem: Item { | ||
145 | Rectangle { | ||
146 | width: progressBar.visualPosition * parent.width | ||
147 | height: parent.height | ||
148 | radius: 2 | ||
149 | color: Kube.Colors.highlightColor | ||
150 | } | ||
151 | } | ||
152 | |||
153 | |||
154 | Kube.Listener { | 139 | Kube.Listener { |
155 | filter: Kube.Messages.progressNotification | 140 | filter: Kube.Messages.progressNotification |
156 | onMessageReceived: { | 141 | 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 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.com> | ||
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 | import QtQuick 2.7 | ||
20 | import QtQuick.Templates 2.0 as T | ||
21 | import org.kube.framework 1.0 as Kube | ||
22 | |||
23 | T.ProgressBar { | ||
24 | id: root | ||
25 | background: Rectangle { | ||
26 | color: Kube.Colors.backgroundColor | ||
27 | radius: 3 | ||
28 | } | ||
29 | |||
30 | contentItem: Item { | ||
31 | Rectangle { | ||
32 | width: root.visualPosition * root.width | ||
33 | height: root.height | ||
34 | radius: 2 | ||
35 | color: Kube.Colors.highlightColor | ||
36 | } | ||
37 | } | ||
38 | } | ||
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 | |||
17 | IconButton 1.0 IconButton.qml | 17 | IconButton 1.0 IconButton.qml |
18 | Button 1.0 Button.qml | 18 | Button 1.0 Button.qml |
19 | Popup 1.0 Popup.qml | 19 | Popup 1.0 Popup.qml |
20 | ProgressBar 1.0 ProgressBar.qml | ||
20 | ComboBox 1.0 ComboBox.qml | 21 | ComboBox 1.0 ComboBox.qml |
21 | PositiveButton 1.0 PositiveButton.qml | 22 | PositiveButton 1.0 PositiveButton.qml |
22 | TextField 1.0 TextField.qml | 23 | TextField 1.0 TextField.qml |