Skip to content

Commit 1a71fd4

Browse files
committed
Merge #164: Refactor Init error window to fit to design spec
86fde6b qml: refactor initerror window (Jarol Rodriguez) Pull request description: Refactors the init error window to fit to the design spec: [init error window design spec](https://www.figma.com/file/GaCoOSNHB2yMB9ThiDtred/Bitcoin-Core-App?node-id=4204%3A85964) | master | PR | | --------- | ---- | | <img width="612" alt="Screen Shot 2022-08-15 at 10 18 07 PM" src="https://user-images.githubusercontent.com/23396902/184787821-693e72aa-e4ac-4535-b6cb-b9b3f780e1ce.png"> | <img width="612" alt="Screen Shot 2023-01-16 at 1 53 50 AM" src="https://user-images.githubusercontent.com/23396902/212616368-688fc9b0-def8-442c-b976-e5592ae09881.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/164) [![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/164) [![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/164) [![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/164) closes #130 ACKs for top commit: johnny9: ACK 86fde6b Tree-SHA512: ffc2d3d40f4a66aac21a1ba5593a88c13ce832c9592744c9227ea495b58c50c417498cbb9b1ca54daf43986f8586cd10cd12f9d2f61d3b3a1bf1b2ec33047f0e
2 parents 56957d4 + 86fde6b commit 1a71fd4

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed

src/qml/pages/initerrormessage.qml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,35 @@
44

55
import QtQuick 2.15
66
import QtQuick.Controls 2.15
7+
import QtQuick.Layouts 1.15
8+
import "../controls"
79

810
ApplicationWindow {
9-
title: "Bitcoin Core TnG"
11+
id: root
1012
visible: true
13+
title: "Bitcoin Core App"
1114
minimumWidth: 500
12-
minimumHeight: 200
15+
minimumHeight: 250
16+
color: Theme.color.background
17+
ColumnLayout {
18+
spacing: 30
19+
anchors.top: parent.top
20+
anchors.horizontalCenter: parent.horizontalCenter
21+
width: 340
1322

14-
Dialog {
15-
anchors.centerIn: parent
16-
title: qsTr("Error")
17-
contentItem:
18-
Label {
19-
text: message
20-
}
21-
visible: true
22-
standardButtons: Dialog.Ok
23-
onAccepted: Qt.quit()
23+
Header {
24+
Layout.topMargin: 30
25+
Layout.fillWidth: true
26+
bold: true
27+
header: qsTr("There was an issue starting up.")
28+
headerSize: 21
29+
description: message
30+
descriptionMargin: 3
31+
}
32+
OutlineButton {
33+
Layout.alignment: Qt.AlignCenter
34+
text: qsTr("Close")
35+
onClicked: Qt.quit()
36+
}
2437
}
2538
}

0 commit comments

Comments
 (0)