From 0cc36a6fcd9559744f223b2e8a0252e0f9abedda Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Sun, 21 Jun 2020 00:00:52 +0200 Subject: [PATCH] add .desktop --- application.qrc | 2 + res/money-mouth.png | Bin 0 -> 3233 bytes res/money-outgoing.png | Bin 0 -> 3102 bytes src/mainwindow.cpp | 24 +++++- src/mainwindow.h | 3 + src/sendHushTransactionChat.ui | 144 ++++++++++++++++++++------------- 6 files changed, 117 insertions(+), 56 deletions(-) create mode 100644 res/money-mouth.png create mode 100644 res/money-outgoing.png diff --git a/application.qrc b/application.qrc index 716471d..0332b5f 100644 --- a/application.qrc +++ b/application.qrc @@ -48,6 +48,8 @@ res/unknownBlack.png res/unknownWhite.png res/dark-01.png + res/money-mouth.png + res/money-outgoing.png res/hushdlogo.gif diff --git a/res/money-mouth.png b/res/money-mouth.png new file mode 100644 index 0000000000000000000000000000000000000000..fc262f4d0a34755fee5ecb4801ca1124751bb7b7 GIT binary patch literal 3233 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 Tlp`lW00000NkvXXu0mjf;?6FR literal 0 HcmV?d00001 diff --git a/res/money-outgoing.png b/res/money-outgoing.png new file mode 100644 index 0000000000000000000000000000000000000000..c40b09bdf4a6ee3729966d853df323ff99bd3c7e GIT binary patch literal 3102 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 + transaction.requestHush->setVisible(false); + transaction.amountChat->setValidator(this->getAmountValidator()); @@ -1529,12 +1544,16 @@ void MainWindow::setupchatTab() { transaction.contactName->setUniformItemSizes(true); transaction.contactName->setDragDropMode(QAbstractItemView::DropOnly); transaction.contactName->show(); + } QObject::connect(transaction.sendHush, &QPushButton::clicked, [&] (){ + QString amt = transaction.amountChat->text(); - this->setAmt(amt); + QString memo = transaction.MemoMoney->text(); + this->setAmt(amt); + this->setMoneyMemo(memo); transactionDialog.close(); }); @@ -1599,9 +1618,10 @@ Tx MainWindow::createTxFromSendChatPage() { QString myAddr = c.getMyAddress(); QString type = "Money"; QString addr = c.getPartnerAddress(); + QString moneymemo = this->getMoneyMemo(); /////////User input for chatmemos - QString memoplain = QString("You have received/sent ") + amtStr + QString(" HUSH") ; + QString memoplain = QString("Money transaction of : ") + amtStr + QString(" HUSH") + QString("\n") + QString("\n") + moneymemo; /////////We convert the user input from QString to unsigned char*, so we can encrypt it later int lengthmemo = memoplain.length(); diff --git a/src/mainwindow.h b/src/mainwindow.h index 2cdf9ce..3867de6 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -53,11 +53,13 @@ public: QString doSendRequestTxValidations(Tx tx); QString getCid(); QString getAmt(); + QString getMoneyMemo(); QString getPassword(); std::map pubkeyMap; QString getPubkeyByAddress(QString requestZaddr); void setPassword(QString Password); void setAmt(QString Amt); + void setMoneyMemo(QString MoneyMemo); void addPubkey(QString requestZaddr, QString pubkey); @@ -115,6 +117,7 @@ private: void closeEventpw(QCloseEvent* event); QString _password; QString _amt; + QString _moneymemo; void setupSendTab(); diff --git a/src/sendHushTransactionChat.ui b/src/sendHushTransactionChat.ui index 1d403c6..64b1e1d 100644 --- a/src/sendHushTransactionChat.ui +++ b/src/sendHushTransactionChat.ui @@ -6,48 +6,22 @@ 0 0 - 530 - 377 + 216 + 384 - Dialog + Send or Request Hush - - - - 16777215 - 20 - - - - <html><head/><body><p align="center"><span style=" font-weight:600;">Send or Request some Hush</span></p></body></html> - - - - To : - - - - Qt::Vertical - - - - 20 - 65 - - - - - + QLayout::SetFixedSize @@ -88,23 +62,31 @@ - - - - Qt::Vertical + + + + QLayout::SetFixedSize - - - 20 - 79 - + + 6 + + + 6 + + + 6 + + + 6 - - - - + + + 80 + 16777215 + + Amount: @@ -112,12 +94,21 @@ + + + 80 + 16777215 + + 200 0 + + 9 + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -126,9 +117,61 @@ + + + + + 35 + 16777215 + + + + Hush + + + - + + + + Memo : + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 41 + + + + + 16777215 + 41 + + + + 100 + + + + Qt::Vertical @@ -136,12 +179,12 @@ 20 - 64 + 39 - + QLayout::SetFixedSize @@ -180,7 +223,7 @@ - + Qt::Horizontal @@ -190,13 +233,6 @@ - - - - Hush - - -