LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #16928: gui: Rename address checkbox back to bech32

Browse source 
fa7847d99b gui: Rename address checkbox back to bech32 (MarcoFalke)

Pull request description:

  This is the wording that has been used in the previous release, so translations should still exist for it.

  Fixes: #16924

ACKs for top commit:
  promag:
    ACK fa7847d99b.
  laanwj:
    ACK fa7847d99b

Tree-SHA512: 0ac6c47fe5eb2145b609a30fd3f56052d3e08abe6c67fc74b6d209a55a4df509c52f13eb1c759520a4fa43916ece0e6d4cefef87e061b51114a6582db911944a
This commit is contained in:
Wladimir J. van der Laan 2019-09-25 16:19:41 +02:00
commit ae3902ee3f
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/qt/forms/receivecoinsdialog.ui
View file

@ -189,7 +189,7 @@
</widget>
</item>
<item>
<widget class="QCheckBox" name="useLegacyAddress">
<widget class="QCheckBox" name="useBech32">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -206,10 +206,10 @@
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When checked, an address compatible with older wallets will be created instead.</string>
<string>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</string>
</property>
<property name="text">
<string>Generate legacy address</string>
<string>Generate native segwit (Bech32) address</string>
</property>
</widget>
</item>
@ -360,7 +360,7 @@
<tabstops>
<tabstop>reqLabel</tabstop>
<tabstop>reqAmount</tabstop>
<tabstop>useLegacyAddress</tabstop>
<tabstop>useBech32</tabstop>
<tabstop>reqMessage</tabstop>
<tabstop>receiveButton</tabstop>
<tabstop>clearButton</tabstop>

24
src/qt/locale/bitcoin_en.ts
View file

@ -2696,17 +2696,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+136"/>
<source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don&apos;t support them. When checked, an address compatible with older wallets will be created instead.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Generate legacy address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-178"/>
<location line="-39"/>
<location line="+153"/>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"></translation>
@ -2727,7 +2717,17 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+142"/>
<location line="+78"/>
<source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don&apos;t support them. When unchecked, an address compatible with older wallets will be created instead.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Generate native segwit (Bech32) address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+61"/>
<source>Requested payments history</source>
<translation type="unfinished"></translation>
</message>

8
src/qt/receivecoinsdialog.cpp
View file

@ -96,13 +96,13 @@ void ReceiveCoinsDialog::setModel(WalletModel *_model)
if (model->node().isAddressTypeSet()) {
// user explicitly set the type, use it
if (model->wallet().getDefaultAddressType() == OutputType::BECH32) {
ui->useLegacyAddress->setCheckState(Qt::Unchecked);
ui->useBech32->setCheckState(Qt::Checked);
} else {
ui->useLegacyAddress->setCheckState(Qt::Checked);
ui->useBech32->setCheckState(Qt::Unchecked);
}
} else {
// Always fall back to bech32 in the gui
ui->useLegacyAddress->setCheckState(Qt::Unchecked);
ui->useBech32->setCheckState(Qt::Checked);
}
// Set the button to be enabled or disabled based on whether the wallet can give out new addresses.
@ -155,7 +155,7 @@ void ReceiveCoinsDialog::on_receiveButton_clicked()
QString label = ui->reqLabel->text();
/* Generate new receiving address */
OutputType address_type;
if (!ui->useLegacyAddress->isChecked()) {
if (ui->useBech32->isChecked()) {
address_type = OutputType::BECH32;
} else {
address_type = model->wallet().getDefaultAddressType();