From 96300a356f86502b92807f25a39a6cba86c8e639 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 26 Feb 2020 22:21:52 +0100 Subject: [PATCH] update the composer icons --- retroshare-gui/src/gui/icons.qrc | 4 ++++ retroshare-gui/src/gui/icons/mail/contacts.png | Bin 0 -> 2513 bytes retroshare-gui/src/gui/icons/mail/quote.png | Bin 0 -> 1922 bytes retroshare-gui/src/gui/icons/mail/save.png | Bin 0 -> 1352 bytes retroshare-gui/src/gui/icons/mail/send.png | Bin 0 -> 2762 bytes retroshare-gui/src/gui/msgs/MessageComposer.cpp | 4 ++-- retroshare-gui/src/gui/msgs/MessageComposer.ui | 16 ++++++++-------- .../src/gui/qss/stylesheet/Standard.qss | 3 +-- 8 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/mail/contacts.png create mode 100644 retroshare-gui/src/gui/icons/mail/quote.png create mode 100644 retroshare-gui/src/gui/icons/mail/save.png create mode 100644 retroshare-gui/src/gui/icons/mail/send.png diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index bd5353112..40b971709 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -305,5 +305,9 @@ icons/mail/replayall-mail.png icons/mail/reply-mail.png icons/mail/tags.png + icons/mail/quote.png + icons/mail/send.png + icons/mail/contacts.png + icons/mail/save.png diff --git a/retroshare-gui/src/gui/icons/mail/contacts.png b/retroshare-gui/src/gui/icons/mail/contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..8c070573710f16ac8e1fc1e61c433d745adbf13b GIT binary patch literal 2513 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 Tr%xElKoGDnwKgd>J{$En=6efQ literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 52da5b10f..389ae69c9 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -2431,9 +2431,9 @@ void MessageComposer::on_contactsdockWidget_visibilityChanged(bool visible) void MessageComposer::updatecontactsviewicons() { if(!ui.contactsdockWidget->isVisible()){ - ui.actionContactsView->setIcon(QIcon(":/images/contactsclosed24.png")); + ui.actionContactsView->setIcon(QIcon(":/icons/mail/contacts.png")); }else{ - ui.actionContactsView->setIcon(QIcon(":/images/contacts24.png")); + ui.actionContactsView->setIcon(QIcon(":/icons/mail/contacts.png")); } } diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui index d48180213..9616851fa 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.ui +++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui @@ -1154,8 +1154,8 @@ border-image: url(:/images/closepressed.png) - - :/images/send24.png:/images/send24.png + + :/icons/mail/send.png:/icons/mail/send.png Send @@ -1175,8 +1175,8 @@ border-image: url(:/images/closepressed.png) - - :/images/contacts24.png:/images/contacts24.png + + :/icons/mail/contacts.png:/icons/mail/contacts.png Contacts @@ -1187,8 +1187,8 @@ border-image: url(:/images/closepressed.png) - - :/images/save24.png:/images/save24.png + + :/icons/mail/save.png:/icons/mail/save.png Save @@ -1214,8 +1214,8 @@ border-image: url(:/images/closepressed.png) true - - :/images/quote_24.png:/images/quote_24.png + + :/icons/mail/quote.png:/icons/mail/quote.png Quote diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index b1ced689a..088205ec3 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -238,8 +238,7 @@ PopupChatWindow QToolBar#chattoolBar{ /* Messages */ MessageComposer QToolBar#toolBar { - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD); - border: 0px; + } MessagesDialog QFrame#folderFrame, MessagesDialog QFrame#quickViewFrame {