foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 09:46:52 -05:00
Code Issues Activity

gui: fix passphrase labels/tooltip in createwalletdialog/askpassphrasedialog

Browse source 
UI improvements:
- update remaining GUI wallet labels and tooltips from passwords to passphrases
- improve grammar of labels in askpassphrase dialog and WalletController::closeWallet
This commit is contained in:
Jon Atack 2019-09-07 11:52:37 +02:00
parent 43aa9b0d79
commit 539d9403af
No known key found for this signature in database
GPG key ID: 4F5721B3D0E3921D
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/qt/askpassphrasedialog.cpp
View file

@ -44,7 +44,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent, SecureStri
switch(mode) switch(mode)
{ {
case Encrypt: // Ask passphrase x2 case Encrypt: // Ask passphrase x2
ui->warningLabel->setText(tr("Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.")); ui->warningLabel->setText(tr("Enter the new passphrase for the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>."));
ui->passLabel1->hide(); ui->passLabel1->hide();
ui->passEdit1->hide(); ui->passEdit1->hide();
setWindowTitle(tr("Encrypt wallet")); setWindowTitle(tr("Encrypt wallet"));
@ -67,7 +67,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent, SecureStri
break; break;
case ChangePass: // Ask old passphrase + new passphrase x2 case ChangePass: // Ask old passphrase + new passphrase x2
setWindowTitle(tr("Change passphrase")); setWindowTitle(tr("Change passphrase"));
ui->warningLabel->setText(tr("Enter the old passphrase and new passphrase to the wallet.")); ui->warningLabel->setText(tr("Enter the old passphrase and new passphrase for the wallet."));
break; break;
} }
textChanged(); textChanged();

2
src/qt/forms/askpassphrasedialog.ui
View file

@ -95,7 +95,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QCheckBox" name="toggleShowPasswordButton"> <widget class="QCheckBox" name="toggleShowPasswordButton">
<property name="text"> <property name="text">
<string>Show password</string> <string>Show passphrase</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/qt/forms/createwalletdialog.ui
View file

@ -62,7 +62,7 @@
</rect> </rect>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Encrypt the wallet. The wallet will be encrypted with a password of your choice.</string> <string>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Encrypt Wallet</string> <string>Encrypt Wallet</string>

2
src/qt/walletcontroller.cpp
View file

@ -75,7 +75,7 @@ void WalletController::closeWallet(WalletModel* wallet_model, QWidget* parent)
{ {
QMessageBox box(parent); QMessageBox box(parent);
box.setWindowTitle(tr("Close wallet")); box.setWindowTitle(tr("Close wallet"));
box.setText(tr("Are you sure you wish to close wallet <i>%1</i>?").arg(GUIUtil::HtmlEscape(wallet_model->getDisplayName()))); box.setText(tr("Are you sure you wish to close the wallet <i>%1</i>?").arg(GUIUtil::HtmlEscape(wallet_model->getDisplayName())));
box.setInformativeText(tr("Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.")); box.setInformativeText(tr("Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled."));
box.setStandardButtons(QMessageBox::Yes|QMessageBox::Cancel); box.setStandardButtons(QMessageBox::Yes|QMessageBox::Cancel);
box.setDefaultButton(QMessageBox::Yes); box.setDefaultButton(QMessageBox::Yes);