diff options
| author | Tomaz Canabrava <tcanabrava@kde.org> | 2017-12-12 12:46:43 +0300 |
|---|---|---|
| committer | Tomaz Canabrava <tcanabrava@kde.org> | 2017-12-12 12:46:43 +0300 |
| commit | 33b1fcfe664bc40586f833a61e5c330744714b74 (patch) | |
| tree | cb9b19146adce0e03cacbb67c0b72cf9451010ba /src/gui/selectivesyncdialog.cpp | |
| parent | 0a83d3e743b917075aeb7d90a02d148a2af8739c (diff) | |
| parent | cd2057fc04fe7a9c27cceffa6f44df6de5ed1f1d (diff) | |
Merge branch 'master' into clientSideEncryptionV3
Diffstat (limited to 'src/gui/selectivesyncdialog.cpp')
| -rw-r--r-- | src/gui/selectivesyncdialog.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index 69c10e1f2..7355e51ac 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -14,7 +14,6 @@ #include "selectivesyncdialog.h" #include "folder.h" #include "account.h" -#include "excludedfiles.h" #include "networkjobs.h" #include "theme.h" #include "folderman.h" @@ -95,6 +94,9 @@ SelectiveSyncWidget::SelectiveSyncWidget(AccountPtr account, QWidget *parent) _folderTree->header()->setStretchLastSection(true); _folderTree->headerItem()->setText(0, tr("Name")); _folderTree->headerItem()->setText(1, tr("Size")); + + ConfigFile::setupDefaultExcludeFilePaths(_excludedFiles); + _excludedFiles.reloadExcludeFiles(); } QSize SelectiveSyncWidget::sizeHint() const @@ -204,7 +206,7 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list) QMutableListIterator<QString> it(list); while (it.hasNext()) { it.next(); - if (ExcludedFiles::instance().isExcluded(it.value(), pathToRemove, FolderMan::instance()->ignoreHiddenFiles())) + if (_excludedFiles.isExcluded(it.value(), pathToRemove, FolderMan::instance()->ignoreHiddenFiles())) it.remove(); } |