Skip to content
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

Introduce Create Single-Sig wallet flow #403

Merged
merged 4 commits into from
Aug 1, 2024
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
20 changes: 17 additions & 3 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ QT_MOC_CPP = \
qml/models/moc_options_model.cpp \
qml/models/moc_peerlistsortproxy.cpp \
qml/moc_appmode.cpp \
qml/moc_walletcontroller.cpp \
qt/moc_addressbookpage.cpp \
qt/moc_addresstablemodel.cpp \
qt/moc_askpassphrasedialog.cpp \
Expand Down Expand Up @@ -126,6 +127,7 @@ BITCOIN_QT_H = \
qml/guiconstants.h \
qml/imageprovider.h \
qml/util.h \
qml/walletcontroller.h \
qt/addressbookpage.h \
qt/addresstablemodel.h \
qt/askpassphrasedialog.h \
Expand Down Expand Up @@ -310,13 +312,15 @@ BITCOIN_QML_BASE_CPP = \
qml/models/options_model.cpp \
qml/models/peerlistsortproxy.cpp \
qml/imageprovider.cpp \
qml/util.cpp
qml/util.cpp \
qml/walletcontroller.cpp

QML_RES_FONTS = \
qml/res/fonts/Inter-Regular.otf \
qml/res/fonts/Inter-SemiBold.otf

QML_RES_ICONS = \
qml/res/icons/add-wallet-dark.png \
qml/res/icons/arrow-down.png \
qml/res/icons/arrow-up.png \
qml/res/icons/bitcoin-circle.png \
Expand All @@ -331,6 +335,7 @@ QML_RES_ICONS = \
qml/res/icons/export.png \
qml/res/icons/gear.png \
qml/res/icons/gear-outline.png \
qml/res/icons/hidden.png \
qml/res/icons/info.png \
qml/res/icons/network-dark.png \
qml/res/icons/network-light.png \
Expand All @@ -339,7 +344,9 @@ QML_RES_ICONS = \
qml/res/icons/storage-dark.png \
qml/res/icons/storage-light.png \
qml/res/icons/tooltip-arrow-dark.png \
qml/res/icons/tooltip-arrow-light.png
qml/res/icons/tooltip-arrow-light.png \
qml/res/icons/wallet.png \
qml/res/icons/visible.png

QML_QRC_CPP = qml/qrc_bitcoin.cpp
QML_QRC = qml/bitcoin_qml.qrc
Expand All @@ -348,7 +355,6 @@ QML_RES_QML = \
qml/components/BlockClock.qml \
qml/components/BlockClockDisplayMode.qml \
qml/components/BlockCounter.qml \
qml/controls/CaretRightIcon.qml \
qml/components/ConnectionOptions.qml \
qml/components/ConnectionSettings.qml \
qml/components/DeveloperOptions.qml \
Expand All @@ -364,8 +370,10 @@ QML_RES_QML = \
qml/components/ThemeSettings.qml \
qml/components/TotalBytesIndicator.qml \
qml/components/Tooltip.qml \
qml/controls/CaretRightIcon.qml \
qml/controls/ContinueButton.qml \
qml/controls/CoreText.qml \
qml/controls/CoreTextField.qml \
qml/controls/ExternalLink.qml \
qml/controls/FocusBorder.qml \
qml/controls/Header.qml \
Expand Down Expand Up @@ -409,6 +417,12 @@ QML_RES_QML = \
qml/pages/settings/SettingsProxy.qml \
qml/pages/settings/SettingsStorage.qml \
qml/pages/settings/SettingsTheme.qml \
qml/pages/wallet/AddWallet.qml \
qml/pages/wallet/CreateBackup.qml \
qml/pages/wallet/CreateConfirm.qml \
qml/pages/wallet/CreateIntro.qml \
qml/pages/wallet/CreateName.qml \
qml/pages/wallet/CreatePassword.qml \
qml/pages/wallet/DesktopWallets.qml

