From 309ff2997ce53209a70d2b55a043dc105204350e Mon Sep 17 00:00:00 2001 From: Christoph Dann Date: Thu, 8 Jan 2015 11:42:14 +0100 Subject: [PATCH] potential fix for #1865 Do not show ignored files in context menu --- src/gui/owncloudgui.cpp | 2 +- src/libsync/progressdispatcher.cpp | 6 ++++++ src/libsync/progressdispatcher.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 70a040795..1cf0a0785 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -486,7 +486,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const Progress::Info _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)) { // display a warn icon if warnings happend. diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp index c2281975a..b2950d9e6 100644 --- a/src/libsync/progressdispatcher.cpp +++ b/src/libsync/progressdispatcher.cpp @@ -88,6 +88,12 @@ bool Progress::isWarningKind( SyncFileItem::Status kind) } +bool Progress::isIgnoredKind( SyncFileItem::Status kind) +{ + return kind == SyncFileItem::FileIgnored; + +} + ProgressDispatcher* ProgressDispatcher::instance() { if (!_instance) { _instance = new ProgressDispatcher(); diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h index 3a79a3118..f2864388d 100644 --- a/src/libsync/progressdispatcher.h +++ b/src/libsync/progressdispatcher.h @@ -168,6 +168,7 @@ namespace Progress OWNCLOUDSYNC_EXPORT QString asResultString( const SyncFileItem& item ); OWNCLOUDSYNC_EXPORT bool isWarningKind( SyncFileItem::Status ); + OWNCLOUDSYNC_EXPORT bool isIgnoredKind( SyncFileItem::Status ); }