Browse Source

Merge pull request #25 from Matoking/master

Send Coins page changes
miguelfreitas
Wladimir J. van der Laan 13 years ago
parent
commit
d28ed9c98e
  1. 5
      src/qt/bitcoingui.cpp
  2. 24
      src/qt/forms/sendcoinsdialog.ui
  3. 1
      src/qt/sendcoinsdialog.cpp

5
src/qt/bitcoingui.cpp

@ -522,11 +522,6 @@ void BitcoinGUI::gotoReceiveCoinsPage()
void BitcoinGUI::gotoSendCoinsPage() void BitcoinGUI::gotoSendCoinsPage()
{ {
sendCoinsAction->setChecked(true); sendCoinsAction->setChecked(true);
if(centralWidget->currentWidget() != sendCoinsPage)
{
// Clear the current contents if we arrived from another tab
sendCoinsPage->clear();
}
centralWidget->setCurrentWidget(sendCoinsPage); centralWidget->setCurrentWidget(sendCoinsPage);
exportAction->setEnabled(false); exportAction->setEnabled(false);

24
src/qt/forms/sendcoinsdialog.ui

@ -25,7 +25,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>666</width> <width>666</width>
<height>162</height> <height>165</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -59,7 +59,7 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing"> <property name="spacing">
<number>12</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="addButton"> <widget class="QPushButton" name="addButton">
@ -75,6 +75,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="clearButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Clear all</string>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property>
<property name="autoRepeatDelay">
<number>300</number>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing"> <property name="spacing">

1
src/qt/sendcoinsdialog.cpp

@ -22,6 +22,7 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
addEntry(); addEntry();
connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addEntry())); connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addEntry()));
connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear()));
} }
void SendCoinsDialog::setModel(WalletModel *model) void SendCoinsDialog::setModel(WalletModel *model)

Loading…
Cancel
Save