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

Author: apoelstra

src/qt/forms/receivecoinsdialog.ui

@@ -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>

src/qt/receivecoinsdialog.cpp

@@ -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())

src/qt/receivecoinsdialog.h

@@ -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;