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

merge and ui update - for debug

Browse Source
This commit is contained in:
DenioD
2020-05-01 19:36:38 +02:00
parent 95638a25fd
commit 6ddb6855d4
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/addressbook.cpp
View File

@@ -168,9 +168,9 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
auto addr = ab.addr->text().trimmed(); auto addr = ab.addr->text().trimmed();
auto myAddr = ab.addr_chat->text().trimmed(); auto myAddr = ab.addr_chat->text().trimmed();
QString newLabel = ab.label->text(); QString newLabel = ab.label->text();
QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces); // QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
QString cid = ab.cid->text();
if (addr.isEmpty() || newLabel.isEmpty()) if (addr.isEmpty() || newLabel.isEmpty())
{ {

2
src/addressbook.ui
View File

@@ -55,7 +55,7 @@
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"/> <widget class="QLineEdit" name="cid"/>
</item> </item>
<item row="6" column="1"> <item row="6" column="1">
<widget class="QPushButton" name="addNew"> <widget class="QPushButton" name="addNew">

2
src/chatmodel.cpp
View File

@@ -117,6 +117,7 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListWidget *view)
// if (c.second.getMemo.find()) // if (c.second.getMemo.find())
line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] "); line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] ");
line += QString("<") + QString("Outgoing") + QString("> :\n"); line += QString("<") + QString("Outgoing") + QString("> :\n");
line += QString("<") + c.second.getCid() + QString("> :\n");
line += QString(c.second.getMemo()) + QString("\n"); line += QString(c.second.getMemo()) + QString("\n");
view->addItem(line); view->addItem(line);
line =""; line ="";
@@ -129,6 +130,7 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListWidget *view)
if ((ui->MyZaddr->text().trimmed() == c.second.getAddress()) && (c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false)){ if ((ui->MyZaddr->text().trimmed() == c.second.getAddress()) && (c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false)){
line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] "); line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] ");
line += QString("<") + QString("incoming") + QString("> :\n"); line += QString("<") + QString("incoming") + QString("> :\n");
line += QString("<") + c.second.getCid() + QString("> :\n");
line += QString(c.second.getMemo()) + QString("\n"); line += QString(c.second.getMemo()) + QString("\n");
view->addItem(line); view->addItem(line);
line =""; line ="";

2
src/controller.cpp
View File

@@ -947,7 +947,7 @@ void Controller::refreshTransactions() {
if(chatModel->getCidByTx(txid) != QString("0xdeadbeef")) if(chatModel->getCidByTx(txid) != QString("0xdeadbeef"))
cid = chatModel->getCidByTx(txid); cid = chatModel->getCidByTx(txid);
cid = ""; //cid = "";
} }
ChatItem item = ChatItem( ChatItem item = ChatItem(