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

update// updated contactmodel and added new generatorclass

Browse Source
This commit is contained in:
Strider
2020-05-09 21:19:59 +02:00
parent 7dfb9a1929
commit abdad2b09d
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/chatmodel.cpp
View File

@@ -27,7 +27,7 @@ ChatModel::ChatModel(std::vector<ChatItem> chatItems)
this->setItems(chatItems); this->setItems(chatItems);
} }
QString ChatModel::generateChatItemID(ChatItem item) /*QString ChatModel::generateChatItemID(ChatItem item)
{ {
QString key = QString::number(item.getTimestamp()) + QString("-"); QString key = QString::number(item.getTimestamp()) + QString("-");
key += QString(QCryptographicHash::hash( key += QString(QCryptographicHash::hash(
@@ -39,7 +39,7 @@ QString ChatModel::generateChatItemID(ChatItem item)
).toUtf8() ).toUtf8()
,QCryptographicHash::Md5).toHex()); ,QCryptographicHash::Md5).toHex());
return key; return key;
} }*/
std::map<QString, ChatItem> ChatModel::getItems() std::map<QString, ChatItem> ChatModel::getItems()
{ {
@@ -55,8 +55,7 @@ void ChatModel::setItems(std::vector<ChatItem> items)
{ {
for(ChatItem c : items) for(ChatItem c : items)
{ {
this->chatItems[this->generateChatItemID(c)] = c; this->chatItems[ChatIDGenerator::getInstance()->generateID(c)] = c; //this->generateChatItemID(c)] = c;
} }
} }
@@ -67,14 +66,14 @@ void ChatModel::clear()
void ChatModel::addMessage(ChatItem item) void ChatModel::addMessage(ChatItem item)
{ {
QString key = this->generateChatItemID(item); QString key = ChatIDGenerator::getInstance()->generateID(item); //this->generateChatItemID(item);
// qDebug() << "inserting chatitem with id: " << key; // qDebug() << "inserting chatitem with id: " << key;
this->chatItems[key] = item; this->chatItems[key] = item;
} }
void ChatModel::addMessage(QString timestamp, ChatItem item) void ChatModel::addMessage(QString timestamp, ChatItem item)
{ {
QString key = this->generateChatItemID(item); QString key = ChatIDGenerator::getInstance()->generateID(item);//this->generateChatItemID(item);
timestamp = "0"; timestamp = "0";
this->chatItems[key] = item; this->chatItems[key] = item;
} }

2
src/chatmodel.h
View File

@@ -30,7 +30,7 @@ class ChatModel
ChatModel() {}; ChatModel() {};
ChatModel(std::map<QString, ChatItem> chatItems); ChatModel(std::map<QString, ChatItem> chatItems);
ChatModel(std::vector<ChatItem> chatItems); ChatModel(std::vector<ChatItem> chatItems);
QString generateChatItemID(ChatItem item); //QString generateChatItemID(ChatItem item);
std::map<QString, ChatItem> getItems(); std::map<QString, ChatItem> getItems();
void setItems(std::map<QString, ChatItem> items); void setItems(std::map<QString, ChatItem> items);
QString zaddr(); QString zaddr();

3
src/contactmodel.cpp
View File

@@ -12,8 +12,6 @@ void ContactModel::renderContactList(QListView* view)
for(auto &c : AddressBook::getInstance()->getAllAddressLabels()) for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
{ {
auto theme = Settings::getInstance()->get_theme_name();
if ((theme == "dark" || theme == "midnight")) {
QString avatar = c.getAvatar(); QString avatar = c.getAvatar();
@@ -26,7 +24,6 @@ void ContactModel::renderContactList(QListView* view)
view->setDragDropMode(QAbstractItemView::DropOnly); view->setDragDropMode(QAbstractItemView::DropOnly);
view->show(); view->show();
}
} }

7
src/controller.cpp
View File

@@ -889,7 +889,8 @@ void Controller::refreshTransactions() {
txid, txid,
true true
); );
DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item); //DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item);
DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
} }
@@ -996,8 +997,8 @@ void Controller::refreshTransactions() {
txid, txid,
false false
); );
DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item); //DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item);
DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
qDebug() << "Position der Message : " << position; qDebug() << "Position der Message : " << position;
} }
} }