Merge pull request #20 from DenioD/chat

Chat

src/controller.cpp

@@ -889,7 +889,7 @@ void Controller::refreshTransactions() {
                                 txid,
                                 true 
                             );
-                        //DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item);
+
                         DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
                     
                         }                              
@@ -920,6 +920,7 @@ void Controller::refreshTransactions() {
                 model->markAddressUsed(address);
 
                 QString memo;
+                QString test;
                 if (!it["memo"].is_null()) {
                     memo = QString::fromStdString(it["memo"]);
                 }
@@ -939,16 +940,16 @@ void Controller::refreshTransactions() {
                 
                     QString type;
                     QString cid;
-                 //   int position;
-                    QString requestZaddr1;
+                   // int position;
                     QString requestZaddr;
 
                 if (memo.startsWith("{")) {
 
-                    type = memo.mid(75,4);
-                    cid =  memo.mid(14,36);
-                    requestZaddr1 = memo.right(82);
-                    requestZaddr = requestZaddr1.left(78);
+                QJsonDocument headermemo = QJsonDocument::fromJson(memo.toUtf8());
+
+                  cid = headermemo["cid"].toString();
+                  type = headermemo["t"].toString();
+                  requestZaddr =  headermemo["z"].toString();
 
                     chatModel->addCid(txid, cid);
                     chatModel->addrequestZaddr(txid, requestZaddr);
@@ -997,7 +998,7 @@ void Controller::refreshTransactions() {
                                 txid,
                                 false
                             );
-                    //DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item);
+
                     DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
                  } 
             }

src/mainwindow.cpp

@@ -908,9 +908,9 @@ void MainWindow::setupTransactionsTab() {
     // Set up context menu on transactions tab
     auto theme = Settings::getInstance()->get_theme_name();
     if (theme == "dark" || theme == "midnight") {
-    ui->listChat->setStyleSheet("background-image: url(res/sdlogo.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");
+    ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");
      }
-    if (theme == "default") {ui->listChat->setStyleSheet("background-image: url(res/sdlogo2.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");}
+    if (theme == "default") {ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo2.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");}
    
     ui->listChat->setResizeMode(QListView::Adjust);
     ui->listChat->setWordWrap(true);

src/mainwindow.ui

@@ -10,6 +10,43 @@
     <height>779</height>
    </rect>
   </property>
+  <property name="palette">
+   <palette>
+    <active>
+     <colorrole role="PlaceholderText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+    </active>
+    <inactive>
+     <colorrole role="PlaceholderText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+    </inactive>
+    <disabled>
+     <colorrole role="PlaceholderText">
+      <brush brushstyle="SolidPattern">
+       <color alpha="255">
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+       </color>
+      </brush>
+     </colorrole>
+    </disabled>
+   </palette>
+  </property>
   <property name="windowTitle">
    <string>SilentDragonLite</string>
   </property>