twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1078 from Diapolo/QR-Code 

QR-Code code update

Fixes problems reported on forum: https://bitcointalk.org/index.php?topic=73695.msg839804#msg839804
miguelfreitas
Wladimir J. van der Laan 13 years ago
parent
460b66b14b 7261945eb5
commit
d844cb58a8
4 changed files with 62 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/qt/addressbookpage.cpp
  2. 15
      src/qt/forms/qrcodedialog.ui
  3. 82
      src/qt/qrcodedialog.cpp
  4. 4
      src/qt/qrcodedialog.h

10
src/qt/addressbookpage.cpp
Unescape View File

@ -310,16 +310,12 @@ void AddressBookPage::on_showQRCode_clicked()
QTableView *table = ui->tableView; QTableView *table = ui->tableView;
QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address); QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address);
QRCodeDialog *d;
foreach (QModelIndex index, indexes) foreach (QModelIndex index, indexes)
{ {
QString address = index.data().toString(), QString address = index.data().toString(), label = index.sibling(index.row(), 0).data(Qt::EditRole).toString();
label = index.sibling(index.row(), 0).data().toString(),
title = QString("%1 << %2 >>").arg(label).arg(address);
QRCodeDialog *d = new QRCodeDialog(title, address, label, tab == ReceivingTab, this); QRCodeDialog *dialog = new QRCodeDialog(address, label, tab == ReceivingTab, this);
d->show(); dialog->show();
} }
#endif #endif
} }

15
src/qt/forms/qrcodedialog.ui
Unescape View File

@ -34,6 +34,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -44,7 +47,7 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QCheckBox" name="chkReq"> <widget class="QCheckBox" name="chkReqPayment">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -56,7 +59,7 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="lblAm1"> <widget class="QLabel" name="lblAmount">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -91,7 +94,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="lblAm2"> <widget class="QLabel" name="lblBTC">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -113,7 +116,7 @@
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="lblLabel">
<property name="text"> <property name="text">
<string>Label:</string> <string>Label:</string>
</property> </property>
@ -136,7 +139,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="lblMessage">
<property name="text"> <property name="text">
<string>Message:</string> <string>Message:</string>
</property> </property>
@ -194,7 +197,7 @@
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>chkReq</sender> <sender>chkReqPayment</sender>
<signal>clicked(bool)</signal> <signal>clicked(bool)</signal>
<receiver>lnReqAmount</receiver> <receiver>lnReqAmount</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>

82
src/qt/qrcodedialog.cpp
Unescape View File

