diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 9ca80dea4..933e30168 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -75,7 +75,7 @@
#define IMAGE_COLLOPEN ":/icons/collections.png"
#define IMAGE_EDITSHARE ":/icons/png/pencil-edit-button.png"
#define IMAGE_MYFILES ":/icons/svg/folders1.svg"
-#define IMAGE_UNSHAREEXTRA ":/images/button_cancel.png"
+#define IMAGE_UNSHAREEXTRA ":/icons/cancel.svg"
/*define viewType_CB value */
#define VIEW_TYPE_TREE 0
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index c40bb0931..0f657a577 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -2260,7 +2260,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
if(n_is_not_a_contact == 0)
- contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"), tr("Remove from Contacts"), this, SLOT(removefromContacts()));
+ contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"), tr("Remove from Contacts"), this, SLOT(removefromContacts()));
contextMenu->addSeparator();
@@ -2279,8 +2279,8 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
contextMenu->addSeparator();
contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
- contextMenu->addAction(ui->editIdentity);
- contextMenu->addAction(ui->removeIdentity);
+ contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EDIT),tr("Edit identity"),this,SLOT(editIdentity())) ;
+ contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"),tr("Delete identity"),this,SLOT(removeIdentity())) ;
}
}
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index 8e40da52b..f18ddbc87 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -302,7 +302,7 @@
0
0
634
- 523
+ 538
@@ -1091,10 +1091,6 @@ border-image: url(:/images/closepressed.png)
-
-
- :/images/edit_16.png:/images/edit_16.png
-
Edit identity
@@ -1103,19 +1099,11 @@ border-image: url(:/images/closepressed.png)
-
-
- :/images/delete.png:/images/delete.png
-
Delete identity
-
-
- :/images/toaster/chat.png:/images/toaster/chat.png
-
Chat with this peer
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 207fc5130..8d323524e 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -141,7 +141,6 @@
#define IMAGE_OVERLAY ":/icons/star_overlay_128.png"
#define IMAGE_BWGRAPH ":/icons/png/bandwidth.png"
-#define IMAGE_MESSENGER ":/images/rsmessenger48.png"
#define IMAGE_COLOR ":/images/highlight.png"
#define IMAGE_NEWRSCOLLECTION ":/images/library.png"
#define IMAGE_ADDSHARE ":/images/directoryadd_24x24_shadow.png"
@@ -625,7 +624,7 @@ void MainWindow::createTrayIcon()
trayMenu->addSeparator();
#ifdef MESSENGER_WINDOW
- trayMenu->addAction(QIcon(IMAGE_MESSENGER), tr("Open Messenger"), this, SLOT(showMessengerWindow()));
+ trayMenu->addAction(QIcon(), tr("Open Messenger"), this, SLOT(showMessengerWindow()));
#endif
trayMenu->addAction(QIcon(IMAGE_MESSAGES), tr("Open Messages"), this, SLOT(showMess()));
#ifdef RS_JSONAPI
diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index 1b83485bc..f8740466d 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -42,7 +42,12 @@
#define IS_MESSAGE_UNREAD(flags) (flags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER))
-#define IMAGE_GROUP24 ":/images/user/group24.png"
+#define IMAGE_COWORKERS ":/icons/groups/green.svg"
+#define IMAGE_FRIENDS ":/icons/groups/blue.svg"
+#define IMAGE_FAMILY ":/icons/groups/purple.svg"
+#define IMAGE_FAVORITES ":/icons/groups/yellow.svg"
+#define IMAGE_OTHERCONTACTS ":/icons/groups/pink.svg"
+#define IMAGE_OTHERGROUPS ":/icons/groups/red.svg"
#define IMAGE_STAR_ON ":/images/star-on-16.png"
#define IMAGE_STAR_OFF ":/images/star-off-16.png"
@@ -497,7 +502,7 @@ QVariant RsFriendListModel::sizeHintRole(const EntryIndex& e,int col) const
y_factor *= 3.0;
if(e.type == ENTRY_TYPE_GROUP)
- y_factor = std::max(y_factor, 24.0f / 14.0f ); // allows to fit the 24 pixels icon for groups in the line
+ y_factor *= 1.5;
switch(col)
{
@@ -871,8 +876,28 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
switch(entry.type)
{
- case ENTRY_TYPE_GROUP: return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_GROUP24));
+ case ENTRY_TYPE_GROUP:
+ {
+ const HierarchicalGroupInformation *groupInfo = getGroupInfo(entry);
+ if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_FRIENDS.toStdString()) {
+ return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_FRIENDS));
+ }
+ if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_FAMILY.toStdString()) {
+ return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_FAMILY));
+ }
+ if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_COWORKERS.toStdString()) {
+ return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_COWORKERS));
+ }
+ if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_OTHERS.toStdString()) {
+ return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_OTHERCONTACTS));
+ }
+ if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_FAVORITES.toStdString()) {
+ return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_FAVORITES));
+ }
+
+ return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_OTHERGROUPS));
+ }
case ENTRY_TYPE_PROFILE:
{
if(!isProfileExpanded(entry))
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
index a2b355e06..b5b3d8264 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
@@ -53,7 +53,6 @@
#define ROLE_SORT_STATE Qt::UserRole + 4
#define ROLE_FILTER_REASON Qt::UserRole + 5
-#define IMAGE_GROUP16 ":/images/user/group16.png"
#define IMAGE_FRIENDINFO ":/images/peerdetails_16x16.png"
static bool isSelected(FriendSelectionWidget::Modus modus, QTreeWidgetItem *item)
@@ -382,12 +381,34 @@ void FriendSelectionWidget::secured_fillList()
// Add item to the list
ui->friendList->addTopLevelItem(groupItem);
+ QFontMetricsF fontMetrics(ui->friendList->font());
+ int avatarHeight = fontMetrics.height() * 1.5;
+ ui->friendList->setIconSize(QSize(avatarHeight, avatarHeight));
+
groupItem->setFlags(Qt::ItemIsUserCheckable | groupItem->flags());
groupItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
groupItem->setTextAlignment(COLUMN_NAME, Qt::AlignLeft | Qt::AlignVCenter);
- groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(IMAGE_GROUP16));
- groupItem->setData(COLUMN_DATA, ROLE_ID, QString::fromStdString(groupInfo->id.toStdString()));
+ if (groupInfo->id.toStdString() == RS_GROUP_ID_FRIENDS.toStdString()) {
+ groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/blue.svg"));
+ }
+ else if (groupInfo->id.toStdString() == RS_GROUP_ID_FAMILY.toStdString()) {
+ groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/purple.svg"));
+ }
+ else if (groupInfo->id.toStdString() == RS_GROUP_ID_COWORKERS.toStdString()) {
+ groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/green.svg"));
+ }
+ else if (groupInfo->id.toStdString() == RS_GROUP_ID_OTHERS.toStdString()) {
+ groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/pink.svg"));
+ }
+ else if (groupInfo->id.toStdString() == RS_GROUP_ID_FAVORITES.toStdString()) {
+ groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/yellow.svg"));
+ }
+ else {
+ groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/red.svg"));
+ }
+
+ groupItem->setData(COLUMN_DATA, ROLE_ID, QString::fromStdString(groupInfo->id.toStdString()));
groupItem->setExpanded(true);
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
index d3682f014..065c9013b 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
@@ -38,6 +38,11 @@
0
+
+
+ 11
+
+
Qt::CustomContextMenu
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 37b1511f8..1b2d513f4 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -68,15 +68,13 @@
#define IMAGE_MSG ":/icons/mail/write-mail.png"
#define IMAGE_CONNECT ":/images/connect_friend.png"
#define IMAGE_COPYLINK ":/images/copyrslink.png"
-#define IMAGE_GROUP16 ":/images/user/group16.png"
+#define IMAGE_GROUPS ":/icons/groups/colored.svg"
#define IMAGE_EDIT ":/icons/png/pencil-edit-button.png"
-#define IMAGE_REMOVE ":/images/delete.png"
-#define IMAGE_EXPAND ":/images/edit_add24.png"
-#define IMAGE_COLLAPSE ":/images/edit_remove24.png"
+#define IMAGE_REMOVE ":/icons/cancel.svg"
+#define IMAGE_ADD ":/icons/png/add.png"
/* Images for Status icons */
#define IMAGE_AVAILABLE ":/images/user/identityavaiblecyan24.png"
#define IMAGE_PASTELINK ":/images/pasterslink.png"
-#define IMAGE_GROUP24 ":/images/user/group24.png"
#define COLUMN_DATA 0 // column for storing the userdata id
@@ -687,8 +685,8 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
}
}
- QMenu *groupsMenu = contextMenu.addMenu(FilesDefs::getIconFromQtResourcePath(IMAGE_GROUP16), tr("Groups"));
- groupsMenu->addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EXPAND), tr("Create new group"), this, SLOT(createNewGroup()));
+ QMenu *groupsMenu = contextMenu.addMenu(FilesDefs::getIconFromQtResourcePath(IMAGE_GROUPS), tr("Groups"));
+ groupsMenu->addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_ADD), tr("Create new group"), this, SLOT(createNewGroup()));
if (addToGroupMenu || moveToGroupMenu || foundGroup) {
if (addToGroupMenu) {
@@ -763,8 +761,8 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
if (RSLinkClipboard::empty(RetroShareLink::TYPE_CERTIFICATE))
action->setDisabled(true);
- contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EXPAND), tr("Expand all"), ui->peerTreeWidget, SLOT(expandAll()));
- contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COLLAPSE), tr("Collapse all"), ui->peerTreeWidget, SLOT(collapseAll()));
+ contextMenu.addAction(QIcon(""), tr("Expand all"), ui->peerTreeWidget, SLOT(expandAll()));
+ contextMenu.addAction(QIcon(""), tr("Collapse all"), ui->peerTreeWidget, SLOT(collapseAll()));
contextMenu.addSeparator();
diff --git a/retroshare-gui/src/gui/common/RSTreeWidget.cpp b/retroshare-gui/src/gui/common/RSTreeWidget.cpp
index 9c91c5f2e..7e3a8b216 100644
--- a/retroshare-gui/src/gui/common/RSTreeWidget.cpp
+++ b/retroshare-gui/src/gui/common/RSTreeWidget.cpp
@@ -264,7 +264,7 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
QLabel *iconLabel = new QLabel(widget);
iconLabel->setObjectName("trans_Icon");
- QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/settings.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
+ QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/options2.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
iconLabel->setPixmap(pix);
iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
hbox->addWidget(iconLabel);
@@ -273,7 +273,7 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
textLabel->setObjectName("trans_Text");
hbox->addWidget(textLabel);
- QSpacerItem *spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+ QSpacerItem *spacerItem = new QSpacerItem(40, 24, QSizePolicy::Expanding, QSizePolicy::Minimum);
hbox->addItem(spacerItem);
widget->setLayout(hbox);
diff --git a/retroshare-gui/src/gui/groups/CreateGroup.cpp b/retroshare-gui/src/gui/groups/CreateGroup.cpp
index 91380f98b..2a3defc9c 100644
--- a/retroshare-gui/src/gui/groups/CreateGroup.cpp
+++ b/retroshare-gui/src/gui/groups/CreateGroup.cpp
@@ -41,7 +41,7 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent)
mIsStandard = false;
- ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/add_group256.png"));
+ ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/groups/colored.svg"));
mGroupId = groupId;
@@ -69,7 +69,7 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent)
}
setWindowTitle(tr("Edit Group"));
- ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/edit_group64.png"));
+ ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/groups/colored.svg"));
ui.headerFrame->setHeaderText(tr("Edit Group"));
ui.groupName->setDisabled(mIsStandard);
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 963b3a8ad..425b87faf 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -42,13 +42,11 @@
/* Images for TreeWidget */
#define IMAGE_SUBSCRIBE ":/images/edit_add24.png"
-#define IMAGE_UNSUBSCRIBE ":/images/cancel.png"
+#define IMAGE_UNSUBSCRIBE ":/icons/cancel.svg"
#define IMAGE_INFO ":/images/info16.png"
-//#define IMAGE_GROUPAUTHD ":/images/konv_message2.png"
#define IMAGE_COPYLINK ":/images/copyrslink.png"
#define IMAGE_EDIT ":/icons/png/pencil-edit-button.png"
-#define IMAGE_SHARE ":/images/share-icon-16.png"
-#define IMAGE_TABNEW ":/images/tab-new.png"
+#define IMAGE_TABNEW ":/icons/newtab.svg"
#define IMAGE_DELETE ":/images/delete.png"
#define IMAGE_RETRIEVE ":/images/edit_add24.png"
#define IMAGE_COMMENT ""
@@ -490,7 +488,7 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point)
ctxMenu2->setEnabled(isSubscribed);
if (shareKeyType()) {
- action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_SHARE), tr("Share publish permissions..."), this, SLOT(sharePublishKey()));
+ action = contextMnu.addAction(QIcon(""), tr("Share publish permissions..."), this, SLOT(sharePublishKey()));
action->setEnabled(!mGroupId.isNull() && isPublisher);
}
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 89c0f83d9..33560031a 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -342,5 +342,16 @@
icons/wire-circle.png
icons/folder-account.svg
icons/notification.svg
+ icons/groups/blue.svg
+ icons/groups/colored.svg
+ icons/groups/green.svg
+ icons/groups/indigo.svg
+ icons/groups/pink.svg
+ icons/groups/purple.svg
+ icons/groups/red.svg
+ icons/groups/yellow.svg
+ icons/newtab.svg
+ icons/newwindow.svg
+ icons/cancel.svg
diff --git a/retroshare-gui/src/gui/icons/account-convert.svg b/retroshare-gui/src/gui/icons/account-convert.svg
new file mode 100644
index 000000000..1e5609fad
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/account-convert.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/account-plus.svg b/retroshare-gui/src/gui/icons/account-plus.svg
new file mode 100644
index 000000000..cf743afad
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/account-plus.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/cancel.svg b/retroshare-gui/src/gui/icons/cancel.svg
new file mode 100644
index 000000000..bb921b5fa
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/cancel.svg
@@ -0,0 +1,38 @@
+
+
diff --git a/retroshare-gui/src/gui/icons/groups/blue.svg b/retroshare-gui/src/gui/icons/groups/blue.svg
new file mode 100644
index 000000000..ee0b3786f
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/blue.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/retroshare-gui/src/gui/icons/groups/colored.svg b/retroshare-gui/src/gui/icons/groups/colored.svg
new file mode 100644
index 000000000..8483f270f
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/colored.svg
@@ -0,0 +1,73 @@
+
+
+
+
diff --git a/retroshare-gui/src/gui/icons/groups/green.svg b/retroshare-gui/src/gui/icons/groups/green.svg
new file mode 100644
index 000000000..3ca8e3074
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/green.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/retroshare-gui/src/gui/icons/groups/indigo.svg b/retroshare-gui/src/gui/icons/groups/indigo.svg
new file mode 100644
index 000000000..56efae8d7
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/indigo.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/retroshare-gui/src/gui/icons/groups/pink.svg b/retroshare-gui/src/gui/icons/groups/pink.svg
new file mode 100644
index 000000000..e8b72e1df
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/pink.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/retroshare-gui/src/gui/icons/groups/purple.svg b/retroshare-gui/src/gui/icons/groups/purple.svg
new file mode 100644
index 000000000..f4d78db5b
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/purple.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/retroshare-gui/src/gui/icons/groups/red.svg b/retroshare-gui/src/gui/icons/groups/red.svg
new file mode 100644
index 000000000..07b706a28
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/red.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/retroshare-gui/src/gui/icons/groups/yellow.svg b/retroshare-gui/src/gui/icons/groups/yellow.svg
new file mode 100644
index 000000000..06982a820
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/yellow.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/retroshare-gui/src/gui/icons/newtab.svg b/retroshare-gui/src/gui/icons/newtab.svg
new file mode 100644
index 000000000..5e7c4316b
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/newtab.svg
@@ -0,0 +1,38 @@
+
+
diff --git a/retroshare-gui/src/gui/icons/newwindow.svg b/retroshare-gui/src/gui/icons/newwindow.svg
new file mode 100644
index 000000000..dd9e408cb
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/newwindow.svg
@@ -0,0 +1,38 @@
+
+
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 4dc8177bd..468a0177d 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -22,10 +22,6 @@
images/streaming.png
images/white-bubble-64.png
images/orange-bubble-64.png
- images/stock_signature_bad.png
- images/stock_signature_ok.png
- images/stock_signature_missing.png
- images/stock_signature_unverified.png
images/anonymous_128_blue.png
images/browsable_128_green.png
images/browsable_128_blue.png
@@ -107,7 +103,6 @@
images/graph-checking.png
images/graph-blue.png
images/avatar_background.png
- images/button_cancel.png
images/chat.png
images/cancel.png
images/close-down.png
@@ -295,9 +290,6 @@
images/sort_incr.png
images/sort_decrease.png
images/sound.png
- images/tab-dock.png
- images/tab-undock.png
- images/tab-new.png
images/transferupdown.png
images/tools_wizard.png
images/uploads.png
@@ -356,11 +348,6 @@
images/up1down0.png
images/underconstruction.png
images/user.png
- images/view_calendar_day.png
- images/view_calendar_week.png
- images/view_calendar_month.png
- images/view_calendar_list.png
- images/view_split_top_bottom.png
qss/chat/standard/private/info.xml
qss/chat/standard/private/incoming.htm
qss/chat/standard/private/outgoing.htm
@@ -427,11 +414,9 @@
images/tags/dev-translator.png
images/tags/dev-patcher.png
images/tags/developer.png
- images/share-icon-16.png
images/toasterEnable.png
images/toasterDisable.png
images/emblem-web.png
- images/rsmessenger48.png
images/SmileyText.png
images/SimpleText.png
images/ColoredText.png
diff --git a/retroshare-gui/src/gui/images/button_cancel.png b/retroshare-gui/src/gui/images/button_cancel.png
deleted file mode 100644
index 3f0c98b7d..000000000
Binary files a/retroshare-gui/src/gui/images/button_cancel.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/rsmessenger48.png b/retroshare-gui/src/gui/images/rsmessenger48.png
deleted file mode 100644
index f01ab76b4..000000000
Binary files a/retroshare-gui/src/gui/images/rsmessenger48.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/share-icon-16.png b/retroshare-gui/src/gui/images/share-icon-16.png
deleted file mode 100644
index a5de1924f..000000000
Binary files a/retroshare-gui/src/gui/images/share-icon-16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/share-icon-24.png b/retroshare-gui/src/gui/images/share-icon-24.png
deleted file mode 100644
index 09eee141f..000000000
Binary files a/retroshare-gui/src/gui/images/share-icon-24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/share-icon-32.png b/retroshare-gui/src/gui/images/share-icon-32.png
deleted file mode 100644
index 80fd96250..000000000
Binary files a/retroshare-gui/src/gui/images/share-icon-32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/stock_signature_bad.png b/retroshare-gui/src/gui/images/stock_signature_bad.png
deleted file mode 100644
index c8de64f7a..000000000
Binary files a/retroshare-gui/src/gui/images/stock_signature_bad.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/stock_signature_missing.png b/retroshare-gui/src/gui/images/stock_signature_missing.png
deleted file mode 100644
index 66c03a4e6..000000000
Binary files a/retroshare-gui/src/gui/images/stock_signature_missing.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/stock_signature_ok.png b/retroshare-gui/src/gui/images/stock_signature_ok.png
deleted file mode 100644
index 454421ad1..000000000
Binary files a/retroshare-gui/src/gui/images/stock_signature_ok.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/stock_signature_unverified.png b/retroshare-gui/src/gui/images/stock_signature_unverified.png
deleted file mode 100644
index aae661fa6..000000000
Binary files a/retroshare-gui/src/gui/images/stock_signature_unverified.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/tab-dock.png b/retroshare-gui/src/gui/images/tab-dock.png
deleted file mode 100644
index ba059de40..000000000
Binary files a/retroshare-gui/src/gui/images/tab-dock.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/tab-new.png b/retroshare-gui/src/gui/images/tab-new.png
deleted file mode 100644
index 3bbbb51c1..000000000
Binary files a/retroshare-gui/src/gui/images/tab-new.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/tab-undock.png b/retroshare-gui/src/gui/images/tab-undock.png
deleted file mode 100644
index f2827606c..000000000
Binary files a/retroshare-gui/src/gui/images/tab-undock.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/view_calendar_day.png b/retroshare-gui/src/gui/images/view_calendar_day.png
deleted file mode 100644
index a32fbb723..000000000
Binary files a/retroshare-gui/src/gui/images/view_calendar_day.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/view_calendar_list.png b/retroshare-gui/src/gui/images/view_calendar_list.png
deleted file mode 100644
index f41b620b3..000000000
Binary files a/retroshare-gui/src/gui/images/view_calendar_list.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/view_calendar_month.png b/retroshare-gui/src/gui/images/view_calendar_month.png
deleted file mode 100644
index e90194dcc..000000000
Binary files a/retroshare-gui/src/gui/images/view_calendar_month.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/view_calendar_week.png b/retroshare-gui/src/gui/images/view_calendar_week.png
deleted file mode 100644
index eb12f42d8..000000000
Binary files a/retroshare-gui/src/gui/images/view_calendar_week.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/view_split_top_bottom.png b/retroshare-gui/src/gui/images/view_split_top_bottom.png
deleted file mode 100644
index 8c0e4db56..000000000
Binary files a/retroshare-gui/src/gui/images/view_split_top_bottom.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 5196764a3..4ecdf67ad 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -544,8 +544,8 @@ QVariant RsMessageModel::decorationRole(const Rs::Msgs::MsgInfoSummary& fmpe,int
case COLUMN_THREAD_SUBJECT:
{
if(fmpe.msgflags & RS_MSG_NEW ) return FilesDefs::getIconFromQtResourcePath(":/images/message-state-new.png");
- if(fmpe.msgflags & RS_MSG_USER_REQUEST) return FilesDefs::getIconFromQtResourcePath(":/images/user/user_request16.png");
- if(fmpe.msgflags & RS_MSG_FRIEND_RECOMMENDATION) return FilesDefs::getIconFromQtResourcePath(":/images/user/friend_suggestion16.png");
+ if(fmpe.msgflags & RS_MSG_USER_REQUEST) return FilesDefs::getIconFromQtResourcePath(":/images/user/user_request48.png");
+ if(fmpe.msgflags & RS_MSG_FRIEND_RECOMMENDATION) return FilesDefs::getIconFromQtResourcePath(":/images/user/invite24.png");
if(fmpe.msgflags & RS_MSG_PUBLISH_KEY) return FilesDefs::getIconFromQtResourcePath(":/images/share-icon-16.png");
if(fmpe.msgflags & RS_MSG_UNREAD_BY_USER)
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index b2beba606..480959bb8 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -663,13 +663,13 @@ void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/)
QMenu contextMnu( this );
- QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/view_split_top_bottom.png"), tr("Open in a new window"), this, SLOT(openAsWindow()));
+ QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/newwindow.svg"), tr("Open in a new window"), this, SLOT(openAsWindow()));
if (nCount != 1) {
action->setDisabled(true);
}
- action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/tab-dock.png"), tr("Open in a new tab"), this, SLOT(openAsTab()));
+ action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/newtab.svg"), tr("Open in a new tab"), this, SLOT(openAsTab()));
if (nCount != 1) {
action->setDisabled(true);
}