mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Changes icons for opening in file manager and to dismiss notification.

Browse source 
- The icons used before were not really clear on what their function
was.

Signed-off-by: Camila San <hello@camila.codes>
This commit is contained in:
Camila San 2018-07-05 17:23:41 +02:00 committed by Roeland Jago Douma
parent ec51428e4d
commit f402b1d9e4
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client.qrc
View file

@ -26,6 +26,7 @@
<file>resources/bell.svg</file>
<file>resources/link.svg</file>
<file>resources/files.svg</file>
<file>resources/folder-grey.png</file>
</qresource>
<qresource prefix="/"/>
</RCC>

8
src/gui/activityitemdelegate.cpp
View file

@ -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'