From 74fb765e29ed2b85ee7f6e61d16876c03b4abe9b Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 16 Oct 2013 15:14:26 +0200 Subject: qt: rework "receive coins" workflow --- src/qt/forms/receiverequestdialog.ui | 239 +++++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+) create mode 100644 src/qt/forms/receiverequestdialog.ui (limited to 'src/qt/forms/receiverequestdialog.ui') diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui new file mode 100644 index 0000000000..7430b34d0c --- /dev/null +++ b/src/qt/forms/receiverequestdialog.ui @@ -0,0 +1,239 @@ + + + ReceiveRequestDialog + + + + 0 + 0 + 487 + 597 + + + + Request coins + + + + + + + 0 + 0 + + + + + 300 + 300 + + + + Qt::PlainText + + + Qt::AlignCenter + + + true + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Save Image... + + + + + + + + + Bitcoin URI: + + + + + + + + 0 + 0 + + + + + 0 + 50 + + + + true + + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Payment information: + + + + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Label: + + + Qt::PlainText + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lnLabel + + + + + + + true + + + true + + + + + + + Message: + + + Qt::PlainText + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lnMessage + + + + + + + true + + + true + + + + + + + + 0 + 0 + + + + Amount: + + + Qt::PlainText + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lnReqAmount + + + + + + + true + + + + 80 + 0 + + + + true + + + + + + + Address: + + + Qt::PlainText + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + reqAddress + + + + + + + true + + + + + + + + + + + + + BitcoinAmountField + QWidget +
bitcoinamountfield.h
+ + + + + -- cgit v1.2.3 From 82095923bb71a670aa67ad15987bb6d4d7726abe Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 18 Oct 2013 13:08:30 +0200 Subject: qt: allow dragging, copying and saving QR code Add context menu and drag handling to QR code widget. --- src/qt/forms/receiverequestdialog.ui | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/qt/forms/receiverequestdialog.ui') diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui index 7430b34d0c..4f53dc19b8 100644 --- a/src/qt/forms/receiverequestdialog.ui +++ b/src/qt/forms/receiverequestdialog.ui @@ -15,7 +15,7 @@ - + 0 @@ -233,6 +233,11 @@ QWidget
bitcoinamountfield.h
+ + QRImageWidget + QLabel +
receiverequestdialog.h
+ -- cgit v1.2.3 From 33a2febf5de0c7bd73c0ea409584487bd9995643 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 18 Oct 2013 14:25:35 +0200 Subject: qt: show payment information in one text area Simplifies the dialog (makes it look less crowded) as well as the code and makes it possible to copy multiple fields at once. Also format bitcoin URI as URI, add copy button for URI. --- src/qt/forms/receiverequestdialog.ui | 205 +++++++---------------------------- 1 file changed, 37 insertions(+), 168 deletions(-) (limited to 'src/qt/forms/receiverequestdialog.ui') diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui index 4f53dc19b8..fc0d10b4e4 100644 --- a/src/qt/forms/receiverequestdialog.ui +++ b/src/qt/forms/receiverequestdialog.ui @@ -17,7 +17,7 @@ - + 0 0 @@ -39,6 +39,28 @@ + + + + + 0 + 0 + + + + + 0 + 50 + + + + true + + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + @@ -54,6 +76,20 @@ + + + + Copy &URI + + + + + + + &Copy Image + + + @@ -63,176 +99,9 @@ - - - - Bitcoin URI: - - - - - - - - 0 - 0 - - - - - 0 - 50 - - - - true - - - Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Payment information: - - - - - - - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Label: - - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - lnLabel - - - - - - - true - - - true - - - - - - - Message: - - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - lnMessage - - - - - - - true - - - true - - - - - - - - 0 - 0 - - - - Amount: - - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - lnReqAmount - - - - - - - true - - - - 80 - 0 - - - - true - - - - - - - Address: - - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - reqAddress - - - - - - - true - - - - - - - - - - BitcoinAmountField - QWidget -
bitcoinamountfield.h
- QRImageWidget QLabel -- cgit v1.2.3 From 70b14636cd60529c87b2cc61516f5d1bf49299a5 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 18 Oct 2013 19:42:40 +0200 Subject: qt: general polish after adding new receive flow - We no longer have an address book, but "address lists", update message accordingly - Add tooltips here and there - Clarify text on buttons - add Copy Address button to receive request dialog --- src/qt/forms/receiverequestdialog.ui | 82 ++++++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 13 deletions(-) (limited to 'src/qt/forms/receiverequestdialog.ui') diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui index fc0d10b4e4..d7724ef915 100644 --- a/src/qt/forms/receiverequestdialog.ui +++ b/src/qt/forms/receiverequestdialog.ui @@ -28,6 +28,9 @@ 300 + + QR Code + Qt::PlainText @@ -53,6 +56,12 @@ 50 + + QFrame::NoFrame + + + QFrame::Plain + true @@ -64,22 +73,16 @@ - - - Qt::Horizontal - - - - 40 - 20 - + + + Copy &URI - + - + - Copy &URI + Copy &Address @@ -97,6 +100,26 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + QDialogButtonBox::Close + + + @@ -109,5 +132,38 @@ - + + + buttonBox + rejected() + ReceiveRequestDialog + reject() + + + 452 + 573 + + + 243 + 298 + + + + + buttonBox + accepted() + ReceiveRequestDialog + accept() + + + 452 + 573 + + + 243 + 298 + + + + -- cgit v1.2.3