From cbb32edee2832ea390a225ff1c19ad83f294196b Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 8 Jan 2019 09:14:38 +0100 Subject: [PATCH] vfs: Disable selective sync if vfs support is available --- src/gui/accountsettings.cpp | 2 +- src/gui/folderstatusmodel.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index b58351e06..20f8688f4 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -418,7 +418,7 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos) ac = menu->addAction(tr("Edit Ignored Files")); connect(ac, &QAction::triggered, this, &AccountSettings::slotEditCurrentIgnoredFiles); - if (!_ui->_folderList->isExpanded(index) && !folder->newFilesAreVirtual()) { + if (!_ui->_folderList->isExpanded(index) && !folder->supportsVirtualFiles()) { ac = menu->addAction(tr("Choose what to sync")); ac->setEnabled(folderConnected); connect(ac, &QAction::triggered, this, &AccountSettings::doExpand); diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 04db5adef..ddb5fd7c9 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -370,7 +370,7 @@ int FolderStatusModel::rowCount(const QModelIndex &parent) const auto info = infoForIndex(parent); if (!info) return 0; - if (info->_folder && info->_folder->newFilesAreVirtual()) + if (info->_folder && info->_folder->supportsVirtualFiles()) return 0; if (info->hasLabel()) return 1; @@ -527,7 +527,7 @@ bool FolderStatusModel::hasChildren(const QModelIndex &parent) const if (!info) return false; - if (info->_folder && info->_folder->newFilesAreVirtual()) + if (info->_folder && info->_folder->supportsVirtualFiles()) return false; if (!info->_fetched) @@ -555,7 +555,7 @@ bool FolderStatusModel::canFetchMore(const QModelIndex &parent) const // Keep showing the error to the user, it will be hidden when the account reconnects return false; } - if (info->_folder && info->_folder->newFilesAreVirtual()) { + if (info->_folder && info->_folder->supportsVirtualFiles()) { // Selective sync is hidden in that case return false; } -- 2.30.2