diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp index 16d927f59..9d0b686f9 100644 --- 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(index.data(SyncProgressItemString)); auto warningCount = qvariant_cast(index.data(WarningCount)); auto syncOngoing = qvariant_cast(index.data(SyncRunning)); - auto syncDate = qvariant_cast(index.data(SyncDate)); auto syncEnabled = qvariant_cast(index.data(FolderAccountConnected)); + auto syncText = qvariant_cast(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 fc9cd2349..63c2903a8 100644 --- 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 e6cf4de3d..5839bd834 100644 --- 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(); }