Permalink
Browse files

Fix for QT pre 4.7 (setPlaceholderText)

  • Loading branch information...
Tranz5 committed Oct 21, 2014
1 parent ad8de3b commit 772868e7e0915488f1d03c7f21d4cdb73563370d
Showing with 14 additions and 18 deletions.
  1. +5 −0 src/qt/blockbrowser.cpp
  2. +9 −0 src/qt/charitydialog.cpp
  3. +0 −3 src/qt/forms/blockbrowser.ui
  4. +0 −15 src/qt/forms/charitydialog.ui
@@ -222,6 +222,11 @@ BlockBrowser::BlockBrowser(QWidget *parent) :
setBaseSize(850, 500);
#if QT_VERSION >= 0x040700
/* Do not move this to the XML file, Qt before 4.7 will choke on it */
ui->txBox->setPlaceholderText(tr("Transaction ID"));
#endif
connect(ui->blockButton, SIGNAL(pressed()), this, SLOT(blockClicked()));
connect(ui->txButton, SIGNAL(pressed()), this, SLOT(txClicked()));
connect(ui->closeButton, SIGNAL(pressed()), this, SLOT(close()));
@@ -16,6 +16,15 @@ StakeForCharityDialog::StakeForCharityDialog(QWidget *parent) :
{
ui->setupUi(this);
#if (QT_VERSION >= 0x040700)
/* Do not move this to the XML file, Qt before 4.7 will choke on it */
ui->charityPercentEdit->setPlaceholderText(tr("Enter % to Give (1-50)"));
ui->charityAddressEdit->setPlaceholderText(tr("Enter Charity Address"));
ui->charityMinEdit->setPlaceholderText(tr("Enter Min Amount (optional)"));
ui->charityMaxEdit->setPlaceholderText(tr("Enter Max Amount (optional)"));
ui->charityChangeAddressEdit->setPlaceholderText(tr("Enter Change Address (optional)"));
#endif
ui->label_2->setFocus();
}
@@ -420,9 +420,6 @@
<property name="inputMask">
<string comment="Transaction id" extracomment="Transaction id"/>
</property>
<property name="placeholderText">
<string comment="Transaction ID" extracomment="Transaction ID"/>
</property>
</widget>
</item>
<item row="11" column="0">
@@ -28,9 +28,6 @@
<property name="toolTip">
<string>Enter whole numbers 1 - 50</string>
</property>
<property name="placeholderText">
<string>Enter % to Give (1-50)</string>
</property>
</widget>
<widget class="QLineEdit" name="charityAddressEdit">
<property name="geometry">
@@ -44,9 +41,6 @@
<property name="toolTip">
<string/>
</property>
<property name="placeholderText">
<string>Enter Charity Address</string>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
@@ -83,9 +77,6 @@ Please enter percentage to give and HoboNickels address to give to. Min and Max
<property name="toolTip">
<string/>
</property>
<property name="placeholderText">
<string>Enter Min Amount (optional)</string>
</property>
</widget>
<widget class="QLineEdit" name="charityMaxEdit">
<property name="geometry">
@@ -102,9 +93,6 @@ Please enter percentage to give and HoboNickels address to give to. Min and Max
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>Enter Max Amount (optional)</string>
</property>
</widget>
<widget class="QLabel" name="message">
<property name="geometry">
@@ -192,9 +180,6 @@ Please enter percentage to give and HoboNickels address to give to. Min and Max
<property name="toolTip">
<string>Change address must be owned by you</string>
</property>
<property name="placeholderText">
<string>Enter Change Address (optional)</string>
</property>
</widget>
<widget class="QPushButton" name="changeAddressBookButton">
<property name="geometry">

0 comments on commit 772868e

Please sign in to comment.