Skip to content

Commit 29c4a9f

Browse files
committed
Merge #252: Blockclock connecting state
e3e7b4c qml: wire up logic for block clock connecting state (jarolrod) Pull request description: Wires logic so that the connecting state for the block clock will actually show when the node is finding peers <img width="400" alt="Screen Shot 2023-02-08 at 11 52 38 PM" src="https://user-images.githubusercontent.com/23396902/217739279-4f4d85e0-38e9-4139-ada7-4f9e72acc5df.png"> [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/252) [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/252) [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/252) [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/252) ACKs for top commit: johnny9: ACK e3e7b4c Tree-SHA512: 1243670cfd410b0a56d7677aaf8bb2a2a17e89846c1bfba7ced6222987e38bba509c3b4be767b3e74378178c1e868f80b66642fbd4e64d135a62ebe152677d60
2 parents 9e249e2 + e3e7b4c commit 29c4a9f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/qml/components/BlockClock.qml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Item {
2020
property alias headerSize: mainText.font.pixelSize
2121
property alias subText: subText.text
2222
property int headerSize: 32
23+
property bool connected: nodeModel.numOutboundPeers > 0
2324
property bool synced: nodeModel.verificationProgress > 0.999
2425
property bool paused: false
25-
property bool conns: true
2626

2727
BlockClockDial {
2828
id: dial
@@ -85,7 +85,7 @@ Item {
8585

8686
states: [
8787
State {
88-
name: "IBD"; when: !synced && !paused && conns
88+
name: "IBD"; when: !synced && !paused && connected
8989
PropertyChanges {
9090
target: root
9191
header: Math.round(nodeModel.verificationProgress * 100) + "%"
@@ -94,7 +94,7 @@ Item {
9494
},
9595

9696
State {
97-
name: "BLOCKCLOCK"; when: synced && !paused && conns
97+
name: "BLOCKCLOCK"; when: synced && !paused && connected
9898
PropertyChanges {
9999
target: root
100100
header: Number(nodeModel.blockTipHeight).toLocaleString(Qt.locale(), 'f', 0)
@@ -121,7 +121,7 @@ Item {
121121
},
122122

123123
State {
124-
name: "CONNECTING"; when: !paused && !conns
124+
name: "CONNECTING"; when: !paused && !connected
125125
PropertyChanges {
126126
target: root
127127
header: "Connecting"

0 commit comments

Comments
 (0)