Move back setPlaceholderText to code, from xml, as this broke building with Qt 4.6

This commit is contained in:
Wladimir J. van der Laan 2012-05-07 00:19:22 +02:00
parent 46692fc929
commit 7d5bb42946
4 changed files with 10 additions and 10 deletions

View File

@ -104,9 +104,6 @@
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="placeholderText">
<string>Click &quot;Sign Message&quot; to get signature</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>

View File

@ -65,9 +65,6 @@
<property name="toolTip"> <property name="toolTip">
<string>Enter a label for this address to add it to your address book</string> <string>Enter a label for this address to add it to your address book</string>
</property> </property>
<property name="placeholderText">
<string>Enter a label for this address to add it to your address book</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -98,9 +95,6 @@
<property name="maxLength"> <property name="maxLength">
<number>34</number> <number>34</number>
</property> </property>
<property name="placeholderText">
<string>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>

View File

@ -25,6 +25,11 @@ MessagePage::MessagePage(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
#if (QT_VERSION >= 0x040700)
/* Do not move this to the XML file, Qt before 4.7 will choke on it */
ui->signature->setPlaceholderText(tr("Click \"Sign Message\" to get signature"));
#endif
GUIUtil::setupAddressWidget(ui->signFrom, this); GUIUtil::setupAddressWidget(ui->signFrom, this);
} }

View File

@ -20,7 +20,11 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) :
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
ui->payToLayout->setSpacing(4); ui->payToLayout->setSpacing(4);
#endif #endif
#if QT_VERSION >= 0x040700
/* Do not move this to the XML file, Qt before 4.7 will choke on it */
ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book"));
ui->payTo->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
#endif
setFocusPolicy(Qt::TabFocus); setFocusPolicy(Qt::TabFocus);
setFocusProxy(ui->payTo); setFocusProxy(ui->payTo);