phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 11:13:23 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

gui: remove payment request file handling from OpenURI dialog

Browse source
This commit is contained in:
fanquake 2019-10-18 08:35:17 -04:00
parent 3548e4aac7
commit 72fe13a58d
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
5 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/qt/bitcoingui.cpp
View file

@ -330,7 +330,7 @@ void BitcoinGUI::createActions()
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels")); usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
openAction = new QAction(tr("Open &URI..."), this); 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 = new QAction(tr("Open Wallet"), this);
m_open_wallet_action->setEnabled(false); m_open_wallet_action->setEnabled(false);

22
src/qt/forms/openuridialog.ui
View file

@ -11,16 +11,9 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Open URI</string> <string>Open bitcoin URI</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <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> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
@ -33,19 +26,6 @@
<item> <item>
<widget class="QValidatedLineEdit" name="uriEdit"/> <widget class="QValidatedLineEdit" name="uriEdit"/>
</item> </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> </layout>
</item> </item>
<item> <item>

9
src/qt/openuridialog.cpp
View file

@ -39,12 +39,3 @@ void OpenURIDialog::accept()
ui->uriEdit->setValid(false); 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()));
}

3
src/qt/openuridialog.h
View file

@ -24,9 +24,6 @@ public:
protected Q_SLOTS: protected Q_SLOTS:
void accept(); void accept();
private Q_SLOTS:
void on_selectFileButton_clicked();
private: private:
Ui::OpenURIDialog *ui; Ui::OpenURIDialog *ui;
}; };

4
src/qt/paymentserver.cpp
View file

@ -185,9 +185,7 @@ PaymentServer::~PaymentServer()
} }
// //
// OSX-specific way of handling bitcoin: URIs and PaymentRequest mime types. // OSX-specific way of handling bitcoin: URIs
// Also used by paymentservertests.cpp and when opening a payment request file
// via "Open URI..." menu entry.
// //
bool PaymentServer::eventFilter(QObject *object, QEvent *event) bool PaymentServer::eventFilter(QObject *object, QEvent *event)
{ {