Skip to content

Introduce reusable CaretRightButton, bind color to Setting stateColor #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hebasto merged 2 commits into from
Feb 9, 2023
Merged

Introduce reusable CaretRightButton, bind color to Setting stateColor #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bd516d
qml: add CaretRightButton component
jarolrod Feb 1, 2023
624d985
qml: use CaretRightButton, bind to Setting state color
jarolrod Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ QML_RES_QML = \
qml/components/AboutOptions.qml \
qml/components/BlockClock.qml \
qml/components/BlockCounter.qml \
qml/components/CaretRightButton.qml \
qml/components/ConnectionOptions.qml \
qml/components/ConnectionSettings.qml \
qml/components/DeveloperOptions.qml \
Expand Down
1 change: 1 addition & 0 deletions src/qml/bitcoin_qml.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<file>components/AboutOptions.qml</file>
<file>components/BlockClock.qml</file>
<file>components/BlockCounter.qml</file>
<file>components/CaretRightButton.qml</file>
<file>components/ConnectionOptions.qml</file>
<file>components/ConnectionSettings.qml</file>
<file>components/DeveloperOptions.qml</file>
Expand Down
9 changes: 3 additions & 6 deletions src/qml/components/AboutOptions.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,12 @@ ColumnLayout {
onClicked: loadedItem.clicked()
}
Setting {
id: gotoDeveloper
Layout.fillWidth: true
header: qsTr("Developer options")
description: qsTr("Only use these if you have development experience")
actionItem: Button {
icon.source: "image://images/caret-right"
icon.color: Theme.color.neutral9
icon.height: 18
icon.width: 18
background: null
actionItem: CaretRightButton{
stateColor: gotoDeveloper.stateColor
onClicked: {
aboutSwipe.incrementCurrentIndex()
}
Expand Down
20 changes: 20 additions & 0 deletions src/qml/components/CaretRightButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright (c) 2023 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

import QtQuick 2.15
import QtQuick.Controls 2.15

Button {
id: root
required property color stateColor
icon.source: "image://images/caret-right"
icon.color: root.stateColor
icon.height: 18
icon.width: 18
background: null

Behavior on icon.color {
ColorAnimation { duration: 150 }
}
}
9 changes: 3 additions & 6 deletions src/qml/components/ConnectionSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,12 @@ ColumnLayout {
}
}
Setting {
id: gotoProxy
last: true
Layout.fillWidth: true
header: qsTr("Proxy settings")
actionItem: Button {
icon.source: "image://images/caret-right"
icon.color: Theme.color.neutral9
icon.height: 18
icon.width: 18
background: null
actionItem: CaretRightButton {
stateColor: gotoProxy.stateColor
}
}
}
27 changes: 9 additions & 18 deletions src/qml/pages/node/NodeSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,44 +47,35 @@ Item {
onClicked: loadedItem.toggled()
}
Setting {
id: gotoAbout
Layout.fillWidth: true
header: qsTr("About")
actionItem: Button {
icon.source: "image://images/caret-right"
icon.color: Theme.color.neutral9
icon.height: 18
icon.width: 18
background: null
actionItem: CaretRightButton {
stateColor: gotoAbout.stateColor
onClicked: {
nodeSettingsView.push(about_page)
}
}
onClicked: loadedItem.clicked()
}
Setting {
id: gotoStorage
Layout.fillWidth: true
header: qsTr("Storage")
actionItem: Button {
icon.source: "image://images/caret-right"
icon.color: Theme.color.neutral9
icon.height: 18
icon.width: 18
background: null
actionItem: CaretRightButton {
stateColor: gotoStorage.stateColor
onClicked: {
nodeSettingsView.push(storage_page)
}
}
onClicked: loadedItem.clicked()
}
Setting {
id: gotoConnection
Layout.fillWidth: true
header: qsTr("Connection")
actionItem: Button {
icon.source: "image://images/caret-right"
icon.color: Theme.color.neutral9
icon.height: 18
icon.width: 18
background: null
actionItem: CaretRightButton {
stateColor: gotoConnection.stateColor
onClicked: {
nodeSettingsView.push(connection_page)
}
Expand Down