mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 14:36:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Changes icons for errors and warnings in the activity list.

Browse source 
Signed-off-by: Camila San <hello@camila.codes>
This commit is contained in:
Camila San 2018-07-18 18:28:03 +02:00 committed by Roeland Jago Douma
parent 31892f5337
commit f294cf1b93
No known key found for this signature in database
GPG key ID: F941078878347C0C
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client.qrc
View file

@ -27,6 +27,9 @@
<file>resources/link.svg</file>
<file>resources/files.svg</file>
<file>resources/folder-grey.png</file>
<file>resources/state-error.svg</file>
<file>resources/state-warning.svg</file>
<file>resources/folder.svg</file>
</qresource>
<qresource prefix="/"/>
</RCC>

1
resources/state-error.svg Normal file
View file

@ -0,0 +1 @@
<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.87498 0 0 .87498 .26458 -255.9)"><circle cx="2.1167" cy="294.88" r="2.1167" fill="#d40000" stroke-width=".25066"/><path d="m1.1839 293.95 1.8656 1.8656" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".52917"/><path d="m3.0495 293.95-1.8656 1.8656" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".52917"/></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 522 B

1
resources/state-warning.svg Normal file
View file

@ -0,0 +1 @@
<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.87498 0 0 .87498 .26458 -255.9)"><circle cx="2.1167" cy="294.88" r="2.1167" fill="#e0d92d" stroke-width=".25066"/><path d="m2.1167 293.83v1.3156" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".52917"/><circle cx="2.1103" cy="295.95" r=".33073" fill="#fcffff"/></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 439 B

6
src/gui/activitylistmodel.cpp
View file

@ -93,18 +93,18 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
return cachedIcon;
else return QIcon(QLatin1String(":/client/resources/bell.svg"));
} else if(a._type == Activity::SyncResultType){
return Theme::instance()->syncStateIcon(SyncResult::Error);
return QIcon(QLatin1String(":/client/resources/state-error.svg"));
} else if(a._type == Activity::SyncFileItemType){
if(a._status == SyncFileItem::NormalError
|| a._status == SyncFileItem::FatalError
|| a._status == SyncFileItem::DetailError
|| a._status == SyncFileItem::BlacklistedError) {
return Theme::instance()->syncStateIcon(SyncResult::Error);
return QIcon(QLatin1String(":/client/resources/state-error.svg"));
} else if(a._status == SyncFileItem::SoftError
|| a._status == SyncFileItem::FileIgnored
|| a._status == SyncFileItem::Conflict
|| a._status == SyncFileItem::Restoration){
return Theme::instance()->syncStateIcon(SyncResult::Problem);
return QIcon(QLatin1String(":/client/resources/state-warning.svg"));
}
} else return QIcon(QLatin1String(":/client/resources/activity.png"));
return QVariant();