@ -8,21 +8,19 @@
#include <qrencode.h> #include <qrencode.h>
#define EXPORT_IMAGE_SIZE 256 #define EXPORT_IMAGE_SIZE 256
QRCodeDialog::QRCodeDialog(const QString &title, const QString &addr, const QString &label, bool enableReq, QWidget *parent) : QRCodeDialog::QRCodeDialog(const QString &addr, const QString &label, bool enableReq, QWidget *parent) :
QDialog(parent), QDialog(parent), ui(new Ui::QRCodeDialog), address(addr)
ui(new Ui::QRCodeDialog),
address(addr)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowTitle(title); setWindowTitle(QString("%1").arg(address));
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
ui->chkReq->setVisible(enableReq); ui->chkReqPayment->setVisible(enableReq);
ui->lnReqAmount->setVisible(enableReq); ui->lnReqAmount->setVisible(enableReq);
ui->lblAm1->setVisible(enableReq); ui->lblAmount->setVisible(enableReq);
ui->lblAm2->setVisible(enableReq); ui->lblBTC->setVisible(enableReq);
ui->lnLabel->setText(label); ui->lnLabel->setText(label);
@ -37,19 +35,28 @@ QRCodeDialog::~QRCodeDialog()
void QRCodeDialog::genCode() void QRCodeDialog::genCode()
{ {
QString uri = getURI(); QString uri = getURI();
//qDebug() << "Encoding:" << uri.toUtf8().constData();
QRcode *code = QRcode_encodeString(uri.toUtf8().constData(), 0, QR_ECLEVEL_L, QR_MODE_8, 1); if (uri != "")
myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32); {
myImage.fill(0xffffff); ui->lblQRCode->setText("");
unsigned char *p = code->data;
for(int y = 0; y < code->width; y++) { QRcode *code = QRcode_encodeString(uri.toUtf8().constData(), 0, QR_ECLEVEL_L, QR_MODE_8, 1);
for(int x = 0; x < code->width; x++) { myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32);
myImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff)); myImage.fill(0xffffff);
p++; unsigned char *p = code->data;
for (int y = 0; y < code->width; y++)
{
for (int x = 0; x < code->width; x++)
{
myImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff));
p++;
}
} }
QRcode_free(code);
ui->lblQRCode->setPixmap(QPixmap::fromImage(myImage).scaled(300, 300));
} }
QRcode_free(code); else
ui->lblQRCode->setPixmap(QPixmap::fromImage(myImage).scaled(300, 300)); ui->lblQRCode->setText(tr("Resulting URI too long, try to reduce the text for label / message."));
} }
QString QRCodeDialog::getURI() QString QRCodeDialog::getURI()
@ -57,41 +64,49 @@ QString QRCodeDialog::getURI()
QString ret = QString("bitcoin:%1").arg(address); QString ret = QString("bitcoin:%1").arg(address);
int paramCount = 0; int paramCount = 0;
if(ui->chkReq->isChecked() && ui->lnReqAmount->text().isEmpty() == false) { if (ui->chkReqPayment->isChecked() && !ui->lnReqAmount->text().isEmpty())
bool ok= false; {
double amount = ui->lnReqAmount->text().toDouble(&ok); bool ok = false;
if(ok) { ui->lnReqAmount->text().toDouble(&ok);
ret += QString("?amount=%1X8").arg(ui->lnReqAmount->text()); if (ok)
{
ret += QString("?amount=%1").arg(ui->lnReqAmount->text());
paramCount++; paramCount++;
} }
} }
if(ui->lnLabel->text().isEmpty() == false) { if (!ui->lnLabel->text().isEmpty())
{
QString lbl(QUrl::toPercentEncoding(ui->lnLabel->text())); QString lbl(QUrl::toPercentEncoding(ui->lnLabel->text()));
ret += QString("%1label=%2").arg(paramCount == 0 ? "?" : "&").arg(lbl); ret += QString("%1label=%2").arg(paramCount == 0 ? "?" : "&").arg(lbl);
paramCount++; paramCount++;
} }
if(ui->lnMessage->text().isEmpty() == false) { if (!ui->lnMessage->text().isEmpty())
{
QString msg(QUrl::toPercentEncoding(ui->lnMessage->text())); QString msg(QUrl::toPercentEncoding(ui->lnMessage->text()));
ret += QString("%1message=%2").arg(paramCount == 0 ? "?" : "&").arg(msg); ret += QString("%1message=%2").arg(paramCount == 0 ? "?" : "&").arg(msg);
paramCount++; paramCount++;
} }
return ret; // limit URI length to 255 chars, to prevent a DoS against the QR-Code dialog
if (ret.length() < 256)
return ret;
else
return QString("");
} }
void QRCodeDialog::on_lnReqAmount_textChanged(const QString &) void QRCodeDialog::on_lnReqAmount_textChanged(const QString &arg1)
{ {
genCode(); genCode();
} }
void QRCodeDialog::on_lnLabel_textChanged(const QString &) void QRCodeDialog::on_lnLabel_textChanged(const QString &arg1)
{ {
genCode(); genCode();
} }
void QRCodeDialog::on_lnMessage_textChanged(const QString &) void QRCodeDialog::on_lnMessage_textChanged(const QString &arg1)
{ {
genCode(); genCode();
} }
@ -99,12 +114,11 @@ void QRCodeDialog::on_lnMessage_textChanged(const QString &)
void QRCodeDialog::on_btnSaveAs_clicked() void QRCodeDialog::on_btnSaveAs_clicked()
{ {
QString fn = GUIUtil::getSaveFileName(this, tr("Save Image..."), QString(), tr("PNG Images (*.png)")); QString fn = GUIUtil::getSaveFileName(this, tr("Save Image..."), QString(), tr("PNG Images (*.png)"));
if(!fn.isEmpty()) { if (!fn.isEmpty())
myImage.scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE).save(fn); myImage.scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE).save(fn);
}
} }
void QRCodeDialog::on_chkReq_toggled(bool) void QRCodeDialog::on_chkReqPayment_toggled(bool)
{ {
genCode(); genCode();
} }

4
src/qt/qrcodedialog.h
Unescape View File

@ -13,7 +13,7 @@ class QRCodeDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit QRCodeDialog(const QString &title, const QString &address, const QString &label, bool allowReq, QWidget *parent = 0); explicit QRCodeDialog(const QString &addr, const QString &label, bool enableReq, QWidget *parent = 0);
~QRCodeDialog(); ~QRCodeDialog();
private slots: private slots:
@ -22,7 +22,7 @@ private slots:
void on_lnMessage_textChanged(const QString &arg1); void on_lnMessage_textChanged(const QString &arg1);
void on_btnSaveAs_clicked(); void on_btnSaveAs_clicked();
void on_chkReq_toggled(bool checked); void on_chkReqPayment_toggled(bool checked);
private: private:
Ui::QRCodeDialog *ui; Ui::QRCodeDialog *ui;

Write Preview
Loading…
Cancel
Save