From f402b1d9e46edf8288da8bb9b6c58bb3e150ad8d Mon Sep 17 00:00:00 2001 From: Camila San Date: Thu, 5 Jul 2018 17:23:41 +0200 Subject: [PATCH] Changes icons for opening in file manager and to dismiss notification. - The icons used before were not really clear on what their function was. Signed-off-by: Camila San --- client.qrc | 1 + src/gui/activityitemdelegate.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client.qrc b/client.qrc index 69fdd7a0b..f9bc23351 100644 --- a/client.qrc +++ b/client.qrc @@ -26,6 +26,7 @@ resources/bell.svg resources/link.svg resources/files.svg + resources/folder-grey.png diff --git a/src/gui/activityitemdelegate.cpp b/src/gui/activityitemdelegate.cpp index 213cfb508..fb5d7096a 100644 --- a/src/gui/activityitemdelegate.cpp +++ b/src/gui/activityitemdelegate.cpp @@ -133,7 +133,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & // Secondary will be 'Dismiss' or '...' secondaryButton.rect = option.rect; - secondaryButton.icon = QIcon(QLatin1String(":/client/resources/close.svg")); + secondaryButton.icon = QIcon(QLatin1String(":/client/resources/dialog-close.png")); if(customList.size() > 1) secondaryButton.icon = QIcon(QLatin1String(":/client/resources/more.png")); @@ -144,7 +144,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & secondaryButton.rect.setRight(right); secondaryButton.rect.setTop(top); secondaryButton.rect.setHeight(_buttonHeight); - secondaryButton.features |= QStyleOptionButton::DefaultButton; + secondaryButton.features |= QStyleOptionButton::Flat; secondaryButton.state |= QStyle::State_Raised; // Primary button will be 'More Information' @@ -172,7 +172,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & // Secondary will be 'Dismiss' or '...' secondaryButton.rect = option.rect; - secondaryButton.icon = QIcon(QLatin1String(":/client/resources/files.svg")); + secondaryButton.icon = QIcon(QLatin1String(":/client/resources/folder-grey.png")); int right = option.rect.right() - rightMargin; int left = right - buttonSize; @@ -181,7 +181,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & secondaryButton.rect.setRight(right); secondaryButton.rect.setTop(top); secondaryButton.rect.setHeight(_buttonHeight); - secondaryButton.features |= QStyleOptionButton::DefaultButton; + secondaryButton.features |= QStyleOptionButton::Flat; secondaryButton.state |= QStyle::State_Raised; // Primary button will be 'More Information'