sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 20:42:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3268

Browse Source 
79fac3f [Qt] use GUIUtil::setClipboard() where possible (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2013-11-17 10:18:58 +01:00
commit af6e093f06
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/guiutil.cpp
View File

@ -221,10 +221,8 @@ void copyEntryData(QAbstractItemView *view, int column, int role)
if(!selection.isEmpty()) if(!selection.isEmpty())
{ {
// Copy first item (global clipboard) // Copy first item
QApplication::clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Clipboard); setClipboard(selection.at(0).data(role).toString());
// Copy first item (global mouse selection for e.g. X11 - NOP on Windows)
QApplication::clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Selection);
} }
} }

11
src/qt/receiverequestdialog.cpp
View File

@ -11,11 +11,11 @@
#include "optionsmodel.h" #include "optionsmodel.h"
#include "walletmodel.h" #include "walletmodel.h"
#include <QPixmap>
#include <QClipboard> #include <QClipboard>
#include <QMouseEvent>
#include <QDrag> #include <QDrag>
#include <QMimeData> #include <QMimeData>
#include <QMouseEvent>
#include <QPixmap>
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
#include <QUrl> #include <QUrl>
#endif #endif
@ -177,13 +177,10 @@ void ReceiveRequestDialog::update()
void ReceiveRequestDialog::on_btnCopyURI_clicked() void ReceiveRequestDialog::on_btnCopyURI_clicked()
{ {
QString uri = GUIUtil::formatBitcoinURI(info); GUIUtil::setClipboard(GUIUtil::formatBitcoinURI(info));
QApplication::clipboard()->setText(uri, QClipboard::Clipboard);
QApplication::clipboard()->setText(uri, QClipboard::Selection);
} }
void ReceiveRequestDialog::on_btnCopyAddress_clicked() void ReceiveRequestDialog::on_btnCopyAddress_clicked()
{ {
QApplication::clipboard()->setText(info.address, QClipboard::Clipboard); GUIUtil::setClipboard(info.address);
QApplication::clipboard()->setText(info.address, QClipboard::Selection);
} }

6
src/qt/signverifymessagedialog.cpp
View File

@ -25,8 +25,7 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
#if (QT_VERSION >= 0x040700) #if QT_VERSION >= 0x040700
/* Do not move this to the XML file, Qt before 4.7 will choke on it */
ui->addressIn_SM->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)")); ui->addressIn_SM->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
ui->signatureOut_SM->setPlaceholderText(tr("Click \"Sign Message\" to generate signature")); ui->signatureOut_SM->setPlaceholderText(tr("Click \"Sign Message\" to generate signature"));
@ -73,7 +72,6 @@ void SignVerifyMessageDialog::setAddress_VM(const QString &address)
void SignVerifyMessageDialog::showTab_SM(bool fShow) void SignVerifyMessageDialog::showTab_SM(bool fShow)
{ {
ui->tabWidget->setCurrentIndex(0); ui->tabWidget->setCurrentIndex(0);
if (fShow) if (fShow)
this->show(); this->show();
} }
@ -164,7 +162,7 @@ void SignVerifyMessageDialog::on_signMessageButton_SM_clicked()
void SignVerifyMessageDialog::on_copySignatureButton_SM_clicked() void SignVerifyMessageDialog::on_copySignatureButton_SM_clicked()
{ {
QApplication::clipboard()->setText(ui->signatureOut_SM->text()); GUIUtil::setClipboard(ui->signatureOut_SM->text());
} }
void SignVerifyMessageDialog::on_clearButton_SM_clicked() void SignVerifyMessageDialog::on_clearButton_SM_clicked()