From bd93002759bcdff612df34dd57044fb167e16dc0 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 0315ba0c3d..498f46de4b 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -315,7 +315,7 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos) QAction *ac = menu->addAction(tr("Open folder")); connect(ac, &QAction::triggered, this, &AccountSettings::slotOpenCurrentFolder); - 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 363c7899d8..06ee703ae0 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -362,7 +362,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; @@ -519,7 +519,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) @@ -547,7 +547,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; }