diff --git a/application.qrc b/application.qrc
index e2da53c..bb3c02c 100644
--- a/application.qrc
+++ b/application.qrc
@@ -33,11 +33,7 @@
res/add_contact.png
res/notification.png
res/rahmen-message.png
- res/upload.png
- res/upload.svg
res/message-icon.svg
- res/lock.svg
- res/lock.png
res/lock_green.png
res/lock_orange.png
res/unlocked.png
@@ -49,6 +45,8 @@
res/sendBlack.png
res/requestBlack.png
res/addContactBlack.png
+ res/unknownBlack.png
+ res/unknownWhite.png
diff --git a/res/getAddrBlack.png b/res/getAddrBlack.png
index 2ede956..d90c9a5 100644
Binary files a/res/getAddrBlack.png and b/res/getAddrBlack.png differ
diff --git a/res/getAddrWhite.png b/res/getAddrWhite.png
index 6caeeae..28b30fb 100644
Binary files a/res/getAddrWhite.png and b/res/getAddrWhite.png differ
diff --git a/res/unknownBlack.png b/res/unknownBlack.png
new file mode 100644
index 0000000..faf65e0
Binary files /dev/null and b/res/unknownBlack.png differ
diff --git a/res/unknownWhite.png b/res/unknownWhite.png
new file mode 100644
index 0000000..7853e1e
Binary files /dev/null and b/res/unknownWhite.png differ
diff --git a/res/unlocked.svg b/res/unlocked.svg
deleted file mode 100644
index 50ff5e1..0000000
--- a/res/unlocked.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/res/upload.png b/res/upload.png
deleted file mode 100644
index b6f3c1f..0000000
Binary files a/res/upload.png and /dev/null differ
diff --git a/res/upload.svg b/res/upload.svg
deleted file mode 100644
index 9f31b60..0000000
--- a/res/upload.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index 5bd28d0..ee3fe6d 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -99,18 +99,39 @@ void MainWindow::renderContactRequest(){
requestContact.setupUi(&dialog);
Settings::saveRestore(&dialog);
+ QString icon;
+ auto theme = Settings::getInstance()->get_theme_name();
+ if (theme == "dark" || theme == "midnight") {
+ icon = ":/icons/res/unknownWhite.png";
+ }else{
+ icon = ":/icons/res/unknownBlack.png";
+ }
+
+ QPixmap unknownWhite(icon);
+ QIcon addnewAddrIcon(unknownWhite);
+
+
+
+
QStandardItemModel* contactRequest = new QStandardItemModel();
for (auto &c : DataStore::getChatDataStore()->getAllNewContactRequests())
+
+
{
- QStandardItem* Items = new QStandardItem(c.second.getAddress());
+ QStandardItem* Items = new QStandardItem(QString("Unknown Sender"));
contactRequest->appendRow(Items);
requestContact.requestContact->setModel(contactRequest);
+
+ Items->setData(QIcon(addnewAddrIcon),Qt::DecorationRole);
+ requestContact.requestContact->setIconSize(QSize(40,50));
+ requestContact.requestContact->setUniformItemSizes(true);
requestContact.requestContact->show();
requestContact.zaddrnew->setVisible(false);
requestContact.zaddrnew->setText(c.second.getAddress());
+
}
QStandardItemModel* contactRequestOld = new QStandardItemModel();
@@ -137,7 +158,7 @@ void MainWindow::renderContactRequest(){
QString label_contact = index.data(Qt::DisplayRole).toString();
QStandardItemModel* contactMemo = new QStandardItemModel();
- if ((c.second.isOutgoing() == false) && (label_contact == c.second.getAddress()) && (c.second.getType() != "Cont"))
+ if ((c.second.isOutgoing() == false) && (requestContact.zaddrnew->text() == c.second.getAddress()) && (c.second.getType() != "Cont"))
{