diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index bc8da9d6b..134b50b9a 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -62,7 +62,7 @@ - :/icons/png/chat-lobbies.png + :/icons/png/chats.png true diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui index f1685a5d5..d2e7a9ab6 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui @@ -62,7 +62,7 @@ - :/icons/png/filesharing.png + :/icons/png/fileshare.png true diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index 1ac4095cc..2ecd9772e 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -62,7 +62,7 @@ - :/icons/png/network.png + :/icons/png/network2.png true diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index d49782bd4..4aa73e097 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -80,7 +80,7 @@ - :/icons/png/people.png + :/icons/png/people2.png true diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui index 43908f81a..ed40bdccb 100644 --- a/retroshare-gui/src/gui/NewsFeed.ui +++ b/retroshare-gui/src/gui/NewsFeed.ui @@ -59,7 +59,7 @@ - :/icons/png/newsfeed.png + :/icons/png/newsfeed2.png true diff --git a/retroshare-gui/src/gui/Posted/PostedDialog.cpp b/retroshare-gui/src/gui/Posted/PostedDialog.cpp index c312bd8e8..edf09ff20 100644 --- a/retroshare-gui/src/gui/Posted/PostedDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedDialog.cpp @@ -99,7 +99,7 @@ QString PostedDialog::icon(IconType type) { switch (type) { case ICON_NAME: - return ":/icons/png/posted.png"; + return ":/icons/png/postedlinks.png"; case ICON_NEW: return ":/icons/png/add.png"; case ICON_YOUR_GROUP: @@ -109,7 +109,7 @@ QString PostedDialog::icon(IconType type) case ICON_POPULAR_GROUP: return ""; case ICON_OTHER_GROUP: - return ":/icons/png/feed-other.png"; + return ""; case ICON_SEARCH: return ":/images/find.png"; case ICON_DEFAULT: diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui index 250f43007..dc4368992 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.ui +++ b/retroshare-gui/src/gui/Posted/PostedItem.ui @@ -407,6 +407,9 @@ 0 + + 6 + 3 @@ -539,8 +542,8 @@ Set as read and remove item - - :/images/cancel.png:/images/cancel.png + + :/icons/png/correct.png:/icons/png/correct.png @@ -559,8 +562,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -685,6 +688,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui index 924028ef3..3b52ca54b 100644 --- a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui @@ -7,7 +7,7 @@ 0 0 543 - 201 + 208 @@ -31,70 +31,6 @@ 0 - - - - - - - 254 - 246 - 222 - - - - - - - 254 - 246 - 222 - - - - - - - - - 254 - 246 - 222 - - - - - - - 254 - 246 - 222 - - - - - - - - - 240 - 240 - 240 - - - - - - - 254 - 246 - 222 - - - - - - true @@ -201,8 +137,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -406,20 +342,21 @@ + + StyledLabel + QLabel +
gui/common/StyledLabel.h
+ AvatarWidget QLabel
gui/common/AvatarWidget.h
1 - - StyledLabel - QLabel -
gui/common/StyledLabel.h
- + diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui index bb7688ffa..e94938020 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui @@ -125,7 +125,10 @@ - :/images/channels.png + :/icons/png/channel.png + + + true @@ -153,6 +156,12 @@ + + + 75 + true + + name @@ -219,8 +228,8 @@ Qt::NoFocus - - :/images/copyrslink.png:/images/copyrslink.png + + :/icons/png/copy.png:/icons/png/copy.png @@ -239,8 +248,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -259,8 +268,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -328,6 +337,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index c049dff59..fbf9f0f33 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -389,6 +389,8 @@ void GxsChannelPostItem::fill() mInFill = true; QString title; + + float f = QFontMetricsF(font()).height()/14.0 ; if(mPost.mThumbnail.mData != NULL) { @@ -397,15 +399,15 @@ void GxsChannelPostItem::fill() GxsIdDetails::loadPixmapFromData(mPost.mThumbnail.mData, mPost.mThumbnail.mSize, thumbnail,GxsIdDetails::ORIGINAL); // Wiping data - as its been passed to thumbnail. if( thumbnail.width() < 90 ){ - ui->logoLabel->setMaximumSize(82,108); + ui->logoLabel->setMaximumSize(82,108*f); } else if( thumbnail.width() < 109 ){ - ui->logoLabel->setMinimumSize(108,108); - ui->logoLabel->setMaximumSize(108,108); + ui->logoLabel->setMinimumSize(108,108*f); + ui->logoLabel->setMaximumSize(108,108*f); } else{ - ui->logoLabel->setMinimumSize(156,108); - ui->logoLabel->setMaximumSize(156,108); + ui->logoLabel->setMinimumSize(156,108*f); + ui->logoLabel->setMaximumSize(156,108*f); } ui->logoLabel->setPixmap(thumbnail); } diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp index e73f08ca6..1e430638a 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp @@ -132,9 +132,9 @@ void GxsForumGroupItem::fill() ui->descLabel->setText(QString::fromUtf8(mGroup.mDescription.c_str())); if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) { - ui->forumlogo_label->setPixmap(QPixmap(":/images/konv_message64.png")); + ui->forumlogo_label->setPixmap(QPixmap(":/icons/png/forums.png")); } else { - ui->forumlogo_label->setPixmap(QPixmap(":/images/konversation64.png")); + ui->forumlogo_label->setPixmap(QPixmap(":/icons/png/forums-default.png")); } if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) { @@ -174,13 +174,13 @@ void GxsForumGroupItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); } else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui index ccdb0a591..066ea2121 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui @@ -125,7 +125,10 @@ - :/images/konversation64.png + :/icons/png/forums-default.png + + + true @@ -153,6 +156,12 @@ + + + 75 + true + + name @@ -219,8 +228,8 @@ Qt::NoFocus - - :/images/copyrslink.png:/images/copyrslink.png + + :/icons/png/copy.png:/icons/png/copy.png @@ -239,8 +248,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -259,8 +268,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -329,6 +338,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp index d6081bbd8..8e1dba4ea 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp @@ -28,9 +28,12 @@ #include "FeedHolder.h" #include "gui/RetroShareLink.h" +#include "gui/gxs/GxsIdDetails.h" #include "util/HandleRichText.h" #include "util/DateTime.h" +#include + #include /**** @@ -279,9 +282,9 @@ void GxsForumMsgItem::fill() } if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) { - ui->iconLabel->setPixmap(QPixmap(":/images/konv_message64.png")); + ui->iconLabel->setPixmap(QPixmap(":/icons/png/forums.png")); } else { - ui->iconLabel->setPixmap(QPixmap(":/images/konversation64.png")); + ui->iconLabel->setPixmap(QPixmap(":/icons/png/forums-default.png")); } if (!mIsHome) { @@ -289,6 +292,16 @@ void GxsForumMsgItem::fill() mCloseOnRead = true; } } + + RsIdentityDetails idDetails ; + rsIdentity->getIdDetails(mMessage.mMeta.mAuthorId,idDetails); + + QPixmap pixmap ; + + if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) + pixmap = GxsIdDetails::makeDefaultIcon(mMessage.mMeta.mAuthorId,GxsIdDetails::SMALL); + + ui->avatar->setPixmap(pixmap); ui->nameLabel->setId(mMessage.mMeta.mAuthorId); @@ -322,6 +335,16 @@ void GxsForumMsgItem::fill() ui->parentMsgLabel->setText(RsHtml().formatText(NULL, QString::fromUtf8(mParentMessage.mMsg.c_str()), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); ui->parentNameLabel->setId(mParentMessage.mMeta.mAuthorId); + + RsIdentityDetails idDetails ; + rsIdentity->getIdDetails(mParentMessage.mMeta.mAuthorId,idDetails); + + QPixmap pixmap ; + + if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) + pixmap = GxsIdDetails::makeDefaultIcon(mParentMessage.mMeta.mAuthorId,GxsIdDetails::SMALL); + + ui->parentAvatar->setPixmap(pixmap); // if (rsPeers->getPeerName(msgParent.srcId) !="") // { @@ -369,7 +392,7 @@ void GxsForumMsgItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); if (!mParentMessage.mMeta.mMsgId.isNull()) { @@ -382,7 +405,7 @@ void GxsForumMsgItem::doExpand(bool open) { ui->expandFrame->hide(); ui->parentFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui index 938d44947..47b1457b2 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui @@ -77,9 +77,95 @@ QFrame::Sunken - - - + + + + + + 70 + 70 + + + + + 70 + 70 + + + + :/icons/png/forums-default.png + + + true + + + Qt::AlignCenter + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Forum Name + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + Qt::Horizontal + + + + 358 + 20 + + + + + + + + + 75 + true + + + + Timestamp + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + @@ -110,16 +196,13 @@ - + Qt::Horizontal - - QSizePolicy::Expanding - - 10 + 168 20 @@ -139,9 +222,8 @@ Unsubscribe To Forum - - - :/images/mail_delete.png:/images/mail_delete.png + + Unsubscribe @@ -160,8 +242,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -180,8 +262,8 @@ Set as read and remove item - - :/images/cancel.png:/images/cancel.png + + :/icons/png/correct.png:/icons/png/correct.png @@ -200,238 +282,13 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg - - - - - - - 70 - 70 - - - - - 70 - 70 - - - - :/images/konversation64.png - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Forum Name - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - - - - Qt::Horizontal - - - - 358 - 20 - - - - - - - - - 75 - true - - - - Timestamp - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Qt::Horizontal - - - - 518 - 20 - - - - - - - - - - QFrame::Box - - - QFrame::Sunken - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - - - - - - 75 - true - - - - Name - - - true - - - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Subject: - - - - - - - - 0 - 0 - - - - Message is about ??? - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - - Qt::Vertical - - - - 20 - 27 - - - - - - - - - - - 0 - 0 - - - - Current Message.. - - - true - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - @@ -589,6 +446,131 @@ + + + + QFrame::Box + + + QFrame::Sunken + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + + + + + + 75 + true + + + + Name + + + true + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Subject: + + + + + + + + 0 + 0 + + + + Message is about ??? + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + + Qt::Vertical + + + + 20 + 27 + + + + + + + + + + + 0 + 0 + + + + Current Message.. + + + true + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + @@ -609,6 +591,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp index 3e4ae3bb6..c0dd8768e 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp @@ -236,7 +236,7 @@ void MsgItem::doExpand(bool open) if (open) { expandFrame->show(); - expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); expandButton->setToolTip(tr("Hide")); mCloseOnRead = false; @@ -246,7 +246,7 @@ void MsgItem::doExpand(bool open) else { expandFrame->hide(); - expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui index d273f935d..6e47331d9 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.ui +++ b/retroshare-gui/src/gui/feeds/MsgItem.ui @@ -31,70 +31,6 @@ 0 - - - - - - - 52 - 177 - 255 - - - - - - - 51 - 174 - 255 - - - - - - - - - 52 - 177 - 255 - - - - - - - 51 - 174 - 255 - - - - - - - - - 240 - 240 - 240 - - - - - - - 51 - 174 - 255 - - - - - - true @@ -215,7 +151,7 @@ - + Qt::NoFocus @@ -229,12 +165,6 @@ :/images/mail_reply.png:/images/mail_reply.png - - Qt::ToolButtonTextBesideIcon - - - false - @@ -265,8 +195,8 @@ Delete Message - - :/images/mail_delete.png:/images/mail_delete.png + + :/icons/png/cancel.png:/icons/png/cancel.png @@ -285,8 +215,8 @@ Play Media - - :/images/startall.png:/images/startall.png + + :/icons/png/play.png:/icons/png/play.png @@ -305,8 +235,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -325,8 +255,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -493,7 +423,7 @@ - + diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp index 0c0c1d057..c1ccd788e 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.cpp +++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp @@ -236,13 +236,13 @@ void PeerItem::doExpand(bool open) if (open) { expandFrame->show(); - expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); expandButton->setToolTip(tr("Hide")); } else { expandFrame->hide(); - expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui index dc37abc28..b7a18df71 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.ui +++ b/retroshare-gui/src/gui/feeds/PeerItem.ui @@ -7,7 +7,7 @@ 0 0 476 - 250 + 262 @@ -294,8 +294,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -314,8 +314,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -581,6 +581,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp b/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp index f0453e4df..1a9ebeb9e 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp @@ -189,13 +189,13 @@ void PostedGroupItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); ui->expandButton->setToolTip(tr("Hide")); } else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui index e792fadca..3b3a3dbb4 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui @@ -153,6 +153,12 @@ + + + 75 + true + + name @@ -219,8 +225,8 @@ Qt::NoFocus - - :/images/copyrslink.png:/images/copyrslink.png + + :/icons/png/copy.png:/icons/png/copy.png @@ -239,8 +245,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -259,8 +265,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -330,6 +336,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp index 969440a8c..a6a5d2d50 100644 --- a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp @@ -203,13 +203,13 @@ void SecurityIpItem::doExpand(bool open) if (open) { ui->expandFrame->show(); - ui->expandButton->setIcon(QIcon(":/images/edit_remove24.png")); + ui->expandButton->setIcon(QIcon(":/icons/png/up-arrow.png")); ui->expandButton->setToolTip(tr("Hide")); } else { ui->expandFrame->hide(); - ui->expandButton->setIcon(QIcon(":/images/edit_add24.png")); + ui->expandButton->setIcon(QIcon(":/icons/png/down-arrow.png")); ui->expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui index a0ee5a55f..defbd39f1 100644 --- a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui +++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui @@ -11,7 +11,16 @@ - + + 1 + + + 1 + + + 1 + + 1 @@ -105,10 +114,19 @@ - + 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -215,8 +233,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -235,8 +253,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -475,6 +493,7 @@ + diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.cpp b/retroshare-gui/src/gui/feeds/SecurityItem.cpp index 6a3f169ec..722296ae5 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityItem.cpp @@ -294,13 +294,13 @@ void SecurityItem::doExpand(bool open) if (open) { expandFrame->show(); - expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png"))); expandButton->setToolTip(tr("Hide")); } else { expandFrame->hide(); - expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); + expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png"))); expandButton->setToolTip(tr("Expand")); } diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.ui b/retroshare-gui/src/gui/feeds/SecurityItem.ui index 0b3c2be41..6b62a5aff 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.ui +++ b/retroshare-gui/src/gui/feeds/SecurityItem.ui @@ -7,11 +7,20 @@ 0 0 763 - 241 + 246 - + + 1 + + + 1 + + + 1 + + 1 @@ -102,10 +111,19 @@ - + 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -362,8 +380,8 @@ Expand - - :/images/edit_add24.png:/images/edit_add24.png + + :/icons/png/down-arrow.png:/icons/png/down-arrow.png @@ -382,8 +400,8 @@ Remove Item - - :/images/close_normal.png:/images/close_normal.png + + :/icons/svg/exit-red.svg:/icons/svg/exit-red.svg @@ -625,6 +643,7 @@ + diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 9c6a9b662..6a0da2fc2 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -7,7 +7,7 @@ 0 0 600 - 633 + 563 @@ -51,6 +51,9 @@ 0 + + 3 + @@ -64,7 +67,7 @@ 4 - 4 + 0 4 @@ -213,159 +216,6 @@ - - - - - 0 - 0 - - - - Message Distribution - - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you're creating.</p></body></html> - - - Public - - - - :/icons/png/network-puplic.png:/icons/png/network-puplic.png - - - - 24 - 24 - - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Messages will spread among Retroshare nodes that host one of the identities listed as member of the circle and who also subscribe the media. Only these nodes will be able to see that this forum/channel/posted media exists. </p></body></html> - - - Restricted to Circle - - - - :/icons/png/circles.png:/icons/png/circles.png - - - - 24 - 24 - - - - - - - - - 0 - 0 - - - - <html><head/><body><p>Messages will only be distributed to the selected subset of your friend nodes. They will not forward messages with each other, but only use your own node as a central hub to distribute them.</p></body></html> - - - Restricted node group - - - - :/icons/png/network.png:/icons/png/network.png - - - - 24 - 24 - - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 68 - 20 - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - @@ -601,6 +451,161 @@ + + + + + + + + + + + + + + + 0 + 0 + + + + Message Distribution + + + + 6 + + + 6 + + + + + + 0 + 0 + + + + <html><head/><body><p>Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you're creating.</p></body></html> + + + Public + + + + :/icons/png/network-puplic.png:/icons/png/network-puplic.png + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Messages will spread among Retroshare nodes that host one of the identities listed as member of the circle and who also subscribe the media. Only these nodes will be able to see that this forum/channel/posted media exists. </p></body></html> + + + Restricted to Circle + + + + :/icons/png/circles.png:/icons/png/circles.png + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Messages will only be distributed to the selected subset of your friend nodes. They will not forward messages with each other, but only use your own node as a central hub to distribute them.</p></body></html> + + + Restricted node group + + + + :/icons/png/network.png:/icons/png/network.png + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 0 + 17 + + + + + + + + Qt::Horizontal + + + + 1 + 25 + + + + + + + diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h index 3f45a9df4..eedde4833 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h @@ -23,7 +23,7 @@ #include "gui/gxs/GxsGroupFrameDialog.h" -#define IMAGE_GXSCHANNELS ":/icons/png/channels.png" +#define IMAGE_GXSCHANNELS ":/icons/png/channel.png" class GxsChannelDialog : public GxsGroupFrameDialog { diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp index 369d28778..5732a706a 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp @@ -99,11 +99,11 @@ QPixmap GxsChannelGroupDialog::serviceImage() switch (mode()) { case MODE_CREATE: - return QPixmap(":/icons/png/channels.png"); + return QPixmap(":/icons/png/channel.png"); case MODE_SHOW: - return QPixmap(":/icons/png/channels.png"); + return QPixmap(":/icons/png/channel.png"); case MODE_EDIT: - return QPixmap(":/icons/png/channels.png"); + return QPixmap(":/icons/png/channel.png"); } return QPixmap(); diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelUserNotify.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelUserNotify.cpp index 63dde30f4..aa82953ed 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelUserNotify.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelUserNotify.cpp @@ -36,12 +36,12 @@ bool GxsChannelUserNotify::hasSetting(QString *name, QString *group) QIcon GxsChannelUserNotify::getIcon() { - return QIcon(":/icons/png/channels.png"); + return QIcon(":/icons/png/channel.png"); } QIcon GxsChannelUserNotify::getMainIcon(bool hasNew) { - return hasNew ? QIcon(":/icons/png/channels-notify.png") : QIcon(":/icons/png/channels.png"); + return hasNew ? QIcon(":/icons/png/channels-notify.png") : QIcon(":/icons/png/channel.png"); } void GxsChannelUserNotify::iconClicked() diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp index 84e903335..34c2818f1 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp @@ -114,7 +114,7 @@ QString GxsForumsDialog::icon(IconType type) { switch (type) { case ICON_NAME: - return ":/icons/png/forums.png"; + return ":/icons/png/forum.png"; case ICON_NEW: return ":/icons/png/add.png"; case ICON_YOUR_GROUP: diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 3986bfad7..3445b1a41 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -105,6 +105,7 @@ icons/png/netgraph.png icons/png/network-notify.png icons/png/network.png + icons/png/network2.png icons/png/network-puplic.png icons/png/newsfeed-notify.png icons/png/newsfeed.png @@ -269,5 +270,12 @@ icons/png/cancel.png icons/png/correct.png icons/png/comment.png + icons/png/chats.png + icons/png/fileshare.png + icons/png/forum.png + icons/png/message.png + icons/png/newsfeed2.png + icons/png/postedlinks.png + icons/png/people2.png diff --git a/retroshare-gui/src/gui/icons/png/channels-notify.png b/retroshare-gui/src/gui/icons/png/channels-notify.png index df46c8857..a916eebbb 100644 Binary files a/retroshare-gui/src/gui/icons/png/channels-notify.png and b/retroshare-gui/src/gui/icons/png/channels-notify.png differ diff --git a/retroshare-gui/src/gui/icons/png/channels.png b/retroshare-gui/src/gui/icons/png/channels.png index f4460cce9..5fdefc95d 100644 Binary files a/retroshare-gui/src/gui/icons/png/channels.png and b/retroshare-gui/src/gui/icons/png/channels.png differ diff --git a/retroshare-gui/src/gui/icons/png/chats.png b/retroshare-gui/src/gui/icons/png/chats.png new file mode 100644 index 000000000..e6237ce90 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/chats.png differ diff --git a/retroshare-gui/src/gui/icons/png/correct.png b/retroshare-gui/src/gui/icons/png/correct.png index 948c13987..1d3d3f388 100644 Binary files a/retroshare-gui/src/gui/icons/png/correct.png and b/retroshare-gui/src/gui/icons/png/correct.png differ diff --git a/retroshare-gui/src/gui/icons/png/fileshare.png b/retroshare-gui/src/gui/icons/png/fileshare.png new file mode 100644 index 000000000..3caa28411 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/fileshare.png differ diff --git a/retroshare-gui/src/gui/icons/png/forum.png b/retroshare-gui/src/gui/icons/png/forum.png new file mode 100644 index 000000000..a29de6fd8 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/forum.png differ diff --git a/retroshare-gui/src/gui/icons/png/message.png b/retroshare-gui/src/gui/icons/png/message.png new file mode 100644 index 000000000..ae9da7e01 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/message.png differ diff --git a/retroshare-gui/src/gui/icons/png/network2.png b/retroshare-gui/src/gui/icons/png/network2.png new file mode 100644 index 000000000..eafc2c095 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/network2.png differ diff --git a/retroshare-gui/src/gui/icons/png/newsfeed2.png b/retroshare-gui/src/gui/icons/png/newsfeed2.png new file mode 100644 index 000000000..0f1c4f59f Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/newsfeed2.png differ diff --git a/retroshare-gui/src/gui/icons/png/people-notify.png b/retroshare-gui/src/gui/icons/png/people-notify.png index 2a0b75a78..919364920 100644 Binary files a/retroshare-gui/src/gui/icons/png/people-notify.png and b/retroshare-gui/src/gui/icons/png/people-notify.png differ diff --git a/retroshare-gui/src/gui/icons/png/people.png b/retroshare-gui/src/gui/icons/png/people.png index b9eb7e656..7de000c34 100644 Binary files a/retroshare-gui/src/gui/icons/png/people.png and b/retroshare-gui/src/gui/icons/png/people.png differ diff --git a/retroshare-gui/src/gui/icons/png/people2.png b/retroshare-gui/src/gui/icons/png/people2.png new file mode 100644 index 000000000..6934b9ee3 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/people2.png differ diff --git a/retroshare-gui/src/gui/icons/png/postedlinks.png b/retroshare-gui/src/gui/icons/png/postedlinks.png new file mode 100644 index 000000000..16875a376 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/postedlinks.png differ diff --git a/retroshare-gui/src/gui/icons/svg/channels-notify.svg b/retroshare-gui/src/gui/icons/svg/channels-notify.svg index 1219e4988..d0a4e0dee 100644 --- a/retroshare-gui/src/gui/icons/svg/channels-notify.svg +++ b/retroshare-gui/src/gui/icons/svg/channels-notify.svg @@ -2,7 +2,6 @@ image/svg+xml \ No newline at end of file + style="fill:#ffffff;stroke-width:0.79999691" + d="m 248.98415,94.44643 -0.0187,0.1875 c -0.34688,3.29687 -3.79998,32.62175 -18.05618,47.53732 -16.47808,17.54368 -35.15926,19.67492 -44.14359,20.69679 -0.74376,0.0844 -1.425,0.1625 -2.03437,0.24375 l -0.71563,0.075 c -54.14979,3.93749 -135.927597,4.47498 -136.746347,4.47811 l -0.07189,0.003 -0.0719,-0.003 c -0.81875,-0.003 -82.59655,-0.54062 -137.233842,-4.4781 l -0.721873,-0.075 c -0.581218,-0.0781 -1.22184,-0.15003 -1.918712,-0.23128 -8.881216,-1.02499 -27.362396,-3.15936 -43.887326,-21.33741 -13.57808,-14.7562 -17.50306,-43.45296 -17.90618,-46.67795 l -0.0469,-0.41875 c -0.12187,-1.37187 -3.01249,-34.031118 -3.01249,-66.818486 v -30.64988 c 0,-32.78738 2.89062,-65.44662 3.01249,-66.82162 l 0.0219,-0.20624 c 0.34687,-3.24374 3.79686,-32.031134 17.98743,-46.952954 15.49369,-16.95618 35.08423,-19.19992 45.621694,-20.40617 1.665619,-0.19063 3.099988,-0.35312 4.078109,-0.525 l 0.946872,-0.13124 c 31.265508,-2.975 129.293238,-4.44061 133.449478,-4.49999 l 0.125,-0.003 0.125,0.003 c 0.81875,0.003 82.593427,0.54063 136.743217,4.47811 l 0.71562,0.075 c 0.68437,0.0906 1.45312,0.17188 2.29687,0.25938 8.83121,0.93749 27.21239,2.88436 43.5092,20.81554 13.57807,14.75932 17.50619,43.456084 17.90618,46.677944 l 0.0469,0.41874 c 0.12188,1.375 3.01562,34.03112 3.01562,66.8185 v 30.64988 c -0.003,32.787408 -2.89375,65.443536 -3.01563,66.818526 z M 227.99362,-3.021936 c 0,-30.34675 -2.65,-61.59976 -2.9,-64.4685 -1.01874,-7.90309 -5.15936,-26.05928 -11.77495,-33.249874 -10.19996,-11.22183 -20.67804,-12.33433 -28.32801,-13.1437 -0.925,-0.0969 -1.78125,-0.19063 -2.55624,-0.2875 -52.3748,-3.78749 -131.065117,-4.36873 -134.690107,-4.39061 -4.06561,0.0594 -100.65898,1.53749 -130.97136,4.35311 -1.553118,0.25313 -3.231236,0.44688 -4.99998,0.64688 -8.97184,1.02811 -21.253043,2.43437 -30.696753,12.82182 l -0.22188,0.2375 c -6.49997,6.771854 -10.52183,23.749914 -11.5437,32.918614 -0.19063,2.16875 -2.90937,33.79051 -2.90937,64.56226 v 30.64988 c 0,30.312376 2.64374,61.531006 2.89999,64.459126 1.21562,9.30934 5.43436,26.36552 11.77496,33.25924 10.51246,11.56246 21.596789,12.8437 28.928009,13.69058 0.699998,0.0812 1.353121,0.15624 1.956244,0.23437 53.13729,3.80623 132.39323,4.37186 135.23697,4.39373 2.84374,-0.0187 82.071557,-0.5875 134.736977,-4.39373 0.64688,-0.0812 1.35312,-0.1625 2.11249,-0.25 7.54059,-0.85937 18.93743,-2.15937 29.39676,-13.31557 l 0.0969,-0.10313 c 6.49997,-6.77185 10.52183,-24.04678 11.5437,-33.39987 0.18125,-2.04686 2.90937,-33.73737 2.90937,-64.574746 z m 0,0" + id="path24" /> \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/chats.svg b/retroshare-gui/src/gui/icons/svg/chats.svg new file mode 100644 index 000000000..fd8763804 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/chats.svg @@ -0,0 +1,64 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/fileshare.svg b/retroshare-gui/src/gui/icons/svg/fileshare.svg new file mode 100644 index 000000000..bc10e769d --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/fileshare.svg @@ -0,0 +1,105 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/forum.svg b/retroshare-gui/src/gui/icons/svg/forum.svg new file mode 100644 index 000000000..38b647f4f --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/forum.svg @@ -0,0 +1,54 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/message.svg b/retroshare-gui/src/gui/icons/svg/message.svg new file mode 100644 index 000000000..81fcd8254 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/message.svg @@ -0,0 +1,69 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/newsfeed2.svg b/retroshare-gui/src/gui/icons/svg/newsfeed2.svg new file mode 100644 index 000000000..dc0bc96ea --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/newsfeed2.svg @@ -0,0 +1,69 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/people.svg b/retroshare-gui/src/gui/icons/svg/people.svg index 3ea6a2e19..5afff47a8 100644 --- a/retroshare-gui/src/gui/icons/svg/people.svg +++ b/retroshare-gui/src/gui/icons/svg/people.svg @@ -11,7 +11,7 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg4155" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.3 (2405546, 2018-03-11)" xml:space="preserve" width="80" height="80" @@ -19,7 +19,7 @@ sodipodi:docname="people.svg">image/svg+xml \ No newline at end of file + d="m 48.355,17.922 c 3.705,2.323 6.303,6.254 6.776,10.817 1.511,0.706 3.188,1.112 4.966,1.112 6.491,0 11.752,-5.261 11.752,-11.751 0,-6.491 -5.261,-11.752 -11.752,-11.752 -6.429,0.002 -11.644,5.169 -11.742,11.574 z m -7.699,24.062 c 6.491,0 11.752,-5.262 11.752,-11.752 0,-6.49 -5.262,-11.751 -11.752,-11.751 -6.49,0 -11.754,5.262 -11.754,11.752 0,6.49 5.264,11.751 11.754,11.751 z m 4.985,0.801 h -9.972 c -8.297,0 -15.047,6.751 -15.047,15.048 v 12.195 l 0.031,0.191 0.84,0.263 c 7.918,2.474 14.797,3.299 20.459,3.299 11.059,0 17.469,-3.153 17.864,-3.354 l 0.785,-0.397 h 0.084 V 57.833 C 60.688,49.536 53.938,42.785 45.641,42.785 Z M 65.084,30.653 h -9.895 c -0.107,3.959 -1.797,7.524 -4.47,10.088 7.375,2.193 12.771,9.032 12.771,17.11 v 3.758 c 9.77,-0.358 15.4,-3.127 15.771,-3.313 l 0.785,-0.398 H 80.13 V 45.699 c 0,-8.296 -6.75,-15.046 -15.046,-15.046 z m -45.049,-0.8 c 2.299,0 4.438,-0.671 6.25,-1.814 0.576,-3.757 2.59,-7.04 5.467,-9.276 0.012,-0.22 0.033,-0.438 0.033,-0.66 0,-6.491 -5.262,-11.752 -11.75,-11.752 -6.492,0 -11.752,5.261 -11.752,11.752 0,6.488 5.26,11.75 11.752,11.75 z M 30.589,40.741 C 27.929,38.19 26.245,34.644 26.122,30.709 25.755,30.682 25.392,30.653 25.018,30.653 H 15.047 C 6.75,30.653 0,37.403 0,45.699 v 12.197 l 0.031,0.188 0.84,0.265 c 6.352,1.983 12.021,2.897 16.945,3.185 v -3.683 c 0.002,-8.078 5.396,-14.915 12.773,-17.11 z" + id="path2" + style="fill:#f9f9f9" /> \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/people2.svg b/retroshare-gui/src/gui/icons/svg/people2.svg new file mode 100644 index 000000000..06badb8a1 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/people2.svg @@ -0,0 +1,56 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/icons/svg/postedlinks.svg b/retroshare-gui/src/gui/icons/svg/postedlinks.svg new file mode 100644 index 000000000..e509c7e32 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/postedlinks.svg @@ -0,0 +1,74 @@ + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.ui b/retroshare-gui/src/gui/msgs/MessagesDialog.ui index 134621e7e..8c830e042 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.ui +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.ui @@ -324,7 +324,7 @@ - :/icons/png/messages.png + :/icons/png/message.png true