Mercurial > hg > bitcoin
changeset 2368:9d99ead61f3e draft
Merge pull request #1194 from Diapolo/sendcoins_placeholdertext
move label placeholdertext from sendcoinsentry.cpp to ui-file
| author | Wladimir J. van der Laan <laanwj@gmail.com> |
|---|---|
| date | Sat, 05 May 2012 00:01:35 -0700 |
| parents | 95797e10102b (current diff) e8f7557d51da (diff) |
| children | 5c21e1e01c5d |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -21,10 +21,6 @@ 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);