Browse Source

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

pull/1/head
Wladimir J. van der Laan 11 years ago
parent
commit
7d5bb42946
  1. 3
      src/qt/forms/messagepage.ui
  2. 6
      src/qt/forms/sendcoinsentry.ui
  3. 5
      src/qt/messagepage.cpp
  4. 6
      src/qt/sendcoinsentry.cpp

3
src/qt/forms/messagepage.ui

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

6
src/qt/forms/sendcoinsentry.ui

@ -65,9 +65,6 @@ @@ -65,9 +65,6 @@
<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>
@ -98,9 +95,6 @@ @@ -98,9 +95,6 @@
<property name="maxLength">
<number>34</number>
</property>
<property name="placeholderText">
<string>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
</property>
</widget>
</item>
<item>

5
src/qt/messagepage.cpp

@ -24,6 +24,11 @@ MessagePage::MessagePage(QWidget *parent) : @@ -24,6 +24,11 @@ MessagePage::MessagePage(QWidget *parent) :
ui(new Ui::MessagePage)
{
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);
}

6
src/qt/sendcoinsentry.cpp

@ -20,7 +20,11 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) : @@ -20,7 +20,11 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) :
#ifdef Q_WS_MAC
ui->payToLayout->setSpacing(4);
#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);
setFocusProxy(ui->payTo);

Loading…
Cancel
Save