Skip to content

Add OptionButton control #67

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.

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
merged 7 commits into from
Nov 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@ QML_QRC_CPP = qml/qrc_bitcoin.cpp
QML_QRC = qml/bitcoin_qml.qrc
QML_RES_QML = \
qml/components/BlockCounter.qml \
qml/components/ConnectionOptions.qml \
qml/controls/OptionButton.qml \
qml/pages/initerrormessage.qml \
qml/pages/stub.qml

Expand Down
2 changes: 2 additions & 0 deletions src/qml/bitcoin_qml.qrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/qml">
<file>components/BlockCounter.qml</file>
<file>components/ConnectionOptions.qml</file>
<file>controls/OptionButton.qml</file>
<file>pages/initerrormessage.qml</file>
<file>pages/stub.qml</file>
</qresource>
Expand Down
2 changes: 1 addition & 1 deletion src/qml/components/BlockCounter.qml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Label {
verticalAlignment: Text.AlignVCenter
font.family: "Inter"
font.styleName: "Semi Bold"
font.pixelSize: height / 3
font.pixelSize: 20
text: blockHeight
}
35 changes: 35 additions & 0 deletions src/qml/components/ConnectionOptions.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Copyright (c) 2021 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.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.11
import "../controls"

ColumnLayout {
ButtonGroup {
id: group
}
spacing: 15
OptionButton {
ButtonGroup.group: group
Layout.fillWidth: true
text: qsTr("Fast always on")
description: qsTr("Loads quickly at all times and uses as much cellular data as needed.")
recommended: true
}
OptionButton {
ButtonGroup.group: group
Layout.fillWidth: true
checked: true
text: qsTr("Slow always on")
description: qsTr("Loads quickly at all times and uses as much cellular data as needed.")
}
OptionButton {
ButtonGroup.group: group
Layout.fillWidth: true
text: qsTr("Only when on Wi-Fi")
description: qsTr("Loads quickly when on wi-fi and pauses when on cellular data.")
}
}
73 changes: 73 additions & 0 deletions src/qml/controls/OptionButton.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// Copyright (c) 2021 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.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.11

Button {
property string description
property bool recommended: false
id: button
padding: 15
checkable: true
background: Rectangle {
border.width: 1
border.color: button.checked ? "#F7931A" : button.hovered ? "white" : "#999999"
radius: 10
color: "transparent"
Rectangle {
visible: button.visualFocus
anchors.fill: parent
anchors.margins: -4
border.width: 2
border.color: "#F7931A"
radius: 14
color: "transparent"
opacity: 0.4
}
}
contentItem: ColumnLayout {
spacing: 3
Label {
Layout.fillWidth: true
Layout.preferredWidth: 0
font.family: "Inter"
font.styleName: "Regular"
font.pointSize: 18
color: "white"
text: button.text
wrapMode: Text.WordWrap
}
Label {
Layout.fillWidth: true
Layout.preferredWidth: 0
font.family: "Inter"
font.styleName: "Regular"
font.pixelSize: 15
color: "#DEDEDE"
text: button.description
wrapMode: Text.WordWrap
}
Loader {
Layout.topMargin: 2
active: button.recommended
visible: active
sourceComponent: Label {
background: Rectangle {
color: "white"
radius: 3
}
font.styleName: "Regular"
font.pixelSize: 13
topPadding: 3
rightPadding: 7
bottomPadding: 4
leftPadding: 7
color: "black"
text: qsTr("Recommended")
}
}
}
}
36 changes: 19 additions & 17 deletions src/qml/pages/stub.qml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,35 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.11
import "../components" as BitcoinCoreComponents

import "../components"

ApplicationWindow {
id: appWindow
title: "Bitcoin Core TnG"
minimumWidth: 750
minimumHeight: 450
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have any plan on how to set the minimumHeight to correspond to the required minimum size of the contents?
Screen Shot 2021-11-02 at 7 27 24 PM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should set these once we settle down the main/window layout.

background: Rectangle {
color: "black"
}
color: "black"
visible: true

Component.onCompleted: nodeModel.startNodeInitializionThread();

Image {
id: appLogo
anchors.horizontalCenter: parent.horizontalCenter
source: "image://images/app"
sourceSize.width: 128
sourceSize.height: 128
}

BitcoinCoreComponents.BlockCounter {
id: blockCounter
ColumnLayout {
anchors.centerIn: parent
height: parent.height / 3
blockHeight: nodeModel.blockTipHeight
spacing: 15
width: 400
Image {
Layout.alignment: Qt.AlignCenter
source: "image://images/app"
sourceSize.width: 64
sourceSize.height: 64
}
BlockCounter {
Layout.alignment: Qt.AlignCenter
blockHeight: nodeModel.blockTipHeight
}
ConnectionOptions {
Layout.preferredWidth: 400
focus: true
}
}
}