diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.cpp | 4 | ||||
| -rw-r--r-- | src/qt/forms/overviewpage.ui | 12 | ||||
| -rw-r--r-- | src/qt/forms/sendcoinsentry.ui | 6 | ||||
| -rw-r--r-- | src/qt/sendcoinsentry.cpp | 4 | ||||
| -rw-r--r-- | src/serialize.h | 2 | ||||
| -rw-r--r-- | src/util.cpp | 4 | ||||
| -rw-r--r-- | src/util.h | 8 | ||||
| -rw-r--r-- | src/version.h | 2 | ||||
| -rw-r--r-- | src/wallet.h | 1 |
9 files changed, 20 insertions, 23 deletions
diff --git a/src/net.cpp b/src/net.cpp index d218dcfb5d..92b4a3173f 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1585,12 +1585,16 @@ void StartNode(void* parg) { vector<CNetAddr> vaddr; if (LookupHost(pszHostName, vaddr)) + { BOOST_FOREACH (const CNetAddr &addr, vaddr) + { if (!addr.IsLocal()) { addrLocalHost.SetIP(addr); break; } + } + } } #else // Get local host ip diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index cc67fae533..3cf7dd0ed3 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -78,12 +78,14 @@ </item> <item row="1" column="0"> <widget class="QLabel" name="label_5"> + <property name="font"> + <font> + <pointsize>11</pointsize> + <bold>true</bold> + </font> + </property> <property name="text"> - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html></string> + <string>Wallet</string> </property> </widget> </item> diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 22a3f8fdc6..da0273e9b1 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -65,6 +65,9 @@ <property name="toolTip"> <string>Enter a label for this address to add it to your address book</string> </property> + <property name="placeholderText"> + <string>Enter a label for this address to add it to your address book</string> + </property> </widget> </item> </layout> @@ -95,6 +98,9 @@ <property name="maxLength"> <number>34</number> </property> + <property name="placeholderText"> + <string>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string> + </property> </widget> </item> <item> diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index c8242d8352..d9b1daf679 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -21,10 +21,6 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) : ui->payToLayout->setSpacing(4); #endif -#if QT_VERSION >= 0x040700 - ui->payTo->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)")); - ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book")); -#endif setFocusPolicy(Qt::TabFocus); setFocusProxy(ui->payTo); diff --git a/src/serialize.h b/src/serialize.h index 12ea1ec695..fe2aebe7f5 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1083,8 +1083,6 @@ public: int nType; int nVersion; - typedef FILE element_type; - CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn) { file = filenew; diff --git a/src/util.cpp b/src/util.cpp index cd3d3b94a9..3d301d21e3 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -43,7 +43,7 @@ namespace boost { #ifdef _WIN32_IE #undef _WIN32_IE #endif -#define _WIN32_IE 0x0400 +#define _WIN32_IE 0x0501 #define WIN32_LEAN_AND_MEAN 1 #ifndef NOMINMAX #define NOMINMAX @@ -252,7 +252,7 @@ inline int OutputDebugStringF(const char* pszFormat, ...) *pend = '\0'; char* p1 = pszBuffer; char* p2; - while (p2 = strchr(p1, '\n')) + while ((p2 = strchr(p1, '\n'))) { p2++; char c = *p2; diff --git a/src/util.h b/src/util.h index 6c3e6c5450..5f8d0375da 100644 --- a/src/util.h +++ b/src/util.h @@ -302,14 +302,6 @@ typedef boost::interprocess::interprocess_condition CConditionVariable; } -// This is exactly like std::string, but with a custom allocator. -// (secure_allocator<> is defined in serialize.h) -typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; - - - - - inline std::string i64tostr(int64 n) { return strprintf("%"PRI64d, n); diff --git a/src/version.h b/src/version.h index e8d5b5c421..9b92bd618e 100644 --- a/src/version.h +++ b/src/version.h @@ -13,7 +13,7 @@ static const int CLIENT_VERSION_MAJOR = 0; static const int CLIENT_VERSION_MINOR = 6; static const int CLIENT_VERSION_REVISION = 1; -static const int CLIENT_VERSION_BUILD = 1; +static const int CLIENT_VERSION_BUILD = 3; static const int CLIENT_VERSION = 1000000 * CLIENT_VERSION_MAJOR diff --git a/src/wallet.h b/src/wallet.h index 49d21d1c40..44c11e2ec4 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -227,7 +227,6 @@ public: void SetBestChain(const CBlockLocator& loc); int LoadWallet(bool& fFirstRunRet); -// bool BackupWallet(const std::string& strDest); bool SetAddressBookName(const CBitcoinAddress& address, const std::string& strName); |