diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-05-05 00:01:35 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-05-05 00:01:35 -0700 |
| commit | 393a0edc5116abe2d816def0508253e9b3480ce0 (patch) | |
| tree | be884069cef08a43eaa7c958d1ee60e74e4cfe9a /src/qt | |
| parent | Merge pull request #1032 from Diapolo/fix#945 (diff) | |
| parent | move label placeholdertext from sendcoinsentry.cpp to ui-file (diff) | |
| download | discoin-393a0edc5116abe2d816def0508253e9b3480ce0.tar.xz discoin-393a0edc5116abe2d816def0508253e9b3480ce0.zip | |
Merge pull request #1194 from Diapolo/sendcoins_placeholdertext
move label placeholdertext from sendcoinsentry.cpp to ui-file
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/forms/sendcoinsentry.ui | 6 | ||||
| -rw-r--r-- | src/qt/sendcoinsentry.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 22a3f8fdc..da0273e9b 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 c8242d835..d9b1daf67 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); |