From dc0cddae7e54195f0a412c9938d08eb0f981903f Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 12 Feb 2022 00:07:23 +0100 Subject: [PATCH 1/7] 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); } From 235ef6f509351922f244f283dbea223b38f4ecf8 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 12 Feb 2022 11:49:50 +0100 Subject: [PATCH 2/7] removed old icons & cleanup --- .../gui/FileTransfer/SharedFilesDialog.cpp | 2 +- retroshare-gui/src/gui/MainWindow.cpp | 5 +-- retroshare-gui/src/gui/QuickStartWizard.cpp | 2 +- retroshare-gui/src/gui/common/FriendList.cpp | 2 +- .../src/gui/common/NewFriendList.cpp | 2 +- retroshare-gui/src/gui/icons.qrc | 1 + retroshare-gui/src/gui/icons/connection.svg | 38 ++++++++++++++++++ retroshare-gui/src/gui/images.qrc | 7 ---- .../src/gui/images/connect_friend.png | Bin 3472 -> 0 bytes retroshare-gui/src/gui/images/kbackgammon.png | Bin 2491 -> 0 bytes retroshare-gui/src/gui/images/kcmsystem24.png | Bin 1535 -> 0 bytes retroshare-gui/src/gui/images/rs_wizard.png | Bin 4495 -> 0 bytes .../src/gui/images/security-high-16.png | Bin 682 -> 0 bytes .../src/gui/images/security-high-32.png | Bin 1628 -> 0 bytes retroshare-gui/src/gui/images/settings.png | Bin 2637 -> 0 bytes .../src/gui/images/underconstruction.png | Bin 1755 -> 0 bytes .../src/gui/settings/rsettingswin.cpp | 2 - 17 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/connection.svg delete mode 100755 retroshare-gui/src/gui/images/connect_friend.png delete mode 100644 retroshare-gui/src/gui/images/kbackgammon.png delete mode 100644 retroshare-gui/src/gui/images/kcmsystem24.png delete mode 100644 retroshare-gui/src/gui/images/rs_wizard.png delete mode 100644 retroshare-gui/src/gui/images/security-high-16.png delete mode 100755 retroshare-gui/src/gui/images/security-high-32.png delete mode 100644 retroshare-gui/src/gui/images/settings.png delete mode 100644 retroshare-gui/src/gui/images/underconstruction.png diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp index 933e30168..a7d61489a 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp @@ -91,7 +91,7 @@ //#define DEBUG_SHARED_FILES_DIALOG 1 -const QString Image_AddNewAssotiationForFile = ":/images/kcmsystem24.png"; +const QString Image_AddNewAssotiationForFile = ":/icons/svg/options.svg"; class SFDSortFilterProxyModel : public QSortFilterProxyModel { diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 8d323524e..10ce2695b 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -145,7 +145,6 @@ #define IMAGE_NEWRSCOLLECTION ":/images/library.png" #define IMAGE_ADDSHARE ":/images/directoryadd_24x24_shadow.png" #define IMAGE_OPTIONS ":/images/settings.png" -#define IMAGE_UNFINISHED ":/images/underconstruction.png" #define IMAGE_MINIMIZE ":/icons/fullscreen.png" #define IMAGE_MAXIMIZE ":/icons/fullscreen-exit.png" @@ -506,7 +505,7 @@ void MainWindow::initStackedPage() #ifdef UNFINISHED - addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui->toolBar), &MainWindow::showApplWindow, SLOT(showApplWindow())); + addAction(new QAction(QIcon(), tr("Unfinished"), ui->toolBar), &MainWindow::showApplWindow, SLOT(showApplWindow())); ui->toolBarAction->addSeparator(); notify += applicationWindow->getNotify(); #endif @@ -637,7 +636,7 @@ void MainWindow::createTrayIcon() #ifdef UNFINISHED - trayMenu->addAction(QIcon(IMAGE_UNFINISHED), tr("Applications"), this, SLOT(showApplWindow())); + trayMenu->addAction(QIcon(), tr("Applications"), this, SLOT(showApplWindow())); #endif trayMenu->addAction(QIcon(IMAGE_PREFERENCES), tr("Options"), this, SLOT(showSettings())); trayMenu->addAction(QIcon(IMG_HELP), tr("Help"), this, SLOT(showHelpDialog())); diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp index 200e75948..ce953a32e 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.cpp +++ b/retroshare-gui/src/gui/QuickStartWizard.cpp @@ -43,7 +43,7 @@ QuickStartWizard::QuickStartWizard(QWidget *parent) : { ui.setupUi(this); - ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/rs_wizard.png")); + ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/tools_wizard.png")); ui.headerFrame->setHeaderText("RetroShare"); ui.pagesWizard->setCurrentIndex(0); diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp index 303b34356..dd2d17875 100644 --- a/retroshare-gui/src/gui/common/FriendList.cpp +++ b/retroshare-gui/src/gui/common/FriendList.cpp @@ -68,7 +68,7 @@ #define IMAGE_FRIENDINFO ":/images/info16.png" #define IMAGE_CHAT ":/icons/png/chats.png" #define IMAGE_MSG ":/icons/mail/write-mail.png" -#define IMAGE_CONNECT ":/images/connect_friend.png" +#define IMAGE_CONNECT ":/icons/connection.svg" #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_GROUP16 ":/images/user/group16.png" #define IMAGE_EDIT ":/icons/png/pencil-edit-button.png" diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp index 1b2d513f4..991f5d647 100644 --- a/retroshare-gui/src/gui/common/NewFriendList.cpp +++ b/retroshare-gui/src/gui/common/NewFriendList.cpp @@ -66,7 +66,7 @@ #define IMAGE_FRIENDINFO ":/images/info16.png" #define IMAGE_CHAT ":/icons/png/chats.png" #define IMAGE_MSG ":/icons/mail/write-mail.png" -#define IMAGE_CONNECT ":/images/connect_friend.png" +#define IMAGE_CONNECT ":/icons/connection.svg" #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_GROUPS ":/icons/groups/colored.svg" #define IMAGE_EDIT ":/icons/png/pencil-edit-button.png" diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 33560031a..57527d447 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -353,5 +353,6 @@ icons/newtab.svg icons/newwindow.svg icons/cancel.svg + icons/connection.svg diff --git a/retroshare-gui/src/gui/icons/connection.svg b/retroshare-gui/src/gui/icons/connection.svg new file mode 100644 index 000000000..b22e7275d --- /dev/null +++ b/retroshare-gui/src/gui/icons/connection.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 468a0177d..a835757bd 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -35,7 +35,6 @@ images/help/natgreen.png images/help/natred.png images/pgp.png - images/rs_wizard.png images/avatar_request.png images/avatar_refused.png images/avatar_request_unknown.png @@ -200,10 +199,7 @@ images/junk.png images/junk_on.png images/junk_off.png - images/connect_friend.png images/kalarm.png - images/kbackgammon.png - images/kcmsystem24.png images/ledoff1.png images/ledon1.png images/locale.png @@ -268,7 +264,6 @@ images/replymailall24-hover.png images/reset.png images/resume.png - images/security-high-16.png images/security-high-48.png images/security-low-48.png images/security-medium-48.png @@ -277,7 +272,6 @@ images/security-medium-off-48.png images/save24.png images/send24.png - images/settings.png images/show_toolbox_frame.png images/start.png images/stop.png @@ -346,7 +340,6 @@ images/up0down1.png images/up1down1.png images/up1down0.png - images/underconstruction.png images/user.png qss/chat/standard/private/info.xml qss/chat/standard/private/incoming.htm diff --git a/retroshare-gui/src/gui/images/connect_friend.png b/retroshare-gui/src/gui/images/connect_friend.png deleted file mode 100755 index 3549e6d83daa8cc78302a34b9888c5ac50d1b441..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3472 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 Q{Qv*}07*qoM6N<$f?fSJSpWb4 diff --git a/retroshare-gui/src/gui/images/security-high-32.png b/retroshare-gui/src/gui/images/security-high-32.png deleted file mode 100755 index 95e73d93e0d768731d8d2f496adc16781f0d2b6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1628 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 diff --git a/retroshare-gui/src/gui/images/underconstruction.png b/retroshare-gui/src/gui/images/underconstruction.png deleted file mode 100644 index af754a98cc40c82a77cd43f49d44bb4f1f4ce252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1755 zcmV<11|<23P)ba+mNH=?i zamn5uZ`-*T`Dwug9Ea2KgVm{&&kbji&6K>%t$XPX!38+y80gl^{YAS924)Pge~$${ zabme8i@?#z&|r8URuhpSYcdGZBku0CJzj@^>ME_1n#1DSAgMndO&a?rNk1M z{1cBvV9db)ci^_RVLlANg@AEbwqxfiQmzF+$h1qmJD!3z2F4iJ)JkEnvjidqvI?*Y zL`i+M31AbLns%ilv|s_k&pp!a-YPR;S7iv?f?jMjBg#S0U(^%2V5ITVQP-U zlErUkG=BL~h``YR*}4dr#$E$l6I0g*p8;^bxiM-9!|7jVFgfP{0Q$Rtb3Y0ZcmTlg z`kOxfaNY+1Fb16ceuTq=2>`;~8IJG1mPR!OhzQRfR`|vDqR;BVK>YXxXF#j?v{o_J z02||p{uqB7NkJQ6IV8+3CK!5T2|B6Zv7I5_{m{YmB7-po?~DQ`4=zBWf{a^1K4oz2 zb^rhvpB5-)BlPbmqnV?DUx^={vY!&5RgA1(K{hbBKAx=ydf=if7oxYd1fydd+7sf! z2dzjnM>XO2Xqw~L{#j@pV^2qjsd*2R^Ytu^jC*)$Z~=j=d|JSFj;r0JP(4>FtE5y` zNf@bWwWdl@MMXWWtI>mHUse*y0@u*(Dc?TUJ-et?TqYAo#ayh%XEILU8d@$3VpI(a zsZuGbsOZt|mCDVjyel}t5kzD6T(!SrCMuPcYH(F+u{y&pp2gYDHv9mrUX+<-)K0ug z!Bz~J&35It%&ymk;gx7|8B_ahVoEGzqZVmI2NsYvy9ybV|l$N=Ui>(RH^^fRvJiln`Lb&UW zfiFKJ#OE_1tKGtJAjC$t8Mis62>|0dFNGAY5F58< zMs14#;-)Bs3*OAdc$PCVj?oHhfYq3|&{^DS0a}}OkXh$3M!^`9mPAGxqt+d*)!-3z z0hrrL0ZQuvh{2eRZ$vsJ$!bsQjjWG-65_8Tx%c^{zGPQ>MSO5Khh6Oz?Cq%Ne~s=C z9l2PZIIvLu-NnB2(MOlmxt)l=?I1J??&261BWr>g}#-oN@_cdKi4tLH!rbZHP75E+!KMzQffr;>bzI{*;X2);C!UbH{|(o6Brwz3CCUiZ%T z75OuaOYp|1n_IDENu>E&55x&ULc=KJw~`zH60Oo&GiV}sYqN+*N?6T}Za5`?Q5Io> z+*S*Ss+3-h2wW(vJx7cnWi_@;Hw2U-*f_@AN`$*xEg&po>>)#UI5^CII#6N&svVOcOK!{g>D9e%iw>05BGs5fPdQ xT>##u)oPXn{u=v4p!002ovPDHLkV1fpyGYJ3y diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp index 4cdd929e5..46c85ea8e 100644 --- a/retroshare-gui/src/gui/settings/rsettingswin.cpp +++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp @@ -52,8 +52,6 @@ # include "JsonApiPage.h" #endif -#define IMAGE_GENERAL ":/images/kcmsystem24.png" - #define ITEM_SPACING 2 #include "rsettingswin.h" From aa5e40828eac4133ed555f9706187b5888e40975 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 12 Feb 2022 12:22:52 +0100 Subject: [PATCH 3/7] removed old icon --- retroshare-gui/src/gui/GenCertDialog.cpp | 2 +- retroshare-gui/src/gui/Identity/IdDialog.cpp | 2 +- .../src/gui/common/SubscribeToolButton.cpp | 2 +- retroshare-gui/src/gui/images.qrc | 1 - retroshare-gui/src/gui/images/cancel.png | Bin 640 -> 0 bytes retroshare-gui/src/gui/unfinished/PhotoDialog.cpp | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 retroshare-gui/src/gui/images/cancel.png diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 1abdb698b..b71e324c7 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -48,7 +48,7 @@ #include #define IMAGE_GOOD ":/images/accepted16.png" -#define IMAGE_BAD ":/images/cancel.png" +#define IMAGE_BAD ":/icons/cancel.svg" class EntropyCollectorWidget: public QTextBrowser { diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 0f657a577..5397f6300 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -1111,7 +1111,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint ) static const int CANCEL = 3 ; // Admin list: no Subscription request: yes const QString menu_titles[4] = { tr("Request subscription"), tr("Accept circle invitation"), tr("Quit this circle"),tr("Cancel subscribe request")} ; - const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/icons/png/enter.png",":/images/cancel.png" } ; + const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/icons/png/enter.png",":/icons/cancel.svg" } ; std::vector< std::vector > ids(4) ; diff --git a/retroshare-gui/src/gui/common/SubscribeToolButton.cpp b/retroshare-gui/src/gui/common/SubscribeToolButton.cpp index 4015e641c..165b6caa1 100644 --- a/retroshare-gui/src/gui/common/SubscribeToolButton.cpp +++ b/retroshare-gui/src/gui/common/SubscribeToolButton.cpp @@ -72,7 +72,7 @@ void SubscribeToolButton::updateUi() delete mMenu ; mMenu = new QMenu; - mMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"), tr("Unsubscribe"), this, SLOT(unsubscribePrivate())); + mMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"), tr("Unsubscribe"), this, SLOT(unsubscribePrivate())); if (!mSubscribedActions.empty()) { mMenu->addSeparator(); diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index a835757bd..6e893722d 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -103,7 +103,6 @@ images/graph-blue.png images/avatar_background.png images/chat.png - images/cancel.png images/close-down.png images/copy.png images/delete.png diff --git a/retroshare-gui/src/gui/images/cancel.png b/retroshare-gui/src/gui/images/cancel.png deleted file mode 100644 index 87cd0b0125d6193c16c59f25b88396493e885f6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 640 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~*<;sHJ( zuK)l4Z(v|p!N9PVfuWs&p^JfGA_Kz=28KBd467IzAX4jDSb*GiKE6H%hCBv_Tn2_L z28Klp4AZo=>*d6nRHQFelpgl-Jed$XS6*hniPlkf`z7+iOXNkDC`v6+mRl+(v`kK5 zwTk$9b?ME9YMZs?_j%bL_HsDk<9sU2r$Je2`?nP^4n zy$lTd7#Q|j8XpwoI%I5o$k*ermDN#8qhmrm$Ax%K+S#3Uu|MtSb;ix@0t3SZA)d=& zVVA>0E~h43Ns7Cc5PLm2@wTwQZ4try!urld@myOUR3yfXZwfVuCELX$$gHBz;HAv3GxeOFfuao00U1?PcLu(fWV*& z*YDnY^6b^8FJFJbz;6)v0|bBn{{8pwYTmshp#IsOE{-7*lD!9A#hMrxSP$@P+)yej zFHd4mDu4d>{K5|<=XpdH-eIeeoFkI5#Mch*eE5E3q& zsDJ)QWe~HZu=JPqwHHm!J!tPMoAuVM<=A|yGuL0$MD)r}t=B23K4h_=$wxfq{j{s6 zvbJ;1RM`0b{&%I*Q{~<_^9mg*KC_8ox^*ST366Hw_&MDTLh{a=g|okJNlO7blfl!~ K&t;ucLK6VLNBNWh diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp index 42fd5acee..83009c267 100644 --- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp +++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp @@ -42,7 +42,7 @@ /* Images for context menu icons */ #define IMAGE_REMOVEFRIEND ":/images/removefriend16.png" -#define IMAGE_REMOVE ":/images/cancel.png" +#define IMAGE_REMOVE ":/icons/cancel.svg" #define IMAGE_CHAT ":/images/chat.png" /* Images for Status icons */ #define IMAGE_PEER ":/images/user/identity16.png" From 6177b4dcdcd733645284deb4f506d3734b6e8faf Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 15 Feb 2022 20:40:11 +0100 Subject: [PATCH 4/7] removed unused old icons --- retroshare-gui/src/gui/images.qrc | 6 ------ .../src/gui/images/security-high-48.png | Bin 2976 -> 0 bytes .../src/gui/images/security-high-off-48.png | Bin 2939 -> 0 bytes .../src/gui/images/security-low-48.png | Bin 3051 -> 0 bytes .../src/gui/images/security-low-off-48.png | Bin 2974 -> 0 bytes .../src/gui/images/security-medium-48.png | Bin 2892 -> 0 bytes .../src/gui/images/security-medium-off-48.png | Bin 2574 -> 0 bytes 7 files changed, 6 deletions(-) delete mode 100644 retroshare-gui/src/gui/images/security-high-48.png delete mode 100644 retroshare-gui/src/gui/images/security-high-off-48.png delete mode 100644 retroshare-gui/src/gui/images/security-low-48.png delete mode 100644 retroshare-gui/src/gui/images/security-low-off-48.png delete mode 100644 retroshare-gui/src/gui/images/security-medium-48.png delete mode 100644 retroshare-gui/src/gui/images/security-medium-off-48.png diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 6e893722d..a0c74bb77 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -263,12 +263,6 @@ images/replymailall24-hover.png images/reset.png images/resume.png - images/security-high-48.png - images/security-low-48.png - images/security-medium-48.png - images/security-high-off-48.png - images/security-low-off-48.png - images/security-medium-off-48.png images/save24.png images/send24.png images/show_toolbox_frame.png diff --git a/retroshare-gui/src/gui/images/security-high-48.png b/retroshare-gui/src/gui/images/security-high-48.png deleted file mode 100644 index fb54fd735289bb627564a30955dbc3b2e3d9e806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2976 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 diff --git a/retroshare-gui/src/gui/images/security-low-48.png b/retroshare-gui/src/gui/images/security-low-48.png deleted file mode 100644 index 9d5659f465a9454148f14e840627ae348312d136..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3051 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 From a073c0964480b61cc0054dec9bfa808a9c084ec6 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 23 Feb 2022 13:50:51 +0100 Subject: [PATCH 5/7] Fixed to remove icons --- .../src/gui/connect/PGPKeyDialog.cpp | 1 + .../src/gui/connect/PGPKeyDialog.ui | 24 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp index cc86593c4..36b6057b4 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp @@ -180,6 +180,7 @@ void PGPKeyDialog::load() { ui.make_friend_button->hide(); ui.signKeyButton->hide(); + ui.label_signKey->hide(); ui.denyFriendButton->hide(); ui.label_trustlevel->hide(); diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui index a1e0f208e..12781b2c9 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui @@ -111,55 +111,31 @@ Unset - - - :/images/security-low-off-48.png:/images/security-low-off-48.png - Unknown - - - :/images/security-low-off-48.png:/images/security-low-off-48.png - No trust - - - :/images/security-low-48.png:/images/security-low-48.png - Marginal - - - :/images/security-medium-48.png:/images/security-medium-48.png - Full - - - :/images/security-high-48.png:/images/security-high-48.png - Ultimate - - - :/images/security-high-48.png:/images/security-high-48.png - From f3d2b4f2d04efcba4174350e46e7ddc703886794 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 23 Feb 2022 14:01:28 +0100 Subject: [PATCH 6/7] Fixed missed icon --- .../src/gui/gxschannels/GxsChannelFilesStatusWidget.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui index 463b05423..2c51ded6c 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui @@ -120,8 +120,8 @@ Qt::NoFocus - - :/images/cancel.png:/images/cancel.png + + :/icons/cancel.svg:/icons/cancel.svg From a6deaa2a273dab95658198ed9d3cef764695fe9a Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 27 Feb 2022 14:30:59 +0100 Subject: [PATCH 7/7] Added back icons --- .../src/gui/common/NewFriendList.cpp | 6 ++- .../src/gui/connect/PGPKeyDialog.ui | 25 +++++++++++ retroshare-gui/src/gui/icons.qrc | 3 ++ retroshare-gui/src/gui/icons/minus.svg | 42 ++++++++++++++++++ retroshare-gui/src/gui/icons/plus.svg | 42 ++++++++++++++++++ .../src/gui/icons/security_low_off_128.png | Bin 0 -> 17008 bytes 6 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/minus.svg create mode 100644 retroshare-gui/src/gui/icons/plus.svg create mode 100644 retroshare-gui/src/gui/icons/security_low_off_128.png diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp index 7930b3057..893433469 100644 --- a/retroshare-gui/src/gui/common/NewFriendList.cpp +++ b/retroshare-gui/src/gui/common/NewFriendList.cpp @@ -70,6 +70,8 @@ #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_GROUPS ":/icons/groups/colored.svg" #define IMAGE_EDIT ":/icons/png/pencil-edit-button.png" +#define IMAGE_EXPAND ":/icons/plus.svg" +#define IMAGE_COLLAPSE ":/icons/minus.svg" #define IMAGE_REMOVE ":/icons/cancel.svg" #define IMAGE_ADD ":/icons/png/add.png" /* Images for Status icons */ @@ -761,8 +763,8 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu() if (RSLinkClipboard::empty(RetroShareLink::TYPE_CERTIFICATE)) action->setDisabled(true); - contextMenu.addAction(QIcon(""), tr("Expand all"), ui->peerTreeWidget, SLOT(expandAll())); - contextMenu.addAction(QIcon(""), tr("Collapse all"), ui->peerTreeWidget, SLOT(collapseAll())); + 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.addSeparator(); diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui index 12781b2c9..eca49e965 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui @@ -111,31 +111,55 @@ Unset + + + :/icons/security_low_off_128.png:/icons/security_low_off_128.png + Unknown + + + :/icons/security_low_off_128.png:/icons/security_low_off_128.png + No trust + + + :/icons/security_low_128.png:/icons/security_low_128.png + Marginal + + + :/icons/security_medium_128.png:/icons/security_medium_128.png + Full + + + :/icons/security_high_128.png:/icons/security_high_128.png + Ultimate + + + :/icons/security_high_128.png:/icons/security_high_128.png + @@ -513,6 +537,7 @@ p, li { white-space: pre-wrap; } + diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 57527d447..b1548493b 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -141,6 +141,7 @@ icons/search_red_128.png icons/security_high_128.png icons/security_low_128.png + icons/security_low_off_128.png icons/security_medium_128.png icons/settings/appearance.svg icons/settings/channels.svg @@ -354,5 +355,7 @@ icons/newwindow.svg icons/cancel.svg icons/connection.svg + icons/plus.svg + icons/minus.svg diff --git a/retroshare-gui/src/gui/icons/minus.svg b/retroshare-gui/src/gui/icons/minus.svg new file mode 100644 index 000000000..fc2ccfaa8 --- /dev/null +++ b/retroshare-gui/src/gui/icons/minus.svg @@ -0,0 +1,42 @@ + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/plus.svg b/retroshare-gui/src/gui/icons/plus.svg new file mode 100644 index 000000000..83b1dfbbb --- /dev/null +++ b/retroshare-gui/src/gui/icons/plus.svg @@ -0,0 +1,42 @@ + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/security_low_off_128.png b/retroshare-gui/src/gui/icons/security_low_off_128.png new file mode 100644 index 0000000000000000000000000000000000000000..a0f02b0a127e317b47460aeb7845f68e7e8c3204 GIT binary patch literal 17008 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 G`2PU;Zic%6 literal 0 HcmV?d00001