Remove vfs warning in the delegate, indicate them in the description instead

Fixes: #8139

diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index 16d927f595792f3b80c943573fd8f68cca9f70d6..9d0b686f9a66220f21e2a4c372192be4ef228f94 100644 (file)
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -166,8 +166,8 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     auto itemString = qvariant_cast<QString>(index.data(SyncProgressItemString));
     auto warningCount = qvariant_cast<int>(index.data(WarningCount));
     auto syncOngoing = qvariant_cast<bool>(index.data(SyncRunning));
-    auto syncDate = qvariant_cast<QDateTime>(index.data(SyncDate));
     auto syncEnabled = qvariant_cast<bool>(index.data(FolderAccountConnected));
+    auto syncText = qvariant_cast<QString>(index.data(FolderSyncText));
 
     auto iconRect = option.rect;
     auto aliasRect = option.rect;
@@ -251,7 +251,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     if (!showProgess) {
         painter->setFont(subFont);
         QString elidedRemotePathText = subFm.elidedText(
-            tr("Synchronized with local folder (%1)").arg(syncDate.toTimeSpec(Qt::LocalTime).toString(Qt::SystemLocaleShortDate)),
+            syncText,
             Qt::ElideRight, remotePathRect.width());
         painter->drawText(QStyle::visualRect(option.direction, option.rect, remotePathRect),
             textAlign, elidedRemotePathText);

diff --git a/src/gui/folderstatusdelegate.h b/src/gui/folderstatusdelegate.h
index fc9cd234941ade66337fd75a26d7b291eca3cdb5..63c2903a882a1c48e58ea3dbb140b12b498883a7 100644 (file)
--- a/src/gui/folderstatusdelegate.h
+++ b/src/gui/folderstatusdelegate.h
@@ -46,7 +46,10 @@ public:
         SyncRunning,
         SyncDate,
 
-        AddButton // 1 = enabled; 2 = disabled
+        AddButton, // 1 = enabled; 2 = disabled
+        FolderSyncText,
+        DataRoleCount
+
     };
     void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
     QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override;

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index e6cf4de3d6045f23b8b525f30148cb1ef5c07305..5839bd83434b3a5ff673ab38b453b1f168808494 100644 (file)
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -219,7 +219,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
     case FolderStatusDelegate::FolderErrorMsg:
         return f->syncResult().errorStrings();
     case FolderStatusDelegate::FolderInfoMsg:
-        return f->supportsVirtualFiles()
+        return f->supportsVirtualFiles() && f->vfs().mode() != Vfs::Mode::WindowsCfApi
             ? QStringList(tr("Virtual file support is enabled."))
             : QStringList();
     case FolderStatusDelegate::SyncRunning:
@@ -282,6 +282,12 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
         return progress._overallPercent;
     case FolderStatusDelegate::SyncProgressOverallString:
         return progress._overallSyncString;
+    case FolderStatusDelegate::FolderSyncText:
+        if (f->supportsVirtualFiles()) {
+            return tr("Synchronizing VirtualFiles with local folder");
+        } else {
+            return tr("Synchronizing with local folder");
+        }
     }
     return QVariant();
 }