From dc0cddae7e54195f0a412c9938d08eb0f981903f Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 12 Feb 2022 00:07:23 +0100 Subject: [PATCH] removed clean up old icons, replaced some by svg --- .../gui/FileTransfer/SharedFilesDialog.cpp | 2 +- retroshare-gui/src/gui/Identity/IdDialog.cpp | 6 +- retroshare-gui/src/gui/Identity/IdDialog.ui | 14 +--- retroshare-gui/src/gui/MainWindow.cpp | 3 +- .../src/gui/common/FriendListModel.cpp | 31 +++++++- .../src/gui/common/FriendSelectionWidget.cpp | 27 ++++++- .../src/gui/common/FriendSelectionWidget.ui | 5 ++ .../src/gui/common/NewFriendList.cpp | 16 ++-- .../src/gui/common/RSTreeWidget.cpp | 4 +- retroshare-gui/src/gui/groups/CreateGroup.cpp | 4 +- .../src/gui/gxs/GxsGroupFrameDialog.cpp | 8 +- retroshare-gui/src/gui/icons.qrc | 11 +++ .../src/gui/icons/account-convert.svg | 1 + retroshare-gui/src/gui/icons/account-plus.svg | 1 + retroshare-gui/src/gui/icons/cancel.svg | 38 +++++++++ retroshare-gui/src/gui/icons/groups/blue.svg | 53 +++++++++++++ .../src/gui/icons/groups/colored.svg | 73 ++++++++++++++++++ retroshare-gui/src/gui/icons/groups/green.svg | 53 +++++++++++++ .../src/gui/icons/groups/indigo.svg | 53 +++++++++++++ retroshare-gui/src/gui/icons/groups/pink.svg | 53 +++++++++++++ .../src/gui/icons/groups/purple.svg | 53 +++++++++++++ retroshare-gui/src/gui/icons/groups/red.svg | 53 +++++++++++++ .../src/gui/icons/groups/yellow.svg | 53 +++++++++++++ retroshare-gui/src/gui/icons/newtab.svg | 38 +++++++++ retroshare-gui/src/gui/icons/newwindow.svg | 38 +++++++++ retroshare-gui/src/gui/images.qrc | 15 ---- .../src/gui/images/button_cancel.png | Bin 1518 -> 0 bytes .../src/gui/images/rsmessenger48.png | Bin 4171 -> 0 bytes .../src/gui/images/share-icon-16.png | Bin 691 -> 0 bytes .../src/gui/images/share-icon-24.png | Bin 1379 -> 0 bytes .../src/gui/images/share-icon-32.png | Bin 1270 -> 0 bytes .../src/gui/images/stock_signature_bad.png | Bin 2094 -> 0 bytes .../gui/images/stock_signature_missing.png | Bin 2021 -> 0 bytes .../src/gui/images/stock_signature_ok.png | Bin 1877 -> 0 bytes .../gui/images/stock_signature_unverified.png | Bin 2001 -> 0 bytes retroshare-gui/src/gui/images/tab-dock.png | Bin 265 -> 0 bytes retroshare-gui/src/gui/images/tab-new.png | Bin 435 -> 0 bytes retroshare-gui/src/gui/images/tab-undock.png | Bin 319 -> 0 bytes .../src/gui/images/view_calendar_day.png | Bin 696 -> 0 bytes .../src/gui/images/view_calendar_list.png | Bin 662 -> 0 bytes .../src/gui/images/view_calendar_month.png | Bin 652 -> 0 bytes .../src/gui/images/view_calendar_week.png | Bin 677 -> 0 bytes .../src/gui/images/view_split_top_bottom.png | Bin 422 -> 0 bytes retroshare-gui/src/gui/msgs/MessageModel.cpp | 4 +- .../src/gui/msgs/MessagesDialog.cpp | 4 +- 45 files changed, 652 insertions(+), 62 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/account-convert.svg create mode 100644 retroshare-gui/src/gui/icons/account-plus.svg create mode 100644 retroshare-gui/src/gui/icons/cancel.svg create mode 100644 retroshare-gui/src/gui/icons/groups/blue.svg create mode 100644 retroshare-gui/src/gui/icons/groups/colored.svg create mode 100644 retroshare-gui/src/gui/icons/groups/green.svg create mode 100644 retroshare-gui/src/gui/icons/groups/indigo.svg create mode 100644 retroshare-gui/src/gui/icons/groups/pink.svg create mode 100644 retroshare-gui/src/gui/icons/groups/purple.svg create mode 100644 retroshare-gui/src/gui/icons/groups/red.svg create mode 100644 retroshare-gui/src/gui/icons/groups/yellow.svg create mode 100644 retroshare-gui/src/gui/icons/newtab.svg create mode 100644 retroshare-gui/src/gui/icons/newwindow.svg delete mode 100644 retroshare-gui/src/gui/images/button_cancel.png delete mode 100644 retroshare-gui/src/gui/images/rsmessenger48.png delete mode 100644 retroshare-gui/src/gui/images/share-icon-16.png delete mode 100644 retroshare-gui/src/gui/images/share-icon-24.png delete mode 100644 retroshare-gui/src/gui/images/share-icon-32.png delete mode 100644 retroshare-gui/src/gui/images/stock_signature_bad.png delete mode 100644 retroshare-gui/src/gui/images/stock_signature_missing.png delete mode 100644 retroshare-gui/src/gui/images/stock_signature_ok.png delete mode 100644 retroshare-gui/src/gui/images/stock_signature_unverified.png delete mode 100644 retroshare-gui/src/gui/images/tab-dock.png delete mode 100644 retroshare-gui/src/gui/images/tab-new.png delete mode 100644 retroshare-gui/src/gui/images/tab-undock.png delete mode 100644 retroshare-gui/src/gui/images/view_calendar_day.png delete mode 100644 retroshare-gui/src/gui/images/view_calendar_list.png delete mode 100644 retroshare-gui/src/gui/images/view_calendar_month.png delete mode 100644 retroshare-gui/src/gui/images/view_calendar_week.png delete mode 100644 retroshare-gui/src/gui/images/view_split_top_bottom.png 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 3f0c98b7d98da3ca38d36f581de0fed5d55b5f95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1518 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 Z1^}|Y?mox^I4b}E002ovPDHLkV1nNgH*Wv{ 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 09eee141f0e8b56e0a11ecfdddbab06a23c79297..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1379 zcmV-p1)TbcP)V6h7zP-ckhQvtP8dR7#5z=LXp@E}5G@3`E@|VjQ@*xDO)9+?EV7ld3UssFVHJ zM$DE>&3-P+Ha47baWm0OojBvi1Qi9ff*_W*R4AYAeRtk_OECk7F?(-s`+nT_ea>^9 zbIvV7tXXRox*4DefYAumkAQ$8f`A&3M1D)4rC&s0avSw&M^pxZUo;TawR%hT3=#&!*`z-aq%ru@*G0%@ap^Mz=Z2javgg zL7XJ;L@l;ALoY|Wn*BRXPUFX@f5jn<+#afTzhkTIx<+OQlNKuE|J9$GUA%OpI5hGKR66U~$B^9U3$i_EE_X_Uogo6S*Y)1w!p`movKe--*#heqmxCw>5E^~} zyASV!Z~puaM9_fQ0l)#w3rrrguF01MZVV_4`tEQBFexI&y!vn-$t~*uM6jt?oIc!?`24p0q z#R2~4Xu;PHyvub0gJlxH=)oKU2r2;fI{!UXWuz-AN9dN7*hUl;3NN{qzz55!VV>R& zEdBA0{P{2An~0jt3o;F3H!XG8h>ZkjIM4;Djy9K14@GF1tT;A6oBS!58Pf zKr0NJE;q9?-m`G2rxi?djc86WGH13(EETu``T#E4k-!AFfbB=njhbT;K%^+5FkNP z8RQgE6y>gSO8r+u^{zKwr zU++Q7t9B`LYnTA+byT??qf|4pd=Bhe)d)|U7RG0PX+I3xe&0@MMioE8fCE_ESyb#+ zTBX4|V+sRNC(cl!rTw=X&xbCH`Em{wS%p|0_I z7e$ejB;w<~(PX8ZM3tzccL7g4waQSN7$yKNvYRw8l@UPq*hkjY)~y*%Z33{_Tr^7~ zlt9P$SXWc`&YS|nUNo<=ioWB0=EVGrS}8MeDLnZLGcMAEf8@ki$H1qK(!5^fFynHw zuK$!TGa8Ph{T~3@6zzcRLgzWnxXML}Uq9SZo_dg_l-$DdP|I{k5QT46m2LP2OoL)~pjl16=+sG63e-<#9o$ z)}dib4PGkW1xb_^%$u6E!|+Ba5;XB(xp_xH2!Lz?80nQUm$Xo5Z{4z+)3ZWW2`Yk9 z!9#soa=d3tE%uhz!Y3NWaWisKv*rPme^>$2_z=$#7J-blA_hYNjP`p0nDZIeEUMO5 zpt`h@Kc6;s;&A6N)Ra|`^WA>Ozl`*vsr3-f7`srox&V*g^9XFyHXQ%84P!P7)Krda zCIeWN7Yg9PM2ro30i0CNuWoI?i<@f}-G-jgUL0(F4_!m&pp~>dLTqb16l>CaDm|57 z126}Wo=pHJLjYVg%Um+;4m(EQ>J936aKemz#}A@=_($lNV{#-!pxq2$WmXt~@nIQ? zpwM0#aH6gy=pTLX{U^M|OL4T)$PWz$kh&%ez{C}=jIsz^X$&5L?*>j||JO~h*eAHu zvd~8aKnKz-tHS_TN4)#Ta^RKw8}QtQ#dF|9UmM=}_7KJd+#s4lL;3mfbFf80U+&7Ftw1AX7UssP*8QWebF zIG|-Rpb7{e<<>9&Hj5X46Vr#utX~KCio80&1gO5W7SEU6&;gUx41<2Y4m^6K0%q%+ z4iG?cS}1@A5;1x020$naRKmKF8tg9F#aH@Yvpem$_oGru*mw@GYy|;)vj~8J0RFkI zLgG`o{b5RLj$dQ^)app*ATDfOA@j&U-)3G(1~lVXV5WW+$xuvjbya^ld`GwLDo+i#cge-q|8Zq9K+M zP+YRf^5vx+id!}!;KhU~h@M&og8@H~V`A)(uu&VKW<|iOnGYhK8hbgs*)L}P08n#M gn`X`tLq`$YzW_3pKZNYoo&W#<07*qoM6N<$f)?>l9smFU 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 c8de64f7ac1b48486601431f0ba9766bbe439d46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2094 zcmV+}2+{Y6P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*t+ z4FCsA+J83y00*u~L_t(o!^N0sa8>0Q$Ny)&+d21~a~FbyuuG6=fr-E%TZSMGAYhGE zJ9P%z;s>n5U=>?iv@Lvqf(FQP2~;<-{(2M^Stl-{Qu_&xNGCB9!|qG&l^yOU%7PkYD2i<0O;BQcykan$60hH&L^Kpk@ebq~)J?+S-3|8>OFzC(3W#Mv{& zkju}Yrt$=!lmmg%0dQCU=`MiGpVe<<+^>fu8rXmMBBX2QQBm|YY+M2K{($pApiVw5 z-&u&clU#l8TQqKB4;;)ZMrm;|>~9aDy5=;X#Q?@bK$#UmZDi#g1bM9|d}eyea|w>} ziYgpGc@cI|9;zyi0gBWJfgV6< z2!}ntky6}T0;367OwuiWsH@C%csR%F{~{`Ei3N3qi9;?cgrAlQz20Mi+kRa&x(b82}&xfCI>!SZO52 z)~h5acqlTZ+>(D1ar`^o!pvKT_<1k5%uveoQ67a6?EWktk(0R)c^0$07qPfOK~h+U z02_dfVbvaVt(UV}KnN_@p_S)flx;sQYc0t5*B#u-M5RG-}@)k+gPPODxLLEA=v zM9?OJc7ft$mWjPT4l-$O|B0)(YWsOUIdcmI^>+-2NleovRttXG2+~G?HUexwz}~1U zTyEj_KbS7nhtPhPi)7CDk%2=+~ zWY!4&R=I+#68zktDb-6YOuOkyXIhxC-Q#FgnMRm0(Z^MWP?crEe|`3d1h`W!&B{8$ zg)4LEF;h8Md6b(xY7@Zq2dWbMTx|#q%PsV|K8qA#j4 zweWM3N97wYhZsNV6F%!ngjYn4Ovi^ zSvXMmJ(%dz5#)ZCi^(oe7|;jaF>!YbnEvNDso{jGlT8rKR~-V}qNyD3*C_zA+LO1v z4sF`Bp-O02;{Bq+wjEypAP{)as5q4vhs^dQmfA6Q!jli-A5Z9A+(UL=MW1>{lWsIB z2SErB(67!3PmS%1vFlH6t-;aGUXe)?`s2!`Dfh8SiyDuy(6}6hiV=01Yy|Din!=?% zJk^;H6O#I(a@|N5|EFqE8q|OQH)smy>&VS-E0)~uanvpIA-OXk#*OZU?>0|ubX2Vx z8i^oxXbw)+aToxW`0!EF29D}8AL}xg_%P;nAd(YfQT#zNxc7T%Y$M2xn#wtYEduyi zbHEA{YtA(;6I)m2L$6ekW}$yaAYvZ~qTr(xaCeKfyIzSsZYMu^>8A{;*aJXm4q9wM zO7mgcnO4hWBfuKL&-VmIS#eHc^Cpja^LK7tz?*9fp~>F0I5Zw~y16aI$8g?! zzA)AzfY~?8waOGOl{Koi-P-A;S=be_e#8U6YCv0LAY9r?@@)ipTJdt%voYkk-*9)< z)9k6^6ae!U%vH=xjyg0hx3J)czhHRr`DMwBf+&_uzCSv^x-TB%!Bvm* ziNQ_+c==ZMTb7CL>kKic^wk=j_xP%^=Si`<(D|di5dXExKrk8g^ATGOk`$SaJK$^ zVK)ODd%wity;XW-6aby0nC%^}n=UZE3+RyXEr6l8N28x8AR>t<01%IRJl+H_{9Xe5 YA9`&FUHFxB3IG5A07*qoM6N<$g0aBe+W-In 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 66c03a4e6aabcd050d7a8e24a91b570b26a6d536..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2021 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*z> z6dV9ZOVhXj00(7BL_t(o!^N0+aMjfn$3MTfWP2oe5J5s9KoSTAf&ef!7z z1zr&(BoNQco%`;ad(ZFl&bep#J%cur6_Ejy=exo<2*>g*|vG&w^j#IqC<`wzUa|!}0bHCq)klcH79joQI?Q zGBuUwz*!EDl=LB}`i(XKd23G0@NTo>2ZeI@WG?p7YgFWDaxt;+=F$70}s}B_F8fNt>0EY$P2aE=$0I`DZz!_kV;7j0;0rkxXsaxDLdDxVs zCpxnIzgNgTeV)erlfYF7>Im&0gR%gqC|d&W<=zAVIs?xGlYF#w21Wr_fJ=hEHbANq zs=gay=Gc(fnAfIHi{s42d@>H7r!nW0SB*p9?hg$e;YRUR_{#@PrT2;|+SvB8>q zSU?*cuwF3c?hw;@5a?b#d1ivksaihYbAj6P8K5l7B|RZ1778n`Vph%nzX-SHJYWrw z3tR>+0V9El7DzbYZ@DgB@H^mB13b4>O>u(p(WvJpL=E~uC?9@wg6qdJyzbx|2nqxD z04T15s=}r4kL+f9TF^l-Rxn5KwLsP=5d1-2KugBI-h13St=oM~PtV>d!*7vbf*?{j z+lz>aBJwxFn7jp^wzoJK1xbS4J}{NmItfNh4Cp@3T)p$EUR{1j0U>V*rV9oLBS?e| z5>c-R|0xA9E~ZskL0|}a3qBPzS}=`O*v@tgoN#^4np0Z7HbXA=O2JEl5dyaeiWEI& zijb*-q~|SNLEowZ%>^+)zy-l8z;R#^;0nU*v$0n_RYnmnEjde7X%0}}jS{DUEp!0= z%5N~eJpI^fY#HbkHF}Zh!EdMib15rtICKTH|Nq-7zor zd9mx`PjP7Be@MtWNdOJRQGB-}MZg81&Rbw811f-JKCZt%SvmoGP$B!`6_%J-7Km{^ z=UaOU4F^Y@?KxWK$@~@73&Sx>t&3vwnbUhWZa2FLTIV03-uCuo zeF%yd*dJIym$yp%Ot7s18hjtzU_(_sf~6?u&F^;m`N<9Q?yHHr*M+YMqD^y z1tIKdG^n%oUzE3Swiv)ENEYl8UZwS*lEE(N@NcDtGg942sq8bUu2ip1c}&0z>+DYj zmo1PQ!OGTvj20YdswefJl0gn>*L2BqKr%C>!oN#qjt*{mQ{7yA=5zK@!Mi?IywcLh zm@6prbw}P{q>~e+@_$NZmQN4`N0r9i6dW}gX%K;J?YR;j;E-SkJql?Mjgw!b5p&YTishYF#et( zR(Vgvr`uW+hP&?!8%CdTWL~l{@+VW-xap7BiuQoL9fx;rWyg`?G+^Id^lpP&cLzwg zCx|s?SUpBsUcRb3k?ivx=eD*Z@jR&H4DcB6br?kS>ddewl9Na~QBK#mF|-dep=1xH>EiglZ2r7v8`%}C21@T? z?R?;z&w9lD)S4Mj4(;Zrz(`DDh>nY=G4lg19zMgay*X^zm&?IyJ_J@ZBN&T-Q$Vt{ z9@^Yg64Av)-i9}Z>+{VEWHx3gW5+zbIXPGfJy5WdGT`OrHd9uH9xuqW^2+Syg8XU1 zz(8$%?-$DY>JzP7@{~qKA-5knz*3-B3zDSEDi_18_v?E~-|%2c=TD8%jtvX6C}p6! z1|r~JK+m@Nmo3EK&VeUm>{^gAP*W4SsGXfkAcZ!TK^Cnk->s0v z?m!gV3Hdw728QrGNsP^))@~yUh~;~h-``K1KMeUF&IO~Unj@yd00000NkvXXu0mjf DuZ5}B 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 454421ad15d80765f71173c3f2ceecb59075817f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1877 zcmV-b2demqP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*t+ z3^)kQIJ9a200z}bL_t(o!^N0;Y*XhMho5tNY{yQV3%Qh;5CXZAgj))vTto;olt6EQ z7$p_!+NztjmC`W^Y!gMSl_(`jTc#F4pcRZrbflYDfeIDWt+ZT1C|Me421y8Z;*g8u z*hy^1_WAaQL8=&|F-_o=zQ4}--t(N_?|kohzfXcv?oWuMuqeZp$T;2ft~R?p(C<2j zFr0w!lMv|FK+%1GP-CSC&~Rd{kj6a;e~+JsWVevn4A~IKTbBFaaeF!FQC!| zrtuJ#1D(oM1qO!Gl43(j^0vZ-NmSL^=(gEVo6qC+T!n~-ASxGnV!RA^cMYQ=fia9o z*s=84Y`xRf$L0D~RBJ7Lt~$_af)FG@w|57qRSI~ALkSIX*!Fopojh(-fz<)AaT zyQ_bm`I7mOx$HhvN&P7w&LVHW!g9;69qXzMH&8gWt#yH4CDEW` zrx2k@Js6Opf)qY3U7H*}u5bzHGr;cxUoR-|(Fdh8Iw&2f(&dK=MGL-r*ciw^aJ_JL zG8KPbV+zkHegX`6ARED12c~SkKJ*R;kJTIp_I36`doO6@d;4?UZQ8uNQ5@L%q7<9` z*gS}u3wks3)`RN9>j<#7d^eUp%5N>}Yj#kip#>S06;JuL=NLKT$w{29jc3J+yK(n9 zpr;BVGC23y0S=#P`4ag1tw|TH;0*+mN+FIrg6L#kTU|_YVNoO`EaL2!-+{Xaeg8M$ zchcY0%l=*4=@?)u->cmXT~OZ+dTr36P{y5v%zikLGnIdmBa-GUqtTX0pEsVYsW~W? z-4Kz^iDPZ7TC?*)tDBkJ*5bt&AvtESW$f;&=JA4TB9gMF;PmETcPQj7Sb%h+5_;=# z2eLR=agbIw`?*7(+1(!;KlU4u^w}fi}wM?P=efU&8pec zN9%+k36)e*awijLEa%GUZ#jO#%Au33eAUbzplmn~GDexhvF&?(rugFEI-v%dM9q=k zip@(+VpcN3q@@S=RS3U@dydjYlMJHry%nOV?h~5z>`y@pe>Q#E2;$t1CSmRUq-=mko+&#~1Ug_x73 z5!1)&M7Tl|Fpmci8>0<~j0A*Up&6LU1Bz5x!mE*K0y22Ou?d*|AOZdhBVDXUjC;tj P00000NkvXXu0mjfWIK7W 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 aae661fa686e42630f258886cf9ac83851bd765a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2001 zcmV;?2QK)DP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*z> z6dEqV$9eGp00&V?L_t(o!^N0;P*m3)$3J&jU>DeB71t^tAR=fG1X0lum11gC)Hu~* zL=&g6KJplw##b}RC^fa!)Wk+-OnebX6J~70w9crF^^q|WH9ip%B?<&sK?Rm&7g!#$ zzy86dLsHpYh@-!mJ7?~_=bZW6-|u(M?|ZJoW3$a+nn3M(eIK9X+Ph|Rdz0;JM0*na zPr++V%Hx4}CrAnKKQ?t?%&7Yfjg%DJp!vHKG&S4+p9wc<8~Kvzv2du>o5s!@G)iYs zQBqum+FDF=!%gtELZ7-J_}SO}2t*)8AX~sB&?-RQNJZjv4MTtp)oV!+u zm!$%m=?V^NK^G00VbG?&t#pET33wmye#mThfH4Y~x(D&rH0_{>L(eac^SySniW}E& z;kb2zM%#G^=mo}9unuma_QCkh9@!350!x8lKo3j zxlvS!!&E?{?Hlm+g1|T+4C-38!Mcl`L9&6N3hY#%N&%Y!$AE>-_ftHFc+CryYV)MI ziIE|F)#P2hLv!g3n(pU=Vg_9#_z!^^slZ|10`NZ&1r{k_f5@ztoNa*TAgyl|g_m&pEIPo1V zMfo75&X5cQzZj@#D96#bqVq_V3y4v`X`l~qNP+#XA?A34^3l^Trbi|X4dh>kZ*u=) zK2YAV==_4f5D(^7Xsp=)d&}H{2n+;{0tO%#$aL?GrZv%1pH9u3HI!4wi@Emie2|Kc zka$Z6M7sgZRk_f*$D=3rP(Q;Y2@hj2j-xkOeh!+$;At*_R zd{ywBa}TCQd7SeCW+zC0_r1r);y3&5@(-`e#+~`%Z+K5&sX(fLLGTL`A{Gkz41tNi z>#_=T@w}I_z3Uoclp0i`Iq<&;+2c)#F z+H+fCQa%&dAh1jzO(00{4;R7~2%2Pp=$UQ{bWcEhRJ_0Zw?mc$kNqXP4(3vHwhd?i zs(=#kc7Q$>EM?GqXET@%_XtFsAyMG}gwuv}yc+C;SJk%j+_*#%lXL{P=dkA=W^8Tc z9U;*@1?_;f=q#wRdhB}Vis>>x!VN5aWh}CGZnP9#+AGqMBj@>pb8a?Qv|iK zu7k)kQ@ZOB1?Fdr^2;6)+}kH0P)8rVoe`rWiH|Cw#vad>qoHK)JIKB2`@a{D%7P0J z7xwJDWS^WZ@4n(!Tw}yiauK7Z27BEds>({3{??~hY{H898E1=YNxf7-`wz+wSmP|9 zeVyCF5#UdX+b!ZDRruHOG*jv3J#f`7%;EB6?bl!juv1ow_X-!XihSHSTr zb+>`NJ;>2X&UTdo4p+ix^x%Gs8J#wfE0?W=#!aSIkOS&Y;BfeJ=~Nki|L`znHnszn z9)NVI{C+9}UKpP|z(=%UIEZ3UTq5lyySa6)kmDy!96VJ?UKx9UEk8$Cxl?{2!Twb3 zTQ^R=IIv0_?WK}`u1TNNW|cS z3D^J(ejNXFp6ai|vLYi&j_g|{Yvw0Ns1^bKNylO9k(fKdrT6vX?D!}zSv5aFGE#yi zz>5Z8{-gd{cOV;s1Cfb?y(D>{kNB%8?X=7uE65uLEfUig@l{hs#}@oVEJ~%&;-#XL j4oUY!Z7q=eBmw>lX3k8JmH;4j00000NkvXXu0mjfKzzFU 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 ba059de403d4058de57681bcc4f1ef2d92e34e41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmV+k0rvihP);~1(3M+$Axi7yB1%$mcHqwjXZ$wChS9>p z{{RSN4O#Vi9CC)-r+`h8BnQi~=x3v{l}gf*6M55?~L5gj`1f z&N-7(el_a4My6?wUZC&$aR&$?*wCUr{N5R3! zqA0Wg$8i);mZcV8+qMGW(P#ni_!Q7I4QtzW7C;C=hGBF-^omYh7XQWvC!|$#gu6U} P00000NkvXXu0mjf((rFj 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 3bbbb51c18367c5c098254c0a7d0ab4b97e1e35e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpikV@N{tu zskn7_;zqB-0U~YttM_`ZjFLIx$0upbsk+~D+`a#@FL{)%G@V$ta!n}0Op@DdfU&KFZs6fs+4WY>~nyNqkvq&UM^dC=2y``*i!0C&%+|-); b@jn=3mz;W3(chg43}6ONS3j3^P6-?)JUISV`@iy0Ug zcY`pa)tkqUfP#`Gt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0Tu1@ba4!+ zxRrZuC+{HxhSrDI)A~JfCMxReG7$-Ik?CHN$k8X7z&DMyi}L4_|79>o*;SOuYX02j=_GOCv<;;a3`8F$&1E zu{jzyPn+-XmS>m3i?jtd*)Q?wOh{_w-FD+~gRIe-v(`t2K8oAz%RBP$%FKyCpD=j3 L`njxgN@xNATUvMy 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 a32fbb72388f5cf59be2e8f2d826b571146053ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 696 zcmV;p0!RIcP)a>g%^Qro(TkfdA)LTw^i zge$RsAZXE|O@BaZmoC}}ZHgkXAR@vt7#DpI3|3&%e5Es^Io>;W?)$!{MciQ&r5-q( z!}~t`c+Rl^dvS3w;dx#Tz_#t$?Cfj@2eh!Tpu>4?ZY}~KBF18ZTk)>=_4Nnq7XbEZ zdus5;;L1Tj`EmJDICo#|evRRwypef}i@dsa`^w~aFbRO;MDT{Q#G_rr+B(33-!+$= zR9gdaNzA_2fqu}HYIWkb(7k8-&}KA$HRi;3&H`p^W0LIGn8#YzQfZKb%qjWGrhA(zWB zHa12omHJRBmEHnaz@+QCFPrailrou&tgWqmoSB)K5RqyKIGs!;&pM7{{R`mxzTVv2 eTosX>@a+$KB9MM>NLw}l0000YnNTP31p)PN_8V*0@F|sRD@D>r=YD3b&{D(=gqq=+6go?pcgLh zz7G!Pa(N2S)oOJj2!bB~TI=re^70scvAVh%C-ut8N(w+ktl|=PbJ^UjttVS0fKIn# zrf*L-`T@Job}LCeeq;PCmYTei$BN6mxq0vUVli3-z;RLpbKl9Ovt)+HK*67`&)&vx z54MqM@chxM*Z!J+)dAG!olTy$UXU3%K`uSY>CG`FPNg|>G7Z2lugy=@W~bfZciZQD zG>_vrDF6q+T0sPiwM4O{8yUQAcwnT5xHJENFRibf9i8Rnw>3VsKK5)J0Ama~*2FP% zqZofbMiUZ*27rg|ecJmGdqIE~gj~qYfh33_t{7viF-HD1<2aV7*{N$Hf+0P$&#ENZuX+Bp0sh zQY;p6U3Z{Cxm-TpKt#yr^C+dr=kxz(kN}#^CJPG-G@H$14Lr|dW@d&=CL_M@_x{GB z@B6mX>4@iflB~z&`ue&UW29QGz6VAQ#&~F^lv1fw3V>wok8Cz8wOZ}N($Z2{L;?T> woSU4Syy!TN8rb+@gkczOZ*RLIvX`9w1@Ajb0p^Y-od5s;07*qoM6N<$f-3JJWB>pF 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 e90194dcc2cb68f78a2f097e98daf8c4c35a3e1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 652 zcmV;70(1R|P)f^uXbF z&RP8VbN&i&^7(w5=XpN?9LMp8hlkS~s?pKWs5*~~jMM>$NUZ4Ney%Y$xbbY`3c#+v zYrF1t%^nsgjg_ud=jPkZGsHZX_wrP6m3Ma@-0Hs^_5+}G9bV55a+yZ5sWd3~>sQ!W zNF9hRWM_H#X8fYn`X*-jl^>hY+-({Cy%4N&l<&Rt8 zeAtWDx(+}C#IYa(HjW9S7(cX>eY5AtNpP?C5udg{)6vk)>o1e6Y%d?U(E!$3oX8=H zzz-uTL4=`cPdO)fY39egfV{5G(x1%VM&hE|u5kV7TMTBoH zEr{NGXb=@4xX?u@)?h_&OY(D=9Pgbw_uTWgh?&%c^nsV( z%i-bSd5;3D@$vEIFbtOgEXyhn4-aS9qp`8Eq`HrcjHCcW#3=f>?KOHgmL4wk0&JJJ zb;r$)>AeA)Pc|=9_oi!2Z!tWQck)1Sp4Zp!3=Z_f0|3}|im>YkUbc}2Hv>^i zZY^xKVVb9-Q!j(b;Ia*<#q~Uo3llUPJ%X35<5)gJb1ut?`YZseTP0RhiS^Pp8>N6# zaW}SYrvPjKV+0Y<#tN7j<8$E)t#zHe_&Ui#VZPSJ2GCk#B^F5n z6 zeIH}YE+*RWeLBTXpGuUjogh-{Lt9(hzHIG@*p|s 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 8c0e4db5685e6275d704316c0ac6f81d0bcdd920..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpik#_H=O! zvFKep+0pM%fI!>+N?9qT+fibyO45fkcQkYJFAV=IrZVRs^MyPw0Wpc}-@lHry75lr zc(nb0+P^rHV&S`grqI0s*tsMeR z4DUH_>*{&lGVy&cGU4t!)m5v)t>#LEs&*~%zj%gYq3ZeKUw`esUKT!mwCUwvXO@n4 zkM}V4E&FKF``^%Y(vmG}1$~#@@mVI%r{S=^{Ahti!u_Z3XGoq-tNLC`UD zKU+)_^M`xMY3kl-ZQp;d6Iq}WKIQ2ve@+nv-}RC_Mtye=Dk`#k+QYDKYQ-v^2XlV! z7ZTm@_18{bMH$`9xJNwAO?)A)9yYjjg%{aaE{U5&B%bP9Nmp%Z+ O0)wZkpUXO@geCxsbgHBP 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); }