From 6ddb6855d49a1222a5f00cfafb80c6f80802787e Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Fri, 1 May 2020 19:36:38 +0200
Subject: [PATCH] merge and ui update - for debug

---
 src/addressbook.cpp | 4 ++--
 src/addressbook.ui  | 2 +-
 src/chatmodel.cpp   | 2 ++
 src/controller.cpp  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/addressbook.cpp b/src/addressbook.cpp
index 975c3e5..be13b82 100644
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@@ -168,9 +168,9 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
         auto addr = ab.addr->text().trimmed();
         auto myAddr = ab.addr_chat->text().trimmed();
         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()) 
         {
diff --git a/src/addressbook.ui b/src/addressbook.ui
index 1c6ed52..f2344eb 100644
--- a/src/addressbook.ui
+++ b/src/addressbook.ui
@@ -55,7 +55,7 @@
        </widget>
       </item>
       <item row="6" column="0">
-       <layout class="QHBoxLayout" name="horizontalLayout"/>
+       <widget class="QLineEdit" name="cid"/>
       </item>
       <item row="6" column="1">
        <widget class="QPushButton" name="addNew">
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index c4b7678..85b135a 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -117,6 +117,7 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListWidget *view)
         //  if (c.second.getMemo.find())
         line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") +  QString("] ");
         line += QString("<") + QString("Outgoing") + QString("> :\n");
+        line += QString("<") + c.second.getCid() + QString("> :\n");
         line += QString(c.second.getMemo()) + QString("\n");      
         view->addItem(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)){
         line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") +  QString("] ");
         line += QString("<") + QString("incoming") + QString("> :\n");
+        line += QString("<") + c.second.getCid() + QString("> :\n");
         line += QString(c.second.getMemo()) + QString("\n");      
         view->addItem(line);
         line ="";
diff --git a/src/controller.cpp b/src/controller.cpp
index 0845a16..0457ccd 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -947,7 +947,7 @@ void Controller::refreshTransactions() {
                     if(chatModel->getCidByTx(txid) != QString("0xdeadbeef"))
                         cid = chatModel->getCidByTx(txid);
 
-                    cid = "";
+                    //cid = "";
                 }
                     
                     ChatItem item = ChatItem(