diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 0181a7f8c..6b1719295 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -49,6 +49,7 @@
#define IMAGE_STAR_ON ":/images/star-on-16.png"
#define IMAGE_STAR_OFF ":/images/star-off-16.png"
#define IMAGE_SYSTEM ":/images/user/user_request16.png"
+#define IMAGE_DECRYPTMESSAGE ":/images/decrypt-mail.png"
#define COLUMN_STAR 0
#define COLUMN_ATTACHEMENTS 1
@@ -608,7 +609,7 @@ void MessagesDialog::messageslistWidgetCustomPopupMenu( QPoint /*point*/ )
}
if(nCount==1 && (msgInfo.msgflags & RS_MSG_ENCRYPTED))
- action = contextMnu.addAction(QIcon(IMAGE_SYSTEM), tr("Decrypt Message"), this, SLOT(decryptSelectedMsg()));
+ action = contextMnu.addAction(QIcon(IMAGE_DECRYPTMESSAGE), tr("Decrypt Message"), this, SLOT(decryptSelectedMsg()));
int listrow = ui.listWidget->currentRow();
if (listrow == ROW_TRASHBOX) {
@@ -1137,6 +1138,7 @@ void MessagesDialog::insertMessages()
// Subject
if(it->msgflags & RS_MSG_ENCRYPTED)
text = tr("Encrypted message. Right-click to decrypt it.") ;
+
else
text = QString::fromStdWString(it->title);
@@ -1218,6 +1220,7 @@ void MessagesDialog::insertMessages()
{
item[COLUMN_SIGNATURE]->setIcon(QIcon(":/images/blue_lock.png")) ;
item[COLUMN_SIGNATURE]->setToolTip(tr("This message is encrypted. Right click to decrypt it.")) ;
+ item[COLUMN_SUBJECT]->setIcon(QIcon(":/images/mail-encrypted-full.png")) ;
}
else
if(it->msgflags & RS_MSG_SIGNED)
diff --git a/retroshare-gui/src/gui/ShareManager.ui b/retroshare-gui/src/gui/ShareManager.ui
index 2d693dbdc..1e0f9f625 100644
--- a/retroshare-gui/src/gui/ShareManager.ui
+++ b/retroshare-gui/src/gui/ShareManager.ui
@@ -6,8 +6,8 @@
0
0
- 600
- 350
+ 741
+ 334
@@ -49,7 +49,7 @@
6
- -
+
-
Shared Folder Manager
@@ -58,22 +58,7 @@
2
-
-
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This is a list of shared folders. You can add and remove folders using the buttons at the bottom.</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">When you add a new folder, intially all files in that folder are shared.</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">You can separately setup share flags for each shared directory:</span><span style=" font-size:8pt;"> </span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">Browsable</span><span style=" font-family:'Sans'; font-size:8pt;">: files are browsable from your direct friends.</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">Network Wide</span><span style=" font-family:'Sans'; font-size:8pt;">: files can be downloaded by anybody through anonymous tunnels.</span></p></body></html>
-
-
-
- -
+
-
Qt::CustomContextMenu
@@ -136,7 +121,7 @@ p, li { white-space: pre-wrap; }
- -
+
-
@@ -164,7 +149,7 @@ p, li { white-space: pre-wrap; }
- -
+
-
@@ -192,7 +177,7 @@ p, li { white-space: pre-wrap; }
- -
+
-
Qt::Horizontal
@@ -205,14 +190,14 @@ p, li { white-space: pre-wrap; }
- -
+
-
Apply and close
- -
+
-
Edit selected Shared Directory
@@ -222,6 +207,28 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+
+ Tahoma
+ 11
+
+
+
+ border: 1px solid #DCDC41;
+ border-radius: 6px;
+ background: #FFFFD7;
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
+
+
+ This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.
+
+
+ true
+
+
+
diff --git a/retroshare-gui/src/gui/common/RSImageBlockWidget.ui b/retroshare-gui/src/gui/common/RSImageBlockWidget.ui
index ed8dd2430..37f1c54b8 100644
--- a/retroshare-gui/src/gui/common/RSImageBlockWidget.ui
+++ b/retroshare-gui/src/gui/common/RSImageBlockWidget.ui
@@ -7,7 +7,7 @@
0
0
476
- 34
+ 38
@@ -96,6 +96,16 @@
6
+ -
+
+
+
+
+
+ :/images/imageblocked_24.png
+
+
+
-
@@ -128,6 +138,8 @@
-
+
+
+
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 836079a1c..7c7e88d48 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -1,6 +1,8 @@
images/add_chat24.png
+ images/mail-encrypted-full.png
+ images/decrypt-mail.png
images/inbox_22.png
images/blue_lock.png
images/d-chat64.png
@@ -271,6 +273,7 @@
images/hot_4.png
images/hot_5.png
images/image16.png
+ images/imageblocked_24.png
images/info16.png
images/im-user.png
images/im-user-offline.png
diff --git a/retroshare-gui/src/gui/images/decrypt-mail.png b/retroshare-gui/src/gui/images/decrypt-mail.png
new file mode 100644
index 000000000..e24cefd71
Binary files /dev/null and b/retroshare-gui/src/gui/images/decrypt-mail.png differ
diff --git a/retroshare-gui/src/gui/images/imageblocked_24.png b/retroshare-gui/src/gui/images/imageblocked_24.png
new file mode 100644
index 000000000..395c81190
Binary files /dev/null and b/retroshare-gui/src/gui/images/imageblocked_24.png differ
diff --git a/retroshare-gui/src/gui/images/mail-encrypted-full.png b/retroshare-gui/src/gui/images/mail-encrypted-full.png
new file mode 100644
index 000000000..358975f19
Binary files /dev/null and b/retroshare-gui/src/gui/images/mail-encrypted-full.png differ