monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ledger: improve hw wallet splash screen

Browse source
This commit is contained in:
selsta 2019-08-16 21:19:58 +02:00
parent 562c46660a
commit 40bdf692d1
No known key found for this signature in database
GPG key ID: 2EA0A99A8B07AE5E
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.qml
View file

@ -859,7 +859,9 @@ ApplicationWindow {
", priority: ", priority, ", priority: ", priority,
", description: ", description); ", description: ", description);
showProcessingSplash("Creating transaction"); var splashMsg = qsTr("Creating transaction...");
splashMsg += appWindow.currentWallet.isLedger() ? qsTr("\n\nPlease check your hardware wallet –\nyour input may be required.") : "";
showProcessingSplash(splashMsg);
transactionDescription = description; transactionDescription = description;

5
src/libwalletqt/Wallet.cpp
View file

@ -258,6 +258,11 @@ bool Wallet::isHwBacked() const
return m_walletImpl->getDeviceType() != Monero::Wallet::Device_Software; return m_walletImpl->getDeviceType() != Monero::Wallet::Device_Software;
} }
bool Wallet::isLedger() const
{
return m_walletImpl->getDeviceType() == Monero::Wallet::Device_Ledger;
}
//! create a view only wallet //! create a view only wallet
bool Wallet::createViewOnly(const QString &path, const QString &password) const bool Wallet::createViewOnly(const QString &path, const QString &password) const
{ {

1
src/libwalletqt/Wallet.h
View file

@ -180,6 +180,7 @@ public:
//! hw-device backed wallets //! hw-device backed wallets
Q_INVOKABLE bool isHwBacked() const; Q_INVOKABLE bool isHwBacked() const;
Q_INVOKABLE bool isLedger() const;
//! returns if view only wallet //! returns if view only wallet
Q_INVOKABLE bool viewOnly() const; Q_INVOKABLE bool viewOnly() const;

4
wizard/WizardController.qml
View file

@ -448,7 +448,9 @@ Rectangle {
} }
function creatingWalletDeviceSplash(){ function creatingWalletDeviceSplash(){
appWindow.showProcessingSplash(qsTr("Creating wallet from device...")); var splashMsg = qsTr("Creating wallet from device...");
splashMsg += wizardController.walletOptionsDeviceName === "Ledger" ? qsTr("\n\nPlease check your hardware wallet –\nyour input may be required.") : "";
appWindow.showProcessingSplash(splashMsg);
} }
function createWalletFromDevice() { function createWalletFromDevice() {