if TARGET_ANDROID
Expand Down
6 changes: 5 additions & 1 deletion src/qml/bitcoin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@
#endif
#include <qml/components/blockclockdial.h>
#include <qml/controls/linegraph.h>
#include <qml/guiconstants.h>
#include <qml/models/chainmodel.h>
#include <qml/models/networktraffictower.h>
#include <qml/models/nodemodel.h>
#include <qml/models/options_model.h>
#include <qml/models/peerlistsortproxy.h>
#include <qml/imageprovider.h>
#include <qml/util.h>
#include <qml/guiconstants.h>
#include <qml/walletcontroller.h>
#include <qt/guiutil.h>
#include <qt/initexecutor.h>
#include <qt/networkstyle.h>
Expand Down Expand Up @@ -286,6 +287,8 @@ int QmlGuiMain(int argc, char* argv[])
GUIUtil::LoadFont(":/fonts/inter/regular");
GUIUtil::LoadFont(":/fonts/inter/semibold");

WalletController wallet_controller(*node);

QQmlApplicationEngine engine;

QScopedPointer<const NetworkStyle> network_style{NetworkStyle::instantiate(Params().GetChainType())};
Expand All @@ -297,6 +300,7 @@ int QmlGuiMain(int argc, char* argv[])
engine.rootContext()->setContextProperty("chainModel", &chain_model);
engine.rootContext()->setContextProperty("peerTableModel", &peer_model);
engine.rootContext()->setContextProperty("peerListModelProxy", &peer_model_sort_proxy);
engine.rootContext()->setContextProperty("walletController", &wallet_controller);

