diff --git a/application.qrc b/application.qrc index d323bff..7ab9af5 100644 --- a/application.qrc +++ b/application.qrc @@ -41,6 +41,15 @@ res/lock_green.svg res/lock_blue.svg res/unlocked.svg + res/getAddrWhite.png + res/send-white.png + res/requestWhite.png + res/addContactWhite.png + res/getAddrBlack.png + res/sendBlack.png + res/requestBlack.png + res/addContactBlack.png + res/hushdlogo.gif diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 01613d0..b48d1b4 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -1177,7 +1177,7 @@ version = "0.1.0" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=32ca60735b3529ff8589ab08fc16678f508a9359)", + "silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=e368816c6d12267f25fbebec0aaac4c15d62d2a3)", ] [[package]] @@ -1640,7 +1640,7 @@ dependencies = [ [[package]] name = "silentdragonlitelib" version = "0.1.0" -source = "git+https://github.com/DenioD/silentdragonlite-cli?rev=32ca60735b3529ff8589ab08fc16678f508a9359#32ca60735b3529ff8589ab08fc16678f508a9359" +source = "git+https://github.com/DenioD/silentdragonlite-cli?rev=e368816c6d12267f25fbebec0aaac4c15d62d2a3#e368816c6d12267f25fbebec0aaac4c15d62d2a3" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bellman 0.1.0 (git+https://github.com/MyHush/librustzcash.git?rev=1a0204113d487cdaaf183c2967010e5214ff9e37)", @@ -2631,7 +2631,7 @@ dependencies = [ "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" "checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" "checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" -"checksum silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=32ca60735b3529ff8589ab08fc16678f508a9359)" = "" +"checksum silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=e368816c6d12267f25fbebec0aaac4c15d62d2a3)" = "" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index fba5265..9784a1a 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["staticlib"] [dependencies] libc = "0.2.58" lazy_static = "1.4.0" -silentdragonlitelib = { git = "https://github.com/DenioD/silentdragonlite-cli", rev = "32ca60735b3529ff8589ab08fc16678f508a9359" } +silentdragonlitelib = { git = "https://github.com/DenioD/silentdragonlite-cli", rev = "e368816c6d12267f25fbebec0aaac4c15d62d2a3" } diff --git a/res/addContactBlack.png b/res/addContactBlack.png new file mode 100644 index 0000000..984c6e3 Binary files /dev/null and b/res/addContactBlack.png differ diff --git a/res/addContactWhite.png b/res/addContactWhite.png new file mode 100644 index 0000000..fea4efc Binary files /dev/null and b/res/addContactWhite.png differ diff --git a/res/getAddrBlack.png b/res/getAddrBlack.png new file mode 100644 index 0000000..2ede956 Binary files /dev/null and b/res/getAddrBlack.png differ diff --git a/res/getAddrWhite.png b/res/getAddrWhite.png new file mode 100644 index 0000000..6caeeae Binary files /dev/null and b/res/getAddrWhite.png differ diff --git a/res/lock_green.png b/res/lock_green.png new file mode 100644 index 0000000..cd7c2ab Binary files /dev/null and b/res/lock_green.png differ diff --git a/res/requestBlack.png b/res/requestBlack.png new file mode 100644 index 0000000..f46f9c2 Binary files /dev/null and b/res/requestBlack.png differ diff --git a/res/requestWhite.png b/res/requestWhite.png new file mode 100644 index 0000000..851a750 Binary files /dev/null and b/res/requestWhite.png differ diff --git a/res/send-white.png b/res/send-white.png new file mode 100644 index 0000000..96c7621 Binary files /dev/null and b/res/send-white.png differ diff --git a/res/sendBlack.png b/res/sendBlack.png new file mode 100644 index 0000000..62d9d1e Binary files /dev/null and b/res/sendBlack.png differ diff --git a/res/unlocked.png b/res/unlocked.png new file mode 100644 index 0000000..d6e6c90 Binary files /dev/null and b/res/unlocked.png differ diff --git a/src/DataStore/ChatDataStore.cpp b/src/DataStore/ChatDataStore.cpp index 22c10f5..1313103 100644 --- a/src/DataStore/ChatDataStore.cpp +++ b/src/DataStore/ChatDataStore.cpp @@ -2,6 +2,7 @@ // GPLv3 #include "ChatDataStore.h" +#include "addressbook.h" ChatDataStore* ChatDataStore::getInstance() { @@ -48,15 +49,18 @@ std::map ChatDataStore::getAllRawChatItems() return this->data; } -std::map ChatDataStore::getAllContactRequests() +std::map ChatDataStore::getAllNewContactRequests() { std::map filteredItems; + for(auto &c: this->data) { if ( (c.second.isOutgoing() == false) && - (c.second.getType() == "cont") && - (c.second.getMemo().startsWith("{")) + (c.second.getType() == "Cont") && + (c.second.getContact() == "") + + ) { filteredItems[c.first] = c.second; @@ -65,6 +69,23 @@ std::map ChatDataStore::getAllContactRequests() return filteredItems; } +std::map ChatDataStore::getAllOldContactRequests() +{ + std::map filteredItems; + for(auto &p : AddressBook::getInstance()->getAllAddressLabels()) + for(auto &c: this->data) + { + if ( + (c.second.isOutgoing() == false) && + (c.second.getType() == "Cont") && + (p.getPartnerAddress() == c.second.getRequestZaddr()) + ) + { + filteredItems[c.first] = c.second; + } + } + return filteredItems; +} std::map ChatDataStore::getAllMemos() { diff --git a/src/DataStore/ChatDataStore.h b/src/DataStore/ChatDataStore.h index 444c704..7fb0998 100644 --- a/src/DataStore/ChatDataStore.h +++ b/src/DataStore/ChatDataStore.h @@ -22,7 +22,8 @@ class ChatDataStore void setData(QString key, ChatItem value); ChatItem getData(QString key); std::map getAllRawChatItems(); - std::map getAllContactRequests(); + std::map getAllNewContactRequests(); + std::map getAllOldContactRequests(); std::map getAllMemos(); QString dump(); diff --git a/src/Model/ChatItem.cpp b/src/Model/ChatItem.cpp index dd43785..540c7ba 100644 --- a/src/Model/ChatItem.cpp +++ b/src/Model/ChatItem.cpp @@ -144,7 +144,7 @@ QString ChatItem::toChatLine() } - QString line = QString("") + myDateTime.toString("dd.MM.yyyy hh:mm"); + QString line = QString("") + myDateTime.toString("dd.MM.yyyy hh:mm"); line += QString(lock) + QString(""); line += QString("

