mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 05:45:42 +03:00
Merge pull request #2678 from chrodan/master
Hide Ignored files in context menu
This commit is contained in:
commit
3f5c1d2ade
3 changed files with 8 additions and 1 deletions
|
@ -486,7 +486,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const Progress::Info
|
||||||
|
|
||||||
_actionRecent->setIcon( QIcon() ); // Fixme: Set a "in-progress"-item eventually.
|
_actionRecent->setIcon( QIcon() ); // Fixme: Set a "in-progress"-item eventually.
|
||||||
|
|
||||||
if (!progress._lastCompletedItem.isEmpty()) {
|
if (!progress._lastCompletedItem.isEmpty() && !Progress::isIgnoredKind(progress._lastCompletedItem._status)) {
|
||||||
|
|
||||||
if (Progress::isWarningKind(progress._lastCompletedItem._status)) {
|
if (Progress::isWarningKind(progress._lastCompletedItem._status)) {
|
||||||
// display a warn icon if warnings happend.
|
// display a warn icon if warnings happend.
|
||||||
|
|
|
@ -88,6 +88,12 @@ bool Progress::isWarningKind( SyncFileItem::Status kind)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Progress::isIgnoredKind( SyncFileItem::Status kind)
|
||||||
|
{
|
||||||
|
return kind == SyncFileItem::FileIgnored;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
ProgressDispatcher* ProgressDispatcher::instance() {
|
ProgressDispatcher* ProgressDispatcher::instance() {
|
||||||
if (!_instance) {
|
if (!_instance) {
|
||||||
_instance = new ProgressDispatcher();
|
_instance = new ProgressDispatcher();
|
||||||
|
|
|
@ -168,6 +168,7 @@ namespace Progress
|
||||||
OWNCLOUDSYNC_EXPORT QString asResultString( const SyncFileItem& item );
|
OWNCLOUDSYNC_EXPORT QString asResultString( const SyncFileItem& item );
|
||||||
|
|
||||||
OWNCLOUDSYNC_EXPORT bool isWarningKind( SyncFileItem::Status );
|
OWNCLOUDSYNC_EXPORT bool isWarningKind( SyncFileItem::Status );
|
||||||
|
OWNCLOUDSYNC_EXPORT bool isIgnoredKind( SyncFileItem::Status );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue