Add HCircleProgressBar

This commit is contained in:
miruka 2019-11-06 13:49:48 -04:00
parent 3cbbd6042b
commit f9fd8055f2
7 changed files with 68 additions and 4 deletions

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "submodules/qsyncable"] [submodule "submodules/qsyncable"]
path = submodules/qsyncable path = submodules/qsyncable
url = https://github.com/benlau/qsyncable url = https://github.com/benlau/qsyncable
[submodule "submodules/RadialBarDemo"]
path = submodules/RadialBarDemo
url = https://github.com/arunpkqt/RadialBarDemo

View File

@ -1,10 +1,9 @@
- Media - Media
- Show upload progression
- Theming (upload bar, media text bubbles) - Theming (upload bar, media text bubbles)
- Downloading - Downloading
- Bottom/top bar - Bottom/top bar
- Image loading progress bar
- Verify things work with chat.privacytools.io (subdomain weirdness) - Verify things work with chat.privacytools.io (subdomain weirdness)
- Show real progression for thumbnail loadings, uploads and downloads
- Support m.file thumbnails - Support m.file thumbnails
- Generate video thumbnails - Generate video thumbnails

View File

@ -12,8 +12,10 @@ RCC_DIR = $$BUILD_DIR/rcc
QRC_FILE = $$BUILD_DIR/resources.qrc QRC_FILE = $$BUILD_DIR/resources.qrc
RESOURCES += $$QRC_FILE RESOURCES += $$QRC_FILE
HEADERS += src/utils.h src/clipboard.h HEADERS += src/utils.h src/clipboard.h \
SOURCES += src/main.cpp src/utils.cpp src/clipboard.cpp submodules/RadialBarDemo/radialbar.h
SOURCES += src/main.cpp src/utils.cpp src/clipboard.cpp \
submodules/RadialBarDemo/radialbar.cpp
TARGET = harmonyqml TARGET = harmonyqml

View File

@ -4,6 +4,8 @@
#include <QQmlComponent> #include <QQmlComponent>
#include <QFileInfo> #include <QFileInfo>
#include "../submodules/RadialBarDemo/radialbar.h"
#include "utils.h" #include "utils.h"
#include "clipboard.h" #include "clipboard.h"
@ -28,6 +30,8 @@ int main(int argc, char *argv[]) {
objectContext->setContextProperty("CppUtils", new Utils()); objectContext->setContextProperty("CppUtils", new Utils());
objectContext->setContextProperty("Clipboard", new Clipboard()); objectContext->setContextProperty("Clipboard", new Clipboard());
qmlRegisterType<RadialBar>("RadialBar", 1, 0, "RadialBar");
QFileInfo qrcPath(":src/qml/Window.qml"); QFileInfo qrcPath(":src/qml/Window.qml");
QQmlComponent component( QQmlComponent component(

View File

@ -0,0 +1,48 @@
import QtQuick 2.12
import RadialBar 1.0
RadialBar {
id: bar
foregroundColor: theme.controls.circleProgressBar.background
progressColor: theme.controls.circleProgressBar.foreground
dialWidth: theme.controls.circleProgressBar.thickness
startAngle: 0
spanAngle: 360
from: 0
to: 100
value: 0
showText: true
suffixText: qsTr("%")
textFont.pixelSize: theme.fontSize.big
textColor: theme.controls.circleProgressBar.text
property alias from: bar.minValue
property alias to: bar.maxValue
property bool indeterminate: false
Binding {
target: bar;
property: "value";
value: bar.to * theme.controls.circleProgressBar.indeterminateSpan
when: bar.indeterminate
}
Binding {
target: bar
property: "showText"
value: false
when: bar.indeterminate
}
RotationAnimator on rotation {
running: bar.indeterminate
from: 0
to: 360
loops: Animation.Infinite
duration: theme ? (theme.animationDuration * 6) : 600
}
}

View File

@ -176,6 +176,13 @@ controls:
color background: colors.inputBackground color background: colors.inputBackground
color foreground: colors.accentBackground color foreground: colors.accentBackground
circleProgressBar:
int thickness: Math.max(2, spacing / 2)
color background: colors.inputBackground
color foreground: colors.accentBackground
color text: colors.text
real indeterminateSpan: 0.2 // 0-1
slider: slider:
int radius: 2 int radius: 2
int height: controls.progressBar.height int height: controls.progressBar.height

@ -0,0 +1 @@
Subproject commit 7c3ebecf4ef0c23776c591ee5d37ff104d04f798