GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ca30d34cf9 into merged_master (Bitcoin PR bitcoin-core/gui#39)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-28 16:21:22 +00:00
commit 2bb42412e2
3 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/qt/forms/receivecoinsdialog.ui
View file

@ -114,6 +114,12 @@
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>

16
src/qt/receivecoinsdialog.cpp
View file

@ -251,22 +251,6 @@ void ReceiveCoinsDialog::resizeEvent(QResizeEvent *event)
QWidget::resizeEvent(event);
}
void ReceiveCoinsDialog::keyPressEvent(QKeyEvent *event)
{
if (event->key() == Qt::Key_Return)
{
// press return -> submit form
if (ui->reqLabel->hasFocus() || ui->reqAmount->hasFocus() || ui->reqMessage->hasFocus())
{
event->ignore();
on_receiveButton_clicked();
return;
}
}
this->QDialog::keyPressEvent(event);
}
QModelIndex ReceiveCoinsDialog::selectedRow()
{
if(!model || !model->getRecentRequestsTableModel() || !ui->recentRequestsView->selectionModel())

3
src/qt/receivecoinsdialog.h
View file

@ -49,9 +49,6 @@ public Q_SLOTS:
void reject() override;
void accept() override;
protected:
virtual void keyPressEvent(QKeyEvent *event) override;
private:
Ui::ReceiveCoinsDialog *ui;
GUIUtil::TableViewLastColumnResizingFixer *columnResizingFixer;