mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4090 from nextcloud/feature/hide-share-for-deleted

Browse Source 
Hide share button for deleted files and ignored files in tray activity
This commit is contained in:
Claudio Cambra 2021-12-20 17:39:16 +01:00 committed by GitHub
commit 2ba0df3d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/tray/ActivityItem.qml
View File

@ -152,7 +152,7 @@ MouseArea {
Layout.alignment: Qt.AlignRight
flat: true
hoverEnabled: true
visible: displayActions && (path !== "")
visible: isShareable
display: AbstractButton.IconOnly
icon.source: "qrc:///client/theme/share.svg"
icon.color: "transparent"

3
src/gui/tray/activitylistmodel.cpp
View File

@ -68,6 +68,7 @@ QHash<int, QByteArray> ActivityListModel::roleNames() const
roles[ObjectTypeRole] = "objectType";
roles[PointInTimeRole] = "dateTime";
roles[DisplayActions] = "displayActions";
roles[ShareableRole] = "isShareable";
return roles;
}
@ -262,6 +263,8 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
return (ast && ast->isConnected());
case DisplayActions:
return _displayActions;
case ShareableRole:
return !data(index, PathRole).toString().isEmpty() && _displayActions && a._fileAction != "file_deleted" && a._status != SyncFileItem::FileIgnored;
default:
return QVariant();
}

1
src/gui/tray/activitylistmodel.h
View File

@ -60,6 +60,7 @@ public:
AccountConnectedRole,
SyncFileStatusRole,
DisplayActions,
ShareableRole,
};
Q_ENUM(DataRole)