OptionsQmlModel options_model(*node, !need_onboarding.toBool());
engine.rootContext()->setContextProperty("optionsModel", &options_model);
Expand Down
11 changes: 11 additions & 0 deletions src/qml/bitcoin_qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<file>components/Tooltip.qml</file>
<file>controls/ContinueButton.qml</file>
<file>controls/CoreText.qml</file>
<file>controls/CoreTextField.qml</file>
<file>controls/ExternalLink.qml</file>
<file>controls/FocusBorder.qml</file>
<file>controls/Header.qml</file>
Expand Down Expand Up @@ -65,9 +66,16 @@
<file>pages/settings/SettingsProxy.qml</file>
<file>pages/settings/SettingsStorage.qml</file>
<file>pages/settings/SettingsTheme.qml</file>
<file>pages/wallet/AddWallet.qml</file>
<file>pages/wallet/CreateBackup.qml</file>
<file>pages/wallet/CreateConfirm.qml</file>
<file>pages/wallet/CreateIntro.qml</file>
<file>pages/wallet/CreateName.qml</file>
<file>pages/wallet/CreatePassword.qml</file>
<file>pages/wallet/DesktopWallets.qml</file>
</qresource>
<qresource prefix="/icons">
<file alias="add-wallet-dark">res/icons/add-wallet-dark.png</file>
<file alias="arrow-down">res/icons/arrow-down.png</file>
<file alias="arrow-up">res/icons/arrow-up.png</file>
<file alias="bitcoin-circle">res/icons/bitcoin-circle.png</file>
Expand All @@ -83,6 +91,7 @@
<file alias="export">res/icons/export.png</file>
<file alias="gear">res/icons/gear.png</file>
<file alias="gear-outline">res/icons/gear-outline.png</file>
<file alias="hidden">res/icons/hidden.png</file>
<file alias="info">res/icons/info.png</file>
<file alias="network-dark">res/icons/network-dark.png</file>
<file alias="network-light">res/icons/network-light.png</file>
Expand All @@ -92,6 +101,8 @@
<file alias="storage-light">res/icons/storage-light.png</file>
<file alias="tooltip-arrow-dark">res/icons/tooltip-arrow-dark.png</file>
<file alias="tooltip-arrow-light">res/icons/tooltip-arrow-light.png</file>
<file alias="wallet">res/icons/wallet.png</file>
<file alias="visible">res/icons/visible.png</file>
</qresource>
<qresource prefix="/fonts">
<file alias="inter/regular">res/fonts/Inter-Regular.otf</file>
Expand Down
25 changes: 22 additions & 3 deletions src/qml/controls/ContinueButton.qml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,44 @@ import org.bitcoincore.qt 1.0
Button {
id: root
hoverEnabled: AppMode.isDesktop

property color textColor: Theme.color.white
property color backgroundColor: Theme.color.orange
property color backgroundHoverColor: Theme.color.orangeLight1
property color backgroundPressedColor: Theme.color.orangeLight2
property color borderColor: "transparent"
property color borderHoverColor: "transparent"
property color borderPressedColor: "transparent"

contentItem: CoreText {
text: parent.text
color: root.textColor
bold: true
font.pixelSize: 18
}
background: Rectangle {
id: bg
implicitHeight: 46
color: Theme.color.orange
color: backgroundColor
border.color: borderColor
radius: 5

states: [
State {
name: "DISABLED"; when: !root.enabled
PropertyChanges { target: bg; color: Theme.color.neutral2 }
PropertyChanges { target: bg; border.color: Theme.color.neutral2 }
PropertyChanges { target: root; textColor: Theme.color.neutral5 }
},
State {
name: "PRESSED"; when: root.pressed
PropertyChanges { target: bg; color: Theme.color.orangeLight2 }
PropertyChanges { target: bg; color: backgroundPressedColor }
PropertyChanges { target: bg; border.color: borderPressedColor }
},
State {
name: "HOVER"; when: root.hovered
PropertyChanges { target: bg; color: Theme.color.orangeLight1 }
PropertyChanges { target: bg; color: backgroundHoverColor }
PropertyChanges { target: bg; border.color: borderHoverColor }
}
]

Expand Down
50 changes: 50 additions & 0 deletions src/qml/controls/CoreTextField.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// Copyright (c) 2022 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

TextField {
id: root

property bool hideText: false

implicitHeight: 56
implicitWidth: 450
font.family: "Inter"
font.styleName: "Regular"
font.pixelSize: 18
color: Theme.color.neutral9
placeholderTextColor: Theme.color.neutral5
echoMode: hideText ? TextInput.Password : TextInput.Normal
rightPadding: hideText ? 46 : 20
leftPadding: 20
background: Rectangle {
border.color: Theme.color.neutral5
border.width: 1
color: "transparent"
radius: 5

Icon {
id: visibleIcon
enabled: hideText
visible: hideText
anchors.right: parent.right
anchors.rightMargin: 12
size: 24
anchors.verticalCenter: parent.verticalCenter
source: "qrc:/icons/visible"
color: Theme.color.neutral5
onClicked: {
if (root.echoMode == TextInput.Password) {
root.echoMode = TextInput.Normal
visibleIcon.source = "qrc:/icons/hidden"
} else {
root.echoMode = TextInput.Password
visibleIcon.source = "qrc:/icons/visible"
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/qml/controls/Setting.qml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.bitcoincore.qt 1.0

AbstractButton {
id: root
required property string header
property string header
property alias actionItem: action_loader.sourceComponent
property alias loadedItem: action_loader.item
property string description
Expand Down
20 changes: 20 additions & 0 deletions src/qml/imageprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,25 @@ QPixmap ImageProvider::requestPixmap(const QString& id, QSize* size, const QSize
return QIcon(":/icons/tooltip-arrow-light").pixmap(requested_size);
}

if (id == "add-wallet-dark") {
*size = requested_size;
return QIcon(":/icons/add-wallet-dark").pixmap(requested_size);
}

if (id == "wallet") {
*size = requested_size;
return QIcon(":/icons/wallet").pixmap(requested_size);
}

if (id == "visible") {
*size = requested_size;
return QIcon(":/icons/visible").pixmap(requested_size);
}

if (id == "hidden") {
*size = requested_size;
return QIcon(":/icons/hidden").pixmap(requested_size);
}

return {};
}
10 changes: 10 additions & 0 deletions src/qml/pages/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ ApplicationWindow {
optionsModel.onboard()
if (AppMode.walletEnabled && AppMode.isDesktop) {
main.push(desktopWallets)
main.push(addWallet)
} else {
main.push(node)
}
Expand All @@ -93,6 +94,15 @@ ApplicationWindow {
DesktopWallets {}
}

Component {
id: addWallet
AddWallet {
onFinished: {
main.pop()
}
}
}

Component {
id: shutdown
Shutdown {}
Expand Down
Loading
Loading