neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #4610

Browse Source 
bdba2dd qt: Remove an obscure option no-one cares about (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2014-08-03 17:08:52 +02:00
commit b4c61f878c
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
5 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/forms/optionsdialog.ui
View File

@ -451,16 +451,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QCheckBox" name="displayAddresses">
<property name="toolTip">
<string>Whether to show Bitcoin addresses in the transaction list or not.</string>
</property>
<property name="text">
<string>&amp;Display addresses in transaction list</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3_Display"> <layout class="QHBoxLayout" name="horizontalLayout_3_Display">
<item> <item>

1
src/qt/optionsdialog.cpp
View File

@ -185,7 +185,6 @@ void OptionsDialog::setMapper()
/* Display */ /* Display */
mapper->addMapping(ui->lang, OptionsModel::Language); mapper->addMapping(ui->lang, OptionsModel::Language);
mapper->addMapping(ui->unit, OptionsModel::DisplayUnit); mapper->addMapping(ui->unit, OptionsModel::DisplayUnit);
mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses);
mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls); mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls);
} }

10
src/qt/optionsmodel.cpp
View File

@ -59,10 +59,6 @@ void OptionsModel::Init()
settings.setValue("nDisplayUnit", BitcoinUnits::BTC); settings.setValue("nDisplayUnit", BitcoinUnits::BTC);
nDisplayUnit = settings.value("nDisplayUnit").toInt(); nDisplayUnit = settings.value("nDisplayUnit").toInt();
if (!settings.contains("bDisplayAddresses"))
settings.setValue("bDisplayAddresses", false);
bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool();
if (!settings.contains("strThirdPartyTxUrls")) if (!settings.contains("strThirdPartyTxUrls"))
settings.setValue("strThirdPartyTxUrls", ""); settings.setValue("strThirdPartyTxUrls", "");
strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "").toString(); strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "").toString();
@ -200,8 +196,6 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
#endif #endif
case DisplayUnit: case DisplayUnit:
return nDisplayUnit; return nDisplayUnit;
case DisplayAddresses:
return bDisplayAddresses;
case ThirdPartyTxUrls: case ThirdPartyTxUrls:
return strThirdPartyTxUrls; return strThirdPartyTxUrls;
case Language: case Language:
@ -296,10 +290,6 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
case DisplayUnit: case DisplayUnit:
setDisplayUnit(value); setDisplayUnit(value);
break; break;
case DisplayAddresses:
bDisplayAddresses = value.toBool();
settings.setValue("bDisplayAddresses", bDisplayAddresses);
break;
case ThirdPartyTxUrls: case ThirdPartyTxUrls:
if (strThirdPartyTxUrls != value.toString()) { if (strThirdPartyTxUrls != value.toString()) {
strThirdPartyTxUrls = value.toString(); strThirdPartyTxUrls = value.toString();

3
src/qt/optionsmodel.h
View File

@ -34,7 +34,6 @@ public:
ProxyPort, // int ProxyPort, // int
Fee, // qint64 Fee, // qint64
DisplayUnit, // BitcoinUnits::Unit DisplayUnit, // BitcoinUnits::Unit
DisplayAddresses, // bool
ThirdPartyTxUrls, // QString ThirdPartyTxUrls, // QString
Language, // QString Language, // QString
CoinControlFeatures, // bool CoinControlFeatures, // bool
@ -58,7 +57,6 @@ public:
bool getMinimizeToTray() { return fMinimizeToTray; } bool getMinimizeToTray() { return fMinimizeToTray; }
bool getMinimizeOnClose() { return fMinimizeOnClose; } bool getMinimizeOnClose() { return fMinimizeOnClose; }
int getDisplayUnit() { return nDisplayUnit; } int getDisplayUnit() { return nDisplayUnit; }
bool getDisplayAddresses() { return bDisplayAddresses; }
QString getThirdPartyTxUrls() { return strThirdPartyTxUrls; } QString getThirdPartyTxUrls() { return strThirdPartyTxUrls; }
bool getProxySettings(QNetworkProxy& proxy) const; bool getProxySettings(QNetworkProxy& proxy) const;
bool getCoinControlFeatures() { return fCoinControlFeatures; } bool getCoinControlFeatures() { return fCoinControlFeatures; }
@ -74,7 +72,6 @@ private:
bool fMinimizeOnClose; bool fMinimizeOnClose;
QString language; QString language;
int nDisplayUnit; int nDisplayUnit;
bool bDisplayAddresses;
QString strThirdPartyTxUrls; QString strThirdPartyTxUrls;
bool fCoinControlFeatures; bool fCoinControlFeatures;
/* settings that were overriden by command-line */ /* settings that were overriden by command-line */

2
src/qt/transactiontablemodel.cpp
View File

@ -346,7 +346,7 @@ QString TransactionTableModel::lookupAddress(const std::string &address, bool to
{ {
description += label + QString(" "); description += label + QString(" ");
} }
if(label.isEmpty() || walletModel->getOptionsModel()->getDisplayAddresses() || tooltip) if(label.isEmpty() || tooltip)
{ {
description += QString("(") + QString::fromStdString(address) + QString(")"); description += QString("(") + QString::fromStdString(address) + QString(")");
} }