Skip to content

Commit 72fe13a

Browse files
committed
gui: remove payment request file handling from OpenURI dialog
1 parent 3548e4a commit 72fe13a

File tree

5 files changed

+3
-37
lines changed

5 files changed

+3
-37
lines changed

src/qt/bitcoingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ void BitcoinGUI::createActions()
330330
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
331331

332332
openAction = new QAction(tr("Open &URI..."), this);
333-
openAction->setStatusTip(tr("Open a bitcoin: URI or payment request"));
333+
openAction->setStatusTip(tr("Open a bitcoin: URI"));
334334

335335
m_open_wallet_action = new QAction(tr("Open Wallet"), this);
336336
m_open_wallet_action->setEnabled(false);

src/qt/forms/openuridialog.ui

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,9 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Open URI</string>
14+
<string>Open bitcoin URI</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
17-
<item>
18-
<widget class="QLabel" name="label_2">
19-
<property name="text">
20-
<string>Open payment request from URI or file</string>
21-
</property>
22-
</widget>
23-
</item>
2417
<item>
2518
<layout class="QHBoxLayout" name="horizontalLayout">
2619
<item>
@@ -33,19 +26,6 @@
3326
<item>
3427
<widget class="QValidatedLineEdit" name="uriEdit"/>
3528
</item>
36-
<item>
37-
<widget class="QPushButton" name="selectFileButton">
38-
<property name="toolTip">
39-
<string>Select payment request file</string>
40-
</property>
41-
<property name="text">
42-
<string notr="true">…</string>
43-
</property>
44-
<property name="autoDefault">
45-
<bool>false</bool>
46-
</property>
47-
</widget>
48-
</item>
4929
</layout>
5030
</item>
5131
<item>

src/qt/openuridialog.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,3 @@ void OpenURIDialog::accept()
3939
ui->uriEdit->setValid(false);
4040
}
4141
}
42-
43-
void OpenURIDialog::on_selectFileButton_clicked()
44-
{
45-
QString filename = GUIUtil::getOpenFileName(this, tr("Select payment request file to open"), "", "", nullptr);
46-
if(filename.isEmpty())
47-
return;
48-
QUrl fileUri = QUrl::fromLocalFile(filename);
49-
ui->uriEdit->setText("bitcoin:?r=" + QUrl::toPercentEncoding(fileUri.toString()));
50-
}

src/qt/openuridialog.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ class OpenURIDialog : public QDialog
2424
protected Q_SLOTS:
2525
void accept();
2626

27-
private Q_SLOTS:
28-
void on_selectFileButton_clicked();
29-
3027
private:
3128
Ui::OpenURIDialog *ui;
3229
};

src/qt/paymentserver.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,7 @@ PaymentServer::~PaymentServer()
185185
}
186186

187187
//
188-
// OSX-specific way of handling bitcoin: URIs and PaymentRequest mime types.
189-
// Also used by paymentservertests.cpp and when opening a payment request file
190-
// via "Open URI..." menu entry.
188+
// OSX-specific way of handling bitcoin: URIs
191189
//
192190
bool PaymentServer::eventFilter(QObject *object, QEvent *event)
193191
{

0 commit comments

Comments
 (0)