zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3268 

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
parent 3443adecf1 79fac3f427
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())
{
// Copy first item (global clipboard)
QApplication::clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Clipboard);
// Copy first item (global mouse selection for e.g. X11 - NOP on Windows)
QApplication::clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Selection);
// Copy first item
setClipboard(selection.at(0).data(role).toString());
}
}

11
src/qt/receiverequestdialog.cpp
View File

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

6
src/qt/signverifymessagedialog.cpp
View File

@ -25,8 +25,7 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) :
{
ui->setupUi(this);
#if (QT_VERSION >= 0x040700)
/* Do not move this to the XML file, Qt before 4.7 will choke on it */
#if QT_VERSION >= 0x040700
ui->addressIn_SM->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
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)
{
ui->tabWidget->setCurrentIndex(0);
if (fShow)
this->show();
}
@ -164,7 +162,7 @@ void SignVerifyMessageDialog::on_signMessageButton_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()