diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-27 09:34:25 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-27 09:34:25 -0700 |
| commit | d28ed9c98e6b87a61b39a4c718dec01553be62c5 (patch) | |
| tree | 34d57b991ad32ed02136bf09eb805b0fdea045a1 | |
| parent | 010c4fc0b5ca8ceccf15417b833bea4ce1016f43 (diff) | |
| parent | a1ef0d19b1c1dd30b49bba6b0036eea3414e6ef7 (diff) | |
| download | bitcoin-d28ed9c98e6b87a61b39a4c718dec01553be62c5.tar.xz | |
Merge pull request #25 from Matoking/master
Send Coins page changes
| -rw-r--r-- | src/qt/bitcoingui.cpp | 5 | ||||
| -rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 24 | ||||
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 1 |
3 files changed, 23 insertions, 7 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 3e6b547006..be10b97c0f 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -522,11 +522,6 @@ void BitcoinGUI::gotoReceiveCoinsPage() void BitcoinGUI::gotoSendCoinsPage() { sendCoinsAction->setChecked(true); - if(centralWidget->currentWidget() != sendCoinsPage) - { - // Clear the current contents if we arrived from another tab - sendCoinsPage->clear(); - } centralWidget->setCurrentWidget(sendCoinsPage); exportAction->setEnabled(false); diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index fb2fc99bfe..f9dd02fef5 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -25,7 +25,7 @@ <x>0</x> <y>0</y> <width>666</width> - <height>162</height> + <height>165</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> @@ -59,7 +59,7 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout"> <property name="spacing"> - <number>12</number> + <number>6</number> </property> <item> <widget class="QPushButton" name="addButton"> @@ -76,6 +76,26 @@ </widget> </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> <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="spacing"> <number>3</number> diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 8954af4742..58eb5c21f7 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -22,6 +22,7 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) : addEntry(); connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addEntry())); + connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear())); } void SendCoinsDialog::setModel(WalletModel *model) |