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

show chatitems only one time #142

Browse Source
This commit is contained in:
DenioD
2020-06-21 08:49:45 +02:00
parent 969b79a40d
commit 515d47df9d
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Model/ChatItem.cpp
View File

@@ -160,6 +160,7 @@ QString ChatItem::toChatLine()
QString lock; QString lock;
QString money; QString money;
QString moneyText; QString moneyText;
QString moneyTextRequest;
myDateTime.setTime_t(_timestamp); myDateTime.setTime_t(_timestamp);
if (_notarize == true) if (_notarize == true)
@@ -177,7 +178,7 @@ QString ChatItem::toChatLine()
{ {
lock = "<b> <img src=':/icons/res/lock_green.png'><b>"; lock = "<b> <img src=':/icons/res/lock_green.png'><b>";
} }else{}
if (_memo.startsWith("Money transaction of :")) if (_memo.startsWith("Money transaction of :"))
{ {
@@ -192,28 +193,28 @@ QString ChatItem::toChatLine()
} }
}else{money = ""; }else{money = "";
moneyText = ""; } moneyText = ""; }
if (_memo.startsWith("Request of :")) if (_memo.startsWith("Request of :"))
{ {
if (_outgoing == true) if (_outgoing == true)
{ {
moneyText = QString("<p> Outgoing Hush Request </p>") + QString("<b> <img src=':/icons/res/money-outgoing.png'><b>"); moneyTextRequest = QString("<p> Outgoing Hush Request </p>") + QString("<b> <img src=':/icons/res/money-outgoing.png'><b>");
}else{ }else{
moneyText = QString("<p> Incoming Hush Request </p>") + QString("<b> <img src=':/icons/res/money-mouth.png'><b>"); moneyTextRequest = QString("<p> Incoming Hush Request </p>") + QString("<b> <img src=':/icons/res/money-mouth.png'><b>");
} }
}else{money = ""; }else{moneyTextRequest = "";
moneyText = ""; } moneyTextRequest = ""; }
QString line = QString("<small>") + myDateTime.toString("yyyy-MM-dd hh:mm"); QString line = QString("<small>") + myDateTime.toString("yyyy-MM-dd hh:mm");
line += QString(lock) + QString(moneyText) + QString("</small>"); line += QString(lock) + QString(moneyText) + QString(moneyTextRequest) + QString("</small>");
line +=QString("<p>") + _memo.toHtmlEscaped() + QString("</p>"); line +=QString("<p>") + _memo.toHtmlEscaped() + QString("</p>");
return line; return line;
} }

2
src/controller.cpp
View File

@@ -990,7 +990,7 @@ void Controller::refreshTransactions() {
chatModel->addconfirmations(txid, confirmations); chatModel->addconfirmations(txid, confirmations);
} }
if ((confirmations == 1) && (chatModel->getConfirmationByTx(txid) != QString("0xdeadbeef"))) { if ((confirmations > 0) && (chatModel->getConfirmationByTx(txid) != QString("0xdeadbeef"))) {
DataStore::getChatDataStore()->clear(); DataStore::getChatDataStore()->clear();
chatModel->killConfirmationCache(); chatModel->killConfirmationCache();
chatModel->killMemoCache(); chatModel->killMemoCache();

4
src/mainwindow.cpp
View File

@@ -1386,6 +1386,8 @@ void MainWindow::setupchatTab() {
ui->listChat->addAction(viewexplorer); ui->listChat->addAction(viewexplorer);
ui->listChat->addAction(copytxid); ui->listChat->addAction(copytxid);
});
QObject::connect(copymessage, &QAction::triggered, [=] { QObject::connect(copymessage, &QAction::triggered, [=] {
@@ -1478,7 +1480,7 @@ void MainWindow::setupchatTab() {
} }
}); });
});
///////// Add contextmenu ///////// Add contextmenu
QMenu* contextMenu; QMenu* contextMenu;