Browse Source

updated to reflect pull-request suggestions / renamed some GUI elements

pull/1/head
Philip Kaufmann 11 years ago
parent
commit
1e8c62b29c
  1. 6
      src/qt/addressbookpage.cpp
  2. 12
      src/qt/forms/qrcodedialog.ui
  3. 28
      src/qt/qrcodedialog.cpp
  4. 4
      src/qt/qrcodedialog.h

6
src/qt/addressbookpage.cpp

@ -312,11 +312,9 @@ void AddressBookPage::on_showQRCode_clicked() @@ -312,11 +312,9 @@ void AddressBookPage::on_showQRCode_clicked()
foreach (QModelIndex index, indexes)
{
QString address = index.data().toString(),
label = index.sibling(index.row(), 0).data().toString(),
title = QString("<< %1 >>").arg(address);
QString address = index.data().toString(), label = index.sibling(index.row(), 0).data(Qt::EditRole).toString();
QRCodeDialog *dialog = new QRCodeDialog(title, address, label, tab == ReceivingTab, this);
QRCodeDialog *dialog = new QRCodeDialog(address, label, tab == ReceivingTab, this);
dialog->show();
}
#endif

12
src/qt/forms/qrcodedialog.ui

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

28
src/qt/qrcodedialog.cpp

@ -10,23 +10,19 @@ @@ -10,23 +10,19 @@
#define EXPORT_IMAGE_SIZE 256
QRCodeDialog::QRCodeDialog(const QString &title, const QString &addr, const QString &label, bool enableReq, QWidget *parent) :
QDialog(parent),
ui(new Ui::QRCodeDialog),
address(addr)
QRCodeDialog::QRCodeDialog(const QString &addr, const QString &label, bool enableReq, QWidget *parent) :
QDialog(parent), ui(new Ui::QRCodeDialog), address(addr)
{
ui->setupUi(this);
setWindowTitle(title);
setWindowTitle(QString("%1").arg(address));
setAttribute(Qt::WA_DeleteOnClose);
ui->chkReq->setVisible(enableReq);
ui->chkReqPayment->setVisible(enableReq);
ui->lnReqAmount->setVisible(enableReq);
ui->lblAm1->setVisible(enableReq);
ui->lblAm2->setVisible(enableReq);
ui->lblAmount->setVisible(enableReq);
ui->lblBTC->setVisible(enableReq);
// don't display "(no label)" if there IS no label, as this is confusing in the QR dialog
if(label != tr("(no label)"))
ui->lnLabel->setText(label);
ui->lnLabel->setText(label);
genCode();
}
@ -60,7 +56,7 @@ QString QRCodeDialog::getURI() @@ -60,7 +56,7 @@ QString QRCodeDialog::getURI()
QString ret = QString("bitcoin:%1").arg(address);
int paramCount = 0;
if (ui->chkReq->isChecked() && !ui->lnReqAmount->text().isEmpty())
if (ui->chkReqPayment->isChecked() && !ui->lnReqAmount->text().isEmpty())
{
bool ok = false;
ui->lnReqAmount->text().toDouble(&ok);
@ -88,17 +84,17 @@ QString QRCodeDialog::getURI() @@ -88,17 +84,17 @@ QString QRCodeDialog::getURI()
return ret;
}
void QRCodeDialog::on_lnReqAmount_textChanged(const QString &)
void QRCodeDialog::on_lnReqAmount_textChanged(const QString &arg1)
{
genCode();
}
void QRCodeDialog::on_lnLabel_textChanged(const QString &)
void QRCodeDialog::on_lnLabel_textChanged(const QString &arg1)
{
genCode();
}
void QRCodeDialog::on_lnMessage_textChanged(const QString &)
void QRCodeDialog::on_lnMessage_textChanged(const QString &arg1)
{
genCode();
}
@ -110,7 +106,7 @@ void QRCodeDialog::on_btnSaveAs_clicked() @@ -110,7 +106,7 @@ void QRCodeDialog::on_btnSaveAs_clicked()
myImage.scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE).save(fn);
}
void QRCodeDialog::on_chkReq_toggled(bool)
void QRCodeDialog::on_chkReqPayment_toggled(bool)
{
genCode();
}

4
src/qt/qrcodedialog.h

@ -13,7 +13,7 @@ class QRCodeDialog : public QDialog @@ -13,7 +13,7 @@ class QRCodeDialog : public QDialog
Q_OBJECT
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();
private slots:
@ -22,7 +22,7 @@ private slots: @@ -22,7 +22,7 @@ private slots:
void on_lnMessage_textChanged(const QString &arg1);
void on_btnSaveAs_clicked();
void on_chkReq_toggled(bool checked);
void on_chkReqPayment_toggled(bool checked);
private:
Ui::QRCodeDialog *ui;

Loading…
Cancel
Save