aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qt/bitcoingui.cpp2
-rw-r--r--src/qt/forms/openuridialog.ui22
-rw-r--r--src/qt/openuridialog.cpp9
-rw-r--r--src/qt/openuridialog.h3
-rw-r--r--src/qt/paymentserver.cpp4
5 files changed, 3 insertions, 37 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b280a0c14f..2aeba6d82c 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -330,7 +330,7 @@ void BitcoinGUI::createActions()
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
openAction = new QAction(tr("Open &URI..."), this);
- openAction->setStatusTip(tr("Open a bitcoin: URI or payment request"));
+ openAction->setStatusTip(tr("Open a bitcoin: URI"));
m_open_wallet_action = new QAction(tr("Open Wallet"), this);
m_open_wallet_action->setEnabled(false);
diff --git a/src/qt/forms/openuridialog.ui b/src/qt/forms/openuridialog.ui
index 0e1048bc07..2acec314fd 100644
--- a/src/qt/forms/openuridialog.ui
+++ b/src/qt/forms/openuridialog.ui
@@ -11,17 +11,10 @@
</rect>
</property>
<property name="windowTitle">
- <string>Open URI</string>
+ <string>Open bitcoin URI</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Open payment request from URI or file</string>
- </property>
- </widget>
- </item>
- <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
@@ -33,19 +26,6 @@
<item>
<widget class="QValidatedLineEdit" name="uriEdit"/>
</item>
- <item>
- <widget class="QPushButton" name="selectFileButton">
- <property name="toolTip">
- <string>Select payment request file</string>
- </property>
- <property name="text">
- <string notr="true">…</string>
- </property>
- <property name="autoDefault">
- <bool>false</bool>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp
index 48db95679f..199804f84d 100644
--- a/src/qt/openuridialog.cpp
+++ b/src/qt/openuridialog.cpp
@@ -39,12 +39,3 @@ void OpenURIDialog::accept()
ui->uriEdit->setValid(false);
}
}
-
-void OpenURIDialog::on_selectFileButton_clicked()
-{
- QString filename = GUIUtil::getOpenFileName(this, tr("Select payment request file to open"), "", "", nullptr);
- if(filename.isEmpty())
- return;
- QUrl fileUri = QUrl::fromLocalFile(filename);
- ui->uriEdit->setText("bitcoin:?r=" + QUrl::toPercentEncoding(fileUri.toString()));
-}
diff --git a/src/qt/openuridialog.h b/src/qt/openuridialog.h
index e94593d5bb..8438f22bd7 100644
--- a/src/qt/openuridialog.h
+++ b/src/qt/openuridialog.h
@@ -24,9 +24,6 @@ public:
protected Q_SLOTS:
void accept();
-private Q_SLOTS:
- void on_selectFileButton_clicked();
-
private:
Ui::OpenURIDialog *ui;
};
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 64fb3d6060..d8d3e2ac14 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -185,9 +185,7 @@ PaymentServer::~PaymentServer()
}
//
-// OSX-specific way of handling bitcoin: URIs and PaymentRequest mime types.
-// Also used by paymentservertests.cpp and when opening a payment request file
-// via "Open URI..." menu entry.
+// OSX-specific way of handling bitcoin: URIs
//
bool PaymentServer::eventFilter(QObject *object, QEvent *event)
{