diff options
author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-11-20 15:56:51 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-29 14:15:55 +0100 |
commit | c78bd937017212c89c1c7aab07399cec5b6b3bdd (patch) | |
tree | 92129bb63c2b9bbb724c3a2b4ad643710484e3ea /src/qt/guiutil.cpp | |
parent | aab8fc58c6e6dc6e0a104170bd2aa10dc1af5dea (diff) |
[Qt] extend validate line edit and btc address validator
- remove btc address length from address validator
- add an optional btc address check in validated line edit that defaults
to off and is used in GUIUtil::setupAddressWidget()
- an isAcceptable() check is added to validated line edit on focus out
which only kicks in, when a validator is used with that widget
- remove an isAcceptable() check from sendcoinsentry.cpp
- remove obsolete attributes from ui files, which are set by calling
GUIUtil::setupAddressWidget()
- move some more things to GUIUtil::setupAddressWidget() and remove them
from normal code e.g. placeholder text
Diffstat (limited to 'src/qt/guiutil.cpp')
-rw-r--r-- | src/qt/guiutil.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 5c3ba05b06..7e1831f037 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -6,6 +6,7 @@ #include "bitcoinaddressvalidator.h" #include "bitcoinunits.h" +#include "qvalidatedlineedit.h" #include "walletmodel.h" #include "core.h" @@ -72,11 +73,16 @@ QFont bitcoinAddressFont() return font; } -void setupAddressWidget(QLineEdit *widget, QWidget *parent) +void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent) { - widget->setMaxLength(BitcoinAddressValidator::MaxAddressLength); - widget->setValidator(new BitcoinAddressValidator(parent)); + parent->setFocusProxy(widget); + widget->setFont(bitcoinAddressFont()); +#if QT_VERSION >= 0x040700 + widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)")); +#endif + widget->setValidator(new BitcoinAddressEntryValidator(parent)); + widget->setCheckValidator(new BitcoinAddressCheckValidator(parent)); } void setupAmountWidget(QLineEdit *widget, QWidget *parent) |