From 7dfb9a192939fa2fce58a920fd93096fd702a3cb Mon Sep 17 00:00:00 2001 From: Strider <127.0.0.1@404.com> Date: Sat, 9 May 2020 18:14:04 +0200 Subject: [PATCH] update// moved generator to separated helper class --- silentdragon-lite.pro | 3 ++- src/Chat/Chat.h | 34 ++++++++++++++++++++++++++++++++++ src/chatmodel.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/silentdragon-lite.pro b/silentdragon-lite.pro index 808527b..5c7dd21 100644 --- a/silentdragon-lite.pro +++ b/silentdragon-lite.pro @@ -77,7 +77,8 @@ SOURCES += \ src/DataStore/SietchDataStore.cpp \ src/Model/ChatItem.cpp \ src/Model/ContactRequestChatItem.cpp \ - src/Model/ContactItem.cpp + src/Model/ContactItem.cpp \ + src/Chat/Helper/ChatIDGenerator.cpp HEADERS += \ src/firsttimewizard.h \ diff --git a/src/Chat/Chat.h b/src/Chat/Chat.h index 0558d91..969f98c 100644 --- a/src/Chat/Chat.h +++ b/src/Chat/Chat.h @@ -1,6 +1,40 @@ #ifndef CHAT_H #define CHAT_H +class Chat // Chat Controller +{ + private: + std::map chatItems; + QTableView* parent; + Ui::MainWindow* ui; + MainWindow* main; + std::map cidMap; + std::map requestZaddrMap; + public: + ChatModel() {}; + ChatModel(std::map chatItems); + ChatModel(std::vector chatItems); + QString generateChatItemID(ChatItem item); // helper + std::map getItems(); + void setItems(std::map items); + QString zaddr(); + void setItems(std::vector items); + void renderChatBox(Ui::MainWindow* ui, QListView &view); // action + void renderChatBox(Ui::MainWindow* ui, QListView *view); // action + // void renderContactRequest(); + void triggerRequest(); + void showMessages(); + void clear(); + //void renderContactRequest(Ui::MainWindow* ui, QListView *view); + void addMessage(ChatItem item); + void addMessage(QString timestamp, ChatItem item); + void addCid(QString tx, QString cid); + void addrequestZaddr(QString tx, QString requestZaddr); + QString getCidByTx(QString tx); + QString getrequestZaddrByTx(QString tx); + void killCidCache(); + void killrequestZaddrCache(); +}; #endif \ No newline at end of file diff --git a/src/chatmodel.h b/src/chatmodel.h index f39888d..d1a4147 100644 --- a/src/chatmodel.h +++ b/src/chatmodel.h @@ -14,6 +14,7 @@ #include "camount.h" #include "Model/ChatItem.h" #include "Chat/Helper/ChatDelegator.h" +#include "Chat/Helper/ChatIDGenerator.h" class ChatModel {