") + _memo.toHtmlEscaped() + QString("

"); return line; diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp index 1e72714..ae123a9 100644 --- a/src/chatmodel.cpp +++ b/src/chatmodel.cpp @@ -10,7 +10,6 @@ #include "addressbook.h" #include "ui_memodialog.h" #include "ui_contactrequest.h" -#include "addressbook.h" #include #include #include "DataStore/DataStore.h" @@ -27,20 +26,6 @@ ChatModel::ChatModel(std::vector chatItems) this->setItems(chatItems); } -/*QString ChatModel::generateChatItemID(ChatItem item) -{ - QString key = QString::number(item.getTimestamp()) + QString("-"); - key += QString(QCryptographicHash::hash( - QString( - QString::number(item.getTimestamp()) + - item.getAddress() + - item.getContact() + - item.getMemo() - ).toUtf8() - ,QCryptographicHash::Md5).toHex()); - return key; -}*/ - std::map ChatModel::getItems() { return this->chatItems; @@ -82,10 +67,12 @@ void ChatModel::showMessages() { for(auto &c : this->chatItems) { - qDebug() << c.second.toChatLine(); + // qDebug() << c.second.toChatLine(); } } + + void MainWindow::renderContactRequest(){ @@ -96,8 +83,8 @@ void MainWindow::renderContactRequest(){ QStandardItemModel* contactRequest = new QStandardItemModel(); - { - for (auto &c : DataStore::getChatDataStore()->getAllContactRequests()) + for (auto &c : DataStore::getChatDataStore()->getAllNewContactRequests()) + { QStandardItem* Items = new QStandardItem(c.second.getAddress()); @@ -105,22 +92,34 @@ void MainWindow::renderContactRequest(){ requestContact.requestContact->setModel(contactRequest); requestContact.requestContact->show(); } - } + + QStandardItemModel* contactRequestOld = new QStandardItemModel(); + for (auto &p : AddressBook::getInstance()->getAllAddressLabels()) + for (auto &c : DataStore::getChatDataStore()->getAllOldContactRequests()) + { + if (p.getPartnerAddress() == c.second.getRequestZaddr()) + { + QStandardItem* Items = new QStandardItem(c.second.getAddress()); + contactRequestOld->appendRow(Items); + requestContact.requestContactOld->setModel(contactRequestOld); + requestContact.requestContactOld->show(); + }else{} + } + QObject::connect(requestContact.requestContact, &QTableView::clicked, [&] () { - for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems()){//this->chatItems){ + for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems()){ QModelIndex index = requestContact.requestContact->currentIndex(); QString label_contact = index.data(Qt::DisplayRole).toString(); QStandardItemModel* contactMemo = new QStandardItemModel(); - if (c.second.isOutgoing() == false) { - if (label_contact == c.second.getAddress()) { - if(c.second.getMemo().startsWith("{")){ + if ((c.second.isOutgoing() == false) && (label_contact == c.second.getAddress()) && (c.second.getType() != "Cont")) + + { - }else{ QStandardItem* Items = new QStandardItem(c.second.getMemo()); - contactMemo->appendRow(Items); + contactMemo->appendRow(Items); requestContact.requestMemo->setModel(contactMemo); requestContact.requestMemo->show(); @@ -128,11 +127,38 @@ void MainWindow::renderContactRequest(){ requestContact.requestZaddr->setText(c.second.getRequestZaddr()); requestContact.requestCID->setText(c.second.getCid()); requestContact.requestMyAddr->setText(c.second.getAddress()); - } + }else{} } - } - } + + + }); + + QObject::connect(requestContact.requestContactOld, &QTableView::clicked, [&] () { + + for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems()){ + QModelIndex index = requestContact.requestContactOld->currentIndex(); + QString label_contactold = index.data(Qt::DisplayRole).toString(); + QStandardItemModel* contactMemo = new QStandardItemModel(); + + if ((c.second.isOutgoing() == false) && (label_contactold == c.second.getAddress()) && (c.second.getType() != "Cont")) + + { + + QStandardItem* Items = new QStandardItem(c.second.getMemo()); + contactMemo->appendRow(Items); + requestContact.requestMemo->setModel(contactMemo); + requestContact.requestMemo->show(); + + + requestContact.requestZaddr->setText(c.second.getRequestZaddr()); + requestContact.requestCID->setText(c.second.getCid()); + requestContact.requestMyAddr->setText(c.second.getAddress()); + }else{} + } + + + }); QObject::connect(requestContact.pushButton, &QPushButton::clicked, [&] () { @@ -173,9 +199,13 @@ void MainWindow::renderContactRequest(){ QMessageBox::information(this, "Added Contact","successfully added your new contact. You can now Chat with this contact"); }); - dialog.exec(); + + rpc->refreshContacts( + ui->listContactWidget + + ); } void ChatModel::addCid(QString tx, QString cid) @@ -286,7 +316,8 @@ Tx MainWindow::createTxFromChatPage() { qDebug() << "pushback chattx"; - } } + } + } tx.fee = Settings::getMinerFee(); @@ -425,7 +456,8 @@ QString MainWindow::doSendChatTxValidations(Tx tx) { } void::MainWindow::addContact() { - + + Ui_Dialog request; QDialog dialog(this); request.setupUi(&dialog); @@ -434,24 +466,29 @@ void::MainWindow::addContact() { bool sapling = true; rpc->createNewZaddr(sapling, [=] (json reply) { QString myAddr = QString::fromStdString(reply.get()[0]); - QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces); + request.myzaddr->setText(myAddr); ui->listReceiveAddresses->insertItem(0, myAddr); ui->listReceiveAddresses->setCurrentIndex(0); - qDebug() << "new generated myAddr" << myAddr; - request.myzaddr->setText(myAddr); - request.cid->setText(cid); - }); - + QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces); + request.cid->setText(cid); + QObject::connect(request.sendRequestButton, &QPushButton::clicked, [&] () { + + QString cid = request.cid->text(); auto addr = request.zaddr->text().trimmed(); + QString getrequest = addr; QString newLabel = request.labelRequest->text().trimmed(); auto myAddr = request.myzaddr->text().trimmed(); + // ChatModel->addSendRequest(myAddr, cid, addr); + + + QString avatar = QString(":/icons/res/") + request.comboBoxAvatar->currentText() + QString(".png"); if (addr.isEmpty() || newLabel.isEmpty()) @@ -489,18 +526,28 @@ void::MainWindow::addContact() { ); return; + }); + + // QObject::connect(request.sendRequestButton, &QPushButton::clicked, this, &MainWindow::ContactRequest); dialog.exec(); + rpc->refreshContacts( + ui->listContactWidget + + ); } + + // Create a Tx for a contact Request Tx MainWindow::createTxForSafeContactRequest() { + +Tx tx; - Tx tx; - - // For each addr/amt in the Chat tab +{ + { CAmount totalAmt; QString amtStr = "0"; @@ -510,41 +557,45 @@ Tx MainWindow::createTxForSafeContactRequest() { amt = CAmount::fromDecimalString("0"); totalAmt = totalAmt + amt; - - for(auto &c : AddressBook::getInstance()->getAllAddressLabels()) - if (ui->contactNameMemo->text().trimmed() == c.getName()) { + + for(auto &c : AddressBook::getInstance()->getAllAddressLabels()) - + if (ui->contactNameMemo->text().trimmed() == c.getName()) { + QString cid = c.getCid(); QString myAddr = c.getMyAddress(); - QString type = "cont"; - QString addr = c.getPartnerAddress(); + QString type = "Cont"; + QString addr = c.getPartnerAddress(); + - QString hmemo= createHeaderMemo(type,cid,myAddr); - QString memo = ui->memoTxtChat->toPlainText().trimmed(); + QString hmemo= createHeaderMemo(type,cid,myAddr); + QString memo = ui->memoTxtChat->toPlainText().trimmed(); + - tx.toAddrs.push_back(ToFields{addr, amt, memo}); - tx.toAddrs.push_back(ToFields{addr, amt, hmemo}); - + // ui->memoSizeChat->setLenDisplayLabel();// Todo -> activate lendisplay for chat + + tx.toAddrs.push_back(ToFields{addr, amt, hmemo}); + tx.toAddrs.push_back(ToFields{addr, amt, memo}); - qDebug() << "pushback chattx"; - - } + + + qDebug() << "pushback chattx"; + tx.fee = Settings::getMinerFee(); + } +} return tx; qDebug() << "RequestTx created"; - - } - +} } void MainWindow::ContactRequest() { - if (ui->contactNameMemo->text().trimmed().isEmpty() || ui->memoTxtChat->toPlainText().trimmed().isEmpty()) { + /* if (request.labelRequest->text().trimmed().isEmpty() || request.memorequest->toPlainText().trimmed().isEmpty()) { // auto addr = ""; // if (! Settings::isZAddress(AddressBook::addressFromAddressLabel(addr->text()))) { @@ -554,7 +605,7 @@ void MainWindow::ContactRequest() { msg.exec(); return; - } + }*/ Tx tx = createTxForSafeContactRequest(); @@ -632,7 +683,7 @@ void MainWindow::ContactRequest() { QMessageBox::critical(this, QObject::tr("Transaction Error"), errStr, QMessageBox::Ok); } ); - + } @@ -664,4 +715,4 @@ QString MainWindow::doSendRequestTxValidations(Tx tx) { } return ""; -} \ No newline at end of file +} diff --git a/src/chatmodel.h b/src/chatmodel.h index bf3e255..a96f3bd 100644 --- a/src/chatmodel.h +++ b/src/chatmodel.h @@ -19,6 +19,9 @@ #include "Chat/Helper/ChatDelegator.h" #include "Chat/Helper/ChatIDGenerator.h" +namespace Ui { + class MainWindow; +} class ChatModel { private: @@ -28,6 +31,7 @@ class ChatModel MainWindow* main; std::map cidMap; std::map requestZaddrMap; + std::map> sendrequestMap; public: ChatModel() {}; @@ -44,6 +48,7 @@ class ChatModel void addMessage(QString timestamp, ChatItem item); void addCid(QString tx, QString cid); void addrequestZaddr(QString tx, QString requestZaddr); + void addSendRequest(int i, QString myAddr, QString cid, QString addr ); QString getCidByTx(QString tx); QString getrequestZaddrByTx(QString tx); void killCidCache(); diff --git a/src/contactrequest.ui b/src/contactrequest.ui index d2ae8ef..e099111 100644 --- a/src/contactrequest.ui +++ b/src/contactrequest.ui @@ -6,15 +6,15 @@ 0 0 - 780 - 416 + 777 + 427 Send a contact request - + <html><head/><body><p align="right">Choose a avatar for your contact :</p></body></html> @@ -28,7 +28,7 @@ - + @@ -192,7 +192,7 @@ - + diff --git a/src/controller.cpp b/src/controller.cpp index 534fffe..db895a1 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -102,6 +102,10 @@ void Controller::setConnection(Connection* c) DataStore::getSietchDataStore()->setData("Sietch" + QString(i), zdust.toUtf8()); }); } + refreshContacts( + ui->listContactWidget + + ); } // Build the RPC JSON Parameters for this tx @@ -797,6 +801,7 @@ void Controller::refreshBalances() CAmount balAvailable = balT + balVerified; model->setAvailableBalance(balAvailable); updateUIBalances(); + }); // 2. Get the UTXOs @@ -881,8 +886,8 @@ void Controller::refreshTransactions() { confirmations, true ); - qDebug()<<"Memo : " <setData(ChatIDGenerator::getInstance()->generateID(item), item); @@ -978,8 +983,8 @@ void Controller::refreshTransactions() { confirmations, false ); - qDebug()<< "Position : " << position; - qDebug()<<"Confirmation :" << confirmations; + // qDebug()<< "Position : " << position; + // qDebug()<<"Confirmation :" << confirmations; DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item); } @@ -1005,10 +1010,10 @@ void Controller::refreshTransactions() { // Update model data, which updates the table view transactionsTableModel->replaceData(txdata); chat->renderChatBox(ui, ui->listChat); - refreshContacts( - ui->listContactWidget + // refreshContacts( + // ui->listContactWidget - ); + // ); }); } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index de034ac..e895947 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1011,52 +1011,49 @@ void MainWindow::setupchatTab() { auto theme = Settings::getInstance()->get_theme_name(); if (theme == "dark" || theme == "midnight") { - QPixmap send(":/icons/res/send-new-white.png"); + QPixmap send(":/icons/res/send-white.png"); QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); - QPixmap notification(":/icons/res/notification.png"); + QPixmap notification(":/icons/res/requestWhite.png"); QIcon notificationIcon(notification); ui->pushContact->setIcon(notificationIcon); - QPixmap addContact(":/icons/res/add_contact.png"); + QPixmap addContact(":/icons/res/addContactWhite.png"); QIcon addContactIcon(addContact); ui->safeContactRequest->setIcon(addContactIcon); - QPixmap newAddr(":/icons/res/add_contact.png"); + QPixmap newAddr(":/icons/res/getAddrWhite.png"); QIcon addnewAddrIcon(newAddr); ui->givemeZaddr->setIcon(addnewAddrIcon); - QPixmap sendContact(":/icons/res/upload.png"); - QIcon addSendContactIcon(sendContact); - ui->sendContact->setIcon(addSendContactIcon); + ui->memoTxtChat->setTextColor("White"); + }else{ - QPixmap pixmap(":/icons/res/send-new.svg"); - QIcon sendIcon(pixmap); + + QPixmap send(":/icons/res/sendBlack.png"); + QIcon sendIcon(send); ui->sendChatButton->setIcon(sendIcon); - QPixmap notification(":/icons/res/notification.svg"); + QPixmap notification(":/icons/res/requestBlack.png"); QIcon notificationIcon(notification); ui->pushContact->setIcon(notificationIcon); - QPixmap addContact(":/icons/res/add_contact.svg"); + QPixmap addContact(":/icons/res/addContactBlack.png"); QIcon addContactIcon(addContact); - ui->safeContactRequest->setIcon(addContact); + ui->safeContactRequest->setIcon(addContactIcon); - QPixmap newAddr(":/icons/res/add_contact.svg"); + QPixmap newAddr(":/icons/res/getAddrBlack.png"); QIcon addnewAddrIcon(newAddr); ui->givemeZaddr->setIcon(addnewAddrIcon); - QPixmap sendContact(":/icons/res/upload.svg"); - QIcon addSendContactIcon(sendContact); - ui->sendContact->setIcon(addSendContactIcon); + ui->memoTxtChat->setTextColor("Black"); } QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChatButton); - QObject::connect(ui->sendContact, &QPushButton::clicked, this, &MainWindow::ContactRequest); QObject::connect(ui->safeContactRequest, &QPushButton::clicked, this, &MainWindow::addContact); QObject::connect(ui->pushContact, &QPushButton::clicked, this , &MainWindow::renderContactRequest); @@ -1116,11 +1113,6 @@ void ChatMemoEdit::setMaxLen(int len) { updateDisplay(); } -void ChatMemoEdit::setSendChatButton(QPushButton* button) { - this->sendChatButton = button; -} - - void MainWindow::updateChat() { rpc->refreshChat(ui->listChat); diff --git a/src/mainwindow.h b/src/mainwindow.h index ff4b76a..4419fcb 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -50,6 +50,7 @@ public: QString doSendTxValidations(Tx tx); QString doSendChatTxValidations(Tx tx); QString doSendRequestTxValidations(Tx tx); + QString getCid(); void replaceWormholeClient(WormholeClient* newClient); bool isWebsocketListening(); @@ -62,12 +63,7 @@ public: void updateLabels(); void updateTAddrCombo(bool checked); - // void renderContactRequest(); - // void setChatItem(ChatItem* item); - //void ChatItem* getChatItem(); - - // Disable recurring on mainnet void disableRecurring(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 3e82d7a..82b4260 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1409,9 +1409,21 @@ 81 + + false + font: 11pt "Noto Color Emoji"; + + QTextEdit::AutoNone + + + QTextEdit::FixedColumnWidth + + + 80 + @@ -1435,7 +1447,7 @@ - 1170 + 1160 560 91 81 @@ -1455,12 +1467,12 @@ - :/icons/res/send-new-white.png + :/icons/res/sendBlack.png - 41 + 50 49 @@ -1533,18 +1545,21 @@ 0 + + Add a new contact + - :/icons/res/add_contact.png + :/icons/res/addContactBlack.png - 43 - 49 + 50 + 45 @@ -1554,10 +1569,10 @@ - 10 - 30 - 41 - 41 + 50 + 20 + 61 + 51 @@ -1566,6 +1581,9 @@ 0 + + Incoming contact request + false @@ -1574,71 +1592,41 @@ - :/icons/res/notification.png:/icons/res/notification.png + :/icons/res/requestBlack.png:/icons/res/requestBlack.png - 33 - 35 + 50 + 45 true - + - 270 - 510 - 51 + 210 + 20 + 61 51 - - - 100 - 0 - + + Get a new Address - - - :/icons/res/add_contact.png - - - - - 43 - 49 - - - - true - - - - - - 60 - 30 - 111 - 41 - - - - New Addr - - :/icons/res/add_contact.png:/icons/res/add_contact.png + :/icons/res/getAddrBlack.png:/icons/res/getAddrBlack.png - 33 - 35 + 50 + 45 @@ -1648,8 +1636,8 @@ - 40 - 20 + 90 + 10 21 16 @@ -2042,7 +2030,7 @@ AddressCombo QComboBox -
addresscombo.h
+
addresscombo.h
 QRCodeLabel diff --git a/src/requestContactDialog.ui b/src/requestContactDialog.ui index b862cda..d2a3b68 100644 --- a/src/requestContactDialog.ui +++ b/src/requestContactDialog.ui @@ -6,350 +6,325 @@ 0 0 - 1011 - 503 + 1025 + 562 Incoming contact request - - - - 9 - 9 - 256 - 461 - - - - true - - - QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked - - - false - - - QAbstractItemView::SingleSelection - - - - - - 263 - 9 - 741 - 271 - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustToContents - - - QAbstractItemView::NoEditTriggers - - - QListView::Adjust - - - 0 - - - false - - - true - - - - - - 276 - 296 - 101 - 17 - - - - Request from : - - - - - - 393 - 296 - 601 - 25 - - - - - - - 276 - 327 - 30 - 17 - - - - Cid : - - - - - - 393 - 327 - 601 - 25 - - - - - - - 276 - 358 - 71 - 17 - - - - My Zaddr : - - - - - - 393 - 358 - 601 - 25 - - - - - - - 276 - 389 - 68 - 17 - - - - Nickname - - - - - - 393 - 389 - 221 - 25 - - - - - - - 276 - 420 - 228 - 17 - - - - <html><head/><body><p align="right">Choose a avatar for your contact :</p></body></html> - - - - - - 510 - 420 - 106 - 25 - - - - - Stag - - - - :/icons/res/Stag.png - - + + + + + <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Open requests</span></p></body></html> + + - - - Elsa - - - - :/icons/res/Elsa.png - - + + + + <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Memo of the request</span></p></body></html> + + - - - Denio - - - - :/icons/res/Denio.png - - + + + + true + + + QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + false + + + QAbstractItemView::SingleSelection + + - - - Duke - - - - :/icons/res/Duke.png - - + + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + QAbstractScrollArea::AdjustToContents + + + QAbstractItemView::NoEditTriggers + + + QListView::Adjust + + + 0 + + + false + + + true + + - - - Yoda - - - - :/icons/res/Yoda.png - - + + + + <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Recently closed requests</span></p></body></html> + + - - - Berg - - - - :/icons/res/Berg.png - - + + + + <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Details of the request</span></p></body></html> + + - - - Sharpee - - - - :/icons/res/Sharpee.png - - + + + + true + + + QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + false + + + QAbstractItemView::SingleSelection + + - - - Garfield - - - - :/icons/res/Garfield.png - - + + + + Request from : + + - - - Snoopy - - - - :/icons/res/Snoopy.png - - + + - - - Popey - - - - :/icons/res/Popey.png - - + + + + Cid : + + - - - Pinguin - - - - :/icons/res/Pinguin.png - - + + - - - Mickey - - - - :/icons/res/Mickey.png - - + + + + My Zaddr : + + - - - SDLogo - - - - :/icons/res/sdlogo2.png - - + + - - - - - 300 - 470 - 80 - 25 - - - - - 100 - 0 - - - - Cancel - - - false - - - - - - 400 - 470 - 101 - 25 - - - - Add Contact - - + + + + Nickname + + + + + + + + + + <html><head/><body><p align="right">Choose a avatar for your contact :</p></body></html> + + + + + + + + Stag + + + + :/icons/res/Stag.png + + + + + + Elsa + + + + :/icons/res/Elsa.png + + + + + + Denio + + + + :/icons/res/Denio.png + + + + + + Duke + + + + :/icons/res/Duke.png + + + + + + Yoda + + + + :/icons/res/Yoda.png + + + + + + Berg + + + + :/icons/res/Berg.png + + + + + + Sharpee + + + + :/icons/res/Sharpee.png + + + + + + Garfield + + + + :/icons/res/Garfield.png + + + + + + Snoopy + + + + :/icons/res/Snoopy.png + + + + + + Popey + + + + :/icons/res/Popey.png + + + + + + Pinguin + + + + :/icons/res/Pinguin.png + + + + + + Mickey + + + + :/icons/res/Mickey.png + + + + + + SDLogo + + + + :/icons/res/sdlogo2.png + + + + + + + + + + 100 + 0 + + + + Cancel + + + false + + + + + + + Add this new Contact + + + + - + + + cancel + clicked() + requestDialog + reject() + + + 339 + 482 + + + 505 + 251 + + + +