Skip to content

Commit fd4e57f

Browse files
committed
Merge #199: Better TextButton control default values
956605f qml: make the TextButton control default values more usable (Jarol Rodriguez) Pull request description: This makes the default values of the TextButton control more usable to it's actual usage. ## Desktop | master | pr | | ------ | -- | | <img width="752" alt="master-7" src="https://user-images.githubusercontent.com/23396902/206324636-ba5d9192-45e2-4e8b-9095-898832e53b16.png"> | <img width="752" alt="Screen Shot 2022-12-07 at 7 09 23 PM" src="https://user-images.githubusercontent.com/23396902/206324655-5f2a26c1-5595-4a19-acbb-1886c2e5278a.png"> | | master | pr | | ------ | -- | | <img width="752" alt="master-9" src="https://user-images.githubusercontent.com/23396902/206324735-f5417dd2-3719-4c16-9e41-b07fd414dbea.png"> | <img width="752" alt="Screen Shot 2022-12-07 at 7 09 29 PM" src="https://user-images.githubusercontent.com/23396902/206324747-657084ce-a26e-44fe-8599-b2210a8c83d0.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/199) [![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/199) [![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/199) [![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/199) ACKs for top commit: johnny9: ACK 956605f Tree-SHA512: cfc80ed64d2fecf137ad775f0bed754eb72cbec8e13c40f746419295908e6ee553e2ac333f5e28948f78245c97d78ddd7e99f42632f86c7fe9d43cc2116eaffc
2 parents 01f3d56 + 956605f commit fd4e57f

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

src/qml/controls/TextButton.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import QtQuick.Controls 2.15
88
Button {
99
id: root
1010
property int textSize: 18
11-
property string textColor: Theme.color.neutral9
11+
property string textColor: Theme.color.orange
1212
property bool bold: true
1313
property bool rightalign: false
1414
font.family: "Inter"

src/qml/pages/onboarding/OnboardingConnection.qml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ Page {
3838
detailActive: true
3939
detailItem: TextButton {
4040
text: qsTr("Connection settings")
41-
textSize: 18
42-
textColor: Theme.color.orange
43-
onClicked: {
44-
connections.incrementCurrentIndex()
45-
}
41+
onClicked: connections.incrementCurrentIndex()
4642
}
4743
lastPage: true
4844
buttonText: qsTr("Next")

src/qml/pages/onboarding/OnboardingStorageAmount.qml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ Page {
4040
Layout.topMargin: 30
4141
Layout.fillWidth: true
4242
text: qsTr("Detailed settings")
43-
textSize: 18
44-
textColor: "#F7931A"
45-
onClicked: {
46-
storages.incrementCurrentIndex()
47-
}
43+
onClicked: storages.incrementCurrentIndex()
4844
}
4945
}
5046
buttonText: qsTr("Next")

0 commit comments

Comments
 (0)