diff options
-rw-r--r-- | doc/Tor.txt | 4 | ||||
-rw-r--r-- | src/leveldb.cpp | 1 | ||||
-rw-r--r-- | src/qt/aboutdialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/bitcoin.cpp | 9 | ||||
-rw-r--r-- | src/qt/bitcoingui.cpp | 2 | ||||
-rw-r--r-- | src/qt/overviewpage.cpp | 5 |
6 files changed, 11 insertions, 12 deletions
diff --git a/doc/Tor.txt b/doc/Tor.txt index f515f96f49..386e3b5466 100644 --- a/doc/Tor.txt +++ b/doc/Tor.txt @@ -3,7 +3,7 @@ TOR SUPPORT IN BITCOIN It is possible to run Bitcoin as a Tor hidden service, and connect to such services. -The following assumes you have a Tor proxy running on port 9050. Many distributions +The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others may not. In particular, the Tor Browser Bundle defaults to listening on a random port. See https://www.torproject.org/docs/faq.html.en#TBBSocksPort for how to properly @@ -77,7 +77,7 @@ In a typical situation, where you're only reachable via Tor, this should suffice ./bitcoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen -(obviously replace the Onion address with your own). If you don't care too much +(obviously, replace the Onion address with your own). If you don't care too much about hiding your node, and want to be reachable on IPv4 as well, additionally specify: diff --git a/src/leveldb.cpp b/src/leveldb.cpp index b41764f51f..e66f8514a7 100644 --- a/src/leveldb.cpp +++ b/src/leveldb.cpp @@ -30,6 +30,7 @@ static leveldb::Options GetOptions(size_t nCacheSize) { options.write_buffer_size = nCacheSize / 4; // up to two write buffers may be held in memory simultaneously options.filter_policy = leveldb::NewBloomFilterPolicy(10); options.compression = leveldb::kNoCompression; + options.max_open_files = 64; return options; } diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp index 57818b8a27..cea8e98425 100644 --- a/src/qt/aboutdialog.cpp +++ b/src/qt/aboutdialog.cpp @@ -11,7 +11,7 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->setupUi(this); // Set current copyright year - ui->copyrightLabel->setText(tr("Copyright") + QString(" © ") + tr("2009-%1 The Bitcoin developers").arg(COPYRIGHT_YEAR)); + ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers")); } void AboutDialog::setModel(ClientModel *model) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index a7b026e789..25448ea8cf 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -146,12 +146,12 @@ int main(int argc, char *argv[]) // Application identification (must be set before OptionsModel is initialized, // as it is used to locate QSettings) - app.setOrganizationName("Bitcoin"); - app.setOrganizationDomain("bitcoin.org"); + QApplication::setOrganizationName("Bitcoin"); + QApplication::setOrganizationDomain("bitcoin.org"); if(GetBoolArg("-testnet")) // Separate UI settings for testnet - app.setApplicationName("Bitcoin-Qt-testnet"); + QApplication::setApplicationName("Bitcoin-Qt-testnet"); else - app.setApplicationName("Bitcoin-Qt"); + QApplication::setApplicationName("Bitcoin-Qt"); // ... then GUI settings: OptionsModel optionsModel; @@ -207,7 +207,6 @@ int main(int argc, char *argv[]) } app.processEvents(); - app.setQuitOnLastWindowClosed(false); try diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index e2eefab3cc..71db587e04 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -42,8 +42,6 @@ #include <QStackedWidget> #include <QDateTime> #include <QMovie> -#include <QFileDialog> -#include <QDesktopServices> #include <QTimer> #include <QDragEnterEvent> #include <QUrl> diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 528c93bdc1..ad2d682b7b 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -46,9 +46,10 @@ public: bool confirmed = index.data(TransactionTableModel::ConfirmedRole).toBool(); QVariant value = index.data(Qt::ForegroundRole); QColor foreground = option.palette.color(QPalette::Text); - if(qVariantCanConvert<QColor>(value)) + if(value.canConvert<QBrush>()) { - foreground = qvariant_cast<QColor>(value); + QBrush brush = qvariant_cast<QBrush>(value); + foreground = brush.color(); } painter->setPen(foreground); |