mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2678 from chrodan/master

Browse source 
Hide Ignored files in context menu
This commit is contained in:
Daniel Molkentin 2015-01-08 14:29:36 +01:00
commit 3f5c1d2ade
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/owncloudgui.cpp
View file

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

6
src/libsync/progressdispatcher.cpp
View file

@ -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();

1
src/libsync/progressdispatcher.h
View file

@ -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 );
} }