DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

improve some UI elements

Browse Source
This commit is contained in:
DenioD
2020-05-03 11:35:05 +02:00
parent 58bee815a5
commit 7b40755d42
4 changed files with 105 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/controller.cpp
View File

@@ -881,24 +881,34 @@ void Controller::refreshTransactions() {
memo = QString::fromStdString(o["memo"]);
QString cid;
QString contact;
for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
if ((ui->ContactZaddr->text().trimmed() == c.getPartnerAddress()) || (ui->MyZaddr->text().trimmed() == c.getMyAddress())) {
{
if (ui->contactNameMemo->text().trimmed() == c.getName()) {
cid = c.getCid();
}else {cid = "";}
}else {cid = "";}
if (address == c.getPartnerAddress()){
contact = c.getName();
}else{ contact = "";}
ChatItem item = ChatItem(
datetime,
address,
QString(""),
contact,
memo,
cid, // we have to set the cid here, its included in our Addressbook for this contact
txid,
true // is an outgoing message
);
chatModel->addMessage(item);
}
}
}
items.push_back(TransactionItemDetail{address, amount, memo});
total_amount = total_amount + amount;
@@ -912,7 +922,6 @@ void Controller::refreshTransactions() {
}else{
addresses.push_back(item.address); }
}
@@ -957,19 +966,34 @@ void Controller::refreshTransactions() {
else
cid = "";
}
QString contact;
for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
// for (auto &p : this->chatItems)
{
if (address == c.getMyAddress()){
contact = c.getName();
qDebug()<< "Addressbuch Addresse: " << c.getMyAddress();
qDebug()<< "Addresse: " << address;
}else{ contact = "ELSE";}
ChatItem item = ChatItem(
datetime,
address,
QString(""),
contact,
memo,
cid, // we have to set the cid here, its included in the headermemo
txid,
false
);
// qDebug()<< "Message CID: " << cid;
chatModel->addMessage(item);
// qDebug()<< "KontaktName: " << contact;
// qDebug()<< "Addressbuch Addresse: " << c.getMyAddress();
chatModel->addMessage(item);
}
}
}