diff --git a/application.qrc b/application.qrc
index 7ab9af5..bf9a3b9 100644
--- a/application.qrc
+++ b/application.qrc
@@ -38,9 +38,8 @@
res/message-icon.svg
res/lock.svg
res/lock.png
- res/lock_green.svg
- res/lock_blue.svg
- res/unlocked.svg
+ res/lock_green.png
+ res/unlocked.png
res/getAddrWhite.png
res/send-white.png
res/requestWhite.png
diff --git a/src/Model/ChatItem.cpp b/src/Model/ChatItem.cpp
index 540c7ba..fff8f9a 100644
--- a/src/Model/ChatItem.cpp
+++ b/src/Model/ChatItem.cpp
@@ -137,10 +137,10 @@ QString ChatItem::toChatLine()
myDateTime.setTime_t(_timestamp);
if (_confirmations == 0){
- lock = " 
";
+ lock = " 
";
}else{
- lock = " 
";
+ lock = " 
";
}
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index 28f7dfe..d3abd34 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -126,6 +126,7 @@ void MainWindow::renderContactRequest(){
requestContact.requestMemo->show();
requestContact.requestCID->setText(c.second.getCid());
+ requestContact.requestCID->setVisible(false);
requestContact.requestZaddr->setText(c.second.getRequestZaddr());
requestContact.requestMyAddr->setText(c.second.getAddress());
}else{}
@@ -152,6 +153,7 @@ void MainWindow::renderContactRequest(){
requestContact.requestMemo->show();
requestContact.requestCID->setText(c.second.getCid());
+ requestContact.requestCID->setVisible(false);
requestContact.requestZaddr->setText(c.second.getRequestZaddr());
requestContact.requestMyAddr->setText(c.second.getAddress());
}else{}
diff --git a/src/requestContactDialog.ui b/src/requestContactDialog.ui
index 7e676e7..2eb4bc0 100644
--- a/src/requestContactDialog.ui
+++ b/src/requestContactDialog.ui
@@ -6,38 +6,28 @@
0
0
- 1025
- 562
+ 812
+ 495
+
+
+ 812
+ 495
+
+
Incoming contact request
- -
-
+
-
+
- My Zaddr :
-
-
-
- -
-
-
- true
-
-
- QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked
-
-
- false
-
-
- QAbstractItemView::SingleSelection
+ <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Open requests</span></p></body></html>
- -
+
-
<html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Memo of the request</span></p></body></html>
@@ -46,6 +36,12 @@
-
+
+
+ 256
+ 231
+
+
true
@@ -60,18 +56,14 @@
- -
-
-
- -
-
-
- Give a Nickname:
-
-
-
- -
+
-
+
+
+ 521
+ 231
+
+
Qt::ScrollBarAlwaysOff
@@ -98,22 +90,112 @@
- -
-
+
-
+
- <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Details of the request</span></p></body></html>
+ <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Recently closed requests</span></p></body></html>
- -
-
+
-
+
+
+
+ 256
+ 192
+
+
+
+ true
+
+
+ QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked
+
+
+ false
+
+
+ QAbstractItemView::SingleSelection
+
+
+
+ -
+
- <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Open requests</span></p></body></html>
+ Request from :
- -
+
-
+
+
+
+ 351
+ 25
+
+
+
+
+ 351
+ 25
+
+
+
+
+ -
+
+
+ My Zaddr :
+
+
+
+ -
+
+
+
+ 351
+ 25
+
+
+
+
+ 351
+ 25
+
+
+
+
+ -
+
+
+ Give a Nickname:
+
+
+
+ -
+
+
+ -
+
+
+ <html><head/><body><p align="right">Choose a avatar for your contact :</p></body></html>
+
+
+
+ -
+
+
+ 106
+ 25
+
+
+
+
+ 106
+ 25
+
+
-
Stag
@@ -246,21 +328,14 @@
- -
-
-
- <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Recently closed requests</span></p></body></html>
-
-
-
- -
-
-
- -
-
-
- -
+
-
+
+
+ 80
+ 25
+
+
100
@@ -278,8 +353,14 @@
- -
+
-
+
+
+ 153
+ 25
+
+
Add this new Contact
@@ -288,27 +369,17 @@
- -
-
-
- Request from :
-
-
-
- -
-
+
-
+
- <html><head/><body><p align="right">Choose a avatar for your contact :</p></body></html>
+
- -
-
-
- -
-
+
-
+
- Cid :
+ <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Details of the request</span></p></body></html>