mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-19 01:42:58 +01:00
qt: Changes for built-in PCP+NAT-PMP
Change option help, and remove conditionals.
This commit is contained in:
parent
52f8ef66c6
commit
7b04709862
@ -328,10 +328,10 @@
|
||||
<item>
|
||||
<widget class="QCheckBox" name="mapPortNatpmp">
|
||||
<property name="toolTip">
|
||||
<string>Automatically open the Bitcoin client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</string>
|
||||
<string>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Map port using NA&T-PMP</string>
|
||||
<string>Map port using PCP or NA&T-PMP</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
@ -108,9 +108,6 @@ OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet)
|
||||
#ifndef USE_UPNP
|
||||
ui->mapPortUpnp->setEnabled(false);
|
||||
#endif
|
||||
#ifndef USE_NATPMP
|
||||
ui->mapPortNatpmp->setEnabled(false);
|
||||
#endif
|
||||
|
||||
ui->proxyIp->setEnabled(false);
|
||||
ui->proxyPort->setEnabled(false);
|
||||
|
@ -414,11 +414,7 @@ QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) con
|
||||
return false;
|
||||
#endif // USE_UPNP
|
||||
case MapPortNatpmp:
|
||||
#ifdef USE_NATPMP
|
||||
return SettingToBool(setting(), DEFAULT_NATPMP);
|
||||
#else
|
||||
return false;
|
||||
#endif // USE_NATPMP
|
||||
case MinimizeOnClose:
|
||||
return fMinimizeOnClose;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user