From 9600242e7055542713c0441419037f96e91b338e Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Thu, 7 May 2020 21:24:51 +0200
Subject: [PATCH] fix icon and background problem on mac/win

---
 silentdragon-lite.pro | 2 +-
 src/addressbook.cpp   | 2 +-
 src/chatmodel.cpp     | 2 +-
 src/contactmodel.cpp  | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/silentdragon-lite.pro b/silentdragon-lite.pro
index a3364d2..5e32f1e 100644
--- a/silentdragon-lite.pro
+++ b/silentdragon-lite.pro
@@ -12,7 +12,7 @@ PRECOMPILED_HEADER = src/precompiled.h
 
 QT += widgets
 QT += websockets
-QT += qml quick
+
 
 TARGET = SilentDragonLite
 
diff --git a/src/addressbook.cpp b/src/addressbook.cpp
index a16d7c8..298b057 100644
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@@ -173,7 +173,7 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
         QString cid = ab.cid->text();
         
         
-        QString avatar = QString("res/") + ab.comboBoxAvatar->currentText() + QString(".png");
+        QString avatar = QString(":/icons/res/") + ab.comboBoxAvatar->currentText() + QString(".png");
         qDebug()<<"AVATAR NAME : " << avatar;
 
         if (addr.isEmpty() || newLabel.isEmpty()) 
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index 6c426be..c8ab957 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -510,7 +510,7 @@ void::MainWindow::addContact() {
             QString newLabel = request.labelRequest->text().trimmed();
             auto myAddr = request.myzaddr->text().trimmed();
 
-            QString avatar = QString("res/") + request.comboBoxAvatar->currentText() + QString(".png");
+            QString avatar = QString(":/icons/res/") + request.comboBoxAvatar->currentText() + QString(".png");
 
              if (addr.isEmpty() || newLabel.isEmpty()) 
         {
diff --git a/src/contactmodel.cpp b/src/contactmodel.cpp
index adeeb45..41b7758 100644
--- a/src/contactmodel.cpp
+++ b/src/contactmodel.cpp
@@ -17,7 +17,8 @@ void ContactModel::renderContactList(QListView* view)
 
           QString avatar = c.getAvatar();
 
-             QStandardItem* Items1 = new QStandardItem(QIcon(avatar) ,c.getName());
+             QStandardItem* Items1 = new QStandardItem(c.getName());
+             Items1->setData(QIcon(avatar),Qt::DecorationRole);
              contact->appendRow(Items1); 
              view->setModel(contact);
              view->setIconSize(QSize(60,70));