LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

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

Browse source
This commit is contained in:
Philip Kaufmann 2012-04-11 23:05:22 +02:00
parent 9e0dba8c17
commit 1e8c62b29c
4 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/qt/addressbookpage.cpp
View file

@ -312,11 +312,9 @@ void AddressBookPage::on_showQRCode_clicked()
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 >>").arg(address);
QRCodeDialog *dialog = new QRCodeDialog(title, address, label, tab == ReceivingTab, this); QRCodeDialog *dialog = new QRCodeDialog(address, label, tab == ReceivingTab, this);
dialog->show(); dialog->show();
} }
#endif #endif

12
src/qt/forms/qrcodedialog.ui
View file

@ -44,7 +44,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 +56,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 +91,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 +113,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 +136,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 +194,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>

26
src/qt/qrcodedialog.cpp
View file

@ -10,22 +10,18 @@
#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);
// 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(); genCode();
@ -60,7 +56,7 @@ 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()) if (ui->chkReqPayment->isChecked() && !ui->lnReqAmount->text().isEmpty())
{ {
bool ok = false; bool ok = false;
ui->lnReqAmount->text().toDouble(&ok); ui->lnReqAmount->text().toDouble(&ok);
@ -88,17 +84,17 @@ QString QRCodeDialog::getURI()
return ret; return ret;
} }
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();
} }
@ -110,7 +106,7 @@ void QRCodeDialog::on_btnSaveAs_clicked()
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
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;